From 220a9874679be2dd50adee0f6cda6f189a526023 Mon Sep 17 00:00:00 2001
From: donandren <donandren@gmail.com>
Date: Sat, 14 Jan 2017 16:24:58 +0200
Subject: [PATCH 001/482] issue #855 unit test

---
 .../ListBoxTests_Single.cs                    | 71 ++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
index c7992fe80f..d95acbdb7f 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
@@ -1,11 +1,15 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
+using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.LogicalTree;
+using Avalonia.Markup.Xaml.Data;
 using Avalonia.Styling;
 using Avalonia.VisualTree;
 using Xunit;
@@ -199,6 +203,71 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(1, target.SelectedIndex);
         }
 
+        [Fact]
+        public void SelectedItem_Should_Not_Cause_StackOverflow()
+        {
+            var viewModel = new TestStackOverflowViewModel()
+            {
+                Items = new List<string> { "foo", "bar", "baz" }
+            };
+
+            var target = new ListBox
+            {
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
+                DataContext = viewModel,
+                Items = viewModel.Items
+            };
+
+            target.Bind(ListBox.SelectedItemProperty,
+                new Binding("SelectedItem") { Mode = BindingMode.TwoWay });
+
+            Assert.Equal(0, viewModel.SetterInvokedCount);
+
+            //here in real life stack overflow exception is thrown issue #855
+            target.SelectedItem = viewModel.Items[2];
+
+            Assert.Equal(viewModel.Items[1], target.SelectedItem);
+            Assert.Equal(1, viewModel.SetterInvokedCount);
+        }
+
+        private class TestStackOverflowViewModel : INotifyPropertyChanged
+        {
+            public List<string> Items { get; set; }
+
+            public int SetterInvokedCount { get; private set; }
+
+            public const int MaxInvokedCount = 1000;
+
+            private string _selectedItem;
+
+            public event PropertyChangedEventHandler PropertyChanged;
+
+            public string SelectedItem
+            {
+                get { return _selectedItem; }
+                set
+                {
+                    if (_selectedItem != value)
+                    {
+                        SetterInvokedCount++;
+
+                        int index = Items.IndexOf(value);
+
+                        if (MaxInvokedCount > SetterInvokedCount && index > 0)
+                        {
+                            _selectedItem = Items[index - 1];
+                        }
+                        else
+                        {
+                            _selectedItem = value;
+                        }
+
+                        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(SelectedItem)));
+                    }
+                }
+            }
+        }
+
         private Control CreateListBoxTemplate(ITemplatedControl parent)
         {
             return new ScrollViewer
@@ -237,4 +306,4 @@ namespace Avalonia.Controls.UnitTests
             target.Presenter.ApplyTemplate();
         }
     }
-}
+}
\ No newline at end of file

From 3729b9797fbae73bd1b0f30204d3d01d8c8493b4 Mon Sep 17 00:00:00 2001
From: donandren <donandren@gmail.com>
Date: Sun, 15 Jan 2017 16:06:43 +0200
Subject: [PATCH 002/482] another failing test for issue #855 and #824

---
 .../Primitives/RangeBaseTests.cs              | 89 +++++++++++++++++++
 1 file changed, 89 insertions(+)

diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
index d3ed077cbf..9bccb1986d 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
@@ -2,7 +2,11 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
+using System.ComponentModel;
 using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+using Avalonia.Markup.Xaml.Data;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests.Primitives
@@ -87,8 +91,93 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.Throws<ArgumentException>(() => target.Value = double.NegativeInfinity);
         }
 
+        [Fact]
+        public void SetValue_Should_Not_Cause_StackOverflow()
+        {
+            var viewModel = new TestStackOverflowViewModel()
+            {
+                Value = 50
+            };
+
+            Track track = null;
+
+            var target = new TestRange()
+            {
+                Template = new FuncControlTemplate<RangeBase>(c =>
+                {
+                    return track = new Track()
+                    {
+                        Width = 100,
+                        Orientation = Orientation.Horizontal,
+                        [~~Track.MinimumProperty] = c[~~RangeBase.MinimumProperty],
+                        [~~Track.MaximumProperty] = c[~~RangeBase.MaximumProperty],
+                        [~~Track.ValueProperty] = c[~~RangeBase.ValueProperty],
+                        Name = "PART_Track",
+                        Thumb = new Thumb()
+                    };
+                }),
+                Minimum = 0,
+                Maximum = 100,
+                DataContext = viewModel
+            };
+
+            target.Bind(TestRange.ValueProperty, new Binding("Value") { Mode = BindingMode.TwoWay });
+
+            target.ApplyTemplate();
+            track.Measure(new Size(100, 0));
+            track.Arrange(new Rect(0, 0, 100, 0));
+
+            Assert.Equal(1, viewModel.SetterInvokedCount);
+
+            //here in real life stack overflow exception is thrown issue #855 and #824
+            target.Value = 51.001;
+
+            Assert.Equal(2, viewModel.SetterInvokedCount);
+
+            double expected = 51;
+
+            Assert.Equal(expected, viewModel.Value);
+            Assert.Equal(expected, target.Value);
+            Assert.Equal(expected, track.Value);
+        }
+
         private class TestRange : RangeBase
         {
         }
+
+        private class TestStackOverflowViewModel : INotifyPropertyChanged
+        {
+            public int SetterInvokedCount { get; private set; }
+
+            public const int MaxInvokedCount = 1000;
+
+            private double _value;
+
+            public event PropertyChangedEventHandler PropertyChanged;
+
+            public double Value
+            {
+                get { return _value; }
+                set
+                {
+                    if (_value != value)
+                    {
+                        SetterInvokedCount++;
+                        if (SetterInvokedCount < MaxInvokedCount)
+                        {
+                            _value = (int)value;
+                            if (_value > 75) _value = 75;
+                            if (_value < 25) _value = 25;
+                        }
+                        else
+                        {
+                            _value = value;
+                        }
+
+                        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Value)));
+                    }
+                }
+            }
+        }
     }
 }
\ No newline at end of file

From ef81c5596051ac123a46c9165b455c48d3bcb06d Mon Sep 17 00:00:00 2001
From: donandren <donandren@gmail.com>
Date: Fri, 17 Feb 2017 00:32:38 +0200
Subject: [PATCH 003/482] another simple unit tests for issue #855 for direct
 and styled properties

---
 .../Avalonia.Base.UnitTests.csproj            |   4 +
 .../AvaloniaObjectTests_Binding.cs            | 103 +++++++++++++++--
 .../AvaloniaObjectTests_Direct.cs             | 106 ++++++++++++++++--
 3 files changed, 191 insertions(+), 22 deletions(-)

diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
index 07ed7f14ca..c712a8bcf9 100644
--- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
+++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
@@ -124,6 +124,10 @@
       <Project>{B09B78D8-9B26-48B0-9149-D64A2F120F3F}</Project>
       <Name>Avalonia.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj">
+      <Project>{3E53A01A-B331-47F3-B828-4A5717E77A24}</Project>
+      <Name>Avalonia.Markup.Xaml</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj">
       <Project>{88060192-33d5-4932-b0f9-8bd2763e857d}</Project>
       <Name>Avalonia.UnitTests</Name>
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
index 5e286305d2..7186207b92 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
@@ -2,22 +2,21 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
+using System.ComponentModel;
+using System.Reactive.Concurrency;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
-using Microsoft.Reactive.Testing;
+using System.Threading;
+using System.Threading.Tasks;
 using Avalonia.Data;
 using Avalonia.Logging;
-using Avalonia.UnitTests;
-using Xunit;
-using System.Threading.Tasks;
+using Avalonia.Markup.Xaml.Data;
 using Avalonia.Platform;
-using System.Threading;
-using Moq;
-using System.Reactive.Disposables;
-using System.Reactive.Concurrency;
 using Avalonia.Threading;
+using Avalonia.UnitTests;
+using Microsoft.Reactive.Testing;
+using Moq;
+using Xunit;
 
 namespace Avalonia.Base.UnitTests
 {
@@ -363,7 +362,7 @@ namespace Avalonia.Base.UnitTests
                 Assert.True(called);
             }
         }
-        
+
         [Fact]
         public async void Bind_With_Scheduler_Executes_On_Scheduler()
         {
@@ -384,7 +383,43 @@ namespace Avalonia.Base.UnitTests
 
                 await Task.Run(() => source.OnNext(6.7));
             }
+        }
+
+        [Fact]
+        public void SetValue_Should_Not_Cause_StackOverflow_And_Have_Correct_Values()
+        {
+            var viewModel = new TestStackOverflowViewModel()
+            {
+                Value = 50
+            };
+
+            var target = new Class1();
+
+            //note: if the initialization of the child binding is here target/child binding work fine!!!
+            //var child = new Class1()
+            //{
+            //    [~~Class1.DoubleValueProperty] = target[~~Class1.DoubleValueProperty]
+            //};
 
+            target.Bind(Class1.DoubleValueProperty, new Binding("Value") { Mode = BindingMode.TwoWay, Source = viewModel });
+
+            var child = new Class1()
+            {
+                [~~Class1.DoubleValueProperty] = target[~~Class1.DoubleValueProperty]
+            };
+
+            Assert.Equal(1, viewModel.SetterInvokedCount);
+
+            //here in real life stack overflow exception is thrown issue #855 and #824
+            target.DoubleValue = 51.001;
+
+            Assert.Equal(2, viewModel.SetterInvokedCount);
+
+            double expected = 51;
+
+            Assert.Equal(expected, viewModel.Value);
+            Assert.Equal(expected, target.DoubleValue);
+            Assert.Equal(expected, child.DoubleValue);
         }
 
         /// <summary>
@@ -405,6 +440,15 @@ namespace Avalonia.Base.UnitTests
 
             public static readonly StyledProperty<double> QuxProperty =
                 AvaloniaProperty.Register<Class1, double>("Qux", 5.6);
+
+            public static readonly StyledProperty<double> DoubleValueProperty =
+                        AvaloniaProperty.Register<Class1, double>(nameof(DoubleValue));
+
+            public double DoubleValue
+            {
+                get { return GetValue(DoubleValueProperty); }
+                set { SetValue(DoubleValueProperty, value); }
+            }
         }
 
         private class Class2 : Class1
@@ -431,5 +475,40 @@ namespace Avalonia.Base.UnitTests
                 return new InstancedBinding(_source, BindingMode.OneTime);
             }
         }
+
+        private class TestStackOverflowViewModel : INotifyPropertyChanged
+        {
+            public int SetterInvokedCount { get; private set; }
+
+            public const int MaxInvokedCount = 1000;
+
+            private double _value;
+
+            public event PropertyChangedEventHandler PropertyChanged;
+
+            public double Value
+            {
+                get { return _value; }
+                set
+                {
+                    if (_value != value)
+                    {
+                        SetterInvokedCount++;
+                        if (SetterInvokedCount < MaxInvokedCount)
+                        {
+                            _value = (int)value;
+                            if (_value > 75) _value = 75;
+                            if (_value < 25) _value = 25;
+                        }
+                        else
+                        {
+                            _value = value;
+                        }
+
+                        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Value)));
+                    }
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
index ecb555252d..b6e5396020 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
@@ -3,10 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Reactive.Subjects;
-using Avalonia;
 using Avalonia.Data;
 using Avalonia.Logging;
+using Avalonia.Markup.Xaml.Data;
 using Avalonia.UnitTests;
 using Xunit;
 
@@ -208,7 +209,7 @@ namespace Avalonia.Base.UnitTests
         {
             var target = new Class1();
 
-            Assert.Throws<ArgumentException>(() => 
+            Assert.Throws<ArgumentException>(() =>
                 target.SetValue(Class1.BarProperty, "newvalue"));
         }
 
@@ -217,7 +218,7 @@ namespace Avalonia.Base.UnitTests
         {
             var target = new Class1();
 
-            Assert.Throws<ArgumentException>(() => 
+            Assert.Throws<ArgumentException>(() =>
                 target.SetValue((AvaloniaProperty)Class1.BarProperty, "newvalue"));
         }
 
@@ -227,7 +228,7 @@ namespace Avalonia.Base.UnitTests
             var target = new Class1();
             var source = new Subject<string>();
 
-            Assert.Throws<ArgumentException>(() => 
+            Assert.Throws<ArgumentException>(() =>
                 target.Bind(Class1.BarProperty, source));
         }
 
@@ -439,12 +440,49 @@ namespace Avalonia.Base.UnitTests
             Assert.Equal(BindingMode.OneWayToSource, bar.GetMetadata<Class2>().DefaultBindingMode);
         }
 
+        [Fact]
+        public void SetValue_Should_Not_Cause_StackOverflow_And_Have_Correct_Values()
+        {
+            var viewModel = new TestStackOverflowViewModel()
+            {
+                Value = 50
+            };
+
+            var target = new Class1();
+
+            //note: if the initialization of the child binding is here there is no stackoverflow!!!
+            //var child = new Class1()
+            //{
+            //    [~~Class1.DoubleValueProperty] = target[~~Class1.DoubleValueProperty]
+            //};
+
+            target.Bind(Class1.DoubleValueProperty, new Binding("Value") { Mode = BindingMode.TwoWay, Source = viewModel });
+
+            var child = new Class1()
+            {
+                [~~Class1.DoubleValueProperty] = target[~~Class1.DoubleValueProperty]
+            };
+
+            Assert.Equal(1, viewModel.SetterInvokedCount);
+
+            //here in real life stack overflow exception is thrown issue #855 and #824
+            target.DoubleValue = 51.001;
+
+            Assert.Equal(2, viewModel.SetterInvokedCount);
+
+            double expected = 51;
+
+            Assert.Equal(expected, viewModel.Value);
+            Assert.Equal(expected, target.DoubleValue);
+            Assert.Equal(expected, child.DoubleValue);
+        }
+
         private class Class1 : AvaloniaObject
         {
             public static readonly DirectProperty<Class1, string> FooProperty =
                 AvaloniaProperty.RegisterDirect<Class1, string>(
-                    "Foo", 
-                    o => o.Foo, 
+                    "Foo",
+                    o => o.Foo,
                     (o, v) => o.Foo = v,
                     unsetValue: "unset");
 
@@ -453,14 +491,21 @@ namespace Avalonia.Base.UnitTests
 
             public static readonly DirectProperty<Class1, int> BazProperty =
                 AvaloniaProperty.RegisterDirect<Class1, int>(
-                    "Bar", 
-                    o => o.Baz, 
-                    (o,v) => o.Baz = v,
+                    "Bar",
+                    o => o.Baz,
+                    (o, v) => o.Baz = v,
                     unsetValue: -1);
 
+            public static readonly DirectProperty<Class1, double> DoubleValueProperty =
+                AvaloniaProperty.RegisterDirect<Class1, double>(
+                    nameof(DoubleValue),
+                    o => o.DoubleValue,
+                    (o, v) => o.DoubleValue = v);
+
             private string _foo = "initial";
             private readonly string _bar = "bar";
             private int _baz = 5;
+            private double _doubleValue;
 
             public string Foo
             {
@@ -478,6 +523,12 @@ namespace Avalonia.Base.UnitTests
                 get { return _baz; }
                 set { SetAndRaise(BazProperty, ref _baz, value); }
             }
+
+            public double DoubleValue
+            {
+                get { return _doubleValue; }
+                set { SetAndRaise(DoubleValueProperty, ref _doubleValue, value); }
+            }
         }
 
         private class Class2 : AvaloniaObject
@@ -497,5 +548,40 @@ namespace Avalonia.Base.UnitTests
                 set { SetAndRaise(FooProperty, ref _foo, value); }
             }
         }
+
+        private class TestStackOverflowViewModel : INotifyPropertyChanged
+        {
+            public int SetterInvokedCount { get; private set; }
+
+            public const int MaxInvokedCount = 1000;
+
+            private double _value;
+
+            public event PropertyChangedEventHandler PropertyChanged;
+
+            public double Value
+            {
+                get { return _value; }
+                set
+                {
+                    if (_value != value)
+                    {
+                        SetterInvokedCount++;
+                        if (SetterInvokedCount < MaxInvokedCount)
+                        {
+                            _value = (int)value;
+                            if (_value > 75) _value = 75;
+                            if (_value < 25) _value = 25;
+                        }
+                        else
+                        {
+                            _value = value;
+                        }
+
+                        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Value)));
+                    }
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file

From 8f3ce463f0c1e97642b43d8727525a6f95fcab40 Mon Sep 17 00:00:00 2001
From: donandren <donandren@gmail.com>
Date: Sun, 26 Feb 2017 21:27:44 +0200
Subject: [PATCH 004/482] Slider (RangeBase) test for #824 with Binding which
 behind scenes is using weakobservable

---
 .../Primitives/RangeBaseTests.cs              | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
index 9bccb1986d..0e67581760 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
@@ -7,6 +7,7 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Markup.Xaml.Data;
+using Avalonia.Styling;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests.Primitives
@@ -91,8 +92,10 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.Throws<ArgumentException>(() => target.Value = double.NegativeInfinity);
         }
 
-        [Fact]
-        public void SetValue_Should_Not_Cause_StackOverflow()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void SetValue_Should_Not_Cause_StackOverflow(bool useXamlBinding)
         {
             var viewModel = new TestStackOverflowViewModel()
             {
@@ -105,16 +108,32 @@ namespace Avalonia.Controls.UnitTests.Primitives
             {
                 Template = new FuncControlTemplate<RangeBase>(c =>
                 {
-                    return track = new Track()
+                    track = new Track()
                     {
                         Width = 100,
                         Orientation = Orientation.Horizontal,
                         [~~Track.MinimumProperty] = c[~~RangeBase.MinimumProperty],
                         [~~Track.MaximumProperty] = c[~~RangeBase.MaximumProperty],
-                        [~~Track.ValueProperty] = c[~~RangeBase.ValueProperty],
+
                         Name = "PART_Track",
                         Thumb = new Thumb()
                     };
+
+                    if (useXamlBinding)
+                    {
+                        track.Bind(Track.ValueProperty, new Binding("Value")
+                                                    {
+                                                        Mode = BindingMode.TwoWay,
+                                                        Source = c,
+                                                        Priority = BindingPriority.Style
+                                                    });
+                    }
+                    else
+                    {
+                        track[~~Track.ValueProperty] = c[~~RangeBase.ValueProperty];
+                    }
+
+                    return track;
                 }),
                 Minimum = 0,
                 Maximum = 100,

From ce387271cc3f77a6ba622cf66402ef6f9c83de9c Mon Sep 17 00:00:00 2001
From: donandren <donandren@gmail.com>
Date: Sun, 26 Feb 2017 23:54:24 +0200
Subject: [PATCH 005/482] add test parameters to styled/direct binding tests
 for #855 and #824

---
 .../AvaloniaObjectTests_Binding.cs            | 26 +++++++++++++----
 .../AvaloniaObjectTests_Direct.cs             | 29 +++++++++++++++----
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
index 7186207b92..95aaa1fa32 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
@@ -385,8 +385,10 @@ namespace Avalonia.Base.UnitTests
             }
         }
 
-        [Fact]
-        public void SetValue_Should_Not_Cause_StackOverflow_And_Have_Correct_Values()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void SetValue_Should_Not_Cause_StackOverflow_And_Have_Correct_Values(bool useXamlBinding)
         {
             var viewModel = new TestStackOverflowViewModel()
             {
@@ -401,12 +403,24 @@ namespace Avalonia.Base.UnitTests
             //    [~~Class1.DoubleValueProperty] = target[~~Class1.DoubleValueProperty]
             //};
 
-            target.Bind(Class1.DoubleValueProperty, new Binding("Value") { Mode = BindingMode.TwoWay, Source = viewModel });
+            target.Bind(Class1.DoubleValueProperty,
+                new Binding("Value") { Mode = BindingMode.TwoWay, Source = viewModel });
+
+            var child = new Class1();
 
-            var child = new Class1()
+            if (useXamlBinding)
             {
-                [~~Class1.DoubleValueProperty] = target[~~Class1.DoubleValueProperty]
-            };
+                child.Bind(Class1.DoubleValueProperty,
+                    new Binding("DoubleValue")
+                    {
+                        Mode = BindingMode.TwoWay,
+                        Source = target
+                    });
+            }
+            else
+            {
+                child[!!Class1.DoubleValueProperty] = target[!!Class1.DoubleValueProperty];
+            }
 
             Assert.Equal(1, viewModel.SetterInvokedCount);
 
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
index b6e5396020..17af8164b6 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
@@ -440,8 +440,10 @@ namespace Avalonia.Base.UnitTests
             Assert.Equal(BindingMode.OneWayToSource, bar.GetMetadata<Class2>().DefaultBindingMode);
         }
 
-        [Fact]
-        public void SetValue_Should_Not_Cause_StackOverflow_And_Have_Correct_Values()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void SetValue_Should_Not_Cause_StackOverflow_And_Have_Correct_Values(bool useXamlBinding)
         {
             var viewModel = new TestStackOverflowViewModel()
             {
@@ -456,12 +458,27 @@ namespace Avalonia.Base.UnitTests
             //    [~~Class1.DoubleValueProperty] = target[~~Class1.DoubleValueProperty]
             //};
 
-            target.Bind(Class1.DoubleValueProperty, new Binding("Value") { Mode = BindingMode.TwoWay, Source = viewModel });
+            target.Bind(Class1.DoubleValueProperty, new Binding("Value")
+                                                    {
+                                                        Mode = BindingMode.TwoWay,
+                                                        Source = viewModel
+                                                    });
+
+            var child = new Class1();
 
-            var child = new Class1()
+            if (useXamlBinding)
             {
-                [~~Class1.DoubleValueProperty] = target[~~Class1.DoubleValueProperty]
-            };
+                child.Bind(Class1.DoubleValueProperty,
+                    new Binding("DoubleValue")
+                    {
+                        Mode = BindingMode.TwoWay,
+                        Source = target
+                    });
+            }
+            else
+            {
+                child[!!Class1.DoubleValueProperty] = target[!!Class1.DoubleValueProperty];
+            }
 
             Assert.Equal(1, viewModel.SetterInvokedCount);
 

From 1eee17345bf2958f0179794a4b21fb9d15469196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Thu, 6 Jul 2017 17:45:21 +0100
Subject: [PATCH 006/482] Implemented Window.WindowStartupLocation and
 WindowBase.Owner.

---
 src/Avalonia.Controls/Window.cs               | 28 +++++++
 src/Avalonia.Controls/WindowBase.cs           | 15 ++++
 .../WindowStartupLocation.cs                  | 23 ++++++
 src/Avalonia.DotNetCoreRuntime/AppBuilder.cs  |  3 +
 .../WindowTests.cs                            | 77 ++++++++++++++++++-
 5 files changed, 143 insertions(+), 3 deletions(-)
 create mode 100644 src/Avalonia.Controls/WindowStartupLocation.cs

diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 3802f2b6ea..3535510ce3 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -183,6 +183,15 @@ namespace Avalonia.Controls
             set { SetValue(IconProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the startup location of the window.
+        /// </summary>
+        public WindowStartupLocation WindowStartupLocation
+        {
+            get;
+            set;
+        }
+
         /// <inheritdoc/>
         Size ILayoutRoot.MaxClientSize => _maxPlatformClientSize;
 
@@ -246,6 +255,7 @@ namespace Avalonia.Controls
             s_windows.Add(this);
 
             EnsureInitialized();
+            SetWindowStartupLocation();
             IsVisible = true;
             LayoutManager.Instance.ExecuteInitialLayoutPass(this);
 
@@ -285,6 +295,7 @@ namespace Avalonia.Controls
             s_windows.Add(this);
 
             EnsureInitialized();
+            SetWindowStartupLocation();
             IsVisible = true;
             LayoutManager.Instance.ExecuteInitialLayoutPass(this);
 
@@ -321,6 +332,23 @@ namespace Avalonia.Controls
             }
         }
 
+        void SetWindowStartupLocation()
+        {
+            if (WindowStartupLocation == WindowStartupLocation.CenterScreen)
+            {
+                var positionAsSize = PlatformImpl.MaxClientSize / 2 - ClientSize / 2;
+                Position = new Point(positionAsSize.Width, positionAsSize.Height);
+            }
+            else if (WindowStartupLocation == WindowStartupLocation.CenterOwner)
+            {
+                if (Owner != null)
+                {
+                    var positionAsSize = Owner.ClientSize / 2 - ClientSize / 2;
+                    Position = Owner.Position + new Point(positionAsSize.Width, positionAsSize.Height);
+                }
+            }
+        }
+
         /// <inheritdoc/>
         void INameScope.Register(string name, object element)
         {
diff --git a/src/Avalonia.Controls/WindowBase.cs b/src/Avalonia.Controls/WindowBase.cs
index fbdf64b14a..dd1e8fbef1 100644
--- a/src/Avalonia.Controls/WindowBase.cs
+++ b/src/Avalonia.Controls/WindowBase.cs
@@ -29,6 +29,12 @@ namespace Avalonia.Controls
         public static readonly DirectProperty<WindowBase, bool> IsActiveProperty =
             AvaloniaProperty.RegisterDirect<WindowBase, bool>(nameof(IsActive), o => o.IsActive);
 
+        /// <summary>
+        /// Defines the <see cref="Owner"/> property.
+        /// </summary>
+        public static readonly StyledProperty<WindowBase> OwnerProperty =
+            AvaloniaProperty.Register<WindowBase, WindowBase>(nameof(Owner));
+
         private bool _hasExecutedInitialLayoutPass;
         private bool _isActive;
         private bool _ignoreVisibilityChange;
@@ -100,6 +106,15 @@ namespace Avalonia.Controls
             private set;
         }
 
+        /// <summary>
+        /// Gets or sets the owner of the window.
+        /// </summary>
+        public WindowBase Owner
+        {
+            get { return GetValue(OwnerProperty); }
+            set { SetValue(OwnerProperty, value); }
+        }
+
         /// <summary>
         /// Activates the window.
         /// </summary>
diff --git a/src/Avalonia.Controls/WindowStartupLocation.cs b/src/Avalonia.Controls/WindowStartupLocation.cs
new file mode 100644
index 0000000000..1818636076
--- /dev/null
+++ b/src/Avalonia.Controls/WindowStartupLocation.cs
@@ -0,0 +1,23 @@
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Determines the startup location of the window.
+    /// </summary>
+    public enum WindowStartupLocation
+    {
+        /// <summary>
+        /// The startup location is defined by the Position property.
+        /// </summary>
+        Manual,
+
+        /// <summary>
+        /// The startup location is the center of the screen.
+        /// </summary>
+        CenterScreen,
+
+        /// <summary>
+        /// The startup location is the center of the owner window. If the owner window is not specified, the startup location will be <see cref="Manual"/>.
+        /// </summary>
+        CenterOwner
+    }
+}
diff --git a/src/Avalonia.DotNetCoreRuntime/AppBuilder.cs b/src/Avalonia.DotNetCoreRuntime/AppBuilder.cs
index 2b9b3083b1..bf8d7a20fd 100644
--- a/src/Avalonia.DotNetCoreRuntime/AppBuilder.cs
+++ b/src/Avalonia.DotNetCoreRuntime/AppBuilder.cs
@@ -10,6 +10,9 @@ using Avalonia.Shared.PlatformSupport;
 
 namespace Avalonia
 {
+    /// <summary>
+    /// Initializes platform-specific services for an <see cref="Application"/>.
+    /// </summary>
     public sealed class AppBuilder : AppBuilderBase<AppBuilder>
     {
         /// <summary>
diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
index e0dd908bbb..83f86ce5a0 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
@@ -68,7 +68,7 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void IsVisible_Should_Be_False_Atfer_Hide()
+        public void IsVisible_Should_Be_False_After_Hide()
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
@@ -82,7 +82,7 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void IsVisible_Should_Be_False_Atfer_Close()
+        public void IsVisible_Should_Be_False_After_Close()
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
@@ -96,7 +96,7 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void IsVisible_Should_Be_False_Atfer_Impl_Signals_Close()
+        public void IsVisible_Should_Be_False_After_Impl_Signals_Close()
         {
             var windowImpl = new Mock<IWindowImpl>();
             windowImpl.SetupProperty(x => x.Closed);
@@ -191,5 +191,76 @@ namespace Avalonia.Controls.UnitTests
             // AvaloniaLocator scopes.
             ((IList<Window>)Window.OpenWindows).Clear();
         }
+
+        [Fact]
+        public void Window_Should_Be_Centered_When_Window_Startup_Location_Is_Center_Screen()
+        {
+            var windowImpl = new Mock<IWindowImpl>();
+            windowImpl.SetupProperty(x => x.Position);
+            windowImpl.Setup(x => x.ClientSize).Returns(new Size(800, 480));
+            windowImpl.Setup(x => x.MaxClientSize).Returns(new Size(1920, 1080));
+            windowImpl.Setup(x => x.Scaling).Returns(1);
+
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var window = new Window();
+                window.WindowStartupLocation = WindowStartupLocation.CenterScreen;
+                window.Position = new Point(60, 40);
+
+                window.Show();
+
+                var expectedPosition = new Point(
+                    window.PlatformImpl.MaxClientSize.Width / 2 - window.ClientSize.Width / 2,
+                    window.PlatformImpl.MaxClientSize.Height / 2 - window.ClientSize.Height / 2);
+
+                Assert.Equal(window.Position, expectedPosition);
+            }
+        }
+
+        [Fact]
+        public void Window_Should_Be_Centered_Relative_To_Owner_When_Window_Startup_Location_Is_Center_Owner()
+        {
+            var parentWindowImpl = new Mock<IWindowImpl>();
+            parentWindowImpl.SetupProperty(x => x.Position);
+            parentWindowImpl.Setup(x => x.ClientSize).Returns(new Size(800, 480));
+            parentWindowImpl.Setup(x => x.MaxClientSize).Returns(new Size(1920, 1080));
+            parentWindowImpl.Setup(x => x.Scaling).Returns(1);
+
+            var windowImpl = new Mock<IWindowImpl>();
+            windowImpl.SetupProperty(x => x.Position);
+            windowImpl.Setup(x => x.ClientSize).Returns(new Size(320, 200));
+            windowImpl.Setup(x => x.MaxClientSize).Returns(new Size(1920, 1080));
+            windowImpl.Setup(x => x.Scaling).Returns(1);
+
+            var parentWindowServices = TestServices.StyledWindow.With(
+                windowingPlatform: new MockWindowingPlatform(() => parentWindowImpl.Object));
+
+            var windowServices = TestServices.StyledWindow.With(
+                windowingPlatform: new MockWindowingPlatform(() => windowImpl.Object));
+
+            using (UnitTestApplication.Start(parentWindowServices))
+            {
+                var parentWindow = new Window();
+                parentWindow.Position = new Point(60, 40);
+
+                parentWindow.Show();
+
+                using (UnitTestApplication.Start(windowServices))
+                {
+                    var window = new Window();
+                    window.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+                    window.Position = new Point(60, 40);
+                    window.Owner = parentWindow;
+
+                    window.Show();
+
+                    var expectedPosition = new Point(
+                        parentWindow.Position.X + parentWindow.ClientSize.Width / 2 - window.ClientSize.Width / 2,
+                        parentWindow.Position.Y + parentWindow.ClientSize.Height / 2 - window.ClientSize.Height / 2);
+
+                    Assert.Equal(window.Position, expectedPosition);
+                }
+            }
+        }
     }
 }

From 87e8cb892384127b7be314a7da8678bc1deefe44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Sat, 8 Jul 2017 18:14:06 +0100
Subject: [PATCH 007/482] Fixed PossibleNullReferenceException.

---
 src/Avalonia.Controls/Window.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 3535510ce3..7f0cab3237 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -336,8 +336,11 @@ namespace Avalonia.Controls
         {
             if (WindowStartupLocation == WindowStartupLocation.CenterScreen)
             {
-                var positionAsSize = PlatformImpl.MaxClientSize / 2 - ClientSize / 2;
-                Position = new Point(positionAsSize.Width, positionAsSize.Height);
+                if (PlatformImpl != null)
+                {
+                    var positionAsSize = PlatformImpl.MaxClientSize / 2 - ClientSize / 2;
+                    Position = new Point(positionAsSize.Width, positionAsSize.Height);
+                }
             }
             else if (WindowStartupLocation == WindowStartupLocation.CenterOwner)
             {

From e54d0c75d1c64f26be1aa6e67fede778729e0040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Sun, 9 Jul 2017 14:03:22 +0100
Subject: [PATCH 008/482] Property changes.

---
 src/Avalonia.Controls/Window.cs     | 13 +++++++++++--
 src/Avalonia.Controls/WindowBase.cs |  9 +++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 7f0cab3237..f60768980d 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -78,9 +78,16 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<WindowIcon> IconProperty =
             AvaloniaProperty.Register<Window, WindowIcon>(nameof(Icon));
 
+        /// <summary>
+        /// Defines the <see cref="WindowStartupLocation"/> proeprty.
+        /// </summary>
+        public static readonly DirectProperty<Window, WindowStartupLocation> WindowStartupLocationProperty =
+            AvaloniaProperty.RegisterDirect<Window, WindowStartupLocation>(nameof(WindowStartupLocation), o => o.WindowStartupLocation);
+
         private readonly NameScope _nameScope = new NameScope();
         private object _dialogResult;
         private readonly Size _maxPlatformClientSize;
+        private WindowStartupLocation _windowStartupLoction;
 
         /// <summary>
         /// Initializes static members of the <see cref="Window"/> class.
@@ -188,8 +195,8 @@ namespace Avalonia.Controls
         /// </summary>
         public WindowStartupLocation WindowStartupLocation
         {
-            get;
-            set;
+            get { return _windowStartupLoction; }
+            set { SetAndRaise(WindowStartupLocationProperty, ref _windowStartupLoction, value); }
         }
 
         /// <inheritdoc/>
@@ -336,6 +343,8 @@ namespace Avalonia.Controls
         {
             if (WindowStartupLocation == WindowStartupLocation.CenterScreen)
             {
+                // This should be using a Screen API, but we don't have one yet and
+                // PlatformImpl.MaxClientSize is the best we have.
                 if (PlatformImpl != null)
                 {
                     var positionAsSize = PlatformImpl.MaxClientSize / 2 - ClientSize / 2;
diff --git a/src/Avalonia.Controls/WindowBase.cs b/src/Avalonia.Controls/WindowBase.cs
index dd1e8fbef1..dd1e0ae842 100644
--- a/src/Avalonia.Controls/WindowBase.cs
+++ b/src/Avalonia.Controls/WindowBase.cs
@@ -32,12 +32,13 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="Owner"/> property.
         /// </summary>
-        public static readonly StyledProperty<WindowBase> OwnerProperty =
-            AvaloniaProperty.Register<WindowBase, WindowBase>(nameof(Owner));
+        public static readonly DirectProperty<WindowBase, WindowBase> OwnerProperty =
+            AvaloniaProperty.RegisterDirect<WindowBase, WindowBase>(nameof(Owner), o => o.Owner);
 
         private bool _hasExecutedInitialLayoutPass;
         private bool _isActive;
         private bool _ignoreVisibilityChange;
+        private WindowBase _owner;
 
         static WindowBase()
         {
@@ -111,8 +112,8 @@ namespace Avalonia.Controls
         /// </summary>
         public WindowBase Owner
         {
-            get { return GetValue(OwnerProperty); }
-            set { SetValue(OwnerProperty, value); }
+            get { return _owner; }
+            set { SetAndRaise(OwnerProperty, ref _owner, value); }
         }
 
         /// <summary>

From efb9fd4c5732db991a6e70e7c410226bea68202c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Sun, 6 Aug 2017 18:02:16 +0100
Subject: [PATCH 009/482] Added missing setters.

---
 src/Avalonia.Controls/Window.cs     | 5 ++++-
 src/Avalonia.Controls/WindowBase.cs | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index f60768980d..a94609122a 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -82,7 +82,10 @@ namespace Avalonia.Controls
         /// Defines the <see cref="WindowStartupLocation"/> proeprty.
         /// </summary>
         public static readonly DirectProperty<Window, WindowStartupLocation> WindowStartupLocationProperty =
-            AvaloniaProperty.RegisterDirect<Window, WindowStartupLocation>(nameof(WindowStartupLocation), o => o.WindowStartupLocation);
+            AvaloniaProperty.RegisterDirect<Window, WindowStartupLocation>(
+                nameof(WindowStartupLocation),
+                o => o.WindowStartupLocation,
+                (o, v) => o.WindowStartupLocation = v);
 
         private readonly NameScope _nameScope = new NameScope();
         private object _dialogResult;
diff --git a/src/Avalonia.Controls/WindowBase.cs b/src/Avalonia.Controls/WindowBase.cs
index dd1e0ae842..73d6d8c7cc 100644
--- a/src/Avalonia.Controls/WindowBase.cs
+++ b/src/Avalonia.Controls/WindowBase.cs
@@ -33,7 +33,10 @@ namespace Avalonia.Controls
         /// Defines the <see cref="Owner"/> property.
         /// </summary>
         public static readonly DirectProperty<WindowBase, WindowBase> OwnerProperty =
-            AvaloniaProperty.RegisterDirect<WindowBase, WindowBase>(nameof(Owner), o => o.Owner);
+            AvaloniaProperty.RegisterDirect<WindowBase, WindowBase>(
+                nameof(Owner),
+                o => o.Owner,
+                (o, v) => o.Owner = v);
 
         private bool _hasExecutedInitialLayoutPass;
         private bool _isActive;

From a2551d505bcc5d4609e33ba8c3556fddced14fae Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Fri, 18 Aug 2017 18:50:29 +0300
Subject: [PATCH 010/482] Initial effort on Remote

---
 Avalonia.sln                                  |  90 +++++++++++++++-
 samples/RemoteTest/Program.cs                 |  12 +++
 samples/RemoteTest/RemoteTest.csproj          |  25 +++++
 .../Avalonia.Controls.csproj                  |   1 +
 .../Embedding/Offscreen/OffscreenTopLevel.cs  |  63 +++++++++++
 .../Offscreen/OffscreenTopLevelImpl.cs        |  65 +++++++++++
 src/Avalonia.Controls/Remote/RemoteServer.cs  |  21 ++++
 .../Remote/Server/RemoteServerTopLevelImpl.cs | 101 ++++++++++++++++++
 src/Avalonia.Input/Key.cs                     |   5 +-
 .../Avalonia.Remote.Protocol.csproj           |   9 ++
 .../AvaloniaRemoteMessageGuidAttribute.cs     |  19 ++++
 .../DefaultMessageTypeResolver.cs             |  35 ++++++
 .../IMessageTypeResolver.cs                   |  10 ++
 src/Avalonia.Remote.Protocol/ITransport.cs    |  15 +++
 src/Avalonia.Remote.Protocol/InputMessages.cs |  82 ++++++++++++++
 .../ViewportMessages.cs                       |  54 ++++++++++
 .../Platform/LockedFramebuffer.cs             |  33 ++++++
 17 files changed, 638 insertions(+), 2 deletions(-)
 create mode 100644 samples/RemoteTest/Program.cs
 create mode 100644 samples/RemoteTest/RemoteTest.csproj
 create mode 100644 src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevel.cs
 create mode 100644 src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs
 create mode 100644 src/Avalonia.Controls/Remote/RemoteServer.cs
 create mode 100644 src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
 create mode 100644 src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
 create mode 100644 src/Avalonia.Remote.Protocol/AvaloniaRemoteMessageGuidAttribute.cs
 create mode 100644 src/Avalonia.Remote.Protocol/DefaultMessageTypeResolver.cs
 create mode 100644 src/Avalonia.Remote.Protocol/IMessageTypeResolver.cs
 create mode 100644 src/Avalonia.Remote.Protocol/ITransport.cs
 create mode 100644 src/Avalonia.Remote.Protocol/InputMessages.cs
 create mode 100644 src/Avalonia.Remote.Protocol/ViewportMessages.cs
 create mode 100644 src/Avalonia.Visuals/Platform/LockedFramebuffer.cs

diff --git a/Avalonia.sln b/Avalonia.sln
index 391d02382e..56c489fd0b 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+VisualStudioVersion = 15.0.26730.3
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Base", "src\Avalonia.Base\Avalonia.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
 EndProject
@@ -185,6 +185,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Win32.Interop", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Skia.RenderTests", "tests\Avalonia.RenderTests\Avalonia.Skia.RenderTests.csproj", "{E1582370-37B3-403C-917F-8209551B1634}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Remote.Protocol", "src\Avalonia.Remote.Protocol\Avalonia.Remote.Protocol.csproj", "{D78A720C-C0C6-478B-8564-F167F9BDD01B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RemoteTest", "samples\RemoteTest\RemoteTest.csproj", "{E2999E4A-9086-401F-898C-AEB0AD38E676}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{3c4c0cb4-0c0f-4450-a37b-148c84ff905f}*SharedItemsImports = 13
@@ -2514,6 +2518,86 @@ Global
 		{E1582370-37B3-403C-917F-8209551B1634}.Release|Mono.Build.0 = Release|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Release|x86.ActiveCfg = Release|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Release|x86.Build.0 = Release|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|Mono.Build.0 = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|Mono.Build.0 = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|x86.Build.0 = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|Mono.Build.0 = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|x86.Build.0 = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|iPhone.Build.0 = Release|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|Mono.ActiveCfg = Release|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|Mono.Build.0 = Release|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|x86.ActiveCfg = Release|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|x86.Build.0 = Release|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|Mono.Build.0 = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|Mono.Build.0 = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|x86.Build.0 = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|Mono.Build.0 = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|x86.Build.0 = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|iPhone.Build.0 = Release|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|Mono.ActiveCfg = Release|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|Mono.Build.0 = Release|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|x86.ActiveCfg = Release|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2571,5 +2655,9 @@ Global
 		{638580B0-7910-40EF-B674-DCB34DA308CD} = {A0CC0258-D18C-4AB3-854F-7101680FC3F9}
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E} = {B39A8919-9F95-48FE-AD7B-76E08B509888}
 		{E1582370-37B3-403C-917F-8209551B1634} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
+		{E2999E4A-9086-401F-898C-AEB0AD38E676} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {1E8CA5AA-707A-4C57-A682-D265A49E10C3}
 	EndGlobalSection
 EndGlobal
diff --git a/samples/RemoteTest/Program.cs b/samples/RemoteTest/Program.cs
new file mode 100644
index 0000000000..eb5f388e9e
--- /dev/null
+++ b/samples/RemoteTest/Program.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace RemoteTest
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            Console.WriteLine("Hello World!");
+        }
+    }
+}
diff --git a/samples/RemoteTest/RemoteTest.csproj b/samples/RemoteTest/RemoteTest.csproj
new file mode 100644
index 0000000000..2487c66e41
--- /dev/null
+++ b/samples/RemoteTest/RemoteTest.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.DotNetCoreRuntime\Avalonia.DotNetCoreRuntime.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
+    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
+    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
+    <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj
index 037546b186..47e0f88341 100644
--- a/src/Avalonia.Controls/Avalonia.Controls.csproj
+++ b/src/Avalonia.Controls/Avalonia.Controls.csproj
@@ -36,6 +36,7 @@
     <ProjectReference Include="..\Avalonia.Input\Avalonia.Input.csproj" />
     <ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
     <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
+    <ProjectReference Include="..\Avalonia.Remote.Protocol\Avalonia.Remote.Protocol.csproj" />
     <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
     <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
   </ItemGroup>
diff --git a/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevel.cs b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevel.cs
new file mode 100644
index 0000000000..cd2da692ba
--- /dev/null
+++ b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevel.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Layout;
+using Avalonia.Styling;
+
+namespace Avalonia.Controls.Embedding.Offscreen
+{
+    class OffscreenTopLevel : TopLevel, IStyleable
+    {
+        public OffscreenTopLevelImplBase Impl { get; }
+
+        public OffscreenTopLevel(OffscreenTopLevelImplBase impl) : base(impl)
+        {
+            Impl = impl;
+            Prepare();
+        }
+
+        public void Prepare()
+        {
+            EnsureInitialized();
+            ApplyTemplate();
+            LayoutManager.Instance.ExecuteInitialLayoutPass(this);
+        }
+
+        private void EnsureInitialized()
+        {
+            if (!this.IsInitialized)
+            {
+                var init = (ISupportInitialize)this;
+                init.BeginInit();
+                init.EndInit();
+            }
+        }
+        
+        private readonly NameScope _nameScope = new NameScope();
+        public event EventHandler<NameScopeEventArgs> Registered
+        {
+            add { _nameScope.Registered += value; }
+            remove { _nameScope.Registered -= value; }
+        }
+
+        public event EventHandler<NameScopeEventArgs> Unregistered
+        {
+            add { _nameScope.Unregistered += value; }
+            remove { _nameScope.Unregistered -= value; }
+        }
+
+        public void Register(string name, object element) => _nameScope.Register(name, element);
+
+        public object Find(string name) => _nameScope.Find(name);
+
+        public void Unregister(string name) => _nameScope.Unregister(name);
+
+        Type IStyleable.StyleKey => typeof(EmbeddableControlRoot);
+        public void Dispose()
+        {
+            PlatformImpl.Dispose();
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs
new file mode 100644
index 0000000000..088f20b270
--- /dev/null
+++ b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Platform;
+
+namespace Avalonia.Controls.Embedding.Offscreen
+{
+    abstract class OffscreenTopLevelImplBase : ITopLevelImpl
+    {
+        private double _scaling;
+        private Size _clientSize;
+        public IInputRoot InputRoot { get; private set; }
+
+        public virtual void Dispose()
+        {
+            //No-op
+        }
+
+        public abstract void Invalidate(Rect rect);
+        public abstract IEnumerable<object> Surfaces { get; }
+
+        public Size ClientSize
+        {
+            get { return _clientSize; }
+            set
+            {
+                _clientSize = value;
+                Resized?.Invoke(value);
+            }
+        }
+
+        public double Scaling
+        {
+            get { return _scaling; }
+            set
+            {
+                _scaling = value;
+                ScalingChanged?.Invoke(value);
+            }
+        }
+        
+        public Action<RawInputEventArgs> Input { get; set; }
+        public Action<Rect> Paint { get; set; }
+        public Action<Size> Resized { get; set; }
+        public Action<double> ScalingChanged { get; set; }
+        public void SetInputRoot(IInputRoot inputRoot) => InputRoot = inputRoot;
+
+        public virtual Point PointToClient(Point point) => point;
+
+        public Point PointToScreen(Point point)
+        {
+            throw new NotImplementedException();
+        }
+
+        public virtual void SetCursor(IPlatformHandle cursor)
+        {
+        }
+
+        public Action Closed { get; set; }
+    }
+}
diff --git a/src/Avalonia.Controls/Remote/RemoteServer.cs b/src/Avalonia.Controls/Remote/RemoteServer.cs
new file mode 100644
index 0000000000..8c0509c5ba
--- /dev/null
+++ b/src/Avalonia.Controls/Remote/RemoteServer.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Remote.Protocol;
+
+namespace Avalonia.Controls.Remote
+{
+    public class RemoteServer
+    {
+        private readonly IAvaloniaRemoteTransport _transport;
+
+        public RemoteServer(IAvaloniaRemoteTransport transport)
+        {
+            _transport = transport;
+        }
+
+        public object Content { get; set; }
+    }
+}
diff --git a/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs b/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
new file mode 100644
index 0000000000..6c89264c64
--- /dev/null
+++ b/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Controls.Embedding.Offscreen;
+using Avalonia.Controls.Platform.Surfaces;
+using Avalonia.Platform;
+using Avalonia.Remote.Protocol;
+using Avalonia.Remote.Protocol.Viewport;
+using Avalonia.Threading;
+using PixelFormat = Avalonia.Platform.PixelFormat;
+using ProtocolPixelFormat = Avalonia.Remote.Protocol.Viewport.PixelFormat;
+
+namespace Avalonia.Controls.Remote.Server
+{
+    class RemoteServerTopLevelImpl : OffscreenTopLevelImplBase, IFramebufferPlatformSurface
+    {
+        private readonly IAvaloniaRemoteTransport _transport;
+        private LockedFramebuffer _framebuffer;
+        private object _lock = new object();
+        private long _lastSentFrame;
+        private long _lastReceivedFrame = -1;
+        private bool _invalidated;
+        private ProtocolPixelFormat[] _supportedFormats;
+
+        public RemoteServerTopLevelImpl(IAvaloniaRemoteTransport transport)
+        {
+            _transport = transport;
+            _transport.OnMessage += OnMessage;
+        }
+
+        private void OnMessage(object obj)
+        {
+            lock (_lock)
+            {
+                var lastFrame = obj as FrameReceivedMessage;
+                if (lastFrame != null)
+                {
+                    lock (_lock)
+                    {
+                        _lastReceivedFrame = lastFrame.SequenceId;
+                    }
+                    Dispatcher.UIThread.InvokeAsync(CheckNeedsRender);
+                }
+                var supportedFormats = obj as ClientSupportedPixelFormatsMessage;
+                if (supportedFormats != null)
+                    _supportedFormats = supportedFormats.Formats;
+            }
+        }
+
+        public override IEnumerable<object> Surfaces => new[] { this };
+        
+        FrameMessage RenderFrame(int width, int height, Size dpi, ProtocolPixelFormat? format)
+        {
+            var fmt = format ?? ProtocolPixelFormat.Rgba8888;
+            var bpp = fmt == ProtocolPixelFormat.Rgb565 ? 2 : 4;
+            var data = new byte[width * height * bpp];
+            var handle = GCHandle.Alloc(data, GCHandleType.Pinned);
+            try
+            {
+                _framebuffer = new LockedFramebuffer(handle.AddrOfPinnedObject(), width, height, width * bpp, dpi, (PixelFormat)fmt,
+                    null);
+                Paint?.Invoke(new Rect(0, 0, width, height));
+            }
+            finally
+            {
+                _framebuffer = null;
+                handle.Free();
+            }
+            return new FrameMessage();
+        }
+
+        public ILockedFramebuffer Lock()
+        {
+            if (_framebuffer == null)
+                throw new InvalidOperationException("Paint was not requested, wait for Paint event");
+            return _framebuffer;
+        }
+
+        void CheckNeedsRender()
+        {
+            ProtocolPixelFormat[] formats;
+            lock (_lock)
+            {
+                if (_lastReceivedFrame != _lastSentFrame && !_invalidated)
+                    return;
+                formats = _supportedFormats;
+            }
+            
+            //var frame = RenderFrame()
+        }
+
+        public override void Invalidate(Rect rect)
+        {
+            _invalidated = true;
+            Dispatcher.UIThread.InvokeAsync(CheckNeedsRender);
+        }
+    }
+}
diff --git a/src/Avalonia.Input/Key.cs b/src/Avalonia.Input/Key.cs
index 3ea506d79e..c10cbc0a6c 100644
--- a/src/Avalonia.Input/Key.cs
+++ b/src/Avalonia.Input/Key.cs
@@ -1,7 +1,10 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+#if AVALONIA_REMOTE_PROTOCOL
+namespace Avalonia.Remote.Protocol.Input
+#else
 namespace Avalonia.Input
+#endif
 {
     /// <summary>
     /// Defines the keys available on a keyboard.
diff --git a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
new file mode 100644
index 0000000000..1ac7ab3a8b
--- /dev/null
+++ b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>netstandard1.3</TargetFramework>
+        <DefineConstants>AVALONIA_REMOTE_PROTOCOL;$(DefineConstants)</DefineConstants>
+    </PropertyGroup>
+    <ItemGroup>
+        <Compile Include="..\Avalonia.Input\Key.cs" />
+    </ItemGroup>
+</Project>
diff --git a/src/Avalonia.Remote.Protocol/AvaloniaRemoteMessageGuidAttribute.cs b/src/Avalonia.Remote.Protocol/AvaloniaRemoteMessageGuidAttribute.cs
new file mode 100644
index 0000000000..12ee3178d3
--- /dev/null
+++ b/src/Avalonia.Remote.Protocol/AvaloniaRemoteMessageGuidAttribute.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Avalonia.Remote.Protocol
+{
+    [AttributeUsage(AttributeTargets.Class)]
+    public class AvaloniaRemoteMessageGuidAttribute : Attribute
+    {
+        public Guid Guid { get; }
+
+        public AvaloniaRemoteMessageGuidAttribute(string guid)
+        {
+            Guid = Guid.Parse(guid);
+        }
+    }
+}
diff --git a/src/Avalonia.Remote.Protocol/DefaultMessageTypeResolver.cs b/src/Avalonia.Remote.Protocol/DefaultMessageTypeResolver.cs
new file mode 100644
index 0000000000..9d44f33627
--- /dev/null
+++ b/src/Avalonia.Remote.Protocol/DefaultMessageTypeResolver.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Avalonia.Remote.Protocol
+{
+    public class DefaultMessageTypeResolver : IMessageTypeResolver
+    {
+        private readonly Dictionary<Guid, Type> _guidsToTypes = new Dictionary<Guid, Type>();
+        private readonly Dictionary<Type, Guid> _typesToGuids = new Dictionary<Type, Guid>();
+        public DefaultMessageTypeResolver(params Assembly[] assemblies)
+        {
+            foreach (var asm in
+                (assemblies ?? new Assembly[0]).Concat(new[]
+                    {typeof(AvaloniaRemoteMessageGuidAttribute).GetTypeInfo().Assembly}))
+            {
+                foreach (var t in asm.ExportedTypes)
+                {
+                    var attr = t.GetTypeInfo().GetCustomAttribute<AvaloniaRemoteMessageGuidAttribute>();
+                    if (attr != null)
+                    {
+                        _guidsToTypes[attr.Guid] = t;
+                        _typesToGuids[t] = attr.Guid;
+                    }
+                }
+            }
+        }
+
+        public Type GetByGuid(Guid id) => _guidsToTypes[id];
+        public Guid GetGuid(Type type) => _typesToGuids[type];
+    }
+}
diff --git a/src/Avalonia.Remote.Protocol/IMessageTypeResolver.cs b/src/Avalonia.Remote.Protocol/IMessageTypeResolver.cs
new file mode 100644
index 0000000000..2e2234b0d6
--- /dev/null
+++ b/src/Avalonia.Remote.Protocol/IMessageTypeResolver.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Avalonia.Remote.Protocol
+{
+    public interface IMessageTypeResolver
+    {
+        Type GetByGuid(Guid id);
+        Guid GetGuid(Type type);
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Remote.Protocol/ITransport.cs b/src/Avalonia.Remote.Protocol/ITransport.cs
new file mode 100644
index 0000000000..e90a49ac71
--- /dev/null
+++ b/src/Avalonia.Remote.Protocol/ITransport.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Avalonia.Remote.Protocol
+{
+    public interface IAvaloniaRemoteTransport
+    {
+        Task Send(object data);
+        event Action<object> OnMessage;
+        event Action<Exception> OnException;
+    }
+}
diff --git a/src/Avalonia.Remote.Protocol/InputMessages.cs b/src/Avalonia.Remote.Protocol/InputMessages.cs
new file mode 100644
index 0000000000..f1996372fc
--- /dev/null
+++ b/src/Avalonia.Remote.Protocol/InputMessages.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+/*
+ We are keeping copies of core events here, so they can be used 
+ without referencing Avalonia itself, e. g. from projects that
+ are using WPF, GTK#, etc
+ */
+namespace Avalonia.Remote.Protocol.Input
+{
+    /// <summary>
+    /// Keep this in sync with InputModifiers in the main library
+    /// </summary>
+    [Flags]
+    public enum InputModifiers
+    {
+        Alt,
+        Control,
+        Shift,
+        Windows,
+        LeftMouseButton,
+        RightMouseButton,
+        MiddleMouseButton
+    }
+
+    /// <summary>
+    /// Keep this in sync with InputModifiers in the main library
+    /// </summary>
+    public enum MouseButton
+    {
+        None,
+        Left,
+        Right,
+        Middle
+    }
+
+    public abstract class InputEventMessageBase
+    {
+        public InputModifiers[] Modifiers { get; set; }
+    }
+
+    public abstract class PointerEventMessageBase : InputEventMessageBase
+    {
+        public double X { get; set; }
+        public double Y { get; set; }
+    }
+
+    [AvaloniaRemoteMessageGuid("6228F0B9-99F2-4F62-A621-414DA2881648")]
+    public class PointerMovedEventMessage : PointerEventMessageBase
+    {
+        
+    }
+
+    [AvaloniaRemoteMessageGuid("7E9E2818-F93F-411A-800E-6B1AEB11DA46")]
+    public class PointerPressedEventMessage : PointerEventMessageBase
+    {
+        public MouseButton Button { get; set; }
+    }
+    
+    [AvaloniaRemoteMessageGuid("4ADC84EE-E7C8-4BCF-986C-DE3A2F78EDE4")]
+    public class PointerReleasedEventMessage : PointerEventMessageBase
+    {
+        public MouseButton Button { get; set; }
+    }
+
+    [AvaloniaRemoteMessageGuid("79301A05-F02D-4B90-BB39-472563B504AE")]
+    public class ScrollEventMessage : PointerEventMessageBase
+    {
+        public double DeltaX { get; set; }
+        public double DeltaY { get; set; }
+    }
+
+    [AvaloniaRemoteMessageGuid("1C3B691E-3D54-4237-BFB0-9FEA83BC1DB8")]
+    public class KeyEventMessage : InputEventMessageBase
+    {
+        public bool IsDown { get; set; }
+        public Key Key { get; set; }
+    }
+
+}
diff --git a/src/Avalonia.Remote.Protocol/ViewportMessages.cs b/src/Avalonia.Remote.Protocol/ViewportMessages.cs
new file mode 100644
index 0000000000..8e1b0bd99e
--- /dev/null
+++ b/src/Avalonia.Remote.Protocol/ViewportMessages.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Avalonia.Remote.Protocol.Viewport
+{
+    public enum PixelFormat
+    {
+        Rgb565,
+        Rgba8888,
+        Bgra8888
+    }
+
+    [AvaloniaRemoteMessageGuid("6E3C5310-E2B1-4C3D-8688-01183AA48C5B")]
+    public class MeasureViewportMessage
+    {
+        public double Width { get; set; }
+        public double Height { get; set; }
+    }
+
+    [AvaloniaRemoteMessageGuid("BD7A8DE6-3DB8-4A13-8583-D6D4AB189A31")]
+    public class ClientViewportAllocatedMessage
+    {
+        public double Width { get; set; }
+        public double Height { get; set; }
+    }
+
+    [AvaloniaRemoteMessageGuid("63481025-7016-43FE-BADC-F2FD0F88609E")]
+    public class ClientSupportedPixelFormatsMessage
+    {
+        public PixelFormat[] Formats { get; set; }
+    }
+
+    [AvaloniaRemoteMessageGuid("68014F8A-289D-4851-8D34-5367EDA7F827")]
+    public class FrameReceivedMessage
+    {
+        public long SequenceId { get; set; }
+    }
+
+
+    [AvaloniaRemoteMessageGuid("F58313EE-FE69-4536-819D-F52EDF201A0E")]
+    public class FrameMessage
+    {
+        public long SequenceId { get; set; }
+        public PixelFormat Format { get; set; }
+        public byte[] Data { get; set; }
+        public int Width { get; set; }
+        public int Height { get; set; }
+        public int Stride { get; set; }
+    }
+
+}
diff --git a/src/Avalonia.Visuals/Platform/LockedFramebuffer.cs b/src/Avalonia.Visuals/Platform/LockedFramebuffer.cs
new file mode 100644
index 0000000000..c03b714956
--- /dev/null
+++ b/src/Avalonia.Visuals/Platform/LockedFramebuffer.cs
@@ -0,0 +1,33 @@
+using System;
+
+namespace Avalonia.Platform
+{
+    public class LockedFramebuffer : ILockedFramebuffer
+    {
+        private readonly Action _onDispose;
+
+        public LockedFramebuffer(IntPtr address, int width, int height, int rowBytes, Vector dpi, PixelFormat format,
+            Action onDispose)
+        {
+            _onDispose = onDispose;
+            Address = address;
+            Width = width;
+            Height = height;
+            RowBytes = rowBytes;
+            Dpi = dpi;
+            Format = format;
+        }
+
+        public IntPtr Address { get; }
+        public int Width { get; }
+        public int Height { get; }
+        public int RowBytes { get; }
+        public Vector Dpi { get; }
+        public PixelFormat Format { get; }
+
+        public void Dispose()
+        {
+            _onDispose?.Invoke();
+        }
+    }
+}
\ No newline at end of file

From fe6e8a4d2b9f076d463b87d38e5f1451f83cb194 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sat, 19 Aug 2017 10:53:29 +0300
Subject: [PATCH 011/482] [GTK3] Use lower priority for timers created by
 Signal()

---
 src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs        | 2 +-
 src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs | 6 ++++++
 src/Gtk/Avalonia.Gtk3/Interop/Native.cs      | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs b/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
index 4ea1a5af56..474f29733e 100644
--- a/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
+++ b/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
@@ -77,7 +77,7 @@ namespace Avalonia.Gtk3
                 if (!_signaled)
                 {
                     _signaled = true;
-                    GlibTimeout.Add(0, () =>
+                    GlibTimeout.Add(100, 0, () =>
                     {
                         lock (_lock)
                         {
diff --git a/src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs b/src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs
index 9971d8881d..1936d40086 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs
+++ b/src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs
@@ -35,6 +35,12 @@ namespace Avalonia.Gtk3.Interop
             var handle = GCHandle.Alloc(callback);
             Native.GTimeoutAdd(interval, PinnedHandler, GCHandle.ToIntPtr(handle));
         }
+        
+        public static void Add(int priority, uint interval, Func<bool> callback)
+        {
+            var handle = GCHandle.Alloc(callback);
+            Native.GTimeoutAddFull(priority, interval, PinnedHandler, GCHandle.ToIntPtr(handle), IntPtr.Zero);
+        }
 
         class Timer : IDisposable
         {
diff --git a/src/Gtk/Avalonia.Gtk3/Interop/Native.cs b/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
index fb1a9955e3..5ccdf3424c 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
+++ b/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
@@ -241,6 +241,8 @@ namespace Avalonia.Gtk3.Interop
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Glib)]
             public delegate ulong g_timeout_add(uint interval, timeout_callback callback, IntPtr data);
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Glib)]
+            public delegate ulong g_timeout_add_full(int prio, uint interval, timeout_callback callback, IntPtr data, IntPtr destroy);
+            [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Glib)]
             public delegate ulong g_free(IntPtr data);
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Glib)]
             public unsafe delegate void g_slist_free(GSList* data);
@@ -302,6 +304,7 @@ namespace Avalonia.Gtk3.Interop
         public static D.g_signal_connect_object GSignalConnectObject;
         public static D.g_signal_handler_disconnect GSignalHandlerDisconnect;
         public static D.g_timeout_add GTimeoutAdd;
+        public static D.g_timeout_add_full GTimeoutAddFull;
         public static D.g_free GFree;
         public static D.g_slist_free GSlistFree;
         public static D.g_memory_input_stream_new_from_data GMemoryInputStreamNewFromData;

From d384a7f61a20a55f31c0766af173fc0a15c6fa12 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sat, 19 Aug 2017 10:54:27 +0300
Subject: [PATCH 012/482] Added .idea/* to .gitignore

---
 .gitignore                                                 | 1 +
 src/Avalonia.Remote.Protocol/BsonStreamTransport.cs        | 7 +++++++
 src/Avalonia.Remote.Protocol/TransportConnectionWrapper.cs | 7 +++++++
 3 files changed, 15 insertions(+)
 create mode 100644 src/Avalonia.Remote.Protocol/BsonStreamTransport.cs
 create mode 100644 src/Avalonia.Remote.Protocol/TransportConnectionWrapper.cs

diff --git a/.gitignore b/.gitignore
index 640725fa26..dc3de9e54c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -169,3 +169,4 @@ artifacts/
 nuget
 Avalonia.XBuild.sln
 project.lock.json
+.idea/*
diff --git a/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs b/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs
new file mode 100644
index 0000000000..b16966ffd7
--- /dev/null
+++ b/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs
@@ -0,0 +1,7 @@
+namespace Avalonia.Remote.Protocol
+{
+    public class BsonStreamTransport
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Remote.Protocol/TransportConnectionWrapper.cs b/src/Avalonia.Remote.Protocol/TransportConnectionWrapper.cs
new file mode 100644
index 0000000000..a1f1df2a2d
--- /dev/null
+++ b/src/Avalonia.Remote.Protocol/TransportConnectionWrapper.cs
@@ -0,0 +1,7 @@
+namespace Avalonia.Remote.Protocol
+{
+    public class TransportConnectionWrapper
+    {
+        
+    }
+}
\ No newline at end of file

From 646db5b91472e40b405728396c2d68e4d118a9e2 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sat, 19 Aug 2017 10:55:51 +0300
Subject: [PATCH 013/482] Initial working version of remoting

---
 samples/ControlCatalog/MainWindow.xaml.cs     |   3 +-
 samples/RemoteTest/Program.cs                 |  43 ++++-
 samples/RemoteTest/RemoteTest.csproj          |   2 +-
 src/Avalonia.Base/AvaloniaObject.cs           |   1 +
 .../Offscreen/OffscreenTopLevelImpl.cs        |  13 +-
 src/Avalonia.Controls/Remote/RemoteServer.cs  |  26 ++-
 src/Avalonia.Controls/Remote/RemoteWidget.cs  |  79 +++++++++
 .../Remote/Server/RemoteServerTopLevelImpl.cs | 107 +++++++++---
 .../Avalonia.Remote.Protocol.csproj           |  19 ++-
 .../BsonStreamTransport.cs                    | 157 +++++++++++++++++-
 .../BsonTcpTransport.cs                       |  27 +++
 src/Avalonia.Remote.Protocol/EventStash.cs    |  72 ++++++++
 src/Avalonia.Remote.Protocol/ITransport.cs    |   2 +-
 .../TcpTransportBase.cs                       |  84 ++++++++++
 .../TransportConnectionWrapper.cs             |  98 ++++++++++-
 .../ViewportMessages.cs                       |   5 +-
 16 files changed, 691 insertions(+), 47 deletions(-)
 create mode 100644 src/Avalonia.Controls/Remote/RemoteWidget.cs
 create mode 100644 src/Avalonia.Remote.Protocol/BsonTcpTransport.cs
 create mode 100644 src/Avalonia.Remote.Protocol/EventStash.cs
 create mode 100644 src/Avalonia.Remote.Protocol/TcpTransportBase.cs

diff --git a/samples/ControlCatalog/MainWindow.xaml.cs b/samples/ControlCatalog/MainWindow.xaml.cs
index 413794dfa2..c7ff0a60df 100644
--- a/samples/ControlCatalog/MainWindow.xaml.cs
+++ b/samples/ControlCatalog/MainWindow.xaml.cs
@@ -6,11 +6,12 @@ namespace ControlCatalog
 {
     public class MainWindow : Window
     {
+        public static bool DebugMode = false;
         public MainWindow()
         {
             this.InitializeComponent();
             this.AttachDevTools();
-            Renderer.DrawDirtyRects = Renderer.DrawFps = true;
+            Renderer.DrawDirtyRects = Renderer.DrawFps = DebugMode;
         }
 
         private void InitializeComponent()
diff --git a/samples/RemoteTest/Program.cs b/samples/RemoteTest/Program.cs
index eb5f388e9e..dce168c7ea 100644
--- a/samples/RemoteTest/Program.cs
+++ b/samples/RemoteTest/Program.cs
@@ -1,4 +1,13 @@
 using System;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Remote;
+using Avalonia.Remote.Protocol;
+using Avalonia.Threading;
+using ControlCatalog;
 
 namespace RemoteTest
 {
@@ -6,7 +15,39 @@ namespace RemoteTest
     {
         static void Main(string[] args)
         {
-            Console.WriteLine("Hello World!");
+            AppBuilder.Configure<App>().UsePlatformDetect().SetupWithoutStarting();
+
+            var l = new TcpListener(IPAddress.Loopback, 0);
+            l.Start();
+            var port = ((IPEndPoint) l.LocalEndpoint).Port;
+            l.Stop();
+            
+            var transport = new BsonTcpTransport();
+            transport.Listen(IPAddress.Loopback, port, sc =>
+            {
+                Dispatcher.UIThread.InvokeAsync(() =>
+                {
+                    new RemoteServer(sc).Content = new MainView();
+                });
+            });
+
+            var cts = new CancellationTokenSource();
+            transport.Connect(IPAddress.Loopback, port).ContinueWith(t =>
+            {
+                Dispatcher.UIThread.InvokeAsync(() =>
+                {
+                    var window = new Window()
+                    {
+                        Content = new RemoteWidget(t.Result)
+                    };
+                    window.Closed += delegate { cts.Cancel(); };
+                    window.Show();
+                });
+            });
+            Dispatcher.UIThread.MainLoop(cts.Token);
+
+
+
         }
     }
 }
diff --git a/samples/RemoteTest/RemoteTest.csproj b/samples/RemoteTest/RemoteTest.csproj
index 2487c66e41..8682916503 100644
--- a/samples/RemoteTest/RemoteTest.csproj
+++ b/samples/RemoteTest/RemoteTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 1bdf1eb5e3..f94b6519d5 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -56,6 +56,7 @@ namespace Avalonia
         /// </summary>
         public AvaloniaObject()
         {
+            CheckAccess();
             foreach (var property in AvaloniaPropertyRegistry.Instance.GetRegistered(this))
             {
                 object value = property.IsDirect ?
diff --git a/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs
index 088f20b270..c986c5d07c 100644
--- a/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs
+++ b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs
@@ -6,12 +6,13 @@ using System.Threading.Tasks;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Platform;
+using Avalonia.Rendering;
 
 namespace Avalonia.Controls.Embedding.Offscreen
 {
-    abstract class OffscreenTopLevelImplBase : ITopLevelImpl
+    public abstract class OffscreenTopLevelImplBase : ITopLevelImpl
     {
-        private double _scaling;
+        private double _scaling = 1;
         private Size _clientSize;
         public IInputRoot InputRoot { get; private set; }
 
@@ -20,6 +21,8 @@ namespace Avalonia.Controls.Embedding.Offscreen
             //No-op
         }
 
+        public IRenderer CreateRenderer(IRenderRoot root) => new ImmediateRenderer(root);
+
         public abstract void Invalidate(Rect rect);
         public abstract IEnumerable<object> Surfaces { get; }
 
@@ -51,15 +54,13 @@ namespace Avalonia.Controls.Embedding.Offscreen
 
         public virtual Point PointToClient(Point point) => point;
 
-        public Point PointToScreen(Point point)
-        {
-            throw new NotImplementedException();
-        }
+        public virtual Point PointToScreen(Point point) => point;
 
         public virtual void SetCursor(IPlatformHandle cursor)
         {
         }
 
         public Action Closed { get; set; }
+        public abstract IMouseDevice MouseDevice { get; }
     }
 }
diff --git a/src/Avalonia.Controls/Remote/RemoteServer.cs b/src/Avalonia.Controls/Remote/RemoteServer.cs
index 8c0509c5ba..0bc43069e7 100644
--- a/src/Avalonia.Controls/Remote/RemoteServer.cs
+++ b/src/Avalonia.Controls/Remote/RemoteServer.cs
@@ -3,19 +3,37 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Avalonia.Controls.Embedding;
+using Avalonia.Controls.Remote.Server;
+using Avalonia.Platform;
 using Avalonia.Remote.Protocol;
 
 namespace Avalonia.Controls.Remote
 {
     public class RemoteServer
     {
-        private readonly IAvaloniaRemoteTransport _transport;
+        private EmbeddableControlRoot _topLevel;
 
-        public RemoteServer(IAvaloniaRemoteTransport transport)
+        class TopLevelImpl : RemoteServerTopLevelImpl, IEmbeddableWindowImpl
         {
-            _transport = transport;
+            public TopLevelImpl(IAvaloniaRemoteTransportConnection transport) : base(transport)
+            {
+            }
+
+            public event Action LostFocus;
+        }
+        
+        public RemoteServer(IAvaloniaRemoteTransportConnection transport)
+        {
+            _topLevel = new EmbeddableControlRoot(new TopLevelImpl(transport));
+            _topLevel.Prepare();
+            //TODO: Somehow react on closed connection?
         }
 
-        public object Content { get; set; }
+        public object Content
+        {
+            get => _topLevel.Content;
+            set => _topLevel.Content = value;
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Remote/RemoteWidget.cs b/src/Avalonia.Controls/Remote/RemoteWidget.cs
new file mode 100644
index 0000000000..f4bcb37d48
--- /dev/null
+++ b/src/Avalonia.Controls/Remote/RemoteWidget.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Runtime.InteropServices;
+using Avalonia.Input;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Remote.Protocol;
+using Avalonia.Remote.Protocol.Viewport;
+using Avalonia.Threading;
+using PixelFormat = Avalonia.Platform.PixelFormat;
+
+namespace Avalonia.Controls.Remote
+{
+    public class RemoteWidget : Control
+    {
+        private readonly IAvaloniaRemoteTransportConnection _connection;
+        private FrameMessage _lastFrame;
+        private WritableBitmap _bitmap;
+        public RemoteWidget(IAvaloniaRemoteTransportConnection connection)
+        {
+            _connection = connection;
+            _connection.OnMessage += msg => Dispatcher.UIThread.InvokeAsync(() => OnMessage(msg));
+            _connection.Send(new ClientSupportedPixelFormatsMessage
+            {
+                Formats = new[]
+                {
+                    Avalonia.Remote.Protocol.Viewport.PixelFormat.Bgra8888,
+                    Avalonia.Remote.Protocol.Viewport.PixelFormat.Rgba8888,
+                }
+            });
+        }
+
+        private void OnMessage(object msg)
+        {
+            if (msg is FrameMessage frame)
+            {
+                _connection.Send(new FrameReceivedMessage
+                {
+                    SequenceId = frame.SequenceId
+                });
+                _lastFrame = frame;
+                InvalidateVisual();
+            }
+            
+        }
+
+        protected override void ArrangeCore(Rect finalRect)
+        {
+            _connection.Send(new ClientViewportAllocatedMessage
+            {
+                Width = finalRect.Width,
+                Height = finalRect.Height,
+                DpiX = 96,
+                DpiY = 96 //TODO: Somehow detect the actual DPI
+            });
+            base.ArrangeCore(finalRect);
+        }
+
+        public override void Render(DrawingContext context)
+        {
+            if (_lastFrame != null)
+            {
+                var fmt = (PixelFormat) _lastFrame.Format;
+                if (_bitmap == null || _bitmap.PixelWidth != _lastFrame.Width ||
+                    _bitmap.PixelHeight != _lastFrame.Height)
+                    _bitmap = new WritableBitmap(_lastFrame.Width, _lastFrame.Height, fmt);
+                using (var l = _bitmap.Lock())
+                {
+                    var lineLen = (fmt == PixelFormat.Rgb565 ? 2 : 4) * _lastFrame.Width;
+                    for (var y = 0; y < _lastFrame.Height; y++)
+                        Marshal.Copy(_lastFrame.Data, y * _lastFrame.Stride,
+                            new IntPtr(l.Address.ToInt64() + l.RowBytes * y), lineLen);
+                }
+                context.DrawImage(_bitmap, 1, new Rect(0, 0, _bitmap.PixelWidth, _bitmap.PixelHeight),
+                    new Rect(Bounds.Size));
+            }
+            base.Render(context);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs b/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
index 6c89264c64..be97f7caaa 100644
--- a/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
+++ b/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
@@ -6,6 +6,8 @@ using System.Text;
 using System.Threading.Tasks;
 using Avalonia.Controls.Embedding.Offscreen;
 using Avalonia.Controls.Platform.Surfaces;
+using Avalonia.Input;
+using Avalonia.Layout;
 using Avalonia.Platform;
 using Avalonia.Remote.Protocol;
 using Avalonia.Remote.Protocol.Viewport;
@@ -15,17 +17,20 @@ using ProtocolPixelFormat = Avalonia.Remote.Protocol.Viewport.PixelFormat;
 
 namespace Avalonia.Controls.Remote.Server
 {
-    class RemoteServerTopLevelImpl : OffscreenTopLevelImplBase, IFramebufferPlatformSurface
+    public class RemoteServerTopLevelImpl : OffscreenTopLevelImplBase, IFramebufferPlatformSurface
     {
-        private readonly IAvaloniaRemoteTransport _transport;
+        private readonly IAvaloniaRemoteTransportConnection _transport;
         private LockedFramebuffer _framebuffer;
         private object _lock = new object();
-        private long _lastSentFrame;
+        private long _lastSentFrame = -1;
         private long _lastReceivedFrame = -1;
+        private long _nextFrameNumber = 1;
+        private ClientViewportAllocatedMessage _pendingAllocation;
         private bool _invalidated;
+        private Vector _dpi = new Vector(96, 96);
         private ProtocolPixelFormat[] _supportedFormats;
 
-        public RemoteServerTopLevelImpl(IAvaloniaRemoteTransport transport)
+        public RemoteServerTopLevelImpl(IAvaloniaRemoteTransportConnection transport)
         {
             _transport = transport;
             _transport.OnMessage += OnMessage;
@@ -35,24 +40,64 @@ namespace Avalonia.Controls.Remote.Server
         {
             lock (_lock)
             {
-                var lastFrame = obj as FrameReceivedMessage;
-                if (lastFrame != null)
+                if (obj is FrameReceivedMessage lastFrame)
                 {
                     lock (_lock)
                     {
                         _lastReceivedFrame = lastFrame.SequenceId;
                     }
-                    Dispatcher.UIThread.InvokeAsync(CheckNeedsRender);
+                    Dispatcher.UIThread.InvokeAsync(RenderIfNeeded);
+                }
+                if (obj is ClientSupportedPixelFormatsMessage supportedFormats)
+                {
+                    lock (_lock)
+                        _supportedFormats = supportedFormats.Formats;
+                    Dispatcher.UIThread.InvokeAsync(RenderIfNeeded);
+                }
+                if (obj is MeasureViewportMessage measure)
+                    Dispatcher.UIThread.InvokeAsync(() =>
+                    {
+                        var m = Measure(new Size(measure.Width, measure.Height));
+                        _transport.Send(new MeasureViewportMessage
+                        {
+                            Width = m.Width,
+                            Height = m.Height
+                        });
+                    });
+                if (obj is ClientViewportAllocatedMessage allocated)
+                {
+                    lock (_lock)
+                    {
+                        if (_pendingAllocation == null)
+                            Dispatcher.UIThread.InvokeAsync(() =>
+                            {
+                                ClientViewportAllocatedMessage allocation;
+                                lock (_lock)
+                                {
+                                    allocation = _pendingAllocation;
+                                    _pendingAllocation = null;
+                                }
+                                _dpi = new Vector(allocation.DpiX, allocation.DpiY);
+                                ClientSize = new Size(allocation.Width, allocation.Height);
+                                RenderIfNeeded();
+                            });
+
+                        _pendingAllocation = allocated;
+                    }
                 }
-                var supportedFormats = obj as ClientSupportedPixelFormatsMessage;
-                if (supportedFormats != null)
-                    _supportedFormats = supportedFormats.Formats;
             }
         }
 
+        protected virtual Size Measure(Size constaint)
+        {
+            var l = (ILayoutable) InputRoot;
+            l.Measure(constaint);
+            return l.DesiredSize;
+        }
+
         public override IEnumerable<object> Surfaces => new[] { this };
         
-        FrameMessage RenderFrame(int width, int height, Size dpi, ProtocolPixelFormat? format)
+        FrameMessage RenderFrame(int width, int height, ProtocolPixelFormat? format)
         {
             var fmt = format ?? ProtocolPixelFormat.Rgba8888;
             var bpp = fmt == ProtocolPixelFormat.Rgb565 ? 2 : 4;
@@ -60,7 +105,7 @@ namespace Avalonia.Controls.Remote.Server
             var handle = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                _framebuffer = new LockedFramebuffer(handle.AddrOfPinnedObject(), width, height, width * bpp, dpi, (PixelFormat)fmt,
+                _framebuffer = new LockedFramebuffer(handle.AddrOfPinnedObject(), width, height, width * bpp, _dpi, (PixelFormat)fmt,
                     null);
                 Paint?.Invoke(new Rect(0, 0, width, height));
             }
@@ -69,7 +114,14 @@ namespace Avalonia.Controls.Remote.Server
                 _framebuffer = null;
                 handle.Free();
             }
-            return new FrameMessage();
+            return new FrameMessage
+            {
+                Data = data,
+                Format = (ProtocolPixelFormat) format,
+                Width = width,
+                Height = height,
+                Stride = width * bpp,
+            };
         }
 
         public ILockedFramebuffer Lock()
@@ -79,23 +131,40 @@ namespace Avalonia.Controls.Remote.Server
             return _framebuffer;
         }
 
-        void CheckNeedsRender()
+        void RenderIfNeeded()
         {
-            ProtocolPixelFormat[] formats;
             lock (_lock)
             {
-                if (_lastReceivedFrame != _lastSentFrame && !_invalidated)
+                if (_lastReceivedFrame != _lastSentFrame || !_invalidated || _supportedFormats == null)
                     return;
-                formats = _supportedFormats;
+
             }
+            if (ClientSize.Width < 1 || ClientSize.Height < 1)
+                return;
+            var format = ProtocolPixelFormat.Rgba8888;
+            foreach(var fmt in _supportedFormats)
+                if (fmt <= ProtocolPixelFormat.MaxValue)
+                {
+                    format = fmt;
+                    break;
+                }
             
-            //var frame = RenderFrame()
+            var frame = RenderFrame((int) ClientSize.Width, (int) ClientSize.Height, format);
+            lock (_lock)
+            {
+                _lastSentFrame = _nextFrameNumber++;
+                frame.SequenceId = _lastSentFrame;
+                _invalidated = false;
+            }
+            _transport.Send(frame);
         }
 
         public override void Invalidate(Rect rect)
         {
             _invalidated = true;
-            Dispatcher.UIThread.InvokeAsync(CheckNeedsRender);
+            Dispatcher.UIThread.InvokeAsync(RenderIfNeeded);
         }
+
+        public override IMouseDevice MouseDevice { get; } = new MouseDevice();
     }
 }
diff --git a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
index 1ac7ab3a8b..a9c6b9e9a0 100644
--- a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
+++ b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>netstandard1.3</TargetFramework>
-        <DefineConstants>AVALONIA_REMOTE_PROTOCOL;$(DefineConstants)</DefineConstants>
-    </PropertyGroup>
-    <ItemGroup>
-        <Compile Include="..\Avalonia.Input\Key.cs" />
-    </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard1.3</TargetFramework>
+    <DefineConstants>AVALONIA_REMOTE_PROTOCOL;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <Compile Include="..\Avalonia.Input\Key.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs b/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs
index b16966ffd7..8c983c385d 100644
--- a/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs
+++ b/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs
@@ -1,7 +1,160 @@
-namespace Avalonia.Remote.Protocol
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using Newtonsoft.Json;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Bson;
+
+namespace Avalonia.Remote.Protocol
 {
-    public class BsonStreamTransport
+    public class BsonStreamTransportConnection : IAvaloniaRemoteTransportConnection
     {
+        private readonly IMessageTypeResolver _resolver;
+        private readonly Stream _inputStream;
+        private readonly Stream _outputStream;
+        private readonly Action _disposeCallback;
+        private readonly CancellationToken _cancel;
+        private readonly CancellationTokenSource _cancelSource;
+        private readonly MemoryStream _outputBlock = new MemoryStream();
+        private readonly object _lock = new object();
+        private bool _writeOperationPending;
+        private bool _readingAlreadyStarted;
+        private bool _writerIsBroken;
+        static readonly JsonSerializer Serializer = new JsonSerializer();        
+        private static readonly byte[] ZeroLength = new byte[4];
+
+        public BsonStreamTransportConnection(IMessageTypeResolver resolver, Stream inputStream, Stream outputStream, Action disposeCallback)
+        {
+            _resolver = resolver;
+            _inputStream = inputStream;
+            _outputStream = outputStream;
+            _disposeCallback = disposeCallback;
+            _cancelSource = new CancellationTokenSource();
+            _cancel = _cancelSource.Token;
+        }
+
+        public void Dispose()
+        {
+            _cancelSource.Cancel();
+            _disposeCallback?.Invoke();
+        }
         
+        public void StartReading()
+        {
+            lock (_lock)
+            {
+                if(_readingAlreadyStarted)
+                    throw new InvalidOperationException("Reading has already started");
+                _readingAlreadyStarted = true;
+                Task.Run(Reader, _cancel);
+            }
+        }
+
+        async Task ReadExact(byte[] buffer)
+        {
+            int read = 0;
+            while (read != buffer.Length)
+            {
+                var readNow = await _inputStream.ReadAsync(buffer, read, buffer.Length - read, _cancel)
+                    .ConfigureAwait(false);
+                if (readNow == 0)
+                    throw new EndOfStreamException();
+                read += readNow;
+            }
+        }
+
+        async Task Reader()
+        {
+            Task.Yield();
+            try
+            {
+                while (true)
+                {
+                    var infoBlock = new byte[20];
+                    await ReadExact(infoBlock).ConfigureAwait(false);
+                    var length = BitConverter.ToInt32(infoBlock, 0);
+                    var guidBytes = new byte[16];
+                    Buffer.BlockCopy(infoBlock, 4, guidBytes, 0, 16);
+                    var guid = new Guid(guidBytes);
+                    var buffer = new byte[length];
+                    await ReadExact(buffer).ConfigureAwait(false);
+                    if (Environment.GetEnvironmentVariable("WTF") == "WTF")
+                    {
+
+                        using (var f = System.IO.File.Create("/tmp/wtf2.bin"))
+                        {
+                            f.Write(infoBlock, 0, infoBlock.Length);
+                            f.Write(buffer, 0, buffer.Length);
+                        }
+                    }
+                    var message = Serializer.Deserialize(new BsonReader(new MemoryStream(buffer)), _resolver.GetByGuid(guid));
+                    OnMessage?.Invoke(message);
+                }
+            }
+            catch (Exception e)
+            {
+                FireException(e);
+            }
+        }
+
+
+        public async Task Send(object data)
+        {
+            lock (_lock)
+            {
+                if(_writerIsBroken) //Ignore further calls, since there is no point of writing to "broken" stream
+                    return;
+                if (_writeOperationPending)
+                    throw new InvalidOperationException("Previous send operation was not finished");
+                _writeOperationPending = true;
+            }
+            try
+            {
+                var guid = _resolver.GetGuid(data.GetType()).ToByteArray();
+                _outputBlock.Seek(0, SeekOrigin.Begin);
+                _outputBlock.SetLength(0);
+                _outputBlock.Write(ZeroLength, 0, 4);
+                _outputBlock.Write(guid, 0, guid.Length);
+                var writer = new BsonWriter(_outputBlock);
+                Serializer.Serialize(writer, data);
+                _outputBlock.Seek(0, SeekOrigin.Begin);
+                var length = BitConverter.GetBytes((int)_outputBlock.Length - 20);
+                _outputBlock.Write(length, 0, length.Length);
+                _outputBlock.Seek(0, SeekOrigin.Begin);
+
+                try
+                {
+                    await _outputBlock.CopyToAsync(_outputStream, 0x1000, _cancel).ConfigureAwait(false);
+                }
+                catch (Exception e) //We are only catching "network"-related exceptions here
+                {
+                    lock (_lock)
+                    {
+                        _writerIsBroken = true;
+                    }
+                    FireException(e);
+                }
+            }
+            finally
+            {
+                lock (_lock)
+                {
+                    _writeOperationPending = false;
+                }
+            }
+        }
+
+        void FireException(Exception e)
+        {
+            var cancel = e as OperationCanceledException;
+            if (cancel?.CancellationToken == _cancel)
+                return;
+            OnException?.Invoke(e);
+        }
+
+
+        public event Action<object> OnMessage;
+        public event Action<Exception> OnException;
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Remote.Protocol/BsonTcpTransport.cs b/src/Avalonia.Remote.Protocol/BsonTcpTransport.cs
new file mode 100644
index 0000000000..e647f75997
--- /dev/null
+++ b/src/Avalonia.Remote.Protocol/BsonTcpTransport.cs
@@ -0,0 +1,27 @@
+using System;
+using System.IO;
+using System.Reflection;
+
+namespace Avalonia.Remote.Protocol
+{
+    public class BsonTcpTransport : TcpTransportBase
+    {
+        public BsonTcpTransport(IMessageTypeResolver resolver) : base(resolver)
+        {
+        }
+
+        public BsonTcpTransport() : this(new DefaultMessageTypeResolver(typeof(BsonTcpTransport).GetTypeInfo().Assembly))
+        {
+            
+        }
+
+        protected override IAvaloniaRemoteTransportConnection CreateTransport(IMessageTypeResolver resolver,
+            Stream stream, Action dispose)
+        {
+            var t = new BsonStreamTransportConnection(resolver, stream, stream, dispose);
+            var wrap = new TransportConnectionWrapper(t);
+            t.StartReading();
+            return wrap;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Remote.Protocol/EventStash.cs b/src/Avalonia.Remote.Protocol/EventStash.cs
new file mode 100644
index 0000000000..06840c8253
--- /dev/null
+++ b/src/Avalonia.Remote.Protocol/EventStash.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+
+namespace Avalonia.Remote.Protocol
+{
+    public class EventStash<T>
+    {
+        private readonly Action<Exception> _exceptionHandler;
+        private List<T> _stash;
+        private Action<T> _delegate;
+
+        public EventStash(Action<Exception> exceptionHandler = null)
+        {
+            _exceptionHandler = exceptionHandler;
+        }
+        
+        public void Add(Action<T> handler)
+        {
+            List<T> stash;
+            lock (this)
+            {
+                var needsReplay = _delegate == null;
+                _delegate += handler;
+                if(!needsReplay)
+                    return;
+
+                lock (this)
+                {
+                    stash = _stash;
+                    if(_stash == null)
+                        return;
+                    _stash = null;
+                }
+            }
+            foreach (var m in stash)
+            {
+                if (_exceptionHandler != null)
+                    try
+                    {
+                        _delegate?.Invoke(m);
+                    }
+                    catch (Exception e)
+                    {
+                        _exceptionHandler(e);
+                    }
+                else
+                    _delegate?.Invoke(m);
+            }
+        }
+        
+        
+        public void Remove(Action<T> handler)
+        {
+            lock (this)
+                _delegate -= handler;
+        }
+
+        public void Fire(T ev)
+        {
+            if (_delegate == null)
+            {
+                lock (this)
+                {
+                    _stash = _stash ?? new List<T>();
+                    _stash.Add(ev);
+                }
+            }
+            else
+                _delegate?.Invoke(ev);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Remote.Protocol/ITransport.cs b/src/Avalonia.Remote.Protocol/ITransport.cs
index e90a49ac71..d4e5427cb4 100644
--- a/src/Avalonia.Remote.Protocol/ITransport.cs
+++ b/src/Avalonia.Remote.Protocol/ITransport.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Avalonia.Remote.Protocol
 {
-    public interface IAvaloniaRemoteTransport
+    public interface IAvaloniaRemoteTransportConnection : IDisposable
     {
         Task Send(object data);
         event Action<object> OnMessage;
diff --git a/src/Avalonia.Remote.Protocol/TcpTransportBase.cs b/src/Avalonia.Remote.Protocol/TcpTransportBase.cs
new file mode 100644
index 0000000000..4278badaae
--- /dev/null
+++ b/src/Avalonia.Remote.Protocol/TcpTransportBase.cs
@@ -0,0 +1,84 @@
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading.Tasks;
+
+namespace Avalonia.Remote.Protocol
+{
+    public abstract class TcpTransportBase
+    {
+        private readonly IMessageTypeResolver _resolver;
+
+        public TcpTransportBase(IMessageTypeResolver resolver)
+        {
+            _resolver = resolver;
+        }
+        
+        protected abstract IAvaloniaRemoteTransportConnection CreateTransport(IMessageTypeResolver resolver,
+            Stream stream, Action disposeCallback);
+
+        class DisposableServer : IDisposable
+        {
+            private readonly TcpListener _l;
+
+            public DisposableServer(TcpListener l)
+            {
+                _l = l;
+            }
+            public void Dispose()
+            {
+                try
+                {
+                    _l.Stop();
+                }
+                catch
+                {
+                    //Ignore
+                }
+            }
+        }
+        
+        public IDisposable Listen(IPAddress address, int port, Action<IAvaloniaRemoteTransportConnection> cb)
+        {
+            var server = new TcpListener(address, port);
+            async void AcceptNew()
+            {
+                try
+                {
+                    var cl = await server.AcceptTcpClientAsync();
+                    AcceptNew();
+                    Task.Run(async () =>
+                    {
+                        try
+                        {
+                            var tcs = new TaskCompletionSource<int>();
+                            var t = CreateTransport(_resolver, cl.GetStream(), () => tcs.TrySetResult(0));
+                            cb(t);
+                            await tcs.Task;
+                        }
+                        finally
+                        {
+                            cl.Dispose();
+                        }
+
+                    });
+                }
+                catch
+                {
+                    //Ignore and stop
+                }
+            }
+            server.Start();
+            AcceptNew();
+            return new DisposableServer(server);
+        }
+
+        public async Task<IAvaloniaRemoteTransportConnection> Connect(IPAddress address, int port)
+        {
+            var c = new TcpClient();
+            await c.ConnectAsync(address, port);
+            return CreateTransport(_resolver, c.GetStream(), c.Dispose);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Remote.Protocol/TransportConnectionWrapper.cs b/src/Avalonia.Remote.Protocol/TransportConnectionWrapper.cs
index a1f1df2a2d..b01b6d7303 100644
--- a/src/Avalonia.Remote.Protocol/TransportConnectionWrapper.cs
+++ b/src/Avalonia.Remote.Protocol/TransportConnectionWrapper.cs
@@ -1,7 +1,101 @@
-namespace Avalonia.Remote.Protocol
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Avalonia.Remote.Protocol
 {
-    public class TransportConnectionWrapper
+    public class TransportConnectionWrapper : IAvaloniaRemoteTransportConnection
     {
+        private readonly IAvaloniaRemoteTransportConnection _conn;
+        private EventStash<object> _onMessage;
+        private EventStash<Exception> _onException = new EventStash<Exception>();
         
+        private Queue<SendOperation> _sendQueue = new Queue<SendOperation>();
+        private object _lock =new object();
+        private TaskCompletionSource<int> _signal;
+        private bool _workerIsAlive;
+        public TransportConnectionWrapper(IAvaloniaRemoteTransportConnection conn)
+        {
+            _conn = conn;
+            _onMessage = new EventStash<object>(_onException.Fire);
+            _conn.OnException +=_onException.Fire;
+            conn.OnMessage +=  _onMessage.Fire;
+
+        }
+
+        class SendOperation
+        {
+            public object Message { get; set; }
+            public TaskCompletionSource<int> Tcs { get; set; }
+        }
+        
+        public void Dispose() => _conn.Dispose();
+
+        async void Worker()
+        {
+            while (true)
+            {
+                SendOperation wi = null;
+                lock (_lock)
+                {
+                    if (_sendQueue.Count != 0)
+                        wi = _sendQueue.Dequeue();
+                }
+                if (wi == null)
+                {
+                    var signal = new TaskCompletionSource<int>();
+                    lock (_lock)
+                        _signal = signal;
+                    await signal.Task.ConfigureAwait(false);
+                    continue;
+                }
+                try
+                {
+                    await _conn.Send(wi.Message).ConfigureAwait(false);
+                    wi.Tcs.TrySetResult(0);
+                }
+                catch (Exception e)
+                {
+                    wi.Tcs.TrySetException(e);
+                }
+            }
+            
+        }
+        
+        public Task Send(object data)
+        {
+            var tcs = new TaskCompletionSource<int>();
+            lock (_lock)
+            {
+                if (!_workerIsAlive)
+                {
+                    _workerIsAlive = true;
+                    Worker();
+                }
+                _sendQueue.Enqueue(new SendOperation
+                {
+                    Message = data,
+                    Tcs = tcs
+                });
+                if (_signal != null)
+                {
+                    _signal.SetResult(0);
+                    _signal = null;
+                }
+            }
+            return tcs.Task;
+        }
+        
+        public event Action<object> OnMessage
+        {
+            add => _onMessage.Add(value);
+            remove => _onMessage.Remove(value);
+        }
+
+        public event Action<Exception> OnException
+        {
+            add => _onException.Add(value);
+            remove => _onException.Remove(value);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Remote.Protocol/ViewportMessages.cs b/src/Avalonia.Remote.Protocol/ViewportMessages.cs
index 8e1b0bd99e..82a7688f37 100644
--- a/src/Avalonia.Remote.Protocol/ViewportMessages.cs
+++ b/src/Avalonia.Remote.Protocol/ViewportMessages.cs
@@ -10,7 +10,8 @@ namespace Avalonia.Remote.Protocol.Viewport
     {
         Rgb565,
         Rgba8888,
-        Bgra8888
+        Bgra8888,
+        MaxValue = Bgra8888
     }
 
     [AvaloniaRemoteMessageGuid("6E3C5310-E2B1-4C3D-8688-01183AA48C5B")]
@@ -25,6 +26,8 @@ namespace Avalonia.Remote.Protocol.Viewport
     {
         public double Width { get; set; }
         public double Height { get; set; }
+        public double DpiX { get; set; }
+        public double DpiY { get; set; }
     }
 
     [AvaloniaRemoteMessageGuid("63481025-7016-43FE-BADC-F2FD0F88609E")]

From e7247a2c12f383d7cd6e26136a1d96fab9f3102f Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 29 Aug 2017 01:17:19 +0200
Subject: [PATCH 014/482] Added methods for creating D2D render layers.

Craetes a compatible render target depending on the type of `IRenderTargetBitmapImpl`.
---
 .../Direct3DInteropSample/MainWindow.cs       |  3 +-
 .../Avalonia.Direct2D1/Direct2D1Platform.cs   |  4 +-
 .../ExternalRenderTarget.cs                   | 15 ++--
 .../Avalonia.Direct2D1/ICreateLayer.cs        | 10 +++
 .../Media/DrawingContextImpl.cs               | 13 ++--
 .../Media/ImageBrushImpl.cs                   |  7 +-
 .../Media/Imaging/BitmapImpl.cs               | 32 +++++++--
 .../Media/Imaging/D2DBitmapImpl.cs            | 47 +++++++------
 .../Imaging/D2DRenderTargetBitmapImpl.cs      | 68 +++++++++++++++++++
 .../Media/Imaging/WicBitmapImpl.cs            | 57 +++++-----------
 ...apImpl.cs => WicRenderTargetBitmapImpl.cs} |  6 +-
 .../Avalonia.Direct2D1/OptionalDispose.cs     | 22 ++++++
 .../Avalonia.Direct2D1/RenderTarget.cs        | 22 ++----
 .../SwapChainRenderTarget.cs                  | 40 ++++++-----
 14 files changed, 225 insertions(+), 121 deletions(-)
 create mode 100644 src/Windows/Avalonia.Direct2D1/ICreateLayer.cs
 create mode 100644 src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
 rename src/Windows/Avalonia.Direct2D1/Media/Imaging/{RenderTargetBitmapImpl.cs => WicRenderTargetBitmapImpl.cs} (89%)
 create mode 100644 src/Windows/Avalonia.Direct2D1/OptionalDispose.cs

diff --git a/samples/interop/Direct3DInteropSample/MainWindow.cs b/samples/interop/Direct3DInteropSample/MainWindow.cs
index ad40e81895..3fe3b896f6 100644
--- a/samples/interop/Direct3DInteropSample/MainWindow.cs
+++ b/samples/interop/Direct3DInteropSample/MainWindow.cs
@@ -254,7 +254,8 @@ namespace Direct3DInteropSample
             public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
             {
                 return new DrawingContextImpl(visualBrushRenderer, _window._d2dRenderTarget,
-                    AvaloniaLocator.Current.GetService<SharpDX.DirectWrite.Factory>());
+                    AvaloniaLocator.Current.GetService<SharpDX.DirectWrite.Factory>(),
+                    AvaloniaLocator.Current.GetService<ImagingFactory>());
             }
         }
 
diff --git a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
index fd8364c03b..eedb8a0c4e 100644
--- a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
+++ b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
@@ -145,7 +145,7 @@ namespace Avalonia.Direct2D1
                     return new HwndRenderTarget(nativeWindow);
                 }
                 if (s is IExternalDirect2DRenderTargetSurface external)
-                    return new ExternalRenderTarget(external, s_dwfactory);
+                    return new ExternalRenderTarget(external, s_dwfactory, s_imagingFactory);
             }
             throw new NotSupportedException("Don't know how to create a Direct2D1 renderer from any of provided surfaces");
         }
@@ -156,7 +156,7 @@ namespace Avalonia.Direct2D1
             double dpiX,
             double dpiY)
         {
-            return new RenderTargetBitmapImpl(
+            return new WicRenderTargetBitmapImpl(
                 s_imagingFactory,
                 s_d2D1Factory,
                 s_dwfactory,
diff --git a/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs
index 307048f7b4..d735c5f8bb 100644
--- a/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Avalonia.Direct2D1.Media;
 using Avalonia.Platform;
 using Avalonia.Rendering;
@@ -15,11 +11,16 @@ namespace Avalonia.Direct2D1
     {
         private readonly IExternalDirect2DRenderTargetSurface _externalRenderTargetProvider;
         private readonly DirectWriteFactory _dwFactory;
-        public ExternalRenderTarget(IExternalDirect2DRenderTargetSurface externalRenderTargetProvider,
-            DirectWriteFactory dwFactory)
+        private readonly SharpDX.WIC.ImagingFactory _wicFactory;
+
+        public ExternalRenderTarget(
+            IExternalDirect2DRenderTargetSurface externalRenderTargetProvider,
+            DirectWriteFactory dwFactory,
+            SharpDX.WIC.ImagingFactory wicFactory)
         {
             _externalRenderTargetProvider = externalRenderTargetProvider;
             _dwFactory = dwFactory;
+            _wicFactory = wicFactory;
         }
 
         public void Dispose()
@@ -31,7 +32,7 @@ namespace Avalonia.Direct2D1
         {
             var target =  _externalRenderTargetProvider.GetOrCreateRenderTarget();
             _externalRenderTargetProvider.BeforeDrawing();
-            return new DrawingContextImpl(visualBrushRenderer, target, _dwFactory, null, () =>
+            return new DrawingContextImpl(visualBrushRenderer, target, _dwFactory, _wicFactory, null, () =>
             {
                 try
                 {
diff --git a/src/Windows/Avalonia.Direct2D1/ICreateLayer.cs b/src/Windows/Avalonia.Direct2D1/ICreateLayer.cs
new file mode 100644
index 0000000000..9214377e6f
--- /dev/null
+++ b/src/Windows/Avalonia.Direct2D1/ICreateLayer.cs
@@ -0,0 +1,10 @@
+using System;
+using Avalonia.Platform;
+
+namespace Avalonia.Direct2D1
+{
+    internal interface ICreateLayer
+    {
+        IRenderTargetBitmapImpl CreateLayer(int pixelWidth, int pixelHeight);
+    }
+}
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
index 69b582b009..a7bb73e19f 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
@@ -2,16 +2,13 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using Avalonia.Media;
 using Avalonia.Platform;
-using Avalonia.RenderHelpers;
 using Avalonia.Rendering;
 using SharpDX;
 using SharpDX.Direct2D1;
 using SharpDX.Mathematics.Interop;
-using IBitmap = Avalonia.Media.Imaging.IBitmap;
 
 namespace Avalonia.Direct2D1.Media
 {
@@ -24,6 +21,7 @@ namespace Avalonia.Direct2D1.Media
         private readonly SharpDX.Direct2D1.RenderTarget _renderTarget;
         private readonly SharpDX.DXGI.SwapChain1 _swapChain;
         private readonly Action _finishedCallback;
+        private readonly SharpDX.WIC.ImagingFactory _imagingFactory;
         private SharpDX.DirectWrite.Factory _directWriteFactory;
 
         /// <summary>
@@ -32,12 +30,14 @@ namespace Avalonia.Direct2D1.Media
         /// <param name="visualBrushRenderer">The visual brush renderer.</param>
         /// <param name="renderTarget">The render target to draw to.</param>
         /// <param name="directWriteFactory">The DirectWrite factory.</param>
+        /// <param name="imagingFactory">The WIC imaging factory.</param>
         /// <param name="swapChain">An optional swap chain associated with this drawing context.</param>
         /// <param name="finishedCallback">An optional delegate to be called when context is disposed.</param>
         public DrawingContextImpl(
             IVisualBrushRenderer visualBrushRenderer,
             SharpDX.Direct2D1.RenderTarget renderTarget,
             SharpDX.DirectWrite.Factory directWriteFactory,
+            SharpDX.WIC.ImagingFactory imagingFactory,
             SharpDX.DXGI.SwapChain1 swapChain = null,
             Action finishedCallback = null)
         {
@@ -46,6 +46,7 @@ namespace Avalonia.Direct2D1.Media
             _swapChain = swapChain;
             _finishedCallback = finishedCallback;
             _directWriteFactory = directWriteFactory;
+            _imagingFactory = imagingFactory;
             _swapChain = swapChain;
             _renderTarget.BeginDraw();
         }
@@ -97,7 +98,7 @@ namespace Avalonia.Direct2D1.Media
             using (var d2d = ((BitmapImpl)source).GetDirect2DBitmap(_renderTarget))
             {
                 _renderTarget.DrawBitmap(
-                    d2d,
+                    d2d.Value,
                     destRect.ToSharpDX(),
                     (float)opacity,
                     BitmapInterpolationMode.Linear,
@@ -115,7 +116,7 @@ namespace Avalonia.Direct2D1.Media
         public void DrawImage(IBitmapImpl source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect)
         {
             using (var d2dSource = ((BitmapImpl)source).GetDirect2DBitmap(_renderTarget))
-            using (var sourceBrush = new BitmapBrush(_renderTarget, d2dSource))
+            using (var sourceBrush = new BitmapBrush(_renderTarget, d2dSource.Value))
             using (var d2dOpacityMask = CreateBrush(opacityMask, opacityMaskRect.Size))
             using (var geometry = new SharpDX.Direct2D1.RectangleGeometry(_renderTarget.Factory, destRect.ToDirect2D()))
             {
@@ -397,7 +398,7 @@ namespace Avalonia.Direct2D1.Media
                             return new ImageBrushImpl(
                                 visualBrush,
                                 _renderTarget,
-                                new D2DBitmapImpl(intermediate.Bitmap),
+                                new D2DBitmapImpl(_imagingFactory, intermediate.Bitmap),
                                 destinationSize);
                         }
                     }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs
index ed3d78b4fd..08cfed2ace 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs
@@ -10,6 +10,8 @@ namespace Avalonia.Direct2D1.Media
 {
     public sealed class ImageBrushImpl : BrushImpl
     {
+        OptionalDispose<Bitmap> _bitmap;
+
         public ImageBrushImpl(
             ITileBrush brush,
             SharpDX.Direct2D1.RenderTarget target,
@@ -20,9 +22,10 @@ namespace Avalonia.Direct2D1.Media
 
             if (!calc.NeedsIntermediate)
             {
+                _bitmap = bitmap.GetDirect2DBitmap(target);
                 PlatformBrush = new BitmapBrush(
                     target,
-                    bitmap.GetDirect2DBitmap(target),
+                    _bitmap.Value,
                     GetBitmapBrushProperties(brush),
                     GetBrushProperties(brush, calc.DestinationRect));
             }
@@ -41,7 +44,7 @@ namespace Avalonia.Direct2D1.Media
 
         public override void Dispose()
         {
-            ((BitmapBrush)PlatformBrush)?.Bitmap.Dispose();
+            _bitmap.Dispose();
             base.Dispose();
         }
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs
index 63596bdf54..d58f023391 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs
@@ -1,20 +1,38 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Avalonia.Platform;
-using SharpDX.Direct2D1;
+using SharpDX.WIC;
+using D2DBitmap = SharpDX.Direct2D1.Bitmap;
 
 namespace Avalonia.Direct2D1.Media
 {
     public abstract class BitmapImpl : IBitmapImpl, IDisposable
     {
-        public abstract Bitmap GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget target);
+        public BitmapImpl(ImagingFactory imagingFactory)
+        {
+            WicImagingFactory = imagingFactory;
+        }
+
+        public ImagingFactory WicImagingFactory { get; }
         public abstract int PixelWidth { get; }
         public abstract int PixelHeight { get; }
-        public abstract void Save(string fileName);
+
+        public abstract OptionalDispose<D2DBitmap> GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget target);
+
+        public void Save(string fileName)
+        {
+            if (Path.GetExtension(fileName) != ".png")
+            {
+                // Yeah, we need to support other formats.
+                throw new NotSupportedException("Use PNG, stoopid.");
+            }
+
+            using (FileStream s = new FileStream(fileName, FileMode.Create))
+            {
+                Save(s);
+            }
+        }
+
         public abstract void Save(Stream stream);
 
         public virtual void Dispose()
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs
index 5378ae3257..b03e022674 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs
@@ -1,11 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia.Platform;
 using SharpDX.Direct2D1;
+using WICFactory = SharpDX.WIC.ImagingFactory;
+using ImagingFactory2 = SharpDX.WIC.ImagingFactory2;
+using ImageParameters = SharpDX.WIC.ImageParameters;
+using PngBitmapEncoder = SharpDX.WIC.PngBitmapEncoder;
 
 namespace Avalonia.Direct2D1.Media
 {
@@ -26,32 +25,42 @@ namespace Avalonia.Direct2D1.Media
         /// or if the render target is a <see cref="SharpDX.Direct2D1.DeviceContext"/>,
         /// the device associated with this context, to be renderable.
         /// </remarks>
-        public D2DBitmapImpl(Bitmap d2DBitmap)
+        public D2DBitmapImpl(WICFactory imagingFactory, Bitmap d2DBitmap)
+            : base(imagingFactory)
         {
-            if (d2DBitmap == null) throw new ArgumentNullException(nameof(d2DBitmap));
-
-            _direct2D = d2DBitmap;
+            _direct2D = d2DBitmap ?? throw new ArgumentNullException(nameof(d2DBitmap));
         }
-
-        public override Bitmap GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget target) => _direct2D;
-               
+              
         public override int PixelWidth => _direct2D.PixelSize.Width;
         public override int PixelHeight => _direct2D.PixelSize.Height;
 
-        public override void Save(string fileName)
+        public override void Dispose()
         {
-            throw new NotImplementedException();
+            base.Dispose();
+            _direct2D.Dispose();
         }
 
-        public override void Save(Stream stream)
+        public override OptionalDispose<Bitmap> GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget target)
         {
-            throw new NotImplementedException();
+            return new OptionalDispose<Bitmap>(_direct2D, false);
         }
 
-        public override void Dispose()
+        public override void Save(Stream stream)
         {
-            base.Dispose();
-            _direct2D.Dispose();
+            using (var encoder = new PngBitmapEncoder(WicImagingFactory, stream))
+            using (var frameEncode = new SharpDX.WIC.BitmapFrameEncode(encoder))
+            using (var imageEncoder = new SharpDX.WIC.ImageEncoder((ImagingFactory2)WicImagingFactory, null))
+            {
+                var parameters = new ImageParameters(
+                    new PixelFormat(SharpDX.DXGI.Format.R8G8B8A8_UNorm, AlphaMode.Premultiplied),
+                    _direct2D.DotsPerInch.Width,
+                    _direct2D.DotsPerInch.Height,
+                    0, 0, PixelWidth, PixelHeight);
+
+                imageEncoder.WriteFrame(_direct2D, frameEncode, parameters);
+                frameEncode.Commit();
+                encoder.Commit();
+            }
         }
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
new file mode 100644
index 0000000000..6162d57bad
--- /dev/null
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
@@ -0,0 +1,68 @@
+using System;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using SharpDX;
+using SharpDX.Direct2D1;
+using SharpDX.WIC;
+using D2DBitmap = SharpDX.Direct2D1.Bitmap;
+using DirectWriteFactory = SharpDX.DirectWrite.Factory;
+
+namespace Avalonia.Direct2D1.Media.Imaging
+{
+    public class D2DRenderTargetBitmapImpl : D2DBitmapImpl, IRenderTargetBitmapImpl, ICreateLayer
+    {
+        private readonly DirectWriteFactory _dwriteFactory;
+        private readonly BitmapRenderTarget _target;
+
+        public D2DRenderTargetBitmapImpl(
+            ImagingFactory imagingFactory,
+            DirectWriteFactory dwriteFactory,
+            BitmapRenderTarget target)
+            : base(imagingFactory, target.Bitmap)
+        {
+            _dwriteFactory = dwriteFactory;
+            _target = target;
+        }
+
+        public override int PixelWidth => _target.PixelSize.Width;
+        public override int PixelHeight => _target.PixelSize.Height;
+
+        public static D2DRenderTargetBitmapImpl CreateCompatible(
+            ImagingFactory imagingFactory,
+            DirectWriteFactory dwriteFactory,
+            SharpDX.Direct2D1.RenderTarget renderTarget,
+            int pixelWidth,
+            int pixelHeight)
+        {
+            var bitmapRenderTarget = new BitmapRenderTarget(
+                renderTarget,
+                CompatibleRenderTargetOptions.None,
+                new Size2F(pixelWidth, pixelHeight));
+            return new D2DRenderTargetBitmapImpl(imagingFactory, dwriteFactory, bitmapRenderTarget);
+        }
+
+        public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
+        {
+            return new DrawingContextImpl(
+                visualBrushRenderer,
+                _target,
+                _dwriteFactory,
+                WicImagingFactory);
+        }
+
+        public IRenderTargetBitmapImpl CreateLayer(int pixelWidth, int pixelHeight)
+        {
+            return CreateCompatible(WicImagingFactory, _dwriteFactory, _target, pixelWidth, pixelHeight);
+        }
+
+        public override void Dispose()
+        {
+            _target.Dispose();
+        }
+
+        public override OptionalDispose<D2DBitmap> GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget target)
+        {
+            return new OptionalDispose<D2DBitmap>(_target.Bitmap, false);
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
index e817dd4812..9b99b4c40a 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
@@ -3,11 +3,10 @@
 
 using System;
 using System.IO;
-using Avalonia.Platform;
 using Avalonia.Win32.Interop;
-using PixelFormat  = SharpDX.WIC.PixelFormat;
-using APixelFormat  = Avalonia.Platform.PixelFormat;
 using SharpDX.WIC;
+using APixelFormat = Avalonia.Platform.PixelFormat;
+using D2DBitmap = SharpDX.Direct2D1.Bitmap;
 
 namespace Avalonia.Direct2D1.Media
 {
@@ -16,18 +15,14 @@ namespace Avalonia.Direct2D1.Media
     /// </summary>
     public class WicBitmapImpl : BitmapImpl
     {
-        private readonly ImagingFactory _factory;
-        
-
         /// <summary>
         /// Initializes a new instance of the <see cref="WicBitmapImpl"/> class.
         /// </summary>
         /// <param name="factory">The WIC imaging factory to use.</param>
         /// <param name="fileName">The filename of the bitmap to load.</param>
         public WicBitmapImpl(ImagingFactory factory, string fileName)
+            : base(factory)
         {
-            _factory = factory;
-
             using (BitmapDecoder decoder = new BitmapDecoder(factory, fileName, DecodeOptions.CacheOnDemand))
             {
                 WicImpl = new Bitmap(factory, decoder.GetFrame(0), BitmapCreateCacheOption.CacheOnDemand);
@@ -40,9 +35,8 @@ namespace Avalonia.Direct2D1.Media
         /// <param name="factory">The WIC imaging factory to use.</param>
         /// <param name="stream">The stream to read the bitmap from.</param>
         public WicBitmapImpl(ImagingFactory factory, Stream stream)
+            : base(factory)
         {
-            _factory = factory;
-
             using (BitmapDecoder decoder = new BitmapDecoder(factory, stream, DecodeOptions.CacheOnLoad))
             {
                 WicImpl = new Bitmap(factory, decoder.GetFrame(0), BitmapCreateCacheOption.CacheOnLoad);
@@ -57,11 +51,11 @@ namespace Avalonia.Direct2D1.Media
         /// <param name="height">The height of the bitmap.</param>
         /// <param name="pixelFormat">Pixel format</param>
         public WicBitmapImpl(ImagingFactory factory, int width, int height, APixelFormat? pixelFormat = null)
+            : base(factory)
         {
             if (!pixelFormat.HasValue)
                 pixelFormat = APixelFormat.Bgra8888;
 
-            _factory = factory;
             PixelFormat = pixelFormat;
             WicImpl = new Bitmap(
                 factory,
@@ -71,7 +65,8 @@ namespace Avalonia.Direct2D1.Media
                 BitmapCreateCacheOption.CacheOnLoad);
         }
 
-        public WicBitmapImpl(ImagingFactory factory, Platform.PixelFormat format, IntPtr data, int width, int height, int stride)
+        public WicBitmapImpl(ImagingFactory factory, APixelFormat format, IntPtr data, int width, int height, int stride)
+            : base(factory)
         {
             WicImpl = new Bitmap(factory, width, height, format.ToWic(), BitmapCreateCacheOption.CacheOnDemand);
             PixelFormat = format;
@@ -112,41 +107,23 @@ namespace Avalonia.Direct2D1.Media
         /// </summary>
         /// <param name="renderTarget">The render target.</param>
         /// <returns>The Direct2D bitmap.</returns>
-        public override SharpDX.Direct2D1.Bitmap GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget renderTarget)
+        public override OptionalDispose<D2DBitmap> GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget renderTarget)
         {
-            FormatConverter converter = new FormatConverter(_factory);
+            FormatConverter converter = new FormatConverter(WicImagingFactory);
             converter.Initialize(WicImpl, SharpDX.WIC.PixelFormat.Format32bppPBGRA);
-            return SharpDX.Direct2D1.Bitmap.FromWicBitmap(renderTarget, converter);
+            return new OptionalDispose<D2DBitmap>(D2DBitmap.FromWicBitmap(renderTarget, converter), true);
         }
 
-        /// <summary>
-        /// Saves the bitmap to a file.
-        /// </summary>
-        /// <param name="fileName">The filename.</param>
-        public override void Save(string fileName)
+        public override void Save(Stream stream)
         {
-            if (Path.GetExtension(fileName) != ".png")
-            {
-                // Yeah, we need to support other formats.
-                throw new NotSupportedException("Use PNG, stoopid.");
-            }
-
-            using (FileStream s = new FileStream(fileName, FileMode.Create))
+            using (var encoder = new PngBitmapEncoder(WicImagingFactory, stream))
+            using (var frame = new BitmapFrameEncode(encoder))
             {
-                Save(s);
+                frame.Initialize();
+                frame.WriteSource(WicImpl);
+                frame.Commit();
+                encoder.Commit();
             }
         }
-
-        public override void Save(Stream stream)
-        {
-            PngBitmapEncoder encoder = new PngBitmapEncoder(_factory);
-            encoder.Initialize(stream);
-
-            BitmapFrameEncode frame = new BitmapFrameEncode(encoder);
-            frame.Initialize();
-            frame.WriteSource(WicImpl);
-            frame.Commit();
-            encoder.Commit();
-        }
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
similarity index 89%
rename from src/Windows/Avalonia.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs
rename to src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
index 33736b02cb..1540ee333a 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
@@ -10,12 +10,12 @@ using DirectWriteFactory = SharpDX.DirectWrite.Factory;
 
 namespace Avalonia.Direct2D1.Media
 {
-    public class RenderTargetBitmapImpl : WicBitmapImpl, IRenderTargetBitmapImpl
+    public class WicRenderTargetBitmapImpl : WicBitmapImpl, IRenderTargetBitmapImpl
     {
         private readonly DirectWriteFactory _dwriteFactory;
         private readonly WicRenderTarget _target;
 
-        public RenderTargetBitmapImpl(
+        public WicRenderTargetBitmapImpl(
             ImagingFactory imagingFactory,
             Factory d2dFactory,
             DirectWriteFactory dwriteFactory,
@@ -47,7 +47,7 @@ namespace Avalonia.Direct2D1.Media
 
         public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
         {
-            return new DrawingContextImpl(visualBrushRenderer, _target, _dwriteFactory);
+            return new DrawingContextImpl(visualBrushRenderer, _target, _dwriteFactory, WicImagingFactory);
         }
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/OptionalDispose.cs b/src/Windows/Avalonia.Direct2D1/OptionalDispose.cs
new file mode 100644
index 0000000000..cd3eee8d25
--- /dev/null
+++ b/src/Windows/Avalonia.Direct2D1/OptionalDispose.cs
@@ -0,0 +1,22 @@
+using System;
+
+namespace Avalonia.Direct2D1
+{
+    public struct OptionalDispose<T> : IDisposable where T : IDisposable
+    {
+        private readonly bool _dispose;
+
+        public OptionalDispose(T value, bool dispose)
+        {
+            Value = value;
+            _dispose = dispose;
+        }
+
+        public T Value { get; }
+
+        public void Dispose()
+        {
+            if (_dispose) Value?.Dispose();
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Direct2D1/RenderTarget.cs b/src/Windows/Avalonia.Direct2D1/RenderTarget.cs
index b4c9b49e3f..cbeff8b2f1 100644
--- a/src/Windows/Avalonia.Direct2D1/RenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/RenderTarget.cs
@@ -7,6 +7,7 @@ using Avalonia.Platform;
 using Avalonia.Rendering;
 using SharpDX.Direct2D1;
 using DwFactory = SharpDX.DirectWrite.Factory;
+using WicFactory = SharpDX.WIC.ImagingFactory;
 
 namespace Avalonia.Direct2D1
 {
@@ -25,24 +26,13 @@ namespace Avalonia.Direct2D1
         {
             Direct2DFactory = AvaloniaLocator.Current.GetService<Factory>();
             DirectWriteFactory = AvaloniaLocator.Current.GetService<DwFactory>();
+            WicFactory = AvaloniaLocator.Current.GetService<WicFactory>();
             _renderTarget = renderTarget;
         }
 
-        /// <summary>
-        /// Gets the Direct2D factory.
-        /// </summary>
-        public Factory Direct2DFactory
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the DirectWrite factory.
-        /// </summary>
-        public DwFactory DirectWriteFactory
-        {
-            get;
-        }
+        public Factory Direct2DFactory { get; }
+        public DwFactory DirectWriteFactory { get; }
+        public WicFactory WicFactory { get; }
 
         /// <summary>
         /// Creates a drawing context for a rendering session.
@@ -50,7 +40,7 @@ namespace Avalonia.Direct2D1
         /// <returns>An <see cref="Avalonia.Platform.IDrawingContextImpl"/>.</returns>
         public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
         {
-            return new DrawingContextImpl(visualBrushRenderer, _renderTarget, DirectWriteFactory);
+            return new DrawingContextImpl(visualBrushRenderer, _renderTarget, DirectWriteFactory, WicFactory);
         }
 
         public void Dispose()
diff --git a/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs
index 3c1024e73a..bd6555159c 100644
--- a/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs
@@ -10,10 +10,11 @@ using Factory = SharpDX.Direct2D1.Factory;
 using Factory2 = SharpDX.DXGI.Factory2;
 using Avalonia.Rendering;
 using Avalonia.Direct2D1.Media;
+using Avalonia.Direct2D1.Media.Imaging;
 
 namespace Avalonia.Direct2D1
 {
-    public abstract class SwapChainRenderTarget : IRenderTarget
+    public abstract class SwapChainRenderTarget : IRenderTarget, ICreateLayer
     {
         private Size2 _savedSize;
         private Size2F _savedDpi;
@@ -26,24 +27,12 @@ namespace Avalonia.Direct2D1
             D2DDevice = AvaloniaLocator.Current.GetService<Device>();
             Direct2DFactory = AvaloniaLocator.Current.GetService<Factory>();
             DirectWriteFactory = AvaloniaLocator.Current.GetService<SharpDX.DirectWrite.Factory>();
+            WicImagingFactory = AvaloniaLocator.Current.GetService<SharpDX.WIC.ImagingFactory>();
         }
 
-
-        /// <summary>
-        /// Gets the Direct2D factory.
-        /// </summary>
-        public Factory Direct2DFactory
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the DirectWrite factory.
-        /// </summary>
-        public SharpDX.DirectWrite.Factory DirectWriteFactory
-        {
-            get;
-        }
+        public Factory Direct2DFactory { get; }
+        public SharpDX.DirectWrite.Factory DirectWriteFactory { get; }
+        public SharpDX.WIC.ImagingFactory WicImagingFactory { get; }
 
         protected SharpDX.DXGI.Device DxgiDevice { get; }
         
@@ -69,9 +58,25 @@ namespace Avalonia.Direct2D1
                 visualBrushRenderer,
                 _deviceContext,
                 DirectWriteFactory,
+                WicImagingFactory,
                 _swapChain);
         }
 
+        public IRenderTargetBitmapImpl CreateLayer(int pixelWidth, int pixelHeight)
+        {
+            if (_deviceContext == null)
+            {
+                CreateSwapChain();
+            }
+
+            return D2DRenderTargetBitmapImpl.CreateCompatible(
+                WicImagingFactory,
+                DirectWriteFactory,
+                _deviceContext,
+                pixelWidth,
+                pixelHeight);
+        }
+
         public void Dispose()
         {
             _deviceContext?.Dispose();
@@ -86,7 +91,6 @@ namespace Avalonia.Direct2D1
                 _deviceContext?.Dispose();
                 _deviceContext = new DeviceContext(D2DDevice, DeviceContextOptions.None) {DotsPerInch = _savedDpi};
 
-
                 var swapChainDesc = new SwapChainDescription1
                 {
                     Width = _savedSize.Width,

From 8efd5e56a25ea3cf2a65e2d7f79a6697b9e13bd7 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 29 Aug 2017 01:17:35 +0200
Subject: [PATCH 015/482] Added missing doc comments.

---
 .../Platform/IDrawingContextImpl.cs               | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
index 14aef8463a..1bae88cb5f 100644
--- a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
@@ -86,6 +86,9 @@ namespace Avalonia.Platform
         /// <param name="clip">The clip rectangle.</param>
         void PushClip(Rect clip);
 
+        /// <summary>
+        /// Pops the latest pushed clip rectangle.
+        /// </summary>
         void PopClip();
 
         /// <summary>
@@ -94,10 +97,19 @@ namespace Avalonia.Platform
         /// <param name="opacity">The opacity.</param>
         void PushOpacity(double opacity);
 
+        /// <summary>
+        /// Pops the latest pushed opacity value.
+        /// </summary>
         void PopOpacity();
 
+        /// <summary>
+        /// Pushes an opacity mask
+        /// </summary>
         void PushOpacityMask(IBrush mask, Rect bounds);
 
+        /// <summary>
+        /// Pops the latest pushed opacity mask.
+        /// </summary>
         void PopOpacityMask();
 
         /// <summary>
@@ -106,6 +118,9 @@ namespace Avalonia.Platform
         /// <param name="clip">The clip geometry.</param>
         void PushGeometryClip(IGeometryImpl clip);
 
+        /// <summary>
+        /// Pops the latest pushed geometry clip.
+        /// </summary>
         void PopGeometryClip();
     }
 }

From 5607404e6cb6a3e9c7d5e6e823668d42a807b3b2 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 29 Aug 2017 13:14:19 +0200
Subject: [PATCH 016/482] Added IDrawingContextImpl.CreateLayer

---
 .../Direct3DInteropSample/MainWindow.cs       |  2 +-
 .../Platform/IDrawingContextImpl.cs           | 14 ++++++++++
 .../SceneGraph/DeferredDrawingContextImpl.cs  |  5 ++++
 .../Avalonia.Cairo/Media/DrawingContext.cs    |  6 +++++
 src/Skia/Avalonia.Skia/DrawingContextImpl.cs  |  6 +++++
 .../ExternalRenderTarget.cs                   | 15 +++++++++--
 .../Avalonia.Direct2D1/ICreateLayer.cs        | 10 -------
 .../Avalonia.Direct2D1/ILayerFactory.cs       | 10 +++++++
 .../Media/DrawingContextImpl.cs               | 26 +++++++++++++++++++
 .../Imaging/D2DRenderTargetBitmapImpl.cs      | 12 ++++-----
 .../Imaging/WicRenderTargetBitmapImpl.cs      |  7 ++++-
 .../Avalonia.Direct2D1/RenderTarget.cs        | 14 ++++++++--
 .../SwapChainRenderTarget.cs                  |  8 +++---
 13 files changed, 109 insertions(+), 26 deletions(-)
 delete mode 100644 src/Windows/Avalonia.Direct2D1/ICreateLayer.cs
 create mode 100644 src/Windows/Avalonia.Direct2D1/ILayerFactory.cs

diff --git a/samples/interop/Direct3DInteropSample/MainWindow.cs b/samples/interop/Direct3DInteropSample/MainWindow.cs
index 3fe3b896f6..ffa0de0a36 100644
--- a/samples/interop/Direct3DInteropSample/MainWindow.cs
+++ b/samples/interop/Direct3DInteropSample/MainWindow.cs
@@ -253,7 +253,7 @@ namespace Direct3DInteropSample
 
             public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
             {
-                return new DrawingContextImpl(visualBrushRenderer, _window._d2dRenderTarget,
+                return new DrawingContextImpl(visualBrushRenderer, null, _window._d2dRenderTarget,
                     AvaloniaLocator.Current.GetService<SharpDX.DirectWrite.Factory>(),
                     AvaloniaLocator.Current.GetService<ImagingFactory>());
             }
diff --git a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
index 1bae88cb5f..3db4527bfb 100644
--- a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
@@ -80,6 +80,20 @@ namespace Avalonia.Platform
         /// <param name="cornerRadius">The corner radius.</param>
         void FillRectangle(IBrush brush, Rect rect, float cornerRadius = 0.0f);
 
+        /// <summary>
+        /// Creates a new <see cref="IRenderTargetBitmapImpl"/> that can be used as a render layer
+        /// for the current render target.
+        /// </summary>
+        /// <param name="size">The size of the layer in DIPs.</param>
+        /// <returns>An <see cref="IRenderTargetBitmapImpl"/></returns>
+        /// <remarks>
+        /// Depending on the rendering backend used, a layer created via this method may be more
+        /// performant than a standard render target bitmap. In particular the Direct2D backend
+        /// has to do a format conversion each time a standard render target bitmap is rendered,
+        /// but a layer created via this method has no such overhead.
+        /// </remarks>
+        IRenderTargetBitmapImpl CreateLayer(Size size);
+
         /// <summary>
         /// Pushes a clip rectange.
         /// </summary>
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
index 0b01960d5b..5fcd0e42bd 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
@@ -194,6 +194,11 @@ namespace Avalonia.Rendering.SceneGraph
             }
         }
 
+        public IRenderTargetBitmapImpl CreateLayer(Size size)
+        {
+            throw new NotImplementedException();
+        }
+
         /// <inheritdoc/>
         public void PopClip()
         {
diff --git a/src/Gtk/Avalonia.Cairo/Media/DrawingContext.cs b/src/Gtk/Avalonia.Cairo/Media/DrawingContext.cs
index 99b0a2ec73..7900f2e440 100644
--- a/src/Gtk/Avalonia.Cairo/Media/DrawingContext.cs
+++ b/src/Gtk/Avalonia.Cairo/Media/DrawingContext.cs
@@ -227,6 +227,12 @@ namespace Avalonia.Cairo.Media
             }
         }
 
+        public IRenderTargetBitmapImpl CreateLayer(Size size)
+        {
+            var surface = new Cairo.ImageSurface(Cairo.Format.Argb32, (int)size.Width, (int)size.Height);
+            return new RenderTargetBitmapImpl(surface);
+        }
+
         /// <summary>
         /// Pushes a clip rectange.
         /// </summary>
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index 7a83835b10..f01e9858e7 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -349,6 +349,12 @@ namespace Avalonia.Skia
             }
         }
 
+        public IRenderTargetBitmapImpl CreateLayer(Size size)
+        {
+            var pixelSize = size * (_dpi / 96);
+            return new BitmapImpl((int)pixelSize.Width, (int)pixelSize.Height, _dpi);
+        }
+
         public void PushClip(Rect clip)
         {
             Canvas.Save();
diff --git a/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs
index d735c5f8bb..176cedd377 100644
--- a/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs
@@ -1,5 +1,6 @@
 using System;
 using Avalonia.Direct2D1.Media;
+using Avalonia.Direct2D1.Media.Imaging;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using SharpDX;
@@ -7,7 +8,7 @@ using DirectWriteFactory = SharpDX.DirectWrite.Factory;
 
 namespace Avalonia.Direct2D1
 {
-    class ExternalRenderTarget : IRenderTarget
+    class ExternalRenderTarget : IRenderTarget, ILayerFactory
     {
         private readonly IExternalDirect2DRenderTargetSurface _externalRenderTargetProvider;
         private readonly DirectWriteFactory _dwFactory;
@@ -32,7 +33,7 @@ namespace Avalonia.Direct2D1
         {
             var target =  _externalRenderTargetProvider.GetOrCreateRenderTarget();
             _externalRenderTargetProvider.BeforeDrawing();
-            return new DrawingContextImpl(visualBrushRenderer, target, _dwFactory, _wicFactory, null, () =>
+            return new DrawingContextImpl(visualBrushRenderer, null, target, _dwFactory, _wicFactory, null, () =>
             {
                 try
                 {
@@ -44,5 +45,15 @@ namespace Avalonia.Direct2D1
                 }
             });
         }
+
+        public IRenderTargetBitmapImpl CreateLayer(Size size)
+        {
+            var target = _externalRenderTargetProvider.GetOrCreateRenderTarget();
+            return D2DRenderTargetBitmapImpl.CreateCompatible(
+                _wicFactory,
+                _dwFactory,
+                target,
+                size);
+        }
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/ICreateLayer.cs b/src/Windows/Avalonia.Direct2D1/ICreateLayer.cs
deleted file mode 100644
index 9214377e6f..0000000000
--- a/src/Windows/Avalonia.Direct2D1/ICreateLayer.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using Avalonia.Platform;
-
-namespace Avalonia.Direct2D1
-{
-    internal interface ICreateLayer
-    {
-        IRenderTargetBitmapImpl CreateLayer(int pixelWidth, int pixelHeight);
-    }
-}
diff --git a/src/Windows/Avalonia.Direct2D1/ILayerFactory.cs b/src/Windows/Avalonia.Direct2D1/ILayerFactory.cs
new file mode 100644
index 0000000000..99f8d4f7ac
--- /dev/null
+++ b/src/Windows/Avalonia.Direct2D1/ILayerFactory.cs
@@ -0,0 +1,10 @@
+using System;
+using Avalonia.Platform;
+
+namespace Avalonia.Direct2D1
+{
+    public interface ILayerFactory
+    {
+        IRenderTargetBitmapImpl CreateLayer(Size size);
+    }
+}
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
index a7bb73e19f..6a72923ce3 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
@@ -18,6 +18,7 @@ namespace Avalonia.Direct2D1.Media
     public class DrawingContextImpl : IDrawingContextImpl, IDisposable
     {
         private readonly IVisualBrushRenderer _visualBrushRenderer;
+        private readonly ILayerFactory _layerFactory;
         private readonly SharpDX.Direct2D1.RenderTarget _renderTarget;
         private readonly SharpDX.DXGI.SwapChain1 _swapChain;
         private readonly Action _finishedCallback;
@@ -29,12 +30,17 @@ namespace Avalonia.Direct2D1.Media
         /// </summary>
         /// <param name="visualBrushRenderer">The visual brush renderer.</param>
         /// <param name="renderTarget">The render target to draw to.</param>
+        /// <param name="layerFactory">
+        /// An object to use to create layers. May be null, in which case a
+        /// <see cref="WicRenderTargetBitmapImpl"/> will created when a new layer is requested.
+        /// </param>
         /// <param name="directWriteFactory">The DirectWrite factory.</param>
         /// <param name="imagingFactory">The WIC imaging factory.</param>
         /// <param name="swapChain">An optional swap chain associated with this drawing context.</param>
         /// <param name="finishedCallback">An optional delegate to be called when context is disposed.</param>
         public DrawingContextImpl(
             IVisualBrushRenderer visualBrushRenderer,
+            ILayerFactory layerFactory,
             SharpDX.Direct2D1.RenderTarget renderTarget,
             SharpDX.DirectWrite.Factory directWriteFactory,
             SharpDX.WIC.ImagingFactory imagingFactory,
@@ -42,6 +48,7 @@ namespace Avalonia.Direct2D1.Media
             Action finishedCallback = null)
         {
             _visualBrushRenderer = visualBrushRenderer;
+            _layerFactory = layerFactory;
             _renderTarget = renderTarget;
             _swapChain = swapChain;
             _finishedCallback = finishedCallback;
@@ -285,6 +292,25 @@ namespace Avalonia.Direct2D1.Media
             }
         }
 
+        public IRenderTargetBitmapImpl CreateLayer(Size size)
+        {
+            if (_layerFactory != null)
+            {
+                return _layerFactory.CreateLayer(size);
+            }
+            else
+            {
+                var platform = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
+                var dpi = new Vector(_renderTarget.DotsPerInch.Width, _renderTarget.DotsPerInch.Height);
+                var pixelSize = size * (dpi / 96);
+                return platform.CreateRenderTargetBitmap(
+                    (int)pixelSize.Width,
+                    (int)pixelSize.Height,
+                    dpi.X,
+                    dpi.Y);
+            }
+        }
+
         /// <summary>
         /// Pushes a clip rectange.
         /// </summary>
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
index 6162d57bad..2843848fac 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
@@ -9,7 +9,7 @@ using DirectWriteFactory = SharpDX.DirectWrite.Factory;
 
 namespace Avalonia.Direct2D1.Media.Imaging
 {
-    public class D2DRenderTargetBitmapImpl : D2DBitmapImpl, IRenderTargetBitmapImpl, ICreateLayer
+    public class D2DRenderTargetBitmapImpl : D2DBitmapImpl, IRenderTargetBitmapImpl, ILayerFactory
     {
         private readonly DirectWriteFactory _dwriteFactory;
         private readonly BitmapRenderTarget _target;
@@ -31,13 +31,12 @@ namespace Avalonia.Direct2D1.Media.Imaging
             ImagingFactory imagingFactory,
             DirectWriteFactory dwriteFactory,
             SharpDX.Direct2D1.RenderTarget renderTarget,
-            int pixelWidth,
-            int pixelHeight)
+            Size size)
         {
             var bitmapRenderTarget = new BitmapRenderTarget(
                 renderTarget,
                 CompatibleRenderTargetOptions.None,
-                new Size2F(pixelWidth, pixelHeight));
+                new Size2F((float)size.Width, (float)size.Height));
             return new D2DRenderTargetBitmapImpl(imagingFactory, dwriteFactory, bitmapRenderTarget);
         }
 
@@ -45,14 +44,15 @@ namespace Avalonia.Direct2D1.Media.Imaging
         {
             return new DrawingContextImpl(
                 visualBrushRenderer,
+                this,
                 _target,
                 _dwriteFactory,
                 WicImagingFactory);
         }
 
-        public IRenderTargetBitmapImpl CreateLayer(int pixelWidth, int pixelHeight)
+        public IRenderTargetBitmapImpl CreateLayer(Size size)
         {
-            return CreateCompatible(WicImagingFactory, _dwriteFactory, _target, pixelWidth, pixelHeight);
+            return CreateCompatible(WicImagingFactory, _dwriteFactory, _target, size);
         }
 
         public override void Dispose()
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
index 1540ee333a..f1065370b5 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
@@ -47,7 +47,12 @@ namespace Avalonia.Direct2D1.Media
 
         public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
         {
-            return new DrawingContextImpl(visualBrushRenderer, _target, _dwriteFactory, WicImagingFactory);
+            return new DrawingContextImpl(
+                visualBrushRenderer,
+                null,
+                _target,
+                _dwriteFactory,
+                WicImagingFactory);
         }
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/RenderTarget.cs b/src/Windows/Avalonia.Direct2D1/RenderTarget.cs
index cbeff8b2f1..6086b0c67c 100644
--- a/src/Windows/Avalonia.Direct2D1/RenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/RenderTarget.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Avalonia.Direct2D1.Media;
+using Avalonia.Direct2D1.Media.Imaging;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using SharpDX.Direct2D1;
@@ -11,7 +12,7 @@ using WicFactory = SharpDX.WIC.ImagingFactory;
 
 namespace Avalonia.Direct2D1
 {
-    public class RenderTarget : IRenderTarget
+    public class RenderTarget : IRenderTarget, ILayerFactory
     {
         /// <summary>
         /// The render target.
@@ -40,7 +41,16 @@ namespace Avalonia.Direct2D1
         /// <returns>An <see cref="Avalonia.Platform.IDrawingContextImpl"/>.</returns>
         public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
         {
-            return new DrawingContextImpl(visualBrushRenderer, _renderTarget, DirectWriteFactory, WicFactory);
+            return new DrawingContextImpl(visualBrushRenderer, this, _renderTarget, DirectWriteFactory, WicFactory);
+        }
+
+        public IRenderTargetBitmapImpl CreateLayer(Size size)
+        {
+            return D2DRenderTargetBitmapImpl.CreateCompatible(
+                WicFactory,
+                DirectWriteFactory,
+                _renderTarget,
+                size);
         }
 
         public void Dispose()
diff --git a/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs
index bd6555159c..0a23c63498 100644
--- a/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs
@@ -14,7 +14,7 @@ using Avalonia.Direct2D1.Media.Imaging;
 
 namespace Avalonia.Direct2D1
 {
-    public abstract class SwapChainRenderTarget : IRenderTarget, ICreateLayer
+    public abstract class SwapChainRenderTarget : IRenderTarget, ILayerFactory
     {
         private Size2 _savedSize;
         private Size2F _savedDpi;
@@ -56,13 +56,14 @@ namespace Avalonia.Direct2D1
 
             return new DrawingContextImpl(
                 visualBrushRenderer,
+                this,
                 _deviceContext,
                 DirectWriteFactory,
                 WicImagingFactory,
                 _swapChain);
         }
 
-        public IRenderTargetBitmapImpl CreateLayer(int pixelWidth, int pixelHeight)
+        public IRenderTargetBitmapImpl CreateLayer(Size size)
         {
             if (_deviceContext == null)
             {
@@ -73,8 +74,7 @@ namespace Avalonia.Direct2D1
                 WicImagingFactory,
                 DirectWriteFactory,
                 _deviceContext,
-                pixelWidth,
-                pixelHeight);
+                size);
         }
 
         public void Dispose()

From 9a1348b37b87a30048ddb197c5c2f3d6545bfe6e Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sun, 24 Sep 2017 00:37:11 +0300
Subject: [PATCH 017/482] Initial remote XAML previewer implementation

---
 Avalonia.sln                                  |  92 +++++++++-
 Avalonia.sln.DotSettings                      |   1 +
 samples/ControlCatalog.NetCore/Program.cs     |  22 ++-
 samples/Previewer/App.xaml                    |   6 +
 samples/Previewer/App.xaml.cs                 |  14 ++
 samples/Previewer/Center.cs                   |  19 ++
 samples/Previewer/MainWindow.xaml             |  12 ++
 samples/Previewer/MainWindow.xaml.cs          |  86 +++++++++
 samples/Previewer/Previewer.csproj            |  27 +++
 samples/Previewer/Program.cs                  |  13 ++
 samples/RemoteTest/RemoteTest.csproj          |   2 +-
 src/Avalonia.Controls/Design.cs               |   2 +-
 .../InternalPlatformThreadingInterface.cs}    |  14 +-
 src/Avalonia.Controls/Remote/RemoteWidget.cs  |   2 +-
 .../Remote/Server/RemoteServerTopLevelImpl.cs |  10 +-
 .../DesignWindowLoader.cs                     |  76 ++++++++
 .../DesignerAssist.cs                         |  60 +-----
 .../Avalonia.DotNetFrameworkRuntime.csproj    |   4 +-
 .../BsonStreamTransport.cs                    |  19 +-
 .../DesignMessages.cs                         |  17 ++
 src/Avalonia.Remote.Protocol/EventStash.cs    |  20 +-
 src/Avalonia.Remote.Protocol/ITransport.cs    |   4 +-
 .../TcpTransportBase.cs                       |  16 +-
 .../TransportConnectionWrapper.cs             |  12 +-
 .../ViewportMessages.cs                       |   7 +
 .../Avalonia.LinuxFramebuffer.csproj          |  24 +--
 .../LinuxFramebufferPlatform.cs               |   7 +-
 src/Linux/Avalonia.LinuxFramebuffer/Mice.cs   |   2 +-
 .../Avalonia.Designer.HostApp.csproj          |  25 +++
 .../DetachableTransportConnection.cs          |  35 ++++
 .../PreviewerWindowImpl.cs                    |  91 +++++++++
 .../PreviewerWindowingPlatform.cs             |  66 +++++++
 .../Avalonia.Designer.HostApp/Program.cs      | 173 ++++++++++++++++++
 src/tools/Avalonia.Designer.HostApp/Stubs.cs  | 136 ++++++++++++++
 34 files changed, 977 insertions(+), 139 deletions(-)
 create mode 100644 samples/Previewer/App.xaml
 create mode 100644 samples/Previewer/App.xaml.cs
 create mode 100644 samples/Previewer/Center.cs
 create mode 100644 samples/Previewer/MainWindow.xaml
 create mode 100644 samples/Previewer/MainWindow.xaml.cs
 create mode 100644 samples/Previewer/Previewer.csproj
 create mode 100644 samples/Previewer/Program.cs
 rename src/{Linux/Avalonia.LinuxFramebuffer/PlatformThreadingInterface.cs => Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs} (89%)
 create mode 100644 src/Avalonia.DesignerSupport/DesignWindowLoader.cs
 create mode 100644 src/Avalonia.Remote.Protocol/DesignMessages.cs
 create mode 100644 src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
 create mode 100644 src/tools/Avalonia.Designer.HostApp/DetachableTransportConnection.cs
 create mode 100644 src/tools/Avalonia.Designer.HostApp/PreviewerWindowImpl.cs
 create mode 100644 src/tools/Avalonia.Designer.HostApp/PreviewerWindowingPlatform.cs
 create mode 100644 src/tools/Avalonia.Designer.HostApp/Program.cs
 create mode 100644 src/tools/Avalonia.Designer.HostApp/Stubs.cs

diff --git a/Avalonia.sln b/Avalonia.sln
index 56c489fd0b..2f2b175fa3 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26730.3
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -189,6 +189,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Remote.Protocol",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RemoteTest", "samples\RemoteTest\RemoteTest.csproj", "{E2999E4A-9086-401F-898C-AEB0AD38E676}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{4ED8B739-6F4E-4CD4-B993-545E6B5CE637}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Designer.HostApp", "src\tools\Avalonia.Designer.HostApp\Avalonia.Designer.HostApp.csproj", "{050CC912-FF49-4A8B-B534-9544017446DD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Previewer", "samples\Previewer\Previewer.csproj", "{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{3c4c0cb4-0c0f-4450-a37b-148c84ff905f}*SharedItemsImports = 13
@@ -2598,6 +2604,86 @@ Global
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|Mono.Build.0 = Release|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|x86.ActiveCfg = Release|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|x86.Build.0 = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Mono.ActiveCfg = Ad-Hoc|Mono
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Mono.Build.0 = Ad-Hoc|Mono
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|x86
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|x86.Build.0 = Ad-Hoc|x86
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|Any CPU.ActiveCfg = AppStore|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|Any CPU.Build.0 = AppStore|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhone.Build.0 = AppStore|iPhone
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|Mono.ActiveCfg = AppStore|Mono
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|Mono.Build.0 = AppStore|Mono
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|x86.ActiveCfg = AppStore|x86
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|x86.Build.0 = AppStore|x86
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhone.Build.0 = Debug|iPhone
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Mono.ActiveCfg = Debug|Mono
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Mono.Build.0 = Debug|Mono
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|x86.ActiveCfg = Debug|x86
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|x86.Build.0 = Debug|x86
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhone.ActiveCfg = Release|iPhone
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhone.Build.0 = Release|iPhone
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Mono.ActiveCfg = Release|Mono
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Mono.Build.0 = Release|Mono
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|x86.ActiveCfg = Release|x86
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|x86.Build.0 = Release|x86
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Mono.ActiveCfg = Ad-Hoc|Mono
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Mono.Build.0 = Ad-Hoc|Mono
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|x86
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|x86.Build.0 = Ad-Hoc|x86
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|Any CPU.ActiveCfg = AppStore|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|Any CPU.Build.0 = AppStore|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhone.Build.0 = AppStore|iPhone
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|Mono.ActiveCfg = AppStore|Mono
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|Mono.Build.0 = AppStore|Mono
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|x86.ActiveCfg = AppStore|x86
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|x86.Build.0 = AppStore|x86
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhone.Build.0 = Debug|iPhone
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Mono.ActiveCfg = Debug|Mono
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Mono.Build.0 = Debug|Mono
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|x86.ActiveCfg = Debug|x86
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|x86.Build.0 = Debug|x86
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhone.ActiveCfg = Release|iPhone
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhone.Build.0 = Release|iPhone
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Mono.ActiveCfg = Release|Mono
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Mono.Build.0 = Release|Mono
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|x86.ActiveCfg = Release|x86
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2656,8 +2742,12 @@ Global
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E} = {B39A8919-9F95-48FE-AD7B-76E08B509888}
 		{E1582370-37B3-403C-917F-8209551B1634} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{E2999E4A-9086-401F-898C-AEB0AD38E676} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{050CC912-FF49-4A8B-B534-9544017446DD} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1E8CA5AA-707A-4C57-A682-D265A49E10C3}
+		{050CC912-FF49-4A8B-B534-9544017446DD} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 	EndGlobalSection
 EndGlobal
diff --git a/Avalonia.sln.DotSettings b/Avalonia.sln.DotSettings
index 1fd6f8d092..d61208c358 100644
--- a/Avalonia.sln.DotSettings
+++ b/Avalonia.sln.DotSettings
@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Examl/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=3E53A01A_002DB331_002D47F3_002DB828_002D4A5717E77A24_002Fd_003Aglass/@EntryIndexedValue">ExplicitlyExcluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=6417B24E_002D49C2_002D4985_002D8DB2_002D3AB9D898EC91/@EntryIndexedValue">ExplicitlyExcluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=E3A1060B_002D50D0_002D44E8_002D88B6_002DF44EF2E5BD72_002Ff_003Ahtml_002Ehtm/@EntryIndexedValue">ExplicitlyExcluded</s:String>
diff --git a/samples/ControlCatalog.NetCore/Program.cs b/samples/ControlCatalog.NetCore/Program.cs
index 7c67a239e6..7e7fb7d2bf 100644
--- a/samples/ControlCatalog.NetCore/Program.cs
+++ b/samples/ControlCatalog.NetCore/Program.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using Avalonia;
+using Avalonia.Controls;
 
 namespace ControlCatalog.NetCore
 {
@@ -8,17 +9,22 @@ namespace ControlCatalog.NetCore
     {
         static void Main(string[] args)
         {
-            if (args.Contains("--fbdev")) AppBuilder.Configure<App>().InitializeWithLinuxFramebuffer(tl =>
-            {
-                tl.Content = new MainView();
-                System.Threading.ThreadPool.QueueUserWorkItem(_ => ConsoleSilencer());
-            });
+            if (args.Contains("--fbdev"))
+                AppBuilder.Configure<App>().InitializeWithLinuxFramebuffer(tl =>
+                {
+                    tl.Content = new MainView();
+                    System.Threading.ThreadPool.QueueUserWorkItem(_ => ConsoleSilencer());
+                });
             else
-                AppBuilder.Configure<App>()
-                    .UsePlatformDetect()
-                    .Start<MainWindow>();
+                BuildAvaloniaApp().Start<MainWindow>();
         }
 
+        /// <summary>
+        /// This method is needed for IDE previewer infrastructure
+        /// </summary>
+        public static AppBuilder BuildAvaloniaApp()
+            => AppBuilder.Configure<App>().UsePlatformDetect();
+
         static void ConsoleSilencer()
         {
             Console.CursorVisible = false;
diff --git a/samples/Previewer/App.xaml b/samples/Previewer/App.xaml
new file mode 100644
index 0000000000..6bae1955af
--- /dev/null
+++ b/samples/Previewer/App.xaml
@@ -0,0 +1,6 @@
+<Application xmlns="https://github.com/avaloniaui">
+    <Application.Styles>
+        <StyleInclude Source="resm:Avalonia.Themes.Default.DefaultTheme.xaml?assembly=Avalonia.Themes.Default"/>
+        <StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"/>
+    </Application.Styles>
+</Application>
\ No newline at end of file
diff --git a/samples/Previewer/App.xaml.cs b/samples/Previewer/App.xaml.cs
new file mode 100644
index 0000000000..fffa987a27
--- /dev/null
+++ b/samples/Previewer/App.xaml.cs
@@ -0,0 +1,14 @@
+using Avalonia;
+using Avalonia.Markup.Xaml;
+
+namespace Previewer
+{
+    public class App : Application
+    {
+        public override void Initialize()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/samples/Previewer/Center.cs b/samples/Previewer/Center.cs
new file mode 100644
index 0000000000..7a28827d61
--- /dev/null
+++ b/samples/Previewer/Center.cs
@@ -0,0 +1,19 @@
+using Avalonia;
+using Avalonia.Controls;
+
+namespace Previewer
+{
+    public class Center : Decorator
+    {
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            if (Child != null)
+            {
+                var desired = Child.DesiredSize;
+                Child.Arrange(new Rect((finalSize.Width - desired.Width) / 2, (finalSize.Height - desired.Height) / 2,
+                    desired.Width, desired.Height));
+            }
+            return finalSize;
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/Previewer/MainWindow.xaml b/samples/Previewer/MainWindow.xaml
new file mode 100644
index 0000000000..eb612303f2
--- /dev/null
+++ b/samples/Previewer/MainWindow.xaml
@@ -0,0 +1,12 @@
+<Window xmlns="https://github.com/avaloniaui" Width="600" Height="500"
+        Title="Previewer">
+    <Grid RowDefinitions="0.5*,200">
+        <ScrollViewer Name="Remote"/>
+        
+        <ScrollViewer Name="ErrorsContainer" Background="#ffe0e0">
+            <TextBlock Name="Errors"/>
+        </ScrollViewer>
+        <TextBox Grid.Row="1" AcceptsReturn="True" Name="Xaml"/>
+    </Grid>
+    
+</Window>
\ No newline at end of file
diff --git a/samples/Previewer/MainWindow.xaml.cs b/samples/Previewer/MainWindow.xaml.cs
new file mode 100644
index 0000000000..c72b1f7e55
--- /dev/null
+++ b/samples/Previewer/MainWindow.xaml.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Net;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Remote;
+using Avalonia.Markup.Xaml;
+using Avalonia.Remote.Protocol;
+using Avalonia.Remote.Protocol.Designer;
+using Avalonia.Remote.Protocol.Viewport;
+using Avalonia.Threading;
+
+namespace Previewer
+{
+    public class MainWindow : Window
+    {
+        private const string InitialXaml = @"<Window xmlns=""https://github.com/avaloniaui"" Width=""600"" Height=""500"">
+        <TextBlock>Hello world!</TextBlock>
+    
+        </Window>";
+        private IAvaloniaRemoteTransportConnection _connection;
+        private Control _errorsContainer;
+        private TextBlock _errors;
+        private RemoteWidget _remote;
+
+
+        public MainWindow()
+        {
+            this.InitializeComponent();
+            var tb = this.FindControl<TextBox>("Xaml");
+            tb.Text = InitialXaml;
+            var scroll = this.FindControl<ScrollViewer>("Remote");
+            var rem = new Center();
+            scroll.Content = rem;
+            _errorsContainer = this.FindControl<Control>("ErrorsContainer");
+            _errors = this.FindControl<TextBlock>("Errors");
+            tb.GetObservable(TextBox.TextProperty).Subscribe(text => _connection?.Send(new UpdateXamlMessage
+            {
+                Xaml = text
+            }));
+            new BsonTcpTransport().Listen(IPAddress.Loopback, 25000, t =>
+            {
+                Dispatcher.UIThread.InvokeAsync(() =>
+                {
+                    if (_connection != null)
+                    {
+                        _connection.Dispose();
+                        _connection.OnMessage -= OnMessage;
+                    }
+                    _connection = t;
+                    rem.Child = _remote = new RemoteWidget(t);
+                    t.Send(new UpdateXamlMessage
+                    {
+                        Xaml = tb.Text
+                    });
+                    
+                    t.OnMessage += OnMessage;
+                });
+            });
+            Title = "Listening on 127.0.0.1:25000";
+        }
+
+        private void OnMessage(IAvaloniaRemoteTransportConnection transport, object obj)
+        {
+            Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                if (transport != _connection)
+                    return;
+                if (obj is UpdateXamlResultMessage result)
+                {
+                    _errorsContainer.IsVisible = result.Error != null;
+                    _errors.Text = result.Error ?? "";
+                }
+                if (obj is RequestViewportResizeMessage resize)
+                {
+                    _remote.Width = Math.Min(4096, Math.Max(resize.Width, 1));
+                    _remote.Height = Math.Min(4096, Math.Max(resize.Height, 1));
+                }
+            });
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/Previewer/Previewer.csproj b/samples/Previewer/Previewer.csproj
new file mode 100644
index 0000000000..13e2418d67
--- /dev/null
+++ b/samples/Previewer/Previewer.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Update="**\*.xaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
+    </Compile>
+    <EmbeddedResource Include="**\*.xaml" />
+    <ProjectReference Include="..\..\src\Avalonia.DotNetCoreRuntime\Avalonia.DotNetCoreRuntime.csproj" />
+    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
+    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.HtmlRenderer\Avalonia.HtmlRenderer.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/samples/Previewer/Program.cs b/samples/Previewer/Program.cs
new file mode 100644
index 0000000000..48363e27f2
--- /dev/null
+++ b/samples/Previewer/Program.cs
@@ -0,0 +1,13 @@
+using System;
+using Avalonia;
+
+namespace Previewer
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            AppBuilder.Configure<App>().UsePlatformDetect().Start<MainWindow>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/RemoteTest/RemoteTest.csproj b/samples/RemoteTest/RemoteTest.csproj
index 8682916503..2487c66e41 100644
--- a/samples/RemoteTest/RemoteTest.csproj
+++ b/samples/RemoteTest/RemoteTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Avalonia.Controls/Design.cs b/src/Avalonia.Controls/Design.cs
index a0b0d5d0ca..ce52891749 100644
--- a/src/Avalonia.Controls/Design.cs
+++ b/src/Avalonia.Controls/Design.cs
@@ -64,7 +64,7 @@ namespace Avalonia.Controls
             return rv;
         }
 
-        internal static void ApplyDesignerProperties(Control target, Control source)
+        public static void ApplyDesignModeProperties(Control target, Control source)
         {
             if (source.IsSet(WidthProperty))
                 target.Width = source.GetValue(WidthProperty);
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/PlatformThreadingInterface.cs b/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs
similarity index 89%
rename from src/Linux/Avalonia.LinuxFramebuffer/PlatformThreadingInterface.cs
rename to src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs
index 9231649754..eebde51555 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/PlatformThreadingInterface.cs
+++ b/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs
@@ -1,19 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 
-namespace Avalonia.LinuxFramebuffer
+namespace Avalonia.Controls.Platform
 {
-    class PlatformThreadingInterface : IPlatformThreadingInterface, IRenderLoop
+    public class InternalPlatformThreadingInterface : IPlatformThreadingInterface, IRenderLoop
     {
-        public static PlatformThreadingInterface Instance { get; } = new PlatformThreadingInterface();
-
-        public PlatformThreadingInterface()
+        public InternalPlatformThreadingInterface()
         {
             TlsCurrentThreadIsLoopThread = true;
             StartTimer(new TimeSpan(0, 0, 0, 0, 66), () => Tick?.Invoke(this, new EventArgs()));
@@ -36,7 +33,7 @@ namespace Avalonia.LinuxFramebuffer
                     while (true)
                     {
                         Action item;
-                        lock(_actions)
+                        lock (_actions)
                             if (_actions.Count == 0)
                                 break;
                             else
@@ -66,6 +63,7 @@ namespace Avalonia.LinuxFramebuffer
                 _timer = timer;
                 _handle = GCHandle.Alloc(_timer);
             }
+
             public void Dispose()
             {
                 _handle.Free();
@@ -109,4 +107,4 @@ namespace Avalonia.LinuxFramebuffer
         public event EventHandler<EventArgs> Tick;
 
     }
-}
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/Remote/RemoteWidget.cs b/src/Avalonia.Controls/Remote/RemoteWidget.cs
index f4bcb37d48..c05aeaf970 100644
--- a/src/Avalonia.Controls/Remote/RemoteWidget.cs
+++ b/src/Avalonia.Controls/Remote/RemoteWidget.cs
@@ -18,7 +18,7 @@ namespace Avalonia.Controls.Remote
         public RemoteWidget(IAvaloniaRemoteTransportConnection connection)
         {
             _connection = connection;
-            _connection.OnMessage += msg => Dispatcher.UIThread.InvokeAsync(() => OnMessage(msg));
+            _connection.OnMessage += (t, msg) => Dispatcher.UIThread.InvokeAsync(() => OnMessage(msg));
             _connection.Send(new ClientSupportedPixelFormatsMessage
             {
                 Formats = new[]
diff --git a/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs b/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
index be97f7caaa..c2e6a200f9 100644
--- a/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
+++ b/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
@@ -36,7 +36,7 @@ namespace Avalonia.Controls.Remote.Server
             _transport.OnMessage += OnMessage;
         }
 
-        private void OnMessage(object obj)
+        protected virtual void OnMessage(IAvaloniaRemoteTransportConnection transport, object obj)
         {
             lock (_lock)
             {
@@ -88,6 +88,12 @@ namespace Avalonia.Controls.Remote.Server
             }
         }
 
+        protected void SetDpi(Vector dpi)
+        {
+            _dpi = dpi;
+            RenderIfNeeded();
+        }
+
         protected virtual Size Measure(Size constaint)
         {
             var l = (ILayoutable) InputRoot;
@@ -131,7 +137,7 @@ namespace Avalonia.Controls.Remote.Server
             return _framebuffer;
         }
 
-        void RenderIfNeeded()
+        protected void RenderIfNeeded()
         {
             lock (_lock)
             {
diff --git a/src/Avalonia.DesignerSupport/DesignWindowLoader.cs b/src/Avalonia.DesignerSupport/DesignWindowLoader.cs
new file mode 100644
index 0000000000..9ad2a216b4
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/DesignWindowLoader.cs
@@ -0,0 +1,76 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Avalonia.Controls;
+using Avalonia.Controls.Platform;
+using Avalonia.Markup.Xaml;
+using Avalonia.Styling;
+
+namespace Avalonia.DesignerSupport
+{
+    public class DesignWindowLoader
+    {
+        public static Window LoadDesignerWindow(string xaml, string assemblyPath)
+        {
+            Window window;
+            Control control;
+            using (PlatformManager.DesignerMode())
+            {
+                var loader = new AvaloniaXamlLoader();
+                var stream = new MemoryStream(Encoding.UTF8.GetBytes(xaml));
+
+
+                
+                Uri baseUri = null;
+                if (assemblyPath != null)
+                {
+                    //Fabricate fake Uri
+                    baseUri =
+                        new Uri("resm:Fake.xaml?assembly=" + Path.GetFileNameWithoutExtension(assemblyPath));
+                }
+
+                var loaded = loader.Load(stream, null, baseUri);
+                var styles = loaded as Styles;
+                if (styles != null)
+                {
+                    var substitute = Design.GetPreviewWith(styles) ??
+                                     styles.Select(Design.GetPreviewWith).FirstOrDefault(s => s != null);
+                    if (substitute != null)
+                    {
+                        substitute.Styles.AddRange(styles);
+                        control = substitute;
+                    }
+                    else
+                        control = new StackPanel
+                        {
+                            Children =
+                            {
+                                new TextBlock {Text = "Styles can't be previewed without Design.PreviewWith. Add"},
+                                new TextBlock {Text = "<Design.PreviewWith>"},
+                                new TextBlock {Text = "    <Border Padding=20><!-- YOUR CONTROL FOR PREVIEW HERE--></Border>"},
+                                new TextBlock {Text = "<Design.PreviewWith>"},
+                                new TextBlock {Text = "before setters in your first Style"}
+                            }
+                        };
+                }
+                if (loaded is Application)
+                    control = new TextBlock {Text = "Application can't be previewed in design view"};
+                else
+                    control = (Control) loaded;
+
+                window = control as Window;
+                if (window == null)
+                {
+                    window = new Window() {Content = (Control)control};
+                }
+
+                if (!window.IsSet(Window.SizeToContentProperty))
+                    window.SizeToContent = SizeToContent.WidthAndHeight;
+            }
+            window.Show();
+            Design.ApplyDesignModeProperties(window, control);
+            return window;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.DesignerSupport/DesignerAssist.cs b/src/Avalonia.DesignerSupport/DesignerAssist.cs
index 2f5fc79147..65c4c14d83 100644
--- a/src/Avalonia.DesignerSupport/DesignerAssist.cs
+++ b/src/Avalonia.DesignerSupport/DesignerAssist.cs
@@ -86,67 +86,11 @@ namespace Avalonia.DesignerSupport
         private static void UpdateXaml2(Dictionary<string, object> dic)
         {
             var xamlInfo = new DesignerApiXamlFileInfo(dic);
-            Window window;
-            Control control;
-
-            using (PlatformManager.DesignerMode())
-            {
-                var loader = new AvaloniaXamlLoader();
-                var stream = new MemoryStream(Encoding.UTF8.GetBytes(xamlInfo.Xaml));
-
-
-                
-                Uri baseUri = null;
-                if (xamlInfo.AssemblyPath != null)
-                {
-                    //Fabricate fake Uri
-                    baseUri =
-                        new Uri("resm:Fake.xaml?assembly=" + Path.GetFileNameWithoutExtension(xamlInfo.AssemblyPath));
-                }
-
-                var loaded = loader.Load(stream, null, baseUri);
-                var styles = loaded as Styles;
-                if (styles != null)
-                {
-                    var substitute = Design.GetPreviewWith(styles) ??
-                                     styles.Select(Design.GetPreviewWith).FirstOrDefault(s => s != null);
-                    if (substitute != null)
-                    {
-                        substitute.Styles.AddRange(styles);
-                        control = substitute;
-                    }
-                    else
-                        control = new StackPanel
-                        {
-                            Children =
-                            {
-                                new TextBlock {Text = "Styles can't be previewed without Design.PreviewWith. Add"},
-                                new TextBlock {Text = "<Design.PreviewWith>"},
-                                new TextBlock {Text = "    <Border Padding=20><!-- YOUR CONTROL FOR PREVIEW HERE--></Border>"},
-                                new TextBlock {Text = "<Design.PreviewWith>"},
-                                new TextBlock {Text = "before setters in your first Style"}
-                            }
-                        };
-                }
-                if (loaded is Application)
-                    control = new TextBlock {Text = "Application can't be previewed in design view"};
-                else
-                    control = (Control) loaded;
-
-                window = control as Window;
-                if (window == null)
-                {
-                    window = new Window() {Content = (Control)control};
-                }
-
-                if (!window.IsSet(Window.SizeToContentProperty))
-                    window.SizeToContent = SizeToContent.WidthAndHeight;
-            }
+            Window window = DesignWindowLoader.LoadDesignerWindow(xamlInfo.Xaml, xamlInfo.AssemblyPath);
 
             s_currentWindow?.Close();
             s_currentWindow = window;
-            window.Show();
-            Design.ApplyDesignerProperties(window, control);
+            
             // ReSharper disable once PossibleNullReferenceException
             // Always not null at this point
             Api.OnWindowCreated?.Invoke(window.PlatformImpl.Handle.Handle);
diff --git a/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj b/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj
index 181f5e3a1e..32171e8495 100644
--- a/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj
+++ b/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj
@@ -10,7 +10,7 @@
         <Compile Include="..\Shared\SharedAssemblyInfo.cs">
             <Link>Properties\SharedAssemblyInfo.cs</Link>
         </Compile>
-
+	<Reference Include="System.Runtime"/>
         <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
         <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
         <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
@@ -18,4 +18,4 @@
     </ItemGroup>
     <Import Project="..\Shared\PlatformSupport\PlatformSupport.projitems" Label="Shared" />
     <Import Project="..\..\build\Rx.props" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs b/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs
index 8c983c385d..82765f98f6 100644
--- a/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs
+++ b/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs
@@ -8,7 +8,7 @@ using Newtonsoft.Json.Bson;
 
 namespace Avalonia.Remote.Protocol
 {
-    public class BsonStreamTransportConnection : IAvaloniaRemoteTransportConnection
+    class BsonStreamTransportConnection : IAvaloniaRemoteTransportConnection
     {
         private readonly IMessageTypeResolver _resolver;
         private readonly Stream _inputStream;
@@ -79,17 +79,8 @@ namespace Avalonia.Remote.Protocol
                     var guid = new Guid(guidBytes);
                     var buffer = new byte[length];
                     await ReadExact(buffer).ConfigureAwait(false);
-                    if (Environment.GetEnvironmentVariable("WTF") == "WTF")
-                    {
-
-                        using (var f = System.IO.File.Create("/tmp/wtf2.bin"))
-                        {
-                            f.Write(infoBlock, 0, infoBlock.Length);
-                            f.Write(buffer, 0, buffer.Length);
-                        }
-                    }
                     var message = Serializer.Deserialize(new BsonReader(new MemoryStream(buffer)), _resolver.GetByGuid(guid));
-                    OnMessage?.Invoke(message);
+                    OnMessage?.Invoke(this, message);
                 }
             }
             catch (Exception e)
@@ -150,11 +141,11 @@ namespace Avalonia.Remote.Protocol
             var cancel = e as OperationCanceledException;
             if (cancel?.CancellationToken == _cancel)
                 return;
-            OnException?.Invoke(e);
+            OnException?.Invoke(this, e);
         }
 
 
-        public event Action<object> OnMessage;
-        public event Action<Exception> OnException;
+        public event Action<IAvaloniaRemoteTransportConnection, object> OnMessage;
+        public event Action<IAvaloniaRemoteTransportConnection, Exception> OnException;
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Remote.Protocol/DesignMessages.cs b/src/Avalonia.Remote.Protocol/DesignMessages.cs
new file mode 100644
index 0000000000..d6e898f320
--- /dev/null
+++ b/src/Avalonia.Remote.Protocol/DesignMessages.cs
@@ -0,0 +1,17 @@
+namespace Avalonia.Remote.Protocol.Designer
+{
+    [AvaloniaRemoteMessageGuid("9AEC9A2E-6315-4066-B4BA-E9A9EFD0F8CC")]
+    public class UpdateXamlMessage
+    {
+        public string Xaml { get; set; }
+        public string AssemblyPath { get; set; }
+    }
+
+    [AvaloniaRemoteMessageGuid("B7A70093-0C5D-47FD-9261-22086D43A2E2")]
+    public class UpdateXamlResultMessage
+    {
+        public string Error { get; set; }
+    }
+    
+    
+}
\ No newline at end of file
diff --git a/src/Avalonia.Remote.Protocol/EventStash.cs b/src/Avalonia.Remote.Protocol/EventStash.cs
index 06840c8253..1fe561d473 100644
--- a/src/Avalonia.Remote.Protocol/EventStash.cs
+++ b/src/Avalonia.Remote.Protocol/EventStash.cs
@@ -3,18 +3,20 @@ using System.Collections.Generic;
 
 namespace Avalonia.Remote.Protocol
 {
-    public class EventStash<T>
+    class EventStash<T>
     {
+        private readonly IAvaloniaRemoteTransportConnection _transport;
         private readonly Action<Exception> _exceptionHandler;
         private List<T> _stash;
-        private Action<T> _delegate;
+        private Action<IAvaloniaRemoteTransportConnection, T> _delegate;
 
-        public EventStash(Action<Exception> exceptionHandler = null)
+        public EventStash(IAvaloniaRemoteTransportConnection transport, Action<Exception> exceptionHandler = null)
         {
+            _transport = transport;
             _exceptionHandler = exceptionHandler;
         }
         
-        public void Add(Action<T> handler)
+        public void Add(Action<IAvaloniaRemoteTransportConnection, T> handler)
         {
             List<T> stash;
             lock (this)
@@ -37,25 +39,25 @@ namespace Avalonia.Remote.Protocol
                 if (_exceptionHandler != null)
                     try
                     {
-                        _delegate?.Invoke(m);
+                        _delegate?.Invoke(_transport, m);
                     }
                     catch (Exception e)
                     {
                         _exceptionHandler(e);
                     }
                 else
-                    _delegate?.Invoke(m);
+                    _delegate?.Invoke(_transport, m);
             }
         }
         
         
-        public void Remove(Action<T> handler)
+        public void Remove(Action<IAvaloniaRemoteTransportConnection, T> handler)
         {
             lock (this)
                 _delegate -= handler;
         }
 
-        public void Fire(T ev)
+        public void Fire(IAvaloniaRemoteTransportConnection transport, T ev)
         {
             if (_delegate == null)
             {
@@ -66,7 +68,7 @@ namespace Avalonia.Remote.Protocol
                 }
             }
             else
-                _delegate?.Invoke(ev);
+                _delegate?.Invoke(_transport, ev);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Remote.Protocol/ITransport.cs b/src/Avalonia.Remote.Protocol/ITransport.cs
index d4e5427cb4..afc7d86845 100644
--- a/src/Avalonia.Remote.Protocol/ITransport.cs
+++ b/src/Avalonia.Remote.Protocol/ITransport.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Remote.Protocol
     public interface IAvaloniaRemoteTransportConnection : IDisposable
     {
         Task Send(object data);
-        event Action<object> OnMessage;
-        event Action<Exception> OnException;
+        event Action<IAvaloniaRemoteTransportConnection, object> OnMessage;
+        event Action<IAvaloniaRemoteTransportConnection, Exception> OnException;
     }
 }
diff --git a/src/Avalonia.Remote.Protocol/TcpTransportBase.cs b/src/Avalonia.Remote.Protocol/TcpTransportBase.cs
index 4278badaae..af62f2da59 100644
--- a/src/Avalonia.Remote.Protocol/TcpTransportBase.cs
+++ b/src/Avalonia.Remote.Protocol/TcpTransportBase.cs
@@ -50,17 +50,11 @@ namespace Avalonia.Remote.Protocol
                     AcceptNew();
                     Task.Run(async () =>
                     {
-                        try
-                        {
-                            var tcs = new TaskCompletionSource<int>();
-                            var t = CreateTransport(_resolver, cl.GetStream(), () => tcs.TrySetResult(0));
-                            cb(t);
-                            await tcs.Task;
-                        }
-                        finally
-                        {
-                            cl.Dispose();
-                        }
+                        var tcs = new TaskCompletionSource<int>();
+                        var t = CreateTransport(_resolver, cl.GetStream(), () => tcs.TrySetResult(0));
+                        cb(t);
+                        await tcs.Task;
+
 
                     });
                 }
diff --git a/src/Avalonia.Remote.Protocol/TransportConnectionWrapper.cs b/src/Avalonia.Remote.Protocol/TransportConnectionWrapper.cs
index b01b6d7303..1e821b7c24 100644
--- a/src/Avalonia.Remote.Protocol/TransportConnectionWrapper.cs
+++ b/src/Avalonia.Remote.Protocol/TransportConnectionWrapper.cs
@@ -8,7 +8,7 @@ namespace Avalonia.Remote.Protocol
     {
         private readonly IAvaloniaRemoteTransportConnection _conn;
         private EventStash<object> _onMessage;
-        private EventStash<Exception> _onException = new EventStash<Exception>();
+        private EventStash<Exception> _onException;
         
         private Queue<SendOperation> _sendQueue = new Queue<SendOperation>();
         private object _lock =new object();
@@ -17,7 +17,8 @@ namespace Avalonia.Remote.Protocol
         public TransportConnectionWrapper(IAvaloniaRemoteTransportConnection conn)
         {
             _conn = conn;
-            _onMessage = new EventStash<object>(_onException.Fire);
+            _onException = new EventStash<Exception>(this);
+            _onMessage = new EventStash<object>(this, e => _onException.Fire(this, e));
             _conn.OnException +=_onException.Fire;
             conn.OnMessage +=  _onMessage.Fire;
 
@@ -58,8 +59,7 @@ namespace Avalonia.Remote.Protocol
                 {
                     wi.Tcs.TrySetException(e);
                 }
-            }
-            
+            }    
         }
         
         public Task Send(object data)
@@ -86,13 +86,13 @@ namespace Avalonia.Remote.Protocol
             return tcs.Task;
         }
         
-        public event Action<object> OnMessage
+        public event Action<IAvaloniaRemoteTransportConnection, object> OnMessage
         {
             add => _onMessage.Add(value);
             remove => _onMessage.Remove(value);
         }
 
-        public event Action<Exception> OnException
+        public event Action<IAvaloniaRemoteTransportConnection, Exception> OnException
         {
             add => _onException.Add(value);
             remove => _onException.Remove(value);
diff --git a/src/Avalonia.Remote.Protocol/ViewportMessages.cs b/src/Avalonia.Remote.Protocol/ViewportMessages.cs
index 82a7688f37..f71e893d26 100644
--- a/src/Avalonia.Remote.Protocol/ViewportMessages.cs
+++ b/src/Avalonia.Remote.Protocol/ViewportMessages.cs
@@ -30,6 +30,13 @@ namespace Avalonia.Remote.Protocol.Viewport
         public double DpiY { get; set; }
     }
 
+    [AvaloniaRemoteMessageGuid("9B47B3D8-61DF-4C38-ACD4-8C1BB72554AC")]
+    public class RequestViewportResizeMessage
+    {
+        public double Width { get; set; }
+        public double Height { get; set; }
+    }
+
     [AvaloniaRemoteMessageGuid("63481025-7016-43FE-BADC-F2FD0F88609E")]
     public class ClientSupportedPixelFormatsMessage
     {
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj
index c38cb0f114..466b47f7a0 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    </PropertyGroup>
-    <ItemGroup>
-      <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
-      <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
-      <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" />
-      <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-      <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-      <ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
-    </ItemGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
+    <ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
index bc1684cc15..e733beae27 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
@@ -12,6 +12,7 @@ using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Threading;
 using Avalonia;
+using Avalonia.Controls.Platform;
 
 namespace Avalonia.LinuxFramebuffer
 {
@@ -22,6 +23,7 @@ namespace Avalonia.LinuxFramebuffer
         public static MouseDevice MouseDevice = new MouseDevice();
         private static readonly Stopwatch St = Stopwatch.StartNew();
         internal static uint Timestamp => (uint)St.ElapsedTicks;
+        public static InternalPlatformThreadingInterface Threading;
         public static FramebufferToplevelImpl TopLevel;
         LinuxFramebufferPlatform(string fbdev = null)
         {
@@ -31,12 +33,13 @@ namespace Avalonia.LinuxFramebuffer
 
         void Initialize()
         {
+            Threading = new InternalPlatformThreadingInterface();
             AvaloniaLocator.CurrentMutable
                 .Bind<IStandardCursorFactory>().ToTransient<CursorFactoryStub>()
                 .Bind<IKeyboardDevice>().ToConstant(KeyboardDevice)
                 .Bind<IPlatformSettings>().ToSingleton<PlatformSettings>()
-                .Bind<IPlatformThreadingInterface>().ToConstant(PlatformThreadingInterface.Instance)
-                .Bind<IRenderLoop>().ToConstant(PlatformThreadingInterface.Instance);
+                .Bind<IPlatformThreadingInterface>().ToConstant(Threading)
+                .Bind<IRenderLoop>().ToConstant(Threading);
         }
 
         internal static TopLevel Initialize<T>(T builder, string fbdev = null) where T : AppBuilderBase<T>, new()
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Mice.cs b/src/Linux/Avalonia.LinuxFramebuffer/Mice.cs
index d1cf9eefb6..7e85796c0c 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Mice.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Mice.cs
@@ -55,7 +55,7 @@ namespace Avalonia.LinuxFramebuffer
                             if (!ev.HasValue)
                                 break;
 
-                            PlatformThreadingInterface.Instance.Send(() => ProcessEvent(dev, ev.Value));
+                            LinuxFramebufferPlatform.Threading.Send(() => ProcessEvent(dev, ev.Value));
                         } 
                     }
                 }
diff --git a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
new file mode 100644
index 0000000000..f0f3b12cc5
--- /dev/null
+++ b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Avalonia.DesignerSupport\DesignWindowLoader.cs"/>
+    <ProjectReference Include="..\..\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj" />
+    <ProjectReference Include="..\..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
+    <ProjectReference Include="..\..\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\Avalonia.HtmlRenderer\Avalonia.HtmlRenderer.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj" />
+    <ProjectReference Include="..\..\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\..\samples\ControlCatalog.NetCore\ControlCatalog.NetCore.csproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/tools/Avalonia.Designer.HostApp/DetachableTransportConnection.cs b/src/tools/Avalonia.Designer.HostApp/DetachableTransportConnection.cs
new file mode 100644
index 0000000000..9cd87a2c59
--- /dev/null
+++ b/src/tools/Avalonia.Designer.HostApp/DetachableTransportConnection.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Remote.Protocol;
+
+namespace Avalonia.Designer.HostApp
+{
+    class DetachableTransportConnection : IAvaloniaRemoteTransportConnection
+    {
+        private IAvaloniaRemoteTransportConnection _inner;
+
+        public DetachableTransportConnection(IAvaloniaRemoteTransportConnection inner)
+        {
+            _inner = inner;
+            _inner.OnMessage += FireOnMessage;
+        }
+
+        public void Dispose()
+        {
+            if (_inner != null)
+                _inner.OnMessage -= FireOnMessage;
+            _inner = null;
+        }
+
+        public void FireOnMessage(IAvaloniaRemoteTransportConnection transport, object obj) => OnMessage?.Invoke(transport, obj);
+        
+        public Task Send(object data)
+        {
+            return _inner?.Send(data);
+        }
+
+        public event Action<IAvaloniaRemoteTransportConnection, object> OnMessage;
+
+        public event Action<IAvaloniaRemoteTransportConnection, Exception> OnException;
+    }
+}
\ No newline at end of file
diff --git a/src/tools/Avalonia.Designer.HostApp/PreviewerWindowImpl.cs b/src/tools/Avalonia.Designer.HostApp/PreviewerWindowImpl.cs
new file mode 100644
index 0000000000..5ffaa6459a
--- /dev/null
+++ b/src/tools/Avalonia.Designer.HostApp/PreviewerWindowImpl.cs
@@ -0,0 +1,91 @@
+using System;
+using System.Reactive.Disposables;
+using Avalonia.Controls;
+using Avalonia.Controls.Remote.Server;
+using Avalonia.Platform;
+using Avalonia.Remote.Protocol;
+using Avalonia.Remote.Protocol.Viewport;
+using Avalonia.Threading;
+
+namespace Avalonia.Designer.HostApp
+{
+    public class PreviewerWindowImpl : RemoteServerTopLevelImpl, IWindowImpl, IEmbeddableWindowImpl
+    {
+        private readonly IAvaloniaRemoteTransportConnection _transport;
+
+        public PreviewerWindowImpl(IAvaloniaRemoteTransportConnection transport) : base(transport)
+        {
+            _transport = transport;
+            ClientSize = new Size(1, 1);
+        }
+
+        public void Show()
+        {
+        }
+
+        public void Hide()
+        {
+        }
+
+        public void BeginMoveDrag()
+        {
+        }
+
+        public void BeginResizeDrag(WindowEdge edge)
+        {
+        }
+
+        public Point Position { get; set; }
+        public Action<Point> PositionChanged { get; set; }
+        public Action Deactivated { get; set; }
+        public Action Activated { get; set; }
+        public IPlatformHandle Handle { get; }
+        public WindowState WindowState { get; set; }
+        public Size MaxClientSize { get; } = new Size(4096, 4096);
+        public event Action LostFocus;
+
+        protected override void OnMessage(IAvaloniaRemoteTransportConnection transport, object obj)
+        {
+            // In previewer mode we completely ignore client-side viewport size
+            if (obj is ClientViewportAllocatedMessage alloc)
+            {
+                Dispatcher.UIThread.InvokeAsync(() => SetDpi(new Vector(alloc.DpiX, alloc.DpiY)));
+                return;
+            }
+            base.OnMessage(transport, obj);
+        }
+        
+        public void Resize(Size clientSize)
+        {
+            _transport.Send(new RequestViewportResizeMessage
+            {
+                Width = clientSize.Width,
+                Height = clientSize.Height
+            });
+            ClientSize = clientSize;
+            RenderIfNeeded();
+        }
+        
+        public void Activate()
+        {
+        }
+        
+        public void SetTitle(string title)
+        {
+        }
+
+        public IDisposable ShowDialog()
+        {
+            return Disposable.Empty;
+        }
+
+        public void SetSystemDecorations(bool enabled)
+        {
+        }
+
+        public void SetIcon(IWindowIconImpl icon)
+        {
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/tools/Avalonia.Designer.HostApp/PreviewerWindowingPlatform.cs b/src/tools/Avalonia.Designer.HostApp/PreviewerWindowingPlatform.cs
new file mode 100644
index 0000000000..b33f871139
--- /dev/null
+++ b/src/tools/Avalonia.Designer.HostApp/PreviewerWindowingPlatform.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Controls.Platform;
+using Avalonia.Input;
+using Avalonia.Input.Platform;
+using Avalonia.Platform;
+using Avalonia.Remote.Protocol;
+using Avalonia.Rendering;
+
+namespace Avalonia.Designer.HostApp
+{
+    class PreviewerWindowingPlatform : IWindowingPlatform, IPlatformSettings
+    {
+        static readonly IKeyboardDevice Keyboard = new KeyboardDevice();
+        private static IAvaloniaRemoteTransportConnection s_transport;
+        private static DetachableTransportConnection s_lastWindowTransport;
+        private static PreviewerWindowImpl s_lastWindow;
+        public static List<object> PreFlightMessages = new List<object>();
+        
+        public IWindowImpl CreateWindow() => new WindowStub();
+
+        public IEmbeddableWindowImpl CreateEmbeddableWindow()
+        {
+            if (s_lastWindow != null)
+            {
+                s_lastWindowTransport.Dispose();
+                try
+                {
+                    s_lastWindow.Dispose();
+                }
+                catch
+                {
+                    //Ignore
+                }
+            }
+            s_lastWindow =
+                new PreviewerWindowImpl(s_lastWindowTransport = new DetachableTransportConnection(s_transport));
+            foreach (var pf in PreFlightMessages)
+                s_lastWindowTransport.FireOnMessage(s_lastWindowTransport, pf);
+            return s_lastWindow;
+        }
+
+        public IPopupImpl CreatePopup() => new WindowStub();
+
+        public static void Initialize(IAvaloniaRemoteTransportConnection transport)
+        {
+            s_transport = transport;
+            var instance = new PreviewerWindowingPlatform();
+            var threading = new InternalPlatformThreadingInterface();
+            AvaloniaLocator.CurrentMutable
+                .Bind<IClipboard>().ToSingleton<ClipboardStub>()
+                .Bind<IStandardCursorFactory>().ToSingleton<CursorFactoryStub>()
+                .Bind<IKeyboardDevice>().ToConstant(Keyboard)
+                .Bind<IPlatformSettings>().ToConstant(instance)
+                .Bind<IPlatformThreadingInterface>().ToConstant(threading)
+                .Bind<IRenderLoop>().ToConstant(threading)
+                .Bind<ISystemDialogImpl>().ToSingleton<SystemDialogsStub>()
+                .Bind<IWindowingPlatform>().ToConstant(instance)
+                .Bind<IPlatformIconLoader>().ToSingleton<IconLoaderStub>();
+
+        }
+
+        public Size DoubleClickSize { get; } = new Size(2, 2);
+        public TimeSpan DoubleClickTime { get; } = TimeSpan.FromMilliseconds(500);
+    }
+}
\ No newline at end of file
diff --git a/src/tools/Avalonia.Designer.HostApp/Program.cs b/src/tools/Avalonia.Designer.HostApp/Program.cs
new file mode 100644
index 0000000000..88dadf479e
--- /dev/null
+++ b/src/tools/Avalonia.Designer.HostApp/Program.cs
@@ -0,0 +1,173 @@
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.DesignerSupport;
+using Avalonia.Input;
+using Avalonia.Remote.Protocol;
+using Avalonia.Remote.Protocol.Designer;
+using Avalonia.Remote.Protocol.Viewport;
+using Avalonia.Threading;
+
+namespace Avalonia.Designer.HostApp
+{
+    class Program
+    {
+        
+        private static ClientSupportedPixelFormatsMessage s_supportedPixelFormats;
+        private static ClientViewportAllocatedMessage s_viewportAllocatedMessage;
+        private static IAvaloniaRemoteTransportConnection s_transport;
+        class CommandLineArgs
+        {
+            public string AppPath { get; set; }
+            public Uri Transport { get; set; }
+        }
+
+        static Exception  Die(string error)
+        {
+            if (error != null)
+            {
+                Console.Error.WriteLine(error);
+                Console.Error.Flush();
+            }
+            Environment.Exit(1);
+            return new Exception("APPEXIT");
+        }
+
+        static Exception PrintUsage()
+        {
+            Console.Error.WriteLine("Usage: --transport transport_spec app");
+            Console.Error.WriteLine();
+            Console.Error.WriteLine("Example: --transport tcp-bson://127.0.0.1:30243/ MyApp.exe");
+            Console.Error.Flush();
+            return Die(null);
+        }
+        
+        static CommandLineArgs ParseCommandLineArgs(string[] args)
+        {
+            var rv = new CommandLineArgs();
+            Action<string> next = null;
+            try
+            {
+                foreach (var arg in args)
+                {
+                    if (next != null)
+                    {
+                        next(arg);
+                        next = null;
+                    }
+                    else if (arg == "--transport")
+                        next = a => rv.Transport = new Uri(a, UriKind.Absolute);
+                    else if (rv.AppPath == null)
+                        rv.AppPath = arg;
+                    else
+                        PrintUsage();
+
+                }
+                if (rv.AppPath == null || rv.Transport == null)
+                    PrintUsage();
+            }
+            catch
+            {
+                PrintUsage();
+            }
+            return rv;
+        }
+
+        static IAvaloniaRemoteTransportConnection CreateTransport(Uri transport)
+        {
+            if (transport.Scheme == "tcp-bson")
+            {
+                return new BsonTcpTransport().Connect(IPAddress.Parse(transport.Host), transport.Port).Result;
+            }
+            PrintUsage();
+            return null;
+        }
+
+        interface IAppInitializer
+        {
+            Application GetConfiguredApp(IAvaloniaRemoteTransportConnection transport, object obj);
+        }
+        
+        class AppInitializer<T> : IAppInitializer where T : AppBuilderBase<T>, new()
+        {
+            public Application GetConfiguredApp(IAvaloniaRemoteTransportConnection transport, object obj)
+            {
+                var builder = (AppBuilderBase<T>) obj;
+                builder.UseWindowingSubsystem(() => PreviewerWindowingPlatform.Initialize(transport));
+                builder.SetupWithoutStarting();
+                return builder.Instance;
+            }
+        }
+
+        private const string BuilderMethodName = "BuildAvaloniaApp";
+
+        class NeverClose : ICloseable
+        {
+            public event EventHandler Closed;
+        }
+        
+        static void Main(string[] cmdline)
+        {
+            var args = ParseCommandLineArgs(cmdline);
+            var transport = CreateTransport(args.Transport);
+            var asm = Assembly.LoadFile(System.IO.Path.GetFullPath(args.AppPath));
+            var entryPoint = asm.EntryPoint;
+            if (entryPoint == null)
+                throw Die($"Assembly {args.AppPath} doesn't have an entry point");
+            var builderMethod = entryPoint.DeclaringType.GetMethod(BuilderMethodName,
+                BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic);
+            if (builderMethod == null)
+                throw Die($"{entryPoint.DeclaringType.FullName} doesn't have a method named {BuilderMethodName}");
+
+            var appBuilder = builderMethod.Invoke(null, null);
+            var initializer =(IAppInitializer)Activator.CreateInstance(typeof(AppInitializer<>).MakeGenericType(appBuilder.GetType()));
+            var app = initializer.GetConfiguredApp(transport, appBuilder);
+            s_transport = transport;
+            transport.OnMessage += OnTransportMessage;
+            transport.OnException += (t, e) => Die(e.ToString());
+            app.Run(new NeverClose());
+        }
+
+
+        private static void RebuildPreFlight()
+        {
+            PreviewerWindowingPlatform.PreFlightMessages = new List<object>
+            {
+                s_supportedPixelFormats,
+                s_viewportAllocatedMessage
+            };
+        }
+        
+        private static void OnTransportMessage(IAvaloniaRemoteTransportConnection transport, object obj) => Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            if (obj is ClientSupportedPixelFormatsMessage formats)
+            {
+                s_supportedPixelFormats = formats;
+                RebuildPreFlight();
+            }
+            if (obj is ClientViewportAllocatedMessage viewport)
+            {
+                s_viewportAllocatedMessage = viewport;
+                RebuildPreFlight();
+            }
+            if (obj is UpdateXamlMessage xaml)
+            {
+                try
+                {
+                    DesignWindowLoader.LoadDesignerWindow(xaml.Xaml, xaml.AssemblyPath);
+                    s_transport.Send(new UpdateXamlResultMessage());
+                }
+                catch (Exception e)
+                {
+                    s_transport.Send(new UpdateXamlResultMessage
+                    {
+                        Error = e.ToString()
+                    });
+                }
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/tools/Avalonia.Designer.HostApp/Stubs.cs b/src/tools/Avalonia.Designer.HostApp/Stubs.cs
new file mode 100644
index 0000000000..a4160e7da4
--- /dev/null
+++ b/src/tools/Avalonia.Designer.HostApp/Stubs.cs
@@ -0,0 +1,136 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reactive.Disposables;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.Platform;
+using Avalonia.Input;
+using Avalonia.Input.Platform;
+using Avalonia.Input.Raw;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+
+namespace Avalonia.Designer.HostApp
+{
+    /// <summary>
+    /// Popups are no-op
+    /// </summary>
+    
+    class WindowStub : IPopupImpl, IWindowImpl
+    {
+        public Action Deactivated { get; set; }
+        public Action Activated { get; set; }
+        public IPlatformHandle Handle { get; }
+        public Size MaxClientSize { get; }
+        public Size ClientSize { get; }
+        public double Scaling { get; }
+        public IEnumerable<object> Surfaces { get; }
+        public Action<RawInputEventArgs> Input { get; set; }
+        public Action<Rect> Paint { get; set; }
+        public Action<Size> Resized { get; set; }
+        public Action<double> ScalingChanged { get; set; }
+        public Action Closed { get; set; }
+        public IMouseDevice MouseDevice { get; } = new MouseDevice();
+        public Point Position { get; set; }
+        public Action<Point> PositionChanged { get; set; }
+        public WindowState WindowState { get; set; }
+        public IRenderer CreateRenderer(IRenderRoot root) => new ImmediateRenderer(root);
+        public void Dispose()
+        {
+        }
+        public void Invalidate(Rect rect)
+        {
+        }
+
+        public void SetInputRoot(IInputRoot inputRoot)
+        {
+        }
+
+        public Point PointToClient(Point point) => point;
+
+        public Point PointToScreen(Point point) => point;
+
+        public void SetCursor(IPlatformHandle cursor)
+        {
+        }
+
+        public void Show()
+        {
+        }
+
+        public void Hide()
+        {
+        }
+
+        public void BeginMoveDrag()
+        {
+        }
+
+        public void BeginResizeDrag(WindowEdge edge)
+        {
+        }
+
+        public void Activate()
+        {
+        }
+
+        public void Resize(Size clientSize)
+        {
+        }
+
+        public void SetTitle(string title)
+        {
+        }
+
+        public IDisposable ShowDialog() => Disposable.Empty;
+
+        public void SetSystemDecorations(bool enabled)
+        {
+        }
+
+        public void SetIcon(IWindowIconImpl icon)
+        {
+        }
+    }
+
+    class ClipboardStub : IClipboard
+    {
+        public Task<string> GetTextAsync() => Task.FromResult("");
+
+        public Task SetTextAsync(string text) => Task.CompletedTask;
+
+        public Task ClearAsync() => Task.CompletedTask;
+    }
+
+    class CursorFactoryStub : IStandardCursorFactory
+    {
+        public IPlatformHandle GetCursor(StandardCursorType cursorType) => new PlatformHandle(IntPtr.Zero, "STUB");
+    }
+
+    class IconLoaderStub : IPlatformIconLoader
+    {
+        class IconStub : IWindowIconImpl
+        {
+            public void Save(Stream outputStream)
+            {
+                
+            }
+        }
+
+        public IWindowIconImpl LoadIcon(string fileName) => new IconStub();
+
+        public IWindowIconImpl LoadIcon(Stream stream) => new IconStub();
+
+        public IWindowIconImpl LoadIcon(IBitmapImpl bitmap) => new IconStub();
+    }
+
+    class SystemDialogsStub : ISystemDialogImpl
+    {
+        public Task<string[]> ShowFileDialogAsync(FileDialog dialog, IWindowImpl parent) =>
+            Task.FromResult((string[]) null);
+
+        public Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, IWindowImpl parent) =>
+            Task.FromResult((string) null);
+    }
+}
\ No newline at end of file

From bb5a7f0cd3d1157885f5f2e140142f5a0adbf843 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@github.com>
Date: Sat, 23 Sep 2017 20:54:06 -0700
Subject: [PATCH 018/482] Removed IRenderLayerFactory

And use `IDrawingContextImpl.CreateLayer` instead.
---
 .../Rendering/DefaultRenderLayerFactory.cs    |  34 ---
 .../Rendering/DeferredRenderer.cs             | 153 ++++++------
 .../Rendering/IRenderLayerFactory.cs          |  11 -
 src/Avalonia.Visuals/Rendering/RenderLayer.cs |  10 +-
 .../Rendering/RenderLayers.cs                 |   9 +-
 .../Rendering/DeferredRendererTests.cs        | 220 ++++++++----------
 6 files changed, 175 insertions(+), 262 deletions(-)
 delete mode 100644 src/Avalonia.Visuals/Rendering/DefaultRenderLayerFactory.cs
 delete mode 100644 src/Avalonia.Visuals/Rendering/IRenderLayerFactory.cs

diff --git a/src/Avalonia.Visuals/Rendering/DefaultRenderLayerFactory.cs b/src/Avalonia.Visuals/Rendering/DefaultRenderLayerFactory.cs
deleted file mode 100644
index c75f948b66..0000000000
--- a/src/Avalonia.Visuals/Rendering/DefaultRenderLayerFactory.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using Avalonia.Platform;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering
-{
-    public class DefaultRenderLayerFactory : IRenderLayerFactory
-    {
-        private IPlatformRenderInterface _renderInterface;
-
-        public DefaultRenderLayerFactory()
-            : this(AvaloniaLocator.Current.GetService<IPlatformRenderInterface>())
-        {
-        }
-
-        public DefaultRenderLayerFactory(IPlatformRenderInterface renderInterface)
-        {
-            _renderInterface = renderInterface;
-        }
-
-        public IRenderTargetBitmapImpl CreateLayer(
-            IVisual layerRoot,
-            Size size,
-            double dpiX,
-            double dpiY)
-        {
-            return _renderInterface.CreateRenderTargetBitmap(
-                (int)Math.Ceiling(size.Width),
-                (int)Math.Ceiling(size.Height),
-                dpiX,
-                dpiY);
-        }
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index c30fb3bdc3..d42f2bd8a4 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -26,7 +26,6 @@ namespace Avalonia.Rendering
         private readonly IVisual _root;
         private readonly ISceneBuilder _sceneBuilder;
         private readonly RenderLayers _layers;
-        private readonly IRenderLayerFactory _layerFactory;
 
         private bool _running;
         private Scene _scene;
@@ -45,13 +44,11 @@ namespace Avalonia.Rendering
         /// <param name="root">The control to render.</param>
         /// <param name="renderLoop">The render loop.</param>
         /// <param name="sceneBuilder">The scene builder to use. Optional.</param>
-        /// <param name="layerFactory">The layer factory to use. Optional.</param>
         /// <param name="dispatcher">The dispatcher to use. Optional.</param>
         public DeferredRenderer(
             IRenderRoot root,
             IRenderLoop renderLoop,
             ISceneBuilder sceneBuilder = null,
-            IRenderLayerFactory layerFactory = null,
             IDispatcher dispatcher = null)
         {
             Contract.Requires<ArgumentNullException>(root != null);
@@ -59,8 +56,7 @@ namespace Avalonia.Rendering
             _dispatcher = dispatcher ?? Dispatcher.UIThread;
             _root = root;
             _sceneBuilder = sceneBuilder ?? new SceneBuilder();
-            _layerFactory = layerFactory ?? new DefaultRenderLayerFactory();
-            _layers = new RenderLayers(_layerFactory);
+            _layers = new RenderLayers();
             _renderLoop = renderLoop;
         }
 
@@ -70,15 +66,13 @@ namespace Avalonia.Rendering
         /// <param name="root">The control to render.</param>
         /// <param name="renderTarget">The render target.</param>
         /// <param name="sceneBuilder">The scene builder to use. Optional.</param>
-        /// <param name="layerFactory">The layer factory to use. Optional.</param>
         /// <remarks>
         /// This constructor is intended to be used for unit testing.
         /// </remarks>
         public DeferredRenderer(
             IVisual root,
             IRenderTarget renderTarget,
-            ISceneBuilder sceneBuilder = null,
-            IRenderLayerFactory layerFactory = null)
+            ISceneBuilder sceneBuilder = null)
         {
             Contract.Requires<ArgumentNullException>(root != null);
             Contract.Requires<ArgumentNullException>(renderTarget != null);
@@ -86,8 +80,7 @@ namespace Avalonia.Rendering
             _root = root;
             _renderTarget = renderTarget;
             _sceneBuilder = sceneBuilder ?? new SceneBuilder();
-            _layerFactory = layerFactory ?? new DefaultRenderLayerFactory();
-            _layers = new RenderLayers(_layerFactory);
+            _layers = new RenderLayers();
         }
 
         /// <inheritdoc/>
@@ -180,38 +173,56 @@ namespace Avalonia.Rendering
             bool renderOverlay = DrawDirtyRects || DrawFps;
             bool composite = false;
 
+            if (_renderTarget == null)
+            {
+                _renderTarget = ((IRenderRoot)_root).CreateRenderTarget();
+            }
+
             if (renderOverlay)
             {
                 _dirtyRectsDisplay.Tick();
             }
 
-            if (scene != null && scene.Size != Size.Empty)
+            try
             {
-                if (scene.Generation != _lastSceneId)
+                using (var context = _renderTarget.CreateDrawingContext(this))
                 {
-                    _layers.Update(scene);
-                    RenderToLayers(scene);
-
-                    if (DebugFramesPath != null)
+                    if (scene != null && scene.Size != Size.Empty)
                     {
-                        SaveDebugFrames(scene.Generation);
-                    }
+                        if (scene.Generation != _lastSceneId)
+                        {
+                            _layers.Update(scene, context);
 
-                    _lastSceneId = scene.Generation;
+                            RenderToLayers(scene);
 
-                    composite = true;
-                }
+                            if (DebugFramesPath != null)
+                            {
+                                SaveDebugFrames(scene.Generation);
+                            }
 
-                if (renderOverlay)
-                {
-                    RenderOverlay(scene);
-                    RenderComposite(scene);
-                }
-                else if(composite)
-                {
-                    RenderComposite(scene);
+                            _lastSceneId = scene.Generation;
+
+                            composite = true;
+                        }
+
+                        if (renderOverlay)
+                        {
+                            RenderOverlay(scene, context);
+                            RenderComposite(scene, context);
+                        }
+                        else if (composite)
+                        {
+                            RenderComposite(scene, context);
+                        }
+                    }
                 }
             }
+            catch (RenderTargetCorruptedException ex)
+            {
+                Logging.Logger.Information("Renderer", this, "Render target was corrupted. Exception: {0}", ex);
+                _renderTarget?.Dispose();
+                _renderTarget = null;
+            }
         }
 
         private void Render(IDrawingContextImpl context, VisualNode node, IVisual layer, Rect clipBounds)
@@ -273,11 +284,11 @@ namespace Avalonia.Rendering
             }
         }
 
-        private void RenderOverlay(Scene scene)
+        private void RenderOverlay(Scene scene, IDrawingContextImpl parentContent)
         {
             if (DrawDirtyRects)
             {
-                var overlay = GetOverlay(scene.Size, scene.Scaling);
+                var overlay = GetOverlay(parentContent, scene.Size, scene.Scaling);
 
                 using (var context = overlay.CreateDrawingContext(this))
                 {
@@ -301,61 +312,44 @@ namespace Avalonia.Rendering
             }
         }
 
-        private void RenderComposite(Scene scene)
+        private void RenderComposite(Scene scene, IDrawingContextImpl context)
         {
-            try
+            var clientRect = new Rect(scene.Size);
+
+            foreach (var layer in scene.Layers)
             {
-                if (_renderTarget == null)
+                var bitmap = _layers[layer.LayerRoot].Bitmap;
+                var sourceRect = new Rect(0, 0, bitmap.PixelWidth, bitmap.PixelHeight);
+
+                if (layer.GeometryClip != null)
                 {
-                    _renderTarget = ((IRenderRoot)_root).CreateRenderTarget();
+                    context.PushGeometryClip(layer.GeometryClip);
                 }
 
-                using (var context = _renderTarget.CreateDrawingContext(this))
+                if (layer.OpacityMask == null)
                 {
-                    var clientRect = new Rect(scene.Size);
-
-                    foreach (var layer in scene.Layers)
-                    {
-                        var bitmap = _layers[layer.LayerRoot].Bitmap;
-                        var sourceRect = new Rect(0, 0, bitmap.PixelWidth, bitmap.PixelHeight);
-
-                        if (layer.GeometryClip != null)
-                        {
-                            context.PushGeometryClip(layer.GeometryClip);
-                        }
-
-                        if (layer.OpacityMask == null)
-                        {
-                            context.DrawImage(bitmap, layer.Opacity, sourceRect, clientRect);
-                        }
-                        else
-                        {
-                            context.DrawImage(bitmap, layer.OpacityMask, layer.OpacityMaskRect, sourceRect);
-                        }
-
-                        if (layer.GeometryClip != null)
-                        {
-                            context.PopGeometryClip();
-                        }
-                    }
-
-                    if (_overlay != null)
-                    {
-                        var sourceRect = new Rect(0, 0, _overlay.PixelWidth, _overlay.PixelHeight);
-                        context.DrawImage(_overlay, 0.5, sourceRect, clientRect);
-                    }
+                    context.DrawImage(bitmap, layer.Opacity, sourceRect, clientRect);
+                }
+                else
+                {
+                    context.DrawImage(bitmap, layer.OpacityMask, layer.OpacityMaskRect, sourceRect);
+                }
 
-                    if (DrawFps)
-                    {
-                        RenderFps(context, clientRect, true);
-                    }
+                if (layer.GeometryClip != null)
+                {
+                    context.PopGeometryClip();
                 }
             }
-            catch (RenderTargetCorruptedException ex)
+
+            if (_overlay != null)
             {
-                Logging.Logger.Information("Renderer", this, "Render target was corrupted. Exception: {0}", ex);
-                _renderTarget?.Dispose();
-                _renderTarget = null;
+                var sourceRect = new Rect(0, 0, _overlay.PixelWidth, _overlay.PixelHeight);
+                context.DrawImage(_overlay, 0.5, sourceRect, clientRect);
+            }
+
+            if (DrawFps)
+            {
+                RenderFps(context, clientRect, true);
             }
         }
 
@@ -422,7 +416,10 @@ namespace Avalonia.Rendering
             }
         }
 
-        private IRenderTargetBitmapImpl GetOverlay(Size size, double scaling)
+        private IRenderTargetBitmapImpl GetOverlay(
+            IDrawingContextImpl parentContext,
+            Size size,
+            double scaling)
         {
             size = new Size(size.Width * scaling, size.Height * scaling);
 
@@ -431,7 +428,7 @@ namespace Avalonia.Rendering
                 _overlay.PixelHeight != size.Height)
             {
                 _overlay?.Dispose();
-                _overlay = _layerFactory.CreateLayer(null, size, 96 * scaling, 96 * scaling);
+                _overlay = parentContext.CreateLayer(size);
             }
 
             return _overlay;
diff --git a/src/Avalonia.Visuals/Rendering/IRenderLayerFactory.cs b/src/Avalonia.Visuals/Rendering/IRenderLayerFactory.cs
deleted file mode 100644
index ed2751cd64..0000000000
--- a/src/Avalonia.Visuals/Rendering/IRenderLayerFactory.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using Avalonia.Platform;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Rendering
-{
-    public interface IRenderLayerFactory
-    {
-        IRenderTargetBitmapImpl CreateLayer(IVisual layerRoot, Size size, double dpiX, double dpiY);
-    }
-}
diff --git a/src/Avalonia.Visuals/Rendering/RenderLayer.cs b/src/Avalonia.Visuals/Rendering/RenderLayer.cs
index df9497af6f..ed33295db6 100644
--- a/src/Avalonia.Visuals/Rendering/RenderLayer.cs
+++ b/src/Avalonia.Visuals/Rendering/RenderLayer.cs
@@ -7,16 +7,16 @@ namespace Avalonia.Rendering
 {
     public class RenderLayer
     {
-        private readonly IRenderLayerFactory _factory;
+        private readonly IDrawingContextImpl _drawingContext;
 
         public RenderLayer(
-            IRenderLayerFactory factory,
+            IDrawingContextImpl drawingContext,
             Size size,
             double scaling,
             IVisual layerRoot)
         {
-            _factory = factory;
-            Bitmap = factory.CreateLayer(layerRoot, size * scaling, 96 * scaling, 96 * scaling);
+            _drawingContext = drawingContext;
+            Bitmap = drawingContext.CreateLayer(size);
             Size = size;
             Scaling = scaling;
             LayerRoot = layerRoot;
@@ -31,7 +31,7 @@ namespace Avalonia.Rendering
         {
             if (Size != size || Scaling != scaling)
             {
-                var resized = _factory.CreateLayer(LayerRoot, size * scaling, 96 * scaling, 96 * scaling);
+                var resized = _drawingContext.CreateLayer(size);
 
                 using (var context = resized.CreateDrawingContext(null))
                 {
diff --git a/src/Avalonia.Visuals/Rendering/RenderLayers.cs b/src/Avalonia.Visuals/Rendering/RenderLayers.cs
index e1b22c55e0..bafd644603 100644
--- a/src/Avalonia.Visuals/Rendering/RenderLayers.cs
+++ b/src/Avalonia.Visuals/Rendering/RenderLayers.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using Avalonia.Platform;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.VisualTree;
 
@@ -8,19 +9,17 @@ namespace Avalonia.Rendering
 {
     public class RenderLayers : IEnumerable<RenderLayer>
     {
-        private readonly IRenderLayerFactory _factory;
         private List<RenderLayer> _inner = new List<RenderLayer>();
         private Dictionary<IVisual, RenderLayer> _index = new Dictionary<IVisual, RenderLayer>();
 
-        public RenderLayers(IRenderLayerFactory factory)
+        public RenderLayers()
         {
-            _factory = factory;
         }
 
         public int Count => _inner.Count;
         public RenderLayer this[IVisual layerRoot] => _index[layerRoot];
 
-        public void Update(Scene scene)
+        public void Update(Scene scene, IDrawingContextImpl context)
         {
             for (var i = scene.Layers.Count - 1; i >= 0; --i)
             {
@@ -29,7 +28,7 @@ namespace Avalonia.Rendering
 
                 if (!_index.TryGetValue(src.LayerRoot, out layer))
                 {
-                    layer = new RenderLayer(_factory, scene.Size, scene.Scaling, src.LayerRoot);
+                    layer = new RenderLayer(context, scene.Size, scene.Scaling, src.LayerRoot);
                     _inner.Add(layer);
                     _index.Add(src.LayerRoot, layer);
                 }
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
index a9b27ed601..047cb05c26 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
@@ -30,7 +30,6 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root,
                 loop.Object,
                 sceneBuilder: MockSceneBuilder(root).Object,
-                layerFactory: MockLayerFactory(root).Object,
                 dispatcher: dispatcher.Object);
 
             target.Start();
@@ -55,7 +54,6 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root,
                 loop.Object,
                 sceneBuilder: sceneBuilder.Object,
-                layerFactory: MockLayerFactory(root).Object,
                 dispatcher: dispatcher);
 
             target.Start();
@@ -75,7 +73,6 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root,
                 loop.Object,
                 sceneBuilder: sceneBuilder.Object,
-                layerFactory: MockLayerFactory(root).Object,
                 dispatcher: dispatcher);
 
             target.Start();
@@ -111,7 +108,6 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root,
                 loop.Object,
                 sceneBuilder: sceneBuilder.Object,
-                layerFactory: MockLayerFactory(root).Object,
                 dispatcher: dispatcher);
 
             target.Start();
@@ -133,100 +129,102 @@ namespace Avalonia.Visuals.UnitTests.Rendering
         [Fact]
         public void Frame_Should_Create_Layer_For_Root()
         {
-            var loop = new Mock<IRenderLoop>();
-            var root = new TestRoot();
-            var rootLayer = new Mock<IRenderTargetBitmapImpl>();
-            var dispatcher = new ImmediateDispatcher();
-
-            var sceneBuilder = new Mock<ISceneBuilder>();
-            sceneBuilder.Setup(x => x.UpdateAll(It.IsAny<Scene>()))
-                .Callback<Scene>(scene =>
-                {
-                    scene.Size = root.ClientSize;
-                    scene.Layers.Add(root).Dirty.Add(new Rect(root.ClientSize));
-                });
-
-            var layers = new Mock<IRenderLayerFactory>();
-            layers.Setup(x => x.CreateLayer(root, root.ClientSize, 96, 96)).Returns(CreateLayer());
-
-            var renderInterface = new Mock<IPlatformRenderInterface>();
-
-            var target = new DeferredRenderer(
-                root,
-                loop.Object,
-                sceneBuilder: sceneBuilder.Object,
-                layerFactory: layers.Object,
-                dispatcher: dispatcher);
-
-            target.Start();
-            RunFrame(loop);
-
-            layers.Verify(x => x.CreateLayer(root, root.ClientSize, 96, 96));
+            throw new NotImplementedException();
+            //var loop = new Mock<IRenderLoop>();
+            //var root = new TestRoot();
+            //var rootLayer = new Mock<IRenderTargetBitmapImpl>();
+            //var dispatcher = new ImmediateDispatcher();
+
+            //var sceneBuilder = new Mock<ISceneBuilder>();
+            //sceneBuilder.Setup(x => x.UpdateAll(It.IsAny<Scene>()))
+            //    .Callback<Scene>(scene =>
+            //    {
+            //        scene.Size = root.ClientSize;
+            //        scene.Layers.Add(root).Dirty.Add(new Rect(root.ClientSize));
+            //    });
+
+            //var layers = new Mock<IRenderLayerFactory>();
+            //layers.Setup(x => x.CreateLayer(root, root.ClientSize, 96, 96)).Returns(CreateLayer());
+
+            //var renderInterface = new Mock<IPlatformRenderInterface>();
+
+            //var target = new DeferredRenderer(
+            //    root,
+            //    loop.Object,
+            //    sceneBuilder: sceneBuilder.Object,
+            //    layerFactory: layers.Object,
+            //    dispatcher: dispatcher);
+
+            //target.Start();
+            //RunFrame(loop);
+
+            //layers.Verify(x => x.CreateLayer(root, root.ClientSize, 96, 96));
         }
 
         [Fact]
         public void Should_Create_And_Delete_Layers_For_Transparent_Controls()
         {
-            Border border;
-            var root = new TestRoot
-            {
-                Width = 100,
-                Height = 100,
-                Child = new Border
-                {
-                    Background = Brushes.Red,
-                    Child = border = new Border
-                    {
-                        Background = Brushes.Green,
-                    }
-                }
-            };
-
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(root.DesiredSize));
-
-            var loop = new Mock<IRenderLoop>();
-            var layerFactory = new MockRenderLayerFactory(new Dictionary<IVisual, IRenderTargetBitmapImpl>
-            {
-                { root, CreateLayer() },
-                { border, CreateLayer() },
-            });
-
-            var target = new DeferredRenderer(
-                root, 
-                loop.Object,
-                layerFactory: layerFactory,
-                dispatcher: new ImmediateDispatcher());
-            root.Renderer = target;
-
-            target.Start();
-            RunFrame(loop);
-
-            var rootContext = layerFactory.GetMockDrawingContext(root);
-            var borderContext = layerFactory.GetMockDrawingContext(border);
-
-            rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
-            rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once);
-            borderContext.Verify(x => x.FillRectangle(It.IsAny<IBrush>(), It.IsAny<Rect>(), It.IsAny<float>()), Times.Never);
-
-            rootContext.ResetCalls();
-            borderContext.ResetCalls();
-            border.Opacity = 0.5;
-            RunFrame(loop);
-
-            rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
-            rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Never);
-            borderContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once);
-
-            rootContext.ResetCalls();
-            borderContext.ResetCalls();
-            border.Opacity = 1;
-            RunFrame(loop);
-
-            layerFactory.GetMockBitmap(border).Verify(x => x.Dispose());
-            rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
-            rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once);
-            borderContext.Verify(x => x.FillRectangle(It.IsAny<IBrush>(), It.IsAny<Rect>(), It.IsAny<float>()), Times.Never);
+            throw new NotImplementedException();
+            //Border border;
+            //var root = new TestRoot
+            //{
+            //    Width = 100,
+            //    Height = 100,
+            //    Child = new Border
+            //    {
+            //        Background = Brushes.Red,
+            //        Child = border = new Border
+            //        {
+            //            Background = Brushes.Green,
+            //        }
+            //    }
+            //};
+
+            //root.Measure(Size.Infinity);
+            //root.Arrange(new Rect(root.DesiredSize));
+
+            //var loop = new Mock<IRenderLoop>();
+            //var layerFactory = new MockRenderLayerFactory(new Dictionary<IVisual, IRenderTargetBitmapImpl>
+            //{
+            //    { root, CreateLayer() },
+            //    { border, CreateLayer() },
+            //});
+
+            //var target = new DeferredRenderer(
+            //    root, 
+            //    loop.Object,
+            //    layerFactory: layerFactory,
+            //    dispatcher: new ImmediateDispatcher());
+            //root.Renderer = target;
+
+            //target.Start();
+            //RunFrame(loop);
+
+            //var rootContext = layerFactory.GetMockDrawingContext(root);
+            //var borderContext = layerFactory.GetMockDrawingContext(border);
+
+            //rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
+            //rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once);
+            //borderContext.Verify(x => x.FillRectangle(It.IsAny<IBrush>(), It.IsAny<Rect>(), It.IsAny<float>()), Times.Never);
+
+            //rootContext.ResetCalls();
+            //borderContext.ResetCalls();
+            //border.Opacity = 0.5;
+            //RunFrame(loop);
+
+            //rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
+            //rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Never);
+            //borderContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once);
+
+            //rootContext.ResetCalls();
+            //borderContext.ResetCalls();
+            //border.Opacity = 1;
+            //RunFrame(loop);
+
+            //layerFactory.GetMockBitmap(border).Verify(x => x.Dispose());
+            //rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
+            //rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once);
+            //borderContext.Verify(x => x.FillRectangle(It.IsAny<IBrush>(), It.IsAny<Rect>(), It.IsAny<float>()), Times.Never);
         }
 
         private void IgnoreFirstFrame(Mock<IRenderLoop> loop, Mock<ISceneBuilder> sceneBuilder)
@@ -246,13 +244,6 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 x.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>()) == Mock.Of<IDrawingContextImpl>());
         }
 
-        private Mock<IRenderLayerFactory> MockLayerFactory(IRenderRoot root)
-        {
-            var result = new Mock<IRenderLayerFactory>();
-            result.Setup(x => x.CreateLayer(root, root.ClientSize, 96, 96)).Returns(CreateLayer());
-            return result;
-        }
-
         private Mock<ISceneBuilder> MockSceneBuilder(IRenderRoot root)
         {
             var result = new Mock<ISceneBuilder>();
@@ -260,34 +251,5 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 .Callback<Scene>(x => x.Layers.Add(root).Dirty.Add(new Rect(root.ClientSize)));
             return result;
         }
-
-        private class MockRenderLayerFactory : IRenderLayerFactory
-        {
-            private IDictionary<IVisual, IRenderTargetBitmapImpl> _layers;
-
-            public MockRenderLayerFactory(IDictionary<IVisual, IRenderTargetBitmapImpl> layers)
-            {
-                _layers = layers;
-            }
-
-            public IRenderTargetBitmapImpl CreateLayer(
-                IVisual layerRoot,
-                Size size,
-                double dpiX,
-                double dpiY)
-            {
-                return _layers[layerRoot];
-            }
-
-            public Mock<IRenderTargetBitmapImpl> GetMockBitmap(IVisual layerRoot)
-            {
-                return Mock.Get(_layers[layerRoot]);
-            }
-
-            public Mock<IDrawingContextImpl> GetMockDrawingContext(IVisual layerRoot)
-            {
-                return Mock.Get(_layers[layerRoot].CreateDrawingContext(null));
-            }
-        }
     }
 }

From d141acab30da31254360613b12184180239fa6c4 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@github.com>
Date: Sat, 23 Sep 2017 20:59:41 -0700
Subject: [PATCH 019/482] Use correct size for overlay.

---
 src/Avalonia.Visuals/Rendering/DeferredRenderer.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index d42f2bd8a4..81a2998fd2 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -421,11 +421,11 @@ namespace Avalonia.Rendering
             Size size,
             double scaling)
         {
-            size = new Size(size.Width * scaling, size.Height * scaling);
+            var pixelSize = size * scaling;
 
             if (_overlay == null ||
-                _overlay.PixelWidth != size.Width ||
-                _overlay.PixelHeight != size.Height)
+                _overlay.PixelWidth != pixelSize.Width ||
+                _overlay.PixelHeight != pixelSize.Height)
             {
                 _overlay?.Dispose();
                 _overlay = parentContext.CreateLayer(size);

From b0d8ff69ea300769018181a6d604bbde1f4118dc Mon Sep 17 00:00:00 2001
From: Dmitriy Arndt <arndtdv@gmail.com>
Date: Tue, 26 Sep 2017 00:11:32 +0300
Subject: [PATCH 020/482] Fixed: MenuItem with sub-items is not closed when
 other menu item without sub-items is selected #226

---
 src/Avalonia.Controls/MenuItem.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs
index 926c240e57..dadd3b910b 100644
--- a/src/Avalonia.Controls/MenuItem.cs
+++ b/src/Avalonia.Controls/MenuItem.cs
@@ -307,6 +307,21 @@ namespace Avalonia.Controls
                     () => IsSubMenuOpen = true,
                     TimeSpan.FromMilliseconds(400));
             }
+            else
+            {
+                var parentItem = Parent as MenuItem;
+                if (parentItem != null)
+                {
+                    foreach (var sibling in parentItem.Items
+                        .OfType<MenuItem>()
+                        .Where(x => x != this && x.IsSubMenuOpen))
+                    {
+                        sibling.CloseSubmenus();
+                        sibling.IsSubMenuOpen = false;
+                        sibling.IsSelected = false;
+                    }
+                }
+            }
         }
 
         /// <summary>

From 7c1245829d9361002cf5d9ba1e277f2964e04c81 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Tue, 26 Sep 2017 21:08:42 +0300
Subject: [PATCH 021/482] [GTK3] Timers should have lower priority than
 Signal()

---
 src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs b/src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs
index 1936d40086..07ca4a9539 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs
+++ b/src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs
@@ -55,7 +55,7 @@ namespace Avalonia.Gtk3.Interop
         public static IDisposable StarTimer(uint interval, Action tick)
         {
             var timer = new Timer ();
-            GlibTimeout.Add(interval,
+            GlibTimeout.Add(101, interval,
                 () =>
                 {
                     if (timer.Stopped)

From d7e74229990205b1865586f44c65fb7571ba0d0e Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 27 Sep 2017 13:37:58 +0300
Subject: [PATCH 022/482] Moved remote previewer entry point to
 DesignSupport.dll

---
 .../Remote}/DetachableTransportConnection.cs  |   2 +-
 .../Remote}/PreviewerWindowImpl.cs            |   4 +-
 .../Remote}/PreviewerWindowingPlatform.cs     |   2 +-
 .../Remote/RemoteDesignerEntryPoint.cs        | 172 ++++++++++++++++++
 .../Remote}/Stubs.cs                          |   6 +-
 .../Avalonia.Designer.HostApp.csproj          |   1 -
 .../Avalonia.Designer.HostApp/Program.cs      | 169 +----------------
 7 files changed, 180 insertions(+), 176 deletions(-)
 rename src/{tools/Avalonia.Designer.HostApp => Avalonia.DesignerSupport/Remote}/DetachableTransportConnection.cs (95%)
 rename src/{tools/Avalonia.Designer.HostApp => Avalonia.DesignerSupport/Remote}/PreviewerWindowImpl.cs (94%)
 rename src/{tools/Avalonia.Designer.HostApp => Avalonia.DesignerSupport/Remote}/PreviewerWindowingPlatform.cs (98%)
 create mode 100644 src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
 rename src/{tools/Avalonia.Designer.HostApp => Avalonia.DesignerSupport/Remote}/Stubs.cs (97%)

diff --git a/src/tools/Avalonia.Designer.HostApp/DetachableTransportConnection.cs b/src/Avalonia.DesignerSupport/Remote/DetachableTransportConnection.cs
similarity index 95%
rename from src/tools/Avalonia.Designer.HostApp/DetachableTransportConnection.cs
rename to src/Avalonia.DesignerSupport/Remote/DetachableTransportConnection.cs
index 9cd87a2c59..1fb10a3a7c 100644
--- a/src/tools/Avalonia.Designer.HostApp/DetachableTransportConnection.cs
+++ b/src/Avalonia.DesignerSupport/Remote/DetachableTransportConnection.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Avalonia.Remote.Protocol;
 
-namespace Avalonia.Designer.HostApp
+namespace Avalonia.DesignerSupport.Remote
 {
     class DetachableTransportConnection : IAvaloniaRemoteTransportConnection
     {
diff --git a/src/tools/Avalonia.Designer.HostApp/PreviewerWindowImpl.cs b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
similarity index 94%
rename from src/tools/Avalonia.Designer.HostApp/PreviewerWindowImpl.cs
rename to src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
index 5ffaa6459a..a787c8e8e3 100644
--- a/src/tools/Avalonia.Designer.HostApp/PreviewerWindowImpl.cs
+++ b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
@@ -7,9 +7,9 @@ using Avalonia.Remote.Protocol;
 using Avalonia.Remote.Protocol.Viewport;
 using Avalonia.Threading;
 
-namespace Avalonia.Designer.HostApp
+namespace Avalonia.DesignerSupport.Remote
 {
-    public class PreviewerWindowImpl : RemoteServerTopLevelImpl, IWindowImpl, IEmbeddableWindowImpl
+    class PreviewerWindowImpl : RemoteServerTopLevelImpl, IWindowImpl, IEmbeddableWindowImpl
     {
         private readonly IAvaloniaRemoteTransportConnection _transport;
 
diff --git a/src/tools/Avalonia.Designer.HostApp/PreviewerWindowingPlatform.cs b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs
similarity index 98%
rename from src/tools/Avalonia.Designer.HostApp/PreviewerWindowingPlatform.cs
rename to src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs
index b33f871139..ca3bb2b97f 100644
--- a/src/tools/Avalonia.Designer.HostApp/PreviewerWindowingPlatform.cs
+++ b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs
@@ -7,7 +7,7 @@ using Avalonia.Platform;
 using Avalonia.Remote.Protocol;
 using Avalonia.Rendering;
 
-namespace Avalonia.Designer.HostApp
+namespace Avalonia.DesignerSupport.Remote
 {
     class PreviewerWindowingPlatform : IWindowingPlatform, IPlatformSettings
     {
diff --git a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
new file mode 100644
index 0000000000..ac3438d71c
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
@@ -0,0 +1,172 @@
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.DesignerSupport;
+using Avalonia.Input;
+using Avalonia.Remote.Protocol;
+using Avalonia.Remote.Protocol.Designer;
+using Avalonia.Remote.Protocol.Viewport;
+using Avalonia.Threading;
+
+namespace Avalonia.DesignerSupport.Remote
+{
+    public class RemoteDesignerEntryPoint
+    {
+        private static ClientSupportedPixelFormatsMessage s_supportedPixelFormats;
+        private static ClientViewportAllocatedMessage s_viewportAllocatedMessage;
+        private static IAvaloniaRemoteTransportConnection s_transport;
+        class CommandLineArgs
+        {
+            public string AppPath { get; set; }
+            public Uri Transport { get; set; }
+        }
+
+        static Exception Die(string error)
+        {
+            if (error != null)
+            {
+                Console.Error.WriteLine(error);
+                Console.Error.Flush();
+            }
+            Environment.Exit(1);
+            return new Exception("APPEXIT");
+        }
+
+        static Exception PrintUsage()
+        {
+            Console.Error.WriteLine("Usage: --transport transport_spec app");
+            Console.Error.WriteLine();
+            Console.Error.WriteLine("Example: --transport tcp-bson://127.0.0.1:30243/ MyApp.exe");
+            Console.Error.Flush();
+            return Die(null);
+        }
+        
+        static CommandLineArgs ParseCommandLineArgs(string[] args)
+        {
+            var rv = new CommandLineArgs();
+            Action<string> next = null;
+            try
+            {
+                foreach (var arg in args)
+                {
+                    if (next != null)
+                    {
+                        next(arg);
+                        next = null;
+                    }
+                    else if (arg == "--transport")
+                        next = a => rv.Transport = new Uri(a, UriKind.Absolute);
+                    else if (rv.AppPath == null)
+                        rv.AppPath = arg;
+                    else
+                        PrintUsage();
+
+                }
+                if (rv.AppPath == null || rv.Transport == null)
+                    PrintUsage();
+            }
+            catch
+            {
+                PrintUsage();
+            }
+            return rv;
+        }
+
+        static IAvaloniaRemoteTransportConnection CreateTransport(Uri transport)
+        {
+            if (transport.Scheme == "tcp-bson")
+            {
+                return new BsonTcpTransport().Connect(IPAddress.Parse(transport.Host), transport.Port).Result;
+            }
+            PrintUsage();
+            return null;
+        }
+
+        interface IAppInitializer
+        {
+            Application GetConfiguredApp(IAvaloniaRemoteTransportConnection transport, object obj);
+        }
+        
+        class AppInitializer<T> : IAppInitializer where T : AppBuilderBase<T>, new()
+        {
+            public Application GetConfiguredApp(IAvaloniaRemoteTransportConnection transport, object obj)
+            {
+                var builder = (AppBuilderBase<T>) obj;
+                builder.UseWindowingSubsystem(() => PreviewerWindowingPlatform.Initialize(transport));
+                builder.SetupWithoutStarting();
+                return builder.Instance;
+            }
+        }
+
+        private const string BuilderMethodName = "BuildAvaloniaApp";
+
+        class NeverClose : ICloseable
+        {
+            public event EventHandler Closed;
+        }
+        
+        public static void Main(string[] cmdline)
+        {
+            var args = ParseCommandLineArgs(cmdline);
+            var transport = CreateTransport(args.Transport);
+            var asm = Assembly.LoadFile(System.IO.Path.GetFullPath(args.AppPath));
+            var entryPoint = asm.EntryPoint;
+            if (entryPoint == null)
+                throw Die($"Assembly {args.AppPath} doesn't have an entry point");
+            var builderMethod = entryPoint.DeclaringType.GetMethod(BuilderMethodName,
+                BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic);
+            if (builderMethod == null)
+                throw Die($"{entryPoint.DeclaringType.FullName} doesn't have a method named {BuilderMethodName}");
+
+            var appBuilder = builderMethod.Invoke(null, null);
+            var initializer =(IAppInitializer)Activator.CreateInstance(typeof(AppInitializer<>).MakeGenericType(appBuilder.GetType()));
+            var app = initializer.GetConfiguredApp(transport, appBuilder);
+            s_transport = transport;
+            transport.OnMessage += OnTransportMessage;
+            transport.OnException += (t, e) => Die(e.ToString());
+            app.Run(new NeverClose());
+        }
+
+
+        private static void RebuildPreFlight()
+        {
+            PreviewerWindowingPlatform.PreFlightMessages = new List<object>
+            {
+                s_supportedPixelFormats,
+                s_viewportAllocatedMessage
+            };
+        }
+        
+        private static void OnTransportMessage(IAvaloniaRemoteTransportConnection transport, object obj) => Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            if (obj is ClientSupportedPixelFormatsMessage formats)
+            {
+                s_supportedPixelFormats = formats;
+                RebuildPreFlight();
+            }
+            if (obj is ClientViewportAllocatedMessage viewport)
+            {
+                s_viewportAllocatedMessage = viewport;
+                RebuildPreFlight();
+            }
+            if (obj is UpdateXamlMessage xaml)
+            {
+                try
+                {
+                    DesignWindowLoader.LoadDesignerWindow(xaml.Xaml, xaml.AssemblyPath);
+                    s_transport.Send(new UpdateXamlResultMessage());
+                }
+                catch (Exception e)
+                {
+                    s_transport.Send(new UpdateXamlResultMessage
+                    {
+                        Error = e.ToString()
+                    });
+                }
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/tools/Avalonia.Designer.HostApp/Stubs.cs b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
similarity index 97%
rename from src/tools/Avalonia.Designer.HostApp/Stubs.cs
rename to src/Avalonia.DesignerSupport/Remote/Stubs.cs
index a4160e7da4..5aad114cf7 100644
--- a/src/tools/Avalonia.Designer.HostApp/Stubs.cs
+++ b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
@@ -11,12 +11,8 @@ using Avalonia.Input.Raw;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 
-namespace Avalonia.Designer.HostApp
+namespace Avalonia.DesignerSupport.Remote
 {
-    /// <summary>
-    /// Popups are no-op
-    /// </summary>
-    
     class WindowStub : IPopupImpl, IWindowImpl
     {
         public Action Deactivated { get; set; }
diff --git a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
index f0f3b12cc5..2a68862f18 100644
--- a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
+++ b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
@@ -4,7 +4,6 @@
     <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\..\Avalonia.DesignerSupport\DesignWindowLoader.cs"/>
     <ProjectReference Include="..\..\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj" />
     <ProjectReference Include="..\..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
diff --git a/src/tools/Avalonia.Designer.HostApp/Program.cs b/src/tools/Avalonia.Designer.HostApp/Program.cs
index 88dadf479e..29640ffc6f 100644
--- a/src/tools/Avalonia.Designer.HostApp/Program.cs
+++ b/src/tools/Avalonia.Designer.HostApp/Program.cs
@@ -1,173 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Reflection;
-using Avalonia.Controls;
-using Avalonia.Controls.Shapes;
-using Avalonia.DesignerSupport;
-using Avalonia.Input;
-using Avalonia.Remote.Protocol;
-using Avalonia.Remote.Protocol.Designer;
-using Avalonia.Remote.Protocol.Viewport;
-using Avalonia.Threading;
+
 
 namespace Avalonia.Designer.HostApp
 {
     class Program
     {
-        
-        private static ClientSupportedPixelFormatsMessage s_supportedPixelFormats;
-        private static ClientViewportAllocatedMessage s_viewportAllocatedMessage;
-        private static IAvaloniaRemoteTransportConnection s_transport;
-        class CommandLineArgs
-        {
-            public string AppPath { get; set; }
-            public Uri Transport { get; set; }
-        }
-
-        static Exception  Die(string error)
-        {
-            if (error != null)
-            {
-                Console.Error.WriteLine(error);
-                Console.Error.Flush();
-            }
-            Environment.Exit(1);
-            return new Exception("APPEXIT");
-        }
-
-        static Exception PrintUsage()
-        {
-            Console.Error.WriteLine("Usage: --transport transport_spec app");
-            Console.Error.WriteLine();
-            Console.Error.WriteLine("Example: --transport tcp-bson://127.0.0.1:30243/ MyApp.exe");
-            Console.Error.Flush();
-            return Die(null);
-        }
-        
-        static CommandLineArgs ParseCommandLineArgs(string[] args)
-        {
-            var rv = new CommandLineArgs();
-            Action<string> next = null;
-            try
-            {
-                foreach (var arg in args)
-                {
-                    if (next != null)
-                    {
-                        next(arg);
-                        next = null;
-                    }
-                    else if (arg == "--transport")
-                        next = a => rv.Transport = new Uri(a, UriKind.Absolute);
-                    else if (rv.AppPath == null)
-                        rv.AppPath = arg;
-                    else
-                        PrintUsage();
-
-                }
-                if (rv.AppPath == null || rv.Transport == null)
-                    PrintUsage();
-            }
-            catch
-            {
-                PrintUsage();
-            }
-            return rv;
-        }
-
-        static IAvaloniaRemoteTransportConnection CreateTransport(Uri transport)
-        {
-            if (transport.Scheme == "tcp-bson")
-            {
-                return new BsonTcpTransport().Connect(IPAddress.Parse(transport.Host), transport.Port).Result;
-            }
-            PrintUsage();
-            return null;
-        }
-
-        interface IAppInitializer
-        {
-            Application GetConfiguredApp(IAvaloniaRemoteTransportConnection transport, object obj);
-        }
-        
-        class AppInitializer<T> : IAppInitializer where T : AppBuilderBase<T>, new()
-        {
-            public Application GetConfiguredApp(IAvaloniaRemoteTransportConnection transport, object obj)
-            {
-                var builder = (AppBuilderBase<T>) obj;
-                builder.UseWindowingSubsystem(() => PreviewerWindowingPlatform.Initialize(transport));
-                builder.SetupWithoutStarting();
-                return builder.Instance;
-            }
-        }
-
-        private const string BuilderMethodName = "BuildAvaloniaApp";
-
-        class NeverClose : ICloseable
-        {
-            public event EventHandler Closed;
-        }
-        
-        static void Main(string[] cmdline)
-        {
-            var args = ParseCommandLineArgs(cmdline);
-            var transport = CreateTransport(args.Transport);
-            var asm = Assembly.LoadFile(System.IO.Path.GetFullPath(args.AppPath));
-            var entryPoint = asm.EntryPoint;
-            if (entryPoint == null)
-                throw Die($"Assembly {args.AppPath} doesn't have an entry point");
-            var builderMethod = entryPoint.DeclaringType.GetMethod(BuilderMethodName,
-                BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic);
-            if (builderMethod == null)
-                throw Die($"{entryPoint.DeclaringType.FullName} doesn't have a method named {BuilderMethodName}");
-
-            var appBuilder = builderMethod.Invoke(null, null);
-            var initializer =(IAppInitializer)Activator.CreateInstance(typeof(AppInitializer<>).MakeGenericType(appBuilder.GetType()));
-            var app = initializer.GetConfiguredApp(transport, appBuilder);
-            s_transport = transport;
-            transport.OnMessage += OnTransportMessage;
-            transport.OnException += (t, e) => Die(e.ToString());
-            app.Run(new NeverClose());
-        }
-
-
-        private static void RebuildPreFlight()
-        {
-            PreviewerWindowingPlatform.PreFlightMessages = new List<object>
-            {
-                s_supportedPixelFormats,
-                s_viewportAllocatedMessage
-            };
-        }
-        
-        private static void OnTransportMessage(IAvaloniaRemoteTransportConnection transport, object obj) => Dispatcher.UIThread.InvokeAsync(() =>
-        {
-            if (obj is ClientSupportedPixelFormatsMessage formats)
-            {
-                s_supportedPixelFormats = formats;
-                RebuildPreFlight();
-            }
-            if (obj is ClientViewportAllocatedMessage viewport)
-            {
-                s_viewportAllocatedMessage = viewport;
-                RebuildPreFlight();
-            }
-            if (obj is UpdateXamlMessage xaml)
-            {
-                try
-                {
-                    DesignWindowLoader.LoadDesignerWindow(xaml.Xaml, xaml.AssemblyPath);
-                    s_transport.Send(new UpdateXamlResultMessage());
-                }
-                catch (Exception e)
-                {
-                    s_transport.Send(new UpdateXamlResultMessage
-                    {
-                        Error = e.ToString()
-                    });
-                }
-            }
-        });
+        public static void Main(string[] args) 
+            => Avalonia.DesignerSupport.Remote.RemoteDesignerEntryPoint.Main(args);
     }
 }
\ No newline at end of file

From 4f13d504967aa9be3ccd2123189dece3591d32ad Mon Sep 17 00:00:00 2001
From: Jurjen Biewenga <j.f.biewenga@gmail.com>
Date: Thu, 28 Sep 2017 15:53:05 +0200
Subject: [PATCH 023/482] Added initial changes to allow the user to change the
 selected item while the dropdown is closed but selected and allows the user
 to open the dropdown by pressing down

---
 src/Avalonia.Controls/DropDown.cs     | 24 ++++++++++++++++++++++++
 src/Avalonia.Controls/ItemsControl.cs | 11 +++++++++++
 2 files changed, 35 insertions(+)

diff --git a/src/Avalonia.Controls/DropDown.cs b/src/Avalonia.Controls/DropDown.cs
index 5349fb1ca7..63fd6726b4 100644
--- a/src/Avalonia.Controls/DropDown.cs
+++ b/src/Avalonia.Controls/DropDown.cs
@@ -114,6 +114,30 @@ namespace Avalonia.Controls
                     IsDropDownOpen = false;
                     e.Handled = true;
                 }
+
+                if (!IsDropDownOpen)
+                {
+                    if (e.Key == Key.Right)
+                    {
+                        if (++SelectedIndex >= ItemCount)
+                            SelectedIndex = 0;
+                        
+                        e.Handled = true;
+                    }
+                    else if (e.Key == Key.Left)
+                    {
+                        if (--SelectedIndex < 0)
+                            SelectedIndex = ItemCount - 1;
+                        e.Handled = true;
+                    }
+                    else if (e.Key == Key.Down)
+                    {
+                        IsDropDownOpen = true;
+                        if (SelectedIndex == -1)
+                            SelectedIndex = 0;
+                        e.Handled = true;
+                    }
+                }
             }
         }
 
diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index aa209e0462..4366de1cd6 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -11,6 +11,7 @@ using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Controls.Utils;
+using Avalonia.Input;
 using Avalonia.LogicalTree;
 using Avalonia.Metadata;
 
@@ -106,6 +107,12 @@ namespace Avalonia.Controls
             set { SetAndRaise(ItemsProperty, ref _items, value); }
         }
 
+        public int ItemCount
+        {
+            get;
+            private set;
+        }
+
         /// <summary>
         /// Gets or sets the panel used to display the items.
         /// </summary>
@@ -352,6 +359,10 @@ namespace Avalonia.Controls
                     RemoveControlItemsFromLogicalChildren(e.OldItems);
                     break;
             }
+            
+            int? count = (Items as IList)?.Count;
+            if (count != null)
+                ItemCount = (int)count;
 
             var collection = sender as ICollection;
             PseudoClasses.Set(":empty", collection == null || collection.Count == 0);

From 12ec059acb3e83b718eabda9cf7f7ac6b8ed5043 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 2 Oct 2017 18:08:37 -0500
Subject: [PATCH 024/482] Initial code to enable binding to a method.

---
 .../Data/ExpressionObserver.cs                |  1 +
 .../Data/Plugins/MethodAccessorPlugin.cs      | 91 +++++++++++++++++++
 .../Data/ExpressionObserverTests_Method.cs    | 65 +++++++++++++
 3 files changed, 157 insertions(+)
 create mode 100644 src/Markup/Avalonia.Markup/Data/Plugins/MethodAccessorPlugin.cs
 create mode 100644 tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Method.cs

diff --git a/src/Markup/Avalonia.Markup/Data/ExpressionObserver.cs b/src/Markup/Avalonia.Markup/Data/ExpressionObserver.cs
index 1e55e17195..66d3beb907 100644
--- a/src/Markup/Avalonia.Markup/Data/ExpressionObserver.cs
+++ b/src/Markup/Avalonia.Markup/Data/ExpressionObserver.cs
@@ -25,6 +25,7 @@ namespace Avalonia.Markup.Data
             new List<IPropertyAccessorPlugin>
             {
                 new AvaloniaPropertyAccessorPlugin(),
+                new MethodAccessorPlugin(),
                 new InpcPropertyAccessorPlugin(),
             };
 
diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/MethodAccessorPlugin.cs b/src/Markup/Avalonia.Markup/Data/Plugins/MethodAccessorPlugin.cs
new file mode 100644
index 0000000000..ef4281c314
--- /dev/null
+++ b/src/Markup/Avalonia.Markup/Data/Plugins/MethodAccessorPlugin.cs
@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Data;
+using System.Reflection;
+using System.Linq;
+
+namespace Avalonia.Markup.Data.Plugins
+{
+    class MethodAccessorPlugin : IPropertyAccessorPlugin
+    {
+        public bool Match(object obj, string propertyName)
+            => obj.GetType().GetRuntimeMethods().FirstOrDefault(x => x.Name == propertyName) != null;
+
+        public IPropertyAccessor Start(WeakReference reference, string propertyName)
+        {
+            Contract.Requires<ArgumentNullException>(reference != null);
+            Contract.Requires<ArgumentNullException>(propertyName != null);
+
+            var instance = reference.Target;
+            var method = instance.GetType().GetRuntimeMethods().FirstOrDefault(x => x.Name == propertyName);
+
+            if (method != null)
+            {
+                return new Accessor(reference, method);
+            }
+            else
+            {
+                var message = $"Could not find CLR method '{propertyName}' on '{instance}'";
+                var exception = new MissingMemberException(message);
+                return new PropertyError(new BindingNotification(exception, BindingErrorType.Error));
+            }
+        }
+
+        private class Accessor : PropertyAccessorBase
+        {
+            public Accessor(WeakReference reference, MethodInfo method)
+            {
+                Contract.Requires<ArgumentNullException>(reference != null);
+                Contract.Requires<ArgumentNullException>(method != null);
+
+                var paramTypes = method.GetParameters().Select(param => param.ParameterType).ToArray();
+                var returnType = method.ReturnType;
+
+                // TODO: Throw exception if more than 8 parameters or more than 7 + return type.
+                // Do this here or in the caller? Here probably
+                if (returnType == typeof(void))
+                {
+                    if (paramTypes.Length == 0)
+                    {
+                        PropertyType = typeof(Action);
+                    }
+                    else
+                    {
+                        PropertyType = Type.GetType($"System.Action`{paramTypes.Length}").MakeGenericType(paramTypes); 
+                    }
+                }
+                else
+                {
+                    var genericTypeParameters = paramTypes.Concat(new[] { returnType }).ToArray();
+                    PropertyType = Type.GetType($"System.Func`{genericTypeParameters.Length}").MakeGenericType(genericTypeParameters);
+                }
+
+                // TODO: Is this going to leak?
+                // TODO: Static methods?
+                Value = method.CreateDelegate(PropertyType, reference.Target);
+            }
+
+            public override Type PropertyType { get; }
+
+            public override object Value { get; }
+
+            public override bool SetValue(object value, BindingPriority priority) => false;
+
+            protected override void SubscribeCore(IObserver<object> observer)
+            {
+                SendCurrentValue();
+            }
+
+            private void SendCurrentValue()
+            {
+                try
+                {
+                    var value = Value;
+                    Observer.OnNext(value);
+                }
+                catch { }
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Method.cs b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Method.cs
new file mode 100644
index 0000000000..9929e4e986
--- /dev/null
+++ b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Method.cs
@@ -0,0 +1,65 @@
+using Avalonia.Data;
+using Avalonia.Markup.Data;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Avalonia.Markup.UnitTests.Data
+{
+    public class ExpressionObserverTests_Method
+    {
+        private class TestObject
+        {
+            public void MethodWithoutReturn() { }
+
+            public int MethodWithReturn() => 0;
+
+            public int MethodWithReturnAndParameters(int i) => i;
+        }
+
+        [Fact]
+        public async Task Should_Get_Method()
+        {
+            var data = new TestObject();
+            var observer = new ExpressionObserver(data, nameof(TestObject.MethodWithoutReturn));
+            var result = await observer.Take(1);
+
+            Assert.NotNull(result);
+
+            GC.KeepAlive(data);
+        }
+
+        [Theory]
+        [InlineData(nameof(TestObject.MethodWithoutReturn), typeof(Action))]
+        [InlineData(nameof(TestObject.MethodWithReturn), typeof(Func<int>))]
+        [InlineData(nameof(TestObject.MethodWithReturnAndParameters), typeof(Func<int, int>))]
+        public async Task Should_Get_Method_WithCorrectDelegateType(string methodName, Type expectedType)
+        {
+            var data = new TestObject();
+            var observer = new ExpressionObserver(data, methodName);
+            var result = await observer.Take(1);
+
+            Assert.IsType(expectedType, result);
+
+            GC.KeepAlive(data);
+        }
+
+        [Fact]
+        public async Task Can_Call_Method_Returned_From_Observer()
+        {
+            var data = new TestObject();
+            var observer = new ExpressionObserver(data, nameof(TestObject.MethodWithReturnAndParameters));
+            var result = await observer.Take(1);
+
+            var callback = (Func<int, int>)result;
+
+            Assert.Equal(1, callback(1));
+
+            GC.KeepAlive(data);
+        }
+    }
+}

From 250f6acef0e702cc420fa68460d6d04122d73e7e Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 2 Oct 2017 18:37:52 -0500
Subject: [PATCH 025/482] Add delegate -> command conversion as a default value
 conversion.

---
 .../AlwaysEnabledDelegateCommand.cs           | 36 ++++++++++++++++++
 .../Avalonia.Markup/DefaultValueConverter.cs  |  6 +++
 .../DefaultValueConverterTests.cs             | 38 +++++++++++++++++++
 3 files changed, 80 insertions(+)
 create mode 100644 src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs

diff --git a/src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs b/src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs
new file mode 100644
index 0000000000..c675b876ae
--- /dev/null
+++ b/src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Input;
+
+namespace Avalonia.Markup
+{
+    class AlwaysEnabledDelegateCommand : ICommand
+    {
+        private readonly Delegate action;
+
+        public AlwaysEnabledDelegateCommand(Delegate action)
+        {
+            this.action = action;
+        }
+
+        public event EventHandler CanExecuteChanged;
+
+        public bool CanExecute(object parameter)
+        {
+            return true;
+        }
+
+        public void Execute(object parameter)
+        {
+            if (action.Method.GetParameters().Length == 0)
+            {
+                action.DynamicInvoke();
+            }
+            else
+            {
+                action.DynamicInvoke(parameter); 
+            }
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup/DefaultValueConverter.cs b/src/Markup/Avalonia.Markup/DefaultValueConverter.cs
index b56291a653..bb6bd85827 100644
--- a/src/Markup/Avalonia.Markup/DefaultValueConverter.cs
+++ b/src/Markup/Avalonia.Markup/DefaultValueConverter.cs
@@ -5,6 +5,7 @@ using System;
 using System.Globalization;
 using Avalonia.Data;
 using Avalonia.Utilities;
+using System.Windows.Input;
 
 namespace Avalonia.Markup
 {
@@ -34,6 +35,11 @@ namespace Avalonia.Markup
                 return AvaloniaProperty.UnsetValue;
             }
 
+            if (typeof(ICommand).IsAssignableFrom(targetType) && value is Delegate d)
+            {
+                return new AlwaysEnabledDelegateCommand(d);
+            }
+
             if (TypeUtilities.TryConvert(targetType, value, culture, out object result))
             {
                 return result;
diff --git a/tests/Avalonia.Markup.UnitTests/DefaultValueConverterTests.cs b/tests/Avalonia.Markup.UnitTests/DefaultValueConverterTests.cs
index fd28f2e900..0aa2e00c0f 100644
--- a/tests/Avalonia.Markup.UnitTests/DefaultValueConverterTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/DefaultValueConverterTests.cs
@@ -5,6 +5,8 @@ using System.Globalization;
 using Avalonia.Controls;
 using Avalonia.Data;
 using Xunit;
+using System.Windows.Input;
+using System;
 
 namespace Avalonia.Markup.UnitTests
 {
@@ -118,6 +120,42 @@ namespace Avalonia.Markup.UnitTests
             Assert.IsType<BindingNotification>(result);
         }
 
+        [Fact]
+        public void Can_Convert_From_Delegate_To_Command()
+        {
+            int commandResult = 0;
+
+            var result = DefaultValueConverter.Instance.Convert(
+                (Action<int>)((int i) => { commandResult = i; }),
+                typeof(ICommand),
+                null,
+                CultureInfo.InvariantCulture);
+
+            Assert.IsAssignableFrom<ICommand>(result);
+
+            (result as ICommand).Execute(5);
+
+            Assert.Equal(5, commandResult);
+        }
+
+        [Fact]
+        public void Can_Convert_From_Delegate_To_Command_No_Parameters()
+        {
+            int commandResult = 0;
+
+            var result = DefaultValueConverter.Instance.Convert(
+                (Action)(() => { commandResult = 1; }),
+                typeof(ICommand),
+                null,
+                CultureInfo.InvariantCulture);
+
+            Assert.IsAssignableFrom<ICommand>(result);
+
+            (result as ICommand).Execute(null);
+
+            Assert.Equal(1, commandResult);
+        }
+
         private enum TestEnum
         {
             Foo,

From 81168ac09433147f8fe055bf7f8c618ea88d3fde Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 2 Oct 2017 21:55:26 -0500
Subject: [PATCH 026/482] Add error handling for methods with too many
 parameters. Add support for static methods.

---
 .../AlwaysEnabledDelegateCommand.cs           |  5 +--
 .../Data/Plugins/MethodAccessorPlugin.cs      | 41 ++++++++++---------
 .../Data/ExpressionObserverTests_Method.cs    | 22 ++++++++++
 3 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs b/src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs
index c675b876ae..1d417a55a6 100644
--- a/src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs
+++ b/src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs
@@ -16,10 +16,7 @@ namespace Avalonia.Markup
 
         public event EventHandler CanExecuteChanged;
 
-        public bool CanExecute(object parameter)
-        {
-            return true;
-        }
+        public bool CanExecute(object parameter) => true;
 
         public void Execute(object parameter)
         {
diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/MethodAccessorPlugin.cs b/src/Markup/Avalonia.Markup/Data/Plugins/MethodAccessorPlugin.cs
index ef4281c314..c602fa4f4d 100644
--- a/src/Markup/Avalonia.Markup/Data/Plugins/MethodAccessorPlugin.cs
+++ b/src/Markup/Avalonia.Markup/Data/Plugins/MethodAccessorPlugin.cs
@@ -9,24 +9,30 @@ namespace Avalonia.Markup.Data.Plugins
 {
     class MethodAccessorPlugin : IPropertyAccessorPlugin
     {
-        public bool Match(object obj, string propertyName)
-            => obj.GetType().GetRuntimeMethods().FirstOrDefault(x => x.Name == propertyName) != null;
+        public bool Match(object obj, string methodName)
+            => obj.GetType().GetRuntimeMethods().Any(x => x.Name == methodName);
 
-        public IPropertyAccessor Start(WeakReference reference, string propertyName)
+        public IPropertyAccessor Start(WeakReference reference, string methodName)
         {
             Contract.Requires<ArgumentNullException>(reference != null);
-            Contract.Requires<ArgumentNullException>(propertyName != null);
+            Contract.Requires<ArgumentNullException>(methodName != null);
 
             var instance = reference.Target;
-            var method = instance.GetType().GetRuntimeMethods().FirstOrDefault(x => x.Name == propertyName);
+            var method = instance.GetType().GetRuntimeMethods().FirstOrDefault(x => x.Name == methodName);
 
             if (method != null)
             {
+                if (method.GetParameters().Length + (method.ReturnType == typeof(void) ? 0 : 1) > 8)
+                {
+                    var exception = new ArgumentException("Cannot create a binding accessor for a method with more than 8 parameters or more than 7 parameters if it has a non-void return type.", nameof(method));
+                    return new PropertyError(new BindingNotification(exception, BindingErrorType.Error));
+                }
+
                 return new Accessor(reference, method);
             }
             else
             {
-                var message = $"Could not find CLR method '{propertyName}' on '{instance}'";
+                var message = $"Could not find CLR method '{methodName}' on '{instance}'";
                 var exception = new MissingMemberException(message);
                 return new PropertyError(new BindingNotification(exception, BindingErrorType.Error));
             }
@@ -41,9 +47,7 @@ namespace Avalonia.Markup.Data.Plugins
 
                 var paramTypes = method.GetParameters().Select(param => param.ParameterType).ToArray();
                 var returnType = method.ReturnType;
-
-                // TODO: Throw exception if more than 8 parameters or more than 7 + return type.
-                // Do this here or in the caller? Here probably
+                
                 if (returnType == typeof(void))
                 {
                     if (paramTypes.Length == 0)
@@ -60,10 +64,8 @@ namespace Avalonia.Markup.Data.Plugins
                     var genericTypeParameters = paramTypes.Concat(new[] { returnType }).ToArray();
                     PropertyType = Type.GetType($"System.Func`{genericTypeParameters.Length}").MakeGenericType(genericTypeParameters);
                 }
-
-                // TODO: Is this going to leak?
-                // TODO: Static methods?
-                Value = method.CreateDelegate(PropertyType, reference.Target);
+                
+                Value = method.IsStatic ? method.CreateDelegate(PropertyType) : method.CreateDelegate(PropertyType, reference.Target);
             }
 
             public override Type PropertyType { get; }
@@ -73,19 +75,18 @@ namespace Avalonia.Markup.Data.Plugins
             public override bool SetValue(object value, BindingPriority priority) => false;
 
             protected override void SubscribeCore(IObserver<object> observer)
-            {
-                SendCurrentValue();
-            }
-
-            private void SendCurrentValue()
             {
                 try
                 {
-                    var value = Value;
-                    Observer.OnNext(value);
+                    Observer.OnNext(Value);
                 }
                 catch { }
             }
+
+            private void SendCurrentValue()
+            {
+
+            }
         }
     }
 }
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Method.cs b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Method.cs
index 9929e4e986..439e9dc542 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Method.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Method.cs
@@ -19,6 +19,11 @@ namespace Avalonia.Markup.UnitTests.Data
             public int MethodWithReturn() => 0;
 
             public int MethodWithReturnAndParameters(int i) => i;
+
+            public static void StaticMethod() { }
+
+            public static void TooManyParameters(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9) { }
+            public static int TooManyParametersWithReturnType(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8) => 1;
         }
 
         [Fact]
@@ -37,6 +42,7 @@ namespace Avalonia.Markup.UnitTests.Data
         [InlineData(nameof(TestObject.MethodWithoutReturn), typeof(Action))]
         [InlineData(nameof(TestObject.MethodWithReturn), typeof(Func<int>))]
         [InlineData(nameof(TestObject.MethodWithReturnAndParameters), typeof(Func<int, int>))]
+        [InlineData(nameof(TestObject.StaticMethod), typeof(Action))]
         public async Task Should_Get_Method_WithCorrectDelegateType(string methodName, Type expectedType)
         {
             var data = new TestObject();
@@ -61,5 +67,21 @@ namespace Avalonia.Markup.UnitTests.Data
 
             GC.KeepAlive(data);
         }
+
+        [Theory]
+        [InlineData(nameof(TestObject.TooManyParameters))]
+        [InlineData(nameof(TestObject.TooManyParametersWithReturnType))]
+        public async Task Should_Return_Error_Notification_If_Too_Many_Parameters(string methodName)
+        {
+            var data = new TestObject();
+            var observer = new ExpressionObserver(data, methodName);
+            var result = await observer.Take(1);
+
+            Assert.IsType<BindingNotification>(result);
+
+            Assert.Equal(BindingErrorType.Error, ((BindingNotification)result).ErrorType);
+
+            GC.KeepAlive(data);
+        }
     }
 }

From 6dc6ec84e975bef1f65d75816a8b558e48b4bd46 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 2 Oct 2017 21:57:47 -0500
Subject: [PATCH 027/482] Add leak test to make sure the method accessor
 doesn't leak memory.

---
 .../ExpressionObserverTests.cs                | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tests/Avalonia.LeakTests/ExpressionObserverTests.cs b/tests/Avalonia.LeakTests/ExpressionObserverTests.cs
index 3dbc62424f..d0f892bebb 100644
--- a/tests/Avalonia.LeakTests/ExpressionObserverTests.cs
+++ b/tests/Avalonia.LeakTests/ExpressionObserverTests.cs
@@ -71,6 +71,28 @@ namespace Avalonia.LeakTests
                 Assert.Equal(0, memory.GetObjects(where => where.Type.Is<NonIntegerIndexer>()).ObjectsCount));
         }
 
+        [Fact]
+        public void Should_Not_Keep_Source_Alive_MethodBinding()
+        {
+            Func<ExpressionObserver> run = () =>
+            {
+                var source = new { Foo = new MethodBound() };
+                var target = new ExpressionObserver(source, "Foo.A");
+                target.Subscribe(_ => { });
+                return target;
+            };
+
+            var result = run();
+
+            dotMemory.Check(memory =>
+                Assert.Equal(0, memory.GetObjects(where => where.Type.Is<MethodBound>()).ObjectsCount));
+        }
+
+        private class MethodBound
+        {
+            public void A() { }
+        }
+
         private class NonIntegerIndexer : NotifyingBase
         {
             private readonly Dictionary<string, string> _storage = new Dictionary<string, string>();

From 05b6ab91c9873885e639e6ba4153b6828dde4edf Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 2 Oct 2017 22:14:56 -0500
Subject: [PATCH 028/482] Disable unused event warning

---
 src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs b/src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs
index 1d417a55a6..6de9be80cc 100644
--- a/src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs
+++ b/src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs
@@ -14,7 +14,9 @@ namespace Avalonia.Markup
             this.action = action;
         }
 
+#pragma warning disable 0067
         public event EventHandler CanExecuteChanged;
+#pragma warning restore 0067
 
         public bool CanExecute(object parameter) => true;
 

From 685a509c5cf7b87f1157d2e8c5ac7f1c2497e0a9 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 3 Oct 2017 17:00:49 +0200
Subject: [PATCH 029/482] Reimplement commented-out tests.

---
 tests/Avalonia.UnitTests/TestRoot.cs          |   2 -
 .../Rendering/DeferredRendererTests.cs        | 178 +++++++++---------
 2 files changed, 87 insertions(+), 93 deletions(-)

diff --git a/tests/Avalonia.UnitTests/TestRoot.cs b/tests/Avalonia.UnitTests/TestRoot.cs
index 90532d64a1..9ec053f075 100644
--- a/tests/Avalonia.UnitTests/TestRoot.cs
+++ b/tests/Avalonia.UnitTests/TestRoot.cs
@@ -49,8 +49,6 @@ namespace Avalonia.UnitTests
 
         public ILayoutManager LayoutManager => AvaloniaLocator.Current.GetService<ILayoutManager>();
 
-        public IRenderTarget RenderTarget => null;
-
         public IRenderer Renderer { get; set; }
 
         public IAccessKeyHandler AccessKeyHandler => null;
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
index 047cb05c26..cec95d4807 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
@@ -129,102 +129,98 @@ namespace Avalonia.Visuals.UnitTests.Rendering
         [Fact]
         public void Frame_Should_Create_Layer_For_Root()
         {
-            throw new NotImplementedException();
-            //var loop = new Mock<IRenderLoop>();
-            //var root = new TestRoot();
-            //var rootLayer = new Mock<IRenderTargetBitmapImpl>();
-            //var dispatcher = new ImmediateDispatcher();
-
-            //var sceneBuilder = new Mock<ISceneBuilder>();
-            //sceneBuilder.Setup(x => x.UpdateAll(It.IsAny<Scene>()))
-            //    .Callback<Scene>(scene =>
-            //    {
-            //        scene.Size = root.ClientSize;
-            //        scene.Layers.Add(root).Dirty.Add(new Rect(root.ClientSize));
-            //    });
-
-            //var layers = new Mock<IRenderLayerFactory>();
-            //layers.Setup(x => x.CreateLayer(root, root.ClientSize, 96, 96)).Returns(CreateLayer());
-
-            //var renderInterface = new Mock<IPlatformRenderInterface>();
-
-            //var target = new DeferredRenderer(
-            //    root,
-            //    loop.Object,
-            //    sceneBuilder: sceneBuilder.Object,
-            //    layerFactory: layers.Object,
-            //    dispatcher: dispatcher);
-
-            //target.Start();
-            //RunFrame(loop);
-
-            //layers.Verify(x => x.CreateLayer(root, root.ClientSize, 96, 96));
+            var loop = new Mock<IRenderLoop>();
+            var root = new TestRoot();
+            var rootLayer = new Mock<IRenderTargetBitmapImpl>();
+            var dispatcher = new ImmediateDispatcher();
+
+            var sceneBuilder = new Mock<ISceneBuilder>();
+            sceneBuilder.Setup(x => x.UpdateAll(It.IsAny<Scene>()))
+                .Callback<Scene>(scene =>
+                {
+                    scene.Size = root.ClientSize;
+                    scene.Layers.Add(root).Dirty.Add(new Rect(root.ClientSize));
+                });
+
+            var renderInterface = new Mock<IPlatformRenderInterface>();
+
+            var target = new DeferredRenderer(
+                root,
+                loop.Object,
+                sceneBuilder: sceneBuilder.Object,
+                //layerFactory: layers.Object,
+                dispatcher: dispatcher);
+
+            target.Start();
+            RunFrame(loop);
+
+            var context = Mock.Get(root.CreateRenderTarget().CreateDrawingContext(null));
+            context.Verify(x => x.CreateLayer(root.ClientSize));
         }
 
         [Fact]
         public void Should_Create_And_Delete_Layers_For_Transparent_Controls()
         {
-            throw new NotImplementedException();
-            //Border border;
-            //var root = new TestRoot
-            //{
-            //    Width = 100,
-            //    Height = 100,
-            //    Child = new Border
-            //    {
-            //        Background = Brushes.Red,
-            //        Child = border = new Border
-            //        {
-            //            Background = Brushes.Green,
-            //        }
-            //    }
-            //};
-
-            //root.Measure(Size.Infinity);
-            //root.Arrange(new Rect(root.DesiredSize));
-
-            //var loop = new Mock<IRenderLoop>();
-            //var layerFactory = new MockRenderLayerFactory(new Dictionary<IVisual, IRenderTargetBitmapImpl>
-            //{
-            //    { root, CreateLayer() },
-            //    { border, CreateLayer() },
-            //});
-
-            //var target = new DeferredRenderer(
-            //    root, 
-            //    loop.Object,
-            //    layerFactory: layerFactory,
-            //    dispatcher: new ImmediateDispatcher());
-            //root.Renderer = target;
-
-            //target.Start();
-            //RunFrame(loop);
-
-            //var rootContext = layerFactory.GetMockDrawingContext(root);
-            //var borderContext = layerFactory.GetMockDrawingContext(border);
-
-            //rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
-            //rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once);
-            //borderContext.Verify(x => x.FillRectangle(It.IsAny<IBrush>(), It.IsAny<Rect>(), It.IsAny<float>()), Times.Never);
-
-            //rootContext.ResetCalls();
-            //borderContext.ResetCalls();
-            //border.Opacity = 0.5;
-            //RunFrame(loop);
-
-            //rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
-            //rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Never);
-            //borderContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once);
-
-            //rootContext.ResetCalls();
-            //borderContext.ResetCalls();
-            //border.Opacity = 1;
-            //RunFrame(loop);
-
-            //layerFactory.GetMockBitmap(border).Verify(x => x.Dispose());
-            //rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
-            //rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once);
-            //borderContext.Verify(x => x.FillRectangle(It.IsAny<IBrush>(), It.IsAny<Rect>(), It.IsAny<float>()), Times.Never);
+            Border border;
+            var root = new TestRoot
+            {
+                Width = 100,
+                Height = 100,
+                Child = new Border
+                {
+                    Background = Brushes.Red,
+                    Child = border = new Border
+                    {
+                        Background = Brushes.Green,
+                    }
+                }
+            };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(root.DesiredSize));
+
+            var rootLayer = CreateLayer();
+            var borderLayer = CreateLayer();
+            var renderTargetContext = Mock.Get(root.CreateRenderTarget().CreateDrawingContext(null));
+            renderTargetContext.SetupSequence(x => x.CreateLayer(It.IsAny<Size>()))
+                .Returns(rootLayer)
+                .Returns(borderLayer);
+
+            var loop = new Mock<IRenderLoop>();
+            var target = new DeferredRenderer(
+                root,
+                loop.Object,
+                dispatcher: new ImmediateDispatcher());
+            root.Renderer = target;
+
+            target.Start();
+            RunFrame(loop);
+
+            var rootContext = Mock.Get(rootLayer.CreateDrawingContext(null));
+            var borderContext = Mock.Get(borderLayer.CreateDrawingContext(null));
+
+            rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
+            rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once);
+            borderContext.Verify(x => x.FillRectangle(It.IsAny<IBrush>(), It.IsAny<Rect>(), It.IsAny<float>()), Times.Never);
+
+            rootContext.ResetCalls();
+            borderContext.ResetCalls();
+            border.Opacity = 0.5;
+            RunFrame(loop);
+
+            rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
+            rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Never);
+            borderContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once);
+
+            rootContext.ResetCalls();
+            borderContext.ResetCalls();
+            border.Opacity = 1;
+            RunFrame(loop);
+
+            Mock.Get(borderLayer).Verify(x => x.Dispose());
+            rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
+            rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once);
+            borderContext.Verify(x => x.FillRectangle(It.IsAny<IBrush>(), It.IsAny<Rect>(), It.IsAny<float>()), Times.Never);
         }
 
         private void IgnoreFirstFrame(Mock<IRenderLoop> loop, Mock<ISceneBuilder> sceneBuilder)

From cf9e8cfede19978fbd55f731325d52c9a94fda91 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 3 Oct 2017 17:36:09 +0200
Subject: [PATCH 030/482] Use NotSupportedException

---
 .../Rendering/SceneGraph/DeferredDrawingContextImpl.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
index 5fcd0e42bd..29c482c336 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
@@ -196,7 +196,7 @@ namespace Avalonia.Rendering.SceneGraph
 
         public IRenderTargetBitmapImpl CreateLayer(Size size)
         {
-            throw new NotImplementedException();
+            throw new NotSupportedException("Creating layers on a deferred drawing context not supported");
         }
 
         /// <inheritdoc/>

From 2cc4b41acc7521f72fe552cfbf079c85f06199dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Tue, 3 Oct 2017 22:12:11 +0100
Subject: [PATCH 031/482] Use Screen API.

---
 src/Avalonia.Controls/Screens.cs               |  2 +-
 src/Avalonia.Controls/Window.cs                | 11 ++++-------
 src/Windows/Avalonia.Win32/ScreenImpl.cs       |  4 ++--
 .../Avalonia.Controls.UnitTests/WindowTests.cs | 18 ++++++++++++------
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/Avalonia.Controls/Screens.cs b/src/Avalonia.Controls/Screens.cs
index b8ddce3aea..2bfddc048b 100644
--- a/src/Avalonia.Controls/Screens.cs
+++ b/src/Avalonia.Controls/Screens.cs
@@ -39,7 +39,7 @@ namespace Avalonia.Controls
             return currMaxScreen;
         }
         
-        public Screen SceenFromPoint(Point point)
+        public Screen ScreenFromPoint(Point point)
         {
             return All.FirstOrDefault(x=>x.Bounds.Contains(point));        
         }
diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 4cbd73841b..7890a7dd5a 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -376,13 +376,10 @@ namespace Avalonia.Controls
         {
             if (WindowStartupLocation == WindowStartupLocation.CenterScreen)
             {
-                // This should be using a Screen API, but we don't have one yet and
-                // PlatformImpl.MaxClientSize is the best we have.
-                if (PlatformImpl != null)
-                {
-                    var positionAsSize = PlatformImpl.MaxClientSize / 2 - ClientSize / 2;
-                    Position = new Point(positionAsSize.Width, positionAsSize.Height);
-                }
+                var screen = Screens.ScreenFromPoint(Bounds.Position);
+
+                if (screen != null)
+                    Position = screen.WorkingArea.CenterRect(new Rect(ClientSize)).Position;
             }
             else if (WindowStartupLocation == WindowStartupLocation.CenterOwner)
             {
diff --git a/src/Windows/Avalonia.Win32/ScreenImpl.cs b/src/Windows/Avalonia.Win32/ScreenImpl.cs
index 4f4331e461..113b2811dc 100644
--- a/src/Windows/Avalonia.Win32/ScreenImpl.cs
+++ b/src/Windows/Avalonia.Win32/ScreenImpl.cs
@@ -41,8 +41,8 @@ namespace Avalonia.Win32
                                 Rect avaloniaBounds = new Rect(bounds.left, bounds.top, bounds.right - bounds.left,
                                     bounds.bottom - bounds.top);
                                 Rect avaloniaWorkArea =
-                                    new Rect(workingArea.left, workingArea.top, workingArea.right - bounds.left,
-                                        workingArea.bottom - bounds.top);
+                                    new Rect(workingArea.left, workingArea.top, workingArea.right - workingArea.left,
+                                        workingArea.bottom - workingArea.top);
                                 screens[index] =
                                     new WinScreen(avaloniaBounds, avaloniaWorkArea, monitorInfo.dwFlags == 1,
                                         monitor);
diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
index 4de1cfe356..6168421919 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
@@ -239,32 +239,38 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void Window_Should_Be_Centered_When_Window_Startup_Location_Is_Center_Screen()
+        public void Window_Should_Be_Centered_When_WindowStartupLocation_Is_CenterScreen()
         {
+            var screen1 = new Mock<Screen>(new Rect(new Size(1920, 1080)), new Rect(new Size(1920, 1040)), true);
+            var screen2 = new Mock<Screen>(new Rect(new Size(1366, 768)), new Rect(new Size(1366, 728)), false);
+
+            var screens = new Mock<IScreenImpl>();
+            screens.Setup(x => x.AllScreens).Returns(new Screen[] { screen1.Object, screen2.Object });
+
             var windowImpl = new Mock<IWindowImpl>();
             windowImpl.SetupProperty(x => x.Position);
             windowImpl.Setup(x => x.ClientSize).Returns(new Size(800, 480));
-            windowImpl.Setup(x => x.MaxClientSize).Returns(new Size(1920, 1080));
             windowImpl.Setup(x => x.Scaling).Returns(1);
+            windowImpl.Setup(x => x.Screen).Returns(screens.Object);
 
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                var window = new Window();
+                var window = new Window(windowImpl.Object);
                 window.WindowStartupLocation = WindowStartupLocation.CenterScreen;
                 window.Position = new Point(60, 40);
 
                 window.Show();
 
                 var expectedPosition = new Point(
-                    window.PlatformImpl.MaxClientSize.Width / 2 - window.ClientSize.Width / 2,
-                    window.PlatformImpl.MaxClientSize.Height / 2 - window.ClientSize.Height / 2);
+                    screen1.Object.WorkingArea.Size.Width / 2 - window.ClientSize.Width / 2,
+                    screen1.Object.WorkingArea.Size.Height / 2 - window.ClientSize.Height / 2);
 
                 Assert.Equal(window.Position, expectedPosition);
             }
         }
 
         [Fact]
-        public void Window_Should_Be_Centered_Relative_To_Owner_When_Window_Startup_Location_Is_Center_Owner()
+        public void Window_Should_Be_Centered_Relative_To_Owner_When_WindowStartupLocation_Is_CenterOwner()
         {
             var parentWindowImpl = new Mock<IWindowImpl>();
             parentWindowImpl.SetupProperty(x => x.Position);

From 097716141399b0a27a34887e109981a7ff1e9b6c Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 4 Oct 2017 11:23:48 +0300
Subject: [PATCH 032/482] Use AppDomain.GetLoadedAssemblies() for all platforms

---
 build/NetCore.props                           |  2 -
 .../NetCoreRuntimePlatform.cs                 | 42 -------------------
 .../StandardRuntimePlatform.cs                |  7 +---
 3 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 src/Avalonia.DotNetCoreRuntime/NetCoreRuntimePlatform.cs

diff --git a/build/NetCore.props b/build/NetCore.props
index cebb02c7f5..b9cde28015 100644
--- a/build/NetCore.props
+++ b/build/NetCore.props
@@ -1,6 +1,4 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.1.0" />
   </ItemGroup>
 </Project>
diff --git a/src/Avalonia.DotNetCoreRuntime/NetCoreRuntimePlatform.cs b/src/Avalonia.DotNetCoreRuntime/NetCoreRuntimePlatform.cs
deleted file mode 100644
index 6aab8e0243..0000000000
--- a/src/Avalonia.DotNetCoreRuntime/NetCoreRuntimePlatform.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.DotNet.PlatformAbstractions;
-using Microsoft.Extensions.DependencyModel;
-
-namespace Avalonia.Shared.PlatformSupport
-{
-    internal partial class StandardRuntimePlatform
-    {
-        private static readonly Lazy<Assembly[]> Assemblies = new Lazy<Assembly[]>(LoadAssemblies);
-        public Assembly[] GetLoadedAssemblies() => Assemblies.Value;
-
-        static Assembly[] LoadAssemblies()
-        {
-            var assemblies = new List<Assembly>();
-            // Mostly copy-pasted from (MIT):
-            // https://github.com/StefH/System.AppDomain.Core/blob/0b35e676c2721aa367b96e62eb52c97ee0b43a70/src/System.AppDomain.NetCoreApp/AppDomain.cs
-
-            foreach (var assemblyName in
-                DependencyContext.Default.GetRuntimeAssemblyNames(RuntimeEnvironment.GetRuntimeIdentifier()))
-            {
-                try
-                {
-                    var assembly = Assembly.Load(assemblyName);
-                    // just load all types and skip this assembly if one or more types cannot be resolved
-                    assembly.DefinedTypes.ToArray();
-                    assemblies.Add(assembly);
-                }
-                catch (Exception ex)
-                {
-                    Debug.Write(ex.Message);
-                }
-            }
-            return assemblies.ToArray();
-        }
-    }
-}
diff --git a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
index 092910a08f..757cf52853 100644
--- a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
+++ b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
@@ -11,13 +11,8 @@ namespace Avalonia.Shared.PlatformSupport
 {
     internal partial class StandardRuntimePlatform : IRuntimePlatform
     {
-
-#if NETCOREAPP2_0
-        public void PostThreadPoolItem(Action cb) =>  ThreadPool.QueueUserWorkItem(_ => cb(), null);
-#else
-        public Assembly[] GetLoadedAssemblies() => AppDomain.CurrentDomain.GetAssemblies();
         public void PostThreadPoolItem(Action cb) => ThreadPool.UnsafeQueueUserWorkItem(_ => cb(), null);
-#endif
+        public Assembly[] GetLoadedAssemblies() => AppDomain.CurrentDomain.GetAssemblies();
         public IDisposable StartSystemTimer(TimeSpan interval, Action tick)
         {
             return new Timer(_ => tick(), null, interval, interval);

From b05f913e2501c47f6a42f8b9ddead69cb076723e Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 4 Oct 2017 12:15:22 +0300
Subject: [PATCH 033/482] [GTK3] Normal priority for timers

---
 src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs b/src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs
index be886ea1c7..5253be5afb 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs
+++ b/src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs
@@ -53,7 +53,7 @@ namespace Avalonia.Gtk3.Interop
             if (interval == 0)
                 throw new ArgumentException("Don't know how to create a timer with zero or negative interval");
             var timer = new Timer ();
-            GlibTimeout.Add(GlibPriority.FromDispatcherPriority(DispatcherPriority.Background), interval,
+            GlibTimeout.Add(GlibPriority.FromDispatcherPriority(DispatcherPriority.Normal), interval,
                 () =>
                 {
                     if (timer.Stopped)

From f6a60e27592d89e76129a5f47157d62a2981b34d Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 4 Oct 2017 12:16:29 +0300
Subject: [PATCH 034/482] [GTK3] Block in SetNextRenderOperation until previous
 frame is dequeued

---
 src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
index bfec3db756..8771106895 100644
--- a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
+++ b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
@@ -4,6 +4,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Threading;
 using Avalonia.Controls;
 using Avalonia.Gtk3.Interop;
 using Avalonia.Input;
@@ -29,6 +30,7 @@ namespace Avalonia.Gtk3
         private GCHandle _gcHandle;
         private object _lock = new object();
         private IDeferredRenderOperation _nextRenderOperation;
+        private readonly AutoResetEvent _canSetNextOperation = new AutoResetEvent(true);
 
         public WindowBaseImpl(GtkWindow gtkWidget)
         {
@@ -255,11 +257,19 @@ namespace Avalonia.Gtk3
 
         public void SetNextRenderOperation(IDeferredRenderOperation op)
         {
-            lock (_lock)
+            while (true)
             {
-                _nextRenderOperation?.Dispose();
-                _nextRenderOperation = op;
+                lock (_lock)
+                {
+                    if (_nextRenderOperation == null)
+                    {
+                        _nextRenderOperation = op;
+                        return;
+                    }
+                }
+                _canSetNextOperation.WaitOne();
             }
+            
         }
 
         private void OnRenderTick()
@@ -272,6 +282,7 @@ namespace Avalonia.Gtk3
                     op = _nextRenderOperation;
                     _nextRenderOperation = null;
                 }
+                _canSetNextOperation.Set();
             }
             if (op != null)
             {

From 5fd6f5ac6d315bc48ab15a9d25f65c0c7cbcc891 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 4 Oct 2017 13:22:59 +0200
Subject: [PATCH 035/482] Snap bounding boxes to pixels.

---
 .../SceneGraph/BrushDrawOperation.cs          | 15 ++---
 .../Rendering/SceneGraph/DrawOperation.cs     | 26 +++++++++
 .../Rendering/SceneGraph/GeometryNode.cs      |  5 +-
 .../Rendering/SceneGraph/IDrawOperation.cs    |  2 +-
 .../Rendering/SceneGraph/ImageNode.cs         | 11 ++--
 .../Rendering/SceneGraph/LineNode.cs          |  5 +-
 .../Rendering/SceneGraph/OpacityMaskNode.cs   |  5 +-
 .../Rendering/SceneGraph/RectangleNode.cs     |  5 +-
 .../Rendering/SceneGraph/TextNode.cs          |  5 +-
 .../SceneGraph/DrawOperationTests.cs          | 55 +++++++++++++++++++
 10 files changed, 97 insertions(+), 37 deletions(-)
 create mode 100644 src/Avalonia.Visuals/Rendering/SceneGraph/DrawOperation.cs
 create mode 100644 tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs

diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/BrushDrawOperation.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/BrushDrawOperation.cs
index 59a895a22f..f56e7448a7 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/BrushDrawOperation.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/BrushDrawOperation.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using Avalonia.Media;
-using Avalonia.Platform;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Rendering.SceneGraph
@@ -12,20 +11,16 @@ namespace Avalonia.Rendering.SceneGraph
     /// <summary>
     /// Base class for draw operations that can use a brush.
     /// </summary>
-    internal abstract class BrushDrawOperation : IDrawOperation
+    internal abstract class BrushDrawOperation : DrawOperation
     {
-        /// <inheritdoc/>
-        public abstract Rect Bounds { get; }
-
-        /// <inheritdoc/>
-        public abstract bool HitTest(Point p);
+        public BrushDrawOperation(Rect bounds, Matrix transform, Pen pen)
+            : base(bounds, transform, pen)
+        {
+        }
 
         /// <summary>
         /// Gets a collection of child scenes that are needed to draw visual brushes.
         /// </summary>
         public abstract IDictionary<IVisual, Scene> ChildScenes { get; }
-
-        /// <inheritdoc/>
-        public abstract void Render(IDrawingContextImpl context);
     }
 }
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DrawOperation.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/DrawOperation.cs
new file mode 100644
index 0000000000..4c6ed189ff
--- /dev/null
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/DrawOperation.cs
@@ -0,0 +1,26 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Platform;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    /// <summary>
+    /// Base class for draw operations that have bounds.
+    /// </summary>
+    internal abstract class DrawOperation : IDrawOperation
+    {
+        public DrawOperation(Rect bounds, Matrix transform, Pen pen)
+        {
+            bounds = bounds.Inflate((pen?.Thickness ?? 0) / 2).TransformToAABB(transform);
+            Bounds = new Rect(
+                new Point(Math.Floor(bounds.X), Math.Floor(bounds.Y)),
+                new Point(Math.Ceiling(bounds.Right), Math.Ceiling(bounds.Bottom)));
+        }
+
+        public Rect Bounds { get; }
+
+        public abstract bool HitTest(Point p);
+
+        public abstract void Render(IDrawingContextImpl context);
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs
index b884c42d99..6310122183 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs
@@ -28,8 +28,8 @@ namespace Avalonia.Rendering.SceneGraph
             Pen pen,
             IGeometryImpl geometry,
             IDictionary<IVisual, Scene> childScenes = null)
+            : base(geometry.GetRenderBounds(pen?.Thickness ?? 0), transform, null)
         {
-            Bounds = geometry.GetRenderBounds(pen?.Thickness ?? 0).TransformToAABB(transform);
             Transform = transform;
             Brush = brush?.ToImmutable();
             Pen = pen?.ToImmutable();
@@ -37,9 +37,6 @@ namespace Avalonia.Rendering.SceneGraph
             ChildScenes = childScenes;
         }
 
-        /// <inheritdoc/>
-        public override Rect Bounds { get; }
-
         /// <summary>
         /// Gets the transform with which the node will be drawn.
         /// </summary>
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/IDrawOperation.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/IDrawOperation.cs
index 8c3bb72463..839fd9b0e5 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/IDrawOperation.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/IDrawOperation.cs
@@ -12,7 +12,7 @@ namespace Avalonia.Rendering.SceneGraph
     public interface IDrawOperation
     {
         /// <summary>
-        /// Gets the bounds of the visible content in the node.
+        /// Gets the bounds of the visible content in the node in global coordinates.
         /// </summary>
         Rect Bounds { get; }
 
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs
index 4a50f12095..8291d1c0bb 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Rendering.SceneGraph
     /// <summary>
     /// A node in the scene graph which represents an image draw.
     /// </summary>
-    internal class ImageNode : IDrawOperation
+    internal class ImageNode : DrawOperation
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageNode"/> class.
@@ -20,8 +20,8 @@ namespace Avalonia.Rendering.SceneGraph
         /// <param name="sourceRect">The source rect.</param>
         /// <param name="destRect">The destination rect.</param>
         public ImageNode(Matrix transform, IBitmapImpl source, double opacity, Rect sourceRect, Rect destRect)
+            : base(destRect, transform, null)
         {
-            Bounds = destRect.TransformToAABB(transform);
             Transform = transform;
             Source = source;
             Opacity = opacity;
@@ -29,9 +29,6 @@ namespace Avalonia.Rendering.SceneGraph
             DestRect = destRect;
         }
 
-        /// <inheritdoc/>
-        public Rect Bounds { get; }
-
         /// <summary>
         /// Gets the transform with which the node will be drawn.
         /// </summary>
@@ -80,7 +77,7 @@ namespace Avalonia.Rendering.SceneGraph
         }
 
         /// <inheritdoc/>
-        public void Render(IDrawingContextImpl context)
+        public override void Render(IDrawingContextImpl context)
         {
             // TODO: Probably need to introduce some kind of locking mechanism in the case of
             // WriteableBitmap.
@@ -89,6 +86,6 @@ namespace Avalonia.Rendering.SceneGraph
         }
 
         /// <inheritdoc/>
-        public bool HitTest(Point p) => Bounds.Contains(p);
+        public override bool HitTest(Point p) => Bounds.Contains(p);
     }
 }
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/LineNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/LineNode.cs
index e39335b5b6..d3df478a63 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/LineNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/LineNode.cs
@@ -28,8 +28,8 @@ namespace Avalonia.Rendering.SceneGraph
             Point p1,
             Point p2,
             IDictionary<IVisual, Scene> childScenes = null)
+            : base(new Rect(p1, p2), transform, pen)
         {
-            Bounds = new Rect(p1, p2).TransformToAABB(transform).Inflate(pen?.Thickness ?? 0);
             Transform = transform;
             Pen = pen?.ToImmutable();
             P1 = p1;
@@ -37,9 +37,6 @@ namespace Avalonia.Rendering.SceneGraph
             ChildScenes = childScenes;
         }
 
-        /// <inheritdoc/>
-        public override Rect Bounds { get; }
-
         /// <summary>
         /// Gets the transform with which the node will be drawn.
         /// </summary>
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/OpacityMaskNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/OpacityMaskNode.cs
index c40869724f..28b8f53e26 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/OpacityMaskNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/OpacityMaskNode.cs
@@ -19,6 +19,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// <param name="bounds">The bounds of the mask.</param>
         /// <param name="childScenes">Child scenes for drawing visual brushes.</param>
         public OpacityMaskNode(IBrush mask, Rect bounds, IDictionary<IVisual, Scene> childScenes = null)
+            : base(Rect.Empty, Matrix.Identity, null)
         {
             Mask = mask?.ToImmutable();
             MaskBounds = bounds;
@@ -30,12 +31,10 @@ namespace Avalonia.Rendering.SceneGraph
         /// opacity mask pop.
         /// </summary>
         public OpacityMaskNode()
+            : base(Rect.Empty, Matrix.Identity, null)
         {
         }
 
-        /// <inheritdoc/>
-        public override Rect Bounds => Rect.Empty;
-
         /// <summary>
         /// Gets the mask to be pushed or null if the operation represents a pop.
         /// </summary>
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs
index 2affc454b5..1730621c55 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs
@@ -30,8 +30,8 @@ namespace Avalonia.Rendering.SceneGraph
             Rect rect,
             float cornerRadius,
             IDictionary<IVisual, Scene> childScenes = null)
+            : base(rect, transform, pen)
         {
-            Bounds = rect.TransformToAABB(transform).Inflate(pen?.Thickness ?? 0);
             Transform = transform;
             Brush = brush?.ToImmutable();
             Pen = pen?.ToImmutable();
@@ -40,9 +40,6 @@ namespace Avalonia.Rendering.SceneGraph
             ChildScenes = childScenes;
         }
 
-        /// <inheritdoc/>
-        public override Rect Bounds { get; }
-
         /// <summary>
         /// Gets the transform with which the node will be drawn.
         /// </summary>
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/TextNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/TextNode.cs
index 058f3b1c22..6328d7dd14 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/TextNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/TextNode.cs
@@ -28,8 +28,8 @@ namespace Avalonia.Rendering.SceneGraph
             Point origin,
             IFormattedTextImpl text,
             IDictionary<IVisual, Scene> childScenes = null)
+            : base(new Rect(origin, text.Size), transform, null)
         {
-            Bounds = new Rect(origin, text.Size).TransformToAABB(transform);
             Transform = transform;
             Foreground = foreground?.ToImmutable();
             Origin = origin;
@@ -37,9 +37,6 @@ namespace Avalonia.Rendering.SceneGraph
             ChildScenes = childScenes;
         }
 
-        /// <inheritdoc/>
-        public override Rect Bounds { get; }
-
         /// <summary>
         /// Gets the transform with which the node will be drawn.
         /// </summary>
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
new file mode 100644
index 0000000000..76fe103c1b
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
@@ -0,0 +1,55 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering.SceneGraph;
+using Xunit;
+
+namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
+{
+    public class DrawOperationTests
+    {
+        [Fact]
+        public void Empty_Bounds_Remain_Empty()
+        {
+            var target = new TestDrawOperation(Rect.Empty, Matrix.Identity, null);
+
+            Assert.Equal(Rect.Empty, target.Bounds);
+        }
+
+        [Theory]
+        [InlineData(10, 10, 10, 10, 1, 1, 1, 9, 9, 12, 12)]
+        [InlineData(10, 10, 10, 10, 1, 1, 2, 9, 9, 12, 12)]
+        [InlineData(10, 10, 10, 10, 1.5, 1.5, 1, 14, 14, 17, 17)]
+        public void Rectangle_Bounds_Are_Snapped_To_Pixels(
+            double x,
+            double y,
+            double width,
+            double height,
+            double scaleX,
+            double scaleY,
+            double? penThickness,
+            double expectedX,
+            double expectedY,
+            double expectedWidth,
+            double expectedHeight)
+        {
+            var target = new TestDrawOperation(
+                new Rect(x, y, width, height),
+                Matrix.CreateScale(scaleX, scaleY),
+                penThickness.HasValue ? new Pen(Brushes.Black, penThickness.Value) : null);
+            Assert.Equal(new Rect(expectedX, expectedY, expectedWidth, expectedHeight), target.Bounds);
+        }
+
+        private class TestDrawOperation : DrawOperation
+        {
+            public TestDrawOperation(Rect bounds, Matrix transform, Pen pen)
+                :base(bounds, transform, pen)
+            {
+            }
+
+            public override bool HitTest(Point p) => false;
+
+            public override void Render(IDrawingContextImpl context) { }
+        }
+    }
+}

From eb5a354d624f49f4a82f0574a9d4b604db0acf4f Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 4 Oct 2017 13:13:07 +0100
Subject: [PATCH 036/482] [StackPanel] Gap value is not added to the measured
 width or height after the last child.

---
 src/Avalonia.Controls/StackPanel.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Avalonia.Controls/StackPanel.cs b/src/Avalonia.Controls/StackPanel.cs
index 0e12fb3283..a6fe35d668 100644
--- a/src/Avalonia.Controls/StackPanel.cs
+++ b/src/Avalonia.Controls/StackPanel.cs
@@ -170,6 +170,15 @@ namespace Avalonia.Controls
                 }
             }
 
+            if (Orientation == Orientation.Vertical)
+            {
+                measuredHeight -= gap;
+            }
+            else
+            {
+                measuredWidth -= gap;
+            }
+
             return new Size(measuredWidth, measuredHeight);
         }
 

From 29791fa241976caa9de681eddc6791669c48aa39 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 4 Oct 2017 15:27:18 +0300
Subject: [PATCH 037/482] Manual native memory management for leak detection

---
 .../Platform/IRuntimePlatform.cs              |   9 ++
 .../Avalonia.DotNetCoreRuntime.csproj         |   3 +-
 .../Avalonia.Gtk3/ImageSurfaceFramebuffer.cs  |  20 +--
 .../Interop/ManagedCairoSurface.cs            |  38 +++++
 src/Gtk/Avalonia.Gtk3/Interop/Native.cs       |   4 +
 .../StandardRuntimePlatform.cs                | 132 +++++++++++++++++-
 src/Skia/Avalonia.Skia/BitmapImpl.cs          |  13 ++
 7 files changed, 207 insertions(+), 12 deletions(-)
 create mode 100644 src/Gtk/Avalonia.Gtk3/Interop/ManagedCairoSurface.cs

diff --git a/src/Avalonia.Base/Platform/IRuntimePlatform.cs b/src/Avalonia.Base/Platform/IRuntimePlatform.cs
index e1a09f094d..66253dc5b2 100644
--- a/src/Avalonia.Base/Platform/IRuntimePlatform.cs
+++ b/src/Avalonia.Base/Platform/IRuntimePlatform.cs
@@ -14,6 +14,15 @@ namespace Avalonia.Platform
         IDisposable StartSystemTimer(TimeSpan interval, Action tick);
         string GetStackTrace();
         RuntimePlatformInfo GetRuntimeInfo();
+        IUnmanagedBlob AllocBlob(int size);
+    }
+
+    public interface IUnmanagedBlob : IDisposable
+    {
+        IntPtr Address { get; }
+        int Size { get; }
+        bool IsDisposed { get; }
+        
     }
 
     public struct RuntimePlatformInfo
diff --git a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj
index eade213c4c..53b2c997d0 100644
--- a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj
+++ b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <DefineConstants>$(DefineConstants);DOTNETCORE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
     <DocumentationFile>bin\$(Configuration)\Avalonia.DotNetCoreRuntime.XML</DocumentationFile>
@@ -21,5 +22,5 @@
     <ProjectReference Include="..\Windows\Avalonia.Win32.NetStandard\Avalonia.Win32.NetStandard.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\NetCore.props" />
-  <Import Project="..\Shared\PlatformSupport\PlatformSupport.projitems" Label="Shared" />
+  <Import Project="..\Shared\PlatformSupport\PlatformSupport.projitems" />
 </Project>
\ No newline at end of file
diff --git a/src/Gtk/Avalonia.Gtk3/ImageSurfaceFramebuffer.cs b/src/Gtk/Avalonia.Gtk3/ImageSurfaceFramebuffer.cs
index 182da7df58..4ebb080dd0 100644
--- a/src/Gtk/Avalonia.Gtk3/ImageSurfaceFramebuffer.cs
+++ b/src/Gtk/Avalonia.Gtk3/ImageSurfaceFramebuffer.cs
@@ -16,7 +16,7 @@ namespace Avalonia.Gtk3
     {
         private readonly WindowBaseImpl _impl;
         private readonly GtkWidget _widget;
-        private CairoSurface _surface;
+        private ManagedCairoSurface _surface;
         private int _factor;
         private object _lock = new object();
         public ImageSurfaceFramebuffer(WindowBaseImpl impl, int width, int height, int factor)
@@ -26,13 +26,13 @@ namespace Avalonia.Gtk3
             _factor = factor;
             width *= _factor;
             height *= _factor;
-            _surface = Native.CairoImageSurfaceCreate(1, width, height);
+            _surface = new ManagedCairoSurface(width, height);
             
             Width = width;
             Height = height;
-            Address = Native.CairoImageSurfaceGetData(_surface);
-            RowBytes = Native.CairoImageSurfaceGetStride(_surface);
-            Native.CairoSurfaceFlush(_surface);
+            Address = _surface.Buffer;
+            RowBytes = _surface.Stride;
+            Native.CairoSurfaceFlush(_surface.Surface);
         }
 
         static void Draw(IntPtr context, CairoSurface surface, double factor)
@@ -83,12 +83,12 @@ namespace Avalonia.Gtk3
         class RenderOp : IDeferredRenderOperation
         {
             private readonly GtkWidget _widget;
-            private CairoSurface _surface;
+            private ManagedCairoSurface _surface;
             private readonly double _factor;
             private readonly int _width;
             private readonly int _height;
 
-            public RenderOp(GtkWidget widget, CairoSurface _surface, double factor, int width, int height)
+            public RenderOp(GtkWidget widget, ManagedCairoSurface _surface, double factor, int width, int height)
             {
                 _widget = widget;
                 this._surface = _surface;
@@ -105,7 +105,7 @@ namespace Avalonia.Gtk3
 
             public void RenderNow()
             {
-                DrawToWidget(_widget, _surface, _width, _height, _factor);
+                DrawToWidget(_widget, _surface.Surface, _width, _height, _factor);
             }
         }
         
@@ -116,9 +116,9 @@ namespace Avalonia.Gtk3
                 if (Dispatcher.UIThread.CheckAccess())
                 {
                     if (_impl.CurrentCairoContext != IntPtr.Zero)
-                        Draw(_impl.CurrentCairoContext, _surface, _factor);
+                        Draw(_impl.CurrentCairoContext, _surface.Surface, _factor);
                     else
-                        DrawToWidget(_widget, _surface, Width, Height, _factor);
+                        DrawToWidget(_widget, _surface.Surface, Width, Height, _factor);
                     _surface.Dispose();
                 }
                 else
diff --git a/src/Gtk/Avalonia.Gtk3/Interop/ManagedCairoSurface.cs b/src/Gtk/Avalonia.Gtk3/Interop/ManagedCairoSurface.cs
new file mode 100644
index 0000000000..2cde99afa5
--- /dev/null
+++ b/src/Gtk/Avalonia.Gtk3/Interop/ManagedCairoSurface.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Runtime.InteropServices;
+using Avalonia.Platform;
+
+namespace Avalonia.Gtk3.Interop
+{
+    class ManagedCairoSurface : IDisposable
+    {
+        public IntPtr Buffer { get; private set; }
+        public CairoSurface Surface { get; private set; }
+        public int Stride { get; private set; }
+        private int _size;
+        private IRuntimePlatform _plat;
+        private IUnmanagedBlob _blob;
+
+        public ManagedCairoSurface(int width, int height)
+        {
+            _plat = AvaloniaLocator.Current.GetService<IRuntimePlatform>();
+            Stride = width * 4;
+            _size = height * Stride;
+            _blob = _plat.AllocBlob(_size * 2);
+            Buffer = _blob.Address;
+            Surface = Native.CairoImageSurfaceCreateForData(Buffer, 1, width, height, Stride);
+        }
+        
+        public void Dispose()
+        {
+            
+            if (Buffer != IntPtr.Zero)
+            {
+                Surface.Dispose();
+                _blob.Dispose();
+                Buffer = IntPtr.Zero;
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Gtk/Avalonia.Gtk3/Interop/Native.cs b/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
index c96fb23366..433094e0ae 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
+++ b/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
@@ -160,6 +160,9 @@ namespace Avalonia.Gtk3.Interop
 
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Cairo)]
             public delegate CairoSurface cairo_image_surface_create(int format, int width, int height);
+            
+            [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Cairo)]
+            public delegate CairoSurface cairo_image_surface_create_for_data(IntPtr data, int format, int width, int height, int stride);
 
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Cairo)]
             public delegate IntPtr cairo_image_surface_get_data(CairoSurface surface);
@@ -459,6 +462,7 @@ namespace Avalonia.Gtk3.Interop
         public static D.gdk_cairo_create GdkCairoCreate;
         
         public static D.cairo_image_surface_create CairoImageSurfaceCreate;
+        public static D.cairo_image_surface_create_for_data CairoImageSurfaceCreateForData;
         public static D.cairo_image_surface_get_data CairoImageSurfaceGetData;
         public static D.cairo_image_surface_get_stride CairoImageSurfaceGetStride;
         public static D.cairo_surface_mark_dirty CairoSurfaceMarkDirty;
diff --git a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
index 757cf52853..d648b630bd 100644
--- a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
+++ b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
@@ -2,8 +2,11 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
+using System.Collections.Generic;
 using System.Reflection;
 using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using System.Threading;
 using Avalonia.Platform;
 
@@ -18,8 +21,135 @@ namespace Avalonia.Shared.PlatformSupport
             return new Timer(_ => tick(), null, interval, interval);
         }
 
+        public string GetStackTrace() => Environment.StackTrace;
+
+        public IUnmanagedBlob AllocBlob(int size) => new UnmanagedBlob(this, size);
+        
+        class UnmanagedBlob : IUnmanagedBlob
+        {
+            private readonly StandardRuntimePlatform _plat;
+#if DEBUG
+            private static readonly List<string> Backtraces = new List<string>();
+            private static Thread GCThread;
+            private readonly string _backtrace;
 
 
-        public string GetStackTrace() => Environment.StackTrace;
+            class GCThreadDetector
+            {
+                ~GCThreadDetector()
+                {
+                    GCThread = Thread.CurrentThread;
+                }
+            }
+
+            [MethodImpl(MethodImplOptions.NoInlining)]
+            static void Spawn() => new GCThreadDetector();
+            
+            static UnmanagedBlob()
+            {
+                Spawn();
+                GC.WaitForPendingFinalizers();
+            }
+            
+#endif
+            
+            public UnmanagedBlob(StandardRuntimePlatform plat, int size)
+            {
+                _plat = plat;
+                Address = plat.Alloc(size);
+                GC.AddMemoryPressure(size);
+                Size = size;
+#if DEBUG
+                _backtrace = Environment.StackTrace;
+                Backtraces.Add(_backtrace);
+#endif
+            }
+
+            void DoDispose()
+            {
+                if (!IsDisposed)
+                {
+                    Backtraces.Remove(_backtrace);
+                    _plat.Free(Address, Size);
+                    GC.RemoveMemoryPressure(Size);
+                    IsDisposed = true;
+                    Address = IntPtr.Zero;
+                }
+            }
+
+            public void Dispose()
+            {
+#if DEBUG
+                if (Thread.CurrentThread.ManagedThreadId == GCThread?.ManagedThreadId)
+                {
+                    Console.Error.WriteLine("Native blob disposal from finalizer thread\nBacktrace: "
+                                            + Environment.StackTrace
+                                            + "\n\nBlob created by " + _backtrace);
+                }
+#endif
+                DoDispose();
+                GC.SuppressFinalize(this);
+            }
+
+            ~UnmanagedBlob()
+            {
+#if DEBUG
+                Console.Error.WriteLine("Undisposed native blob created by " + _backtrace);
+#endif
+                DoDispose();
+            }
+
+            public IntPtr Address { get; private set; }
+            public int Size { get; private set; }
+            public bool IsDisposed { get; private set; }
+        }
+        
+        
+        
+#if FULLDOTNET || DOTNETCORE
+        [DllImport("libc", SetLastError = true)]
+        private static extern IntPtr mmap(IntPtr addr, IntPtr length, int prot, int flags, int fd, IntPtr offset);
+        [DllImport("libc", SetLastError = true)]
+        private static extern int munmap(IntPtr addr, IntPtr length);
+        [DllImport("libc", SetLastError = true)]
+        private static extern long sysconf(int name);
+
+        private bool? _useMmap;
+        private bool UseMmap 
+            => _useMmap ?? ((_useMmap = GetRuntimeInfo().OperatingSystem == OperatingSystemType.Linux)).Value;
+        
+        IntPtr Alloc(int size)
+        {
+            if (UseMmap)
+            {
+                var rv = mmap(IntPtr.Zero, new IntPtr(size), 3, 0x22, -1, IntPtr.Zero);
+                if (rv.ToInt64() == -1 || (ulong) rv.ToInt64() == 0xffffffff)
+                {
+                    var errno = Marshal.GetLastWin32Error();
+                    throw new Exception("Unable to allocate memory: " + errno);
+                }
+                return rv;
+            }
+            else
+                return Marshal.AllocHGlobal(size);
+        }
+
+        void Free(IntPtr ptr, int len)
+        {
+            if (UseMmap)
+            {
+                if (munmap(ptr, new IntPtr(len)) == -1)
+                {
+                    var errno = Marshal.GetLastWin32Error();
+                    throw new Exception("Unable to free memory: " + errno);
+                }
+            }
+            else
+                Marshal.FreeHGlobal(ptr);
+        }
+#else
+        IntPtr Alloc(int size) => Marshal.AllocHGlobal(size);
+        void Free(IntPtr ptr, int len) => Marshal.FreeHGlobal(ptr);
+#endif
     }
 }
\ No newline at end of file
diff --git a/src/Skia/Avalonia.Skia/BitmapImpl.cs b/src/Skia/Avalonia.Skia/BitmapImpl.cs
index ce3efded11..d13190deff 100644
--- a/src/Skia/Avalonia.Skia/BitmapImpl.cs
+++ b/src/Skia/Avalonia.Skia/BitmapImpl.cs
@@ -20,6 +20,13 @@ namespace Avalonia.Skia
             _dpi = new Vector(96, 96);
         }
 
+        static void ReleaseProc(IntPtr address, object ctx)
+        {
+            ((IUnmanagedBlob) ctx).Dispose();
+        }
+
+        private static readonly SKBitmapReleaseDelegate ReleaseDelegate = ReleaseProc;
+        
         public BitmapImpl(int width, int height, Vector dpi, PixelFormat? fmt = null)
         {
             PixelHeight = height;
@@ -29,6 +36,12 @@ namespace Avalonia.Skia
             var runtime = AvaloniaLocator.Current?.GetService<IRuntimePlatform>()?.GetRuntimeInfo();
             if (runtime?.IsDesktop == true && runtime?.OperatingSystem == OperatingSystemType.Linux)
                 colorType = SKColorType.Bgra8888;
+            
+            Bitmap = new SKBitmap();
+            var nfo = new SKImageInfo(width, height, colorType, SKAlphaType.Premul);
+            var plat = AvaloniaLocator.Current.GetService<IRuntimePlatform>();
+            var blob = plat.AllocBlob(nfo.BytesSize);
+            Bitmap.InstallPixels(nfo, blob.Address, nfo.RowBytes, null, ReleaseDelegate, blob);
             Bitmap = new SKBitmap(width, height, colorType, SKAlphaType.Premul);
             Bitmap.Erase(SKColor.Empty);
         }

From 18e556a1b11c46a5f2061b736913f30174812b16 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 4 Oct 2017 13:37:01 +0100
Subject: [PATCH 038/482] correct stack panel unit tests.

---
 tests/Avalonia.Controls.UnitTests/StackPanelTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Avalonia.Controls.UnitTests/StackPanelTests.cs b/tests/Avalonia.Controls.UnitTests/StackPanelTests.cs
index f75c126ff1..56412d732b 100644
--- a/tests/Avalonia.Controls.UnitTests/StackPanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/StackPanelTests.cs
@@ -70,7 +70,7 @@ namespace Avalonia.Controls.UnitTests
             target.Measure(Size.Infinity);
             target.Arrange(new Rect(target.DesiredSize));
 
-            Assert.Equal(new Size(120, 130), target.Bounds.Size);
+            Assert.Equal(new Size(120, 120), target.Bounds.Size);
             Assert.Equal(new Rect(0, 0, 120, 20), target.Children[0].Bounds);
             Assert.Equal(new Rect(0, 30, 120, 30), target.Children[1].Bounds);
             Assert.Equal(new Rect(0, 70, 120, 50), target.Children[2].Bounds);
@@ -94,7 +94,7 @@ namespace Avalonia.Controls.UnitTests
             target.Measure(Size.Infinity);
             target.Arrange(new Rect(target.DesiredSize));
 
-            Assert.Equal(new Size(130, 120), target.Bounds.Size);
+            Assert.Equal(new Size(120, 120), target.Bounds.Size);
             Assert.Equal(new Rect(0, 0, 20, 120), target.Children[0].Bounds);
             Assert.Equal(new Rect(30, 0, 30, 120), target.Children[1].Bounds);
             Assert.Equal(new Rect(70, 0, 50, 120), target.Children[2].Bounds);

From 835bf9a7e5054a2078d01655c1546215d37cdb34 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 4 Oct 2017 15:45:37 +0300
Subject: [PATCH 039/482] Fixed release build

---
 src/Shared/PlatformSupport/StandardRuntimePlatform.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
index d648b630bd..fafa17a810 100644
--- a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
+++ b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
@@ -69,7 +69,9 @@ namespace Avalonia.Shared.PlatformSupport
             {
                 if (!IsDisposed)
                 {
+#if DEBUG
                     Backtraces.Remove(_backtrace);
+#endif
                     _plat.Free(Address, Size);
                     GC.RemoveMemoryPressure(Size);
                     IsDisposed = true;

From 38053170425ea333c70b79128eeae7ec064da696 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 4 Oct 2017 17:31:22 +0300
Subject: [PATCH 040/482] [SKIA] Fall back to direct SKBitmap call for unit
 tests

---
 src/Skia/Avalonia.Skia/BitmapImpl.cs | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/Skia/Avalonia.Skia/BitmapImpl.cs b/src/Skia/Avalonia.Skia/BitmapImpl.cs
index d13190deff..49d7d355ec 100644
--- a/src/Skia/Avalonia.Skia/BitmapImpl.cs
+++ b/src/Skia/Avalonia.Skia/BitmapImpl.cs
@@ -33,16 +33,22 @@ namespace Avalonia.Skia
             PixelWidth = width;
             _dpi = dpi;
             var colorType = fmt?.ToSkColorType() ?? SKImageInfo.PlatformColorType;
-            var runtime = AvaloniaLocator.Current?.GetService<IRuntimePlatform>()?.GetRuntimeInfo();
+            var runtimePlatform = AvaloniaLocator.Current?.GetService<IRuntimePlatform>()
+            var runtime = runtimePlatform?.GetRuntimeInfo();
             if (runtime?.IsDesktop == true && runtime?.OperatingSystem == OperatingSystemType.Linux)
                 colorType = SKColorType.Bgra8888;
-            
-            Bitmap = new SKBitmap();
-            var nfo = new SKImageInfo(width, height, colorType, SKAlphaType.Premul);
-            var plat = AvaloniaLocator.Current.GetService<IRuntimePlatform>();
-            var blob = plat.AllocBlob(nfo.BytesSize);
-            Bitmap.InstallPixels(nfo, blob.Address, nfo.RowBytes, null, ReleaseDelegate, blob);
-            Bitmap = new SKBitmap(width, height, colorType, SKAlphaType.Premul);
+
+            if (runtimePlatform != null)
+            {
+                Bitmap = new SKBitmap();
+                var nfo = new SKImageInfo(width, height, colorType, SKAlphaType.Premul);
+                var plat = AvaloniaLocator.Current.GetService<IRuntimePlatform>();
+                var blob = plat.AllocBlob(nfo.BytesSize);
+                Bitmap.InstallPixels(nfo, blob.Address, nfo.RowBytes, null, ReleaseDelegate, blob);
+                
+            }
+            else 
+                Bitmap =  new SKBitmap(width, height, colorType, SKAlphaType.Premul);
             Bitmap.Erase(SKColor.Empty);
         }
 

From 004f8a4cdde88168c6b4ebcb3a6a8b9e123d19f4 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 4 Oct 2017 17:32:53 +0300
Subject: [PATCH 041/482] Fall back to direct SKBitmap

---
 src/Skia/Avalonia.Skia/BitmapImpl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Skia/Avalonia.Skia/BitmapImpl.cs b/src/Skia/Avalonia.Skia/BitmapImpl.cs
index 49d7d355ec..00ab770e01 100644
--- a/src/Skia/Avalonia.Skia/BitmapImpl.cs
+++ b/src/Skia/Avalonia.Skia/BitmapImpl.cs
@@ -33,7 +33,7 @@ namespace Avalonia.Skia
             PixelWidth = width;
             _dpi = dpi;
             var colorType = fmt?.ToSkColorType() ?? SKImageInfo.PlatformColorType;
-            var runtimePlatform = AvaloniaLocator.Current?.GetService<IRuntimePlatform>()
+            var runtimePlatform = AvaloniaLocator.Current?.GetService<IRuntimePlatform>();
             var runtime = runtimePlatform?.GetRuntimeInfo();
             if (runtime?.IsDesktop == true && runtime?.OperatingSystem == OperatingSystemType.Linux)
                 colorType = SKColorType.Bgra8888;

From 372ae88ba926268fe6cdb1e363506ed1baee9364 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 4 Oct 2017 17:50:31 +0300
Subject: [PATCH 042/482] Set NativeBlob.Size to zero on dispose

---
 src/Shared/PlatformSupport/StandardRuntimePlatform.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
index fafa17a810..b777736f06 100644
--- a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
+++ b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
@@ -76,6 +76,7 @@ namespace Avalonia.Shared.PlatformSupport
                     GC.RemoveMemoryPressure(Size);
                     IsDisposed = true;
                     Address = IntPtr.Zero;
+                    Size = 0;
                 }
             }
 

From 1993942e9e0ed329f6c3c40174f9f7a6e01122de Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 4 Oct 2017 18:25:10 +0300
Subject: [PATCH 043/482] [SKIA] Properly dispose intermediate bitmaps

---
 src/Skia/Avalonia.Skia/DrawingContextImpl.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index eadcc05744..e549f06bd5 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -112,6 +112,7 @@ namespace Avalonia.Skia
             public readonly SKPaint Paint;
 
             private IDisposable _disposable1;
+            private IDisposable _disposable2;
 
             public IDisposable ApplyTo(SKPaint paint)
             {
@@ -127,6 +128,8 @@ namespace Avalonia.Skia
             {
                 if (_disposable1 == null)
                     _disposable1 = disposable;
+                else if (_disposable2 == null)
+                    _disposable2 = disposable;
                 else
                     throw new InvalidOperationException();
             }
@@ -135,12 +138,14 @@ namespace Avalonia.Skia
             {
                 Paint = paint;
                 _disposable1 = null;
+                _disposable2 = null;
             }
 
             public void Dispose()
             {
                 Paint?.Dispose();
                 _disposable1?.Dispose();
+                _disposable2?.Dispose();
             }
         }
 
@@ -221,8 +226,8 @@ namespace Avalonia.Skia
                             _visualBrushRenderer.RenderVisualBrush(ctx, visualBrush);
                         }
 
-                        rv.AddDisposable(tileBrushImage);
                         tileBrushImage = intermediate;
+                        rv.AddDisposable(tileBrushImage);
                     }
                 }
                 else

From 10551b7b312a81703779d92d1026ff4f75173eb2 Mon Sep 17 00:00:00 2001
From: Jurjen Biewenga <j.f.biewenga@gmail.com>
Date: Wed, 4 Oct 2017 17:30:15 +0200
Subject: [PATCH 044/482] Added array to filter out specific chars from the
 input text Added '' to the invalid chars array

---
 src/Avalonia.Input/KeyboardDevice.cs | 34 ++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/Avalonia.Input/KeyboardDevice.cs b/src/Avalonia.Input/KeyboardDevice.cs
index d815f8082b..76656ee79e 100644
--- a/src/Avalonia.Input/KeyboardDevice.cs
+++ b/src/Avalonia.Input/KeyboardDevice.cs
@@ -23,6 +23,8 @@ namespace Avalonia.Input
         public IInputManager InputManager => AvaloniaLocator.Current.GetService<IInputManager>();
 
         public IFocusManager FocusManager => AvaloniaLocator.Current.GetService<IFocusManager>();
+        
+        public string[] invalidCharacters = new String[1]{""};
 
         public IInputElement FocusedElement
         {
@@ -122,18 +124,32 @@ namespace Avalonia.Input
 
                 if (text != null)
                 {
-                    var ev = new TextInputEventArgs()
+                    string cleanedText = RemoveInvalidCharacters(text.Text);
+                    if (!string.IsNullOrEmpty(cleanedText))
                     {
-                        Device = this,
-                        Text = text.Text,
-                        Source = element,
-                        RoutedEvent = InputElement.TextInputEvent
-                    };
-
-                    element.RaiseEvent(ev);
-                    e.Handled = ev.Handled;
+                        var ev = new TextInputEventArgs()
+                                 {
+                                     Device = this,
+                                     Text = cleanedText,
+                                     Source = element,
+                                     RoutedEvent = InputElement.TextInputEvent
+                                 };
+
+                        element.RaiseEvent(ev);
+                        e.Handled = ev.Handled;
+                    }
                 }
             }
         }
+
+        public string RemoveInvalidCharacters(string text)
+        {
+            for (var i = 0; i < invalidCharacters.Length; i++)
+            {
+                text = text.Replace(invalidCharacters[i], string.Empty);
+            }
+
+            return text;
+        }
     }
 }

From 3882cf6cf35b80e320f54d82dbe4d4d7d7f8061d Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 4 Oct 2017 18:30:54 +0300
Subject: [PATCH 045/482] [GTK3] Allow to render IDeferredRenderOperation to
 existing context

---
 src/Gtk/Avalonia.Gtk3/IDeferredRenderOperation.cs |  2 +-
 src/Gtk/Avalonia.Gtk3/ImageSurfaceFramebuffer.cs  | 11 +++++++----
 src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs           |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Gtk/Avalonia.Gtk3/IDeferredRenderOperation.cs b/src/Gtk/Avalonia.Gtk3/IDeferredRenderOperation.cs
index 8c1456726c..e16463a2ef 100644
--- a/src/Gtk/Avalonia.Gtk3/IDeferredRenderOperation.cs
+++ b/src/Gtk/Avalonia.Gtk3/IDeferredRenderOperation.cs
@@ -4,6 +4,6 @@ namespace Avalonia.Gtk3
 {
     public interface IDeferredRenderOperation : IDisposable
     {
-        void RenderNow();
+        void RenderNow(IntPtr? ctx);
     }
 }
\ No newline at end of file
diff --git a/src/Gtk/Avalonia.Gtk3/ImageSurfaceFramebuffer.cs b/src/Gtk/Avalonia.Gtk3/ImageSurfaceFramebuffer.cs
index 4ebb080dd0..efda21c753 100644
--- a/src/Gtk/Avalonia.Gtk3/ImageSurfaceFramebuffer.cs
+++ b/src/Gtk/Avalonia.Gtk3/ImageSurfaceFramebuffer.cs
@@ -88,10 +88,10 @@ namespace Avalonia.Gtk3
             private readonly int _width;
             private readonly int _height;
 
-            public RenderOp(GtkWidget widget, ManagedCairoSurface _surface, double factor, int width, int height)
+            public RenderOp(GtkWidget widget, ManagedCairoSurface surface, double factor, int width, int height)
             {
                 _widget = widget;
-                this._surface = _surface;
+                _surface = surface ?? throw new ArgumentNullException();
                 _factor = factor;
                 _width = width;
                 _height = height;
@@ -103,9 +103,12 @@ namespace Avalonia.Gtk3
                 _surface = null;
             }
 
-            public void RenderNow()
+            public void RenderNow(IntPtr? ctx)
             {
-                DrawToWidget(_widget, _surface.Surface, _width, _height, _factor);
+                if(ctx.HasValue)
+                    Draw(ctx.Value, _surface.Surface, _factor);
+                else
+                    DrawToWidget(_widget, _surface.Surface, _width, _height, _factor);
             }
         }
         
diff --git a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
index 8771106895..d12ef23623 100644
--- a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
+++ b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
@@ -286,7 +286,7 @@ namespace Avalonia.Gtk3
             }
             if (op != null)
             {
-                op?.RenderNow();
+                op?.RenderNow(null);
                 op?.Dispose();
             }
         }

From e3b3e05a0cf6455717a67921f8ca786f92a67076 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 4 Oct 2017 22:23:59 +0300
Subject: [PATCH 046/482] [GTK3] Use XPutImage on Linux when possible

---
 src/Gtk/Avalonia.Gtk3/FramebufferManager.cs | 32 ++++++++++++
 src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs       |  5 ++
 src/Gtk/Avalonia.Gtk3/Interop/Native.cs     |  4 ++
 src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs     |  3 +-
 src/Gtk/Avalonia.Gtk3/X11.cs                | 54 ++++++++++++++++++++
 src/Gtk/Avalonia.Gtk3/X11Framebuffer.cs     | 55 +++++++++++++++++++++
 6 files changed, 152 insertions(+), 1 deletion(-)
 create mode 100644 src/Gtk/Avalonia.Gtk3/X11.cs
 create mode 100644 src/Gtk/Avalonia.Gtk3/X11Framebuffer.cs

diff --git a/src/Gtk/Avalonia.Gtk3/FramebufferManager.cs b/src/Gtk/Avalonia.Gtk3/FramebufferManager.cs
index b0cc668569..455b63b89e 100644
--- a/src/Gtk/Avalonia.Gtk3/FramebufferManager.cs
+++ b/src/Gtk/Avalonia.Gtk3/FramebufferManager.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Platform;
+using Avalonia.Threading;
 
 namespace Avalonia.Gtk3
 {
@@ -27,7 +28,38 @@ namespace Avalonia.Gtk3
             var s = _window.ClientSize;
             var width = (int) s.Width;
             var height = (int) s.Height;
+            
+            if (!Dispatcher.UIThread.CheckAccess() && Gtk3Platform.DisplayClassName.ToLower().Contains("x11"))
+            {
+                var x11 = LockX11Framebuffer(width, height);
+                if (x11 != null)
+                    return x11;
+            }
+            
+
             return new ImageSurfaceFramebuffer(_window, width, height, _window.LastKnownScaleFactor);
         }
+
+        private static int X11ErrorHandler(IntPtr d, IntPtr e)
+        {
+            return 0;
+        }
+
+        private static X11.XErrorHandler X11ErrorHandlerDelegate = X11ErrorHandler;
+        
+        private static IntPtr X11Display;
+        private ILockedFramebuffer LockX11Framebuffer(int width, int height)
+        {
+            if (!_window.GdkWindowHandle.HasValue)
+                return null;
+            if (X11Display == IntPtr.Zero)
+            {
+                X11Display = X11.XOpenDisplay(IntPtr.Zero);
+                if (X11Display == IntPtr.Zero)
+                    return null;
+                X11.XSetErrorHandler(X11ErrorHandlerDelegate);
+            }
+            return new X11Framebuffer(X11Display, _window.GdkWindowHandle.Value, width, height, _window.LastKnownScaleFactor);
+        }
     }
 }
diff --git a/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs b/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
index b36a1cda91..10405037ab 100644
--- a/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
+++ b/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -22,11 +23,15 @@ namespace Avalonia.Gtk3
         internal static readonly MouseDevice Mouse = new MouseDevice();
         internal static readonly KeyboardDevice Keyboard = new KeyboardDevice();
         internal static IntPtr App { get; set; }
+        internal static string DisplayClassName;
         public static bool UseDeferredRendering = true;
         public static void Initialize()
         {
             Resolver.Resolve();
             Native.GtkInit(0, IntPtr.Zero);
+            var disp = Native.GdkGetDefaultDisplay();
+            DisplayClassName = Utf8Buffer.StringFromPtr(Native.GTypeName(Marshal.ReadIntPtr(Marshal.ReadIntPtr(disp))));
+            
             using (var utf = new Utf8Buffer("avalonia.app." + Guid.NewGuid()))
                 App = Native.GtkApplicationNew(utf, 0);
             //Mark current thread as UI thread
diff --git a/src/Gtk/Avalonia.Gtk3/Interop/Native.cs b/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
index 433094e0ae..15b3a11fbb 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
+++ b/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
@@ -318,6 +318,9 @@ namespace Avalonia.Gtk3.Interop
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Gobject)]
             public delegate void g_object_ref(GObject instance);
             
+            [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Gobject)]
+            public delegate IntPtr g_type_name(IntPtr instance);
+            
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Gobject)]
             public delegate ulong g_signal_connect_object(GObject instance, Utf8Buffer signal, IntPtr handler, IntPtr userData, int flags);
             
@@ -410,6 +413,7 @@ namespace Avalonia.Gtk3.Interop
         public static D.gtk_dialog_add_button GtkDialogAddButton;
         public static D.g_object_unref GObjectUnref;
         public static D.g_object_ref GObjectRef;
+        public static D.g_type_name GTypeName;
         public static D.g_signal_connect_object GSignalConnectObject;
         public static D.g_signal_handler_disconnect GSignalHandlerDisconnect;
         public static D.g_timeout_add GTimeoutAdd;
diff --git a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
index d12ef23623..e14ed77877 100644
--- a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
+++ b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
@@ -31,7 +31,7 @@ namespace Avalonia.Gtk3
         private object _lock = new object();
         private IDeferredRenderOperation _nextRenderOperation;
         private readonly AutoResetEvent _canSetNextOperation = new AutoResetEvent(true);
-
+        internal IntPtr? GdkWindowHandle;
         public WindowBaseImpl(GtkWindow gtkWidget)
         {
             
@@ -55,6 +55,7 @@ namespace Avalonia.Gtk3
             ConnectEvent("leave-notify-event", OnLeaveNotifyEvent);
             Connect<Native.D.signal_generic>("destroy", OnDestroy);
             Native.GtkWidgetRealize(gtkWidget);
+            GdkWindowHandle = this.Handle.Handle;
             _lastSize = ClientSize;
             if (Gtk3Platform.UseDeferredRendering)
             {
diff --git a/src/Gtk/Avalonia.Gtk3/X11.cs b/src/Gtk/Avalonia.Gtk3/X11.cs
new file mode 100644
index 0000000000..6708ece17b
--- /dev/null
+++ b/src/Gtk/Avalonia.Gtk3/X11.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Gtk3
+{
+    class X11
+    {
+        [DllImport("libX11.so.6")]
+        public static extern IntPtr XOpenDisplay(IntPtr name);
+        
+        [DllImport("libX11.so.6")]
+        public static extern IntPtr XFreeGC(IntPtr display, IntPtr gc);
+        
+        [DllImport("libX11.so.6")]
+        public static extern IntPtr XCreateGC(IntPtr display, IntPtr drawable, ulong valuemask, IntPtr values);
+        
+        [DllImport("libX11.so.6")]
+        public static extern int XInitImage(ref XImage image);
+        
+        [DllImport("libX11.so.6")]
+        public static extern int XDestroyImage(ref XImage image);
+        
+        [DllImport("libX11.so.6")]
+        public static extern IntPtr XSetErrorHandler(XErrorHandler handler);
+
+        public delegate int XErrorHandler(IntPtr display, IntPtr error);
+
+        [DllImport("libX11.so.6")]
+        public static extern int XPutImage(IntPtr display, IntPtr drawable, IntPtr gc, ref XImage image,
+            int srcx, int srcy, int destx, int desty, uint width, uint height);
+
+        
+        public unsafe struct XImage
+        {
+            public int width, height; /* size of image */
+            public int xoffset; /* number of pixels offset in X direction */
+            public int format; /* XYBitmap, XYPixmap, ZPixmap */
+            public IntPtr data; /* pointer to image data */
+            public int byte_order; /* data byte order, LSBFirst, MSBFirst */
+            public int bitmap_unit; /* quant. of scanline 8, 16, 32 */
+            public int bitmap_bit_order; /* LSBFirst, MSBFirst */
+            public int bitmap_pad; /* 8, 16, 32 either XY or ZPixmap */
+            public int depth; /* depth of image */
+            public int bytes_per_line; /* accelerator to next scanline */
+            public int bits_per_pixel; /* bits per pixel (ZPixmap) */
+            public ulong red_mask; /* bits in z arrangement */
+            public ulong green_mask;
+            public ulong blue_mask;
+            private fixed byte funcs[128];
+        }
+        
+        
+    }
+}
\ No newline at end of file
diff --git a/src/Gtk/Avalonia.Gtk3/X11Framebuffer.cs b/src/Gtk/Avalonia.Gtk3/X11Framebuffer.cs
new file mode 100644
index 0000000000..2bf08bddf1
--- /dev/null
+++ b/src/Gtk/Avalonia.Gtk3/X11Framebuffer.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Runtime.InteropServices;
+using Avalonia.Platform;
+
+namespace Avalonia.Gtk3
+{
+    class X11Framebuffer : ILockedFramebuffer
+    {
+        private readonly IntPtr _display;
+        private readonly IntPtr _xid;
+        private IUnmanagedBlob _blob;
+
+        public X11Framebuffer(IntPtr display, IntPtr xid, int width, int height, int factor)
+        {
+            _display = display;
+            _xid = xid;
+            Width = width*factor;
+            Height = height*factor;
+            RowBytes = Width * 4;
+            Dpi = new Vector(96, 96) * factor;
+            Format = PixelFormat.Bgra8888;
+            _blob = AvaloniaLocator.Current.GetService<IRuntimePlatform>().AllocBlob(RowBytes * Height);
+            Address = _blob.Address;
+        }
+        
+        public void Dispose()
+        {
+            var image = new X11.XImage();
+            int bitsPerPixel = 32;
+            image.width = Width;
+            image.height = Height;
+            image.format = 2; //ZPixmap;
+            image.data = Address;
+            image.byte_order = 0;// LSBFirst;
+            image.bitmap_unit = bitsPerPixel;
+            image.bitmap_bit_order = 0;// LSBFirst;
+            image.bitmap_pad = bitsPerPixel;
+            image.depth = 24;
+            image.bytes_per_line = RowBytes - Width * 4;
+            image.bits_per_pixel = bitsPerPixel;
+            X11.XInitImage(ref image);
+            var gc = X11.XCreateGC(_display, _xid, 0, IntPtr.Zero);
+            X11.XPutImage(_display, _xid, gc, ref image, 0, 0, 0, 0, (uint) Width, (uint) Height);
+            X11.XFreeGC(_display, gc);
+            _blob.Dispose();
+        }
+
+        public IntPtr Address { get; }
+        public int Width { get; }
+        public int Height { get; }
+        public int RowBytes { get; }
+        public Vector Dpi { get; }
+        public PixelFormat Format { get; }
+    }
+}
\ No newline at end of file

From ecc79607d7e45b205747cc1dcdde1be3b0f2ac59 Mon Sep 17 00:00:00 2001
From: Artjom <worldbeater-dev@yandex.ru>
Date: Thu, 5 Oct 2017 21:29:35 +0300
Subject: [PATCH 047/482] Update readme.md

The first time I've seen Avalonia's readme, I was a bit confused about how to quickly get started with the framework. So this readme update includes a new paragraph named "Getting Started" where I've tried to point out how to create a simple "Hello world" application!
---
 readme.md | 57 ++++++++++++++++++-------------------------------------
 1 file changed, 18 insertions(+), 39 deletions(-)

diff --git a/readme.md b/readme.md
index 3f4840fce2..3fce3719db 100644
--- a/readme.md
+++ b/readme.md
@@ -1,70 +1,49 @@
 # Avalonia
 
-
 | Gitter Chat | Windows Build Status | Linux/Mac Build Status |
 |---|---|---|
 | [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/AvaloniaUI/Avalonia?utm_campaign=pr-badge&utm_content=badge&utm_medium=badge&utm_source=badge) | [![Build status](https://ci.appveyor.com/api/projects/status/hubk3k0w9idyibfg/branch/master?svg=true)](https://ci.appveyor.com/project/AvaloniaUI/Avalonia/branch/master) | [![Build Status](https://travis-ci.org/AvaloniaUI/Avalonia.svg?branch=master)](https://travis-ci.org/AvaloniaUI/Avalonia) |
 
-A multi-platform .NET UI framework. It can run on Windows, Linux, Mac OS X, iOS and Android.
+A multi-platform .NET UI framework. It runs on Windows, Linux, Mac OS X, iOS and Android.
 
-[![](docs/images/screen.png)](https://youtu.be/wHcB3sGLVYg)
+| Control catalog | Desktop platforms | Mobile platforms |
+|---|---|---|
+| <a href='https://youtu.be/wHcB3sGLVYg'><img width='300' src='docs/images/screen.png'></a> | <a href='https://www.youtube.com/watch?t=28&v=c_AB_XSILp0' target='_blank'><img width='300' src='docs/images/avalonia-video.png'></a> | <a href='https://www.youtube.com/watch?v=NJ9-hnmUbBM' target='_blank'><img width='300' src='https://i.ytimg.com/vi/NJ9-hnmUbBM/hqdefault.jpg'></a> |
 
-Desktop platforms:
+## About
 
-<a href='https://www.youtube.com/watch?t=28&v=c_AB_XSILp0' target='_blank'>![](docs/images/avalonia-video.png)<a/>
+Avalonia is a multi-platform windowing toolkit - somewhat like WPF - that is intended to be multi-platform. It supports XAML, lookless controls and a flexible styling system, and runs on Windows using Direct2D and other operating systems using Skia and OS-specific windowing backend (GTK, Cocoa, etc).
 
-Mobile platforms:
+<b>Avalonia is now in alpha.</b> What does "alpha" mean? Well, it means that it's now at a stage where you can have a play and hopefully create simple applications. There's still a lot missing, and you *will* find bugs, and the API *will* change, but this represents the first time where we've made it somewhat easy to have a play and experiment with the framework.
 
-<a href='https://www.youtube.com/watch?v=NJ9-hnmUbBM' target='_blank'>![](https://i.ytimg.com/vi/NJ9-hnmUbBM/hqdefault.jpg)<a/>
+## Getting Started
 
-## NuGet
+Avalonia [Visual Studio Extension](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.AvaloniaforVisualStudio) contains project and control templates that will help you get started. After installing it, open "New Project" dialog in Visual Studio, choose "Avalonia" in "Visual C#" section and press OK (<a href="https://github.com/AvaloniaUI/Avalonia/raw/master/docs/tutorial/images/add-dialogs.png">screenshot</a>). Now you can write code and markup that will work on multiple platforms!
 
-Avalonia is delivered as a NuGet package.
-You can find the packages here: ([stable(ish)](https://www.nuget.org/packages/Avalonia/), [nightly](https://github.com/AvaloniaUI/Avalonia/wiki/Using-nightly-build-feed))
+Avalonia is also delivered as a <b>NuGet</b> package. You can find the packages here: ([stable(ish)](https://www.nuget.org/packages/Avalonia/), [nightly](https://github.com/AvaloniaUI/Avalonia/wiki/Using-nightly-build-feed))
 
-You can install the package like this:
-`Install-Package Avalonia -Pre`
+Use this command in Package Manager console to install the package:
+```
+Install-Package Avalonia -Pre
+```
 
 ## Bleeding Edge Builds
 
 Try out the latest build of Avalonia available for download here:
 https://ci.appveyor.com/project/AvaloniaUI/Avalonia/branch/master/artifacts
 
-Try out the ControlCatalog to give it a quick demo.
-
-## Background
-
-Avalonia is a multi-platform windowing toolkit - somewhat like WPF - that is intended to be multi-
-platform. It supports XAML, lookless controls and a flexible styling system, and runs on Windows
-using Direct2D and other operating systems using Skia and OS-specific windowing backend (GTK, Cocoa, etc).
-
-## Current Status
-
-Avalonia is now in alpha. What does "alpha" mean? Well, it means that it's now at a stage where you
-can have a play and hopefully create simple applications. There's now a [Visual
-Studio Extension](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.AvaloniaforVisualStudio)
-containing project and item templates that will help you get started, and
-there's an initial complement of controls. There's still a lot missing, and you
-*will* find bugs, and the API *will* change, but this represents the first time
-where we've made it somewhat easy to have a play and experiment with the
-framework.
-
 ## Documentation
 
-As mentioned above, Avalonia is still in alpha and as such there's not much documentation yet. You can
-take a look at the [getting started page](docs/tutorial/gettingstarted.md) for an
-overview of how to get started but probably the best thing to do for now is to already know a little bit
-about WPF/Silverlight/UWP/XAML and ask questions in our [Gitter room](https://gitter.im/AvaloniaUI/Avalonia).
+As mentioned above, Avalonia is still in alpha and as such there's not much documentation yet. You can take a look at the [getting started page](docs/tutorial/gettingstarted.md) for an overview of how to get started but probably the best thing to do for now is to already know a little bit about WPF/Silverlight/UWP/XAML and ask questions in our [Gitter room](https://gitter.im/AvaloniaUI/Avalonia).
 
-There's also a high-level [architecture document](docs/spec/architecture.md) that is currently a little bit
-out of date, and I've also started writing blog posts on Avalonia at http://grokys.github.io/.
+There's also a high-level [architecture document](docs/spec/architecture.md) that is currently a little bit out of date, and I've also started writing blog posts on Avalonia at http://grokys.github.io/.
 
 Contributions are always welcome!
 
 ## Building and Using
 
-See the [build instructions here](docs/guidelines/build.md)
+See the [build instructions here](docs/guidelines/build.md).
 
-## Contributing ##
+## Contributing
 
 Please read the [contribution guidelines](docs/guidelines/contributing.md) before submitting a pull request.

From 5efae9e9c33b105649e185912b6ca931a4fbba53 Mon Sep 17 00:00:00 2001
From: Artjom <worldbeater-dev@yandex.ru>
Date: Fri, 6 Oct 2017 00:44:01 +0300
Subject: [PATCH 048/482] Update readme.md

Better description!
---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 3fce3719db..444071178f 100644
--- a/readme.md
+++ b/readme.md
@@ -12,7 +12,7 @@ A multi-platform .NET UI framework. It runs on Windows, Linux, Mac OS X, iOS and
 
 ## About
 
-Avalonia is a multi-platform windowing toolkit - somewhat like WPF - that is intended to be multi-platform. It supports XAML, lookless controls and a flexible styling system, and runs on Windows using Direct2D and other operating systems using Skia and OS-specific windowing backend (GTK, Cocoa, etc).
+Avalonia is a WPF-inspired cross-platform XAML UI providing a flexible styling system and supporting a wide range of OSs: Windows (.NET Framework, .NET Core), Android, Linux (GTK), MacOS and iOS.
 
 <b>Avalonia is now in alpha.</b> What does "alpha" mean? Well, it means that it's now at a stage where you can have a play and hopefully create simple applications. There's still a lot missing, and you *will* find bugs, and the API *will* change, but this represents the first time where we've made it somewhat easy to have a play and experiment with the framework.
 

From 615ad42a6217351fd5838495cc07c18cd1947821 Mon Sep 17 00:00:00 2001
From: Artjom <worldbeater-dev@yandex.ru>
Date: Fri, 6 Oct 2017 00:45:54 +0300
Subject: [PATCH 049/482] Update readme.md

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 444071178f..d7e90a4a44 100644
--- a/readme.md
+++ b/readme.md
@@ -12,7 +12,7 @@ A multi-platform .NET UI framework. It runs on Windows, Linux, Mac OS X, iOS and
 
 ## About
 
-Avalonia is a WPF-inspired cross-platform XAML UI providing a flexible styling system and supporting a wide range of OSs: Windows (.NET Framework, .NET Core), Android, Linux (GTK), MacOS and iOS.
+Avalonia is a WPF-inspired cross-platform XAML-based UI framework providing a flexible styling system and supporting a wide range of OSs: Windows (.NET Framework, .NET Core), Android, Linux (GTK), MacOS and iOS.
 
 <b>Avalonia is now in alpha.</b> What does "alpha" mean? Well, it means that it's now at a stage where you can have a play and hopefully create simple applications. There's still a lot missing, and you *will* find bugs, and the API *will* change, but this represents the first time where we've made it somewhat easy to have a play and experiment with the framework.
 

From c8e6bd58090763e2f6c48601f7469108a4bd1443 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 6 Oct 2017 12:41:48 +0100
Subject: [PATCH 050/482] Fix using dispatcher timer with 0 time interval
 causing exception.

---
 src/Avalonia.Controls/TreeView.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/TreeView.cs b/src/Avalonia.Controls/TreeView.cs
index 5d1b9a1462..079e571d29 100644
--- a/src/Avalonia.Controls/TreeView.cs
+++ b/src/Avalonia.Controls/TreeView.cs
@@ -253,9 +253,7 @@ namespace Avalonia.Controls
 
                         if (AutoScrollToSelectedItem)
                         {
-                            DispatcherTimer.RunOnce(
-                                container.ContainerControl.BringIntoView,
-                                TimeSpan.Zero);
+                            Dispatcher.UIThread.InvokeAsync(container.ContainerControl.BringIntoView);
                         }
 
                         break;

From bdbe95b9b1649ccfd7857cbe77caccec1e723028 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Fri, 6 Oct 2017 14:59:28 +0300
Subject: [PATCH 051/482] Fixed DispatcherTimer's priorities

---
 .../AndroidThreadingInterface.cs               |  2 +-
 .../Platform/IPlatformThreadingInterface.cs    |  3 ++-
 src/Avalonia.Base/Threading/Dispatcher.cs      | 13 +++++++++++++
 src/Avalonia.Base/Threading/DispatcherTimer.cs | 18 ++++--------------
 src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs          |  6 ++----
 src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs   |  6 ++----
 .../PlatformThreadingInterface.cs              |  4 ++--
 .../PlatformThreadingInterface.cs              |  2 +-
 src/Windows/Avalonia.Win32/Win32Platform.cs    |  2 +-
 .../Avalonia.iOS/PlatformThreadingInterface.cs |  2 +-
 .../AvaloniaObjectTests_Threading.cs           |  2 +-
 tests/Avalonia.RenderTests/TestBase.cs         |  2 +-
 12 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/Android/Avalonia.Android/AndroidThreadingInterface.cs b/src/Android/Avalonia.Android/AndroidThreadingInterface.cs
index 2e5b2902f4..77dfc60b83 100644
--- a/src/Android/Avalonia.Android/AndroidThreadingInterface.cs
+++ b/src/Android/Avalonia.Android/AndroidThreadingInterface.cs
@@ -30,7 +30,7 @@ namespace Avalonia.Android
             return;
         }
 
-        public IDisposable StartTimer(TimeSpan interval, Action tick)
+        public IDisposable StartTimer(DispatcherPriority priority, TimeSpan interval, Action tick)
         {
             if (interval.TotalMilliseconds < 10)
                 interval = TimeSpan.FromMilliseconds(10);
diff --git a/src/Avalonia.Base/Platform/IPlatformThreadingInterface.cs b/src/Avalonia.Base/Platform/IPlatformThreadingInterface.cs
index 68f9e2c631..9f5417ca95 100644
--- a/src/Avalonia.Base/Platform/IPlatformThreadingInterface.cs
+++ b/src/Avalonia.Base/Platform/IPlatformThreadingInterface.cs
@@ -17,10 +17,11 @@ namespace Avalonia.Platform
         /// <summary>
         /// Starts a timer.
         /// </summary>
+        /// <param name="priority"></param>
         /// <param name="interval">The interval.</param>
         /// <param name="tick">The action to call on each tick.</param>
         /// <returns>An <see cref="IDisposable"/> used to stop the timer.</returns>
-        IDisposable StartTimer(TimeSpan interval, Action tick);
+        IDisposable StartTimer(DispatcherPriority priority, TimeSpan interval, Action tick);
 
         void Signal(DispatcherPriority priority);
 
diff --git a/src/Avalonia.Base/Threading/Dispatcher.cs b/src/Avalonia.Base/Threading/Dispatcher.cs
index a60b663bed..a4b1aaafbc 100644
--- a/src/Avalonia.Base/Threading/Dispatcher.cs
+++ b/src/Avalonia.Base/Threading/Dispatcher.cs
@@ -84,6 +84,19 @@ namespace Avalonia.Threading
             _jobRunner?.Post(action, priority);
         }
 
+        /// <summary>
+        /// This is needed for platform backends that don't have internal priority system (e. g. win32)
+        /// To ensure that there are no jobs with higher priority
+        /// </summary>
+        /// <param name="currentPriority"></param>
+        internal void EnsurePriority(DispatcherPriority currentPriority)
+        {
+            if (currentPriority == DispatcherPriority.MaxValue)
+                return;
+            currentPriority += 1;
+            _jobRunner.RunJobs(currentPriority);
+        }
+
         /// <summary>
         /// Allows unit tests to change the platform threading interface.
         /// </summary>
diff --git a/src/Avalonia.Base/Threading/DispatcherTimer.cs b/src/Avalonia.Base/Threading/DispatcherTimer.cs
index 972fdb2049..4a8a9d673f 100644
--- a/src/Avalonia.Base/Threading/DispatcherTimer.cs
+++ b/src/Avalonia.Base/Threading/DispatcherTimer.cs
@@ -17,13 +17,11 @@ namespace Avalonia.Threading
         private readonly DispatcherPriority _priority;
 
         private TimeSpan _interval;
-
-        private readonly Action _raiseTickAction;
-
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="DispatcherTimer"/> class.
         /// </summary>
-        public DispatcherTimer() : this(DispatcherPriority.Normal)
+        public DispatcherTimer() : this(DispatcherPriority.Background)
         {
         }
 
@@ -34,7 +32,6 @@ namespace Avalonia.Threading
         public DispatcherTimer(DispatcherPriority priority)
         {
             _priority = priority;
-            _raiseTickAction = RaiseTick;
         }
 
         /// <summary>
@@ -187,7 +184,7 @@ namespace Avalonia.Threading
                     throw new Exception("Could not start timer: IPlatformThreadingInterface is not registered.");
                 }
 
-                _timer = threading.StartTimer(Interval, InternalTick);
+                _timer = threading.StartTimer(_priority, Interval, InternalTick);
             }
         }
 
@@ -210,14 +207,7 @@ namespace Avalonia.Threading
         /// </summary>
         private void InternalTick()
         {
-            Dispatcher.UIThread.InvokeAsync(_raiseTickAction, _priority);
-        }
-
-        /// <summary>
-        /// Raises the <see cref="Tick"/> event.
-        /// </summary>
-        private void RaiseTick()
-        {
+            Dispatcher.UIThread.EnsurePriority(_priority);
             Tick?.Invoke(this, EventArgs.Empty);
         }
     }
diff --git a/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs b/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
index 10405037ab..aefd873155 100644
--- a/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
+++ b/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
@@ -70,15 +70,13 @@ namespace Avalonia.Gtk3
                 Native.GtkMainIteration();
         }
 
-        public IDisposable StartTimer(TimeSpan interval, Action tick)
+        public IDisposable StartTimer(DispatcherPriority priority, TimeSpan interval, Action tick)
         {
             var msec = interval.TotalMilliseconds;
-            if (msec <= 0)
-                throw new ArgumentException("Don't know how to create a timer with zero or negative interval");
             var imsec = (uint) msec;
             if (imsec == 0)
                 imsec = 1;
-            return GlibTimeout.StarTimer(imsec, tick);
+            return GlibTimeout.StartTimer(GlibPriority.FromDispatcherPriority(priority), imsec, tick);
         }
 
         private bool[] _signaled = new bool[(int) DispatcherPriority.MaxValue + 1];
diff --git a/src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs b/src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs
index 5253be5afb..0ab4ef980c 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs
+++ b/src/Gtk/Avalonia.Gtk3/Interop/GlibTimeout.cs
@@ -48,12 +48,10 @@ namespace Avalonia.Gtk3.Interop
             }
         }
 
-        public static IDisposable StarTimer(uint interval, Action tick)
+        public static IDisposable StartTimer(int priority, uint interval, Action tick)
         {
-            if (interval == 0)
-                throw new ArgumentException("Don't know how to create a timer with zero or negative interval");
             var timer = new Timer ();
-            GlibTimeout.Add(GlibPriority.FromDispatcherPriority(DispatcherPriority.Normal), interval,
+            GlibTimeout.Add(priority, interval,
                 () =>
                 {
                     if (timer.Stopped)
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/PlatformThreadingInterface.cs b/src/Linux/Avalonia.LinuxFramebuffer/PlatformThreadingInterface.cs
index 3aef6944af..e6d21fca36 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/PlatformThreadingInterface.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/PlatformThreadingInterface.cs
@@ -17,7 +17,7 @@ namespace Avalonia.LinuxFramebuffer
         public PlatformThreadingInterface()
         {
             TlsCurrentThreadIsLoopThread = true;
-            StartTimer(new TimeSpan(0, 0, 0, 0, 66), () => Tick?.Invoke(this, new EventArgs()));
+            StartTimer(DispatcherPriority.Render, new TimeSpan(0, 0, 0, 0, 66), () => Tick?.Invoke(this, new EventArgs()));
         }
 
         private readonly AutoResetEvent _signaled = new AutoResetEvent(false);
@@ -74,7 +74,7 @@ namespace Avalonia.LinuxFramebuffer
             }
         }
 
-        public IDisposable StartTimer(TimeSpan interval, Action tick)
+        public IDisposable StartTimer(DispatcherPriority priority, TimeSpan interval, Action tick)
         {
             return new WatTimer(new System.Threading.Timer(delegate
             {
diff --git a/src/OSX/Avalonia.MonoMac/PlatformThreadingInterface.cs b/src/OSX/Avalonia.MonoMac/PlatformThreadingInterface.cs
index 80c854f5a5..184416e77a 100644
--- a/src/OSX/Avalonia.MonoMac/PlatformThreadingInterface.cs
+++ b/src/OSX/Avalonia.MonoMac/PlatformThreadingInterface.cs
@@ -16,7 +16,7 @@ namespace Avalonia.MonoMac
 
         public event Action<DispatcherPriority?> Signaled;
 
-        public IDisposable StartTimer(TimeSpan interval, Action tick)
+        public IDisposable StartTimer(DispatcherPriority priority, TimeSpan interval, Action tick)
             => NSTimer.CreateRepeatingScheduledTimer(interval, () => tick());
 
         public void Signal(DispatcherPriority prio)
diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
index a260efd9b9..e265749249 100644
--- a/src/Windows/Avalonia.Win32/Win32Platform.cs
+++ b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -114,7 +114,7 @@ namespace Avalonia.Win32
             }
         }
 
-        public IDisposable StartTimer(TimeSpan interval, Action callback)
+        public IDisposable StartTimer(DispatcherPriority priority, TimeSpan interval, Action callback)
         {
             UnmanagedMethods.TimerProc timerDelegate =
                 (hWnd, uMsg, nIDEvent, dwTime) => callback();
diff --git a/src/iOS/Avalonia.iOS/PlatformThreadingInterface.cs b/src/iOS/Avalonia.iOS/PlatformThreadingInterface.cs
index 6d6a5e22ca..43a620cccd 100644
--- a/src/iOS/Avalonia.iOS/PlatformThreadingInterface.cs
+++ b/src/iOS/Avalonia.iOS/PlatformThreadingInterface.cs
@@ -51,7 +51,7 @@ namespace Avalonia.iOS
             }
         }*/
 
-        public IDisposable StartTimer(TimeSpan interval, Action tick)
+        public IDisposable StartTimer(DispatcherPriority priority, TimeSpan interval, Action tick)
             => NSTimer.CreateRepeatingScheduledTimer(interval, _ => tick());
 
         public void Signal(DispatcherPriority prio)
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Threading.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Threading.cs
index 229a34643d..09aedbdf9c 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Threading.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Threading.cs
@@ -160,7 +160,7 @@ namespace Avalonia.Base.UnitTests
                 throw new NotImplementedException();
             }
 
-            public IDisposable StartTimer(TimeSpan interval, Action tick)
+            public IDisposable StartTimer(DispatcherPriority priority, TimeSpan interval, Action tick)
             {
                 throw new NotImplementedException();
             }
diff --git a/tests/Avalonia.RenderTests/TestBase.cs b/tests/Avalonia.RenderTests/TestBase.cs
index 409870ed0f..84860eefdb 100644
--- a/tests/Avalonia.RenderTests/TestBase.cs
+++ b/tests/Avalonia.RenderTests/TestBase.cs
@@ -161,7 +161,7 @@ namespace Avalonia.Direct2D1.RenderTests
                 throw new NotImplementedException();
             }
 
-            public IDisposable StartTimer(TimeSpan interval, Action tick)
+            public IDisposable StartTimer(DispatcherPriority priority, TimeSpan interval, Action tick)
             {
                 throw new NotImplementedException();
             }

From cc7098583e420ca70198fda7bf916eb74c1731af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Fri, 6 Oct 2017 16:57:32 +0100
Subject: [PATCH 052/482] Fixed Assert.Null warnings.

---
 .../Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs | 2 +-
 .../Generators/ItemContainerGeneratorTests.cs             | 2 +-
 .../Presenters/ContentPresenterTests_InTemplate.cs        | 4 ++--
 .../Presenters/ContentPresenterTests_Standalone.cs        | 2 +-
 .../Primitives/SelectingItemsControlTests.cs              | 8 ++++----
 .../Primitives/SelectingItemsControlTests_Multiple.cs     | 2 +-
 .../Data/BindingTests_RelativeSource.cs                   | 2 +-
 .../Templates/MemberSelectorTests.cs                      | 4 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
index 05339c43b0..e9cb2bf450 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
@@ -187,7 +187,7 @@ namespace Avalonia.Base.UnitTests
 
             source.OnNext(45);
 
-            Assert.Equal(null, target.Foo);
+            Assert.Null(target.Foo);
         }
 
         [Fact]
diff --git a/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs b/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs
index 01b550fb3b..9b4be59647 100644
--- a/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs
@@ -66,7 +66,7 @@ namespace Avalonia.Controls.UnitTests.Generators
             target.Dematerialize(1, 1);
 
             Assert.Equal(containers[0].ContainerControl, target.ContainerFromIndex(0));
-            Assert.Equal(null, target.ContainerFromIndex(1));
+            Assert.Null(target.ContainerFromIndex(1));
             Assert.Equal(containers[2].ContainerControl, target.ContainerFromIndex(2));
         }
 
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
index e32c703409..a524ca3e89 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
@@ -107,7 +107,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
             target.Content = child;
             target.Content = null;
 
-            Assert.Equal(null, child.GetLogicalParent());
+            Assert.Null(child.GetLogicalParent());
             Assert.Empty(target.GetLogicalChildren());
         }
 
@@ -120,7 +120,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
             target.Content = child;
             target.Content = null;
 
-            Assert.Equal(null, child.GetVisualParent());
+            Assert.Null(child.GetVisualParent());
             Assert.Empty(target.GetVisualChildren());
         }
 
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
index 589b1d67d2..032928d673 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
@@ -191,7 +191,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
             target.Content = "bar";
             target.UpdateChild();
 
-            Assert.Equal(null, foo.Parent);
+            Assert.Null(foo.Parent);
 
             logicalChildren = target.GetLogicalChildren();
 
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
index 7ee9fbbf52..a60074fa43 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
@@ -171,7 +171,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
             target.SelectedItem = new Item();
 
-            Assert.Equal(null, target.SelectedItem);
+            Assert.Null(target.SelectedItem);
             Assert.Equal(-1, target.SelectedIndex);
         }
 
@@ -278,7 +278,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
             target.Items = null;
 
-            Assert.Equal(null, target.SelectedItem);
+            Assert.Null(target.SelectedItem);
             Assert.Equal(-1, target.SelectedIndex);
         }
 
@@ -305,7 +305,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
             items.RemoveAt(1);
 
-            Assert.Equal(null, target.SelectedItem);
+            Assert.Null(target.SelectedItem);
             Assert.Equal(-1, target.SelectedIndex);
         }
 
@@ -334,7 +334,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
             items.Clear();
 
-            Assert.Equal(null, target.SelectedItem);
+            Assert.Null(target.SelectedItem);
             Assert.Equal(-1, target.SelectedIndex);
         }
 
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
index d8600f472d..642f594e4d 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
@@ -76,7 +76,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.SelectedItems = new AvaloniaList<object>();
 
             Assert.Equal(-1, target.SelectedIndex);
-            Assert.Equal(null, target.SelectedItem);
+            Assert.Null(target.SelectedItem);
         }
 
         [Fact]
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_RelativeSource.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_RelativeSource.cs
index e912770470..c46fb6fce2 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_RelativeSource.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_RelativeSource.cs
@@ -117,7 +117,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
             };
 
             target.Bind(TextBox.TextProperty, binding);
-            Assert.Equal(null, target.Text);
+            Assert.Null(target.Text);
         }
 
         [Fact]
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Templates/MemberSelectorTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Templates/MemberSelectorTests.cs
index 49a88e8fae..aa1e56f2a5 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Templates/MemberSelectorTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Templates/MemberSelectorTests.cs
@@ -63,7 +63,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Templates
         {
             var selector = new MemberSelector() { MemberName = "StringValue" };
 
-            Assert.Equal(null, selector.Select(null));
+            Assert.Null(selector.Select(null));
         }
 
         [Fact]
@@ -73,7 +73,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Templates
 
             var data = new Item() { StringValue = "Value1" };
 
-            Assert.Same(null, selector.Select(data));
+            Assert.Null(selector.Select(data));
         }
 
         [Fact]

From 2b8953c7abbd4f9b7fed59f34ac3648703c42d81 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Fri, 6 Oct 2017 19:23:14 +0300
Subject: [PATCH 053/482] Fixed merge issues and made new previewer to work
 with desktop .net

---
 Avalonia.sln                                  | 206 +++++++++++-------
 packages.cake                                 |  12 +
 samples/ControlCatalog.Desktop/Program.cs     |  10 +-
 samples/ControlCatalog.NetCore/Program.cs     |  17 +-
 .../Avalonia.Controls.csproj                  |   2 +-
 src/Avalonia.Controls/Remote/RemoteServer.cs  |   3 +-
 .../Avalonia.DesignerSupport.csproj           |   2 +-
 .../Remote/PreviewerWindowImpl.cs             |   7 +-
 src/Avalonia.DesignerSupport/Remote/Stubs.cs  |  14 ++
 src/Gtk/Avalonia.Gtk3/Interop/Native.cs       |   2 -
 .../Avalonia.Designer.HostApp.NetFX.csproj    |  28 +++
 .../Program.cs                                |  14 ++
 .../Properties/launchSettings.json            |   8 +
 .../Avalonia.Designer.HostApp.csproj          |   1 +
 14 files changed, 222 insertions(+), 104 deletions(-)
 create mode 100644 src/tools/Avalonia.Designer.HostApp.NetFX/Avalonia.Designer.HostApp.NetFX.csproj
 create mode 100644 src/tools/Avalonia.Designer.HostApp.NetFX/Program.cs
 create mode 100644 src/tools/Avalonia.Designer.HostApp.NetFX/Properties/launchSettings.json

diff --git a/Avalonia.sln b/Avalonia.sln
index 6f46bf953e..7f516667ee 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -1,4 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26730.3
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -178,19 +179,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Win32.Interop", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Skia.RenderTests", "tests\Avalonia.RenderTests\Avalonia.Skia.RenderTests.csproj", "{E1582370-37B3-403C-917F-8209551B1634}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Remote.Protocol", "src\Avalonia.Remote.Protocol\Avalonia.Remote.Protocol.csproj", "{D78A720C-C0C6-478B-8564-F167F9BDD01B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Remote.Protocol", "src\Avalonia.Remote.Protocol\Avalonia.Remote.Protocol.csproj", "{D78A720C-C0C6-478B-8564-F167F9BDD01B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RemoteTest", "samples\RemoteTest\RemoteTest.csproj", "{E2999E4A-9086-401F-898C-AEB0AD38E676}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RemoteTest", "samples\RemoteTest\RemoteTest.csproj", "{E2999E4A-9086-401F-898C-AEB0AD38E676}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{4ED8B739-6F4E-4CD4-B993-545E6B5CE637}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Designer.HostApp", "src\tools\Avalonia.Designer.HostApp\Avalonia.Designer.HostApp.csproj", "{050CC912-FF49-4A8B-B534-9544017446DD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Designer.HostApp", "src\tools\Avalonia.Designer.HostApp\Avalonia.Designer.HostApp.csproj", "{050CC912-FF49-4A8B-B534-9544017446DD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Previewer", "samples\Previewer\Previewer.csproj", "{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Previewer", "samples\Previewer\Previewer.csproj", "{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}"
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OSX", "OSX", "{A59C4C0A-64DF-4621-B450-2BA00D6F61E2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.MonoMac", "src\OSX\Avalonia.MonoMac\Avalonia.MonoMac.csproj", "{CBFD5788-567D-401B-9DFA-74E4224025A0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Designer.HostApp.NetFX", "src\tools\Avalonia.Designer.HostApp.NetFX\Avalonia.Designer.HostApp.NetFX.csproj", "{4ADA61C8-D191-428D-9066-EF4F0D86520F}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{3c4c0cb4-0c0f-4450-a37b-148c84ff905f}*SharedItemsImports = 13
@@ -200,7 +204,6 @@ Global
 		tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{48840edd-24bf-495d-911e-2eb12ae75d3b}*SharedItemsImports = 13
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{4a1abb09-9047-4bd5-a4ad-a055e52c5ee0}*SharedItemsImports = 4
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{7863ea94-f0fb-4386-bf8c-e5bfa761560a}*SharedItemsImports = 4
-		src\Shared\PlatformSupport\PlatformSupport.projitems*{7b92af71-6287-4693-9dcb-bd5b6e927e23}*SharedItemsImports = 4
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{7d2d3083-71dd-4cc9-8907-39a0d86fb322}*SharedItemsImports = 4
 		src\Windows\Avalonia.Win32\Avalonia.Win32.Shared.projitems*{811a76cf-1cf6-440f-963b-bbe31bd72a82}*SharedItemsImports = 4
 		src\Windows\Avalonia.Win32\Avalonia.Win32.Shared.projitems*{9defc6b7-845b-4d8f-afc0-d32bf0032b8c}*SharedItemsImports = 13
@@ -2444,86 +2447,86 @@ Global
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|Mono.Build.0 = Release|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|x86.ActiveCfg = Release|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|x86.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Mono.ActiveCfg = Ad-Hoc|Mono
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Mono.Build.0 = Ad-Hoc|Mono
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|x86
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|x86.Build.0 = Ad-Hoc|x86
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|Any CPU.ActiveCfg = AppStore|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|Any CPU.Build.0 = AppStore|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhone.Build.0 = AppStore|iPhone
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|Mono.ActiveCfg = AppStore|Mono
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|Mono.Build.0 = AppStore|Mono
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|x86.ActiveCfg = AppStore|x86
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|x86.Build.0 = AppStore|x86
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Mono.ActiveCfg = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Mono.Build.0 = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|Mono.ActiveCfg = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|Mono.Build.0 = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|x86.Build.0 = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhone.Build.0 = Debug|iPhone
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Mono.ActiveCfg = Debug|Mono
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Mono.Build.0 = Debug|Mono
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|x86.ActiveCfg = Debug|x86
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|x86.Build.0 = Debug|x86
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Mono.Build.0 = Debug|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|x86.Build.0 = Debug|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhone.ActiveCfg = Release|iPhone
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhone.Build.0 = Release|iPhone
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Mono.ActiveCfg = Release|Mono
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Mono.Build.0 = Release|Mono
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|x86.ActiveCfg = Release|x86
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|x86.Build.0 = Release|x86
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Mono.ActiveCfg = Ad-Hoc|Mono
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Mono.Build.0 = Ad-Hoc|Mono
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|x86
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|x86.Build.0 = Ad-Hoc|x86
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|Any CPU.ActiveCfg = AppStore|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|Any CPU.Build.0 = AppStore|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhone.Build.0 = AppStore|iPhone
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|Mono.ActiveCfg = AppStore|Mono
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|Mono.Build.0 = AppStore|Mono
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|x86.ActiveCfg = AppStore|x86
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|x86.Build.0 = AppStore|x86
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhone.Build.0 = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Mono.ActiveCfg = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Mono.Build.0 = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|x86.ActiveCfg = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|x86.Build.0 = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Mono.ActiveCfg = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Mono.Build.0 = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|Mono.ActiveCfg = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|Mono.Build.0 = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|x86.Build.0 = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhone.Build.0 = Debug|iPhone
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Mono.ActiveCfg = Debug|Mono
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Mono.Build.0 = Debug|Mono
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|x86.ActiveCfg = Debug|x86
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|x86.Build.0 = Debug|x86
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Mono.Build.0 = Debug|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|x86.Build.0 = Debug|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhone.ActiveCfg = Release|iPhone
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhone.Build.0 = Release|iPhone
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Mono.ActiveCfg = Release|Mono
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Mono.Build.0 = Release|Mono
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|x86.ActiveCfg = Release|x86
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|x86.Build.0 = Release|x86
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhone.Build.0 = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Mono.ActiveCfg = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Mono.Build.0 = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|x86.ActiveCfg = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|x86.Build.0 = Release|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
@@ -2564,6 +2567,46 @@ Global
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Release|Mono.Build.0 = Release|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Release|x86.ActiveCfg = Release|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Release|x86.Build.0 = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|Mono.ActiveCfg = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|Mono.Build.0 = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|Mono.ActiveCfg = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|Mono.Build.0 = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|x86.Build.0 = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|Mono.Build.0 = Debug|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|x86.Build.0 = Debug|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|iPhone.Build.0 = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|Mono.ActiveCfg = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|Mono.Build.0 = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|x86.ActiveCfg = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2620,12 +2663,7 @@ Global
 		{E2999E4A-9086-401F-898C-AEB0AD38E676} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{050CC912-FF49-4A8B-B534-9544017446DD} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {1E8CA5AA-707A-4C57-A682-D265A49E10C3}
-		{050CC912-FF49-4A8B-B534-9544017446DD} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{CBFD5788-567D-401B-9DFA-74E4224025A0} = {A59C4C0A-64DF-4621-B450-2BA00D6F61E2}
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {87366D66-1391-4D90-8999-95A620AD786A}
diff --git a/packages.cake b/packages.cake
index a22ff65e72..98aa08bb50 100644
--- a/packages.cake
+++ b/packages.cake
@@ -223,6 +223,17 @@ public class Packages
             };
         });
 
+        var toolsContent = new[] {
+            new NuSpecContent{
+                Source = ((FilePath)context.File("./src/tools/Avalonia.Designer.HostApp/bin/" + parameters.DirSuffix + "/netcoreapp2.0/Avalonia.Designer.HostApp.dll")).FullPath, 
+                Target = "tools/netcoreapp2.0/previewer"
+            },
+            new NuSpecContent{
+                Source = ((FilePath)context.File("./src/tools/Avalonia.Designer.HostApp.NetFx/bin/" + parameters.DirSuffix + "/net461/Avalonia.Designer.HostApp.NetFx.exe")).FullPath, 
+                Target = "tools/net461/previewer"
+            }
+        };
+
         var nuspecNuGetSettingsCore = new []
         {
             ///////////////////////////////////////////////////////////////////////////////
@@ -253,6 +264,7 @@ public class Packages
                 Files = coreLibrariesNuSpecContent
                     .Concat(win32CoreLibrariesNuSpecContent).Concat(net45RuntimePlatform)
                     .Concat(netcoreappCoreLibrariesNuSpecContent).Concat(netCoreRuntimePlatform)
+                    .Concat(toolsContent)
                     .ToList(),
                 BasePath = context.Directory("./"),
                 OutputDirectory = parameters.NugetRoot
diff --git a/samples/ControlCatalog.Desktop/Program.cs b/samples/ControlCatalog.Desktop/Program.cs
index b67c5ea51d..20bf4ed342 100644
--- a/samples/ControlCatalog.Desktop/Program.cs
+++ b/samples/ControlCatalog.Desktop/Program.cs
@@ -16,11 +16,15 @@ namespace ControlCatalog
 
             // TODO: Make this work with GTK/Skia/Cairo depending on command-line args
             // again.
-            AppBuilder.Configure<App>()
-                .UsePlatformDetect()
-                .Start<MainWindow>();
+            BuildAvaloniaApp().Start<MainWindow>();
         }
 
+        /// <summary>
+        /// This method is needed for IDE previewer infrastructure
+        /// </summary>
+        public static AppBuilder BuildAvaloniaApp()
+            => AppBuilder.Configure<App>().UsePlatformDetect();
+
         // This will be made into a runtime configuration extension soon!
         private static void InitializeLogging()
         {
diff --git a/samples/ControlCatalog.NetCore/Program.cs b/samples/ControlCatalog.NetCore/Program.cs
index 640dce0a80..346535d39d 100644
--- a/samples/ControlCatalog.NetCore/Program.cs
+++ b/samples/ControlCatalog.NetCore/Program.cs
@@ -28,19 +28,14 @@ namespace ControlCatalog.NetCore
                     System.Threading.ThreadPool.QueueUserWorkItem(_ => ConsoleSilencer());
                 });
             else
-                AppBuilder.Configure<App>()
-                    .CustomPlatformDetect()
-                    .UseReactiveUI()
-                    .Start<MainWindow>();
+                BuildAvaloniaApp().Start<MainWindow>();
         }
 
-        static AppBuilder CustomPlatformDetect(this AppBuilder builder)
-        {
-            //This is needed because we still aren't ready to have MonoMac backend as default one
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                return builder.UseSkia().UseMonoMac();
-            return builder.UsePlatformDetect();
-        }
+        /// <summary>
+        /// This method is needed for IDE previewer infrastructure
+        /// </summary>
+        public static AppBuilder BuildAvaloniaApp()
+            => AppBuilder.Configure<App>().UsePlatformDetect().UseReactiveUI();
 
         static void ConsoleSilencer()
         {
diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj
index 0c9981f209..c8f6b4e65a 100644
--- a/src/Avalonia.Controls/Avalonia.Controls.csproj
+++ b/src/Avalonia.Controls/Avalonia.Controls.csproj
@@ -12,7 +12,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Debug\Avalonia.Controls.XML</DocumentationFile>
-    <NoWarn>CS1591</NoWarn>
+    <NoWarn>CS1591;CS0067</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DebugType>pdbonly</DebugType>
diff --git a/src/Avalonia.Controls/Remote/RemoteServer.cs b/src/Avalonia.Controls/Remote/RemoteServer.cs
index 0bc43069e7..86f8318e15 100644
--- a/src/Avalonia.Controls/Remote/RemoteServer.cs
+++ b/src/Avalonia.Controls/Remote/RemoteServer.cs
@@ -19,8 +19,9 @@ namespace Avalonia.Controls.Remote
             public TopLevelImpl(IAvaloniaRemoteTransportConnection transport) : base(transport)
             {
             }
-
+#pragma warning disable 67
             public event Action LostFocus;
+
         }
         
         public RemoteServer(IAvaloniaRemoteTransportConnection transport)
diff --git a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
index 63cb8132a9..9f54137e47 100644
--- a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
+++ b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
@@ -12,7 +12,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Debug\Avalonia.DesignerSupport.xml</DocumentationFile>
-    <NoWarn>CS1591</NoWarn>
+    <NoWarn>CS1591;CS0067</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DebugType>pdbonly</DebugType>
diff --git a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
index a787c8e8e3..535dfd700b 100644
--- a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
+++ b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
@@ -65,7 +65,9 @@ namespace Avalonia.DesignerSupport.Remote
             ClientSize = clientSize;
             RenderIfNeeded();
         }
-        
+
+        public IScreenImpl Screen { get; } = new ScreenStub();
+
         public void Activate()
         {
         }
@@ -87,5 +89,8 @@ namespace Avalonia.DesignerSupport.Remote
         {
         }
 
+        public void ShowTaskbarIcon(bool value)
+        {
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.DesignerSupport/Remote/Stubs.cs b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
index 5aad114cf7..2ed434a2dc 100644
--- a/src/Avalonia.DesignerSupport/Remote/Stubs.cs
+++ b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
@@ -75,6 +75,8 @@ namespace Avalonia.DesignerSupport.Remote
         {
         }
 
+        public IScreenImpl Screen { get; } = new ScreenStub();
+
         public void SetTitle(string title)
         {
         }
@@ -88,6 +90,10 @@ namespace Avalonia.DesignerSupport.Remote
         public void SetIcon(IWindowIconImpl icon)
         {
         }
+
+        public void ShowTaskbarIcon(bool value)
+        {
+        }
     }
 
     class ClipboardStub : IClipboard
@@ -129,4 +135,12 @@ namespace Avalonia.DesignerSupport.Remote
         public Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, IWindowImpl parent) =>
             Task.FromResult((string) null);
     }
+
+    class ScreenStub : IScreenImpl
+    {
+        public int ScreenCount => 1;
+
+        public Screen[] AllScreens { get; } =
+            {new Screen(new Rect(0, 0, 4000, 4000), new Rect(0, 0, 4000, 4000), true)};
+    }
 }
\ No newline at end of file
diff --git a/src/Gtk/Avalonia.Gtk3/Interop/Native.cs b/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
index ab1bf4eb34..15b3a11fbb 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
+++ b/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
@@ -333,8 +333,6 @@ namespace Avalonia.Gtk3.Interop
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Glib)]
             public delegate ulong g_timeout_add_full(int prio, uint interval, timeout_callback callback, IntPtr data, IntPtr destroy);
 
-            [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Glib)]
-            public delegate ulong g_timeout_add_full(int prio, uint interval, timeout_callback callback, IntPtr data, IntPtr destroy);
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Glib)]
             public delegate ulong g_free(IntPtr data);
             
diff --git a/src/tools/Avalonia.Designer.HostApp.NetFX/Avalonia.Designer.HostApp.NetFX.csproj b/src/tools/Avalonia.Designer.HostApp.NetFX/Avalonia.Designer.HostApp.NetFX.csproj
new file mode 100644
index 0000000000..cb4ce3f301
--- /dev/null
+++ b/src/tools/Avalonia.Designer.HostApp.NetFX/Avalonia.Designer.HostApp.NetFX.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net461</TargetFrameworks>
+      
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj" />
+    <ProjectReference Include="..\..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
+    <ProjectReference Include="..\..\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\Avalonia.HtmlRenderer\Avalonia.HtmlRenderer.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj" />
+    <ProjectReference Include="..\..\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\..\samples\ControlCatalog.Desktop\ControlCatalog.Desktop.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/tools/Avalonia.Designer.HostApp.NetFX/Program.cs b/src/tools/Avalonia.Designer.HostApp.NetFX/Program.cs
new file mode 100644
index 0000000000..d3f80dd621
--- /dev/null
+++ b/src/tools/Avalonia.Designer.HostApp.NetFX/Program.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Avalonia.Designer.HostApp.NetFX
+{
+    class Program
+    {
+        public static void Main(string[] args)
+            => Avalonia.DesignerSupport.Remote.RemoteDesignerEntryPoint.Main(args);
+    }
+}
diff --git a/src/tools/Avalonia.Designer.HostApp.NetFX/Properties/launchSettings.json b/src/tools/Avalonia.Designer.HostApp.NetFX/Properties/launchSettings.json
new file mode 100644
index 0000000000..493caa2693
--- /dev/null
+++ b/src/tools/Avalonia.Designer.HostApp.NetFX/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "Avalonia.Designer.HostApp.NetFX": {
+      "commandName": "Project",
+      "commandLineArgs": "--transport tcp-bson://127.0.0.1:25000/ bin/Debug/net461/ControlCatalog.Desktop.exe"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
index 2a68862f18..5bb4b9dd4a 100644
--- a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
+++ b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+      
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj" />

From 3e09457e10e058aed23db2090afaafaa79b0d1b5 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Fri, 6 Oct 2017 20:22:52 +0300
Subject: [PATCH 054/482] [D2D1] Implement support for
 IFramebufferPlatformSurface

---
 .../Avalonia.Direct2D1/Direct2D1Platform.cs   |   2 +
 .../FramebufferShimRenderTarget.cs            |  84 ++++++++++++++++++
 .../Media/Imaging/RenderTargetBitmapImpl.cs   |  13 ++-
 .../Media/Imaging/WicBitmapImpl.cs            |   1 +
 .../Avalonia.RenderTests/Media/BitmapTests.cs |  11 +--
 ...ouldBeUsableAsBitmap_Bgra8888.expected.png | Bin 0 -> 800 bytes
 ...ShouldBeUsableAsBitmap_Rgb565.expected.png | Bin 0 -> 786 bytes
 ...ouldBeUsableAsBitmap_Rgba8888.expected.png | Bin 0 -> 800 bytes
 8 files changed, 102 insertions(+), 9 deletions(-)
 create mode 100644 src/Windows/Avalonia.Direct2D1/FramebufferShimRenderTarget.cs
 create mode 100644 tests/TestFiles/Direct2D1/Media/Bitmap/FramebufferRenderResultsShouldBeUsableAsBitmap_Bgra8888.expected.png
 create mode 100644 tests/TestFiles/Direct2D1/Media/Bitmap/FramebufferRenderResultsShouldBeUsableAsBitmap_Rgb565.expected.png
 create mode 100644 tests/TestFiles/Direct2D1/Media/Bitmap/FramebufferRenderResultsShouldBeUsableAsBitmap_Rgba8888.expected.png

diff --git a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
index fd8364c03b..90409bb208 100644
--- a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
+++ b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
@@ -146,6 +146,8 @@ namespace Avalonia.Direct2D1
                 }
                 if (s is IExternalDirect2DRenderTargetSurface external)
                     return new ExternalRenderTarget(external, s_dwfactory);
+                if (s is IFramebufferPlatformSurface fb)
+                    return new FramebufferShimRenderTarget(fb, s_imagingFactory, s_d2D1Factory, s_dwfactory);
             }
             throw new NotSupportedException("Don't know how to create a Direct2D1 renderer from any of provided surfaces");
         }
diff --git a/src/Windows/Avalonia.Direct2D1/FramebufferShimRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/FramebufferShimRenderTarget.cs
new file mode 100644
index 0000000000..d465af5322
--- /dev/null
+++ b/src/Windows/Avalonia.Direct2D1/FramebufferShimRenderTarget.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Controls.Platform.Surfaces;
+using Avalonia.Direct2D1.Media;
+using Avalonia.Direct2D1.Media.Imaging;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.Win32.Interop;
+using SharpDX.Direct2D1;
+using SharpDX.WIC;
+using PixelFormat = Avalonia.Platform.PixelFormat;
+
+namespace Avalonia.Direct2D1
+{
+    class FramebufferShimRenderTarget : IRenderTarget
+    {
+        private readonly IFramebufferPlatformSurface _surface;
+        private readonly ImagingFactory _imagingFactory;
+        private readonly Factory _d2DFactory;
+        private readonly SharpDX.DirectWrite.Factory _dwriteFactory;
+
+        public FramebufferShimRenderTarget(IFramebufferPlatformSurface surface,
+            ImagingFactory imagingFactory, Factory d2dFactory, SharpDX.DirectWrite.Factory dwriteFactory)
+        {
+            _surface = surface;
+            _imagingFactory = imagingFactory;
+            _d2DFactory = d2dFactory;
+            _dwriteFactory = dwriteFactory;
+        }
+
+        public void Dispose()
+        {
+            
+        }
+
+        public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
+        {
+            var locked = _surface.Lock();
+            if (locked.Format == PixelFormat.Rgb565)
+            {
+                locked.Dispose();
+                throw new ArgumentException("Unsupported pixel format: " + locked.Format);
+            }
+
+            return new FramebufferShim(locked, _imagingFactory, _d2DFactory, _dwriteFactory)
+                .CreateDrawingContext(visualBrushRenderer);
+        }
+
+        class FramebufferShim : RenderTargetBitmapImpl
+        {
+            private readonly ILockedFramebuffer _target;
+
+            public FramebufferShim(ILockedFramebuffer target,
+                ImagingFactory imagingFactory, Factory d2dFactory, SharpDX.DirectWrite.Factory dwriteFactory
+                ) : base(imagingFactory, d2dFactory, dwriteFactory,
+                    target.Width, target.Height, target.Dpi.X, target.Dpi.Y, target.Format)
+            {
+                _target = target;
+            }
+            
+            public override IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
+            {
+                return base.CreateDrawingContext(visualBrushRenderer, () =>
+                {
+                    using (var l = WicImpl.Lock(BitmapLockFlags.Read))
+                    {
+                        for (var y = 0; y < _target.Height; y++)
+                        {
+                            UnmanagedMethods.CopyMemory(
+                                _target.Address + _target.RowBytes * y,
+                                l.Data.DataPointer + l.Stride * y,
+                                (uint) Math.Min(l.Stride, _target.RowBytes));
+                        }
+                    }
+                    Dispose();
+                    _target.Dispose();
+
+                });
+            }
+        }
+
+    }
+}
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs
index 33736b02cb..0d6ed9f39f 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs
@@ -22,8 +22,9 @@ namespace Avalonia.Direct2D1.Media
             int width,
             int height,
             double dpiX,
-            double dpiY)
-            : base(imagingFactory, width, height)
+            double dpiY,
+            Platform.PixelFormat? pixelFormat = null)
+            : base(imagingFactory, width, height, pixelFormat)
         {
             var props = new RenderTargetProperties
             {
@@ -45,9 +46,13 @@ namespace Avalonia.Direct2D1.Media
             base.Dispose();
         }
 
-        public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
+        public virtual IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
+            => CreateDrawingContext(visualBrushRenderer, null);
+
+        public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer, Action finishedCallback)
         {
-            return new DrawingContextImpl(visualBrushRenderer, _target, _dwriteFactory);
+            return new DrawingContextImpl(visualBrushRenderer, _target, _dwriteFactory,
+                finishedCallback: finishedCallback);
         }
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
index e817dd4812..bcce2496cd 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
@@ -74,6 +74,7 @@ namespace Avalonia.Direct2D1.Media
         public WicBitmapImpl(ImagingFactory factory, Platform.PixelFormat format, IntPtr data, int width, int height, int stride)
         {
             WicImpl = new Bitmap(factory, width, height, format.ToWic(), BitmapCreateCacheOption.CacheOnDemand);
+            _factory = factory;
             PixelFormat = format;
             using (var l = WicImpl.Lock(BitmapLockFlags.Write))
             {
diff --git a/tests/Avalonia.RenderTests/Media/BitmapTests.cs b/tests/Avalonia.RenderTests/Media/BitmapTests.cs
index f01f78ae94..a7cd06a894 100644
--- a/tests/Avalonia.RenderTests/Media/BitmapTests.cs
+++ b/tests/Avalonia.RenderTests/Media/BitmapTests.cs
@@ -64,13 +64,13 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             public void Deallocate() => Marshal.FreeHGlobal(Address);
         }
 
-
-#if AVALONIA_SKIA
+        
         [Theory]
-#else
-        [Theory(Skip = "Framebuffer not supported")]
+        [InlineData(PixelFormat.Rgba8888), InlineData(PixelFormat.Bgra8888),
+#if SKIA
+             InlineData(PixelFormat.Rgb565)
 #endif
-        [InlineData(PixelFormat.Rgba8888), InlineData(PixelFormat.Bgra8888), InlineData(PixelFormat.Rgb565)]
+            ]
         public void FramebufferRenderResultsShouldBeUsableAsBitmap(PixelFormat fmt)
         {
             var testName = nameof(FramebufferRenderResultsShouldBeUsableAsBitmap) + "_" + fmt;
@@ -84,6 +84,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
                 ctx.FillRectangle(Brushes.Chartreuse, new Rect(0, 0, 20, 100));
                 ctx.FillRectangle(Brushes.Crimson, new Rect(20, 0, 20, 100));
                 ctx.FillRectangle(Brushes.Gold, new Rect(40, 0, 20, 100));
+                ctx.PopOpacity();
             }
 
             var bmp = new Bitmap(fmt, fb.Address, fb.Width, fb.Height, fb.RowBytes);
diff --git a/tests/TestFiles/Direct2D1/Media/Bitmap/FramebufferRenderResultsShouldBeUsableAsBitmap_Bgra8888.expected.png b/tests/TestFiles/Direct2D1/Media/Bitmap/FramebufferRenderResultsShouldBeUsableAsBitmap_Bgra8888.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..19686464c546d3f56a55e15fc4df8bc574ecf13e
GIT binary patch
literal 800
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$`B3jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1rg$Oj|u&978JN-riU^QG`Lj^&oGfiQjw$F%wrm
zmPQ2@o97&j0vrjR3+~=tC26?m?DYIQHv4M#*vG$ozI?s@*N>0?E|u$lp4Sznk+pCI
zt8&hw6|IZJx}ppYsSSFePk-;<{yg<x-M>#k=k4>?e|`Nut9(N0JB8DC9H;GU)+uI>
ze8#uwjBLtG>k~#GiPBBIAg^g;9psn|@-5J#JsUblxX|hXn_`Q3mNMsM`qKH18@E56
ndHCa*hZWCgD4b?9|371-;u7va=|XQ{s%G$X^>bP0l+XkKg^yP@

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Direct2D1/Media/Bitmap/FramebufferRenderResultsShouldBeUsableAsBitmap_Rgb565.expected.png b/tests/TestFiles/Direct2D1/Media/Bitmap/FramebufferRenderResultsShouldBeUsableAsBitmap_Rgb565.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3d20008a1bde3d523b8be3c2dc29af79b52303f
GIT binary patch
literal 786
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$`B3jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1rg$Ov^o8978JN-rm@_QkId2^`h><wL8?x(+l{|
z+3#3d%B(({U8sgtedj}s%b#DruC#x7zJI>_*Z1E)2cG}@ZrO^~MPgl128YzTqBOD=
zu3%NpSu{k1j{g3hz18}JQTc?_cM7NPI8NKytW(S$`HXMV8QGMXK#BYB6l%hUjCbf5
z@>(+IW%|<jjvKc>o_YA=nTHk63T%ok=2_BESn~aE`Pr+P_hqe@Y6hlb22WQ%mvv4F
FO#n8jN}B)x

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Direct2D1/Media/Bitmap/FramebufferRenderResultsShouldBeUsableAsBitmap_Rgba8888.expected.png b/tests/TestFiles/Direct2D1/Media/Bitmap/FramebufferRenderResultsShouldBeUsableAsBitmap_Rgba8888.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..19686464c546d3f56a55e15fc4df8bc574ecf13e
GIT binary patch
literal 800
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$`B3jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1rg$Oj|u&978JN-riU^QG`Lj^&oGfiQjw$F%wrm
zmPQ2@o97&j0vrjR3+~=tC26?m?DYIQHv4M#*vG$ozI?s@*N>0?E|u$lp4Sznk+pCI
zt8&hw6|IZJx}ppYsSSFePk-;<{yg<x-M>#k=k4>?e|`Nut9(N0JB8DC9H;GU)+uI>
ze8#uwjBLtG>k~#GiPBBIAg^g;9psn|@-5J#JsUblxX|hXn_`Q3mNMsM`qKH18@E56
ndHCa*hZWCgD4b?9|371-;u7va=|XQ{s%G$X^>bP0l+XkKg^yP@

literal 0
HcmV?d00001


From abe47da717f1269e0d62fa84e0e187a97c7a7fa3 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 7 Oct 2017 19:05:51 +0200
Subject: [PATCH 055/482] Fix flicker on resize under D2D.

Still getting a "rubber banding" effect that needs to be fixed though.
---
 .../Rendering/DeferredRenderer.cs             | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index 81a2998fd2..5434a35464 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -185,36 +185,40 @@ namespace Avalonia.Rendering
 
             try
             {
-                using (var context = _renderTarget.CreateDrawingContext(this))
+                if (scene != null && scene.Size != Size.Empty)
                 {
-                    if (scene != null && scene.Size != Size.Empty)
+                    IDrawingContextImpl context = null;
+
+                    if (scene.Generation != _lastSceneId)
                     {
-                        if (scene.Generation != _lastSceneId)
-                        {
-                            _layers.Update(scene, context);
+                        context = _renderTarget.CreateDrawingContext(this);
+                        _layers.Update(scene, context);
 
-                            RenderToLayers(scene);
+                        RenderToLayers(scene);
 
-                            if (DebugFramesPath != null)
-                            {
-                                SaveDebugFrames(scene.Generation);
-                            }
+                        if (DebugFramesPath != null)
+                        {
+                            SaveDebugFrames(scene.Generation);
+                        }
 
-                            _lastSceneId = scene.Generation;
+                        _lastSceneId = scene.Generation;
 
-                            composite = true;
-                        }
+                        composite = true;
+                    }
 
-                        if (renderOverlay)
-                        {
-                            RenderOverlay(scene, context);
-                            RenderComposite(scene, context);
-                        }
-                        else if (composite)
-                        {
-                            RenderComposite(scene, context);
-                        }
+                    if (renderOverlay)
+                    {
+                        context = context ?? _renderTarget.CreateDrawingContext(this);
+                        RenderOverlay(scene, context);
+                        RenderComposite(scene, context);
+                    }
+                    else if (composite)
+                    {
+                        context = context ?? _renderTarget.CreateDrawingContext(this);
+                        RenderComposite(scene, context);
                     }
+
+                    context?.Dispose();
                 }
             }
             catch (RenderTargetCorruptedException ex)

From e2b9e5dbaa46af922b062906b829eb23a7f50b84 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sat, 7 Oct 2017 21:15:45 +0300
Subject: [PATCH 056/482] Call VerifyAccess in AvaloniaObject.ctor

---
 src/Avalonia.Base/AvaloniaObject.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 7defcfbe6a..efcbb57244 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -56,7 +56,7 @@ namespace Avalonia
         /// </summary>
         public AvaloniaObject()
         {
-            CheckAccess();
+            VerifyAccess();
             foreach (var property in AvaloniaPropertyRegistry.Instance.GetRegistered(this))
             {
                 object value = property.IsDirect ?
@@ -818,4 +818,4 @@ namespace Avalonia
             throw new ArgumentException($"Property '{p.Name} not registered on '{this.GetType()}");
         }
     }
-}
\ No newline at end of file
+}

From 120eb2dde6d9671e712f8c456c684bda467a0c8d Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sat, 7 Oct 2017 15:00:46 -0500
Subject: [PATCH 057/482] PR Feedback.

---
 .../Data/Plugins/MethodAccessorPlugin.cs      |   5 -
 .../Avalonia.Markup/DefaultValueConverter.cs  |   2 +-
 .../Data/BindingTests_Method.cs               | 106 ++++++++++++++++++
 3 files changed, 107 insertions(+), 6 deletions(-)
 create mode 100644 tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs

diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/MethodAccessorPlugin.cs b/src/Markup/Avalonia.Markup/Data/Plugins/MethodAccessorPlugin.cs
index c602fa4f4d..db0d3e0299 100644
--- a/src/Markup/Avalonia.Markup/Data/Plugins/MethodAccessorPlugin.cs
+++ b/src/Markup/Avalonia.Markup/Data/Plugins/MethodAccessorPlugin.cs
@@ -82,11 +82,6 @@ namespace Avalonia.Markup.Data.Plugins
                 }
                 catch { }
             }
-
-            private void SendCurrentValue()
-            {
-
-            }
         }
     }
 }
diff --git a/src/Markup/Avalonia.Markup/DefaultValueConverter.cs b/src/Markup/Avalonia.Markup/DefaultValueConverter.cs
index bb6bd85827..28d64eb561 100644
--- a/src/Markup/Avalonia.Markup/DefaultValueConverter.cs
+++ b/src/Markup/Avalonia.Markup/DefaultValueConverter.cs
@@ -35,7 +35,7 @@ namespace Avalonia.Markup
                 return AvaloniaProperty.UnsetValue;
             }
 
-            if (typeof(ICommand).IsAssignableFrom(targetType) && value is Delegate d)
+            if (typeof(ICommand).IsAssignableFrom(targetType) && value is Delegate d && d.Method.GetParameters().Length <= 1)
             {
                 return new AlwaysEnabledDelegateCommand(d);
             }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs
new file mode 100644
index 0000000000..031f14d686
--- /dev/null
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs
@@ -0,0 +1,106 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System.Reactive.Subjects;
+using System.Windows.Input;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Markup.Xaml.UnitTests.Data
+{
+    public class BindingTests_Method
+    {
+        [Fact]
+        public void Binding_Method_To_Command_Works()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <Button Name='button' Command='{Binding Method}'/>
+</Window>";
+                var loader = new AvaloniaXamlLoader();
+                var window = (Window)loader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+                var vm = new ViewModel();
+
+                button.DataContext = vm;
+                window.ApplyTemplate();
+
+                Assert.NotNull(button.Command);
+                PerformClick(button);
+                Assert.Equal("Called", vm.Value);
+            }
+        }
+
+        [Fact]
+        public void Binding_Method_With_Parameter_To_Command_Works()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <Button Name='button' Command='{Binding Method1}' CommandParameter='5'/>
+</Window>";
+                var loader = new AvaloniaXamlLoader();
+                var window = (Window)loader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+                var vm = new ViewModel();
+
+                button.DataContext = vm;
+                window.ApplyTemplate();
+
+                Assert.NotNull(button.Command);
+                PerformClick(button);
+                Assert.Equal("Called 5", vm.Value);
+            }
+        }
+
+        // Should this work or should it be a binding error?
+        [Fact]
+        public void Binding_Method_To_TextBlock_Text_Works()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <TextBlock Name='textBlock' Text='{Binding Method}'/>
+</Window>";
+                var loader = new AvaloniaXamlLoader();
+                var window = (Window)loader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+                var vm = new ViewModel();
+
+                textBlock.DataContext = vm;
+                window.ApplyTemplate();
+
+                Assert.NotNull(textBlock.Text);
+            }
+        }
+
+        static void PerformClick(Button button)
+        {
+            button.RaiseEvent(new KeyEventArgs
+            {
+                RoutedEvent = InputElement.KeyDownEvent,
+                Key = Input.Key.Enter,
+            });
+        }
+
+        private class ViewModel
+        {
+            public string Method() => Value = "Called";
+            public string Method1(int i) => Value = $"Called {i}";
+            public string Method2(int i, int j) => Value = $"Called {i},{j}";
+            public string Value { get; private set; } = "Not called";
+        }
+    }
+}
\ No newline at end of file

From 83ee601735f7a7e8763a462a64020317e2256f1a Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sat, 7 Oct 2017 15:17:36 -0500
Subject: [PATCH 058/482] Use TypeUtilities to convert the type of
 CommandParameter to the correct type.

---
 .../AlwaysEnabledDelegateCommand.cs                | 14 +++++++++++---
 .../Data/BindingTests_Method.cs                    |  3 +--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs b/src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs
index 6de9be80cc..48db99b43c 100644
--- a/src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs
+++ b/src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs
@@ -1,5 +1,8 @@
-using System;
+using Avalonia.Utilities;
+using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.Reflection;
 using System.Text;
 using System.Windows.Input;
 
@@ -9,9 +12,13 @@ namespace Avalonia.Markup
     {
         private readonly Delegate action;
 
+        private ParameterInfo parameterInfo;
+
         public AlwaysEnabledDelegateCommand(Delegate action)
         {
             this.action = action;
+            var parameters = action.Method.GetParameters();
+            parameterInfo = parameters.Length == 0 ? null : parameters[0];
         }
 
 #pragma warning disable 0067
@@ -22,13 +29,14 @@ namespace Avalonia.Markup
 
         public void Execute(object parameter)
         {
-            if (action.Method.GetParameters().Length == 0)
+            if (parameterInfo == null)
             {
                 action.DynamicInvoke();
             }
             else
             {
-                action.DynamicInvoke(parameter); 
+                TypeUtilities.TryConvert(parameterInfo.ParameterType, parameter, CultureInfo.CurrentCulture, out object convertedParameter);
+                action.DynamicInvoke(convertedParameter); 
             }
         }
     }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs
index 031f14d686..0d96df8eb8 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs
@@ -61,8 +61,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
                 Assert.Equal("Called 5", vm.Value);
             }
         }
-
-        // Should this work or should it be a binding error?
+        
         [Fact]
         public void Binding_Method_To_TextBlock_Text_Works()
         {

From 753d05d19e635b6f324c66fb6f5afcbeadaa1f0c Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 9 Oct 2017 15:27:22 +0300
Subject: [PATCH 059/482] [GTK3] Don't initialize GTK twice

---
 src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs b/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
index aefd873155..81ff2e9a45 100644
--- a/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
+++ b/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
@@ -25,18 +25,23 @@ namespace Avalonia.Gtk3
         internal static IntPtr App { get; set; }
         internal static string DisplayClassName;
         public static bool UseDeferredRendering = true;
+        private static bool s_gtkInitialized;
         public static void Initialize()
         {
-            Resolver.Resolve();
-            Native.GtkInit(0, IntPtr.Zero);
-            var disp = Native.GdkGetDefaultDisplay();
-            DisplayClassName = Utf8Buffer.StringFromPtr(Native.GTypeName(Marshal.ReadIntPtr(Marshal.ReadIntPtr(disp))));
-            
-            using (var utf = new Utf8Buffer("avalonia.app." + Guid.NewGuid()))
-                App = Native.GtkApplicationNew(utf, 0);
-            //Mark current thread as UI thread
-            s_tlsMarker = true;
+            if (!s_gtkInitialized)
+            {
+                Resolver.Resolve();
+                Native.GtkInit(0, IntPtr.Zero);
+                var disp = Native.GdkGetDefaultDisplay();
+                DisplayClassName =
+                    Utf8Buffer.StringFromPtr(Native.GTypeName(Marshal.ReadIntPtr(Marshal.ReadIntPtr(disp))));
 
+                using (var utf = new Utf8Buffer("avalonia.app." + Guid.NewGuid()))
+                    App = Native.GtkApplicationNew(utf, 0);
+                //Mark current thread as UI thread
+                s_tlsMarker = true;
+                s_gtkInitialized = true;
+            }
             AvaloniaLocator.CurrentMutable.Bind<IWindowingPlatform>().ToConstant(Instance)
                 .Bind<IClipboard>().ToSingleton<ClipboardImpl>()
                 .Bind<IStandardCursorFactory>().ToConstant(new CursorFactory())

From fe8aae224444cd0197ecbab7693029c9e4686752 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 9 Oct 2017 15:27:57 +0300
Subject: [PATCH 060/482] [GTK3] Lock and sync X11 display

---
 src/Gtk/Avalonia.Gtk3/FramebufferManager.cs |  2 +-
 src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs       |  4 +++
 src/Gtk/Avalonia.Gtk3/X11.cs                | 28 +++++++++++++++++++--
 src/Gtk/Avalonia.Gtk3/X11Framebuffer.cs     |  3 +++
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/Gtk/Avalonia.Gtk3/FramebufferManager.cs b/src/Gtk/Avalonia.Gtk3/FramebufferManager.cs
index 455b63b89e..a673047e8c 100644
--- a/src/Gtk/Avalonia.Gtk3/FramebufferManager.cs
+++ b/src/Gtk/Avalonia.Gtk3/FramebufferManager.cs
@@ -40,7 +40,7 @@ namespace Avalonia.Gtk3
             return new ImageSurfaceFramebuffer(_window, width, height, _window.LastKnownScaleFactor);
         }
 
-        private static int X11ErrorHandler(IntPtr d, IntPtr e)
+        private static int X11ErrorHandler(IntPtr d, ref X11.XErrorEvent e)
         {
             return 0;
         }
diff --git a/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs b/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
index 81ff2e9a45..2cf893346f 100644
--- a/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
+++ b/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
@@ -30,6 +30,10 @@ namespace Avalonia.Gtk3
         {
             if (!s_gtkInitialized)
             {
+                try
+                {
+                    X11.XInitThreads();
+                }catch{}
                 Resolver.Resolve();
                 Native.GtkInit(0, IntPtr.Zero);
                 var disp = Native.GdkGetDefaultDisplay();
diff --git a/src/Gtk/Avalonia.Gtk3/X11.cs b/src/Gtk/Avalonia.Gtk3/X11.cs
index 6708ece17b..4677114bdb 100644
--- a/src/Gtk/Avalonia.Gtk3/X11.cs
+++ b/src/Gtk/Avalonia.Gtk3/X11.cs
@@ -5,9 +5,18 @@ namespace Avalonia.Gtk3
 {
     class X11
     {
+        [DllImport("libX11.so.6")]
+        public static extern IntPtr XInitThreads();
+        
         [DllImport("libX11.so.6")]
         public static extern IntPtr XOpenDisplay(IntPtr name);
         
+        [DllImport("libX11.so.6")]
+        public static extern IntPtr XLockDisplay(IntPtr display);
+        
+        [DllImport("libX11.so.6")]
+        public static extern IntPtr XUnlockDisplay(IntPtr display);
+        
         [DllImport("libX11.so.6")]
         public static extern IntPtr XFreeGC(IntPtr display, IntPtr gc);
         
@@ -23,13 +32,28 @@ namespace Avalonia.Gtk3
         [DllImport("libX11.so.6")]
         public static extern IntPtr XSetErrorHandler(XErrorHandler handler);
 
-        public delegate int XErrorHandler(IntPtr display, IntPtr error);
+        [DllImport("libX11.so.6")]
+        public static extern int XSync(IntPtr display, bool discard);
+
+        public delegate int XErrorHandler(IntPtr display, ref XErrorEvent error);
 
         [DllImport("libX11.so.6")]
         public static extern int XPutImage(IntPtr display, IntPtr drawable, IntPtr gc, ref XImage image,
             int srcx, int srcy, int destx, int desty, uint width, uint height);
 
-        
+        [StructLayout(LayoutKind.Sequential)]
+        public unsafe struct XErrorEvent
+        {
+            public int type;
+            public IntPtr* display; /* Display the event was read from */
+            public ulong serial; /* serial number of failed request */
+            public byte error_code; /* error code of failed request */
+            public byte request_code; /* Major op-code of failed request */
+            public byte minor_code; /* Minor op-code of failed request */
+            public IntPtr resourceid; /* resource id */
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
         public unsafe struct XImage
         {
             public int width, height; /* size of image */
diff --git a/src/Gtk/Avalonia.Gtk3/X11Framebuffer.cs b/src/Gtk/Avalonia.Gtk3/X11Framebuffer.cs
index 2bf08bddf1..4b27920d64 100644
--- a/src/Gtk/Avalonia.Gtk3/X11Framebuffer.cs
+++ b/src/Gtk/Avalonia.Gtk3/X11Framebuffer.cs
@@ -38,10 +38,13 @@ namespace Avalonia.Gtk3
             image.depth = 24;
             image.bytes_per_line = RowBytes - Width * 4;
             image.bits_per_pixel = bitsPerPixel;
+            X11.XLockDisplay(_display);
             X11.XInitImage(ref image);
             var gc = X11.XCreateGC(_display, _xid, 0, IntPtr.Zero);
             X11.XPutImage(_display, _xid, gc, ref image, 0, 0, 0, 0, (uint) Width, (uint) Height);
             X11.XFreeGC(_display, gc);
+            X11.XSync(_display, true);
+            X11.XUnlockDisplay(_display);
             _blob.Dispose();
         }
 

From 12e32dc08e9ac77c51860df9f6fe0f16d2ea5a6e Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 9 Oct 2017 15:31:38 -0500
Subject: [PATCH 061/482] Implement RelativeSource binding syntax sugar except
 for parsing AncestorType.

---
 .../Avalonia.Markup.Xaml/Data/Binding.cs      | 96 +++++++++++++++++--
 1 file changed, 87 insertions(+), 9 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
index 3f12593197..9d911999c6 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
@@ -96,20 +96,23 @@ namespace Avalonia.Markup.Xaml.Data
             ValidateState(pathInfo);
             enableDataValidation = enableDataValidation && Priority == BindingPriority.LocalValue;
 
+            var elementName = pathInfo.ElementName;
+            var relativeSource = RelativeSource ?? pathInfo.RelativeSource;
+
             ExpressionObserver observer;
 
-            if (pathInfo.ElementName != null || ElementName != null)
+            if (elementName != null)
             {
                 observer = CreateElementObserver(
                     (target as IControl) ?? (anchor as IControl),
-                    pathInfo.ElementName ?? ElementName,
+                    elementName,
                     pathInfo.Path);
             }
             else if (Source != null)
             {
                 observer = CreateSourceObserver(Source, pathInfo.Path, enableDataValidation);
             }
-            else if (RelativeSource == null || RelativeSource.Mode == RelativeSourceMode.DataContext)
+            else if (relativeSource == null || relativeSource.Mode == RelativeSourceMode.DataContext)
             {
                 observer = CreateDataContexObserver(
                     target,
@@ -118,23 +121,24 @@ namespace Avalonia.Markup.Xaml.Data
                     anchor,
                     enableDataValidation);
             }
-            else if (RelativeSource.Mode == RelativeSourceMode.Self)
+            else if (relativeSource.Mode == RelativeSourceMode.Self)
             {
                 observer = CreateSourceObserver(target, pathInfo.Path, enableDataValidation);
             }
-            else if (RelativeSource.Mode == RelativeSourceMode.TemplatedParent)
+            else if (relativeSource.Mode == RelativeSourceMode.TemplatedParent)
             {
                 observer = CreateTemplatedParentObserver(target, pathInfo.Path);
             }
-            else if (RelativeSource.Mode == RelativeSourceMode.FindAncestor)
+            else if (relativeSource.Mode == RelativeSourceMode.FindAncestor)
             {
-                if (RelativeSource.AncestorType == null)
+                if (relativeSource.AncestorType == null)
                 {
                     throw new InvalidOperationException("AncestorType must be set for RelativeSourceModel.FindAncestor.");
                 }
 
                 observer = CreateFindAncestorObserver(
                     (target as IControl) ?? (anchor as IControl),
+                    relativeSource,
                     pathInfo.Path);
             }
             else
@@ -187,6 +191,66 @@ namespace Avalonia.Markup.Xaml.Data
                     result.ElementName = path.Substring(1);
                 }
             }
+            else if (path.StartsWith("$"))
+            {
+                var relativeSource = new RelativeSource();
+                result.RelativeSource = relativeSource;
+                var dot = path.IndexOf('.');
+                string relativeSourceMode;
+                if (dot != -1)
+                {
+                    result.Path = path.Substring(dot + 1);
+                    relativeSourceMode = path.Substring(1, dot - 1);
+                }
+                else
+                {
+                    result.Path = string.Empty;
+                    relativeSourceMode = path.Substring(1);
+                }
+
+                if (relativeSourceMode == "self")
+                {
+                    relativeSource.Mode = RelativeSourceMode.Self;
+                }
+                else if(relativeSourceMode == "parent")
+                {
+                    relativeSource.Mode = RelativeSourceMode.FindAncestor;
+                    var parentConfigStart = relativeSourceMode.IndexOf('[');
+                    if (parentConfigStart != -1)
+                    {
+                        if (!relativeSourceMode.EndsWith("]"))
+                        {
+                            throw new InvalidOperationException("Invalid RelativeSource binding syntax. Expected matching ']' for '['.");
+                        }
+                        var parentConfigParams = relativeSourceMode.Substring(0, relativeSourceMode.Length - 1).Split(',');
+                        if (parentConfigParams.Length > 2 || parentConfigParams.Length == 0)
+                        {
+                            throw new InvalidOperationException("Expected either 1 or 2 parameters for RelativeSource binding syntax");
+                        }
+                        else if (parentConfigParams.Length == 1)
+                        {
+                            if (int.TryParse(parentConfigParams[0], out int level))
+                            {
+                                relativeSource.AncestorType = typeof(IControl);
+                                relativeSource.AncestorLevel = level;
+                            }
+                            else
+                            {
+                                relativeSource.AncestorType = LookupAncestorType(parentConfigParams[0]);
+                            }
+                        }
+                        else
+                        {
+                            relativeSource.AncestorType = LookupAncestorType(parentConfigParams[0]);
+                            relativeSource.AncestorLevel = int.Parse(parentConfigParams[1]);
+                        }
+                    }
+                }
+                else
+                {
+                    throw new InvalidOperationException($"Invalid RelativeSource binding syntax: {relativeSourceMode}");
+                }
+            }
             else
             {
                 result.Path = path;
@@ -195,6 +259,12 @@ namespace Avalonia.Markup.Xaml.Data
             return result;
         }
 
+        private static Type LookupAncestorType(string ancestorTypeName)
+        {
+            //TODO: What is our syntax for type lookup here?
+            throw new NotImplementedException();
+        }
+
         private void ValidateState(PathInfo pathInfo)
         {
             if (pathInfo.ElementName != null && ElementName != null)
@@ -203,8 +273,14 @@ namespace Avalonia.Markup.Xaml.Data
                     "ElementName property cannot be set when an #elementName path is provided.");
             }
 
+            if (pathInfo.RelativeSource != null && RelativeSource != null)
+            {
+                throw new InvalidOperationException(
+                    "ElementName property cannot be set when a $self or $parent path is provided.");
+            }
+
             if ((pathInfo.ElementName != null || ElementName != null) &&
-                RelativeSource != null)
+                (pathInfo.RelativeSource != null || RelativeSource != null))
             {
                 throw new InvalidOperationException(
                     "ElementName property cannot be set with a RelativeSource.");
@@ -267,12 +343,13 @@ namespace Avalonia.Markup.Xaml.Data
 
         private ExpressionObserver CreateFindAncestorObserver(
             IControl target,
+            RelativeSource relativeSource,
             string path)
         {
             Contract.Requires<ArgumentNullException>(target != null);
 
             return new ExpressionObserver(
-                ControlLocator.Track(target, RelativeSource.AncestorType, RelativeSource.AncestorLevel -1),
+                ControlLocator.Track(target, relativeSource.AncestorType, relativeSource.AncestorLevel -1),
                 path);
         }
 
@@ -324,6 +401,7 @@ namespace Avalonia.Markup.Xaml.Data
         {
             public string Path { get; set; }
             public string ElementName { get; set; }
+            public RelativeSource RelativeSource { get; set; }
         }
     }
 }
\ No newline at end of file

From bf78e35489c8e5a7c6a7091f4657abd7e2756d3b Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 9 Oct 2017 17:43:10 -0500
Subject: [PATCH 062/482] Update XUnit to a released version.

---
 build/XUnit.props | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/build/XUnit.props b/build/XUnit.props
index 42fe9b6d7a..1d7da7257d 100644
--- a/build/XUnit.props
+++ b/build/XUnit.props
@@ -1,14 +1,14 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit" Version="2.3.0" />
     <PackageReference Include="xunit.abstractions" Version="2.0.1" />
-    <PackageReference Include="xunit.assert" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.core" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.extensibility.core" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.extensibility.execution" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.console" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit.assert" Version="2.3.0" />
+    <PackageReference Include="xunit.core" Version="2.3.0" />
+    <PackageReference Include="xunit.extensibility.core" Version="2.3.0" />
+    <PackageReference Include="xunit.extensibility.execution" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.console" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />

From a29837dd042b8ee068daef5049d1883cfe3d7189 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 9 Oct 2017 17:44:45 -0500
Subject: [PATCH 063/482] Implement syntax sugar for RelativeSource (not
 including setting a specific AncestorType)

---
 .../Avalonia.Markup.Xaml/Data/Binding.cs      | 47 +++++++++--------
 .../Xaml/BindingTests_RelativeSource.cs       | 50 +++++++++++++++++++
 2 files changed, 75 insertions(+), 22 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
index 9d911999c6..052f743a4b 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
@@ -96,7 +96,7 @@ namespace Avalonia.Markup.Xaml.Data
             ValidateState(pathInfo);
             enableDataValidation = enableDataValidation && Priority == BindingPriority.LocalValue;
 
-            var elementName = pathInfo.ElementName;
+            var elementName = ElementName ?? pathInfo.ElementName;
             var relativeSource = RelativeSource ?? pathInfo.RelativeSource;
 
             ExpressionObserver observer;
@@ -213,38 +213,41 @@ namespace Avalonia.Markup.Xaml.Data
                     relativeSource.Mode = RelativeSourceMode.Self;
                 }
                 else if(relativeSourceMode == "parent")
+                {
+                    relativeSource.Mode = RelativeSourceMode.FindAncestor;
+                    relativeSource.AncestorType = typeof(IControl);
+                    relativeSource.AncestorLevel = 1;
+                }
+                else if(relativeSourceMode.StartsWith("parent["))
                 {
                     relativeSource.Mode = RelativeSourceMode.FindAncestor;
                     var parentConfigStart = relativeSourceMode.IndexOf('[');
-                    if (parentConfigStart != -1)
+                    if (!relativeSourceMode.EndsWith("]"))
                     {
-                        if (!relativeSourceMode.EndsWith("]"))
-                        {
-                            throw new InvalidOperationException("Invalid RelativeSource binding syntax. Expected matching ']' for '['.");
-                        }
-                        var parentConfigParams = relativeSourceMode.Substring(0, relativeSourceMode.Length - 1).Split(',');
-                        if (parentConfigParams.Length > 2 || parentConfigParams.Length == 0)
-                        {
-                            throw new InvalidOperationException("Expected either 1 or 2 parameters for RelativeSource binding syntax");
-                        }
-                        else if (parentConfigParams.Length == 1)
+                        throw new InvalidOperationException("Invalid RelativeSource binding syntax. Expected matching ']' for '['.");
+                    }
+                    var parentConfigParams = relativeSourceMode.Substring(parentConfigStart + 1).TrimEnd(']').Split(',');
+                    if (parentConfigParams.Length > 2 || parentConfigParams.Length == 0)
+                    {
+                        throw new InvalidOperationException("Expected either 1 or 2 parameters for RelativeSource binding syntax");
+                    }
+                    else if (parentConfigParams.Length == 1)
+                    {
+                        if (int.TryParse(parentConfigParams[0], out int level))
                         {
-                            if (int.TryParse(parentConfigParams[0], out int level))
-                            {
-                                relativeSource.AncestorType = typeof(IControl);
-                                relativeSource.AncestorLevel = level;
-                            }
-                            else
-                            {
-                                relativeSource.AncestorType = LookupAncestorType(parentConfigParams[0]);
-                            }
+                            relativeSource.AncestorType = typeof(IControl);
+                            relativeSource.AncestorLevel = level + 1;
                         }
                         else
                         {
                             relativeSource.AncestorType = LookupAncestorType(parentConfigParams[0]);
-                            relativeSource.AncestorLevel = int.Parse(parentConfigParams[1]);
                         }
                     }
+                    else
+                    {
+                        relativeSource.AncestorType = LookupAncestorType(parentConfigParams[0]);
+                        relativeSource.AncestorLevel = int.Parse(parentConfigParams[1]) + 1;
+                    }
                 }
                 else
                 {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs
index 9125e1e643..a4e4d4f5c3 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs
@@ -77,6 +77,31 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void Binding_To_First_Ancestor_With_Shorthand_Works()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <Border Name='border1'>
+      <Border Name='border2'>
+        <Button Name='button' Content='{Binding $parent.Name}'/>
+      </Border>
+    </Border>
+</Window>";
+                var loader = new AvaloniaXamlLoader();
+                var window = (Window)loader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+
+                window.ApplyTemplate();
+
+                Assert.Equal("border2", button.Content);
+            }
+        }
+
         [Fact]
         public void Binding_To_Second_Ancestor_Works()
         {
@@ -102,6 +127,31 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void Binding_To_Second_Ancestor_With_Shorthand_Works()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <Border Name='border1'>
+      <Border Name='border2'>
+        <Button Name='button' Content='{Binding $parent[1].Name}'/>
+      </Border>
+    </Border>
+</Window>";
+                var loader = new AvaloniaXamlLoader();
+                var window = (Window)loader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+
+                window.ApplyTemplate();
+
+                Assert.Equal("border1", button.Content);
+            }
+        }
+
         [Fact]
         public void Binding_To_Ancestor_With_Namespace_Works()
         {

From 713933b7fb78e96070408ca1b966ff35efa26bc4 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 10 Oct 2017 14:11:51 +0100
Subject: [PATCH 064/482] [Scrollbar] dont try and arrange the thumb and
 buttons if the extent is zero.

---
 src/Avalonia.Controls/Primitives/Track.cs | 34 +++++++++++++----------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/Track.cs b/src/Avalonia.Controls/Primitives/Track.cs
index 663b7a22d5..ce768fe58d 100644
--- a/src/Avalonia.Controls/Primitives/Track.cs
+++ b/src/Avalonia.Controls/Primitives/Track.cs
@@ -137,14 +137,17 @@ namespace Avalonia.Controls.Primitives
                     decreaseButton.Arrange(new Rect(0, 0, firstWidth, finalSize.Height));
                 }
 
-                if (thumb != null)
+                if (!double.IsNaN(thumbWidth))
                 {
-                    thumb.Arrange(new Rect(firstWidth, 0, thumbWidth, finalSize.Height));
-                }
-
-                if (increaseButton != null)
-                {
-                    increaseButton.Arrange(new Rect(firstWidth + thumbWidth, 0, remaining - firstWidth, finalSize.Height));
+                    if (thumb != null)
+                    {
+                        thumb.Arrange(new Rect(firstWidth, 0, thumbWidth, finalSize.Height));
+                    }
+
+                    if (increaseButton != null)
+                    {
+                        increaseButton.Arrange(new Rect(firstWidth + thumbWidth, 0, remaining - firstWidth, finalSize.Height));
+                    }
                 }
             }
             else
@@ -158,14 +161,17 @@ namespace Avalonia.Controls.Primitives
                     decreaseButton.Arrange(new Rect(0, 0, finalSize.Width, firstHeight));
                 }
 
-                if (thumb != null)
-                {
-                    thumb.Arrange(new Rect(0, firstHeight, finalSize.Width, thumbHeight));
-                }
-
-                if (increaseButton != null)
+                if (!double.IsNaN(thumbHeight))
                 {
-                    increaseButton.Arrange(new Rect(0, firstHeight + thumbHeight, finalSize.Width, Math.Max(remaining - firstHeight, 0)));
+                    if (thumb != null)
+                    {
+                        thumb.Arrange(new Rect(0, firstHeight, finalSize.Width, thumbHeight));
+                    }
+
+                    if (increaseButton != null)
+                    {
+                        increaseButton.Arrange(new Rect(0, firstHeight + thumbHeight, finalSize.Width, Math.Max(remaining - firstHeight, 0)));
+                    }
                 }
             }
 

From 884423d879140fe30b36795c1cd3e91034184684 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Tue, 10 Oct 2017 21:43:01 +0300
Subject: [PATCH 065/482] Adapt threading tests to VerifyAccess on
 AvaloniaObject.ctor

---
 .../AvaloniaObjectTests_Threading.cs          | 52 ++++++++++++-------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Threading.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Threading.cs
index 229a34643d..215e872e8c 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Threading.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Threading.cs
@@ -14,13 +14,24 @@ namespace Avalonia.Base.UnitTests
 {
     public class AvaloniaObjectTests_Threading
     {
+        private ThreadingInterface _threading = new ThreadingInterface(true);
+
         [Fact]
-        public void StyledProperty_GetValue_Should_Throw()
+        public void AvaloniaObject_Constructor_Should_Throw()
         {
             using (UnitTestApplication.Start(new TestServices(threadingInterface: new ThreadingInterface())))
             {
-                var target = new Class1();
+                Assert.Throws<InvalidOperationException>(() => new Class1());
+            }
+        }
 
+        [Fact]
+        public void StyledProperty_GetValue_Should_Throw()
+        {
+            using (UnitTestApplication.Start(new TestServices(threadingInterface: _threading)))
+            {
+                var target = new Class1();
+                _threading.CurrentThreadIsLoopThread = false;
                 Assert.Throws<InvalidOperationException>(() => target.GetValue(Class1.StyledProperty));
             }
         }
@@ -28,10 +39,10 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void StyledProperty_SetValue_Should_Throw()
         {
-            using (UnitTestApplication.Start(new TestServices(threadingInterface: new ThreadingInterface())))
+            using (UnitTestApplication.Start(new TestServices(threadingInterface: _threading)))
             {
                 var target = new Class1();
-
+                _threading.CurrentThreadIsLoopThread = false;
                 Assert.Throws<InvalidOperationException>(() => target.SetValue(Class1.StyledProperty, "foo"));
             }
         }
@@ -39,10 +50,10 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void Setting_StyledProperty_Binding_Should_Throw()
         {
-            using (UnitTestApplication.Start(new TestServices(threadingInterface: new ThreadingInterface())))
+            using (UnitTestApplication.Start(new TestServices(threadingInterface: _threading)))
             {
                 var target = new Class1();
-
+                _threading.CurrentThreadIsLoopThread = false;
                 Assert.Throws<InvalidOperationException>(() => 
                     target.Bind(
                         Class1.StyledProperty,
@@ -53,10 +64,10 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void StyledProperty_ClearValue_Should_Throw()
         {
-            using (UnitTestApplication.Start(new TestServices(threadingInterface: new ThreadingInterface())))
+            using (UnitTestApplication.Start(new TestServices(threadingInterface: _threading)))
             {
                 var target = new Class1();
-
+                _threading.CurrentThreadIsLoopThread = false;
                 Assert.Throws<InvalidOperationException>(() => target.ClearValue(Class1.StyledProperty));
             }
         }
@@ -64,10 +75,10 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void StyledProperty_IsSet_Should_Throw()
         {
-            using (UnitTestApplication.Start(new TestServices(threadingInterface: new ThreadingInterface())))
+            using (UnitTestApplication.Start(new TestServices(threadingInterface: _threading)))
             {
                 var target = new Class1();
-
+                _threading.CurrentThreadIsLoopThread = false;
                 Assert.Throws<InvalidOperationException>(() => target.IsSet(Class1.StyledProperty));
             }
         }
@@ -75,10 +86,10 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void DirectProperty_GetValue_Should_Throw()
         {
-            using (UnitTestApplication.Start(new TestServices(threadingInterface: new ThreadingInterface())))
+            using (UnitTestApplication.Start(new TestServices(threadingInterface: _threading)))
             {
                 var target = new Class1();
-
+                _threading.CurrentThreadIsLoopThread = false;
                 Assert.Throws<InvalidOperationException>(() => target.GetValue(Class1.DirectProperty));
             }
         }
@@ -86,10 +97,10 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void DirectProperty_SetValue_Should_Throw()
         {
-            using (UnitTestApplication.Start(new TestServices(threadingInterface: new ThreadingInterface())))
+            using (UnitTestApplication.Start(new TestServices(threadingInterface: _threading)))
             {
                 var target = new Class1();
-
+                _threading.CurrentThreadIsLoopThread = false;
                 Assert.Throws<InvalidOperationException>(() => target.SetValue(Class1.DirectProperty, "foo"));
             }
         }
@@ -97,10 +108,10 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void Setting_DirectProperty_Binding_Should_Throw()
         {
-            using (UnitTestApplication.Start(new TestServices(threadingInterface: new ThreadingInterface())))
+            using (UnitTestApplication.Start(new TestServices(threadingInterface: _threading)))
             {
                 var target = new Class1();
-
+                _threading.CurrentThreadIsLoopThread = false;
                 Assert.Throws<InvalidOperationException>(() =>
                     target.Bind(
                         Class1.DirectProperty,
@@ -111,10 +122,10 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void DirectProperty_ClearValue_Should_Throw()
         {
-            using (UnitTestApplication.Start(new TestServices(threadingInterface: new ThreadingInterface())))
+            using (UnitTestApplication.Start(new TestServices(threadingInterface: _threading)))
             {
                 var target = new Class1();
-
+                _threading.CurrentThreadIsLoopThread = false;
                 Assert.Throws<InvalidOperationException>(() => target.ClearValue(Class1.DirectProperty));
             }
         }
@@ -122,10 +133,10 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void DirectProperty_IsSet_Should_Throw()
         {
-            using (UnitTestApplication.Start(new TestServices(threadingInterface: new ThreadingInterface())))
+            using (UnitTestApplication.Start(new TestServices(threadingInterface: _threading)))
             {
                 var target = new Class1();
-
+                _threading.CurrentThreadIsLoopThread = false;
                 Assert.Throws<InvalidOperationException>(() => target.IsSet(Class1.DirectProperty));
             }
         }
@@ -141,6 +152,7 @@ namespace Avalonia.Base.UnitTests
 
         private class ThreadingInterface : IPlatformThreadingInterface
         {
+
             public ThreadingInterface(bool isLoopThread = false)
             {
                 CurrentThreadIsLoopThread = isLoopThread;

From a5f0d23ccb7e22a1f440092cbc3765b79afe9f8c Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 11 Oct 2017 15:08:22 +0300
Subject: [PATCH 066/482] Embed Metsys.Bson as a serializer to avoid
 referencing JSON.NET

---
 .../Avalonia.DotNetFrameworkRuntime.csproj    |    1 -
 .../Avalonia.Remote.Protocol.csproj           |    3 +-
 .../BsonStreamTransport.cs                    |   13 +-
 src/Avalonia.Remote.Protocol/MetsysBson.cs    | 1632 +++++++++++++++++
 4 files changed, 1639 insertions(+), 10 deletions(-)
 create mode 100644 src/Avalonia.Remote.Protocol/MetsysBson.cs

diff --git a/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj b/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj
index db28f8c469..dc4a06d2a7 100644
--- a/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj
+++ b/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj
@@ -10,7 +10,6 @@
         <Compile Include="..\Shared\SharedAssemblyInfo.cs">
             <Link>Properties\SharedAssemblyInfo.cs</Link>
         </Compile>
-	<Reference Include="System.Runtime"/>
         <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
         <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
         <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
diff --git a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
index a9c6b9e9a0..871c9cd995 100644
--- a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
+++ b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <DefineConstants>AVALONIA_REMOTE_PROTOCOL;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <Compile Include="..\Avalonia.Input\Key.cs" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs b/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs
index 82765f98f6..604703cac8 100644
--- a/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs
+++ b/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs
@@ -2,9 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
-using Newtonsoft.Json;
 using System.Threading.Tasks;
-using Newtonsoft.Json.Bson;
+using Metsys.Bson;
 
 namespace Avalonia.Remote.Protocol
 {
@@ -20,8 +19,7 @@ namespace Avalonia.Remote.Protocol
         private readonly object _lock = new object();
         private bool _writeOperationPending;
         private bool _readingAlreadyStarted;
-        private bool _writerIsBroken;
-        static readonly JsonSerializer Serializer = new JsonSerializer();        
+        private bool _writerIsBroken;   
         private static readonly byte[] ZeroLength = new byte[4];
 
         public BsonStreamTransportConnection(IMessageTypeResolver resolver, Stream inputStream, Stream outputStream, Action disposeCallback)
@@ -79,7 +77,8 @@ namespace Avalonia.Remote.Protocol
                     var guid = new Guid(guidBytes);
                     var buffer = new byte[length];
                     await ReadExact(buffer).ConfigureAwait(false);
-                    var message = Serializer.Deserialize(new BsonReader(new MemoryStream(buffer)), _resolver.GetByGuid(guid));
+                    var message = Deserializer.Deserialize(new BinaryReader(new MemoryStream(buffer)),
+                        _resolver.GetByGuid(guid));
                     OnMessage?.Invoke(this, message);
                 }
             }
@@ -107,8 +106,8 @@ namespace Avalonia.Remote.Protocol
                 _outputBlock.SetLength(0);
                 _outputBlock.Write(ZeroLength, 0, 4);
                 _outputBlock.Write(guid, 0, guid.Length);
-                var writer = new BsonWriter(_outputBlock);
-                Serializer.Serialize(writer, data);
+                var serialized = Serializer.Serialize(data);
+                _outputBlock.Write(serialized, 0, serialized.Length);
                 _outputBlock.Seek(0, SeekOrigin.Begin);
                 var length = BitConverter.GetBytes((int)_outputBlock.Length - 20);
                 _outputBlock.Write(length, 0, length.Length);
diff --git a/src/Avalonia.Remote.Protocol/MetsysBson.cs b/src/Avalonia.Remote.Protocol/MetsysBson.cs
new file mode 100644
index 0000000000..eb6445c3a5
--- /dev/null
+++ b/src/Avalonia.Remote.Protocol/MetsysBson.cs
@@ -0,0 +1,1632 @@
+/*
+Copyright (c) 2010, Karl Seguin - http://www.openmymind.net/
+All rights reserved.
+ 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the <organization> nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+ 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Code imported from https://github.com/elaberge/Metsys.Bson without any changes
+
+*/
+
+using System.Text;
+using System.Text.RegularExpressions;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Net;
+using System.Security.Cryptography;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using System;
+using System.Runtime.Serialization;
+
+using Metsys.Bson.Configuration;
+// ReSharper disable All
+
+namespace Metsys.Bson
+{
+    internal enum Types
+    {
+        Double = 1,
+        String = 2,
+        Object = 3,
+        Array = 4,
+        Binary = 5,
+        Undefined = 6,
+        ObjectId = 7,
+        Boolean = 8,
+        DateTime = 9,
+        Null = 10,
+        Regex = 11,
+        Reference = 12,
+        Code = 13,
+        Symbol = 14,
+        ScopedCode = 15,
+        Int32 = 16,
+        Timestamp = 17,
+        Int64 = 18,
+    }
+}
+
+namespace Metsys.Bson
+{
+
+    internal class Serializer
+    {
+        private static readonly IDictionary<Type, Types> _typeMap = new Dictionary<Type, Types>
+                                                                            {
+                                                                                {typeof (int), Types.Int32},
+                                                                                {typeof (long), Types.Int64},
+                                                                                {typeof (bool), Types.Boolean},
+                                                                                {typeof (string), Types.String},
+                                                                                {typeof (double), Types.Double},
+                                                                                {typeof (Guid), Types.Binary},
+                                                                                {typeof (Regex), Types.Regex},
+                                                                                {typeof (DateTime), Types.DateTime},
+                                                                                {typeof (float), Types.Double},
+                                                                                {typeof (byte[]), Types.Binary},
+                                                                                {typeof (ObjectId), Types.ObjectId},
+                                                                                {typeof (ScopedCode), Types.ScopedCode}
+                                                                            };
+
+        private readonly BinaryWriter _writer;
+        private Document _current;
+
+        public static byte[] Serialize<T>(T document)
+        {
+            var type = document.GetType();
+            if (type.IsValueType ||
+                (typeof(IEnumerable).IsAssignableFrom(type) && typeof(IDictionary).IsAssignableFrom(type) == false)
+            )
+            {
+                throw new BsonException("Root type must be an object");
+            }
+            using (var ms = new MemoryStream(250))
+            using (var writer = new BinaryWriter(ms))
+            {
+                new Serializer(writer).WriteDocument(document);
+                return ms.ToArray();
+            }
+        }
+        public static byte[] Serialize(object document)
+        {
+            var type = document.GetType();
+            if (type.IsValueType ||
+                (typeof(IEnumerable).IsAssignableFrom(type) && typeof(IDictionary).IsAssignableFrom(type) == false)
+            )
+            {
+                throw new BsonException("Root type must be an object");
+            }
+            using (var ms = new MemoryStream(250))
+            using (var writer = new BinaryWriter(ms))
+            {
+                new Serializer(writer).WriteDocument(document);
+                return ms.ToArray();
+            }
+        }
+
+        private Serializer(BinaryWriter writer)
+        {
+            _writer = writer;
+        }
+
+        private void NewDocument()
+        {
+            var old = _current;
+            _current = new Document { Parent = old, Length = (int)_writer.BaseStream.Position, Digested = 4 };
+            _writer.Write(0); // length placeholder
+        }
+        private void EndDocument(bool includeEeo)
+        {
+            var old = _current;
+            if (includeEeo)
+            {
+                Written(1);
+                _writer.Write((byte)0);
+            }
+
+            _writer.Seek(_current.Length, SeekOrigin.Begin);
+            _writer.Write(_current.Digested); // override the document length placeholder
+            _writer.Seek(0, SeekOrigin.End); // back to the end
+            _current = _current.Parent;
+            if (_current != null)
+            {
+                Written(old.Digested);
+            }
+        }
+
+        private void Written(int length)
+        {
+            _current.Digested += length;
+        }
+
+        private void WriteDocument(object document)
+        {
+            NewDocument();
+            WriteObject(document);
+            EndDocument(true);
+        }
+
+        private void WriteObject(object document)
+        {
+            var asDictionary = document as IDictionary;
+            if (asDictionary != null)
+            {
+                Write(asDictionary);
+                return;
+            }
+
+            var typeHelper = TypeHelper.GetHelperForType(document.GetType());
+            foreach (var property in typeHelper.GetProperties())
+            {
+                if (property.Ignored) { continue; }
+                var name = property.Name;
+                var value = property.Getter(document);
+                if (value == null && property.IgnoredIfNull)
+                {
+                    continue;
+                }
+                SerializeMember(name, value);
+            }
+        }
+
+        private void SerializeMember(string name, object value)
+        {
+            if (value == null)
+            {
+                Write(Types.Null);
+                WriteName(name);
+                return;
+            }
+
+            var type = value.GetType();
+            if (type.IsEnum)
+            {
+                type = Enum.GetUnderlyingType(type);
+            }
+
+            Types storageType;
+            if (!_typeMap.TryGetValue(type, out storageType))
+            {
+                // this isn't a simple type;
+                Write(name, value);
+                return;
+            }
+
+            Write(storageType);
+            WriteName(name);
+            switch (storageType)
+            {
+                case Types.Int32:
+                    Written(4);
+                    _writer.Write((int)value);
+                    return;
+                case Types.Int64:
+                    Written(8);
+                    _writer.Write((long)value);
+                    return;
+                case Types.String:
+                    Write((string)value);
+                    return;
+                case Types.Double:
+                    Written(8);
+                    if (value is float)
+                    {
+                        _writer.Write(Convert.ToDouble((float)value));
+                    }
+                    else
+                    {
+                        _writer.Write((double)value);
+                    }
+
+                    return;
+                case Types.Boolean:
+                    Written(1);
+                    _writer.Write((bool)value ? (byte)1 : (byte)0);
+                    return;
+                case Types.DateTime:
+                    Written(8);
+                    _writer.Write((long)((DateTime)value).ToUniversalTime().Subtract(Helper.Epoch).TotalMilliseconds);
+                    return;
+                case Types.Binary:
+                    WriteBinnary(value);
+                    return;
+                case Types.ScopedCode:
+                    Write((ScopedCode)value);
+                    return;
+                case Types.ObjectId:
+                    Written(((ObjectId)value).Value.Length);
+                    _writer.Write(((ObjectId)value).Value);
+                    return;
+                case Types.Regex:
+                    Write((Regex)value);
+                    break;
+            }
+        }
+
+        private void Write(string name, object value)
+        {
+            if (value is IDictionary)
+            {
+                Write(Types.Object);
+                WriteName(name);
+                NewDocument();
+                Write((IDictionary)value);
+                EndDocument(true);
+            }
+            else if (value is IEnumerable)
+            {
+                Write(Types.Array);
+                WriteName(name);
+                NewDocument();
+                Write((IEnumerable)value);
+                EndDocument(true);
+            }
+            else
+            {
+                Write(Types.Object);
+                WriteName(name);
+                WriteDocument(value); // Write manages new/end document
+            }
+        }
+
+        private void Write(IEnumerable enumerable)
+        {
+            var index = 0;
+            foreach (var value in enumerable)
+            {
+                SerializeMember((index++).ToString(), value);
+            }
+        }
+
+        private void Write(IDictionary dictionary)
+        {
+            foreach (var key in dictionary.Keys)
+            {
+                SerializeMember((string)key, dictionary[key]);
+            }
+        }
+
+        private void WriteBinnary(object value)
+        {
+            if (value is byte[])
+            {
+                var bytes = (byte[])value;
+                var length = bytes.Length;
+                _writer.Write(length + 4);
+                _writer.Write((byte)2);
+                _writer.Write(length);
+                _writer.Write(bytes);
+                Written(9 + length);
+            }
+            else if (value is Guid)
+            {
+                var guid = (Guid)value;
+                var bytes = guid.ToByteArray();
+                _writer.Write(bytes.Length);
+                _writer.Write((byte)3);
+                _writer.Write(bytes);
+                Written(5 + bytes.Length);
+            }
+        }
+
+        private void Write(Types type)
+        {
+            _writer.Write((byte)type);
+            Written(1);
+        }
+
+        private void WriteName(string name)
+        {
+            var bytes = Encoding.UTF8.GetBytes(name);
+            _writer.Write(bytes);
+            _writer.Write((byte)0);
+            Written(bytes.Length + 1);
+        }
+
+        private void Write(string name)
+        {
+            var bytes = Encoding.UTF8.GetBytes(name);
+            _writer.Write(bytes.Length + 1);
+            _writer.Write(bytes);
+            _writer.Write((byte)0);
+            Written(bytes.Length + 5); // stringLength + length + null byte
+        }
+
+        private void Write(Regex regex)
+        {
+            WriteName(regex.ToString());
+
+            var options = string.Empty;
+            if ((regex.Options & RegexOptions.ECMAScript) == RegexOptions.ECMAScript)
+            {
+                options = string.Concat(options, 'e');
+            }
+
+            if ((regex.Options & RegexOptions.IgnoreCase) == RegexOptions.IgnoreCase)
+            {
+                options = string.Concat(options, 'i');
+            }
+
+            if ((regex.Options & RegexOptions.CultureInvariant) == RegexOptions.CultureInvariant)
+            {
+                options = string.Concat(options, 'l');
+            }
+
+            if ((regex.Options & RegexOptions.Multiline) == RegexOptions.Multiline)
+            {
+                options = string.Concat(options, 'm');
+            }
+
+            if ((regex.Options & RegexOptions.Singleline) == RegexOptions.Singleline)
+            {
+                options = string.Concat(options, 's');
+            }
+
+            options = string.Concat(options, 'u'); // all .net regex are unicode regex, therefore:
+            if ((regex.Options & RegexOptions.IgnorePatternWhitespace) == RegexOptions.IgnorePatternWhitespace)
+            {
+                options = string.Concat(options, 'w');
+            }
+
+            if ((regex.Options & RegexOptions.ExplicitCapture) == RegexOptions.ExplicitCapture)
+            {
+                options = string.Concat(options, 'x');
+            }
+
+            WriteName(options);
+        }
+
+        private void Write(ScopedCode value)
+        {
+            NewDocument();
+            Write(value.CodeString);
+            WriteDocument(value.Scope);
+            EndDocument(false);
+        }
+    }
+}
+namespace Metsys.Bson
+{
+    internal class ScopedCode
+    {
+        public string CodeString { get; set; }
+        public object Scope { get; set; }
+    }
+
+    internal class ScopedCode<T> : ScopedCode
+    {
+        public new T Scope { get; set; }
+    }
+}
+
+namespace Metsys.Bson
+{
+    internal static class ObjectIdGenerator
+    {
+        private static readonly object _inclock = new object();
+
+        private static int _counter;
+        private static readonly byte[] _machineHash = GenerateHostHash();
+        private static readonly byte[] _processId = BitConverter.GetBytes(GenerateProcId());
+
+        public static byte[] Generate()
+        {
+            var oid = new byte[12];
+            var copyidx = 0;
+
+            Array.Copy(BitConverter.GetBytes(GenerateTime()), 0, oid, copyidx, 4);
+            copyidx += 4;
+
+            Array.Copy(_machineHash, 0, oid, copyidx, 3);
+            copyidx += 3;
+
+            Array.Copy(_processId, 0, oid, copyidx, 2);
+            copyidx += 2;
+
+            Array.Copy(BitConverter.GetBytes(GenerateInc()), 0, oid, copyidx, 3);
+            return oid;
+        }
+
+        private static int GenerateTime()
+        {
+            var now = DateTime.Now.ToUniversalTime();
+
+            var nowtime = new DateTime(Helper.Epoch.Year, Helper.Epoch.Month, Helper.Epoch.Day, now.Hour, now.Minute, now.Second, now.Millisecond);
+            var diff = nowtime - Helper.Epoch;
+            return Convert.ToInt32(Math.Floor(diff.TotalMilliseconds));
+        }
+
+        private static int GenerateInc()
+        {
+            lock (_inclock)
+            {
+                return _counter++;
+            }
+        }
+
+        private static byte[] GenerateHostHash()
+        {
+            using (var md5 = MD5.Create())
+            {
+                var host = Dns.GetHostName();
+                return md5.ComputeHash(Encoding.Default.GetBytes(host));
+            }
+        }
+        private static int GenerateProcId()
+        {
+            var proc = Process.GetCurrentProcess();
+            return proc.Id;
+        }
+    }
+}
+
+namespace Metsys.Bson
+{
+    internal class ObjectId
+    {
+        private string _string;
+
+        public ObjectId()
+        {
+        }
+
+        public ObjectId(string value) : this(DecodeHex(value))
+        {
+        }
+
+        internal ObjectId(byte[] value)
+        {
+            Value = value;
+        }
+
+        public static ObjectId Empty
+        {
+            get { return new ObjectId("000000000000000000000000"); }
+        }
+
+        public byte[] Value { get; private set; }
+
+        public static ObjectId NewObjectId()
+        {
+            // TODO: generate random-ish bits.
+            return new ObjectId { Value = ObjectIdGenerator.Generate() };
+        }
+
+        public static bool TryParse(string value, out ObjectId id)
+        {
+            id = Empty;
+            if (value == null || value.Length != 24)
+            {
+                return false;
+            }
+
+            try
+            {
+                id = new ObjectId(value);
+                return true;
+            }
+            catch (FormatException)
+            {
+                return false;
+            }
+        }
+
+        public static bool operator ==(ObjectId a, ObjectId b)
+        {
+            if (ReferenceEquals(a, b))
+            {
+                return true;
+            }
+
+            if (((object)a == null) || ((object)b == null))
+            {
+                return false;
+            }
+
+            return a.Equals(b);
+        }
+
+        public static bool operator !=(ObjectId a, ObjectId b)
+        {
+            return !(a == b);
+        }
+
+        public override int GetHashCode()
+        {
+            return Value != null ? ToString().GetHashCode() : 0;
+        }
+
+        public override string ToString()
+        {
+            if (_string == null && Value != null)
+            {
+                _string = BitConverter.ToString(Value).Replace("-", string.Empty).ToLower();
+            }
+
+            return _string;
+        }
+
+        public override bool Equals(object o)
+        {
+            var other = o as ObjectId;
+            return Equals(other);
+        }
+
+        public bool Equals(ObjectId other)
+        {
+            return other != null && ToString() == other.ToString();
+        }
+
+        protected static byte[] DecodeHex(string val)
+        {
+            var chars = val.ToCharArray();
+            var numberChars = chars.Length;
+            var bytes = new byte[numberChars / 2];
+
+            for (var i = 0; i < numberChars; i += 2)
+            {
+                bytes[i / 2] = Convert.ToByte(new string(chars, i, 2), 16);
+            }
+
+            return bytes;
+        }
+
+        public static implicit operator string(ObjectId oid)
+        {
+            return oid == null ? null : oid.ToString();
+        }
+        public static implicit operator ObjectId(string oidString)
+        {
+            return new ObjectId(oidString);
+        }
+    }
+}
+
+namespace Metsys.Bson
+{
+    public interface IExpando
+    {
+        IDictionary<string, object> Expando { get; }
+    }
+}
+
+namespace Metsys.Bson
+{
+    internal class MagicProperty
+    {
+        private readonly PropertyInfo _property;
+        private readonly string _name;
+        private readonly bool _ignored;
+        public readonly bool _ignoredIfNull;
+
+        public Type Type
+        {
+            get { return _property.PropertyType; }
+        }
+        public string Name
+        {
+            get { return _name; }
+        }
+        public bool Ignored
+        {
+            get { return _ignored; }
+        }
+        public bool IgnoredIfNull
+        {
+            get { return _ignoredIfNull; }
+        }
+
+        public Action<object, object> Setter { get; private set; }
+
+        public Func<object, object> Getter { get; private set; }
+
+        public MagicProperty(PropertyInfo property, string name, bool ignored, bool ignoredIfNull)
+        {
+            _property = property;
+            _name = name;
+            _ignored = ignored;
+            _ignoredIfNull = ignoredIfNull;
+            Getter = CreateGetterMethod(property);
+            Setter = CreateSetterMethod(property);
+        }
+
+        private static Action<object, object> CreateSetterMethod(PropertyInfo property)
+        {
+            var genericHelper = typeof(MagicProperty).GetMethod("SetterMethod", BindingFlags.Static | BindingFlags.NonPublic);
+            var constructedHelper = genericHelper.MakeGenericMethod(property.DeclaringType, property.PropertyType);
+            return (Action<object, object>)constructedHelper.Invoke(null, new object[] { property });
+        }
+
+        private static Func<object, object> CreateGetterMethod(PropertyInfo property)
+        {
+            var genericHelper = typeof(MagicProperty).GetMethod("GetterMethod", BindingFlags.Static | BindingFlags.NonPublic);
+            var constructedHelper = genericHelper.MakeGenericMethod(property.DeclaringType, property.PropertyType);
+            return (Func<object, object>)constructedHelper.Invoke(null, new object[] { property });
+        }
+
+        //called via reflection       
+        private static Action<object, object> SetterMethod<TTarget, TParam>(PropertyInfo method) where TTarget : class
+        {
+            var m = method.GetSetMethod(true);
+            if (m == null) { return null; } //no setter
+            var func = (Action<TTarget, TParam>)Delegate.CreateDelegate(typeof(Action<TTarget, TParam>), m);
+            return (target, param) => func((TTarget)target, (TParam)param);
+        }
+
+        //called via reflection
+        private static Func<object, object> GetterMethod<TTarget, TParam>(PropertyInfo method) where TTarget : class
+        {
+            var m = method.GetGetMethod(true);
+            var func = (Func<TTarget, TParam>)Delegate.CreateDelegate(typeof(Func<TTarget, TParam>), m);
+            return target => func((TTarget)target);
+        }
+    }
+}
+
+namespace Metsys.Bson
+{
+    internal class TypeHelper
+    {
+        private static readonly IDictionary<Type, TypeHelper> _cachedTypeLookup = new Dictionary<Type, TypeHelper>();
+        private static readonly BsonConfiguration _configuration = BsonConfiguration.Instance;
+
+        private readonly IDictionary<string, MagicProperty> _properties;
+
+        private TypeHelper(Type type)
+        {
+            var properties = type.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.FlattenHierarchy);
+            _properties = LoadMagicProperties(type, properties);
+            if (typeof(IExpando).IsAssignableFrom(type))
+            {
+                Expando = _properties["Expando"];
+            }
+        }
+
+        public MagicProperty Expando { get; private set; }
+
+        public ICollection<MagicProperty> GetProperties()
+        {
+            return _properties.Values;
+        }
+
+        public MagicProperty FindProperty(string name)
+        {
+            return _properties.ContainsKey(name) ? _properties[name] : null;
+        }
+
+        public static TypeHelper GetHelperForType(Type type)
+        {
+            TypeHelper helper;
+            if (!_cachedTypeLookup.TryGetValue(type, out helper))
+            {
+                helper = new TypeHelper(type);
+                _cachedTypeLookup[type] = helper;
+            }
+            return helper;
+        }
+
+        public static string FindProperty(LambdaExpression lambdaExpression)
+        {
+            Expression expressionToCheck = lambdaExpression;
+
+            var done = false;
+            while (!done)
+            {
+                switch (expressionToCheck.NodeType)
+                {
+                    case ExpressionType.Convert:
+                        expressionToCheck = ((UnaryExpression)expressionToCheck).Operand;
+                        break;
+
+                    case ExpressionType.Lambda:
+                        expressionToCheck = ((LambdaExpression)expressionToCheck).Body;
+                        break;
+
+                    case ExpressionType.MemberAccess:
+                        var memberExpression = (MemberExpression)expressionToCheck;
+
+                        if (memberExpression.Expression.NodeType != ExpressionType.Parameter && memberExpression.Expression.NodeType != ExpressionType.Convert)
+                        {
+                            throw new ArgumentException(string.Format("Expression '{0}' must resolve to top-level member.", lambdaExpression), "lambdaExpression");
+                        }
+                        return memberExpression.Member.Name;
+                    default:
+                        done = true;
+                        break;
+                }
+            }
+
+            return null;
+        }
+
+        public static PropertyInfo FindProperty(Type type, string name)
+        {
+            return type.GetProperties().Where(p => p.Name == name).First();
+        }
+
+        private static IDictionary<string, MagicProperty> LoadMagicProperties(Type type, IEnumerable<PropertyInfo> properties)
+        {
+            var magic = new Dictionary<string, MagicProperty>(StringComparer.CurrentCultureIgnoreCase);
+            foreach (var property in properties)
+            {
+                if (property.GetIndexParameters().Length > 0)
+                {
+                    continue;
+                }
+                var name = _configuration.AliasFor(type, property.Name);
+                var ignored = _configuration.IsIgnored(type, property.Name);
+                var ignoredIfNull = _configuration.IsIgnoredIfNull(type, property.Name);
+                magic.Add(name, new MagicProperty(property, name, ignored, ignoredIfNull));
+            }
+            return magic;
+        }
+    }
+}
+
+namespace Metsys.Bson
+{
+    internal class ListWrapper : BaseWrapper
+    {
+        private IList _list;
+
+        public override object Collection
+        {
+            get { return _list; }
+        }
+        public override void Add(object value)
+        {
+            _list.Add(value);
+        }
+
+        protected override object CreateContainer(Type type, Type itemType)
+        {
+            if (type.IsInterface)
+            {
+                return Activator.CreateInstance(typeof(List<>).MakeGenericType(itemType));
+            }
+            if (type.GetConstructor(BindingFlags.Instance | BindingFlags.Public, null, new Type[0], null) != null)
+            {
+                return Activator.CreateInstance(type);
+            }
+            return null;
+        }
+        protected override void SetContainer(object container)
+        {
+            _list = container == null ? new ArrayList() : (IList)container;
+        }
+    }
+}
+
+namespace Metsys.Bson
+{
+    internal static class ListHelper
+    {
+        public static Type GetListItemType(Type enumerableType)
+        {
+            if (enumerableType.IsArray)
+            {
+                return enumerableType.GetElementType();
+            }
+            return enumerableType.IsGenericType ? enumerableType.GetGenericArguments()[0] : typeof(object);
+        }
+
+        public static Type GetDictionarKeyType(Type enumerableType)
+        {
+            return enumerableType.IsGenericType
+                ? enumerableType.GetGenericArguments()[0]
+                : typeof(object);
+        }
+
+        public static Type GetDictionarValueType(Type enumerableType)
+        {
+            return enumerableType.IsGenericType
+                ? enumerableType.GetGenericArguments()[1]
+                : typeof(object);
+        }
+
+        public static IDictionary CreateDictionary(Type dictionaryType, Type keyType, Type valueType)
+        {
+            if (dictionaryType.IsInterface)
+            {
+                return (IDictionary)Activator.CreateInstance(typeof(Dictionary<,>).MakeGenericType(keyType, valueType));
+            }
+
+            if (dictionaryType.GetConstructor(BindingFlags.Instance | BindingFlags.Public, null, new Type[0], null) != null)
+            {
+                return (IDictionary)Activator.CreateInstance(dictionaryType);
+            }
+
+            return new Dictionary<object, object>();
+        }
+    }
+}
+
+namespace Metsys.Bson
+{
+    internal class CollectionWrapper<T> : BaseWrapper
+    {
+        private ICollection<T> _list;
+
+        public override object Collection
+        {
+            get { return _list; }
+        }
+
+        public override void Add(object value)
+        {
+            _list.Add((T)value);
+        }
+
+        protected override object CreateContainer(Type type, Type itemType)
+        {
+            return Activator.CreateInstance(type);
+        }
+        protected override void SetContainer(object container)
+        {
+            _list = (ICollection<T>)container;
+        }
+    }
+}
+
+namespace Metsys.Bson
+{
+    internal abstract class BaseWrapper
+    {
+        public static BaseWrapper Create(Type type, Type itemType, object existingContainer)
+        {
+            var instance = CreateWrapperFromType(existingContainer == null ? type : existingContainer.GetType(), itemType);
+            instance.SetContainer(existingContainer ?? instance.CreateContainer(type, itemType));
+            return instance;
+        }
+
+        private static BaseWrapper CreateWrapperFromType(Type type, Type itemType)
+        {
+            if (type.IsArray)
+            {
+                return (BaseWrapper)Activator.CreateInstance(typeof(ArrayWrapper<>).MakeGenericType(itemType));
+            }
+
+            var isCollection = false;
+            var types = new List<Type>(type.GetInterfaces().Select(h => h.IsGenericType ? h.GetGenericTypeDefinition() : h));
+            types.Insert(0, type.IsGenericType ? type.GetGenericTypeDefinition() : type);
+            foreach (var @interface in types)
+            {
+                if (typeof(IList<>).IsAssignableFrom(@interface) || typeof(IList).IsAssignableFrom(@interface))
+                {
+                    return new ListWrapper();
+                }
+                if (typeof(ICollection<>).IsAssignableFrom(@interface))
+                {
+                    isCollection = true;
+                }
+            }
+            if (isCollection)
+            {
+                return (BaseWrapper)Activator.CreateInstance(typeof(CollectionWrapper<>).MakeGenericType(itemType));
+            }
+
+            //a last-ditch pass
+            foreach (var @interface in types)
+            {
+                if (typeof(IEnumerable<>).IsAssignableFrom(@interface) || typeof(IEnumerable).IsAssignableFrom(@interface))
+                {
+                    return new ListWrapper();
+                }
+            }
+            throw new BsonException(string.Format("Collection of type {0} cannot be deserialized", type.FullName));
+        }
+
+        public abstract void Add(object value);
+        public abstract object Collection { get; }
+
+        protected abstract object CreateContainer(Type type, Type itemType);
+        protected abstract void SetContainer(object container);
+    }
+}
+
+namespace Metsys.Bson
+{
+
+    internal class ArrayWrapper<T> : BaseWrapper
+    {
+        private readonly List<T> _list = new List<T>();
+
+        public override void Add(object value)
+        {
+            _list.Add((T)value);
+        }
+
+        protected override object CreateContainer(Type type, Type itemType)
+        {
+            return null;
+        }
+
+        protected override void SetContainer(object container)
+        {
+            if (container != null)
+            {
+                throw new BsonException("An container cannot exist when trying to deserialize an array");
+            }
+        }
+
+        public override object Collection
+        {
+            get
+            {
+                return _list.ToArray();
+            }
+        }
+    }
+}
+
+namespace Metsys.Bson
+{
+    public static class Helper
+    {
+        public static readonly DateTime Epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+    }
+}
+namespace Metsys.Bson
+{
+    internal class Document
+    {
+        public int Length;
+        public Document Parent;
+        public int Digested;
+    }
+}
+
+namespace Metsys.Bson
+{
+    internal class Deserializer
+    {
+        internal class Options
+        {
+            public bool LongIntegers { get; set; }
+            public bool StringDates { get; set; }
+        }
+
+        private readonly static IDictionary<Types, Type> _typeMap = new Dictionary<Types, Type>
+        {
+            {Types.Int32, typeof(int)},
+            {Types.Int64, typeof (long)},
+            {Types.Boolean, typeof (bool)},
+            {Types.String, typeof (string)},
+            {Types.Double, typeof(double)},
+            {Types.Binary, typeof (byte[])},
+            {Types.Regex, typeof (Regex)},
+            {Types.DateTime, typeof (DateTime)},
+            {Types.ObjectId, typeof(ObjectId)},
+            {Types.Array, typeof(List<object>)},
+            {Types.Object, typeof(Dictionary<string, object>)},
+            {Types.Null, null},
+        };
+        private readonly BinaryReader _reader;
+        private Document _current;
+
+        private Deserializer(BinaryReader reader)
+        {
+            _reader = reader;
+        }
+
+        public static T Deserialize<T>(byte[] objectData, Options options = null) where T : class
+        {
+            using (var ms = new MemoryStream())
+            {
+                ms.Write(objectData, 0, objectData.Length);
+                ms.Position = 0;
+                return Deserialize<T>(new BinaryReader(ms), options ?? new Options());
+            }
+        }
+
+        private static T Deserialize<T>(BinaryReader stream, Options options)
+        {
+            return new Deserializer(stream).Read<T>(options);
+        }
+
+        private T Read<T>(Options options)
+        {
+            NewDocument(_reader.ReadInt32());
+            var @object = (T)DeserializeValue(typeof(T), Types.Object, options);
+            return @object;
+        }
+
+        public static object Deserialize(BinaryReader stream, Type t, Options options = null)
+        {
+            return new Deserializer(stream).Read(t, options ?? new Options());
+        }
+
+        object Read(Type t, Options options)
+        {
+            NewDocument(_reader.ReadInt32());
+            return DeserializeValue(t, Types.Object, options);
+        }
+
+        private void Read(int read)
+        {
+            _current.Digested += read;
+        }
+
+        private bool IsDone()
+        {
+            var isDone = _current.Digested + 1 == _current.Length;
+            if (isDone)
+            {
+                _reader.ReadByte(); // EOO
+                var old = _current;
+                _current = old.Parent;
+                if (_current != null) { Read(old.Length); }
+            }
+            return isDone;
+        }
+
+        private void NewDocument(int length)
+        {
+            var old = _current;
+            _current = new Document { Length = length, Parent = old, Digested = 4 };
+        }
+
+        private object DeserializeValue(Type type, Types storedType, Options options)
+        {
+            return DeserializeValue(type, storedType, null, options);
+        }
+
+        private object DeserializeValue(Type type, Types storedType, object container, Options options)
+        {
+            if (storedType == Types.Null)
+            {
+                return null;
+            }
+            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
+            {
+                type = Nullable.GetUnderlyingType(type);
+            }
+            if (type == typeof(string))
+            {
+                return ReadString();
+            }
+            if (type == typeof(int))
+            {
+                var val = ReadInt(storedType);
+                return options.LongIntegers ? (object)(long)val : (object)val;
+            }
+            if (type.IsEnum)
+            {
+                return ReadEnum(type, storedType);
+            }
+            if (type == typeof(float))
+            {
+                Read(8);
+                return (float)_reader.ReadDouble();
+            }
+            if (storedType == Types.Binary)
+            {
+                return ReadBinary();
+            }
+            if (typeof(IEnumerable).IsAssignableFrom(type))
+            {
+                return ReadList(type, container, options);
+            }
+            if (type == typeof(bool))
+            {
+                Read(1);
+                return _reader.ReadBoolean();
+            }
+            if (type == typeof(DateTime))
+            {
+                var value = Helper.Epoch.AddMilliseconds(ReadLong(Types.Int64));
+                return options.StringDates ? value.ToString("s", System.Globalization.CultureInfo.InvariantCulture) : (object)value;
+            }
+            if (type == typeof(ObjectId))
+            {
+                Read(12);
+                return new ObjectId(_reader.ReadBytes(12));
+            }
+            if (type == typeof(long))
+            {
+                return ReadLong(storedType);
+            }
+            if (type == typeof(double))
+            {
+                Read(8);
+                return _reader.ReadDouble();
+            }
+            if (type == typeof(Regex))
+            {
+                return ReadRegularExpression();
+            }
+            if (type == typeof(ScopedCode))
+            {
+                return ReadScopedCode(options);
+            }
+            return ReadObject(type, options);
+        }
+
+        private object ReadObject(Type type, Options options)
+        {
+            var instance = Activator.CreateInstance(type, true);
+            var typeHelper = TypeHelper.GetHelperForType(type);
+            while (true)
+            {
+                var storageType = ReadType();
+                var name = ReadName();
+                var isNull = false;
+                if (storageType == Types.Object)
+                {
+                    var length = _reader.ReadInt32();
+                    if (length == 5)
+                    {
+                        _reader.ReadByte(); //eoo
+                        Read(5);
+                        isNull = true;
+                    }
+                    else
+                    {
+                        NewDocument(length);
+                    }
+                }
+                object container = null;
+                var property = typeHelper.FindProperty(name);
+                var propertyType = property != null ? property.Type : _typeMap.ContainsKey(storageType) ? _typeMap[storageType] : typeof(object);
+                if (property == null && typeHelper.Expando == null)
+                {
+                    throw new BsonException(string.Format("Deserialization failed: type {0} does not have a property named {1}", type.FullName, name));
+                }
+                if (property != null && property.Setter == null)
+                {
+                    container = property.Getter(instance);
+                }
+                var value = isNull ? null : DeserializeValue(propertyType, storageType, container, options);
+                if (property == null)
+                {
+                    ((IDictionary<string, object>)typeHelper.Expando.Getter(instance))[name] = value;
+                }
+                else if (container == null && value != null && !property.Ignored)
+                {
+                    property.Setter(instance, value);
+                }
+                if (IsDone())
+                {
+                    break;
+                }
+            }
+            return instance;
+        }
+
+        private object ReadList(Type listType, object existingContainer, Options options)
+        {
+            if (IsDictionary(listType))
+            {
+                return ReadDictionary(listType, existingContainer, options);
+            }
+
+            NewDocument(_reader.ReadInt32());
+            var itemType = ListHelper.GetListItemType(listType);
+            var isObject = typeof(object) == itemType;
+            var wrapper = BaseWrapper.Create(listType, itemType, existingContainer);
+
+            while (!IsDone())
+            {
+                var storageType = ReadType();
+                ReadName();
+                if (storageType == Types.Object)
+                {
+                    NewDocument(_reader.ReadInt32());
+                }
+                var specificItemType = isObject ? _typeMap[storageType] : itemType;
+                var value = DeserializeValue(specificItemType, storageType, options);
+                wrapper.Add(value);
+            }
+            return wrapper.Collection;
+        }
+
+        private static bool IsDictionary(Type type)
+        {
+            var types = new List<Type>(type.GetInterfaces());
+            types.Insert(0, type);
+            foreach (var interfaceType in types)
+            {
+                if (interfaceType.IsGenericType && interfaceType.GetGenericTypeDefinition() == typeof(IDictionary<,>))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        private object ReadDictionary(Type listType, object existingContainer, Options options)
+        {
+            var valueType = ListHelper.GetDictionarValueType(listType);
+            var isObject = typeof(object) == valueType;
+            var container = existingContainer == null ? ListHelper.CreateDictionary(listType, ListHelper.GetDictionarKeyType(listType), valueType) : (IDictionary)existingContainer;
+
+            while (!IsDone())
+            {
+                var storageType = ReadType();
+
+                var key = ReadName();
+                if (storageType == Types.Object)
+                {
+                    NewDocument(_reader.ReadInt32());
+                }
+                var specificItemType = isObject ? _typeMap[storageType] : valueType;
+                var value = DeserializeValue(specificItemType, storageType, options);
+                container.Add(key, value);
+            }
+            return container;
+        }
+
+        private object ReadBinary()
+        {
+            var length = _reader.ReadInt32();
+            var subType = _reader.ReadByte();
+            Read(5 + length);
+            if (subType == 2)
+            {
+                return _reader.ReadBytes(_reader.ReadInt32());
+            }
+            if (subType == 3)
+            {
+                return new Guid(_reader.ReadBytes(length));
+            }
+            throw new BsonException("No support for binary type: " + subType);
+        }
+
+        private string ReadName()
+        {
+            var buffer = new List<byte>(128); //todo: use a pool to prevent fragmentation
+            byte b;
+            while ((b = _reader.ReadByte()) > 0)
+            {
+                buffer.Add(b);
+            }
+            Read(buffer.Count + 1);
+            return Encoding.UTF8.GetString(buffer.ToArray());
+        }
+
+        private string ReadString()
+        {
+            var length = _reader.ReadInt32();
+            var buffer = _reader.ReadBytes(length - 1); //todo: again, look at fragementation prevention
+            _reader.ReadByte(); //null;
+            Read(4 + length);
+
+            return Encoding.UTF8.GetString(buffer);
+        }
+
+        private int ReadInt(Types storedType)
+        {
+            switch (storedType)
+            {
+                case Types.Int32:
+                    Read(4);
+                    return _reader.ReadInt32();
+                case Types.Int64:
+                    Read(8);
+                    return (int)_reader.ReadInt64();
+                case Types.Double:
+                    Read(8);
+                    return (int)_reader.ReadDouble();
+                default:
+                    throw new BsonException("Could not create an int from " + storedType);
+            }
+        }
+
+        private long ReadLong(Types storedType)
+        {
+            switch (storedType)
+            {
+                case Types.Int32:
+                    Read(4);
+                    return _reader.ReadInt32();
+                case Types.Int64:
+                    Read(8);
+                    return _reader.ReadInt64();
+                case Types.Double:
+                    Read(8);
+                    return (long)_reader.ReadDouble();
+                default:
+                    throw new BsonException("Could not create an int64 from " + storedType);
+            }
+        }
+
+        private object ReadEnum(Type type, Types storedType)
+        {
+            if (storedType == Types.Int64)
+            {
+                return Enum.Parse(type, ReadLong(storedType).ToString(), false);
+            }
+            return Enum.Parse(type, ReadInt(storedType).ToString(), false);
+        }
+
+        private object ReadRegularExpression()
+        {
+            var pattern = ReadName();
+            var optionsString = ReadName();
+
+            var options = RegexOptions.None;
+            if (optionsString.Contains("e")) options = options | RegexOptions.ECMAScript;
+            if (optionsString.Contains("i")) options = options | RegexOptions.IgnoreCase;
+            if (optionsString.Contains("l")) options = options | RegexOptions.CultureInvariant;
+            if (optionsString.Contains("m")) options = options | RegexOptions.Multiline;
+            if (optionsString.Contains("s")) options = options | RegexOptions.Singleline;
+            if (optionsString.Contains("w")) options = options | RegexOptions.IgnorePatternWhitespace;
+            if (optionsString.Contains("x")) options = options | RegexOptions.ExplicitCapture;
+
+            return new Regex(pattern, options);
+        }
+
+        private Types ReadType()
+        {
+            Read(1);
+            return (Types)_reader.ReadByte();
+        }
+
+        private ScopedCode ReadScopedCode(Options options)
+        {
+            _reader.ReadInt32(); //length
+            Read(4);
+            var name = ReadString();
+            NewDocument(_reader.ReadInt32());
+            return new ScopedCode { CodeString = name, Scope = DeserializeValue(typeof(object), Types.Object, options) };
+        }
+    }
+}
+
+namespace Metsys.Bson.Configuration
+{
+    public interface ITypeConfiguration<T>
+    {
+        ITypeConfiguration<T> UseAlias(Expression<Func<T, object>> expression, string alias);
+        ITypeConfiguration<T> Ignore(Expression<Func<T, object>> expression);
+        ITypeConfiguration<T> Ignore(string name);
+        ITypeConfiguration<T> IgnoreIfNull(Expression<Func<T, object>> expression);
+    }
+
+    internal class TypeConfiguration<T> : ITypeConfiguration<T>
+    {
+        private readonly BsonConfiguration _configuration;
+
+        internal TypeConfiguration(BsonConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public ITypeConfiguration<T> UseAlias(Expression<Func<T, object>> expression, string alias)
+        {
+            var member = expression.GetMemberExpression();
+            _configuration.AddMap<T>(member.GetName(), alias);
+            return this;
+        }
+
+        public ITypeConfiguration<T> Ignore(Expression<Func<T, object>> expression)
+        {
+            var member = expression.GetMemberExpression();
+            return Ignore(member.GetName());
+        }
+
+        public ITypeConfiguration<T> Ignore(string name)
+        {
+            _configuration.AddIgnore<T>(name);
+            return this;
+        }
+
+        public ITypeConfiguration<T> IgnoreIfNull(Expression<Func<T, object>> expression)
+        {
+            var member = expression.GetMemberExpression();
+            _configuration.AddIgnoreIfNull<T>(member.GetName());
+            return this;
+        }
+    }
+}
+
+namespace Metsys.Bson.Configuration
+{
+    public static class ExpressionHelper
+    {
+        public static string GetName(this MemberExpression expression)
+        {
+            return new ExpressionNameVisitor().Visit(expression);
+        }
+
+        public static MemberExpression GetMemberExpression<T, TValue>(this Expression<Func<T, TValue>> expression)
+        {
+            if (expression == null)
+            {
+                return null;
+            }
+            if (expression.Body is MemberExpression)
+            {
+                return (MemberExpression)expression.Body;
+            }
+            if (expression.Body is UnaryExpression)
+            {
+                var operand = ((UnaryExpression)expression.Body).Operand;
+                if (operand is MemberExpression)
+                {
+                    return (MemberExpression)operand;
+                }
+                if (operand is MethodCallExpression)
+                {
+                    return ((MethodCallExpression)operand).Object as MemberExpression;
+                }
+            }
+            return null;
+        }
+
+        private class ExpressionNameVisitor
+        {
+            public string Visit(Expression expression)
+            {
+                if (expression is UnaryExpression)
+                {
+                    expression = ((UnaryExpression)expression).Operand;
+                }
+                if (expression is MethodCallExpression)
+                {
+                    return Visit((MethodCallExpression)expression);
+                }
+                if (expression is MemberExpression)
+                {
+                    return Visit((MemberExpression)expression);
+                }
+                if (expression is BinaryExpression && expression.NodeType == ExpressionType.ArrayIndex)
+                {
+                    return Visit((BinaryExpression)expression);
+                }
+                return null;
+            }
+
+            private string Visit(BinaryExpression expression)
+            {
+                string result = null;
+                if (expression.Left is MemberExpression)
+                {
+                    result = Visit((MemberExpression)expression.Left);
+                }
+                var index = Expression.Lambda(expression.Right).Compile().DynamicInvoke();
+                return result + string.Format("[{0}]", index);
+            }
+
+            private string Visit(MemberExpression expression)
+            {
+                var name = expression.Member.Name;
+                var ancestorName = Visit(expression.Expression);
+                if (ancestorName != null)
+                {
+                    name = ancestorName + "." + name;
+                }
+                return name;
+            }
+
+            private string Visit(MethodCallExpression expression)
+            {
+                string name = null;
+                if (expression.Object is MemberExpression)
+                {
+                    name = Visit((MemberExpression)expression.Object);
+                }
+
+                //TODO: Is there a more certain way to determine if this is an indexed property?
+                if (expression.Method.Name == "get_Item" && expression.Arguments.Count == 1)
+                {
+                    var index = Expression.Lambda(expression.Arguments[0]).Compile().DynamicInvoke();
+                    name += string.Format("[{0}]", index);
+                }
+                return name;
+            }
+        }
+    }
+}
+
+namespace Metsys.Bson.Configuration
+{
+
+    internal class BsonConfiguration
+    {
+        private readonly IDictionary<Type, IDictionary<string, string>> _aliasMap = new Dictionary<Type, IDictionary<string, string>>();
+        private readonly IDictionary<Type, HashSet<string>> _ignored = new Dictionary<Type, HashSet<string>>();
+        private readonly IDictionary<Type, HashSet<string>> _ignoredIfNull = new Dictionary<Type, HashSet<string>>();
+
+        //not thread safe
+        private static BsonConfiguration _instance;
+        internal static BsonConfiguration Instance
+        {
+            get
+            {
+                if (_instance == null) { _instance = new BsonConfiguration(); }
+                return _instance;
+            }
+        }
+
+        private BsonConfiguration() { }
+
+        public static void ForType<T>(Action<ITypeConfiguration<T>> action)
+        {
+            action(new TypeConfiguration<T>(Instance));
+        }
+
+        internal void AddMap<T>(string property, string alias)
+        {
+            var type = typeof(T);
+            if (!_aliasMap.ContainsKey(type))
+            {
+                _aliasMap[type] = new Dictionary<string, string>();
+            }
+            _aliasMap[type][property] = alias;
+        }
+        internal string AliasFor(Type type, string property)
+        {
+            IDictionary<string, string> map;
+            if (!_aliasMap.TryGetValue(type, out map))
+            {
+                return property;
+            }
+            return map.ContainsKey(property) ? map[property] : property;
+        }
+
+        public void AddIgnore<T>(string name)
+        {
+            var type = typeof(T);
+            if (!_ignored.ContainsKey(type))
+            {
+                _ignored[type] = new HashSet<string>();
+            }
+            _ignored[type].Add(name);
+        }
+        public bool IsIgnored(Type type, string name)
+        {
+            HashSet<string> list;
+            return _ignored.TryGetValue(type, out list) && list.Contains(name);
+        }
+
+        public void AddIgnoreIfNull<T>(string name)
+        {
+            var type = typeof(T);
+            if (!_ignoredIfNull.ContainsKey(type))
+            {
+                _ignoredIfNull[type] = new HashSet<string>();
+            }
+            _ignoredIfNull[type].Add(name);
+        }
+        public bool IsIgnoredIfNull(Type type, string name)
+        {
+            HashSet<string> list;
+            return _ignoredIfNull.TryGetValue(type, out list) && list.Contains(name);
+        }
+    }
+}
+namespace Metsys.Bson
+{
+
+    internal class BsonException : Exception
+    {
+        public BsonException() { }
+        public BsonException(string message) : base(message) { }
+        public BsonException(string message, Exception innerException) : base(message, innerException) { }
+        protected BsonException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+    }
+}

From db8cd568ac4ca94a1a973408caa3d6ef5d7477c5 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 11 Oct 2017 13:30:30 +0100
Subject: [PATCH 067/482] [Scrollbar] Simplify the thumb height / thumb width
 logic.

---
 src/Avalonia.Controls/Primitives/Track.cs | 24 +++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/Track.cs b/src/Avalonia.Controls/Primitives/Track.cs
index ce768fe58d..f98ceab23f 100644
--- a/src/Avalonia.Controls/Primitives/Track.cs
+++ b/src/Avalonia.Controls/Primitives/Track.cs
@@ -128,7 +128,17 @@ namespace Avalonia.Controls.Primitives
 
             if (Orientation == Orientation.Horizontal)
             {
-                var thumbWidth = double.IsNaN(viewportSize) ? thumb?.DesiredSize.Width ?? 0 : finalSize.Width * viewportSize / extent;
+                double thumbWidth = 0;
+
+                if (double.IsNaN(viewportSize))
+                {
+                    thumbWidth = thumb?.DesiredSize.Width ?? 0;
+                }
+                else if (extent > 0)
+                {
+                    thumbWidth = finalSize.Width * viewportSize / extent;
+                }
+
                 var remaining = finalSize.Width - thumbWidth;
                 var firstWidth = range <= 0 ? 0 : remaining * offset / range;
 
@@ -152,7 +162,17 @@ namespace Avalonia.Controls.Primitives
             }
             else
             {
-                var thumbHeight = double.IsNaN(viewportSize) ? thumb?.DesiredSize.Height ?? 0 : finalSize.Height * viewportSize / extent;
+                double thumbHeight = 0;
+
+                if (double.IsNaN(viewportSize))
+                {
+                    thumbHeight = thumb?.DesiredSize.Height ?? 0;
+                }
+                else if (extent > 0)
+                {
+                    thumbHeight = finalSize.Height * viewportSize / extent;
+                }
+
                 var remaining = finalSize.Height - thumbHeight;
                 var firstHeight = range <= 0 ? 0 : remaining * offset / range;
 

From eee063455d54350e0ccb38e8a58319e4593c51fa Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 11 Oct 2017 13:31:24 +0100
Subject: [PATCH 068/482] [Track] remove redundant IsNaN check.

---
 src/Avalonia.Controls/Primitives/Track.cs | 34 ++++++++++-------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/Track.cs b/src/Avalonia.Controls/Primitives/Track.cs
index f98ceab23f..8c577665d5 100644
--- a/src/Avalonia.Controls/Primitives/Track.cs
+++ b/src/Avalonia.Controls/Primitives/Track.cs
@@ -147,17 +147,14 @@ namespace Avalonia.Controls.Primitives
                     decreaseButton.Arrange(new Rect(0, 0, firstWidth, finalSize.Height));
                 }
 
-                if (!double.IsNaN(thumbWidth))
+                if (thumb != null)
                 {
-                    if (thumb != null)
-                    {
-                        thumb.Arrange(new Rect(firstWidth, 0, thumbWidth, finalSize.Height));
-                    }
-
-                    if (increaseButton != null)
-                    {
-                        increaseButton.Arrange(new Rect(firstWidth + thumbWidth, 0, remaining - firstWidth, finalSize.Height));
-                    }
+                    thumb.Arrange(new Rect(firstWidth, 0, thumbWidth, finalSize.Height));
+                }
+
+                if (increaseButton != null)
+                {
+                    increaseButton.Arrange(new Rect(firstWidth + thumbWidth, 0, remaining - firstWidth, finalSize.Height));
                 }
             }
             else
@@ -181,17 +178,14 @@ namespace Avalonia.Controls.Primitives
                     decreaseButton.Arrange(new Rect(0, 0, finalSize.Width, firstHeight));
                 }
 
-                if (!double.IsNaN(thumbHeight))
+                if (thumb != null)
+                {
+                    thumb.Arrange(new Rect(0, firstHeight, finalSize.Width, thumbHeight));
+                }
+
+                if (increaseButton != null)
                 {
-                    if (thumb != null)
-                    {
-                        thumb.Arrange(new Rect(0, firstHeight, finalSize.Width, thumbHeight));
-                    }
-
-                    if (increaseButton != null)
-                    {
-                        increaseButton.Arrange(new Rect(0, firstHeight + thumbHeight, finalSize.Width, Math.Max(remaining - firstHeight, 0)));
-                    }
+                    increaseButton.Arrange(new Rect(0, firstHeight + thumbHeight, finalSize.Width, Math.Max(remaining - firstHeight, 0)));
                 }
             }
 

From 1ba432c0f9f1eaa46b159ee91606360fab1f1587 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 11 Oct 2017 16:43:22 +0300
Subject: [PATCH 069/482] Use old SDK for
 Avalonia.Designer.HostApp.NetFX.csproj

---
 packages.cake                                 |   2 +-
 .../Avalonia.Designer.HostApp.NetFX.csproj    | 125 +++++++++++++++---
 2 files changed, 105 insertions(+), 22 deletions(-)

diff --git a/packages.cake b/packages.cake
index 98aa08bb50..deb8eaf3d5 100644
--- a/packages.cake
+++ b/packages.cake
@@ -229,7 +229,7 @@ public class Packages
                 Target = "tools/netcoreapp2.0/previewer"
             },
             new NuSpecContent{
-                Source = ((FilePath)context.File("./src/tools/Avalonia.Designer.HostApp.NetFx/bin/" + parameters.DirSuffix + "/net461/Avalonia.Designer.HostApp.NetFx.exe")).FullPath, 
+                Source = ((FilePath)context.File("./src/tools/Avalonia.Designer.HostApp.NetFx/bin/" + parameters.DirSuffix + "/Avalonia.Designer.HostApp.exe")).FullPath, 
                 Target = "tools/net461/previewer"
             }
         };
diff --git a/src/tools/Avalonia.Designer.HostApp.NetFX/Avalonia.Designer.HostApp.NetFX.csproj b/src/tools/Avalonia.Designer.HostApp.NetFX/Avalonia.Designer.HostApp.NetFX.csproj
index cb4ce3f301..c18cee8d08 100644
--- a/src/tools/Avalonia.Designer.HostApp.NetFX/Avalonia.Designer.HostApp.NetFX.csproj
+++ b/src/tools/Avalonia.Designer.HostApp.NetFX/Avalonia.Designer.HostApp.NetFX.csproj
@@ -1,28 +1,111 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net461</TargetFrameworks>
-      
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{4ADA61C8-D191-428D-9066-EF4F0D86520F}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Avalonia.Designer.HostApp</RootNamespace>
+    <AssemblyName>Avalonia.Designer.HostApp</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject />
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj" />
-    <ProjectReference Include="..\..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
-    <ProjectReference Include="..\..\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
-    <ProjectReference Include="..\..\Avalonia.HtmlRenderer\Avalonia.HtmlRenderer.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
-    <ProjectReference Include="..\..\..\samples\ControlCatalog.Desktop\ControlCatalog.Desktop.csproj" />
+    <Compile Include="Program.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\" />
+    <ProjectReference Include="..\..\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj">
+      <Project>{799a7bb5-3c2c-48b6-85a7-406a12c420da}</Project>
+      <Name>Avalonia.DesignerSupport</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Avalonia.DotNetFrameworkRuntime\Avalonia.DotNetFrameworkRuntime.csproj">
+      <Project>{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}</Project>
+      <Name>Avalonia.DotNetFrameworkRuntime</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj">
+      <Project>{3E53A01A-B331-47F3-B828-4A5717E77A24}</Project>
+      <Name>Avalonia.Markup.Xaml</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Markup\Avalonia.Markup\Avalonia.Markup.csproj">
+      <Project>{6417E941-21BC-467B-A771-0DE389353CE6}</Project>
+      <Name>Avalonia.Markup</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj">
+      <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
+      <Name>Avalonia.Animation</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj">
+      <Project>{B09B78D8-9B26-48B0-9149-D64A2F120F3F}</Project>
+      <Name>Avalonia.Base</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj">
+      <Project>{D2221C82-4A25-4583-9B43-D791E3F6820C}</Project>
+      <Name>Avalonia.Controls</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj">
+      <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
+      <Name>Avalonia.Input</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj">
+      <Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
+      <Name>Avalonia.Interactivity</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj">
+      <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
+      <Name>Avalonia.Layout</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Avalonia.Logging.Serilog\Avalonia.Logging.Serilog.csproj">
+      <Project>{B61B66A3-B82D-4875-8001-89D3394FE0C9}</Project>
+      <Name>Avalonia.Logging.Serilog</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj">
+      <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
+      <Name>Avalonia.Visuals</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj">
+      <Project>{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}</Project>
+      <Name>Avalonia.Styling</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj">
+      <Project>{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}</Project>
+      <Name>Avalonia.Themes.Default</Name>
+    </ProjectReference>
   </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

From a3937812ab4aa742cddec764e33b7e99e2508de6 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 11 Oct 2017 16:44:00 +0300
Subject: [PATCH 070/482] [REMOTE] Renamed private class to avoid confusion

---
 src/Avalonia.Controls/Remote/RemoteServer.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/Remote/RemoteServer.cs b/src/Avalonia.Controls/Remote/RemoteServer.cs
index 86f8318e15..9c0f3464a5 100644
--- a/src/Avalonia.Controls/Remote/RemoteServer.cs
+++ b/src/Avalonia.Controls/Remote/RemoteServer.cs
@@ -14,9 +14,9 @@ namespace Avalonia.Controls.Remote
     {
         private EmbeddableControlRoot _topLevel;
 
-        class TopLevelImpl : RemoteServerTopLevelImpl, IEmbeddableWindowImpl
+        class EmbeddableRemoteServerTopLevelImpl : RemoteServerTopLevelImpl, IEmbeddableWindowImpl
         {
-            public TopLevelImpl(IAvaloniaRemoteTransportConnection transport) : base(transport)
+            public EmbeddableRemoteServerTopLevelImpl(IAvaloniaRemoteTransportConnection transport) : base(transport)
             {
             }
 #pragma warning disable 67
@@ -26,7 +26,7 @@ namespace Avalonia.Controls.Remote
         
         public RemoteServer(IAvaloniaRemoteTransportConnection transport)
         {
-            _topLevel = new EmbeddableControlRoot(new TopLevelImpl(transport));
+            _topLevel = new EmbeddableControlRoot(new EmbeddableRemoteServerTopLevelImpl(transport));
             _topLevel.Prepare();
             //TODO: Somehow react on closed connection?
         }

From cde1e232056cd7c82fdb53640c2cd3f1c617f1ef Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 11 Oct 2017 17:29:25 +0300
Subject: [PATCH 071/482] Added Avalonia.Remote.Protocol package

---
 packages.cake | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages.cake b/packages.cake
index deb8eaf3d5..98075ef36b 100644
--- a/packages.cake
+++ b/packages.cake
@@ -248,6 +248,7 @@ public class Packages
                     new NuSpecDependency() { Id = "Splat", Version = SplatVersion },
                     new NuSpecDependency() { Id = "Sprache", Version = SpracheVersion },
                     new NuSpecDependency() { Id = "System.Reactive", Version = SystemReactiveVersion },
+                    new NuSpecDependency() { Id = "Avalonia.Remote.Protocol", Version = parameters.Version },
                     //.NET Core
                     new NuSpecDependency() { Id = "System.Threading.ThreadPool", TargetFramework = "netcoreapp2.0", Version = "4.3.0" },
                     new NuSpecDependency() { Id = "Microsoft.Extensions.DependencyModel", TargetFramework = "netcoreapp2.0", Version = "1.1.0" },
@@ -256,6 +257,7 @@ public class Packages
                     new NuSpecDependency() { Id = "Serilog", TargetFramework = "netcoreapp2.0", Version = SerilogVersion },
                     new NuSpecDependency() { Id = "Sprache", TargetFramework = "netcoreapp2.0", Version = SpracheVersion },
                     new NuSpecDependency() { Id = "System.Reactive", TargetFramework = "netcoreapp2.0", Version = SystemReactiveVersion },
+                    new NuSpecDependency() { Id = "Avalonia.Remote.Protocol", TargetFramework = "netcoreapp2.0", Version = parameters.Version },
                 }
                 .Deps(new string[]{null, "netcoreapp2.0"},
                     "System.ValueTuple", "System.ComponentModel.TypeConverter", "System.ComponentModel.Primitives",
@@ -303,6 +305,19 @@ public class Packages
                 BasePath = context.Directory("./src/Avalonia.ReactiveUI/bin/" + parameters.DirSuffix + "/netstandard2.0"),
                 OutputDirectory = parameters.NugetRoot
             },
+            ///////////////////////////////////////////////////////////////////////////////
+            // Avalonia.Remote.Protocol
+            ///////////////////////////////////////////////////////////////////////////////
+            new NuGetPackSettings()
+            {
+                Id = "Avalonia.Remote.Protocol",
+                Files = new []
+                {
+                    new NuSpecContent { Source = "Avalonia.Remote.Protocol.dll", Target = "lib/netstandard2.0" }
+                },
+                BasePath = context.Directory("./src/Avalonia.Remote.Protocol/bin/" + parameters.DirSuffix + "/netstandard2.0"),
+                OutputDirectory = parameters.NugetRoot
+            },
         };
 
         var nuspecNuGetSettingsMobile = new []

From a899892d96054bcaa99d304eff816fe4987a137b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 12 Oct 2017 09:23:42 +0200
Subject: [PATCH 072/482] Ignore RemoteTest.

---
 .ncrunch/RemoteTest.v3.ncrunchproject | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .ncrunch/RemoteTest.v3.ncrunchproject

diff --git a/.ncrunch/RemoteTest.v3.ncrunchproject b/.ncrunch/RemoteTest.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/RemoteTest.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file

From 815d3f719ebbdb2e443e08ced24295e44dea73de Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 12 Oct 2017 09:42:24 +0200
Subject: [PATCH 073/482] Report correct root in logical tree attach/detach.

Fixes #1192.
---
 src/Avalonia.Controls/Control.cs              |  6 +--
 .../ControlTests.cs                           | 41 ++++++++++++++++++-
 .../ContentPresenterTests_Standalone.cs       |  4 ++
 3 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index f3705c9127..7434bd6cc1 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -773,11 +773,9 @@ namespace Avalonia.Controls
         {
             while (e != null)
             {
-                var root = e as IStyleRoot;
-
-                if (root != null && root.StylingParent == null)
+                if (e is IRenderRoot root)
                 {
-                    return root;
+                    return root as IStyleRoot;
                 }
 
                 e = e.StylingParent;
diff --git a/tests/Avalonia.Controls.UnitTests/ControlTests.cs b/tests/Avalonia.Controls.UnitTests/ControlTests.cs
index 605406518d..b7e2cbeca9 100644
--- a/tests/Avalonia.Controls.UnitTests/ControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ControlTests.cs
@@ -123,7 +123,26 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void DetachedToLogicalParent_Should_Be_Called_When_Removed_From_Tree()
+        public void AttachedToLogicalParent_Should_Not_Be_Called_With_GlobalStyles_As_Root()
+        {
+            var globalStyles = Mock.Of<IGlobalStyles>();
+            var root = new TestRoot { StylingParent = globalStyles };
+            var child = new Border();
+            var raised = false;
+
+            child.AttachedToLogicalTree += (s, e) =>
+            {
+                Assert.Equal(root, e.Root);
+                raised = true;
+            };
+
+            root.Child = child;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void DetachedFromLogicalParent_Should_Be_Called_When_Removed_From_Tree()
         {
             var root = new TestRoot();
             var parent = new Border();
@@ -148,6 +167,26 @@ namespace Avalonia.Controls.UnitTests
             Assert.True(grandchildRaised);
         }
 
+        [Fact]
+        public void DetachedFromLogicalParent_Should_Not_Be_Called_With_GlobalStyles_As_Root()
+        {
+            var globalStyles = Mock.Of<IGlobalStyles>();
+            var root = new TestRoot { StylingParent = globalStyles };
+            var child = new Border();
+            var raised = false;
+
+            child.DetachedFromLogicalTree += (s, e) =>
+            {
+                Assert.Equal(root, e.Root);
+                raised = true;
+            };
+
+            root.Child = child;
+            root.Child = null;
+
+            Assert.True(raised);
+        }
+
         [Fact]
         public void Adding_Tree_To_IStyleRoot_Should_Style_Controls()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
index 032928d673..027e162877 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
@@ -12,6 +12,7 @@ using Moq;
 using System;
 using System.Linq;
 using Xunit;
+using Avalonia.Rendering;
 
 namespace Avalonia.Controls.UnitTests.Presenters
 {
@@ -56,6 +57,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
             var parentMock = new Mock<Control>();
             parentMock.As<IContentPresenterHost>();
+            parentMock.As<IRenderRoot>();
             parentMock.As<IStyleRoot>();
 
             (target as ISetLogicalParent).SetParent(parentMock.Object);
@@ -100,6 +102,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
             };
 
             var parentMock = new Mock<Control>();
+            parentMock.As<IRenderRoot>();
             parentMock.As<IStyleRoot>();
             parentMock.As<ILogical>().SetupGet(l => l.IsAttachedToLogicalTree).Returns(true);
 
@@ -144,6 +147,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
             var parentMock = new Mock<Control>();
             parentMock.As<IContentPresenterHost>();
+            parentMock.As<IRenderRoot>();
             parentMock.As<IStyleRoot>();
 
             (target as ISetLogicalParent).SetParent(parentMock.Object);

From d1eb0512bbffdec59b7c4664311693f057f29912 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 12 Oct 2017 14:23:45 +0200
Subject: [PATCH 074/482] Added failing test for #1171.

---
 .../Rendering/SceneGraph/SceneBuilderTests.cs | 54 +++++++++++++++++--
 1 file changed, 51 insertions(+), 3 deletions(-)

diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
index c51e8941a9..d0f7671956 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
@@ -143,13 +143,61 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
 
                 var borderNode = scene.FindNode(border);
                 Assert.Equal(new Rect(50, 50, 50, 50), borderNode.ClipBounds);
+            }
+        }
+
+        [Fact]
+        public void Should_Update_Descendent_ClipBounds_When_Margin_Changed()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Border border;
+                Canvas canvas;
+                var tree = new TestRoot
+                {
+                    Width = 200,
+                    Height = 300,
+                    Child = canvas = new Canvas
+                    {
+                        ClipToBounds = true,
+                        Width = 100,
+                        Height = 100,
+                        HorizontalAlignment = HorizontalAlignment.Left,
+                        VerticalAlignment = VerticalAlignment.Top,
+                        Children =
+                        {
+                            (border = new Border
+                            {
+                                Background = Brushes.AliceBlue,
+                                Width = 100,
+                                Height = 100,
+                                [Canvas.LeftProperty] = 50,
+                                [Canvas.TopProperty] = 50,
+                            })
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
 
-                // Initial ClipBounds are correct, make sure they're still correct after updating border.
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var borderNode = scene.FindNode(border);
+                Assert.Equal(new Rect(50, 50, 50, 50), borderNode.ClipBounds);
+
+                canvas.Width = canvas.Height = 125;
+                canvas.Measure(Size.Infinity);
+                canvas.Arrange(new Rect(tree.DesiredSize));
+
+                // Initial ClipBounds are correct, make sure they're still correct after updating canvas.
                 scene = scene.Clone();
-                Assert.True(sceneBuilder.Update(scene, border));
+                Assert.True(sceneBuilder.Update(scene, canvas));
 
                 borderNode = scene.FindNode(border);
-                Assert.Equal(new Rect(50, 50, 50, 50), borderNode.ClipBounds);
+                Assert.Equal(new Rect(50, 50, 75, 75), borderNode.ClipBounds);
             }
         }
 

From dc7740554ecda45c444ffd8807e30108d941f94e Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 12 Oct 2017 14:24:41 +0200
Subject: [PATCH 075/482] Propagate ClipBounds to child nodes.

When a scenegraph node's ClipBounds changes, ensure that that change is propagated to child nodes.

Fixes #1171
---
 src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
index 10455eb147..90ef78de37 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
@@ -168,11 +168,14 @@ namespace Avalonia.Rendering.SceneGraph
                 using (context.PushTransformContainer())
                 {
                     var startLayer = opacity < 1 || visual.OpacityMask != null;
+                    var clipBounds = bounds.TransformToAABB(contextImpl.Transform).Intersect(clip);
 
-                    forceRecurse = forceRecurse || node.Transform != contextImpl.Transform;
+                    forceRecurse = forceRecurse ||
+                        node.Transform != contextImpl.Transform ||
+                        node.ClipBounds != clipBounds;
 
                     node.Transform = contextImpl.Transform;
-                    node.ClipBounds = bounds.TransformToAABB(node.Transform).Intersect(clip);
+                    node.ClipBounds = clipBounds;
                     node.ClipToBounds = clipToBounds;
                     node.GeometryClip = visual.Clip?.PlatformImpl;
                     node.Opacity = opacity;

From 763775fa824cc6263e9c397447651db9aec5e761 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 12 Oct 2017 23:26:31 +0200
Subject: [PATCH 076/482] Clear mouse capture when control removed.

When a captured control is removed from the visual tree, clear the mouse capture.

Note that our capture logic needs to be improved - it shouldn't be possible to capture a non-visible or non-enabled control. This doesn't address that but it does fix the crash in #1203.

Fixes #1203
---
 src/Avalonia.Input/MouseDevice.cs             | 22 +++++++++++++++++--
 .../MouseDeviceTests.cs                       | 19 +++++++++++++++-
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Input/MouseDevice.cs b/src/Avalonia.Input/MouseDevice.cs
index 875a5ebaee..50cdb5945c 100644
--- a/src/Avalonia.Input/MouseDevice.cs
+++ b/src/Avalonia.Input/MouseDevice.cs
@@ -20,6 +20,8 @@ namespace Avalonia.Input
         private int _clickCount;
         private Rect _lastClickRect;
         private uint _lastClickTime;
+        private IInputElement _captured;
+        private IDisposable _capturedSubscription;
        
         /// <summary>
         /// Gets the control that is currently capturing by the mouse, if any.
@@ -31,8 +33,23 @@ namespace Avalonia.Input
         /// </remarks>
         public IInputElement Captured
         {
-            get;
-            protected set;
+            get => _captured;
+            protected set
+            {
+                _capturedSubscription?.Dispose();
+                _capturedSubscription = null;
+
+                if (value != null)
+                {
+                    _capturedSubscription = Observable.FromEventPattern<VisualTreeAttachmentEventArgs>(
+                        x => value.DetachedFromVisualTree += x,
+                        x => value.DetachedFromVisualTree -= x)
+                        .Take(1)
+                        .Subscribe(_ => Captured = null);
+                }
+
+                _captured = value;
+            }
         }
         
         /// <summary>
@@ -55,6 +72,7 @@ namespace Avalonia.Input
         /// </remarks>
         public virtual void Capture(IInputElement control)
         {
+            // TODO: Check visibility and enabled state before setting capture.
             Captured = control;
         }
 
diff --git a/tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs b/tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs
index 4a834fd55d..6aca69b88f 100644
--- a/tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs
+++ b/tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs
@@ -1,6 +1,5 @@
 using Avalonia.Controls;
 using Avalonia.Input.Raw;
-using Avalonia.Layout;
 using Avalonia.Rendering;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
@@ -12,6 +11,24 @@ namespace Avalonia.Input.UnitTests
 {
     public class MouseDeviceTests
     {
+        [Fact]
+        public void Capture_Is_Cleared_When_Control_Removed()
+        {
+            Canvas control;
+            var root = new TestRoot
+            {
+                Child = control = new Canvas(),
+            };
+            var target = new MouseDevice();
+
+            target.Capture(control);
+            Assert.Same(control, target.Captured);
+
+            root.Child = null;
+
+            Assert.Null(target.Captured);
+        }
+
         [Fact]
         public void MouseMove_Should_Update_PointerOver()
         {

From a0f4d3fb051897d521f76241d8428a62317c9548 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 12 Oct 2017 23:27:25 +0200
Subject: [PATCH 077/482] Ignore Avalonia.Designer.HostApp in ncrunch.

---
 .ncrunch/Avalonia.Designer.HostApp.v3.ncrunchproject | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .ncrunch/Avalonia.Designer.HostApp.v3.ncrunchproject

diff --git a/.ncrunch/Avalonia.Designer.HostApp.v3.ncrunchproject b/.ncrunch/Avalonia.Designer.HostApp.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/Avalonia.Designer.HostApp.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file

From 8c3a19bb9a97eef2aedea57ede2828f5587b15f5 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 12 Oct 2017 23:36:31 -0500
Subject: [PATCH 078/482] Upgrade XUnit. (Fixes VS Test Explorer integration
 for the solution)

---
 build/XUnit.props | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/build/XUnit.props b/build/XUnit.props
index 42fe9b6d7a..1d7da7257d 100644
--- a/build/XUnit.props
+++ b/build/XUnit.props
@@ -1,14 +1,14 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit" Version="2.3.0" />
     <PackageReference Include="xunit.abstractions" Version="2.0.1" />
-    <PackageReference Include="xunit.assert" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.core" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.extensibility.core" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.extensibility.execution" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.console" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit.assert" Version="2.3.0" />
+    <PackageReference Include="xunit.core" Version="2.3.0" />
+    <PackageReference Include="xunit.extensibility.core" Version="2.3.0" />
+    <PackageReference Include="xunit.extensibility.execution" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.console" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />

From 54e8187a70daaf2851d442279ddc14aa030fb62f Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 12 Oct 2017 23:37:37 -0500
Subject: [PATCH 079/482] Fix StackOverflow in Negation Binding. Fixes #1213

---
 .../Data/ExpressionObserver.cs                | 19 +++++++++++++++++-
 .../Avalonia.Markup/Data/ITransformNode.cs    | 11 ++++++++++
 .../Avalonia.Markup/Data/LogicalNotNode.cs    | 13 +++++++++++-
 .../Data/ExpressionObserverTests_Negation.cs  | 20 ++++++++++++++++++-
 4 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 src/Markup/Avalonia.Markup/Data/ITransformNode.cs

diff --git a/src/Markup/Avalonia.Markup/Data/ExpressionObserver.cs b/src/Markup/Avalonia.Markup/Data/ExpressionObserver.cs
index 66d3beb907..dd9718a0f6 100644
--- a/src/Markup/Avalonia.Markup/Data/ExpressionObserver.cs
+++ b/src/Markup/Avalonia.Markup/Data/ExpressionObserver.cs
@@ -154,7 +154,24 @@ namespace Avalonia.Markup.Data
         /// </returns>
         public bool SetValue(object value, BindingPriority priority = BindingPriority.LocalValue)
         {
-            return (Leaf as ISettableNode)?.SetTargetValue(value, priority) ?? false;
+            if (Leaf is ISettableNode settable)
+            {
+                var node = _node;
+                while (node != null)
+                {
+                    if (node is ITransformNode transform)
+                    {
+                        value = transform.Transform(value);
+                        if (value is BindingNotification)
+                        {
+                            return false;
+                        }
+                    }
+                    node = node.Next;
+                }
+                return settable.SetTargetValue(value, priority);
+            }
+            return false;
         }
 
         /// <summary>
diff --git a/src/Markup/Avalonia.Markup/Data/ITransformNode.cs b/src/Markup/Avalonia.Markup/Data/ITransformNode.cs
new file mode 100644
index 0000000000..f33ecd3722
--- /dev/null
+++ b/src/Markup/Avalonia.Markup/Data/ITransformNode.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Avalonia.Markup.Data
+{
+    interface ITransformNode
+    {
+        object Transform(object value);
+    }
+}
diff --git a/src/Markup/Avalonia.Markup/Data/LogicalNotNode.cs b/src/Markup/Avalonia.Markup/Data/LogicalNotNode.cs
index 58a7915254..ae68867e82 100644
--- a/src/Markup/Avalonia.Markup/Data/LogicalNotNode.cs
+++ b/src/Markup/Avalonia.Markup/Data/LogicalNotNode.cs
@@ -7,7 +7,7 @@ using Avalonia.Data;
 
 namespace Avalonia.Markup.Data
 {
-    internal class LogicalNotNode : ExpressionNode
+    internal class LogicalNotNode : ExpressionNode, ITransformNode
     {
         public override string Description => "!";
 
@@ -61,5 +61,16 @@ namespace Avalonia.Markup.Data
 
             return AvaloniaProperty.UnsetValue;
         }
+
+        public object Transform(object value)
+        {
+            var originalType = value.GetType();
+            var negated = Negate(value);
+            if (negated is BindingNotification)
+            {
+                return negated;
+            }
+            return Convert.ChangeType(negated, originalType);
+        }
     }
 }
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Negation.cs b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Negation.cs
index d8dc2de847..6a23a24051 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Negation.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Negation.cs
@@ -105,14 +105,32 @@ namespace Avalonia.Markup.UnitTests.Data
         }
 
         [Fact]
-        public void SetValue_Should_Return_False()
+        public void SetValue_Should_Return_False_For_Invalid_Value()
         {
             var data = new { Foo = "foo" };
             var target = new ExpressionObserver(data, "!Foo");
+            target.Subscribe(_ => { });
 
             Assert.False(target.SetValue("bar"));
 
             GC.KeepAlive(data);
         }
+
+        [Fact]
+        public void Can_SetValue_For_Valid_Value()
+        {
+            var data = new Test { Foo = true };
+            var target = new ExpressionObserver(data, "!Foo");
+            target.Subscribe(_ => { });
+
+            Assert.True(target.SetValue(true));
+
+            Assert.False(data.Foo);
+        }
+
+        private class Test
+        {
+            public bool Foo { get; set; }
+        }
     }
 }

From 3402456284313264e31cf8485b3c762ff6b3d28a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 13 Oct 2017 14:38:48 +0200
Subject: [PATCH 080/482] Always raise logical tree attach/detach events.

Previously, if the user overrode `OnAttachedToLogicalTree` or `OnDetachedFromLogicalTree` and forgot to call the base implementation, the events wouldn't be raised. It's very important that these events get raised so moved the code to raise them to `OnAttachedToLogicalTreeCore`/`OnDetachedFromLogicalTreeCore`.
---
 src/Avalonia.Controls/Control.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index f3705c9127..050315af7c 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -656,7 +656,6 @@ namespace Avalonia.Controls
         /// <param name="e">The event args.</param>
         protected virtual void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
-            AttachedToLogicalTree?.Invoke(this, e);
         }
 
         /// <summary>
@@ -665,7 +664,6 @@ namespace Avalonia.Controls
         /// <param name="e">The event args.</param>
         protected virtual void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
-            DetachedFromLogicalTree?.Invoke(this, e);
         }
 
         /// <inheritdoc/>
@@ -844,6 +842,7 @@ namespace Avalonia.Controls
                 InitializeStylesIfNeeded(true);
 
                 OnAttachedToLogicalTree(e);
+                AttachedToLogicalTree?.Invoke(this, e);
             }
 
             foreach (var child in LogicalChildren.OfType<Control>())
@@ -864,6 +863,7 @@ namespace Avalonia.Controls
                 _isAttachedToLogicalTree = false;
                 _styleDetach.OnNext(this);
                 OnDetachedFromLogicalTree(e);
+                DetachedFromLogicalTree?.Invoke(this, e);
 
                 foreach (var child in LogicalChildren.OfType<Control>())
                 {

From 2c61d17bc3efc967716f4620dcb4dae9189b17d0 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 13 Oct 2017 15:45:25 +0200
Subject: [PATCH 081/482] Always raise visual tree attach/detach events.

Previously, if the user overrode `OnAttachedToVisualTree` or `OnDetachedFromVisualTree` and forgot to call the base implementation, the events wouldn't be raised. It's very important that these events get raised so moved the code to raise them to `OnAttachedToVisualTreeCore`/`OnDetachedFromVisualTreeCore`.
---
 src/Avalonia.Visuals/Visual.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Visuals/Visual.cs b/src/Avalonia.Visuals/Visual.cs
index cfe6bce7e0..bc65d4f69f 100644
--- a/src/Avalonia.Visuals/Visual.cs
+++ b/src/Avalonia.Visuals/Visual.cs
@@ -329,6 +329,7 @@ namespace Avalonia
             }
 
             OnAttachedToVisualTree(e);
+            AttachedToVisualTree?.Invoke(this, e);
             InvalidateVisual();
 
             if (VisualChildren != null)
@@ -357,6 +358,7 @@ namespace Avalonia
             }
 
             OnDetachedFromVisualTree(e);
+            DetachedFromVisualTree?.Invoke(this, e);
             e.Root?.Renderer?.AddDirty(this);
 
             if (VisualChildren != null)
@@ -374,7 +376,6 @@ namespace Avalonia
         /// <param name="e">The event args.</param>
         protected virtual void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
-            AttachedToVisualTree?.Invoke(this, e);
         }
 
         /// <summary>
@@ -383,7 +384,6 @@ namespace Avalonia
         /// <param name="e">The event args.</param>
         protected virtual void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
         {
-            DetachedFromVisualTree?.Invoke(this, e);
         }
 
         /// <summary>

From fbba93f4218feb983252602e51ca2dd919af12f2 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 13 Oct 2017 17:11:33 +0100
Subject: [PATCH 082/482] update replace scripts.

---
 scripts/ReplaceNugetCache.ps1 | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/ReplaceNugetCache.ps1 b/scripts/ReplaceNugetCache.ps1
index 5f678bedef..4ad31db274 100644
--- a/scripts/ReplaceNugetCache.ps1
+++ b/scripts/ReplaceNugetCache.ps1
@@ -1,5 +1,4 @@
-copy ..\samples\ControlCatalog.NetCore\bin\Debug\netcoreapp1.1\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netcoreapp1.0\
-copy ..\samples\ControlCatalog.NetCore.\bin\Debug\netcoreapp1.1\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netstandard1.3\
-copy ..\samples\ControlCatalog.NetCore.\bin\Debug\netcoreapp1.1\Avalonia**.dll ~\.nuget\packages\avalonia.gtk3\$args\lib\netstandard1.3\
-copy ..\samples\ControlCatalog.NetCore.\bin\Debug\netcoreapp1.1\Avalonia**.dll ~\.nuget\packages\avalonia.skia.desktop\$args\lib\netstandard1.3\
-copy ..\samples\ControlCatalog.NetCore.\bin\Debug\netcoreapp1.1\Avalonia**.dll ~\.nuget\packages\avalonia.win32\$args\lib\netstandard1.3\
+copy ..\samples\ControlCatalog.NetCore\bin\Debug\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netcoreapp2.0\
+copy ..\samples\ControlCatalog.NetCore.\bin\Debug\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netstandard2.0\
+copy ..\samples\ControlCatalog.NetCore.\bin\Debug\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.gtk3\$args\lib\netstandard2.0\
+copy ..\samples\ControlCatalog.NetCore.\bin\Debug\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.win32\$args\lib\netstandard2.0\

From 3cb888f4303609ec1a8ad319edaa0bda9be635a1 Mon Sep 17 00:00:00 2001
From: Artjom <worldbeater-dev@yandex.ru>
Date: Fri, 13 Oct 2017 19:48:11 +0300
Subject: [PATCH 083/482] Update readme.md

---
 readme.md | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/readme.md b/readme.md
index d7e90a4a44..28cb638a7c 100644
--- a/readme.md
+++ b/readme.md
@@ -1,30 +1,31 @@
+<img src='https://avatars2.githubusercontent.com/u/14075148?s=200&v=4' width='100' />
+
 # Avalonia
 
 | Gitter Chat | Windows Build Status | Linux/Mac Build Status |
 |---|---|---|
 | [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/AvaloniaUI/Avalonia?utm_campaign=pr-badge&utm_content=badge&utm_medium=badge&utm_source=badge) | [![Build status](https://ci.appveyor.com/api/projects/status/hubk3k0w9idyibfg/branch/master?svg=true)](https://ci.appveyor.com/project/AvaloniaUI/Avalonia/branch/master) | [![Build Status](https://travis-ci.org/AvaloniaUI/Avalonia.svg?branch=master)](https://travis-ci.org/AvaloniaUI/Avalonia) |
 
-A multi-platform .NET UI framework. It runs on Windows, Linux, Mac OS X, iOS and Android.
+## About
+
+Avalonia is a WPF-inspired cross-platform XAML-based UI framework providing a flexible styling system and supporting a wide range of OSs: Windows (.NET Framework, .NET Core), Linux (GTK), MacOS, Android and iOS.
+
+<b>Avalonia is now in alpha.</b> This means that framework is now at a stage where you can have a play and hopefully create simple applications. There's still a lot missing, and you *will* find bugs, and the API *will* change, but this represents the first time where we've made it somewhat easy to have a play and experiment with the framework.
 
 | Control catalog | Desktop platforms | Mobile platforms |
 |---|---|---|
 | <a href='https://youtu.be/wHcB3sGLVYg'><img width='300' src='docs/images/screen.png'></a> | <a href='https://www.youtube.com/watch?t=28&v=c_AB_XSILp0' target='_blank'><img width='300' src='docs/images/avalonia-video.png'></a> | <a href='https://www.youtube.com/watch?v=NJ9-hnmUbBM' target='_blank'><img width='300' src='https://i.ytimg.com/vi/NJ9-hnmUbBM/hqdefault.jpg'></a> |
 
-## About
-
-Avalonia is a WPF-inspired cross-platform XAML-based UI framework providing a flexible styling system and supporting a wide range of OSs: Windows (.NET Framework, .NET Core), Android, Linux (GTK), MacOS and iOS.
-
-<b>Avalonia is now in alpha.</b> What does "alpha" mean? Well, it means that it's now at a stage where you can have a play and hopefully create simple applications. There's still a lot missing, and you *will* find bugs, and the API *will* change, but this represents the first time where we've made it somewhat easy to have a play and experiment with the framework.
-
 ## Getting Started
 
-Avalonia [Visual Studio Extension](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.AvaloniaforVisualStudio) contains project and control templates that will help you get started. After installing it, open "New Project" dialog in Visual Studio, choose "Avalonia" in "Visual C#" section and press OK (<a href="https://github.com/AvaloniaUI/Avalonia/raw/master/docs/tutorial/images/add-dialogs.png">screenshot</a>). Now you can write code and markup that will work on multiple platforms!
+Avalonia [Visual Studio Extension](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.AvaloniaforVisualStudio) contains project and control templates that will help you get started. After installing it, open "New Project" dialog in Visual Studio, choose "Avalonia" in "Visual C#" section, select "Avalonia .NET Core Application" and press OK (<a href="https://github.com/AvaloniaUI/Avalonia/raw/master/docs/tutorial/images/add-dialogs.png">screenshot</a>). Now you can write code and markup that will work on multiple platforms!
 
-Avalonia is also delivered as a <b>NuGet</b> package. You can find the packages here: ([stable(ish)](https://www.nuget.org/packages/Avalonia/), [nightly](https://github.com/AvaloniaUI/Avalonia/wiki/Using-nightly-build-feed))
+Avalonia is delivered via <b>NuGet</b> package manager. You can find the packages here: ([stable(ish)](https://www.nuget.org/packages/Avalonia/), [nightly](https://github.com/AvaloniaUI/Avalonia/wiki/Using-nightly-build-feed))
 
-Use this command in Package Manager console to install the package:
+Use these commands in Package Manager console to install Avalonia manually:
 ```
-Install-Package Avalonia -Pre
+Install-Package Avalonia
+Install-Package Avalonia.Desktop
 ```
 
 ## Bleeding Edge Builds

From aa2980b8c833f50b2b895a93802d7b3b256d4af3 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 13 Oct 2017 19:10:09 +0200
Subject: [PATCH 084/482] Don't return detached controls in HitTest.

If a control has been detached from the visual tree but the scene hasn't yet been updated, don't return the control as part of a hit-test.
---
 src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
index a85fd36763..a4af106a73 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
@@ -173,7 +173,7 @@ namespace Avalonia.Rendering.SceneGraph
                         }
                     }
 
-                    if (node.HitTest(p))
+                    if (node.HitTest(p) && node.Visual.IsAttachedToVisualTree)
                     {
                         yield return node.Visual;
                     }

From 30a31006cc19ab7b102aeaeb410cf47d5e9a66b1 Mon Sep 17 00:00:00 2001
From: Unknown <dan@walms.co.uk>
Date: Fri, 13 Oct 2017 19:52:33 +0100
Subject: [PATCH 085/482] update linux and release replace scripts.

---
 scripts/ReplaceNugetCache.sh         | 7 +++----
 scripts/ReplaceNugetCacheRelease.ps1 | 9 ++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/scripts/ReplaceNugetCache.sh b/scripts/ReplaceNugetCache.sh
index 2ce3e7648d..636aec5f23 100755
--- a/scripts/ReplaceNugetCache.sh
+++ b/scripts/ReplaceNugetCache.sh
@@ -1,7 +1,6 @@
  #!/usr/bin/env bash
  
- cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp1.1/Avalonia**.dll ~/.nuget/packages/avalonia/$1/lib/netcoreapp1.0/
- cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp1.1/Avalonia**.dll ~/.nuget/packages/avalonia/$1/lib/netstandard1.1/
- cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp1.1/Avalonia**.dll ~/.nuget/packages/avalonia.gtk3/$1/lib/netstandard1.1/
- cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp1.1/Avalonia**.dll ~/.nuget/packages/avalonia.skia.desktop/$1/lib/netstandard1.3/
+ cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp2.0/Avalonia**.dll ~/.nuget/packages/avalonia/$1/lib/netcoreapp2.0/
+ cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp2.0/Avalonia**.dll ~/.nuget/packages/avalonia/$1/lib/netstandard2.0/
+ cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp2.0/Avalonia**.dll ~/.nuget/packages/avalonia.gtk3/$1/lib/netstandard2.0/
  
diff --git a/scripts/ReplaceNugetCacheRelease.ps1 b/scripts/ReplaceNugetCacheRelease.ps1
index f3c1a0a975..f188c81c51 100644
--- a/scripts/ReplaceNugetCacheRelease.ps1
+++ b/scripts/ReplaceNugetCacheRelease.ps1
@@ -1,5 +1,4 @@
-copy ..\samples\ControlCatalog.NetCore\bin\Release\netcoreapp1.1\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netcoreapp1.0\
-copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp1.1\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netstandard1.3\
-copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp1.1\Avalonia**.dll ~\.nuget\packages\avalonia.gtk3\$args\lib\netstandard1.3\
-copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp1.1\Avalonia**.dll ~\.nuget\packages\avalonia.skia.desktop\$args\lib\netstandard1.3\
-copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp1.1\Avalonia**.dll ~\.nuget\packages\avalonia.win32\$args\lib\netstandard1.3\
+copy ..\samples\ControlCatalog.NetCore\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netcoreapp2.0\
+copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netstandard2.0\
+copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.gtk3\$args\lib\netstandard2.0\
+copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.win32\$args\lib\netstandard2.0\
\ No newline at end of file

From 83b21aab08167e474909951660441b2164f6350b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Sat, 14 Oct 2017 11:15:11 +0200
Subject: [PATCH 086/482] Disable osx builds

They're failing and not that useful anyway.
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 52a400d19a..ea09278cdd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: csharp
 os:
   - linux
-  - osx
 dist: trusty
 osx_image: xcode8.3
 env:

From 268587c4320c43b9eb861a88119ab2e6ba4d8f9f Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 14 Oct 2017 11:31:47 +0200
Subject: [PATCH 087/482] Fix DropDown popup opening.

When the `DropDown` control is clicked, toggle the opening of the popup.

Fixes #1169.
---
 src/Avalonia.Controls/DropDown.cs             | 20 +++++++-------
 .../DropDownTests.cs                          | 26 +++++++++++++++++--
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/Avalonia.Controls/DropDown.cs b/src/Avalonia.Controls/DropDown.cs
index 5349fb1ca7..fa2e0c1e16 100644
--- a/src/Avalonia.Controls/DropDown.cs
+++ b/src/Avalonia.Controls/DropDown.cs
@@ -120,21 +120,21 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
-            if (!IsDropDownOpen && ((IVisual)e.Source).GetVisualRoot() is PopupRoot)
-            {
-                IsDropDownOpen = true;
-                e.Handled = true;
-            }
-
             if (!e.Handled)
             {
-                if (UpdateSelectionFromEventSource(e.Source))
+                if (((IVisual)e.Source).GetVisualRoot() is PopupRoot)
                 {
-                    _popup?.Close();
-                    e.Handled = true;
+                    if (UpdateSelectionFromEventSource(e.Source))
+                    {
+                        _popup?.Close();
+                        e.Handled = true;
+                    }
+                }
+                else
+                {
+                    IsDropDownOpen = !IsDropDownOpen;
                 }
             }
-
             base.OnPointerPressed(e);
         }
 
diff --git a/tests/Avalonia.Controls.UnitTests/DropDownTests.cs b/tests/Avalonia.Controls.UnitTests/DropDownTests.cs
index 30cca90b4a..b5de8c67fa 100644
--- a/tests/Avalonia.Controls.UnitTests/DropDownTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/DropDownTests.cs
@@ -1,21 +1,43 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using System.Linq;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Shapes;
 using Avalonia.Controls.Templates;
+using Avalonia.Input;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.UnitTests;
-using Avalonia.VisualTree;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
 {
     public class DropDownTests
     {
+        [Fact]
+        public void Clicking_On_Control_Toggles_IsDropDownOpen()
+        {
+            var target = new DropDown
+            {
+                Items = new[] { "Foo", "Bar" },
+            };
+
+            target.RaiseEvent(new PointerPressedEventArgs
+            {
+                RoutedEvent = InputElement.PointerPressedEvent,
+            });
+
+            Assert.True(target.IsDropDownOpen);
+
+            target.RaiseEvent(new PointerPressedEventArgs
+            {
+                RoutedEvent = InputElement.PointerPressedEvent,
+            });
+
+            Assert.False(target.IsDropDownOpen);
+        }
+
         [Fact]
         public void SelectionBoxItem_Is_Rectangle_With_VisualBrush_When_Selection_Is_Control()
         {

From 33b57118cfe3750ccdd52689cd945ec944114bd9 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 14 Oct 2017 16:09:25 +0200
Subject: [PATCH 088/482] Bind TextPresenter.Text before CaretIndex.

Otherwise if `TextBox.CaretIndex` is set before the `TextBox`'s template is applied then it will be coerced to null on the `TextPresenter` when created as `Text` will still be null at this point.
---
 src/Avalonia.Themes.Default/TextBox.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Themes.Default/TextBox.xaml b/src/Avalonia.Themes.Default/TextBox.xaml
index 8acc97d663..87d8c22663 100644
--- a/src/Avalonia.Themes.Default/TextBox.xaml
+++ b/src/Avalonia.Themes.Default/TextBox.xaml
@@ -46,10 +46,10 @@
                            Text="{TemplateBinding Watermark}"
                            IsVisible="{TemplateBinding Path=Text, Converter={Static StringConverters.NullOrEmpty}}"/>
                 <TextPresenter Name="PART_TextPresenter"
+                               Text="{TemplateBinding Text, Mode=TwoWay}"
                                CaretIndex="{TemplateBinding CaretIndex}"
                                SelectionStart="{TemplateBinding SelectionStart}"
                                SelectionEnd="{TemplateBinding SelectionEnd}"
-                               Text="{TemplateBinding Text, Mode=TwoWay}"
                                TextAlignment="{TemplateBinding TextAlignment}"
                                TextWrapping="{TemplateBinding TextWrapping}"/>
               </Panel>

From e3d34f2eb8519da32ab2bbd8ae2703b4b9076d7e Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 14 Oct 2017 17:01:26 +0200
Subject: [PATCH 089/482] Added a failing test for #1221

---
 .../VisualExtensions_GetVisualsAt.cs          | 103 ++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 tests/Avalonia.Visuals.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs

diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs
new file mode 100644
index 0000000000..867d4d7450
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Visuals.UnitTests.VisualTree
+{
+    public class VisualExtensions_GetVisualsAt
+    {
+        [Fact]
+        public void Should_Find_Control()
+        {
+            using (TestApplication())
+            {
+                Border target;
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new StackPanel
+                    {
+                        Background = Brushes.White,
+                        Children =
+                        {
+                            (target = new Border
+                            {
+                                Width = 100,
+                                Height = 200,
+                                Background = Brushes.Red,
+                            }),
+                            new Border
+                            {
+                                Width = 100,
+                                Height = 200,
+                                Background = Brushes.Green,
+                            }
+                        },
+                        Orientation = Orientation.Horizontal,
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var result = target.GetVisualsAt(new Point(50, 50));
+
+                Assert.Same(target, result.Single());
+            }
+        }
+
+        [Fact]
+        public void Should_Not_Find_Sibling_Control()
+        {
+            using (TestApplication())
+            {
+                Border target;
+                var root = new TestRoot
+                {
+                    Width = 200,
+                    Height = 200,
+                    Child = new StackPanel
+                    {
+                        Background = Brushes.White,
+                        Children =
+                        {
+                            (target = new Border
+                            {
+                                Width = 100,
+                                Height = 200,
+                                Background = Brushes.Red,
+                            }),
+                            new Border
+                            {
+                                Width = 100,
+                                Height = 200,
+                                Background = Brushes.Green,
+                            }
+                        },
+                        Orientation = Orientation.Horizontal,
+                    }
+                };
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var result = target.GetVisualsAt(new Point(150, 50));
+
+                Assert.Empty(result);
+            }
+        }
+
+        private IDisposable TestApplication()
+        {
+            return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+        }
+    }
+}

From 880cf657ec36f5a6abaa334297b601aaf71b870e Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 14 Oct 2017 17:46:49 +0200
Subject: [PATCH 090/482] Accept root in IRenderer.HitTest.

Fixes #1221.
---
 .../Rendering/DeferredRenderer.cs             |  4 +--
 src/Avalonia.Visuals/Rendering/IRenderer.cs   |  8 +++--
 .../Rendering/ImmediateRenderer.cs            |  4 +--
 .../Rendering/SceneGraph/Scene.cs             |  7 ++--
 .../VisualTree/VisualExtensions.cs            |  2 +-
 .../MouseDeviceTests.cs                       |  4 +--
 tests/Avalonia.LeakTests/ControlTests.cs      |  2 +-
 .../DeferredRendererTests_HitTesting.cs       | 32 +++++++++----------
 .../ImmediateRendererTests_HitTesting.cs      | 22 ++++++-------
 9 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index 5434a35464..f7befa646a 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -106,7 +106,7 @@ namespace Avalonia.Rendering
         public void Dispose() => Stop();
 
         /// <inheritdoc/>
-        public IEnumerable<IVisual> HitTest(Point p, Func<IVisual, bool> filter)
+        public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool> filter)
         {
             if (_renderLoop == null && (_dirty == null || _dirty.Count > 0))
             {
@@ -114,7 +114,7 @@ namespace Avalonia.Rendering
                 UpdateScene();
             }
 
-            return _scene?.HitTest(p, filter) ?? Enumerable.Empty<IVisual>();
+            return _scene?.HitTest(p, root, filter) ?? Enumerable.Empty<IVisual>();
         }
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Visuals/Rendering/IRenderer.cs b/src/Avalonia.Visuals/Rendering/IRenderer.cs
index aa2413bdfb..9085e63aa9 100644
--- a/src/Avalonia.Visuals/Rendering/IRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/IRenderer.cs
@@ -33,9 +33,13 @@ namespace Avalonia.Rendering
         /// Hit tests a location to find the visuals at the specified point.
         /// </summary>
         /// <param name="p">The point, in client coordinates.</param>
-        /// <param name="filter">An optional filter.</param>
+        /// <param name="root">The root of the subtree to search.</param>
+        /// <param name="filter">
+        /// A filter predicate. If the predicate returns false then the visual and all its
+        /// children will be excluded from the results.
+        /// </param>
         /// <returns>The visuals at the specified point, topmost first.</returns>
-        IEnumerable<IVisual> HitTest(Point p, Func<IVisual, bool> filter);
+        IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool> filter);
 
         /// <summary>
         /// Called when a resize notification is received by the control being rendered.
diff --git a/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs b/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
index 4ef2b30463..2d5a864089 100644
--- a/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
@@ -136,9 +136,9 @@ namespace Avalonia.Rendering
         }
 
         /// <inheritdoc/>
-        public IEnumerable<IVisual> HitTest(Point p, Func<IVisual, bool> filter)
+        public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool> filter)
         {
-            return HitTest(_root, p, filter);
+            return HitTest(root, p, filter);
         }
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
index a4af106a73..9216bae8ad 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Rendering.SceneGraph
@@ -113,11 +114,13 @@ namespace Avalonia.Rendering.SceneGraph
         /// Gets the visuals at a point in the scene.
         /// </summary>
         /// <param name="p">The point.</param>
+        /// <param name="root">The root of the subtree to search.</param>
         /// <param name="filter">A filter. May be null.</param>
         /// <returns>The visuals at the specified point.</returns>
-        public IEnumerable<IVisual> HitTest(Point p, Func<IVisual, bool> filter)
+        public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool> filter)
         {
-            return HitTest(Root, p, null, filter);
+            var node = FindNode(root);
+            return (node != null) ? HitTest(node, p, null, filter) : Enumerable.Empty<IVisual>();
         }
 
         /// <summary>
diff --git a/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs b/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs
index 4f4bf4b9fe..2d417852fe 100644
--- a/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs
+++ b/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs
@@ -133,7 +133,7 @@ namespace Avalonia.VisualTree
 
             var root = visual.GetVisualRoot();
             p = visual.TranslatePoint(p, root);
-            return root.Renderer.HitTest(p, filter);
+            return root.Renderer.HitTest(p, visual, filter);
         }
 
         /// <summary>
diff --git a/tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs b/tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs
index 6aca69b88f..7764c47dbf 100644
--- a/tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs
+++ b/tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs
@@ -59,7 +59,7 @@ namespace Avalonia.Input.UnitTests
                     }
                 };
 
-                renderer.Setup(x => x.HitTest(It.IsAny<Point>(), It.IsAny<Func<IVisual, bool>>()))
+                renderer.Setup(x => x.HitTest(It.IsAny<Point>(), It.IsAny<IVisual>(), It.IsAny<Func<IVisual, bool>>()))
                     .Returns(new[] { decorator });
 
                 inputManager.ProcessInput(new RawMouseEventArgs(
@@ -75,7 +75,7 @@ namespace Avalonia.Input.UnitTests
                 Assert.False(canvas.IsPointerOver);
                 Assert.True(root.IsPointerOver);
 
-                renderer.Setup(x => x.HitTest(It.IsAny<Point>(), It.IsAny<Func<IVisual, bool>>()))
+                renderer.Setup(x => x.HitTest(It.IsAny<Point>(), It.IsAny<IVisual>(), It.IsAny<Func<IVisual, bool>>()))
                     .Returns(new[] { canvas });
 
                 inputManager.ProcessInput(new RawMouseEventArgs(
diff --git a/tests/Avalonia.LeakTests/ControlTests.cs b/tests/Avalonia.LeakTests/ControlTests.cs
index 12ac8d3af6..979127cd14 100644
--- a/tests/Avalonia.LeakTests/ControlTests.cs
+++ b/tests/Avalonia.LeakTests/ControlTests.cs
@@ -357,7 +357,7 @@ namespace Avalonia.LeakTests
             {
             }
 
-            public IEnumerable<IVisual> HitTest(Point p, Func<IVisual, bool> filter) => null;
+            public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool> filter) => null;
 
             public void Paint(Rect rect)
             {
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
index 1044c1f2a3..9e2f1fc293 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
@@ -42,7 +42,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root.Measure(Size.Infinity);
                 root.Arrange(new Rect(root.DesiredSize));
 
-                var result = root.Renderer.HitTest(new Point(100, 100), null);
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
 
                 Assert.Equal(new[] { root.Child }, result);
             }
@@ -70,7 +70,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root.Measure(Size.Infinity);
                 root.Arrange(new Rect(root.DesiredSize));
 
-                var result = root.Renderer.HitTest(new Point(100, 100), null);
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
 
                 Assert.Empty(result);
             }
@@ -107,7 +107,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root.Measure(Size.Infinity);
                 root.Arrange(new Rect(root.DesiredSize));
 
-                var result = root.Renderer.HitTest(new Point(100, 100), null);
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
 
                 Assert.Empty(result);
             }
@@ -136,7 +136,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root.Measure(Size.Infinity);
                 root.Arrange(new Rect(root.DesiredSize));
 
-                var result = root.Renderer.HitTest(new Point(10, 10), null);
+                var result = root.Renderer.HitTest(new Point(10, 10), root, null);
 
                 Assert.Empty(result);
             }
@@ -180,7 +180,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root.Measure(Size.Infinity);
                 root.Arrange(new Rect(container.DesiredSize));
 
-                var result = root.Renderer.HitTest(new Point(100, 100), null);
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
 
                 Assert.Equal(new[] { container.Children[1], container.Children[0] }, result);
             }
@@ -234,7 +234,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root.Measure(Size.Infinity);
                 root.Arrange(new Rect(container.DesiredSize));
 
-                var result = root.Renderer.HitTest(new Point(100, 100), null);
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
 
                 Assert.Equal(new[] { container.Children[2], container.Children[0], container.Children[1] }, result);
             }
@@ -283,7 +283,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 container.Measure(Size.Infinity);
                 container.Arrange(new Rect(container.DesiredSize));
 
-                var result = root.Renderer.HitTest(new Point(120, 120), null);
+                var result = root.Renderer.HitTest(new Point(120, 120), root, null);
 
                 Assert.Equal(new IVisual[] { target, container }, result);
             }
@@ -331,7 +331,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root.Measure(Size.Infinity);
                 root.Arrange(new Rect(container.DesiredSize));
 
-                var result = root.Renderer.HitTest(new Point(50, 50), null);
+                var result = root.Renderer.HitTest(new Point(50, 50), root, null);
 
                 Assert.Equal(new[] { container }, result);
             }
@@ -404,11 +404,11 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root.Measure(Size.Infinity);
                 root.Arrange(new Rect(container.DesiredSize));
 
-                var result = root.Renderer.HitTest(new Point(50, 150), null).First();
+                var result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
 
                 Assert.Equal(item1, result);
 
-                result = root.Renderer.HitTest(new Point(50, 50), null).First();
+                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
 
                 Assert.Equal(target, result);
 
@@ -419,10 +419,10 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 container.InvalidateArrange();
                 container.Arrange(new Rect(container.DesiredSize));
 
-                result = root.Renderer.HitTest(new Point(50, 150), null).First();
+                result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
                 Assert.Equal(item2, result);
 
-                result = root.Renderer.HitTest(new Point(50, 50), null).First();
+                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
                 Assert.Equal(target, result);
             }
         }
@@ -452,10 +452,10 @@ namespace Avalonia.Visuals.UnitTests.Rendering
 
                 var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
 
-                var result = root.Renderer.HitTest(new Point(100, 100), null);
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
                 Assert.Equal(new[] { path }, result);
 
-                result = root.Renderer.HitTest(new Point(10, 10), null);
+                result = root.Renderer.HitTest(new Point(10, 10), root, null);
                 Assert.Empty(result);
             }
         }
@@ -492,10 +492,10 @@ namespace Avalonia.Visuals.UnitTests.Rendering
 
                 var context = new DrawingContext(Mock.Of<IDrawingContextImpl>());
 
-                var result = root.Renderer.HitTest(new Point(200, 200), null);
+                var result = root.Renderer.HitTest(new Point(200, 200), root, null);
                 Assert.Equal(new IVisual[] { canvas, border }, result);
 
-                result = root.Renderer.HitTest(new Point(110, 110), null);
+                result = root.Renderer.HitTest(new Point(110, 110), root, null);
                 Assert.Empty(result);
             }
         }
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
index 2c3e9bf11a..c8a19a9f46 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
@@ -40,7 +40,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root.Arrange(new Rect(root.DesiredSize));
                 root.Renderer.Paint(new Rect(root.ClientSize));
 
-                var result = root.Renderer.HitTest(new Point(100, 100), null);
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
 
                 Assert.Equal(new[] { root.Child, root }, result);
             }
@@ -78,7 +78,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root.Arrange(new Rect(root.DesiredSize));
                 root.Renderer.Paint(new Rect(root.ClientSize));
 
-                var result = root.Renderer.HitTest(new Point(100, 100), null);
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
 
                 Assert.Equal(new[] { root }, result);
             }
@@ -108,7 +108,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root.Arrange(new Rect(root.DesiredSize));
                 root.Renderer.Paint(new Rect(root.ClientSize));
 
-                var result = root.Renderer.HitTest(new Point(10, 10), null);
+                var result = root.Renderer.HitTest(new Point(10, 10), root, null);
 
                 Assert.Equal(new[] { root }, result);
             }
@@ -153,7 +153,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root.Arrange(new Rect(container.DesiredSize));
                 root.Renderer.Paint(new Rect(root.ClientSize));
 
-                var result = root.Renderer.HitTest(new Point(100, 100), null);
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
 
                 Assert.Equal(new[] { container.Children[1], container.Children[0], container, root }, result);
             }
@@ -208,7 +208,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root.Arrange(new Rect(container.DesiredSize));
                 root.Renderer.Paint(new Rect(root.ClientSize));
 
-                var result = root.Renderer.HitTest(new Point(100, 100), null);
+                var result = root.Renderer.HitTest(new Point(100, 100), root, null);
 
                 Assert.Equal(
                     new[] 
@@ -267,7 +267,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 container.Arrange(new Rect(container.DesiredSize));
                 root.Renderer.Paint(new Rect(root.ClientSize));
 
-                var result = root.Renderer.HitTest(new Point(120, 120), null);
+                var result = root.Renderer.HitTest(new Point(120, 120), root, null);
 
                 Assert.Equal(new IVisual[] { target, container }, result);
             }
@@ -316,7 +316,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root.Arrange(new Rect(container.DesiredSize));
                 root.Renderer.Paint(new Rect(root.ClientSize));
 
-                var result = root.Renderer.HitTest(new Point(50, 50), null);
+                var result = root.Renderer.HitTest(new Point(50, 50), root, null);
 
                 Assert.Equal(new IVisual[] { container, root }, result);
             }
@@ -390,11 +390,11 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root.Arrange(new Rect(container.DesiredSize));
                 root.Renderer.Paint(new Rect(root.ClientSize));
 
-                var result = root.Renderer.HitTest(new Point(50, 150), null).First();
+                var result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
 
                 Assert.Equal(item1, result);
 
-                result = root.Renderer.HitTest(new Point(50, 50), null).First();
+                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
 
                 Assert.Equal(target, result);
 
@@ -406,10 +406,10 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 container.Arrange(new Rect(container.DesiredSize));
                 root.Renderer.Paint(new Rect(root.ClientSize));
 
-                result = root.Renderer.HitTest(new Point(50, 150), null).First();
+                result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
                 Assert.Equal(item2, result);
 
-                result = root.Renderer.HitTest(new Point(50, 50), null).First();
+                result = root.Renderer.HitTest(new Point(50, 50), root, null).First();
                 Assert.Equal(target, result);
             }
         }

From a3eb9e0da4ed350836155296a9a933df9d6d401c Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sat, 14 Oct 2017 19:00:27 +0300
Subject: [PATCH 091/482] Docs are now living at
 https://github.com/AvaloniaUI/avaloniaui.net

So long and thanks for the fish
---
 docs/.gitignore                            |   3 -
 docs/README.md                             |  21 --
 docs/build.cmd                             |   3 -
 docs/docfx.json                            |  55 -----
 docs/guidelines/build.md                   |  43 ----
 docs/guidelines/contributing.md            |  60 ------
 docs/guidelines/toc.yml                    |   4 -
 docs/images/avalonia-video.png             | Bin 135848 -> 0 bytes
 docs/images/cross-platform.png             | Bin 45808 -> 0 bytes
 docs/images/hello-world-xaml.png           | Bin 125439 -> 0 bytes
 docs/images/inspection-support.png         | Bin 231938 -> 0 bytes
 docs/images/screen.png                     | Bin 27256 -> 0 bytes
 docs/index.md                              |  37 ----
 docs/intro.md                              | 225 ---------------------
 docs/serve.cmd                             |   2 -
 docs/spec/architecture.md                  | 101 ---------
 docs/spec/binding-from-code.md             | 156 --------------
 docs/spec/binding-from-xaml.md             |  99 ---------
 docs/spec/defining-properties.md           | 199 ------------------
 docs/spec/logging.md                       |  54 -----
 docs/spec/styles.md                        | 111 ----------
 docs/spec/toc.yml                          |  14 --
 docs/spec/working-with-properties.md       | 102 ----------
 docs/template/partials/footer.tmpl.partial |  13 --
 docs/toc.yml                               |  10 -
 docs/tutorial/from-wpf.md                  | 161 ---------------
 docs/tutorial/gettingstarted.md            |  10 -
 docs/tutorial/images/add-dialogs.png       | Bin 45998 -> 0 bytes
 docs/tutorial/nuget.md                     |  86 --------
 docs/tutorial/toc.yml                      |   6 -
 readme.md                                  |  12 +-
 31 files changed, 6 insertions(+), 1581 deletions(-)
 delete mode 100644 docs/.gitignore
 delete mode 100644 docs/README.md
 delete mode 100644 docs/build.cmd
 delete mode 100644 docs/docfx.json
 delete mode 100644 docs/guidelines/build.md
 delete mode 100644 docs/guidelines/contributing.md
 delete mode 100644 docs/guidelines/toc.yml
 delete mode 100644 docs/images/avalonia-video.png
 delete mode 100644 docs/images/cross-platform.png
 delete mode 100644 docs/images/hello-world-xaml.png
 delete mode 100644 docs/images/inspection-support.png
 delete mode 100644 docs/images/screen.png
 delete mode 100644 docs/index.md
 delete mode 100644 docs/intro.md
 delete mode 100644 docs/serve.cmd
 delete mode 100644 docs/spec/architecture.md
 delete mode 100644 docs/spec/binding-from-code.md
 delete mode 100644 docs/spec/binding-from-xaml.md
 delete mode 100644 docs/spec/defining-properties.md
 delete mode 100644 docs/spec/logging.md
 delete mode 100644 docs/spec/styles.md
 delete mode 100644 docs/spec/toc.yml
 delete mode 100644 docs/spec/working-with-properties.md
 delete mode 100644 docs/template/partials/footer.tmpl.partial
 delete mode 100644 docs/toc.yml
 delete mode 100644 docs/tutorial/from-wpf.md
 delete mode 100644 docs/tutorial/gettingstarted.md
 delete mode 100644 docs/tutorial/images/add-dialogs.png
 delete mode 100644 docs/tutorial/nuget.md
 delete mode 100644 docs/tutorial/toc.yml

diff --git a/docs/.gitignore b/docs/.gitignore
deleted file mode 100644
index 8782b2d294..0000000000
--- a/docs/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-#docfx
-_site
-api
diff --git a/docs/README.md b/docs/README.md
deleted file mode 100644
index c65b576bfa..0000000000
--- a/docs/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Avalonia Documentation
-
-* [API Reference](http://avalonia.github.io/)
-
-## Building
-
-Download and unzip `docfx.zip` into `Documentation` folder from [DocFX project site](https://github.com/dotnet/docfx/releases).
-
-**Step 1.** To create `_site` documentation folder run build script
-
-```
-build.cmd
-```
-
-**Step 2.** To browse `_site` documentation folder run serve script
-
-```
-serve.cmd
-```
-
-And you can view the generated website in your browser `http://localhost:8080`.
diff --git a/docs/build.cmd b/docs/build.cmd
deleted file mode 100644
index b11ad76376..0000000000
--- a/docs/build.cmd
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-docfx metadata
-docfx build
diff --git a/docs/docfx.json b/docs/docfx.json
deleted file mode 100644
index d49ee066ed..0000000000
--- a/docs/docfx.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "metadata": [
-    {
-      "src": [
-        {
-          "files": [
-            "/src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj",
-            "/src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj",
-            "/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj",
-            "/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj",
-            "/src/Avalonia.Animation/Avalonia.Animation.csproj",
-            "/src/Avalonia.Application/Avalonia.Application.csproj",
-            "/src/Avalonia.Base/Avalonia.Base.csproj",
-            "/src/Avalonia.Controls/Avalonia.Controls.csproj",
-            "/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj",
-            "/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj",
-            "/src/Avalonia.Input/Avalonia.Input.csproj",
-            "/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj",
-            "/src/Avalonia.Layout/Avalonia.Layout.csproj",
-            "/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj",
-            "/src/Avalonia.Visuals/Avalonia.Visuals.csproj",
-            "/src/Avalonia.Styling/Avalonia.Styling.csproj",
-            "/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj",
-            "/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj",
-            "/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj",
-            "/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj",
-            "/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj",
-          ],
-          "exclude": [ "**/bin/**", "**/obj/**" ], 
-          "cwd": ".."
-        }
-      ],
-      "dest": "api"
-    },
-  ],
-  "build": {
-    "content":
-      [
-        {
-          "files": ["**/*.yml", "index.md", "tutorial/*.md", "guidelines/*.md", "spec/*.md"],
-        }
-      ],
-    "resource": [
-        {
-          "files": ["images/**", "tutorial/images/**", "guidelines/images/**", "spec/images/**"]
-        }
-    ],
-    "overwrite": "apidoc/*.md",
-    "globalMetadata": {
-      "_appTitle": "Avalonia Website"
-    },
-    "dest": "_site",
-    "template": [ "default", "template"]
-  }
-}
diff --git a/docs/guidelines/build.md b/docs/guidelines/build.md
deleted file mode 100644
index 559790b197..0000000000
--- a/docs/guidelines/build.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Building Avalonia
-
-## Windows
-
-Avalonia requires at least Visual Studio 2017 and .NET Core SDK 2.0 to build on Windows.
-
-### Clone the Avalonia repository
-
-```
-git clone https://github.com/AvaloniaUI/Avalonia.git
-git submodule update --init
-```
-
-### Open in Visual Studio
-
-Open the `Avalonia.sln` solution in Visual Studio 2015 or newer. The free Visual Studio Community
-edition works fine. Run the `Samples\ControlCatalog.Desktop` project to see the sample application.
-
-## Linux/OSX
-
-It's *not* possible to build the *whole* project on Linux/OSX. You can only build the subset targeting .NET Standard and .NET Core (which is, however, sufficient to get UI working on Linux/OSX). If you want to something that involves changing platform-specific APIs you'll need a Windows machine.
-
-MonoDevelop, Xamarin Studio and Visual Studio for Mac aren't capable of properly opening our solution. You can use Rider (at least 2017.2 EAP) or VSCode instead. They will fail to load most of platform specific projects, but you don't need them to run on .NET Core.
-
-### Install the latest version of .NET Core
-
-Go to https://www.microsoft.com/net/core and follow instructions for your OS. You need SDK (not just "runtime") package.
-
-### Clone the Avalonia repository
-
-```
-git clone https://github.com/AvaloniaUI/Avalonia.git
-git submodule update --init --recursive
-```
-
-### Build and Run Avalonia
-
-```
-samples/ControlCatalog.NetCore
-dotnet restore
-dotnet run
-```
-
diff --git a/docs/guidelines/contributing.md b/docs/guidelines/contributing.md
deleted file mode 100644
index 771b8f49f2..0000000000
--- a/docs/guidelines/contributing.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# Contributing #
-
-## Before You Start ##
-
-Drop into our [gitter chat room](https://gitter.im/Avalonia/Avalonia) and let us know what you're thinking of doing. We might be able to give you guidance or let you know if someone else is already working on the feature.
-
-## Style ##
-
-The codebase uses [.net core](https://github.com/dotnet/corefx/blob/master/Documentation/coding-guidelines/coding-style.md) coding style. 
-
-Try to keep lines of code around 100 characters in length or less, though this is not a hard limit.
-If you're a few characters over then don't worry too much. 
-
-**DO NOT USE #REGIONS** full stop.
-
-## Pull requests ##
-
-A single pull request should be submitted for each change. If you're making more than one change,
-please submit separate pull requests for each change for easy review. Rebase your changes to make 
-sense, so a history that looks like:
-
-* Add class A
-* Feature A didn't set Foo when Bar was set
-* Fix spacing
-* Add class B
-* Sort using statements
-
-Should be rebased to read:
-
-* Add class A
-* Add class B
-
-Again, this makes review much easier.
-
-Please try not to submit pull requests that don't add new features (e.g. moving stuff around) 
-unless you see something that is obviously wrong or that could be written in a more terse or 
-idiomatic style. It takes time to review each pull request - time that I'd prefer to spend writing 
-new features!
-
-Prefer terseness to verbosity but don't try to be too clever.
-
-## Tests ##
-
-There are two types of tests currently in the codebase; unit tests and render tests.
-
-Unit tests should be contained in a class name that mirrors the class being tested with the suffix
--Tests, e.g.
-
-    Avalonia.Controls.UnitTests.Presenters.TextPresenterTests
-
-Where Avalonia.Controls.UnitTests is the name of the project.
-
-Unit test methods should be named in a sentence style, separated by underscores, that describes in
-English what the test is testing, e.g.
-
-    void Calling_Foo_Should_Increment_Bar()
-
-Render tests should describe what the produced image is:
-
-    void Rectangle_2px_Stroke_Filled()
diff --git a/docs/guidelines/toc.yml b/docs/guidelines/toc.yml
deleted file mode 100644
index 25bfbbf6bf..0000000000
--- a/docs/guidelines/toc.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Building Avalonia 
-  href: build.md
-- name: Contributing
-  href: contributing.md
\ No newline at end of file
diff --git a/docs/images/avalonia-video.png b/docs/images/avalonia-video.png
deleted file mode 100644
index 2af3fd4c917635bc85859ece74ddcb116df783c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 135848
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

diff --git a/docs/images/cross-platform.png b/docs/images/cross-platform.png
deleted file mode 100644
index 70ded84bf8bbc105975b92f05e1c2853147acef6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 45808
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
P_)&PM{Gj;0LEwJ@P?>c_

diff --git a/docs/images/hello-world-xaml.png b/docs/images/hello-world-xaml.png
deleted file mode 100644
index 0a3ecbf91f4b911a4eb7f268444aeb102674f034..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 125439
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
Eg3<VN;{X5v

diff --git a/docs/images/inspection-support.png b/docs/images/inspection-support.png
deleted file mode 100644
index 849c590cf581e461ea804a038aee10e317aeb29b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 231938
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

diff --git a/docs/images/screen.png b/docs/images/screen.png
deleted file mode 100644
index 3214a44267e42b5650cbb96a82f87b1ae0f255bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 27256
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

diff --git a/docs/index.md b/docs/index.md
deleted file mode 100644
index 37d95b203d..0000000000
--- a/docs/index.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# The Avalonia UI Framework
-
-Cross platform .NET UI Framework with bindings and XAML
-
-## Current status
-
-We're pleased to announce that Avalonia is now in alpha!
-
-What does alpha mean? Well, it means that it's now at a stage where you can have a play and hopefully create simple applications. There's now a Visual Studio Extension containing project and item templates that will help you get started, and there's an initial complement of controls. There's still a lot missing, and you will find bugs, and the API will change, but this represents the first time where we've made it somewhat easy to have a play and experiment with the framework.
-
-## How do I try it out
-
-The easiest way to try out Avalonia is to install the [Visual Studio Extension](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.AvaloniaforVisualStudio).
-
-This will add a Avalonia project template and a Window template to the standard Visual Studo "Add" dialog (yes, icons still to come :) ):
-
-![](images/add-dialogs.png)
-
-Creating a Avalonia Project will give you a simple project with a single XAML window. We even have a simple designer:
-
-![](images/hello-world-xaml.png)
-
-You can also find the project [on GitHub](https://github.com/AvaloniaUI/Avalonia/)
-
-## News
-
-You can read news about Avalonia on [Groky's blog](http://grokys.github.io/)
-
-## Cross Platform
-
-Fow now we can run on Windows, Linux and Mac.
-
-![](images/cross-platform.png)
-
-## Inspection support
-
-![](images/inspection-support.png)
diff --git a/docs/intro.md b/docs/intro.md
deleted file mode 100644
index 1303815736..0000000000
--- a/docs/intro.md
+++ /dev/null
@@ -1,225 +0,0 @@
-# Avalonia #
-
-...a next generation WPF?
-
-## Background ##
-
-As everyone who's involved in client-side .NET development knows, the past half decade have been a 
-very sad time. Where WPF started off as a game-changer, it now seems to have been all but forgotten.
-WinRT came along and took many of the lessons of WPF but it's currently not usable on the desktop.
-
-After a few months of trying to reverse-engineer WPF with the [Avalonia Project](https://github.com/grokys/Avalonia) I began to come to the same conclusion that I imagine Microsoft
-came to internally: for all its groundbreaking-ness at the time, WPF at its core is a dated mess,
-written for .NET 1 and barely updated to even bring it up-to-date with .NET 2 features such as
-generics.
-
-So I began to think: what if we were to start anew with modern C# features such as *(gasp)* 
-Generics, Observables, async, etc etc. The result of that thought is Avalonia 
-(https://github.com/grokys/Avalonia).
-
-##### DISCLAIMER
-This is really **early development pre-alpha-alpha** stuff. Everything is subject to 
-change, I'm not even sure if the performance characteristics of Rx make Observables suitable for 
-binding throughout a framework. *I'm writing this only to see if the idea of exploring these ideas 
-appeals to anyone else.*
-
-So what can it do so far? Not a whole lot right now. Here's the demo application:
-
-![](screen.png)
-
-## AvaloniaProperty ##
-
-AvaloniaProperty is the equivalent of WPF's DependencyProperty. 
-
-I'm not a big fan of DependencyProperty. My first thought was that I'd rather not have something 
-like this at all and just use basic INPC but DPs give you two important features: Inheritance and 
-Attached Properties. So the challenge became to improve it.
-
-Declaring a DependencyProperty in WPF looks something like this:
-
-```csharp
-public static readonly DependencyProperty PropertyDeclaration =
-DependencyProperty.Register(
-    "PropertyName",
-    typeof(PropertyType),
-    typeof(OwnerClass),
-    new FrameworkPropertyMetadata(
-        default(PropertyType),
-        FrameworkPropertyMetadataOptions.Inherits));
-
-public PropertyType PropertyName
-{
-    get { return (PropertyType)this.GetValue(PropertyDeclaration); }
-    set { this.SetValue(PropertyDeclaration, value); }
-}
-```
-
-Eww! All that just to declare a single property. There's **A LOT** of boilerplate there. With 
-generics and default parameters we can at least make it look a bit nicer:
-
-```csharp
-public static readonly AvaloniaProperty<PropertyType> PropertyDeclaration =
-AvaloniaProperty.Register<OwnerClass, PropertyType>("PropertyName", inherits: true);
-
-public PropertyType PropertyName
-{
-    get { return this.GetValue(PropertyDeclaration); }
-    set { this.SetValue(PropertyDeclaration, value); }
-}
-```
-
-What can we see here?
-
-- AvaloniaProperties are typed, so no more having to cast in the getter.
-- We pass the property type and owner class as a generic type to `Register()` so we don't have to 
-write `typeof()` twice.
-- We used default parameter values in `Register()` so that defaults don't have to be restated.
-
-*(ASIDE: maybe Roslyn will give us [var for fields](http://blogs.msdn.com/b/ericlippert/archive/2009/01/26/why-no-var-on-fields.aspx)...)? Lets hope...*
-
-## Binding
-
-Binding in Avalonia uses Reactive Extensions' [IObservable](http://msdn.microsoft.com/library/dd990377.aspx). To bind an IObservable to a property, use the `Bind()` method:
-
-```csharp
-control.Bind(BorderProperty, someObject.SomeObservable());
-```
-
-Note that because AvaloniaProperty is typed, we can check that the observable is of the correct type.
-
-To get the value of a property as an observable, call `GetObservable()`:
-
-```csharp
-var observable = control.GetObservable(Control.FooProperty);
-```
-
-## Attached Properties and Binding Pt 2
-
-Attached properties are set just like in WPF, using `SetValue()`. But what about the `[]` operator, also called [index initializer](https://roslyn.codeplex.com/wikipage?title=Language%20Feature%20Status&referringTitle=Home) (see *C# feature descriptions*)? The upcoming version of C# will provide a new feature that allows us to use `[]` array subscripts in object initializers. An example on how to make use of it will look like this:
-
-```csharp
-var control = new Control
-{
-    Property1 = "Foo",
-    [Attached.Property] = "Bar",
-}
-```
-
-
-Nice... Lets take this further:
-
-```csharp
-var control = new Control
-{
-    Property1 = "Foo",
-    [Attached.Property] = "Bar",
-    [!Property2] = something.SomeObservable,
-}
-```
-
-Yep, by putting a bang in front of the property name you can **bind** to a property (attached or 
-otherwise) from the object initializer.
-
-Binding to a property on another control? Easy:
-
-```csharp
-var control = new Control
-{
-    Property1 = "Foo",
-    [Attached.Property] = "Bar",
-    [!Property2] = anotherControl[!Property1],
-}
-```
-
-Two way binding? Just add two bangs:
-
-```csharp
-var control = new Control
-{
-    Property1 = "Foo",
-    [Attached.Property] = "Bar",
-    [!!Property2] = anotherControl[!!Property1],
-}
-```
-
-## Visual and Logical trees
-
-Avalonia uses the same visual/logical tree separation that is used by WPF (and to some extent HTML 
-is moving in this direction with the Shadow DOM). The manner of accessing the two trees is slightly
-different however. Rather than using Visual/LogicalTreeHelper you can cast any control to an 
-`IVisual` or `ILogical` to reveal the tree operations. There's also the VisualExtensions class which
-provides some useful extension methods such as `GetVisualAncestor<T>(this IVisual visual)` or 
-`GetVisualAt(this IVisual visual, Point p)`.
-
-Again like WPF, Controls are lookless with the visual appearance being defined by the Template 
-property, which is determined by...
-
-## Styles
-
-Styles in Avalonia diverge from styles in WPF quite a lot, and move towards a more CSS-like system.
-It's probably easiest to show in an example. Here is the default style for the CheckBox control:
-
-```csharp
-new Style(x => x.OfType<CheckBox>())
-{
-	Setters = new[]
-	{
-	    new Setter(Button.TemplateProperty, ControlTemplate.Create<CheckBox>(this.Template))
-	}
-};
-
-new Style(x => x.OfType<CheckBox>().Template().Id("checkMark"))
-{
-	Setters = new[]
-	{
-	    new Setter(Shape.IsVisibleProperty, false)
-	}
-};
-	
-new Style(x => x.OfType<CheckBox>().Class(":checked").Template().Id("checkMark"))
-{
-	Setters = new[]
-	{
-	    new Setter(Shape.IsVisibleProperty, true)
-	}
-};
-```
-
-Let's see what's happening here:
-
-```csharp
-new Style(x => x.OfType<CheckBox>())
-```
-
-The constructor for the Style class defines the selector. Here we're saying "*this style applies to 
-all controls in the the visual tree of type CheckBox*". A more complex selector:
-
-```csharp
-new Style(x => x.OfType<CheckBox>().Class(":checked").Template().Id("checkMark"))
-```
-
-This selector matches *"all controls with Id == "checkMark" in the template of a CheckBox with the
-class `:checked`"*. Each control has an Id property, and Ids in templates are considered to be in a
-separate namespace.
-
-Inside the Style class we then have a collection of setters similar to WPF. 
-
-This system means that there's no more need for WPF's Triggers - the styling works with classes 
-(which are arbitrary strings) similar to CSS. Similar to CSS, classes with a leading `:` are set
-by the control itself in response to events like `mouseover` and `click`.
-
-Similar to WPF, styles can be defined on each control, with a global application style collection
-at the root. This means that different subsections of the visual tree can have a completely 
-different look-and-feel.
-
-## XAML
-
-As you can see, all of the examples here are defined in code - but a XAML implementation is being
-worked on. The current progress can be reviewed at [https://github.com/SuperJMN/Avalonia](https://github.com/SuperJMN/Avalonia).
-
-## That's all for now
-
-There's a lot more to see, and even more to do, so if you want to have a play you can get the code 
-here: [https://github.com/grokys/Avalonia](https://github.com/grokys/Avalonia)
-
-Feedback is always welcome!
diff --git a/docs/serve.cmd b/docs/serve.cmd
deleted file mode 100644
index 8d19925938..0000000000
--- a/docs/serve.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-docfx serve _site
diff --git a/docs/spec/architecture.md b/docs/spec/architecture.md
deleted file mode 100644
index 1245bdbfd4..0000000000
--- a/docs/spec/architecture.md
+++ /dev/null
@@ -1,101 +0,0 @@
-# Avalonia Architecture
-
-At the highest level, avalonia is split up into a "core" and two "subsystems".
-
-* The core is a set of Portable Class Libraries that can run anywhere.
-* The Windowing subsystem is responsible for creating windows, handling input and scheduling timers.
-* The Rendering subsystem is responsible for drawing.
-
-There are currently two Windowing and two Rendering subsystems:
-
-## Windowing Subsystems
-
-* Avalonia.Win32 uses the Win32 API (this also works on 64-bit windows).
-* Avalonia.Gtk uses the GTK2 toolkit and can be run on both Windows and *nix.
-
-## Rendering Subsystems
-
-* Avalonia.Direct2D1 uses Microsoft's Direct2D1 API.
-* Avalonia.Cairo uses Cairo for rendering and Pango for text layout.
-
-## Core
-
-The Avalonia core is split up into several assemblies. Note that they're not separated like this 
-because you will want to use them separately; they are separate to maintain separation of concerns 
-and a layered architecture. It is fully possible that they will be ILMerged into a single assembly 
-for distribution.
-
-The assemblies are as follows, from lowest to highest level:
-
-### Avalonia.Base
-
-The main classes in this assembly are `AvaloniaObject` and `AvaloniaProperty`.
-
-These are Avalonia's versions of XAML's `DependencyObject` and `DependencyProperty`. It also 
-defines a `AvaloniaDispatcher` which is - surprise - our version of XAML's `Dispatcher`.
-
-### Avalonia.Animation
-
-The main class in the assembly is `Animatable`.
-
-Allows AvaloniaProperties to be animated and provides various utilities related to animation.
-
-### Avalonia.Visuals
-
-The main class in this assembly is `Visual` and its interface `IVisual`.
-
-Defines the "Visual" layer which is a 2D scene graph, with each node being a `IVisual`/`Visual`. 
-Also defines primitives such as `Point`/`Rect`/`Matrix`, plus `Geometry`, `Bitmap`, `Brush` and 
-whatever else you might need in order to draw to the screen.
-
-### Avalonia.Styling
-
-The main interface in this assembly is `IStyleable`.
-
-Defines a CSS-like system for styling controls.
-
-### Avalonia.Layout
-
-The main class in this assembly is `Layoutable`.
-
-Defines a XAML-like layout system using `Measure` and `Arrange`. Also defines `LayoutManager` which 
-carries out the actual layout.
-
-### Avalonia.Interactivity
-
-The main class in this assembly is `Interactive`.
-
-Defines a system of routed events similar to those found in XAML.
-
-### Avalonia.Input
-
-The main class in this assembly is `InputElement`.
-
-Handles input from various devices such as `MouseDevice` and `KeyboardDevice`, together with
-`FocusManager` for tracking input focus. Input is sent from the windowing subsystem to 
-`InputManager` in the form of "Raw" events which are then translated into routed events for the 
-controls.
-
-### Avalonia.Controls
-
-There are many important classes in this assembly, but the root of them is `Control`.
-
-Finally defines the actual controls. The `Control` class is analogous to WPF's `FrameworkElement`
-whereas the `TemplatedControl` class is our version of WPF's `Control`. This is also where you'll 
-find all of the basic controls you'd expect.
-
-### Avalonia.Themes.Default
-
-Defines a default theme using a set of styles and control templates.
-
-### Avalonia.Application
-
-The main class in this assembly is `Application`.
-
-This ties everything together, setting up the service locator, defining the default theme etc.
-
-### Avalonia.Diagnostics
-
-Adds utilities for debugging avalonia applications, such as `DevTools` which provides a Snoop/WPF
-Inspector/Browser DevTools window for inspecting the state of the application.
-
diff --git a/docs/spec/binding-from-code.md b/docs/spec/binding-from-code.md
deleted file mode 100644
index 76f3aa55c9..0000000000
--- a/docs/spec/binding-from-code.md
+++ /dev/null
@@ -1,156 +0,0 @@
-# Binding from Code
-
-Avalonia binding from code works somewhat differently to WPF/UWP. At the low level, Avalonia's
-binding system is based on Reactive Extensions' `IObservable` which is then built upon by XAML
-bindings (which can also be instantiated in code).
-
-## Binding to an observable
-
-You can bind a property to an observable using the `AvaloniaObject.Bind` method:
-
-```csharp
-// We use an Rx Subject here so we can push new values using OnNext
-var source = new Subject<string>();
-var textBlock = new TextBlock();
-
-// Bind TextBlock.Text to source
-textBlock.Bind(TextBlock.TextProperty, source);
-
-// Set textBlock.Text to "hello"
-source.OnNext("hello");
-// Set textBlock.Text to "world!"
-source.OnNext("world!");
-```
-
-## Binding priorities
-
-You can also pass a priority to a binding. *Note: Priorities only apply to styled properties: they*
-*are ignored for direct properties.*
-
-The priority is passed using the `BindingPriority` enum, which looks like this:
-
-```csharp
-/// <summary>
-/// The priority of a binding.
-/// </summary>
-public enum BindingPriority
-{
-    /// <summary>
-    /// A value that comes from an animation.
-    /// </summary>
-    Animation = -1,
-
-    /// <summary>
-    /// A local value: this is the default.
-    /// </summary>
-    LocalValue = 0,
-
-    /// <summary>
-    /// A triggered style binding.
-    /// </summary>
-    /// <remarks>
-    /// A style trigger is a selector such as .class which overrides a
-    /// <see cref="TemplatedParent"/> binding. In this way, a basic control can have
-    /// for example a Background from the templated parent which changes when the
-    /// control has the :pointerover class.
-    /// </remarks>
-    StyleTrigger,
-
-    /// <summary>
-    /// A binding to a property on the templated parent.
-    /// </summary>
-    TemplatedParent,
-
-    /// <summary>
-    /// A style binding.
-    /// </summary>
-    Style,
-
-    /// <summary>
-    /// The binding is uninitialized.
-    /// </summary>
-    Unset = int.MaxValue,
-}
-```
-
-Bindings with a priority with a smaller number take precedence over bindings with a higher value
-priority, and bindings added more recently take precedence over other bindings with the same
-priority. Whenever the binding produces `AvaloniaProperty.UnsetValue` then the next binding in the
-priority order is selected.
-
-## Setting a binding in an object initializer
-
-It is often useful to set up bindings in object initializers. You can do this using the indexer:
-
-```csharp
-var source = new Subject<string>();
-var textBlock = new TextBlock
-{
-    Foreground = Brushes.Red,
-    MaxWidth = 200,
-    [!TextBlock.TextProperty] = source.ToBinding(),
-};
-```
-
-Using this method you can also easily bind a property on one control to a property on another:
-
-```csharp
-var textBlock1 = new TextBlock();
-var textBlock2 = new TextBlock
-{
-    Foreground = Brushes.Red,
-    MaxWidth = 200,
-    [!TextBlock.TextProperty] = textBlock1[!TextBlock.TextProperty],
-};
-```
-
-Of course the indexer can be used outside object initializers too:
-
-```csharp
-textBlock2[!TextBlock.TextProperty] = textBlock1[!TextBlock.TextProperty];
-```
-
-# Transforming binding values
-
-Because we're working with observables, we can easily transform the values we're binding!
-
-```csharp
-var source = new Subject<string>();
-var textBlock = new TextBlock
-{
-    Foreground = Brushes.Red,
-    MaxWidth = 200,
-    [!TextBlock.TextProperty] = source.Select(x => "Hello " + x).ToBinding(),
-};
-```
-
-# Using XAML bindings from code
-
-Sometimes when you want the additional features that XAML bindings provide, it's easier to use XAML bindings from code. For example, using only observables you could bind to a property on `DataContext` like this:
-
-```csharp
-var textBlock = new TextBlock();
-var viewModelProperty = textBlock.GetObservable(TextBlock.DataContext)
-    .OfType<MyViewModel>()
-    .Select(x => x?.Name);
-textBlock.Bind(TextBlock, viewModelProperty);
-```
-
-However, it might be preferable to use a XAML binding in this case:
-
-```csharp
-var textBlock = new TextBlock
-{
-    [!TextBlock.TextProperty] = new Binding("Name")
-};
-```
-
-By using XAML binding objects, you get access to binding to named controls and [all the other features that XAML bindings bring](binding-from.xaml.md):
-
-```csharp
-var textBlock = new TextBlock
-{
-    [!TextBlock.TextProperty] = new Binding("Text") { ElementName = "other" }
-};
-```
-
diff --git a/docs/spec/binding-from-xaml.md b/docs/spec/binding-from-xaml.md
deleted file mode 100644
index 143e3627c8..0000000000
--- a/docs/spec/binding-from-xaml.md
+++ /dev/null
@@ -1,99 +0,0 @@
-# Binding from XAML
-
-Binding from XAML works on the whole the same as in other XAML frameworks: you use the `{Binding}`
-markup extension. Avalonia does have some extra syntacic niceties however. Here's an overview of
-what you can currently do in Avalonia:
-
-## Binding to a property on the DataContext
-
-By default a binding binds to a property on the `DataContext`, e.g.:
-
-```xml
-<!-- Binds to the tb.DataContext.Name property -->
-<TextBlock Name="tb" Text="{Binding Name}"/>
-<!-- Which is the same as ('Path' is optional) -->
-<TextBlock Name="tb" Text="{Binding Path=Name}"/>
-```
-
-An empty binding binds to DataContext itself
-
-```xml
-<!-- Binds to the tb.DataContext property -->
-<TextBlock Name="tb" Text="{Binding}"/>
-<!-- Which is the same as -->
-<TextBlock Name="tb" Text="{Binding .}"/>
-```
-
-This usage is identical to WPF/UWP etc.
-
-## Two way bindings and more
-
-You can also specify a binding `Mode`:
-
-```xml
-<!-- Bind two-way to the property (although this is actually the default binding mode for
-     TextBox.Text) so strictly speaking it's unnecessary here) -->
-<TextBox Name="tb" Text="{Binding Name, Mode=TwoWay}"/>
-```
-
-This usage is identical to WPF/UWP etc.
-
-## Binding to a property on the templated parent
-
-When you're creating a control template and you want to bind to the templated parent you can use:
-
-```xml
-<TextBlock Name="tb" Text="{TemplateBinding Caption}"/>
-<!-- Which is short for -->
-<TextBlock Name="tb" Text="{Binding Caption, RelativeSource={RelativeSource TemplatedParent}}"/>
-```
-
-This usage is identical to WPF/UWP etc.
-
-## Binding to a named control
-
-If you want to bind to a property on another (named) control, you can use `ElementName` as in
-WPF/UWP:
-
-```xml
-<!-- Binds to the Tag property of a control named "other" -->
-<TextBlock Text="{Binding Tag, ElementName=other}"/>
-```
-
-However Avalonia also introduces a shorthand syntax for this:
-
-```xml
-<TextBlock Text="{Binding #other.Tag}"/>
-```
-
-## Negating bindings
-
-You can also negate the value of a binding using the `!` operator:
-
-```xml
-<TextBox IsEnabled="{Binding !HasErrors}"/>
-```
-
-Here, the `TextBox` will only be enabled when the view model signals that it has no errors. Behind
-the scenes, Avalonia tries to convert the incoming value to a boolean, and if it can be converted
-it negates the value. If the incoming value cannot be converted to a boolean then no value will be
-pushed to the binding target.
-
-This syntax is specific to Avalonia.
-
-## Binding to tasks and observables
-
-You can subscribe to the result of a task or an observable by using the `^` stream binding operator.
-
-```xml
-<!-- If DataContext.Name is an IObservable<string> then this will bind to the length of each
-     string produced by the observable as each value is produced -->
-<TextBlock Text="{Binding Name^.Length}"/>
-```
-
-This syntax is specific to Avalonia.
-
-*Note: the stream operator is actually extensible, see
-[here](https://github.com/AvaloniaUI/Avalonia/blob/master/src/Markup/Avalonia.Markup/Data/Plugins/IStreamPlugin.cs)
-for the interface to implement and [here](https://github.com/AvaloniaUI/Avalonia/blob/master/src/Markup/Avalonia.Markup/Data/ExpressionObserver.cs#L47)
-for the registration.*
diff --git a/docs/spec/defining-properties.md b/docs/spec/defining-properties.md
deleted file mode 100644
index d9e925aa1c..0000000000
--- a/docs/spec/defining-properties.md
+++ /dev/null
@@ -1,199 +0,0 @@
-# Defining Properties
-
-If you are creating a control, you will want to define properties on your
-control. The process in Avalonia is broadly similar to other XAML languages
-with a few differences - the main one being that Perpsex's equivalent of
-`DependencyProperty` is called `StyledProperty`.
-
-## Registering Styled Properties
-
-A styled property is analogous to a `DependencyProperty` in other XAML
-frameworks.
-
-You register a styled property by calling `AvaloniaProperty.Register` and
-storing the result in a `static readonly` field. You then create a standard C#
-property to access it.
-
-Here's how the `Border` control defines its `Background` property:
-
-```c#
-    public static readonly StyledProperty<Brush> BackgroundProperty =
-        AvaloniaProperty.Register<Border, Brush>(nameof(Background));
-
-    public Brush Background
-    {
-        get { return GetValue(BackgroundProperty); }
-        set { SetValue(BackgroundProperty, value); }
-    }
-```
-
-The `AvaloniaProperty.Register` method also accepts a number of other parameters:
-
-- `defaultValue`: This gives the property a default value. Be sure to only pass
-value types and immutable types here as passing a reference type will cause the
-same object to be used on all instances on which the property is registered.
-- `inherits`: Specified that the property's default value should come from
-the parent control.
-- `defaultBindingMode`: The default binding mode for the property. Can be set to
-`OneWay`, `TwoWay`, `OneTime` or `OneWayToSource`.
-- `validate`: A validation/coercion function of type
-`Func<TOwner, TValue, TValue>`. The function accepts the instance of the class
-on which the property is being set and the value and returns the coerced value
-or throws an exception for an invalid value.
-
-## Using a StyledProperty on Another Class
-
-Sometimes the property you want to add to your control already exists on another
-control, `Background` being a good example. To register a property defined on
-another control, you call `StyledProperty.AddOwner`:
-
-
-```c#
-    public static readonly StyledProperty<Brush> BackgroundProperty =
-        Border.BackgroundProperty.AddOwner<Panel>();
-
-    public Brush Background
-    {
-        get { return GetValue(BackgroundProperty); }
-        set { SetValue(BackgroundProperty, value); }
-    }
-```
-
-*Note: Unlike WPF, a property must be registered on a class otherwise it cannot
-be set on an object of that class.*
-
-## Attached Properties
-
-Attached properties are defined almost identically to styled properties except
-that they are registered using the `RegisterAttached` method and their accessors
-are defined as static methods.
-
-Here's how `Grid` defines its `Grid.Column` attached property:
-
-```c#
-    public static readonly AttachedProperty<int> ColumnProperty =
-        AvaloniaProperty.RegisterAttached<Grid, Control, int>("Column");
-
-    public static int GetColumn(Control element)
-    {
-        return element.GetValue(ColumnProperty);
-    }
-
-    public static void SetColumn(Control element, int value)
-    {
-        element.SetValue(ColumnProperty, value);
-    }
-```
-
-## Readonly AvaloniaProperties
-
-To create a readonly property you use the `AvaloniaProperty.RegisterDirect`
-method. Here is how `Visual` registers the readonly `Bounds` property:
-
-```c#
-    public static readonly DirectProperty<Visual, Rect> BoundsProperty =
-        AvaloniaProperty.RegisterDirect<Visual, Rect>(
-            nameof(Bounds),
-            o => o.Bounds);
-
-    private Rect _bounds;
-
-    public Rect Bounds
-    {
-        get { return _bounds; }
-        private set { SetAndRaise(BoundsProperty, ref _bounds, value); }
-    }
-```
-
-As can be seen, readonly properties are stored as a field on the object. When
-registering the property, a getter is passed which is used to access the
-property value through `GetValue` and then `SetAndRaise` is used to notify
-listeners to changes to the property.
-
-## Direct AvaloniaProperties
-
-As its name suggests, `RegisterDirect` isn't just used for registering readonly
-properties. You can also pass a *setter* to `RegisterDirect` to expose a
-standard C# property as a Avalonia property.
-
-A `StyledProperty` which is registered using `AvaloniaProperty.Register`
-maintains a prioritized list of values and bindings that allow styles to work.
-However, this is overkill for many properties, such as `ItemsControl.Items` -
-this will never be styled and the overhead involved with styled properties is
-unnecessary.
-
-Here is how `ItemsControl.Items` is registered:
-
-```c#
-    public static readonly DirectProperty<ItemsControl, IEnumerable> ItemsProperty =
-        AvaloniaProperty.RegisterDirect<ItemsControl, IEnumerable>(
-            nameof(Items),
-            o => o.Items,
-            (o, v) => o.Items = v);
-
-    private IEnumerable _items = new AvaloniaList<object>();
-
-    public IEnumerable Items
-    {
-        get { return _items; }
-        set { SetAndRaise(ItemsProperty, ref _items, value); }
-    }
-```
-
-
-Direct properties are a lightweight version of styled properties that support
-the following:
-
-- AvaloniaObject.GetValue
-- AvaloniaObject.SetValue for non-readonly properties
-- PropertyChanged
-- Binding (only with LocalValue priority)
-- GetObservable
-- AddOwner
-- Metadata
-
-They don't support the following:
-
-- Validation/Coercion (although this could be done in the property setter)
-- Overriding default values.
-- Inherited values
-
-## Using a DirectProperty on Another Class
-
-In the same way that you can call `AddOwner` on a styled property, you can also
-add an owner to a direct property. Because direct properties reference fields
-on the control, you must also add a field for the property:
-
-```c#
-    public static readonly DirectProperty<MyControl, IEnumerable> ItemsProperty =
-        ItemsControl.ItemsProperty.AddOwner<MyControl>(
-            o => o.Items,
-            (o, v) => o.Items = v);
-
-    private IEnumerable _items = new AvaloniaList<object>();
-
-    public IEnumerable Items
-    {
-        get { return _items; }
-        set { SetAndRaise(ItemsProperty, ref _items, value); }
-    }
-```
-
-## When to use a Direct vs a Styled Property
-
-Direct properties have advantages and disadvantages:
-
-Pros:
-- No additional object is allocated per-instance for the property
-- Property getter is a standard C# property getter
-- Property setter is is a standard C# property setter that raises an event.
-
-Cons:
-- Cannot inherit value from parent control
-- Cannot take advantage of Avalonia's styling system
-- Property value is a field and as such is allocated whether the property is
-set on the object or not
-
-So use direct properties when you have the following requirements:
-- Property will not need to be styled
-- Property will usually or always have a value
diff --git a/docs/spec/logging.md b/docs/spec/logging.md
deleted file mode 100644
index 60b8689d84..0000000000
--- a/docs/spec/logging.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# Avalonia Logging
-
-Avalonia uses [Serilog](https://github.com/serilog/serilog) for logging via
-the Avalonia.Logging.Serilog assembly.
-
-The following method should be present in your App.xaml.cs file:
-
-```C#
-private void InitializeLogging()
-{
-#if DEBUG
-    SerilogLogger.Initialize(new LoggerConfiguration()
-        .MinimumLevel.Warning()
-        .WriteTo.Trace(outputTemplate: "{Area}: {Message}")
-        .CreateLogger());
-#endif
-}
-```
-
-By default, this logging setup will write log messages with a severity of
-`Warning` or higher to `System.Diagnostics.Trace`. See the [Serilog
-documentation](https://github.com/serilog/serilog/wiki/Configuration-Basics)
-for more information on the options here.
-
-## Areas
-
-Each Avalonia log message has an "Area" that can be used to filter the log to
-include only the type of events that you are interested in. These are currently:
-
-- Property
-- Binding
-- Visual
-- Layout
-- Control
-
-To limit the log output to a specific area you can add a filter; for example
-to enable verbose logging but only about layout:
-
-```C#
-SerilogLogger.Initialize(new LoggerConfiguration()
-    .Filter.ByIncludingOnly(Matching.WithProperty("Area", LogArea.Layout))
-    .MinimumLevel.Verbose()
-    .WriteTo.Trace(outputTemplate: "{Area}: {Message}")
-    .CreateLogger());
-```
-
-## Removing Serilog
-
-If you don't want a dependency on Serilog in your application, simply remove
-the reference to Avalonia.Logging.Serilog and the code that initializes it. If
-you do however still want some kinda of logging, there are two steps:
-
-- Implement `Avalonia.Logging.ILogSink`
-- Assign your implementation to `Logger.Sink`
diff --git a/docs/spec/styles.md b/docs/spec/styles.md
deleted file mode 100644
index c1b27d6418..0000000000
--- a/docs/spec/styles.md
+++ /dev/null
@@ -1,111 +0,0 @@
-# Styling in Avalonia
-
-The main difference between Avalonia and existing XAML toolkits such as WPF and
-UWP is in styling. Styling in Avalonia uses a CSS-like system that aims to be
-more powerful and flexible than existing XAML styling systems. For convenience
-for the rest of this document we'll refer to existing XAML toolkit's styling as
-"WPF styling" as that's where it originated.
-
-## Basics
-
-- Styles are defined on the `Control.Styles` collection (as opposed to in
-`ResourceDictionaries` in WPF).
-- Styles have a `Selector` and a collection of `Setter`s
-- Selector works like a CSS selector.
-- Setters function like WPF's setters.
-- Styles are applied to a control and all its descendants, depending on whether
-  the selector matches.
-
-## Simple example
-
-Make all `Button`s in a `StackPanel` have a blue `Background`:
-
-```xaml
-<StackPanel>
-  <StackPanel.Styles>
-    <Style Selector="Button">
-      <Setter Property="Button.Background" Value="Blue"/>
-    </Style>
-  </StackPanel.Styles>
-  <Button>I will have a blue background.</Button>
-</StackPanel>
-```
-
-This is very similar to WPF, except `TargetType` is replaced by `Selector`.
-
-_Note that currently (as of Alpha 2) you **always** need to specify the fully
-qualified property name (i.e. `Button.Background` instead of simply
-`Background`). This restriction will be lifted in future._
-
-## Style Classes
-
-As in CSS, controls can be given *style classes* which can be used in selectors:
-
-```xaml
-<StackPanel>
-  <StackPanel.Styles>
-    <Style Selector="Button.blue">
-      <Setter Property="Button.Background" Value="Blue"/>
-    </Style>
-  </StackPanel.Styles>
-  <Button Classes="blue">I will have a blue background.</Button>
-  <Button>I will not.</Button>
-</StackPanel>
-```
-
-Each control can be given 0 or more style classes. This is different to WPF
-where only a single style can be applied to a control: in Avalonia any number
-of separate styles can be applied to a control. If more than one style affects
-a particular property, the style closest to the control will take precedence.
-
-Style classes can also be manipulated in code using the `Classes` collection:
-
-```csharp
-control.Classes.Add("blue");
-control.Classes.Remove("red");
-```
-
-## Pseudoclasses
-
-Also as in CSS, controls can have pseudoclasses; these are classes that are
-defined by the control itself rather than by the user. Pseudoclasses start
-with a `:` character.
-
-One example of a pseudoclass is the `:pointerover`
-pseudoclass (`:hover` in CSS - we may change to that in future).
-
-Pseudoclasses provide the functionality of `Triggers` in WPF and
-`VisualStateManager` in UWP:
-
-```xaml
-<StackPanel>
-  <StackPanel.Styles>
-    <Style Selector="Button:pointerover">
-      <Setter Property="Button.Foreground" Value="Red"/>
-    </Style>
-  </StackPanel.Styles>
-  <Button>I will have red text when hovered.</Button>
-</StackPanel>
-```
-
-Other pseudoclasses include `:focus`, `:disabled`, `:pressed` for buttons,
-`:checked` for checkboxes etc.
-
-## Named Controls
-
-Named controls can be selected using `#` as in CSS, e.g. `Button#Name`.
-
-## Children
-
-As with CSS, you can select children and descendants:
-
-- `StackPanel > Button#Foo` selects a `Button` named `"Foo"` that is the child
-  of a `StackPanel`.
-- `StackPanel Button.foo` selects all `Button`s with the `foo` class that are
-  descendants of a `StackPanel`.
-
-## Templates
-
-You can select controls in the template of a lookless control by using the
-`/template/` selector, so `Button /template/ Border#outline` selects `Border`
-controls named `"outline"` in the template of a `Button`.
diff --git a/docs/spec/toc.yml b/docs/spec/toc.yml
deleted file mode 100644
index b0981017e0..0000000000
--- a/docs/spec/toc.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-- name: Avalonia Architecture
-  href: architecture.md
-- name: Styling in Avalonia
-  href: styles.md
-- name: Defining Properties
-  href: defining-properties.md
-- name: Working with Properties
-  href: working-with-properties.md
-- name: Logging
-  href: logging.md
-- name: Binding from XAML
-  href: binding-from-xaml.md
-- name: Binding from Code
-  href: binding-from-code.md
diff --git a/docs/spec/working-with-properties.md b/docs/spec/working-with-properties.md
deleted file mode 100644
index a8a383b733..0000000000
--- a/docs/spec/working-with-properties.md
+++ /dev/null
@@ -1,102 +0,0 @@
-# Working with Properties
-
-Avalonia controls expose their properties as standard CLR properties, so for
-reading and writing values there's no surprises:
-
-```c#
-    // Create a TextBlock and set its Text property.
-    var textBlock = new TextBlock();
-    textBlock.Text = "Hello World!";
-```
-
-
-However there's a lot more you can do with properties such as subscribing to
-changes on the property, and binding.
-
-# Subscribing to Changes to a Property
-
-You can subscribe to changes on a property by calling the `GetObservable`
-method. This returns an `IObservable<T>` which can be used to listen for changes
-to the property:
-
-```c#
-    var textBlock = new TextBlock();
-    var text = textBlock.GetObservable(TextBlock.TextProperty);
-```
-
-Each property that can be subscribed to has a static readonly field called
-`[PropertyName]Property` which is passed to `GetObservable` in order to
-subscribe to the property's changes.
-
-`IObservable` (part of Reactive Extensions, or rx for short) is out of scope
-for this guide, but here's an example which uses the returned observable to
-print a message with the changing property values to the console:
-
-```c#
-    var textBlock = new TextBlock();
-    var text = textBlock.GetObservable(TextBlock.TextProperty);
-    text.Subscribe(value => Console.WriteLine(value + " Changed"));
-```
-
-When the returned observable is subscribed, it will return the current value
-of the property immediately and then push a new value each time the property
-changes. If you don't want the current value, you can use the rx `Skip`
-operator:
-
-```c#
-    var text = textBlock.GetObservable(TextBlock.TextProperty).Skip(1);
-```
-
-# Binding a property
-
-Observables don't just go one way! You can also use them to bind properties.
-For example here we create two `TextBlock`s and bind the second's `Text`
-property to the first:
-
-```c#
-  var textBlock1 = new TextBlock();
-  var textBlock2 = new TextBlock();
-
-  // Get an observable for the first text block's Text property.
-  var source = textBlock1.GetObservable(TextBlock.TextProperty);
-
-  // And bind it to the second.
-  textBlock2.Bind(TextBlock.TextProperty, source);
-
-  // Changes to the first TextBlock's Text property will now be propagated
-  // to the second.
-  textBlock1.Text = "Goodbye Cruel World";
-
-  // Prints "Goodbye Cruel World"
-  Console.WriteLine(textBlock2.Text);
-```
-
-To read more about creating bindings from code, see [Binding from Code](binding-from-code.md).
-
-# Subscribing to a Property on Any Object
-
-The `GetObservable` method returns an observable that tracks changes to a
-property on a single instance. However, if you're writing a control you may
-want to implement an `OnPropertyChanged` method. In WPF this is done by passing
-a static `PropertyChangedCallback` to the `DependencyProperty` registration
-method, but in Avalonia it's slightly different (and hopefully easier!)
-
-The field which defines the property is derived from `AvaloniaProperty` and this
-has a `Changed` observable which is fired every time the property changes on
-*any* object. In addition there is an `AddClassHandler` extension method which
-can automatically route the event to a method on your control.
-
-For example if you want to listen to changes to your control's `Foo` property
-you'd do it like this:
-
-```c#
-    static MyControl()
-    {
-        FooProperty.Changed.AddClassHandler<MyControl>(x => x.FooChanged);
-    }
-
-    private void FooChanged(AvaloniaPropertyChangedEventArgs e)
-    {
-        // The 'e' parameter describes what's changed.
-    }
-```
diff --git a/docs/template/partials/footer.tmpl.partial b/docs/template/partials/footer.tmpl.partial
deleted file mode 100644
index c9b8ba35e3..0000000000
--- a/docs/template/partials/footer.tmpl.partial
+++ /dev/null
@@ -1,13 +0,0 @@
-{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
-
-<footer>
-  <div class="grad-bottom"></div>
-  <div class="footer">
-    <div class="container">
-      <span class="pull-right">
-        <a href="#top">Back to top</a>
-      </span>
-      <span>Copyright © 2016 The Avalonia Project<br>Generated by <strong>DocFX</strong></span>
-    </div>
-  </div>
-</footer>
diff --git a/docs/toc.yml b/docs/toc.yml
deleted file mode 100644
index 3720b4fcbe..0000000000
--- a/docs/toc.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- name: Home
-  href: index.md
-- name: Getting Started
-  href: tutorial/
-- name: Guidelines
-  href: guidelines/
-- name: Specifications
-  href: spec/
-- name: API Documentation
-  href: api/
diff --git a/docs/tutorial/from-wpf.md b/docs/tutorial/from-wpf.md
deleted file mode 100644
index d244fb076b..0000000000
--- a/docs/tutorial/from-wpf.md
+++ /dev/null
@@ -1,161 +0,0 @@
-# Avalonia for WPF Developers
-
-Avalonia is in general very similar to WPF, but you will find differences. Here
-are the most common:
-
-## Styling
-
-The most obvious difference from other XAML frameworks is that Avalonia uses a
-[CSS-like styling system](../spec/styles.md). Styles aren't stored in a
-`Resources` collection as in WPF, they are stored in a separate `Styles`
-collection:
-
-    <UserControl>
-        <UserControl.Styles>
-            <!-- Make TextBlocks with the h1 style class have a font size of 24 points -->
-            <Style Selector="TextBlock.h1">
-                <Setter Property="FontSize" Value="24"/>
-            </Style>
-        </UserControl.Styles>
-        <TextBlock Classes="h1">Header</TextBlock>
-    <UserControl>    
-
-## DataTemplates
-
-As styles aren't stored  in `Resources`, neither are `DataTemplates` ([in fact
-there is no `Resources` collection](#resources)). Instead, `DataTemplates` are
-placed in a `DataTemplates` collection on each control (and on `Application`):
-
-    <UserControl xmlns:viewmodels="clr-namespace:MyApp.ViewModels;assembly=MyApp">
-        <UserControl.DataTemplates>
-            <DataTemplate DataType="viewmodels:FooViewModel">
-                <Border Background="Red" CornerRadius="8">
-                    <TextBox Text="{Binding Name}"/>
-                </Border>
-            </DataTemplate>
-        </UserControl.DataTemplates>
-        <!-- Assuming that DataContext.Foo is an object of type
-             MyApp.ViewModels.FooViewModel then a red border with a corner
-             radius of 8 containing a TextBox will be displayed here -->
-        <ContentControl Content="{Binding Foo}"/>
-    <UserControl>    
-
-Data templates in Avalonia can also target interfaces and derived classes (which
-cannot be done in WPF) and so the order of `DataTemplate`s can be important:
-`DataTemplate`s  within the same collection are evaluated in declaration order
-so you need to place them from most-specific to least-specific as you would in
-code.
-
-## HierachicalDataTemplate
-
-WPF's `HierarchicalDataTemplate` is called `TreeDataTemplate` in Avalonia (as the
-former is difficult to type!). The two are almost entirely equivalent except
-that the `ItemTemplate` property is not present in Avalonia.
-
-## UIElement, FrameworkElement and Control
-
-WPF's `UIElement` and `FrameworkElement` are non-templated control base classes,
-which roughly equate to the Avalonia `Control` class. WPF's `Control` class on
-the other hand is a templated control - Avalonia's equivalent of this is
-`TemplatedControl`.
-
-So to recap:
-
-- `UIElement`: `Control`
-- `FrameworkElement`: `Control`
-- `Control`: `TemplatedControl`
-
-## DependencyProperty
-
-The Avalonia equivalent of `DependencyProperty` is `StyledProperty`, however
-Avalonia [has a richer property system than WPF](../spec/defining-properties.md),
-and includes `DirectProperty` for turning standard CLR properties into Avalonia
-properties. The common base class of `StyledProperty` and `DirectProperty`
-is `AvaloniaProperty`.
-
-## Grid
-
-Column and row definitions can be specified in Avalonia using strings, avoiding
-the clunky syntax in WPF:
-
-    <Grid ColumnDefinitions="Auto,*,32" RowDefinitions="*,Auto">
-
-A common use of `Grid` in WPF is to stack two controls on top of each other.
-For this purpose in Avalonia you can just use a `Panel` which is more lightweight
-than `Grid`.
-
-We don't yet support `SharedSizeScope` in `Grid`.
-
-## ItemsControl
-
-In WPF, `ItemsControl` and derived classes such as `ListBox` have two separate
-items properties: `Items` and `ItemsSource`. Avalonia however just has a single
-one: `Items`.
-
-## Tunnelling Events
-
-Avalonia has tunnelling events (unlike UWP!) but they're not exposed via
-separate `Preview` CLR event handlers. To subscribe to a tunnelling event you
-must call `AddHandler` with `RoutingStrategies.Tunnel`:
-
-```
-target.AddHandler(InputElement.KeyDownEvent, OnPreviewKeyDown, RoutingStrategies.Tunnel);
-
-void OnPreviewKeyDown(object sender, KeyEventArgs e)
-{
-    // Handler code
-}
-```
-
-## Class Handlers
-
-In WPF, class handlers for events can be added by calling
-[EventManager.RegisterClassHandler](https://msdn.microsoft.com/en-us/library/ms597875.aspx).
-An example of registering a class handler in WPF might be:
-
-    static MyControl()
-    {
-      EventManager.RegisterClassHandler(typeof(MyControl), MyEvent, HandleMyEvent));
-    }
-
-    private static void HandleMyEvent(object sender, RoutedEventArgs e)
-    {
-    }
-
-The equivalent of this in Avalonia would be:
-
-    static MyControl()
-    {
-        MyEvent.AddClassHandler<MyControl>(x => x.HandleMyEvent);
-    }
-
-    private void HandleMyEvent(object sender, RoutedEventArgs e)
-    {
-    }
-
-Notice that in WPF you have to add the class handler as a static method, whereas
-in Avalonia the class handler is not static: the notification is automatically
-directed to the correct instance.
-
-## PropertyChangedCallback
-
-Listening to changes on DependencyProperties in WPF can be complex. When you
-register a `DependencyProperty` you can supply a static `PropertyChangedCallback`
-but if you want to listen to changes from elsewhere [things can get complicated
-and error-prone](http://stackoverflow.com/questions/23682232).
-
-In Avalonia, there is no `PropertyChangedCallback` at the time of registration,
-instead a class listener is [added to the control's static constructor in much
-the same way that event class listeners are added](../spec/working-with-properties.md#subscribing-to-a-property-on-any-object).
-
-## RenderTransforms and RenderTransformOrigin
-
-RenderTransformOrigins are different in WPF and Avalonia: If you apply a `RenderTransform`, keep in mind that our default value for the RenderTransformOrigin is `RelativePoint.Center`. In WPF the default value is `RelativePoint.TopLeft` (0, 0). In controls like Viewbox (currently being developed) the same code will lead to a different rendering behavior:
-
-In WPF:
-![WPF](https://files.gitter.im/AvaloniaUI/Avalonia/cDrM/image.png)
-
-In Avalonia:
-![Avalonia](https://files.gitter.im/AvaloniaUI/Avalonia/KGk7/image.png)
-
-In AvaloniaUI, to get the same scale transform we should indicate that the RenderTransformOrigin is the TopLeft part of the Visual. 
diff --git a/docs/tutorial/gettingstarted.md b/docs/tutorial/gettingstarted.md
deleted file mode 100644
index 5b7fe436a7..0000000000
--- a/docs/tutorial/gettingstarted.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Getting Started
-
-## Windows
-
-![](images/add-dialogs.png)
-
-The easiest way to try out Avalonia is to install the [Visual Studio Extension](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.AvaloniaforVisualStudio).
-
-This will add a Avalonia project template and a Window template to the standard Visual Studo “Add”
-dialog (yes, icons still to come :) ):
diff --git a/docs/tutorial/images/add-dialogs.png b/docs/tutorial/images/add-dialogs.png
deleted file mode 100644
index d1f1d2f81a2b49007ffc986f99d9ac57a762f6cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 45998
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
O&&JZ;g8Z}lt^Wan*%sIU

diff --git a/docs/tutorial/nuget.md b/docs/tutorial/nuget.md
deleted file mode 100644
index b5f8f50242..0000000000
--- a/docs/tutorial/nuget.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# Avalonia NuGet Packages
-
-Avalonia is divided into several `NuGet` packages. 
-
-* The `Avalonia` package contains core portable class libraries.
-* The `Dekstop` and `Mobile` packages contain platform specific windowing and rendering back-ends.
-* The `Avalonia.Desktop` package is intended to be used by the end users targeting multiple desktop platforms (`Windows`, `Linux` and `OSX`).
-* The `Avalonia.iOS` and `Avalonia.Android` packages are intended to be used by the end users targeting specific mobile platforms. 
-* The `Avalonia.Mobile` package is intended to be used by the end users targeting multiple mobile platforms (`Android` and `iOS`).
-
-## Core
-
-* Avalonia (.nupkg)
-  - Avalonia.Animation (.dll)
-  - Avalonia.Base (.dll)
-  - Avalonia.Controls (.dll)
-  - Avalonia.DesignerSupport (.dll)
-  - Avalonia.Diagnostics (.dll)
-  - Avalonia.Input (.dll)
-  - Avalonia.Interactivity (.dll)
-  - Avalonia.Layout (.dll)
-  - Avalonia.Logging.Serilog (.dll)
-  - Avalonia.Visuals (.dll)
-  - Avalonia.Styling (.dll)
-  - Avalonia.ReactiveUI (.dll)
-  - Avalonia.Themes.Default (.dll)
-  - Avalonia.Markup (.dll)
-  - Avalonia.Markup.Xaml (.dll)
-  - Serilog (.nupkg)
-  - Splat (.nupkg)
-  - Sprache (.nupkg)
-  - System.Reactive (.nupkg)
-
-* Avalonia.HtmlRenderer (.nupkg)
-  - Avalonia (.nupkg)
-
-## Desktop
-
-* Avalonia.Win32 (.nupkg)
-  - Avalonia.Win32 (.dll)
-  - Avalonia (.nupkg)
-
-* Avalonia.Direct2D1 (.nupkg)
-  - Avalonia.Direct2D1 (.dll)
-  - Avalonia (.nupkg)
-  - SharpDX (.nupkg)
-  - SharpDX.Direct2D1 (.nupkg)
-  - SharpDX.DXGI (.nupkg)
-
-* Avalonia.Gtk (.nupkg)
-  - Avalonia.Gtk (.dll)
-  - Avalonia (.nupkg)
-
-* Avalonia.Cairo (.nupkg)
-  - Avalonia.Cairo (.dll)
-  - Avalonia (.nupkg)
-
-* Avalonia.Skia.Desktop (.nupkg)
-  - Avalonia.Skia.Desktop (.dll)
-  - Avalonia (.nupkg)
-  - SkiaSharp (.nupkg)
-
-* Avalonia.Desktop (.nupkg)
-  - Avalonia.Win32 (.nupkg)
-  - Avalonia.Direct2D1 (.nupkg)
-  - Avalonia.Gtk (.nupkg)
-  - Avalonia.Cairo (.nupkg)
-  - Avalonia.Skia.Desktop (.nupkg)
-
-## Mobile
-
-* Avalonia.Android (.nupkg)
-  - Avalonia.Android (.dll)
-  - Avalonia.Skia.Android (.dll)
-  - Avalonia (.nupkg)
-  - SkiaSharp (.nupkg)
-
-* Avalonia.iOS (.nupkg)
-  - Avalonia.iOS (.dll)
-  - Avalonia.Skia.iOS (.dll)
-  - Avalonia (.nupkg)
-  - SkiaSharp (.nupkg)
-
-* Avalonia.Mobile (.nupkg)
-  - Avalonia.Android (.nupkg)
-  - Avalonia.iOS (.nupkg)
diff --git a/docs/tutorial/toc.yml b/docs/tutorial/toc.yml
deleted file mode 100644
index 4f46813cd8..0000000000
--- a/docs/tutorial/toc.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- name: Getting Started
-  href: gettingstarted.md
-- name: Avalonia NuGet Packages
-  href: nuget.md
-- name: Avalonia for WPF Developers
-  href: from-wpf.md
diff --git a/readme.md b/readme.md
index 28cb638a7c..906c3a4b5c 100644
--- a/readme.md
+++ b/readme.md
@@ -14,11 +14,11 @@ Avalonia is a WPF-inspired cross-platform XAML-based UI framework providing a fl
 
 | Control catalog | Desktop platforms | Mobile platforms |
 |---|---|---|
-| <a href='https://youtu.be/wHcB3sGLVYg'><img width='300' src='docs/images/screen.png'></a> | <a href='https://www.youtube.com/watch?t=28&v=c_AB_XSILp0' target='_blank'><img width='300' src='docs/images/avalonia-video.png'></a> | <a href='https://www.youtube.com/watch?v=NJ9-hnmUbBM' target='_blank'><img width='300' src='https://i.ytimg.com/vi/NJ9-hnmUbBM/hqdefault.jpg'></a> |
+| <a href='https://youtu.be/wHcB3sGLVYg'><img width='300' src='http://avaloniaui.net/images/screen.png'></a> | <a href='https://www.youtube.com/watch?t=28&v=c_AB_XSILp0' target='_blank'><img width='300' src='http://avaloniaui.net/images/avalonia-video.png'></a> | <a href='https://www.youtube.com/watch?v=NJ9-hnmUbBM' target='_blank'><img width='300' src='https://i.ytimg.com/vi/NJ9-hnmUbBM/hqdefault.jpg'></a> |
 
 ## Getting Started
 
-Avalonia [Visual Studio Extension](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.AvaloniaforVisualStudio) contains project and control templates that will help you get started. After installing it, open "New Project" dialog in Visual Studio, choose "Avalonia" in "Visual C#" section, select "Avalonia .NET Core Application" and press OK (<a href="https://github.com/AvaloniaUI/Avalonia/raw/master/docs/tutorial/images/add-dialogs.png">screenshot</a>). Now you can write code and markup that will work on multiple platforms!
+Avalonia [Visual Studio Extension](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.AvaloniaforVisualStudio) contains project and control templates that will help you get started. After installing it, open "New Project" dialog in Visual Studio, choose "Avalonia" in "Visual C#" section, select "Avalonia .NET Core Application" and press OK (<a href="http://avaloniaui.net/tutorial/images/add-dialogs.png">screenshot</a>). Now you can write code and markup that will work on multiple platforms!
 
 Avalonia is delivered via <b>NuGet</b> package manager. You can find the packages here: ([stable(ish)](https://www.nuget.org/packages/Avalonia/), [nightly](https://github.com/AvaloniaUI/Avalonia/wiki/Using-nightly-build-feed))
 
@@ -35,16 +35,16 @@ https://ci.appveyor.com/project/AvaloniaUI/Avalonia/branch/master/artifacts
 
 ## Documentation
 
-As mentioned above, Avalonia is still in alpha and as such there's not much documentation yet. You can take a look at the [getting started page](docs/tutorial/gettingstarted.md) for an overview of how to get started but probably the best thing to do for now is to already know a little bit about WPF/Silverlight/UWP/XAML and ask questions in our [Gitter room](https://gitter.im/AvaloniaUI/Avalonia).
+As mentioned above, Avalonia is still in alpha and as such there's not much documentation yet. You can take a look at the [getting started page](http://avaloniaui.net/tutorial/gettingstarted) for an overview of how to get started but probably the best thing to do for now is to already know a little bit about WPF/Silverlight/UWP/XAML and ask questions in our [Gitter room](https://gitter.im/AvaloniaUI/Avalonia).
 
-There's also a high-level [architecture document](docs/spec/architecture.md) that is currently a little bit out of date, and I've also started writing blog posts on Avalonia at http://grokys.github.io/.
+There's also a high-level [architecture document](http://avaloniaui.net/spec/architecture) that is currently a little bit out of date, and I've also started writing blog posts on Avalonia at http://grokys.github.io/.
 
 Contributions are always welcome!
 
 ## Building and Using
 
-See the [build instructions here](docs/guidelines/build.md).
+See the [build instructions here](http://avaloniaui.net/guidelines/build).
 
 ## Contributing
 
-Please read the [contribution guidelines](docs/guidelines/contributing.md) before submitting a pull request.
+Please read the [contribution guidelines](http://avaloniaui.net/guidelines/contributing) before submitting a pull request.

From ac9a8d74b87b451529c18a4f9832b97efcee018a Mon Sep 17 00:00:00 2001
From: brandonhood <bhood@mail.usf.edu>
Date: Sat, 14 Oct 2017 18:23:36 -0400
Subject: [PATCH 092/482] Update Control.cs

Updated the setter for Name to use IsNullOrWhiteSpace to both protect against null and do the emptiness check
---
 src/Avalonia.Controls/Control.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index 14beb2eab7..89c4f9279a 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -175,9 +175,9 @@ namespace Avalonia.Controls
 
             set
             {
-                if (value.Trim() == string.Empty)
+                if (String.IsNullOrWhiteSpace(value))
                 {
-                    throw new InvalidOperationException("Cannot set Name to empty string.");
+                    throw new InvalidOperationException("Cannot set Name to null or empty string.");
                 }
 
                 if (_styled)

From f869e3f1781d95ae201854037d31eee950b37452 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 15 Oct 2017 13:17:52 -0500
Subject: [PATCH 093/482] Move path parsing into the binding extension. Our
 path shorthands will only work from XAML now. Now we can look up types.

---
 .../Avalonia.Markup.Xaml/Data/Binding.cs      | 159 ++-------------
 .../MarkupExtensions/BindingExtension.cs      | 189 +++++++++++++++++-
 .../Xaml/BindingTests_RelativeSource.cs       |  50 +++++
 3 files changed, 244 insertions(+), 154 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
index 052f743a4b..f40e6ad84e 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
@@ -91,55 +91,50 @@ namespace Avalonia.Markup.Xaml.Data
             bool enableDataValidation = false)
         {
             Contract.Requires<ArgumentNullException>(target != null);
-
-            var pathInfo = ParsePath(Path);
-            ValidateState(pathInfo);
+            
             enableDataValidation = enableDataValidation && Priority == BindingPriority.LocalValue;
-
-            var elementName = ElementName ?? pathInfo.ElementName;
-            var relativeSource = RelativeSource ?? pathInfo.RelativeSource;
-
+            
             ExpressionObserver observer;
 
-            if (elementName != null)
+            if (ElementName != null)
             {
                 observer = CreateElementObserver(
                     (target as IControl) ?? (anchor as IControl),
-                    elementName,
-                    pathInfo.Path);
+                    ElementName,
+                    Path);
             }
             else if (Source != null)
             {
-                observer = CreateSourceObserver(Source, pathInfo.Path, enableDataValidation);
+                observer = CreateSourceObserver(Source, Path, enableDataValidation);
             }
-            else if (relativeSource == null || relativeSource.Mode == RelativeSourceMode.DataContext)
+            else if (RelativeSource == null || RelativeSource.Mode == RelativeSourceMode.DataContext)
             {
                 observer = CreateDataContexObserver(
                     target,
-                    pathInfo.Path,
+                    Path,
                     targetProperty == Control.DataContextProperty,
                     anchor,
                     enableDataValidation);
             }
-            else if (relativeSource.Mode == RelativeSourceMode.Self)
+            else if (RelativeSource.Mode == RelativeSourceMode.Self)
             {
-                observer = CreateSourceObserver(target, pathInfo.Path, enableDataValidation);
+                observer = CreateSourceObserver(target, Path, enableDataValidation);
             }
-            else if (relativeSource.Mode == RelativeSourceMode.TemplatedParent)
+            else if (RelativeSource.Mode == RelativeSourceMode.TemplatedParent)
             {
-                observer = CreateTemplatedParentObserver(target, pathInfo.Path);
+                observer = CreateTemplatedParentObserver(target, Path);
             }
-            else if (relativeSource.Mode == RelativeSourceMode.FindAncestor)
+            else if (RelativeSource.Mode == RelativeSourceMode.FindAncestor)
             {
-                if (relativeSource.AncestorType == null)
+                if (RelativeSource.AncestorType == null)
                 {
                     throw new InvalidOperationException("AncestorType must be set for RelativeSourceModel.FindAncestor.");
                 }
 
                 observer = CreateFindAncestorObserver(
                     (target as IControl) ?? (anchor as IControl),
-                    relativeSource,
-                    pathInfo.Path);
+                    RelativeSource,
+                    Path);
             }
             else
             {
@@ -168,128 +163,6 @@ namespace Avalonia.Markup.Xaml.Data
             return new InstancedBinding(subject, Mode, Priority);
         }
 
-        private static PathInfo ParsePath(string path)
-        {
-            var result = new PathInfo();
-
-            if (string.IsNullOrWhiteSpace(path) || path == ".")
-            {
-                result.Path = string.Empty;
-            }
-            else if (path.StartsWith("#"))
-            {
-                var dot = path.IndexOf('.');
-
-                if (dot != -1)
-                {
-                    result.Path = path.Substring(dot + 1);
-                    result.ElementName = path.Substring(1, dot - 1);
-                }
-                else
-                {
-                    result.Path = string.Empty;
-                    result.ElementName = path.Substring(1);
-                }
-            }
-            else if (path.StartsWith("$"))
-            {
-                var relativeSource = new RelativeSource();
-                result.RelativeSource = relativeSource;
-                var dot = path.IndexOf('.');
-                string relativeSourceMode;
-                if (dot != -1)
-                {
-                    result.Path = path.Substring(dot + 1);
-                    relativeSourceMode = path.Substring(1, dot - 1);
-                }
-                else
-                {
-                    result.Path = string.Empty;
-                    relativeSourceMode = path.Substring(1);
-                }
-
-                if (relativeSourceMode == "self")
-                {
-                    relativeSource.Mode = RelativeSourceMode.Self;
-                }
-                else if(relativeSourceMode == "parent")
-                {
-                    relativeSource.Mode = RelativeSourceMode.FindAncestor;
-                    relativeSource.AncestorType = typeof(IControl);
-                    relativeSource.AncestorLevel = 1;
-                }
-                else if(relativeSourceMode.StartsWith("parent["))
-                {
-                    relativeSource.Mode = RelativeSourceMode.FindAncestor;
-                    var parentConfigStart = relativeSourceMode.IndexOf('[');
-                    if (!relativeSourceMode.EndsWith("]"))
-                    {
-                        throw new InvalidOperationException("Invalid RelativeSource binding syntax. Expected matching ']' for '['.");
-                    }
-                    var parentConfigParams = relativeSourceMode.Substring(parentConfigStart + 1).TrimEnd(']').Split(',');
-                    if (parentConfigParams.Length > 2 || parentConfigParams.Length == 0)
-                    {
-                        throw new InvalidOperationException("Expected either 1 or 2 parameters for RelativeSource binding syntax");
-                    }
-                    else if (parentConfigParams.Length == 1)
-                    {
-                        if (int.TryParse(parentConfigParams[0], out int level))
-                        {
-                            relativeSource.AncestorType = typeof(IControl);
-                            relativeSource.AncestorLevel = level + 1;
-                        }
-                        else
-                        {
-                            relativeSource.AncestorType = LookupAncestorType(parentConfigParams[0]);
-                        }
-                    }
-                    else
-                    {
-                        relativeSource.AncestorType = LookupAncestorType(parentConfigParams[0]);
-                        relativeSource.AncestorLevel = int.Parse(parentConfigParams[1]) + 1;
-                    }
-                }
-                else
-                {
-                    throw new InvalidOperationException($"Invalid RelativeSource binding syntax: {relativeSourceMode}");
-                }
-            }
-            else
-            {
-                result.Path = path;
-            }
-
-            return result;
-        }
-
-        private static Type LookupAncestorType(string ancestorTypeName)
-        {
-            //TODO: What is our syntax for type lookup here?
-            throw new NotImplementedException();
-        }
-
-        private void ValidateState(PathInfo pathInfo)
-        {
-            if (pathInfo.ElementName != null && ElementName != null)
-            {
-                throw new InvalidOperationException(
-                    "ElementName property cannot be set when an #elementName path is provided.");
-            }
-
-            if (pathInfo.RelativeSource != null && RelativeSource != null)
-            {
-                throw new InvalidOperationException(
-                    "ElementName property cannot be set when a $self or $parent path is provided.");
-            }
-
-            if ((pathInfo.ElementName != null || ElementName != null) &&
-                (pathInfo.RelativeSource != null || RelativeSource != null))
-            {
-                throw new InvalidOperationException(
-                    "ElementName property cannot be set with a RelativeSource.");
-            }
-        }
-
         private ExpressionObserver CreateDataContexObserver(
             IAvaloniaObject target,
             string path,
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
index 9d1e36ee78..08b81a07b3 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
@@ -7,8 +7,13 @@ using System;
 
 namespace Avalonia.Markup.Xaml.MarkupExtensions
 {
+    using Avalonia.Controls;
+    using Avalonia.Styling;
+    using Portable.Xaml;
+    using Portable.Xaml.ComponentModel;
     using Portable.Xaml.Markup;
     using PortableXaml;
+    using System.ComponentModel;
 
     [MarkupExtensionReturnType(typeof(IBinding))]
     public class BindingExtension : MarkupExtension
@@ -24,19 +29,181 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
 
         public override object ProvideValue(IServiceProvider serviceProvider)
         {
-            var b = new Binding
+            var descriptorContext = (ITypeDescriptorContext)serviceProvider;
+
+            var pathInfo = ParsePath(Path, descriptorContext);
+            ValidateState(pathInfo);
+
+            return XamlBinding.FromMarkupExtensionContext(
+                new Binding
+                {
+                    Converter = Converter,
+                    ConverterParameter = ConverterParameter,
+                    ElementName = pathInfo.ElementName ?? ElementName,
+                    FallbackValue = FallbackValue,
+                    Mode = Mode,
+                    Path = pathInfo.Path,
+                    Priority = Priority,
+                    RelativeSource = pathInfo.RelativeSource ?? RelativeSource,
+                },
+                serviceProvider);
+        }
+
+        private class PathInfo
+        {
+            public string Path { get; set; }
+            public string ElementName { get; set; }
+            public RelativeSource RelativeSource { get; set; }
+        }
+
+        private void ValidateState(PathInfo pathInfo)
+        {
+            if (pathInfo.ElementName != null && ElementName != null)
+            {
+                throw new InvalidOperationException(
+                    "ElementName property cannot be set when an #elementName path is provided.");
+            }
+
+            if (pathInfo.RelativeSource != null && RelativeSource != null)
+            {
+                throw new InvalidOperationException(
+                    "ElementName property cannot be set when a $self or $parent path is provided.");
+            }
+
+            if ((pathInfo.ElementName != null || ElementName != null) &&
+                (pathInfo.RelativeSource != null || RelativeSource != null))
+            {
+                throw new InvalidOperationException(
+                    "ElementName property cannot be set with a RelativeSource.");
+            }
+        }
+
+        private static PathInfo ParsePath(string path, ITypeDescriptorContext context)
+        {
+            var result = new PathInfo();
+
+            if (string.IsNullOrWhiteSpace(path) || path == ".")
             {
-                Converter = Converter,
-                ConverterParameter = ConverterParameter,
-                ElementName = ElementName,
-                FallbackValue = FallbackValue,
-                Mode = Mode,
-                Path = Path,
-                Priority = Priority,
-                RelativeSource = RelativeSource
-            };
+                result.Path = string.Empty;
+            }
+            else if (path.StartsWith("#"))
+            {
+                var dot = path.IndexOf('.');
+
+                if (dot != -1)
+                {
+                    result.Path = path.Substring(dot + 1);
+                    result.ElementName = path.Substring(1, dot - 1);
+                }
+                else
+                {
+                    result.Path = string.Empty;
+                    result.ElementName = path.Substring(1);
+                }
+            }
+            else if (path.StartsWith("$"))
+            {
+                var relativeSource = new RelativeSource();
+                result.RelativeSource = relativeSource;
+                var dot = path.IndexOf('.');
+                string relativeSourceMode;
+                if (dot != -1)
+                {
+                    result.Path = path.Substring(dot + 1);
+                    relativeSourceMode = path.Substring(1, dot - 1);
+                }
+                else
+                {
+                    result.Path = string.Empty;
+                    relativeSourceMode = path.Substring(1);
+                }
+
+                if (relativeSourceMode == "self")
+                {
+                    relativeSource.Mode = RelativeSourceMode.Self;
+                }
+                else if (relativeSourceMode == "parent")
+                {
+                    relativeSource.Mode = RelativeSourceMode.FindAncestor;
+                    relativeSource.AncestorType = typeof(IControl);
+                    relativeSource.AncestorLevel = 1;
+                }
+                else if (relativeSourceMode.StartsWith("parent["))
+                {
+                    relativeSource.Mode = RelativeSourceMode.FindAncestor;
+                    var parentConfigStart = relativeSourceMode.IndexOf('[');
+                    if (!relativeSourceMode.EndsWith("]"))
+                    {
+                        throw new InvalidOperationException("Invalid RelativeSource binding syntax. Expected matching ']' for '['.");
+                    }
+                    var parentConfigParams = relativeSourceMode.Substring(parentConfigStart + 1).TrimEnd(']').Split(';');
+                    if (parentConfigParams.Length > 2 || parentConfigParams.Length == 0)
+                    {
+                        throw new InvalidOperationException("Expected either 1 or 2 parameters for RelativeSource binding syntax");
+                    }
+                    else if (parentConfigParams.Length == 1)
+                    {
+                        if (int.TryParse(parentConfigParams[0], out int level))
+                        {
+                            relativeSource.AncestorType = typeof(IControl);
+                            relativeSource.AncestorLevel = level + 1;
+                        }
+                        else
+                        {
+                            relativeSource.AncestorType = LookupAncestorType(parentConfigParams[0], context);
+                        }
+                    }
+                    else
+                    {
+                        relativeSource.AncestorType = LookupAncestorType(parentConfigParams[0], context);
+                        relativeSource.AncestorLevel = int.Parse(parentConfigParams[1]) + 1;
+                    }
+                }
+                else
+                {
+                    throw new InvalidOperationException($"Invalid RelativeSource binding syntax: {relativeSourceMode}");
+                }
+            }
+            else
+            {
+                result.Path = path;
+            }
+
+            return result;
+        }
+
+        private static Type LookupAncestorType(string ancestorTypeName, ITypeDescriptorContext context)
+        {
+            var parts = ancestorTypeName.Split(':');
+            if (parts.Length == 0 || parts.Length > 2)
+            {
+                throw new InvalidOperationException("Invalid type name");
+            }
+
+            if (parts.Length == 1)
+            {
+                return context.ResolveType(string.Empty, parts[0]);
+            }
+            else
+            {
+                return context.ResolveType(parts[0], parts[1]);
+            }
+        }
+
+        private static object GetDefaultAnchor(ITypeDescriptorContext context)
+        {
+            object anchor = null;
+
+            // The target is not a control, so we need to find an anchor that will let us look
+            // up named controls and style resources. First look for the closest IControl in
+            // the context.
+            anchor = context.GetFirstAmbientValue<IControl>();
 
-            return XamlBinding.FromMarkupExtensionContext(b, serviceProvider);
+            // If a control was not found, then try to find the highest-level style as the XAML
+            // file could be a XAML file containing only styles.
+            return anchor ??
+                    context.GetService<IRootObjectProvider>()?.RootObject as IStyle ??
+                    context.GetLastOrDefaultAmbientValue<IStyle>();
         }
 
         public IValueConverter Converter { get; set; }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs
index a4e4d4f5c3..e372799c1c 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs
@@ -127,6 +127,56 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void Binding_To_Ancestor_Of_Type_With_Shorthand_Works()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <Border Name='border1'>
+      <Border Name='border2'>
+        <Button Name='button' Content='{Binding $parent[Border].Name}'/>
+      </Border>
+    </Border>
+</Window>";
+                var loader = new AvaloniaXamlLoader();
+                var window = (Window)loader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+
+                window.ApplyTemplate();
+
+                Assert.Equal("border2", button.Content);
+            }
+        }
+
+        [Fact]
+        public void Binding_To_Second_Ancestor_With_Shorthand_And_Type_Works()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <Border Name='border1'>
+      <Border Name='border2'>
+        <Button Name='button' Content='{Binding $parent[Border; 1].Name}'/>
+      </Border>
+    </Border>
+</Window>";
+                var loader = new AvaloniaXamlLoader();
+                var window = (Window)loader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+
+                window.ApplyTemplate();
+
+                Assert.Equal("border1", button.Content);
+            }
+        }
+
         [Fact]
         public void Binding_To_Second_Ancestor_With_Shorthand_Works()
         {

From 34ffd63eca8b62975ea207c7949773817973c168 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 15 Oct 2017 13:29:35 -0500
Subject: [PATCH 094/482] If AncestorType == null, track ancestor on logical
 tree instead of visual tree.

---
 .../Avalonia.Markup.Xaml/Data/Binding.cs      | 20 ++++----
 .../MarkupExtensions/BindingExtension.cs      |  2 +-
 src/Markup/Avalonia.Markup/ControlLocator.cs  | 46 +++++++++++++++++--
 3 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
index f40e6ad84e..bb561cd5b2 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
@@ -126,11 +126,6 @@ namespace Avalonia.Markup.Xaml.Data
             }
             else if (RelativeSource.Mode == RelativeSourceMode.FindAncestor)
             {
-                if (RelativeSource.AncestorType == null)
-                {
-                    throw new InvalidOperationException("AncestorType must be set for RelativeSourceModel.FindAncestor.");
-                }
-
                 observer = CreateFindAncestorObserver(
                     (target as IControl) ?? (anchor as IControl),
                     RelativeSource,
@@ -224,9 +219,18 @@ namespace Avalonia.Markup.Xaml.Data
         {
             Contract.Requires<ArgumentNullException>(target != null);
 
-            return new ExpressionObserver(
-                ControlLocator.Track(target, relativeSource.AncestorType, relativeSource.AncestorLevel -1),
-                path);
+            if (relativeSource.AncestorType == null)
+            {
+                return new ExpressionObserver(
+                    ControlLocator.Track(target, relativeSource.AncestorLevel - 1),
+                    path);
+            }
+            else
+            {
+                return new ExpressionObserver(
+                    ControlLocator.Track(target, relativeSource.AncestorType, relativeSource.AncestorLevel - 1),
+                    path); 
+            }
         }
 
         private ExpressionObserver CreateSourceObserver(
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
index 08b81a07b3..2896e9803d 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
@@ -145,7 +145,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
                     {
                         if (int.TryParse(parentConfigParams[0], out int level))
                         {
-                            relativeSource.AncestorType = typeof(IControl);
+                            relativeSource.AncestorType = null;
                             relativeSource.AncestorLevel = level + 1;
                         }
                         else
diff --git a/src/Markup/Avalonia.Markup/ControlLocator.cs b/src/Markup/Avalonia.Markup/ControlLocator.cs
index de8415d6db..2ae580d602 100644
--- a/src/Markup/Avalonia.Markup/ControlLocator.cs
+++ b/src/Markup/Avalonia.Markup/ControlLocator.cs
@@ -27,13 +27,13 @@ namespace Avalonia.Markup
         {
             var attached = Observable.FromEventPattern<LogicalTreeAttachmentEventArgs>(
                 x => relativeTo.AttachedToLogicalTree += x,
-                x => relativeTo.DetachedFromLogicalTree += x)
+                x => relativeTo.AttachedToLogicalTree -= x)
                 .Select(x => ((IControl)x.Sender).FindNameScope())
                 .StartWith(relativeTo.FindNameScope());
 
             var detached = Observable.FromEventPattern<LogicalTreeAttachmentEventArgs>(
                 x => relativeTo.DetachedFromLogicalTree += x,
-                x => relativeTo.DetachedFromLogicalTree += x)
+                x => relativeTo.DetachedFromLogicalTree -= x)
                 .Select(x => (INameScope)null);
 
             return attached.Merge(detached).Select(nameScope =>
@@ -77,13 +77,13 @@ namespace Avalonia.Markup
         {
             var attached = Observable.FromEventPattern<VisualTreeAttachmentEventArgs>(
                 x => relativeTo.AttachedToVisualTree += x,
-                x => relativeTo.DetachedFromVisualTree += x)
+                x => relativeTo.AttachedToVisualTree -= x)
                 .Select(x => true)
                 .StartWith(relativeTo.IsAttachedToVisualTree);
 
             var detached = Observable.FromEventPattern<VisualTreeAttachmentEventArgs>(
                 x => relativeTo.DetachedFromVisualTree += x,
-                x => relativeTo.DetachedFromVisualTree += x)
+                x => relativeTo.DetachedFromVisualTree -= x)
                 .Select(x => false);
 
             return attached.Merge(detached).Select(isAttachedToVisualTree =>
@@ -100,5 +100,43 @@ namespace Avalonia.Markup
                 }
             });
         }
+
+        /// <summary>
+        /// Tracks a typed logical ancestor control.
+        /// </summary>
+        /// <param name="relativeTo">
+        /// The control relative from which the other control should be found.
+        /// </param>
+        /// <param name="ancestorType">The type of the ancestor to find.</param>
+        /// <param name="ancestorLevel">
+        /// The level of ancestor control to look for. Use 0 for the first ancestor of the
+        /// requested type.
+        /// </param>
+        public static IObservable<IControl> Track(IControl relativeTo, int ancestorLevel)
+        {
+            var attached = Observable.FromEventPattern<LogicalTreeAttachmentEventArgs>(
+                x => relativeTo.AttachedToLogicalTree += x,
+                x => relativeTo.AttachedToLogicalTree -= x)
+                .Select(x => true)
+                .StartWith(relativeTo.IsAttachedToVisualTree);
+
+            var detached = Observable.FromEventPattern<LogicalTreeAttachmentEventArgs>(
+                x => relativeTo.DetachedFromLogicalTree += x,
+                x => relativeTo.DetachedFromLogicalTree += x)
+                .Select(x => false);
+
+            return attached.Merge(detached).Select(isAttachedToLogicalTree =>
+            {
+                if (isAttachedToLogicalTree)
+                {
+                    return relativeTo.GetLogicalAncestors()
+                        .ElementAtOrDefault(ancestorLevel) as IControl;
+                }
+                else
+                {
+                    return null;
+                }
+            });
+        }
     }
 }

From 4e31f735a6b589bc6388445e29d9e89c2132e60f Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 15 Oct 2017 13:54:09 -0500
Subject: [PATCH 095/482] Fixed bugs.

---
 src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs | 2 +-
 src/Markup/Avalonia.Markup/ControlLocator.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
index bb561cd5b2..c0e0915006 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
@@ -66,7 +66,7 @@ namespace Avalonia.Markup.Xaml.Data
         /// <summary>
         /// Gets or sets the binding path.
         /// </summary>
-        public string Path { get; set; }
+        public string Path { get; set; } = "";
 
         /// <summary>
         /// Gets or sets the binding priority.
diff --git a/src/Markup/Avalonia.Markup/ControlLocator.cs b/src/Markup/Avalonia.Markup/ControlLocator.cs
index 2ae580d602..7da70283bf 100644
--- a/src/Markup/Avalonia.Markup/ControlLocator.cs
+++ b/src/Markup/Avalonia.Markup/ControlLocator.cs
@@ -118,7 +118,7 @@ namespace Avalonia.Markup
                 x => relativeTo.AttachedToLogicalTree += x,
                 x => relativeTo.AttachedToLogicalTree -= x)
                 .Select(x => true)
-                .StartWith(relativeTo.IsAttachedToVisualTree);
+                .StartWith(relativeTo.IsAttachedToLogicalTree);
 
             var detached = Observable.FromEventPattern<LogicalTreeAttachmentEventArgs>(
                 x => relativeTo.DetachedFromLogicalTree += x,

From 52617b4a58ed6a3ecd406e63c871ae934589bb11 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 15 Oct 2017 14:44:26 -0500
Subject: [PATCH 096/482] Remove StyleResource and StyleBinding. Fold
 XamlBinding into Binding since that is the only place it is being used now.

---
 Avalonia.sln                                  |  3 +-
 .../Avalonia.Markup.Xaml.csproj               |  3 -
 .../Avalonia.Markup.Xaml/Data/Binding.cs      |  4 ++
 .../Data/StyleResourceBinding.cs              | 69 -------------------
 .../MarkupExtensions/BindingExtension.cs      | 27 +++++++-
 .../StyleResourceExtension.cs                 | 31 ---------
 .../PortableXaml/AvaloniaXamlType.cs          | 12 +---
 .../PortableXaml/XamlBinding.cs               | 63 -----------------
 .../Xaml/BasicTests.cs                        | 17 ++---
 9 files changed, 35 insertions(+), 194 deletions(-)
 delete mode 100644 src/Markup/Avalonia.Markup.Xaml/Data/StyleResourceBinding.cs
 delete mode 100644 src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StyleResourceExtension.cs
 delete mode 100644 src/Markup/Avalonia.Markup.Xaml/PortableXaml/XamlBinding.cs

diff --git a/Avalonia.sln b/Avalonia.sln
index 7f516667ee..c6509817ce 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.3
+VisualStudioVersion = 15.0.26730.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Base", "src\Avalonia.Base\Avalonia.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
 EndProject
@@ -204,6 +204,7 @@ Global
 		tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{48840edd-24bf-495d-911e-2eb12ae75d3b}*SharedItemsImports = 13
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{4a1abb09-9047-4bd5-a4ad-a055e52c5ee0}*SharedItemsImports = 4
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{7863ea94-f0fb-4386-bf8c-e5bfa761560a}*SharedItemsImports = 4
+		src\Shared\PlatformSupport\PlatformSupport.projitems*{7b92af71-6287-4693-9dcb-bd5b6e927e23}*SharedItemsImports = 4
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{7d2d3083-71dd-4cc9-8907-39a0d86fb322}*SharedItemsImports = 4
 		src\Windows\Avalonia.Win32\Avalonia.Win32.Shared.projitems*{811a76cf-1cf6-440f-963b-bbe31bd72a82}*SharedItemsImports = 4
 		src\Windows\Avalonia.Win32\Avalonia.Win32.Shared.projitems*{9defc6b7-845b-4d8f-afc0-d32bf0032b8c}*SharedItemsImports = 13
diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index de015fc947..caf3259f30 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -39,7 +39,6 @@
         <Compile Include="MarkupExtensions\StaticResourceExtension.cs" />
         <Compile Include="MarkupExtensions\StyleIncludeExtension.cs" />
         <Compile Include="PortableXaml\AvaloniaXamlContext.cs" />
-        <Compile Include="PortableXaml\XamlBinding.cs" />
         <Compile Include="PortableXaml\AttributeExtensions.cs" />
         <Compile Include="PortableXaml\AvaloniaMemberAttributeProvider.cs" />
         <Compile Include="PortableXaml\AvaloniaNameScope.cs" />
@@ -73,8 +72,6 @@
         <Compile Include="Data\DelayedBinding.cs" />
         <Compile Include="Data\MultiBinding.cs" />
         <Compile Include="Data\RelativeSource.cs" />
-        <Compile Include="Data\StyleResourceBinding.cs" />
-        <Compile Include="MarkupExtensions\StyleResourceExtension.cs" />
         <Compile Include="MarkupExtensions\BindingExtension.cs" />
         <Compile Include="MarkupExtensions\RelativeSourceExtension.cs" />
         <Compile Include="MarkupExtensions\StaticExtension.cs" />
diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
index 3f12593197..fd54f0f3ad 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
@@ -83,6 +83,8 @@ namespace Avalonia.Markup.Xaml.Data
         /// </summary>
         public object Source { get; set; }
 
+        internal WeakReference DefaultAnchor { get; set; }
+
         /// <inheritdoc/>
         public InstancedBinding Initiate(
             IAvaloniaObject target,
@@ -92,6 +94,8 @@ namespace Avalonia.Markup.Xaml.Data
         {
             Contract.Requires<ArgumentNullException>(target != null);
 
+            anchor = anchor ?? DefaultAnchor.Target;
+
             var pathInfo = ParsePath(Path);
             ValidateState(pathInfo);
             enableDataValidation = enableDataValidation && Priority == BindingPriority.LocalValue;
diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/StyleResourceBinding.cs b/src/Markup/Avalonia.Markup.Xaml/Data/StyleResourceBinding.cs
deleted file mode 100644
index 787aebbdc6..0000000000
--- a/src/Markup/Avalonia.Markup.Xaml/Data/StyleResourceBinding.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using Avalonia.Controls;
-using Avalonia.Data;
-using Avalonia.Styling;
-
-namespace Avalonia.Markup.Xaml.Data
-{
-    public class StyleResourceBinding : IBinding
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StyleResourceBinding"/> class.
-        /// </summary>
-        /// <param name="name">The resource name.</param>
-        public StyleResourceBinding(string name)
-        {
-            Name = name;
-        }
-
-        /// <inheritdoc/>
-        public BindingMode Mode => BindingMode.OneTime;
-
-        /// <summary>
-        /// Gets the resource name.
-        /// </summary>
-        public string Name { get; }
-
-        /// <inheritdoc/>
-        public BindingPriority Priority => BindingPriority.LocalValue;
-
-        /// <inheritdoc/>
-        public InstancedBinding Initiate(
-            IAvaloniaObject target,
-            AvaloniaProperty targetProperty,
-            object anchor = null,
-            bool enableDataValidation = false)
-        {
-            var host = (target as IControl) ?? (anchor as IControl);
-            var style = anchor as IStyle;
-            var resource = AvaloniaProperty.UnsetValue;
-
-            if (host != null)
-            {
-                resource = host.FindResource(Name);
-            }
-            else if (style != null)
-            {
-                if (!style.TryGetResource(Name, out resource))
-                {
-                    resource = AvaloniaProperty.UnsetValue;
-                }
-            }
-
-            if (resource != AvaloniaProperty.UnsetValue)
-            {
-                return new InstancedBinding(resource, Priority);
-            }
-            else
-            {
-                return null;
-            }
-        }
-    }
-}
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
index 9d1e36ee78..8984498393 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
@@ -7,8 +7,13 @@ using System;
 
 namespace Avalonia.Markup.Xaml.MarkupExtensions
 {
+    using Avalonia.Controls;
+    using Avalonia.Styling;
+    using Portable.Xaml;
+    using Portable.Xaml.ComponentModel;
     using Portable.Xaml.Markup;
     using PortableXaml;
+    using System.ComponentModel;
 
     [MarkupExtensionReturnType(typeof(IBinding))]
     public class BindingExtension : MarkupExtension
@@ -24,7 +29,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
 
         public override object ProvideValue(IServiceProvider serviceProvider)
         {
-            var b = new Binding
+            return new Binding
             {
                 Converter = Converter,
                 ConverterParameter = ConverterParameter,
@@ -33,10 +38,26 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
                 Mode = Mode,
                 Path = Path,
                 Priority = Priority,
-                RelativeSource = RelativeSource
+                RelativeSource = RelativeSource,
+                DefaultAnchor = new WeakReference(GetDefaultAnchor((ITypeDescriptorContext)serviceProvider))
             };
+        }
+
+
+        private static object GetDefaultAnchor(ITypeDescriptorContext context)
+        {
+            object anchor = null;
+
+            // The target is not a control, so we need to find an anchor that will let us look
+            // up named controls and style resources. First look for the closest IControl in
+            // the context.
+            anchor = context.GetFirstAmbientValue<IControl>();
 
-            return XamlBinding.FromMarkupExtensionContext(b, serviceProvider);
+            // If a control was not found, then try to find the highest-level style as the XAML
+            // file could be a XAML file containing only styles.
+            return anchor ??
+                    context.GetService<IRootObjectProvider>()?.RootObject as IStyle ??
+                    context.GetLastOrDefaultAmbientValue<IStyle>();
         }
 
         public IValueConverter Converter { get; set; }
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StyleResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StyleResourceExtension.cs
deleted file mode 100644
index 55a1b72125..0000000000
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StyleResourceExtension.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Data;
-using Avalonia.Markup.Xaml.Data;
-using System;
-
-namespace Avalonia.Markup.Xaml.MarkupExtensions
-{
-    using Portable.Xaml.Markup;
-    using PortableXaml;
-
-    [MarkupExtensionReturnType(typeof(IBinding))]
-    public class StyleResourceExtension : MarkupExtension
-    {
-        public StyleResourceExtension(string name)
-        {
-            Name = name;
-        }
-
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            return XamlBinding.FromMarkupExtensionContext(
-                            new StyleResourceBinding(Name),
-                            serviceProvider);
-        }
-
-        [ConstructorArgument("name")]
-        public string Name { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs
index 71c8902cbd..94881723a9 100644
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs
@@ -210,11 +210,6 @@ namespace Avalonia.Markup.Xaml.PortableXaml
                                             value);
                 }
 
-                if (value is XamlBinding)
-                {
-                    value = (value as XamlBinding).Value;
-                }
-
                 if (UpdateListInsteadSet &&
                     value != null &&
                     UpdateListInsteadSetValue(instance, value))
@@ -315,9 +310,7 @@ namespace Avalonia.Markup.Xaml.PortableXaml
                         if (!Member.AssignBinding)
                             ApplyBinding(obj, (IBinding)value);
                         else
-                            obj.SetValue(Property, value is XamlBinding ?
-                                                        (value as XamlBinding).Value :
-                                                        value);
+                            obj.SetValue(Property, value);
                     }
                     else
                     {
@@ -346,12 +339,9 @@ namespace Avalonia.Markup.Xaml.PortableXaml
             {
                 var control = obj as IControl;
                 var property = Property;
-                var xamlBinding = binding as XamlBinding;
 
                 if (control != null && property != Control.DataContextProperty)
                     DelayedBinding.Add(control, property, binding);
-                else if (xamlBinding != null)
-                    obj.Bind(property, xamlBinding.Value, xamlBinding.Anchor?.Target);
                 else
                     obj.Bind(property, binding);
             }
diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/XamlBinding.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/XamlBinding.cs
deleted file mode 100644
index 1f4e66471c..0000000000
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/XamlBinding.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Data;
-using Avalonia.Styling;
-using Portable.Xaml;
-using Portable.Xaml.ComponentModel;
-using System.ComponentModel;
-using Portable.Xaml.Markup;
-using System;
-
-namespace Avalonia.Markup.Xaml.PortableXaml
-{
-    internal class XamlBinding : IBinding
-    {
-        public static IBinding FromMarkupExtensionContext(
-                                    IBinding binding,
-                                    IServiceProvider serviceProvider)
-        {
-            var context = (ITypeDescriptorContext)serviceProvider;
-            var pvt = context.GetService<IProvideValueTarget>();
-
-            if (pvt.TargetObject is IControl) return binding;
-
-            object anchor = GetDefaultAnchor(context);
-
-            if (anchor == null) return binding;
-
-            return new XamlBinding(binding, anchor);
-        }
-
-        private static object GetDefaultAnchor(ITypeDescriptorContext context)
-        {
-            object anchor = null;
-
-            // The target is not a control, so we need to find an anchor that will let us look
-            // up named controls and style resources. First look for the closest IControl in
-            // the context.
-            anchor = context.GetFirstAmbientValue<IControl>();
-
-            // If a control was not found, then try to find the highest-level style as the XAML
-            // file could be a XAML file containing only styles.
-            return anchor ??
-                    context.GetService<IRootObjectProvider>()?.RootObject as IStyle ??
-                    context.GetLastOrDefaultAmbientValue<IStyle>();
-        }
-
-        private XamlBinding(IBinding binding, object anchor)
-        {
-            Value = binding;
-
-            Anchor = new WeakReference(anchor);
-        }
-
-        public WeakReference Anchor { get; }
-
-        public IBinding Value { get; }
-
-        public InstancedBinding Initiate(IAvaloniaObject target, AvaloniaProperty targetProperty, object anchor = null, bool enableDataValidation = false)
-        {
-            return Value.Initiate(target, targetProperty,
-                            anchor ?? Anchor.Target, enableDataValidation);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
index ce370790c3..88ee13eae4 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
@@ -411,8 +411,8 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 var xaml = @"
 <Styles xmlns='https://github.com/avaloniaui'>
   <Style Selector='CheckBox'>
-    <Setter Property='BorderBrush' Value='{StyleResource ThemeBorderMidBrush}'/>
-    <Setter Property='BorderThickness' Value='{StyleResource ThemeBorderThickness}'/>
+    <Setter Property='BorderBrush' Value='{DynamicResource ThemeBorderMidBrush}'/>
+    <Setter Property='BorderThickness' Value='{DynamicResource ThemeBorderThickness}'/>
     <Setter Property='Template'>
       <ControlTemplate>
         <Grid ColumnDefinitions='Auto,*'>
@@ -423,7 +423,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                   Height='18'
                   VerticalAlignment='Center'>
             <Path Name='checkMark'
-                  Fill='{StyleResource HighlightBrush}'
+                  Fill='{StaticResource HighlightBrush}'
                   Width='11'
                   Height='10'
                   Stretch='Uniform'
@@ -457,8 +457,6 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 Assert.Equal(CheckBox.BorderThicknessProperty, setters[1].Property);
                 Assert.Equal(CheckBox.TemplateProperty, setters[2].Property);
 
-                Assert.IsType<StyleResourceBinding>(setters[0].Value);
-                Assert.IsType<StyleResourceBinding>(setters[1].Value);
                 Assert.IsType<ControlTemplate>(setters[2].Value);
             }
         }
@@ -772,14 +770,7 @@ do we need it?")]
 <Window xmlns='https://github.com/avaloniaui'
                 xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
                 xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
-    <Window.Styles>
-        <Style>
-            <Style.Resources>
-                <x:Double x:Key='Double'>100</x:Double>
-            </Style.Resources>
-        </Style>
-    </Window.Styles>
-    <local:InitializationOrderTracker Width='100' Height='{StyleResource Double}'
+    <local:InitializationOrderTracker Width='100' Height='100'
                      Tag='{Binding Height, RelativeSource={RelativeSource Self}}' />
 </Window>";
 

From 4ecbea9d5e12324663799fa9eb3bbd60a54cbcd6 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 15 Oct 2017 14:54:23 -0500
Subject: [PATCH 097/482] Remove unneeded markup extensions.

---
 Avalonia.sln                                  |  3 ++-
 .../Avalonia.Markup.Xaml.csproj               |  2 --
 .../MarkupExtensions/StaticExtension.cs       | 25 -------------------
 .../MarkupExtensions/TypeExtension.cs         | 23 -----------------
 4 files changed, 2 insertions(+), 51 deletions(-)
 delete mode 100644 src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticExtension.cs
 delete mode 100644 src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/TypeExtension.cs

diff --git a/Avalonia.sln b/Avalonia.sln
index 7f516667ee..c6509817ce 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.3
+VisualStudioVersion = 15.0.26730.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Base", "src\Avalonia.Base\Avalonia.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
 EndProject
@@ -204,6 +204,7 @@ Global
 		tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{48840edd-24bf-495d-911e-2eb12ae75d3b}*SharedItemsImports = 13
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{4a1abb09-9047-4bd5-a4ad-a055e52c5ee0}*SharedItemsImports = 4
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{7863ea94-f0fb-4386-bf8c-e5bfa761560a}*SharedItemsImports = 4
+		src\Shared\PlatformSupport\PlatformSupport.projitems*{7b92af71-6287-4693-9dcb-bd5b6e927e23}*SharedItemsImports = 4
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{7d2d3083-71dd-4cc9-8907-39a0d86fb322}*SharedItemsImports = 4
 		src\Windows\Avalonia.Win32\Avalonia.Win32.Shared.projitems*{811a76cf-1cf6-440f-963b-bbe31bd72a82}*SharedItemsImports = 4
 		src\Windows\Avalonia.Win32\Avalonia.Win32.Shared.projitems*{9defc6b7-845b-4d8f-afc0-d32bf0032b8c}*SharedItemsImports = 13
diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index de015fc947..e07c22d750 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -77,9 +77,7 @@
         <Compile Include="MarkupExtensions\StyleResourceExtension.cs" />
         <Compile Include="MarkupExtensions\BindingExtension.cs" />
         <Compile Include="MarkupExtensions\RelativeSourceExtension.cs" />
-        <Compile Include="MarkupExtensions\StaticExtension.cs" />
         <Compile Include="MarkupExtensions\TemplateBindingExtension.cs" />
-        <Compile Include="MarkupExtensions\TypeExtension.cs" />
         <Compile Include="Parsers\SelectorGrammar.cs" />
         <Compile Include="Parsers\SelectorParser.cs" />
         <Compile Include="PortableXaml\AvaloniaTypeAttributeProvider.cs" />
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticExtension.cs
deleted file mode 100644
index c084e362c2..0000000000
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticExtension.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-
-namespace Avalonia.Markup.Xaml.MarkupExtensions
-{
-    public class StaticExtension : Portable.Xaml.Markup.StaticExtension
-    {
-        public StaticExtension()
-        {
-        }
-
-        public StaticExtension(string member)
-            : base(member)
-        {
-        }
-
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            return base.ProvideValue(serviceProvider);
-        }
-    }
-    
-}
\ No newline at end of file
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/TypeExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/TypeExtension.cs
deleted file mode 100644
index 062096e746..0000000000
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/TypeExtension.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-
-namespace Avalonia.Markup.Xaml.MarkupExtensions
-{
-    public class TypeExtension : Portable.Xaml.Markup.TypeExtension
-    {
-        public TypeExtension()
-        {
-        }
-
-        public TypeExtension(string typeName) : base(typeName)
-        {
-        }
-
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            return base.ProvideValue(serviceProvider);
-        }
-    }
-}
\ No newline at end of file

From 918cd06d2fa2f135c93561f1508e132f5f0fcd06 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 15 Oct 2017 14:55:32 -0500
Subject: [PATCH 098/482] Fix failing tests.

---
 src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
index fd54f0f3ad..eb5f87ea2a 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
@@ -94,7 +94,7 @@ namespace Avalonia.Markup.Xaml.Data
         {
             Contract.Requires<ArgumentNullException>(target != null);
 
-            anchor = anchor ?? DefaultAnchor.Target;
+            anchor = anchor ?? DefaultAnchor?.Target;
 
             var pathInfo = ParsePath(Path);
             ValidateState(pathInfo);

From 41a1a7e09977fd5a37641b3bbdf90b78b6919040 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 15 Oct 2017 15:03:48 -0500
Subject: [PATCH 099/482] Remove invalid param doc tag

---
 src/Markup/Avalonia.Markup/ControlLocator.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Markup/Avalonia.Markup/ControlLocator.cs b/src/Markup/Avalonia.Markup/ControlLocator.cs
index 7da70283bf..41851ca288 100644
--- a/src/Markup/Avalonia.Markup/ControlLocator.cs
+++ b/src/Markup/Avalonia.Markup/ControlLocator.cs
@@ -107,7 +107,6 @@ namespace Avalonia.Markup
         /// <param name="relativeTo">
         /// The control relative from which the other control should be found.
         /// </param>
-        /// <param name="ancestorType">The type of the ancestor to find.</param>
         /// <param name="ancestorLevel">
         /// The level of ancestor control to look for. Use 0 for the first ancestor of the
         /// requested type.

From 7e4c16838b0d99c330bd4df4c17f432d51d99533 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 15 Oct 2017 15:37:49 -0500
Subject: [PATCH 100/482] Remove StyleResource markup extension tests.

---
 .../Xaml/StyleTests.cs                        | 165 ------------------
 1 file changed, 165 deletions(-)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
index 65fc9eaddd..b339972029 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
@@ -61,171 +61,6 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
-        [Fact]
-        public void StyleResource_Can_Be_Assigned_To_Property()
-        {
-            var xaml = @"
-<UserControl xmlns='https://github.com/avaloniaui'
-             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
-    <UserControl.Styles>
-        <Style>
-            <Style.Resources>
-                <SolidColorBrush x:Key='brush'>#ff506070</SolidColorBrush>
-            </Style.Resources>
-        </Style>
-    </UserControl.Styles>
-
-    <Border Name='border' Background='{StyleResource brush}'/>
-</UserControl>";
-
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
-            var border = userControl.FindControl<Border>("border");
-
-            DelayedBinding.ApplyBindings(border);
-
-            var brush = (SolidColorBrush)border.Background;
-            Assert.Equal(0xff506070, brush.Color.ToUint32());
-        }
-
-        [Fact]
-        public void StyleResource_Can_Be_Assigned_To_Setter()
-        {
-            //skip default theme and styles, they are not needed
-            using (UnitTestApplication.Start(TestServices.StyledWindow
-                                        .With(theme: () => new Styles())))
-            {
-                var xaml = @"
-<Window xmlns='https://github.com/avaloniaui'
-        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
-    <Window.Styles>
-        <Style>
-            <Style.Resources>
-                <SolidColorBrush x:Key='brush'>#ff506070</SolidColorBrush>
-            </Style.Resources>
-        </Style>
-        <Style Selector='Button'>
-            <Setter Property='Background' Value='{StyleResource brush}'/>
-        </Style>
-    </Window.Styles>
-    <Button Name='button'/>
-</Window>";
-
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
-                var button = window.FindControl<Button>("button");
-                var brush = (SolidColorBrush)button.Background;
-
-                Assert.Equal(0xff506070, brush.Color.ToUint32());
-            }
-        }
-
-        [Fact]
-        public void StyleResource_Can_Be_Assigned_To_StyleResource_Property()
-        {
-            using (UnitTestApplication.Start(TestServices.StyledWindow))
-            {
-                var xaml = @"
-<Window xmlns='https://github.com/avaloniaui'
-        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
-    <Window.Styles>
-        <Style>
-            <Style.Resources>
-                <Color x:Key='color'>#ff506070</Color>
-                <SolidColorBrush x:Key='brush' Color='{StyleResource color}'/>
-            </Style.Resources>
-        </Style>
-    </Window.Styles>
-    <Button Name='button' Background='{StyleResource brush}'/>
-</Window>";
-
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
-                var brush = (ISolidColorBrush)window.FindResource("brush");
-                var button = window.FindControl<Button>("button");
-
-                DelayedBinding.ApplyBindings(button);
-
-                var buttonBrush = (ISolidColorBrush)button.Background;
-
-                Assert.Equal(0xff506070, brush.Color.ToUint32());
-                Assert.Equal(0xff506070, buttonBrush.Color.ToUint32());
-            }
-        }
-
-        [Fact]
-        public void StyleResource_Can_Be_Found_In_TopLevel_Styles()
-        {
-            var xaml = @"
-<Styles xmlns='https://github.com/avaloniaui'
-        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
-    <Style>
-        <Style.Resources>
-            <Color x:Key='color'>#ff506070</Color>
-            <SolidColorBrush x:Key='brush' Color='{StyleResource color}'/>
-        </Style.Resources>
-    </Style>
-</Styles>";
-
-            var loader = new AvaloniaXamlLoader();
-            var styles = (Styles)loader.Load(xaml);
-
-            styles.TryGetResource("brush", out var brush);
-
-            Assert.Equal(0xff506070, ((SolidColorBrush)brush).Color.ToUint32());
-        }
-
-        [Fact]
-        public void StyleResource_Can_Be_Found_In_Sibling_Styles()
-        {
-            var xaml = @"
-<Styles xmlns='https://github.com/avaloniaui'
-        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
-    <Style>
-        <Style.Resources>
-            <Color x:Key='color'>#ff506070</Color>
-        </Style.Resources>
-    </Style>
-    <Style>
-        <Style.Resources>
-            <SolidColorBrush x:Key='brush' Color='{StyleResource color}'/>
-        </Style.Resources>
-    </Style>
-</Styles>";
-
-            var loader = new AvaloniaXamlLoader();
-            var styles = (Styles)loader.Load(xaml);
-
-            styles.TryGetResource("brush", out var brush);
-
-            Assert.Equal(0xff506070, ((SolidColorBrush)brush).Color.ToUint32());
-        }
-
-        [Fact(Skip = "TODO: Issue #492")]
-        public void StyleResource_Can_Be_Found_Across_Xaml_Files()
-        {
-            using (UnitTestApplication.Start(TestServices.StyledWindow))
-            {
-                var xaml = @"
-<Window xmlns='https://github.com/avaloniaui'
-        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
-    <Window.Styles>
-        <StyleInclude Source='resm:Avalonia.Markup.Xaml.UnitTests.Xaml.Style1.xaml?assembly=Avalonia.Markup.Xaml.UnitTests'/>
-        <StyleInclude Source='resm:Avalonia.Markup.Xaml.UnitTests.Xaml.Style2.xaml?assembly=Avalonia.Markup.Xaml.UnitTests'/>
-    </Window.Styles>
-    <Border Name='border' Background='{StyleResource RedBrush}'/>
-</Window>";
-
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
-                var border = window.FindControl<Border>("border");
-                var borderBrush = (ISolidColorBrush)border.Background;
-
-                Assert.NotNull(borderBrush);
-                Assert.Equal(0xffff0000, borderBrush.Color.ToUint32());
-            }
-        }
-
         [Fact]
         public void StyleInclude_Is_Built()
         {

From b0a1f3f3dff53d82efa4c3b763a69fed7aa04989 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 15 Oct 2017 15:42:19 -0500
Subject: [PATCH 101/482] Update tests to use `x:Static`.

---
 tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
index ce370790c3..8c7dad1bce 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
@@ -609,8 +609,8 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         public void Multi_Xaml_Binding_Is_Parsed()
         {
             var xaml =
-@"<MultiBinding xmlns='https://github.com/avaloniaui'
-        Converter='{Static BoolConverters.And}'>
+@"<MultiBinding xmlns='https://github.com/avaloniaui' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+    Converter ='{x:Static BoolConverters.And}'>
      <Binding Path='Foo' />
      <Binding Path='Bar' />
 </MultiBinding>";
@@ -818,10 +818,11 @@ do we need it?")]
         {
             var xaml =
 @"<ContentControl xmlns='https://github.com/avaloniaui'
+            xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
             xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
     <ContentControl.ContentTemplate>
         <DataTemplate>
-            <TextBlock  Tag='{Static local:NonControl.StringProperty}'/>
+            <TextBlock  Tag='{x:Static local:NonControl.StringProperty}'/>
         </DataTemplate>
     </ContentControl.ContentTemplate>
 </ContentControl>";

From 745517f68e601c2941b88fe10a249c9cbd5dd1e9 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 15 Oct 2017 15:47:48 -0500
Subject: [PATCH 102/482] Updated usage of Static and Type to be x:Static and
 x:Type.

---
 samples/ControlCatalog/SideBar.xaml                      | 6 +++---
 samples/RenderTest/SideBar.xaml                          | 6 +++---
 src/Avalonia.Themes.Default/TabControl.xaml              | 6 +++---
 src/Avalonia.Themes.Default/TextBox.xaml                 | 8 ++++----
 .../Xaml/DataTemplateTests.cs                            | 9 +++++----
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/samples/ControlCatalog/SideBar.xaml b/samples/ControlCatalog/SideBar.xaml
index c03bc432d4..7fcd828ba3 100644
--- a/samples/ControlCatalog/SideBar.xaml
+++ b/samples/ControlCatalog/SideBar.xaml
@@ -1,11 +1,11 @@
-<Styles xmlns="https://github.com/avaloniaui">
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Style Selector="TabControl.sidebar">
     <Setter Property="Template">
       <ControlTemplate>
         <DockPanel>
           <ScrollViewer MinWidth="190" Background="{DynamicResource ThemeAccentBrush}" DockPanel.Dock="Left">
             <TabStrip Name="PART_TabStrip"
-                      MemberSelector="{Static TabControl.HeaderSelector}"
+                      MemberSelector="{x:Static TabControl.HeaderSelector}"
                       Items="{TemplateBinding Items}"
                       SelectedIndex="{TemplateBinding Path=SelectedIndex, Mode=TwoWay}">
               <TabStrip.ItemsPanel>
@@ -17,7 +17,7 @@
           </ScrollViewer>
           <Carousel Name="PART_Content"
                     Margin="8 0 0 0"
-                    MemberSelector="{Static TabControl.ContentSelector}"
+                    MemberSelector="{x:Static TabControl.ContentSelector}"
                     Items="{TemplateBinding Items}"
                     SelectedIndex="{TemplateBinding Path=SelectedIndex}"
                     Transition="{TemplateBinding Transition}"
diff --git a/samples/RenderTest/SideBar.xaml b/samples/RenderTest/SideBar.xaml
index c03bc432d4..784d1f4071 100644
--- a/samples/RenderTest/SideBar.xaml
+++ b/samples/RenderTest/SideBar.xaml
@@ -1,11 +1,11 @@
-<Styles xmlns="https://github.com/avaloniaui">
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">>
   <Style Selector="TabControl.sidebar">
     <Setter Property="Template">
       <ControlTemplate>
         <DockPanel>
           <ScrollViewer MinWidth="190" Background="{DynamicResource ThemeAccentBrush}" DockPanel.Dock="Left">
             <TabStrip Name="PART_TabStrip"
-                      MemberSelector="{Static TabControl.HeaderSelector}"
+                      MemberSelector="{x:Static TabControl.HeaderSelector}"
                       Items="{TemplateBinding Items}"
                       SelectedIndex="{TemplateBinding Path=SelectedIndex, Mode=TwoWay}">
               <TabStrip.ItemsPanel>
@@ -17,7 +17,7 @@
           </ScrollViewer>
           <Carousel Name="PART_Content"
                     Margin="8 0 0 0"
-                    MemberSelector="{Static TabControl.ContentSelector}"
+                    MemberSelector="{x:Static TabControl.ContentSelector}"
                     Items="{TemplateBinding Items}"
                     SelectedIndex="{TemplateBinding Path=SelectedIndex}"
                     Transition="{TemplateBinding Transition}"
diff --git a/src/Avalonia.Themes.Default/TabControl.xaml b/src/Avalonia.Themes.Default/TabControl.xaml
index 2397ce4e95..f8fb4a1f49 100644
--- a/src/Avalonia.Themes.Default/TabControl.xaml
+++ b/src/Avalonia.Themes.Default/TabControl.xaml
@@ -1,4 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui">
+<Styles xmlns="https://github.com/avaloniaui"  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Style Selector="TabControl">
     <Setter Property="Template">
       <ControlTemplate>
@@ -7,11 +7,11 @@
                 BorderThickness="{TemplateBinding BorderThickness}">
           <DockPanel>
             <TabStrip Name="PART_TabStrip"
-                      MemberSelector="{Static TabControl.HeaderSelector}"
+                      MemberSelector="{x:Static TabControl.HeaderSelector}"
                       Items="{TemplateBinding Items}"
                       SelectedIndex="{TemplateBinding Path=SelectedIndex, Mode=TwoWay}"/>
             <Carousel Name="PART_Content"
-                      MemberSelector="{Static TabControl.ContentSelector}"
+                      MemberSelector="{x:Static TabControl.ContentSelector}"
                       Items="{TemplateBinding Items}"
                       SelectedIndex="{TemplateBinding Path=SelectedIndex}"
                       Transition="{TemplateBinding Transition}"
diff --git a/src/Avalonia.Themes.Default/TextBox.xaml b/src/Avalonia.Themes.Default/TextBox.xaml
index 87d8c22663..6b8f93e714 100644
--- a/src/Avalonia.Themes.Default/TextBox.xaml
+++ b/src/Avalonia.Themes.Default/TextBox.xaml
@@ -1,4 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui">
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Style Selector="TextBox">
     <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
     <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
@@ -18,12 +18,12 @@
                        Text="{TemplateBinding Watermark}"
                        DockPanel.Dock="Top">
               <TextBlock.IsVisible>
-                <MultiBinding Converter="{Static BoolConverters.And}">
+                <MultiBinding Converter="{x:Static BoolConverters.And}">
                   <Binding RelativeSource="{RelativeSource TemplatedParent}"
                            Path="UseFloatingWatermark"/>
                   <Binding RelativeSource="{RelativeSource TemplatedParent}"
                            Path="Text"
-                           Converter="{Static StringConverters.NotNullOrEmpty}"/>
+                           Converter="{x:Static StringConverters.NotNullOrEmpty}"/>
                 </MultiBinding>
               </TextBlock.IsVisible>
             </TextBlock>
@@ -44,7 +44,7 @@
                 <TextBlock Name="watermark"
                            Opacity="0.5"
                            Text="{TemplateBinding Watermark}"
-                           IsVisible="{TemplateBinding Path=Text, Converter={Static StringConverters.NullOrEmpty}}"/>
+                           IsVisible="{TemplateBinding Path=Text, Converter={x:Static StringConverters.NullOrEmpty}}"/>
                 <TextPresenter Name="PART_TextPresenter"
                                Text="{TemplateBinding Text, Mode=TwoWay}"
                                CaretIndex="{TemplateBinding CaretIndex}"
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs
index f79d12cfde..ce51e7ad72 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs
@@ -17,9 +17,10 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             {
                 var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
-        xmlns:sys='clr-namespace:System;assembly=mscorlib'>
+        xmlns:sys='clr-namespace:System;assembly=mscorlib'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
     <Window.DataTemplates>
-        <DataTemplate DataType='{Type sys:String}'>
+        <DataTemplate DataType='{x:Type sys:String}'>
             <Canvas Name='foo'/>
         </DataTemplate>
     </Window.DataTemplates>
@@ -43,10 +44,10 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
                 var xaml = @"
-<Window xmlns='https://github.com/avaloniaui'
+<Window xmlns='https://github.com/avaloniaui' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
         xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests;assembly=Avalonia.Markup.Xaml.UnitTests'>
     <Window.DataTemplates>
-        <DataTemplate DataType='{Type local:TestViewModel}'>
+        <DataTemplate DataType='{x:Type local:TestViewModel}'>
             <Canvas Name='foo' DataContext='{Binding Child}'/>
         </DataTemplate>
     </Window.DataTemplates>

From 7f455e945d7a4b3afca59366595955c3fa5d7497 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 15 Oct 2017 21:33:45 -0500
Subject: [PATCH 103/482] Update Portable.Xaml

---
 Avalonia.sln                                                   | 3 ++-
 .../Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs      | 2 ++
 .../Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Avalonia.sln b/Avalonia.sln
index 7f516667ee..c6509817ce 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.3
+VisualStudioVersion = 15.0.26730.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Base", "src\Avalonia.Base\Avalonia.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
 EndProject
@@ -204,6 +204,7 @@ Global
 		tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{48840edd-24bf-495d-911e-2eb12ae75d3b}*SharedItemsImports = 13
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{4a1abb09-9047-4bd5-a4ad-a055e52c5ee0}*SharedItemsImports = 4
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{7863ea94-f0fb-4386-bf8c-e5bfa761560a}*SharedItemsImports = 4
+		src\Shared\PlatformSupport\PlatformSupport.projitems*{7b92af71-6287-4693-9dcb-bd5b6e927e23}*SharedItemsImports = 4
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{7d2d3083-71dd-4cc9-8907-39a0d86fb322}*SharedItemsImports = 4
 		src\Windows\Avalonia.Win32\Avalonia.Win32.Shared.projitems*{811a76cf-1cf6-440f-963b-bbe31bd72a82}*SharedItemsImports = 4
 		src\Windows\Avalonia.Win32\Avalonia.Win32.Shared.projitems*{9defc6b7-845b-4d8f-afc0-d32bf0032b8c}*SharedItemsImports = 13
diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs
index 71c8902cbd..0cc08ac6ee 100644
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs
@@ -294,6 +294,8 @@ namespace Avalonia.Markup.Xaml.PortableXaml
             return Property.IsReadOnly;
         }
 
+        protected override bool LookupIsUnknown() => false;
+
         protected override Type GetPropertyType()
         {
             return Property.PropertyType;
diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
index eebf9dbb92..f226a516fe 160000
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
@@ -1 +1 @@
-Subproject commit eebf9dbb9275ecc48c18ec24f6fbad8cb494857f
+Subproject commit f226a516fe2bc191145c1fbf732f5a087f121a33

From 0590465a0a3239827c314faac8695de82c3fa9d5 Mon Sep 17 00:00:00 2001
From: Jurjen Biewenga <j.f.biewenga@gmail.com>
Date: Mon, 16 Oct 2017 11:01:35 +0200
Subject: [PATCH 104/482] Reverted keyboard device

---
 src/Avalonia.Input/KeyboardDevice.cs | 34 ++++++++--------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/src/Avalonia.Input/KeyboardDevice.cs b/src/Avalonia.Input/KeyboardDevice.cs
index 76656ee79e..d815f8082b 100644
--- a/src/Avalonia.Input/KeyboardDevice.cs
+++ b/src/Avalonia.Input/KeyboardDevice.cs
@@ -23,8 +23,6 @@ namespace Avalonia.Input
         public IInputManager InputManager => AvaloniaLocator.Current.GetService<IInputManager>();
 
         public IFocusManager FocusManager => AvaloniaLocator.Current.GetService<IFocusManager>();
-        
-        public string[] invalidCharacters = new String[1]{""};
 
         public IInputElement FocusedElement
         {
@@ -124,32 +122,18 @@ namespace Avalonia.Input
 
                 if (text != null)
                 {
-                    string cleanedText = RemoveInvalidCharacters(text.Text);
-                    if (!string.IsNullOrEmpty(cleanedText))
+                    var ev = new TextInputEventArgs()
                     {
-                        var ev = new TextInputEventArgs()
-                                 {
-                                     Device = this,
-                                     Text = cleanedText,
-                                     Source = element,
-                                     RoutedEvent = InputElement.TextInputEvent
-                                 };
-
-                        element.RaiseEvent(ev);
-                        e.Handled = ev.Handled;
-                    }
+                        Device = this,
+                        Text = text.Text,
+                        Source = element,
+                        RoutedEvent = InputElement.TextInputEvent
+                    };
+
+                    element.RaiseEvent(ev);
+                    e.Handled = ev.Handled;
                 }
             }
         }
-
-        public string RemoveInvalidCharacters(string text)
-        {
-            for (var i = 0; i < invalidCharacters.Length; i++)
-            {
-                text = text.Replace(invalidCharacters[i], string.Empty);
-            }
-
-            return text;
-        }
     }
 }

From 410702da5ba56ec4bbed295d6eedf2496dffc7a3 Mon Sep 17 00:00:00 2001
From: Jurjen Biewenga <j.f.biewenga@gmail.com>
Date: Mon, 16 Oct 2017 11:01:59 +0200
Subject: [PATCH 105/482] Added array that is used to filter out certain
 characters the input to the textbox

---
 src/Avalonia.Controls/TextBox.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 92ab12f82e..7b6d5ac52e 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -97,6 +97,7 @@ namespace Avalonia.Controls
         private UndoRedoHelper<UndoRedoState> _undoRedoHelper;
         private bool _ignoreTextChanges;
         private IEnumerable<Exception> _dataValidationErrors;
+        private string[] invalidCharacters = new String[1]{""};
 
         static TextBox()
         {
@@ -280,6 +281,7 @@ namespace Avalonia.Controls
         {
             if (!IsReadOnly)
             {
+                input = RemoveInvalidCharacters(input);
                 string text = Text ?? string.Empty;
                 int caretIndex = CaretIndex;
                 if (!string.IsNullOrEmpty(input))
@@ -295,6 +297,16 @@ namespace Avalonia.Controls
             }
         }
 
+        public string RemoveInvalidCharacters(string text)
+        {
+            for (var i = 0; i < invalidCharacters.Length; i++)
+            {
+                text = text.Replace(invalidCharacters[i], string.Empty);
+            }
+
+            return text;
+        }
+
         private async void Copy()
         {
             await ((IClipboard)AvaloniaLocator.Current.GetService(typeof(IClipboard)))

From 3081a07f1c64403a668049d8e0652255b26fc888 Mon Sep 17 00:00:00 2001
From: Jurjen Biewenga <j.f.biewenga@gmail.com>
Date: Mon, 16 Oct 2017 11:27:06 +0200
Subject: [PATCH 106/482] Made the requested changes

---
 src/Avalonia.Controls/DropDown.cs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/Avalonia.Controls/DropDown.cs b/src/Avalonia.Controls/DropDown.cs
index c38f9ffd9e..cdb179cac9 100644
--- a/src/Avalonia.Controls/DropDown.cs
+++ b/src/Avalonia.Controls/DropDown.cs
@@ -104,7 +104,7 @@ namespace Avalonia.Controls
             if (!e.Handled)
             {
                 if (e.Key == Key.F4 ||
-                    (e.Key == Key.Down && ((e.Modifiers & InputModifiers.Alt) != 0)))
+                    ((e.Key == Key.Down || e.Key == Key.Up) && ((e.Modifiers & InputModifiers.Alt) != 0)))
                 {
                     IsDropDownOpen = !IsDropDownOpen;
                     e.Handled = true;
@@ -117,24 +117,21 @@ namespace Avalonia.Controls
 
                 if (!IsDropDownOpen)
                 {
-                    if (e.Key == Key.Right)
+                    if (e.Key == Key.Down)
                     {
+                        if (SelectedIndex == -1)
+                            SelectedIndex = 0;
+                        
                         if (++SelectedIndex >= ItemCount)
                             SelectedIndex = 0;
                         
                         e.Handled = true;
                     }
-                    else if (e.Key == Key.Left)
+                    else if (e.Key == Key.Up)
                     {
                         if (--SelectedIndex < 0)
                             SelectedIndex = ItemCount - 1;
-                        e.Handled = true;
-                    }
-                    else if (e.Key == Key.Down)
-                    {
-                        IsDropDownOpen = true;
-                        if (SelectedIndex == -1)
-                            SelectedIndex = 0;
+                        
                         e.Handled = true;
                     }
                 }

From b0f97939c3e147904417a23bd192ff6e570ec578 Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Tue, 17 Oct 2017 02:15:18 -0400
Subject: [PATCH 107/482] Fix sizing behavior of Shape class

Shapes with Strech set to Fill would fail to size themselves correctly
when an infinite available size was passed to messure. This occurs
because the transform is calculated before a final size is known.

A flag was added that signals ArrangeOverride to calculate the
transform for the RenderedGeometry
---
 src/Avalonia.Controls/Shapes/Shape.cs | 46 +++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Shapes/Shape.cs b/src/Avalonia.Controls/Shapes/Shape.cs
index c03f4dc563..73b89ca4b7 100644
--- a/src/Avalonia.Controls/Shapes/Shape.cs
+++ b/src/Avalonia.Controls/Shapes/Shape.cs
@@ -29,6 +29,8 @@ namespace Avalonia.Controls.Shapes
         private Matrix _transform = Matrix.Identity;
         private Geometry _definingGeometry;
         private Geometry _renderedGeometry;
+        bool _calculateTransformOnArrange = false;
+
 
         static Shape()
         {
@@ -150,13 +152,53 @@ namespace Avalonia.Controls.Shapes
             this._definingGeometry = null;
             InvalidateMeasure();
         }
-
+        
         protected override Size MeasureOverride(Size availableSize)
+        {
+            bool deferCalculateTransform;
+            switch (Stretch)
+            {
+                case Stretch.Fill:
+                case Stretch.UniformToFill:
+                    deferCalculateTransform = double.IsInfinity(availableSize.Width) || double.IsInfinity(availableSize.Height);
+                    break;
+                case Stretch.Uniform:
+                    deferCalculateTransform = double.IsInfinity(availableSize.Width) && double.IsInfinity(availableSize.Height);
+                    break;
+                case Stretch.None:
+                default:
+                    deferCalculateTransform = false;
+                    break;
+            }
+
+            if (deferCalculateTransform)
+            {
+                _calculateTransformOnArrange = true;
+                return DefiningGeometry.Bounds.Size;
+            }
+            else
+            {
+                _calculateTransformOnArrange = false;
+                return CalculateShapeSizeAndSetTransform(availableSize);
+            }
+        }
+        
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            if(_calculateTransformOnArrange)
+            {
+                _calculateTransformOnArrange = false;
+                CalculateShapeSizeAndSetTransform(finalSize);
+            }
+
+            return finalSize;
+        }
+        private Size CalculateShapeSizeAndSetTransform(Size availableSize)
         {
             // This should probably use GetRenderBounds(strokeThickness) but then the calculations
             // will multiply the stroke thickness as well, which isn't correct.
             var (size, transform) = CalculateSizeAndTransform(availableSize, DefiningGeometry.Bounds, Stretch);
-            
+
             if (_transform != transform)
             {
                 _transform = transform;

From 17337882b3cbc5d89f402caafd1448b75afedf8c Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Tue, 17 Oct 2017 13:04:12 +0300
Subject: [PATCH 108/482] [GTK3] Special resize handling for popups

---
 src/Gtk/Avalonia.Gtk3/Interop/Native.cs |  4 ++++
 src/Gtk/Avalonia.Gtk3/PopupImpl.cs      |  1 +
 src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs | 23 +++++++++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/src/Gtk/Avalonia.Gtk3/Interop/Native.cs b/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
index 15b3a11fbb..3b9007786d 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
+++ b/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
@@ -102,6 +102,9 @@ namespace Avalonia.Gtk3.Interop
             
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Gdk)]
             public delegate void gdk_window_resize(IntPtr gtkWindow, int width, int height);
+            
+            [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Gdk)]
+            public delegate void gdk_window_set_override_redirect(IntPtr gdkWindow, bool value);
 
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Gtk)]
             public delegate void gtk_widget_realize(GtkWidget gtkWidget);
@@ -402,6 +405,7 @@ namespace Avalonia.Gtk3.Interop
         public static D.gtk_window_get_size GtkWindowGetSize;
         public static D.gtk_window_resize GtkWindowResize;
         public static D.gdk_window_resize GdkWindowResize;
+        public static D.gdk_window_set_override_redirect GdkWindowSetOverrideRedirect;
         public static D.gtk_widget_set_size_request GtkWindowSetSizeRequest;
         public static D.gtk_window_set_default_size GtkWindowSetDefaultSize;
         public static D.gtk_window_get_position GtkWindowGetPosition;
diff --git a/src/Gtk/Avalonia.Gtk3/PopupImpl.cs b/src/Gtk/Avalonia.Gtk3/PopupImpl.cs
index 8fd1c28ea4..13beff580e 100644
--- a/src/Gtk/Avalonia.Gtk3/PopupImpl.cs
+++ b/src/Gtk/Avalonia.Gtk3/PopupImpl.cs
@@ -19,6 +19,7 @@ namespace Avalonia.Gtk3
 
         public PopupImpl() : base(CreateWindow())
         {
+            OverrideRedirect = true;
         }
     }
 }
diff --git a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
index e14ed77877..3128be23aa 100644
--- a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
+++ b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
@@ -32,6 +32,7 @@ namespace Avalonia.Gtk3
         private IDeferredRenderOperation _nextRenderOperation;
         private readonly AutoResetEvent _canSetNextOperation = new AutoResetEvent(true);
         internal IntPtr? GdkWindowHandle;
+        private bool _overrideRedirect;
         public WindowBaseImpl(GtkWindow gtkWidget)
         {
             
@@ -406,6 +407,28 @@ namespace Avalonia.Gtk3
             if (GtkWidget.IsClosed)
                 return;
             Native.GtkWindowResize(GtkWidget, (int)value.Width, (int)value.Height);
+            if (OverrideRedirect)
+            {
+                var size = ClientSize = value;
+                if (_lastSize != size)
+                {
+                    Resized?.Invoke(size);
+                    _lastSize = size;
+                }
+            }
+        }
+
+        public bool OverrideRedirect
+        {
+            get => _overrideRedirect;
+            set
+            {
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                {
+                    Native.GdkWindowSetOverrideRedirect(Native.GtkWidgetGetWindow(GtkWidget), value);
+                    _overrideRedirect = value;
+                }
+            }
         }
         
         public IScreenImpl Screen

From 4e98c3494048934f12028a30f8cbadc7cc567d49 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Tue, 17 Oct 2017 14:08:30 +0300
Subject: [PATCH 109/482] [GTK3] Skip resize part of configure event if
 OverrideRedirect=true

---
 src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
index 3128be23aa..136023c31d 100644
--- a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
+++ b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
@@ -70,12 +70,15 @@ namespace Avalonia.Gtk3
         private bool OnConfigured(IntPtr gtkwidget, IntPtr ev, IntPtr userdata)
         {
             int w, h;
-            Native.GtkWindowGetSize(GtkWidget, out w, out h);
-            var size = ClientSize = new Size(w, h);
-            if (_lastSize != size)
+            if (!OverrideRedirect)
             {
-                Resized?.Invoke(size);
-                _lastSize = size;
+                Native.GtkWindowGetSize(GtkWidget, out w, out h);
+                var size = ClientSize = new Size(w, h);
+                if (_lastSize != size)
+                {
+                    Resized?.Invoke(size);
+                    _lastSize = size;
+                }
             }
             var pos = Position;
             if (_lastPosition != pos)

From ca7584ce3fef1ba5f8a7e8b7bb916dc4617a1f21 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 17 Oct 2017 23:45:00 +0200
Subject: [PATCH 110/482] Added failing test for #1218

---
 .../Avalonia.Styling.UnitTests/SetterTests.cs | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/tests/Avalonia.Styling.UnitTests/SetterTests.cs b/tests/Avalonia.Styling.UnitTests/SetterTests.cs
index 84536fa47b..9c43097a21 100644
--- a/tests/Avalonia.Styling.UnitTests/SetterTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/SetterTests.cs
@@ -8,6 +8,9 @@ using Avalonia.Data;
 using Xunit;
 using System;
 using Avalonia.Controls.Templates;
+using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup;
+using System.Globalization;
 
 namespace Avalonia.Styling.UnitTests
 {
@@ -61,5 +64,39 @@ namespace Avalonia.Styling.UnitTests
 
             Assert.NotNull(NameScope.GetNameScope((Control)control.Child));
         }
+
+        [Fact]
+        public void Does_Not_Call_Converter_ConvertBack_On_OneWay_Binding()
+        {
+            var control = new Decorator { Name = "foo" };
+            var style = Mock.Of<IStyle>();
+            var binding = new Binding("Name", BindingMode.OneWay)
+            {
+                Converter = new TestConverter(),
+                RelativeSource = new RelativeSource(RelativeSourceMode.Self),
+            };
+            var setter = new Setter(Decorator.TagProperty, binding);
+            var activator = new BehaviorSubject<bool>(true);
+
+            setter.Apply(style, control, activator);
+            Assert.Equal("foobar", control.Tag);
+
+            // Issue #1218 caused TestConverter.ConvertBack to throw here.
+            activator.OnNext(false);
+            Assert.Null(control.Tag);
+        }
+
+        private class TestConverter : IValueConverter
+        {
+            public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+            {
+                return value.ToString() + "bar";
+            }
+
+            public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+            {
+                throw new NotImplementedException();
+            }
+        }
     }
 }

From dede306531fc38eef26807cd0eb028f9dbd66470 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 17 Oct 2017 23:45:35 +0200
Subject: [PATCH 111/482] Fixed #1218

---
 src/Avalonia.Styling/Styling/Setter.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Styling/Styling/Setter.cs b/src/Avalonia.Styling/Styling/Setter.cs
index d065b231ce..eb5218cd6f 100644
--- a/src/Avalonia.Styling/Styling/Setter.cs
+++ b/src/Avalonia.Styling/Styling/Setter.cs
@@ -141,20 +141,20 @@ namespace Avalonia.Styling
             {
                 var description = style?.ToString();
 
-                if (sourceInstance.Subject != null)
+                if (sourceInstance.Mode == BindingMode.TwoWay || sourceInstance.Mode == BindingMode.OneWayToSource)
                 {
                     var activated = new ActivatedSubject(activator, sourceInstance.Subject, description);
                     cloned = new InstancedBinding(activated, sourceInstance.Mode, BindingPriority.StyleTrigger);
                 }
-                else if (sourceInstance.Observable != null)
+                else if (sourceInstance.Mode == BindingMode.OneTime)
                 {
-                    var activated = new ActivatedObservable(activator, sourceInstance.Observable, description);
-                    cloned = new InstancedBinding(activated, sourceInstance.Mode, BindingPriority.StyleTrigger);
+                    var activated = new ActivatedValue(activator, sourceInstance.Value, description);
+                    cloned = new InstancedBinding(activated, BindingMode.OneWay, BindingPriority.StyleTrigger);
                 }
                 else
                 {
-                    var activated = new ActivatedValue(activator, sourceInstance.Value, description);
-                    cloned = new InstancedBinding(activated, BindingMode.OneWay, BindingPriority.StyleTrigger);
+                    var activated = new ActivatedObservable(activator, sourceInstance.Observable ?? sourceInstance.Subject, description);
+                    cloned = new InstancedBinding(activated, sourceInstance.Mode, BindingPriority.StyleTrigger);
                 }
             }
             else

From d6b6a0fa969bc8ef1df69749b2cfc81294d7008a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 18 Oct 2017 17:26:25 +0200
Subject: [PATCH 112/482] Refactored InstancedBinding creation.

Previously it wasn't clear which constructor on `InstancedBinding` must be called for a particular binding mode. Refactored the constructors:

- We now have a single public ctor which takes an `ISubject`, as a subject can be used for all binding modes.
- Instanced bindings with other sources such as single values and `IObservables` are now constructed via static methods which only allow the correct sources for that binding mode
---
 src/Avalonia.Base/AvaloniaObjectExtensions.cs |   2 +-
 src/Avalonia.Base/Data/IndexerBinding.cs      |  17 +-
 src/Avalonia.Base/Data/InstancedBinding.cs    | 155 ++++++++++++------
 .../Templates/FuncTreeDataTemplate.cs         |   2 +-
 src/Avalonia.Styling/Styling/Setter.cs        |  60 +++----
 .../Avalonia.Markup.Xaml/Data/MultiBinding.cs |  35 +---
 .../Data/StyleResourceBinding.cs              |   2 +-
 .../DynamicResourceExtension.cs               |   2 +-
 .../Templates/TreeDataTemplate.cs             |   2 +-
 .../AvaloniaObjectTests_Binding.cs            |   2 +-
 .../TreeViewTests.cs                          |   2 +-
 .../Data/MultiBindingTests.cs                 |   4 +-
 .../Avalonia.Styling.UnitTests/SetterTests.cs |   2 +-
 13 files changed, 160 insertions(+), 127 deletions(-)

diff --git a/src/Avalonia.Base/AvaloniaObjectExtensions.cs b/src/Avalonia.Base/AvaloniaObjectExtensions.cs
index 685bf83a75..e96679e643 100644
--- a/src/Avalonia.Base/AvaloniaObjectExtensions.cs
+++ b/src/Avalonia.Base/AvaloniaObjectExtensions.cs
@@ -326,7 +326,7 @@ namespace Avalonia
                 object anchor = null,
                 bool enableDataValidation = false)
             {
-                return new InstancedBinding(_source);
+                return InstancedBinding.OneWay(_source);
             }
         }
     }
diff --git a/src/Avalonia.Base/Data/IndexerBinding.cs b/src/Avalonia.Base/Data/IndexerBinding.cs
index 729b21b0d9..6b5a84989a 100644
--- a/src/Avalonia.Base/Data/IndexerBinding.cs
+++ b/src/Avalonia.Base/Data/IndexerBinding.cs
@@ -31,13 +31,18 @@ namespace Avalonia.Data
                 targetProperty.GetMetadata(target.GetType()).DefaultBindingMode :
                 Mode;
 
-            if (mode == BindingMode.TwoWay)
+            switch (mode)
             {
-                return new InstancedBinding(Source.GetSubject(Property), mode);
-            }
-            else
-            {
-                return new InstancedBinding(Source.GetObservable(Property), mode);
+                case BindingMode.OneTime:
+                    return InstancedBinding.OneTime(Source.GetObservable(Property));
+                case BindingMode.OneWay:
+                    return InstancedBinding.OneWay(Source.GetObservable(Property));
+                case BindingMode.OneWayToSource:
+                    return InstancedBinding.OneWayToSource(Source.GetSubject(Property));
+                case BindingMode.TwoWay:
+                    return InstancedBinding.TwoWay(Source.GetSubject(Property));
+                default:
+                    throw new NotSupportedException("Unsupported BindingMode.");
             }
         }
     }
diff --git a/src/Avalonia.Base/Data/InstancedBinding.cs b/src/Avalonia.Base/Data/InstancedBinding.cs
index 899cfed1fe..dc35fe076b 100644
--- a/src/Avalonia.Base/Data/InstancedBinding.cs
+++ b/src/Avalonia.Base/Data/InstancedBinding.cs
@@ -14,71 +14,35 @@ namespace Avalonia.Data
     /// property on a control's DataContext"; this class represents a binding that has been 
     /// *instanced* by calling <see cref="IBinding.Initiate(IAvaloniaObject, AvaloniaProperty, object, bool)"/>
     /// on a target object.
-    /// 
-    /// When a binding is initiated, it can return one of 3 possible sources for the binding:
-    /// - An <see cref="ISubject{Object}"/> which can be used for any type of binding.
-    /// - An <see cref="IObservable{Object}"/> which can be used for all types of bindings except
-    ///  <see cref="BindingMode.OneWayToSource"/> and <see cref="BindingMode.TwoWay"/>.
-    /// - A plain object, which can only represent a <see cref="BindingMode.OneTime"/> binding.
     /// </remarks>
     public class InstancedBinding
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="InstancedBinding"/> class.
         /// </summary>
-        /// <param name="value">
-        /// The value used for the <see cref="BindingMode.OneTime"/> binding.
-        /// </param>
-        /// <param name="priority">The binding priority.</param>
-        public InstancedBinding(object value,
-            BindingPriority priority = BindingPriority.LocalValue)
-        {
-            Mode = BindingMode.OneTime;
-            Priority = priority;
-            Value = value;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InstancedBinding"/> class.
-        /// </summary>
-        /// <param name="observable">The observable for a one-way binding.</param>
+        /// <param name="subject">The binding source.</param>
         /// <param name="mode">The binding mode.</param>
-        /// <param name="priority">The binding priority.</param>
-        public InstancedBinding(
-            IObservable<object> observable, 
-            BindingMode mode = BindingMode.OneWay,
-            BindingPriority priority = BindingPriority.LocalValue)
+        /// <param name="priority">The priority of the binding.</param>
+        /// <remarks>
+        /// This constructor can be used to create any type of binding and as such requires an
+        /// <see cref="ISubject{Object}"/> as the binding source because this is the only binding
+        /// source which can be used for all binding modes. If you wish to create an instance with
+        /// something other than a subject, use one of the static creation methods on this class.
+        /// </remarks>
+        public InstancedBinding(ISubject<object> subject, BindingMode mode, BindingPriority priority)
         {
-            Contract.Requires<ArgumentNullException>(observable != null);
-
-            if (mode == BindingMode.OneWayToSource || mode == BindingMode.TwoWay)
-            {
-                throw new ArgumentException(
-                    "Invalid BindingResult mode: OneWayToSource and TwoWay bindings" +
-                    "require a Subject.");
-            }
+            Contract.Requires<ArgumentNullException>(subject != null);
 
             Mode = mode;
             Priority = priority;
-            Observable = observable;
+            Value = subject;
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InstancedBinding"/> class.
-        /// </summary>
-        /// <param name="subject">The subject for a two-way binding.</param>
-        /// <param name="mode">The binding mode.</param>
-        /// <param name="priority">The binding priority.</param>
-        public InstancedBinding(
-            ISubject<object> subject,
-            BindingMode mode = BindingMode.OneWay,
-            BindingPriority priority = BindingPriority.LocalValue)
+        private InstancedBinding(object value, BindingMode mode, BindingPriority priority)
         {
-            Contract.Requires<ArgumentNullException>(subject != null);
-
             Mode = mode;
             Priority = priority;
-            Subject = subject;
+            Value = value;
         }
 
         /// <summary>
@@ -92,18 +56,101 @@ namespace Avalonia.Data
         public BindingPriority Priority { get; }
 
         /// <summary>
-        /// Gets the value used for a <see cref="BindingMode.OneTime"/> binding.
+        /// Gets the value or source of the binding.
         /// </summary>
         public object Value { get; }
 
         /// <summary>
-        /// Gets the observable for a one-way binding.
+        /// Gets the <see cref="Value"/> as an observable.
         /// </summary>
-        public IObservable<object> Observable { get; }
+        public IObservable<object> Observable => Value as IObservable<object>;
 
         /// <summary>
-        /// Gets the subject for a two-way binding.
+        /// Gets the <see cref="Value"/> as a subject.
         /// </summary>
-        public ISubject<object> Subject { get; }
+        public ISubject<object> Subject => Value as ISubject<object>;
+
+        /// <summary>
+        /// Creates a new one-time binding with a fixed value.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <param name="priority">The priority of the binding.</param>
+        /// <returns>An <see cref="InstancedBinding"/> instance.</returns>
+        public static InstancedBinding OneTime(
+            object value,
+            BindingPriority priority = BindingPriority.LocalValue)
+        {
+            return new InstancedBinding(value, BindingMode.OneTime, priority);
+        }
+
+        /// <summary>
+        /// Creates a new one-time binding.
+        /// </summary>
+        /// <param name="observable">The source observable.</param>
+        /// <param name="priority">The priority of the binding.</param>
+        /// <returns>An <see cref="InstancedBinding"/> instance.</returns>
+        public static InstancedBinding OneTime(
+            IObservable<object> observable,
+            BindingPriority priority = BindingPriority.LocalValue)
+        {
+            Contract.Requires<ArgumentNullException>(observable != null);
+
+            return new InstancedBinding(observable, BindingMode.OneTime, priority);
+        }
+
+        /// <summary>
+        /// Creates a new one-way binding.
+        /// </summary>
+        /// <param name="observable">The source observable.</param>
+        /// <param name="priority">The priority of the binding.</param>
+        /// <returns>An <see cref="InstancedBinding"/> instance.</returns>
+        public static InstancedBinding OneWay(
+            IObservable<object> observable,
+            BindingPriority priority = BindingPriority.LocalValue)
+        {
+            Contract.Requires<ArgumentNullException>(observable != null);
+
+            return new InstancedBinding(observable, BindingMode.OneWay, priority);
+        }
+
+        /// <summary>
+        /// Creates a new one-way to source binding.
+        /// </summary>
+        /// <param name="subject">The binding source.</param>
+        /// <param name="priority">The priority of the binding.</param>
+        /// <returns>An <see cref="InstancedBinding"/> instance.</returns>
+        public static InstancedBinding OneWayToSource(
+            ISubject<object> subject,
+            BindingPriority priority = BindingPriority.LocalValue)
+        {
+            Contract.Requires<ArgumentNullException>(subject != null);
+
+            return new InstancedBinding(subject, BindingMode.OneWayToSource, priority);
+        }
+
+        /// <summary>
+        /// Creates a new two-way binding.
+        /// </summary>
+        /// <param name="subject">The binding source.</param>
+        /// <param name="priority">The priority of the binding.</param>
+        /// <returns>An <see cref="InstancedBinding"/> instance.</returns>
+        public static InstancedBinding TwoWay(
+            ISubject<object> subject,
+            BindingPriority priority = BindingPriority.LocalValue)
+        {
+            Contract.Requires<ArgumentNullException>(subject != null);
+
+            return new InstancedBinding(subject, BindingMode.TwoWay, priority);
+        }
+
+        /// <summary>
+        /// Creates a copy of the <see cref="InstancedBinding"/> with a different priority.
+        /// </summary>
+        /// <param name="priority">The priority of the binding.</param>
+        /// <returns>An <see cref="InstancedBinding"/> instance.</returns>
+        public InstancedBinding WithPriority(BindingPriority priority)
+        {
+            return new InstancedBinding(Value, Mode, priority);
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Templates/FuncTreeDataTemplate.cs b/src/Avalonia.Controls/Templates/FuncTreeDataTemplate.cs
index 04e6ece832..2e55dd3552 100644
--- a/src/Avalonia.Controls/Templates/FuncTreeDataTemplate.cs
+++ b/src/Avalonia.Controls/Templates/FuncTreeDataTemplate.cs
@@ -62,7 +62,7 @@ namespace Avalonia.Controls.Templates
         /// <returns>The child items, or null if no child items.</returns>
         public InstancedBinding ItemsSelector(object item)
         {
-            return new InstancedBinding(this?._itemsSelector(item));
+            return InstancedBinding.OneTime(this?._itemsSelector(item));
         }
 
         /// <summary>
diff --git a/src/Avalonia.Styling/Styling/Setter.cs b/src/Avalonia.Styling/Styling/Setter.cs
index eb5218cd6f..95db18a465 100644
--- a/src/Avalonia.Styling/Styling/Setter.cs
+++ b/src/Avalonia.Styling/Styling/Setter.cs
@@ -135,45 +135,47 @@ namespace Avalonia.Styling
 
         private InstancedBinding Clone(InstancedBinding sourceInstance, IStyle style, IObservable<bool> activator)
         {
-            InstancedBinding cloned;
-
             if (activator != null)
             {
                 var description = style?.ToString();
 
-                if (sourceInstance.Mode == BindingMode.TwoWay || sourceInstance.Mode == BindingMode.OneWayToSource)
-                {
-                    var activated = new ActivatedSubject(activator, sourceInstance.Subject, description);
-                    cloned = new InstancedBinding(activated, sourceInstance.Mode, BindingPriority.StyleTrigger);
-                }
-                else if (sourceInstance.Mode == BindingMode.OneTime)
-                {
-                    var activated = new ActivatedValue(activator, sourceInstance.Value, description);
-                    cloned = new InstancedBinding(activated, BindingMode.OneWay, BindingPriority.StyleTrigger);
-                }
-                else
+                switch (sourceInstance.Mode)
                 {
-                    var activated = new ActivatedObservable(activator, sourceInstance.Observable ?? sourceInstance.Subject, description);
-                    cloned = new InstancedBinding(activated, sourceInstance.Mode, BindingPriority.StyleTrigger);
+                    case BindingMode.OneTime:
+                        if (sourceInstance.Observable != null)
+                        {
+                            var activated = new ActivatedObservable(activator, sourceInstance.Observable, description);
+                            return InstancedBinding.OneTime(activated, BindingPriority.StyleTrigger);
+                        }
+                        else
+                        {
+                            var activated = new ActivatedValue(activator, sourceInstance.Value, description);
+                            return InstancedBinding.OneTime(activated, BindingPriority.StyleTrigger);
+                        }
+                    case BindingMode.OneWay:
+                        {
+                            var activated = new ActivatedObservable(activator, sourceInstance.Observable, description);
+                            return InstancedBinding.OneWay(activated, BindingPriority.StyleTrigger);
+                        }
+                    case BindingMode.OneWayToSource:
+                        {
+                            var activated = new ActivatedSubject(activator, sourceInstance.Subject, description);
+                            return InstancedBinding.OneWayToSource(activated, BindingPriority.StyleTrigger);
+                        }
+                    case BindingMode.TwoWay:
+                        {
+                            var activated = new ActivatedSubject(activator, sourceInstance.Subject, description);
+                            return InstancedBinding.TwoWay(activated, BindingPriority.StyleTrigger);
+                        }
+                    default:
+                        throw new NotSupportedException("Unsupported BindingMode.");
                 }
+
             }
             else
             {
-                if (sourceInstance.Subject != null)
-                {
-                    cloned = new InstancedBinding(sourceInstance.Subject, sourceInstance.Mode, BindingPriority.Style);
-                }
-                else if (sourceInstance.Observable != null)
-                {
-                    cloned = new InstancedBinding(sourceInstance.Observable, sourceInstance.Mode, BindingPriority.Style);
-                }
-                else
-                {
-                    cloned = new InstancedBinding(sourceInstance.Value, BindingPriority.Style);
-                }
+                return sourceInstance.WithPriority(BindingPriority.StyleTrigger);
             }
-
-            return cloned;
         }
     }
 }
diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/MultiBinding.cs b/src/Markup/Avalonia.Markup.Xaml/Data/MultiBinding.cs
index 621e06efba..3c29ed3a39 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/MultiBinding.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Data/MultiBinding.cs
@@ -62,41 +62,20 @@ namespace Avalonia.Markup.Xaml.Data
             }
 
             var targetType = targetProperty?.PropertyType ?? typeof(object);
-            var result = new BehaviorSubject<object>(AvaloniaProperty.UnsetValue);
             var children = Bindings.Select(x => x.Initiate(target, null));
             var input = children.Select(x => x.Subject).CombineLatest().Select(x => ConvertValue(x, targetType));
-            input.Subscribe(result);
-            return new InstancedBinding(result, Mode, Priority);
-        }
-
-        /// <summary>
-        /// Applies a binding subject to a property on an instance.
-        /// </summary>
-        /// <param name="target">The target instance.</param>
-        /// <param name="property">The target property.</param>
-        /// <param name="subject">The binding subject.</param>
-        internal void Bind(IAvaloniaObject target, AvaloniaProperty property, ISubject<object> subject)
-        {
             var mode = Mode == BindingMode.Default ?
-                property.GetMetadata(target.GetType()).DefaultBindingMode : Mode;
+                targetProperty.GetMetadata(target.GetType()).DefaultBindingMode : Mode;
 
             switch (mode)
             {
-                case BindingMode.Default:
-                case BindingMode.OneWay:
-                    target.Bind(property, subject, Priority);
-                    break;
-                case BindingMode.TwoWay:
-                    throw new NotSupportedException("TwoWay MultiBinding not currently supported.");
                 case BindingMode.OneTime:
-                    target.GetObservable(Control.DataContextProperty).Subscribe(dataContext =>
-                    {
-                        subject.Take(1).Subscribe(x => target.SetValue(property, x, Priority));
-                    });                    
-                    break;
-                case BindingMode.OneWayToSource:
-                    target.GetObservable(property).Subscribe(subject);
-                    break;
+                    return InstancedBinding.OneTime(input, Priority);
+                case BindingMode.OneWay:
+                    return InstancedBinding.OneWay(input, Priority);
+                default:
+                    throw new NotSupportedException(
+                        "MultiBinding currently only supports OneTime and OneWay BindingMode.");
             }
         }
 
diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/StyleResourceBinding.cs b/src/Markup/Avalonia.Markup.Xaml/Data/StyleResourceBinding.cs
index 787aebbdc6..7df2aef07b 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/StyleResourceBinding.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Data/StyleResourceBinding.cs
@@ -58,7 +58,7 @@ namespace Avalonia.Markup.Xaml.Data
 
             if (resource != AvaloniaProperty.UnsetValue)
             {
-                return new InstancedBinding(resource, Priority);
+                return InstancedBinding.OneTime(resource, Priority);
             }
             else
             {
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
index 231778be09..52d9f043f4 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
@@ -51,7 +51,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
 
             if (control != null)
             {
-                return new InstancedBinding(control.GetResourceObservable(ResourceKey));
+                return InstancedBinding.OneWay(control.GetResourceObservable(ResourceKey));
             }
 
             return null;
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
index d6d3bd46ec..883e177f8a 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
@@ -42,7 +42,7 @@ namespace Avalonia.Markup.Xaml.Templates
             if (ItemsSource != null)
             {
                 var obs = new ExpressionObserver(item, ItemsSource.Path);
-                return new InstancedBinding(obs, BindingMode.OneWay, BindingPriority.Style);
+                return InstancedBinding.OneWay(obs, BindingPriority.Style);
             }
 
             return null;
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
index 66b237de06..4d6559a078 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
@@ -428,7 +428,7 @@ namespace Avalonia.Base.UnitTests
                 object anchor = null,
                 bool enableDataValidation = false)
             {
-                return new InstancedBinding(_source, BindingMode.OneTime);
+                return InstancedBinding.OneTime(_source);
             }
         }
     }
diff --git a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
index 29eac3d8f5..17eccc96bc 100644
--- a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
@@ -515,7 +515,7 @@ namespace Avalonia.Controls.UnitTests
             public InstancedBinding ItemsSelector(object item)
             {
                 var obs = new ExpressionObserver(item, nameof(Node.Children));
-                return new InstancedBinding(obs);
+                return InstancedBinding.OneWay(obs);
             }
 
             public bool Match(object data)
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/MultiBindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/MultiBindingTests.cs
index 874dc18552..4450cc0c90 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/MultiBindingTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/MultiBindingTests.cs
@@ -34,8 +34,8 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
             var target = new Mock<IAvaloniaObject>().As<IControl>();
             target.Setup(x => x.GetValue(Control.DataContextProperty)).Returns(source);
 
-            var subject = binding.Initiate(target.Object, null).Subject;
-            var result = await subject.Take(1);
+            var observable = binding.Initiate(target.Object, null).Observable;
+            var result = await observable.Take(1);
 
             Assert.Equal("1,2,3", result);
         }
diff --git a/tests/Avalonia.Styling.UnitTests/SetterTests.cs b/tests/Avalonia.Styling.UnitTests/SetterTests.cs
index 9c43097a21..b65b8dcc68 100644
--- a/tests/Avalonia.Styling.UnitTests/SetterTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/SetterTests.cs
@@ -29,7 +29,7 @@ namespace Avalonia.Styling.UnitTests
         {
             var control = new TextBlock();
             var subject = new BehaviorSubject<object>("foo");
-            var descriptor = new InstancedBinding(subject);
+            var descriptor = InstancedBinding.OneWay(subject);
             var binding = Mock.Of<IBinding>(x => x.Initiate(control, TextBlock.TextProperty, null, false) == descriptor);
             var style = Mock.Of<IStyle>();
             var setter = new Setter(TextBlock.TextProperty, binding);

From 7f16137f905748a36454c1f7391c3ab19dc67d44 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 18 Oct 2017 17:46:50 +0200
Subject: [PATCH 113/482] Fix RenderTest default orientation.

7cb4485d changed the order of the `Orientation` enum members to match WPF but didn't change the default in `RenderTest`  which caused it to display horizontal by default. Fix this.
---
 samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs b/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs
index a0e1570a36..f47627acb4 100644
--- a/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs
+++ b/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs
@@ -17,7 +17,7 @@ namespace VirtualizationTest.ViewModels
         private int _newItemIndex;
         private IReactiveList<ItemViewModel> _items;
         private string _prefix = "Item";
-        private Orientation _orientation;
+        private Orientation _orientation = Orientation.Vertical;
         private ItemVirtualizationMode _virtualizationMode = ItemVirtualizationMode.Simple;
 
         public MainWindowViewModel()

From a38dfada10871d82eed1a78ed9b2217b02994f9d Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 18 Oct 2017 10:54:27 -0500
Subject: [PATCH 114/482] Fix malformed XAML

---
 samples/RenderTest/SideBar.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/RenderTest/SideBar.xaml b/samples/RenderTest/SideBar.xaml
index 784d1f4071..7fcd828ba3 100644
--- a/samples/RenderTest/SideBar.xaml
+++ b/samples/RenderTest/SideBar.xaml
@@ -1,4 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">>
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Style Selector="TabControl.sidebar">
     <Setter Property="Template">
       <ControlTemplate>

From f4011a9d32788286208036033449e9755cd22e22 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 18 Oct 2017 14:37:20 -0500
Subject: [PATCH 115/482] Fix unsubscription.

---
 src/Markup/Avalonia.Markup/ControlLocator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Markup/Avalonia.Markup/ControlLocator.cs b/src/Markup/Avalonia.Markup/ControlLocator.cs
index 41851ca288..300da8a739 100644
--- a/src/Markup/Avalonia.Markup/ControlLocator.cs
+++ b/src/Markup/Avalonia.Markup/ControlLocator.cs
@@ -121,7 +121,7 @@ namespace Avalonia.Markup
 
             var detached = Observable.FromEventPattern<LogicalTreeAttachmentEventArgs>(
                 x => relativeTo.DetachedFromLogicalTree += x,
-                x => relativeTo.DetachedFromLogicalTree += x)
+                x => relativeTo.DetachedFromLogicalTree -= x)
                 .Select(x => false);
 
             return attached.Merge(detached).Select(isAttachedToLogicalTree =>

From 871d689445d8f34b960cf2bb76f582ab8d01144d Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 18 Oct 2017 14:52:11 -0500
Subject: [PATCH 116/482] Mark properties tracked by all of our XAML property
 types as not unkown.

---
 .../Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs
index 0cc08ac6ee..a38029964f 100644
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs
@@ -135,6 +135,8 @@ namespace Avalonia.Markup.Xaml.PortableXaml
             };
         }
 
+        protected override bool LookupIsUnknown() => false;
+
         protected override XamlType LookupType()
         {
             var propType = GetPropertyType();
@@ -294,8 +296,6 @@ namespace Avalonia.Markup.Xaml.PortableXaml
             return Property.IsReadOnly;
         }
 
-        protected override bool LookupIsUnknown() => false;
-
         protected override Type GetPropertyType()
         {
             return Property.PropertyType;

From cc147db28d7f36596ed38d32a4cc601819cea726 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 18 Oct 2017 23:12:54 +0200
Subject: [PATCH 117/482] Added more tests.

One failing.
---
 .../Xaml/BindingTests_RelativeSource.cs       | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs
index e372799c1c..8bd042e98a 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs
@@ -77,6 +77,32 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void Binding_To_First_Ancestor_Without_AncestorType_Uses_LogicalTree()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <Border Name='border1'>
+      <ContentControl Name='contentControl'>
+        <Button Name='button' Content='{Binding Name, RelativeSource={RelativeSource AncestorLevel=1}}'/>
+      </ContentControl>
+    </Border>
+</Window>";
+                var loader = new AvaloniaXamlLoader();
+                var window = (Window)loader.Load(xaml);
+                var contentControl = window.FindControl<ContentControl>("contentControl");
+                var button = window.FindControl<Button>("button");
+
+                window.ApplyTemplate();
+
+                Assert.Equal("contentControl", button.Content);
+            }
+        }
+
         [Fact]
         public void Binding_To_First_Ancestor_With_Shorthand_Works()
         {
@@ -102,6 +128,36 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void Binding_To_First_Ancestor_With_Shorthand_Uses_LogicalTree()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <Border Name='border'>
+      <ContentControl Name='contentControl'>
+        <Button Name='button' Content='{Binding $parent.Name}'/>
+      </ContentControl>
+    </Border>
+</Window>";
+                var loader = new AvaloniaXamlLoader();
+                var window = (Window)loader.Load(xaml);
+                var contentControl = window.FindControl<ContentControl>("contentControl");
+                var button = window.FindControl<Button>("button");
+
+                window.ApplyTemplate();
+
+                // This isn't needed in `Binding_To_First_Ancestor_Without_AncestorType_Uses_LogicalTree` -
+                // why is it needed to get non-null value here?
+                contentControl.ApplyTemplate();
+
+                Assert.Equal("contentControl", button.Content);
+            }
+        }
+
         [Fact]
         public void Binding_To_Second_Ancestor_Works()
         {
@@ -127,6 +183,33 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void Binding_To_Second_Ancestor_With_Shorthand_Uses_LogicalTree()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <ContentControl Name='contentControl1'>
+      <ContentControl Name='contentControl2'>
+        <Button Name='button' Content='{Binding $parent[1].Name}'/>
+      </ContentControl>
+    </ContentControl>
+</Window>";
+                var loader = new AvaloniaXamlLoader();
+                var window = (Window)loader.Load(xaml);
+                var contentControl1 = window.FindControl<ContentControl>("contentControl1");
+                var contentControl2 = window.FindControl<ContentControl>("contentControl2");
+                var button = window.FindControl<Button>("button");
+
+                window.ApplyTemplate();
+
+                Assert.Equal("contentControl1", button.Content);
+            }
+        }
+
         [Fact]
         public void Binding_To_Ancestor_Of_Type_With_Shorthand_Works()
         {

From 2f4887318495bfbf1fffa772bf65e729a678eceb Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 19 Oct 2017 00:26:27 +0200
Subject: [PATCH 118/482] Select dropdown item on focus.

Arrow keys within the dropdown are handled by the keyboard navigation handler, so detect when this focuses a new item and select it.
---
 src/Avalonia.Controls/DropDown.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Avalonia.Controls/DropDown.cs b/src/Avalonia.Controls/DropDown.cs
index cdb179cac9..6b27c479ba 100644
--- a/src/Avalonia.Controls/DropDown.cs
+++ b/src/Avalonia.Controls/DropDown.cs
@@ -96,6 +96,16 @@ namespace Avalonia.Controls
             this.UpdateSelectionBoxItem(this.SelectedItem);
         }
 
+        protected override void OnGotFocus(GotFocusEventArgs e)
+        {
+            base.OnGotFocus(e);
+
+            if (!e.Handled && e.NavigationMethod == NavigationMethod.Directional)
+            {
+                e.Handled = UpdateSelectionFromEventSource(e.Source);
+            }
+        }
+
         /// <inheritdoc/>
         protected override void OnKeyDown(KeyEventArgs e)
         {

From ca0e346f49217e52216dfa3f9edf8f352e7611ee Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 19 Oct 2017 12:26:48 +0200
Subject: [PATCH 119/482] Added failing test for #507.

---
 .../Xaml/ControlBindingTests.cs               | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs
index a508c21747..bd9d99ff23 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs
@@ -1,7 +1,10 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using System.Collections.Generic;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Layout;
 using Avalonia.Logging;
 using Avalonia.UnitTests;
 using Xunit;
@@ -67,5 +70,61 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 Assert.True(called);
             }
         }
+
+        [Fact]
+        public void Can_Bind_Between_TabStrip_And_Carousel()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'>
+    <DockPanel>
+        <TabStrip Name='strip' DockPanel.Dock='Top' Items='{Binding Items}' SelectedIndex='0'>
+          <TabStrip.DataTemplates>
+            <DataTemplate>
+              <TextBlock Text='{Binding Header}'/>
+            </DataTemplate>
+          </TabStrip.DataTemplates>
+        </TabStrip>
+        <Carousel Name='carousel' Items='{Binding Items}' SelectedIndex='{Binding #strip.SelectedIndex}'>
+          <Carousel.DataTemplates>
+            <DataTemplate>
+              <TextBlock Text='{Binding Detail}'/>
+            </DataTemplate>
+          </Carousel.DataTemplates>
+        </Carousel>
+    </DockPanel>
+</Window>";
+                var loader = new AvaloniaXamlLoader();
+                var window = (Window)loader.Load(xaml);
+                var strip = window.FindControl<TabStrip>("strip");
+                var carousel = window.FindControl<Carousel>("carousel");
+
+                window.DataContext = new ItemsViewModel
+                {
+                    Items = new[]
+                    {
+                        new ItemViewModel { Header = "Item1", Detail = "Detail1" },
+                        new ItemViewModel { Header = "Item2", Detail = "Detail2" },
+                    }
+                };
+
+                window.Show();
+
+                Assert.Equal(0, strip.SelectedIndex);
+                Assert.Equal(0, carousel.SelectedIndex);
+            }
+        }
+
+        private class ItemsViewModel
+        {
+            public IList<ItemViewModel> Items { get; set; }
+        }
+
+        private class ItemViewModel
+        {
+            public string Header { get; set; }
+            public string Detail { get; set; }
+        }
     }
 }

From 181dd53e58615d7c8542f5017f4774173a04fb8e Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 19 Oct 2017 14:54:38 +0200
Subject: [PATCH 120/482] Notify DataContextChanged down tree.

When a data context changes, it should be notified to all descendant controls who inherit the data context. This allows the `SelectingItemsControl` to defer setting the selected item until the `DataContext` has changed for the whole tree.

Renamed `OnDataContextChanging`/`OnDataContextChanged` to `OnDataContextBeginUpdate`/`OnDataContextEndUpdate` because `DataContextChanged` is now called from the property changed notification.

Fixes #507.
---
 src/Avalonia.Controls/Control.cs              |  61 +++++---
 .../Primitives/SelectingItemsControl.cs       |   8 +-
 .../LogicalTree/LogicalExtensions.cs          |  10 ++
 .../ControlTests.cs                           | 133 +++++++++++++++++-
 4 files changed, 191 insertions(+), 21 deletions(-)

diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index 89c4f9279a..a7aafbf6e8 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -101,6 +101,7 @@ namespace Avalonia.Controls
         private Styles _styles;
         private bool _styled;
         private Subject<IStyleable> _styleDetach = new Subject<IStyleable>();
+        private bool _dataContextUpdating;
 
         /// <summary>
         /// Initializes static members of the <see cref="Control"/> class.
@@ -111,6 +112,7 @@ namespace Avalonia.Controls
             PseudoClass(IsEnabledCoreProperty, x => !x, ":disabled");
             PseudoClass(IsFocusedProperty, ":focus");
             PseudoClass(IsPointerOverProperty, ":pointerover");
+            DataContextProperty.Changed.AddClassHandler<Control>(x => x.OnDataContextChangedCore);
         }
 
         /// <summary>
@@ -681,18 +683,26 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Called before the <see cref="DataContext"/> property changes.
+        /// Called when the <see cref="DataContext"/> property changes.
         /// </summary>
-        protected virtual void OnDataContextChanging()
+        /// <param name="e">The event args.</param>
+        protected virtual void OnDataContextChanged(EventArgs e)
         {
+            DataContextChanged?.Invoke(this, EventArgs.Empty);
         }
 
         /// <summary>
-        /// Called after the <see cref="DataContext"/> property changes.
+        /// Called when the <see cref="DataContext"/> begins updating.
         /// </summary>
-        protected virtual void OnDataContextChanged()
+        protected virtual void OnDataContextBeginUpdate()
+        {
+        }
+
+        /// <summary>
+        /// Called when the <see cref="DataContext"/> finishes updating.
+        /// </summary>
+        protected virtual void OnDataContextEndUpdate()
         {
-            DataContextChanged?.Invoke(this, EventArgs.Empty);
         }
 
         /// <inheritdoc/>
@@ -745,24 +755,38 @@ namespace Avalonia.Controls
             }
         }
 
-        /// <summary>
-        /// Called when the <see cref="DataContext"/> property begins and ends being notified.
-        /// </summary>
-        /// <param name="o">The object on which the DataContext is changing.</param>
-        /// <param name="notifying">Whether the notifcation is beginning or ending.</param>
         private static void DataContextNotifying(IAvaloniaObject o, bool notifying)
         {
-            var control = o as Control;
+            if (o is Control control)
+            {
+                DataContextNotifying(control, notifying);
+            }
+        }
 
-            if (control != null)
+        private static void DataContextNotifying(Control control, bool notifying)
+        {
+            if (notifying)
             {
-                if (notifying)
+                if (!control._dataContextUpdating)
                 {
-                    control.OnDataContextChanging();
+                    control._dataContextUpdating = true;
+                    control.OnDataContextBeginUpdate();
+
+                    foreach (var child in control.LogicalChildren)
+                    {
+                        if (child is Control c && !c.IsSet(DataContextProperty))
+                        {
+                            DataContextNotifying(c, notifying);
+                        }
+                    }
                 }
-                else
+            }
+            else
+            {
+                if (control._dataContextUpdating)
                 {
-                    control.OnDataContextChanged();
+                    control.OnDataContextEndUpdate();
+                    control._dataContextUpdating = false;
                 }
             }
         }
@@ -881,6 +905,11 @@ namespace Avalonia.Controls
             }
         }
 
+        private void OnDataContextChangedCore(AvaloniaPropertyChangedEventArgs e)
+        {
+            OnDataContextChanged(EventArgs.Empty);
+        }
+
         private void LogicalChildrenCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
             switch (e.Action)
diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
index 27f3407fd9..ab09a4701d 100644
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@@ -414,16 +414,16 @@ namespace Avalonia.Controls.Primitives
         }
 
         /// <inheritdoc/>
-        protected override void OnDataContextChanging()
+        protected override void OnDataContextBeginUpdate()
         {
-            base.OnDataContextChanging();
+            base.OnDataContextBeginUpdate();
             ++_updateCount;
         }
 
         /// <inheritdoc/>
-        protected override void OnDataContextChanged()
+        protected override void OnDataContextEndUpdate()
         {
-            base.OnDataContextChanged();
+            base.OnDataContextEndUpdate();
 
             if (--_updateCount == 0)
             {
diff --git a/src/Avalonia.Styling/LogicalTree/LogicalExtensions.cs b/src/Avalonia.Styling/LogicalTree/LogicalExtensions.cs
index a72a558258..276ea6c060 100644
--- a/src/Avalonia.Styling/LogicalTree/LogicalExtensions.cs
+++ b/src/Avalonia.Styling/LogicalTree/LogicalExtensions.cs
@@ -50,6 +50,16 @@ namespace Avalonia.LogicalTree
             }
         }
 
+        public static IEnumerable<ILogical> GetSelfAndLogicalDescendants(this ILogical logical)
+        {
+            yield return logical;
+
+            foreach (var descendent in logical.GetLogicalDescendants())
+            {
+                yield return descendent;
+            }
+        }
+
         public static ILogical GetLogicalParent(this ILogical logical)
         {
             return logical.LogicalParent;
diff --git a/tests/Avalonia.Controls.UnitTests/ControlTests.cs b/tests/Avalonia.Controls.UnitTests/ControlTests.cs
index b7e2cbeca9..3506a1606b 100644
--- a/tests/Avalonia.Controls.UnitTests/ControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ControlTests.cs
@@ -8,6 +8,7 @@ using Moq;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Xunit;
+using Avalonia.LogicalTree;
 
 namespace Avalonia.Controls.UnitTests
 {
@@ -328,9 +329,139 @@ namespace Avalonia.Controls.UnitTests
             Assert.True(target.IsInitialized);
         }
 
-        private class TestControl : Control
+        [Fact]
+        public void DataContextChanged_Should_Be_Called()
+        {
+            var root = new TestStackPanel
+            {
+                Name = "root",
+                Children =
+                {
+                    new TestControl
+                    {
+                        Name = "a1",
+                        Child = new TestControl
+                        {
+                            Name = "b1",
+                        }
+                    },
+                    new TestControl
+                    {
+                        Name = "a2",
+                        DataContext = "foo",
+                    },
+                }
+            };
+
+            var called = new List<string>();
+            void Record(object sender, EventArgs e) => called.Add(((Control)sender).Name);
+
+            root.DataContextChanged += Record;
+
+            foreach (TestControl c in root.GetLogicalDescendants())
+            {
+                c.DataContextChanged += Record;
+            }
+
+            root.DataContext = "foo";
+
+            Assert.Equal(new[] { "root", "a1", "b1", }, called);
+        }
+
+        [Fact]
+        public void DataContext_Notifications_Should_Be_Called_In_Correct_Order()
         {
+            var root = new TestStackPanel
+            {
+                Name = "root",
+                Children =
+                {
+                    new TestControl
+                    {
+                        Name = "a1",
+                        Child = new TestControl
+                        {
+                            Name = "b1",
+                        }
+                    },
+                    new TestControl
+                    {
+                        Name = "a2",
+                        DataContext = "foo",
+                    },
+                }
+            };
+
+            var called = new List<string>();
+
+            foreach (IDataContextEvents c in root.GetSelfAndLogicalDescendants())
+            {
+                c.DataContextBeginUpdate += (s, e) => called.Add("begin " + ((Control)s).Name);
+                c.DataContextChanged += (s, e) => called.Add("changed " + ((Control)s).Name);
+                c.DataContextEndUpdate += (s, e) => called.Add("end " + ((Control)s).Name);
+            }
+
+            root.DataContext = "foo";
+
+            Assert.Equal(
+                new[] 
+                {
+                    "begin root",
+                    "begin a1",
+                    "begin b1",
+                    "changed root",
+                    "changed a1",
+                    "changed b1",
+                    "end b1",
+                    "end a1",
+                    "end root",
+                },
+                called);
+        }
+
+        private interface IDataContextEvents
+        {
+            event EventHandler DataContextBeginUpdate;
+            event EventHandler DataContextChanged;
+            event EventHandler DataContextEndUpdate;
+        }
+
+        private class TestControl : Decorator, IDataContextEvents
+        {
+            public event EventHandler DataContextBeginUpdate;
+            public event EventHandler DataContextEndUpdate;
+
             public new IAvaloniaObject InheritanceParent => base.InheritanceParent;
+
+            protected override void OnDataContextBeginUpdate()
+            {
+                DataContextBeginUpdate?.Invoke(this, EventArgs.Empty);
+                base.OnDataContextBeginUpdate();
+            }
+
+            protected override void OnDataContextEndUpdate()
+            {
+                DataContextEndUpdate?.Invoke(this, EventArgs.Empty);
+                base.OnDataContextEndUpdate();
+            }
+        }
+
+        private class TestStackPanel : StackPanel, IDataContextEvents
+        {
+            public event EventHandler DataContextBeginUpdate;
+            public event EventHandler DataContextEndUpdate;
+
+            protected override void OnDataContextBeginUpdate()
+            {
+                DataContextBeginUpdate?.Invoke(this, EventArgs.Empty);
+                base.OnDataContextBeginUpdate();
+            }
+
+            protected override void OnDataContextEndUpdate()
+            {
+                DataContextEndUpdate?.Invoke(this, EventArgs.Empty);
+                base.OnDataContextEndUpdate();
+            }
         }
     }
 }

From 8d22a25a66074a2481ea5c038ffcabb18dc694e2 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 19 Oct 2017 20:39:58 -0500
Subject: [PATCH 121/482] Bring back original logic of test. Still trying to
 figure out what's going on.

---
 tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
index cc190087d1..3205a0e76a 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
@@ -770,7 +770,14 @@ do we need it?")]
 <Window xmlns='https://github.com/avaloniaui'
                 xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
                 xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
-    <local:InitializationOrderTracker Width='100' Height='100'
+    <Window.Styles>
+        <Style Selector='local|InitializationOrderTracker'> 
+            <Style.Resources> 
+                 <x:Double x:Key='Double'>100</x:Double> 
+            </Style.Resources> 
+        </Style> 
+   </Window.Styles>     
+<local:InitializationOrderTracker Width='100' Height='{DynamicResource Double}'
                      Tag='{Binding Height, RelativeSource={RelativeSource Self}}' />
 </Window>";
 

From 3e0dbf9a171a27d23d9ddcf6755298cf6ec8aa83 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Fri, 20 Oct 2017 11:25:21 +0300
Subject: [PATCH 122/482] Pin mono version to 5.2.0

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ea09278cdd..9fb48a024e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ env:
     - DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
     - DOTNET_CLI_TELEMETRY_OPTOUT=1
 mono:
-  - latest
+  - 5.2.0
 dotnet: 2.0.0
 script:
   - ./build.sh --target "Travis" --platform "Mono" --configuration "Release"

From 9539979a6ec29be89b5fa88e214b84156563e525 Mon Sep 17 00:00:00 2001
From: ARSolog <arsolog@mail.ru>
Date: Sat, 21 Oct 2017 01:33:04 +0300
Subject: [PATCH 123/482] Update DataAnnotationsValidationPluginTests.cs

fix unit test to non 'en-us' CultureInfo
---
 .../Data/Plugins/DataAnnotationsValidationPluginTests.cs    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/Avalonia.Markup.UnitTests/Data/Plugins/DataAnnotationsValidationPluginTests.cs b/tests/Avalonia.Markup.UnitTests/Data/Plugins/DataAnnotationsValidationPluginTests.cs
index 3002dc516f..6663457add 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/Plugins/DataAnnotationsValidationPluginTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/Plugins/DataAnnotationsValidationPluginTests.cs
@@ -49,6 +49,8 @@ namespace Avalonia.Markup.UnitTests.Data.Plugins
             var accessor = inpcAccessorPlugin.Start(new WeakReference(data), nameof(data.Between5And10));
             var validator = validatorPlugin.Start(new WeakReference(data), nameof(data.Between5And10), accessor);
             var result = new List<object>();
+            
+            var errmsg = new RangeAttribute(5, 10).FormatErrorMessage(nameof(Data.Between5And10));
 
             validator.Subscribe(x => result.Add(x));
             validator.SetValue(3, BindingPriority.LocalValue);
@@ -59,12 +61,12 @@ namespace Avalonia.Markup.UnitTests.Data.Plugins
             {
                 new BindingNotification(5),
                 new BindingNotification(
-                    new ValidationException("The field Between5And10 must be between 5 and 10."),
+                    new ValidationException(errmsg),
                     BindingErrorType.DataValidationError,
                     3),
                 new BindingNotification(7),
                 new BindingNotification(
-                    new ValidationException("The field Between5And10 must be between 5 and 10."),
+                    new ValidationException(errmsg),
                     BindingErrorType.DataValidationError,
                     11),
             }, result);

From 81bd7df8d7eebc85a7210fcbc73c286adcb5d41d Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sat, 21 Oct 2017 01:12:02 +0300
Subject: [PATCH 124/482] [MONOMAC] Initial implementation of deferred
 rendering support

---
 .../Avalonia.MonoMac/EmulatedFramebuffer.cs   | 98 ++++++++++++++++---
 src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs   | 43 +++++++-
 src/OSX/Avalonia.MonoMac/RenderLoop.cs        | 33 +++++++
 src/OSX/Avalonia.MonoMac/ThreadingUtils.cs    | 36 +++++++
 src/OSX/Avalonia.MonoMac/TopLevelImpl.cs      | 61 +++++++++++-
 5 files changed, 252 insertions(+), 19 deletions(-)
 create mode 100644 src/OSX/Avalonia.MonoMac/RenderLoop.cs
 create mode 100644 src/OSX/Avalonia.MonoMac/ThreadingUtils.cs

diff --git a/src/OSX/Avalonia.MonoMac/EmulatedFramebuffer.cs b/src/OSX/Avalonia.MonoMac/EmulatedFramebuffer.cs
index 1ecfa0eb7d..02ead65281 100644
--- a/src/OSX/Avalonia.MonoMac/EmulatedFramebuffer.cs
+++ b/src/OSX/Avalonia.MonoMac/EmulatedFramebuffer.cs
@@ -2,17 +2,20 @@
 using Avalonia.Platform;
 using MonoMac.AppKit;
 using System.Runtime.InteropServices;
+using Avalonia.Threading;
 using MonoMac.CoreGraphics;
 
 namespace Avalonia.MonoMac
 {
     class EmulatedFramebuffer : ILockedFramebuffer
     {
+        private readonly TopLevelImpl.TopLevelView _view;
         private readonly CGSize _logicalSize;
-        public EmulatedFramebuffer(NSView view)
+
+        public EmulatedFramebuffer(TopLevelImpl.TopLevelView view, CGSize logicalSize, CGSize pixelSize)
         {
-            _logicalSize = view.Frame.Size;
-            var pixelSize = view.ConvertSizeToBacking(_logicalSize);
+            _view = view;
+            _logicalSize = logicalSize;
             Width = (int)pixelSize.Width;
             Height = (int)pixelSize.Height;
             RowBytes = Width * 4;
@@ -21,25 +24,78 @@ namespace Avalonia.MonoMac
             Address = Marshal.AllocHGlobal(Height * RowBytes);
         }
 
+        class DeferredRenderingHelper : IDisposable
+        {
+            private readonly NSView _view;
+            public void Dispose()
+            {
+                _view.NonUIUnlockFocus();
+            }
+
+            public DeferredRenderingHelper(NSView view)
+            {
+                _view = view;
+            }
+        }
+
+        DeferredRenderingHelper SetupWindowContext()
+        {
+            if (!_view.NonUILockFocusIfCanDraw())
+                return null;
+            return new DeferredRenderingHelper(_view);
+        }
+
         public void Dispose()
         {
             if (Address == IntPtr.Zero)
                 return;
             var nfo = (int) CGBitmapFlags.ByteOrder32Big | (int) CGImageAlphaInfo.PremultipliedLast;
 
-            using (var colorSpace = CGColorSpace.CreateDeviceRGB())
-            using (var bContext = new CGBitmapContext(Address, Width, Height, 8, Width * 4,
-                colorSpace, (CGImageAlphaInfo) nfo))
-            using (var image = bContext.ToImage())
-            using (var nscontext = NSGraphicsContext.CurrentContext)
-            using (var context = nscontext.GraphicsPort)
+            DeferredRenderingHelper deferred = null;
+            var isDeferred = !Dispatcher.UIThread.CheckAccess();
+            if (!isDeferred || (deferred = SetupWindowContext()) != null)
             {
-                context.SetFillColor(255, 255, 255, 255);
-                context.FillRect(new CGRect(default(CGPoint), _logicalSize));
-                context.DrawImage(new CGRect(default(CGPoint), _logicalSize), image);
+                CGImage image = null;
+                try
+                {
+                    lock (_view.SyncRoot)
+                    {
+                        using (deferred)
+                        using (var colorSpace = CGColorSpace.CreateDeviceRGB())
+                        using (var bContext = new CGBitmapContext(Address, Width, Height, 8, Width * 4,
+                            colorSpace, (CGImageAlphaInfo) nfo))
+                        {
+                            if (!isDeferred || deferred != null)
+                            {
+                                using (var nscontext = NSGraphicsContext.CurrentContext)
+                                using (var context = nscontext.GraphicsPort)
+                                {
+                                    image = bContext.ToImage();
+                                    context.SetFillColor(255, 255, 255, 255);
+                                    context.FillRect(new CGRect(default(CGPoint), _view.LogicalSize));
+                                    context.TranslateCTM(0, _view.LogicalSize.Height - _logicalSize.Height);
+                                    context.DrawImage(new CGRect(default(CGPoint), _logicalSize), image);
+                                    context.Flush();
+                                    nscontext.FlushGraphics();
+                                }
+                            }
+                        }
+                    }
+                }
+                finally
+                {
+                    if (image != null)
+                    {
+                        if (deferred == null)
+                            image.Dispose();
+                        else
+                            _view.SetBackBufferImage(new SavedImage(image, _logicalSize));
+                    }
+                }
             }
             Marshal.FreeHGlobal(Address);
             Address = IntPtr.Zero;
+
         }
 
         public IntPtr Address { get; private set; }
@@ -49,4 +105,22 @@ namespace Avalonia.MonoMac
         public Vector Dpi { get; }
         public PixelFormat Format { get; }
     }
+
+    class SavedImage : IDisposable
+    {
+        public CGImage Image { get; private set; }
+        public CGSize LogicalSize { get; }
+
+        public SavedImage(CGImage image, CGSize logicalSize)
+        {
+            Image = image;
+            LogicalSize = logicalSize;
+        }
+
+        public void Dispose()
+        {
+            Image?.Dispose();
+            Image = null;
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs b/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs
index 0deea7fb44..c11ac0d6ee 100644
--- a/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs
+++ b/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs
@@ -1,10 +1,13 @@
 using System;
+using System.Threading;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
 using Avalonia.Input;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using MonoMac.AppKit;
+using MonoMac.Foundation;
+using MonoMac.ObjCRuntime;
 
 namespace Avalonia.MonoMac
 {
@@ -16,9 +19,11 @@ namespace Avalonia.MonoMac
         internal static NSApplication App;
         private static bool s_monoMacInitialized;
         private static bool s_showInDock = true;
+        private static IRenderLoop s_renderLoop;
 
         void DoInitialize()
         {
+            InitializeMonoMac();
             AvaloniaLocator.CurrentMutable
                 .Bind<IStandardCursorFactory>().ToTransient<CursorFactoryStub>()
                 .Bind<IPlatformIconLoader>().ToSingleton<IconLoader>()
@@ -27,9 +32,8 @@ namespace Avalonia.MonoMac
                 .Bind<IPlatformSettings>().ToConstant(this)
                 .Bind<IWindowingPlatform>().ToConstant(this)
                 .Bind<ISystemDialogImpl>().ToSingleton<SystemDialogsImpl>()
+                .Bind<IRenderLoop>().ToConstant(s_renderLoop)
                 .Bind<IPlatformThreadingInterface>().ToConstant(PlatformThreadingInterface.Instance);
-
-            InitializeMonoMac();
         }
 
         public static void Initialize()
@@ -39,13 +43,43 @@ namespace Avalonia.MonoMac
 
         }
 
+
+        /// <summary>
+        /// See "Using POSIX Threads in a Cocoa Application" section here:
+        /// https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/Multithreading/CreatingThreads/CreatingThreads.html#//apple_ref/doc/uid/20000738-125024
+        /// </summary>
+        class ThreadHelper : NSObject
+        {
+            private readonly AutoResetEvent _event = new AutoResetEvent(false);
+            [Export("doNothing")]
+            public void DoNothing()
+            {
+                _event.Set();
+            }
+
+            public static void InitializeCocoaThreadingLocks()
+            {
+                var helper = new ThreadHelper();
+                var thread = new NSThread(helper, Selector.FromHandle(Selector.GetHandle("doNothing")), new NSObject());
+                thread.Start();
+                helper._event.WaitOne();
+                helper._event.Dispose();
+                if (!NSThread.IsMultiThreaded)
+                {
+                    throw new Exception("Unable to initialize Cocoa threading");
+                }
+            }
+        }
+
         void InitializeMonoMac()
         {
             if(s_monoMacInitialized)
                 return;
             NSApplication.Init();
+            ThreadHelper.InitializeCocoaThreadingLocks();
             App = NSApplication.SharedApplication;
             UpdateActivationPolicy();
+            s_renderLoop = new RenderLoop(); //TODO: use CVDisplayLink
             s_monoMacInitialized = true;
         }
 
@@ -64,6 +98,7 @@ namespace Avalonia.MonoMac
             }
         }
 
+        public static bool UseDeferredRendering { get; set; } = true;
 
         public Size DoubleClickSize => new Size(4, 4);
         public TimeSpan DoubleClickTime => TimeSpan.FromSeconds(NSEvent.DoubleClickInterval);
@@ -87,8 +122,10 @@ namespace Avalonia
 {
     public static class MonoMacPlatformExtensions
     {
-        public static T UseMonoMac<T>(this T builder) where T : AppBuilderBase<T>, new()
+        public static T UseMonoMac<T>(this T builder, bool? useDeferredRendering = null) where T : AppBuilderBase<T>, new()
         {
+            if (useDeferredRendering.HasValue)
+                MonoMac.MonoMacPlatform.UseDeferredRendering = useDeferredRendering.Value;
             return builder.UseWindowingSubsystem(MonoMac.MonoMacPlatform.Initialize);
         }
     }
diff --git a/src/OSX/Avalonia.MonoMac/RenderLoop.cs b/src/OSX/Avalonia.MonoMac/RenderLoop.cs
new file mode 100644
index 0000000000..a6f3e9f493
--- /dev/null
+++ b/src/OSX/Avalonia.MonoMac/RenderLoop.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using MonoMac.Foundation;
+
+namespace Avalonia.MonoMac
+{
+    //TODO: Switch to using CVDisplayLink
+    public class RenderLoop : IRenderLoop
+    {
+        private readonly object _lock = new object();
+        private readonly IDisposable _timer;
+
+        public RenderLoop()
+        {
+            _timer = AvaloniaLocator.Current.GetService<IRuntimePlatform>().StartSystemTimer(new TimeSpan(0, 0, 0, 0, 1000 / 60),
+                () =>
+                {
+                    lock (_lock)
+                    {
+                        using (new NSAutoreleasePool())
+                        {
+                            Tick?.Invoke(this, EventArgs.Empty);
+                        }
+                    }
+                });
+        }
+
+        public event EventHandler<EventArgs> Tick;
+    }
+}
diff --git a/src/OSX/Avalonia.MonoMac/ThreadingUtils.cs b/src/OSX/Avalonia.MonoMac/ThreadingUtils.cs
new file mode 100644
index 0000000000..7762d86764
--- /dev/null
+++ b/src/OSX/Avalonia.MonoMac/ThreadingUtils.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using MonoMac.AppKit;
+using MonoMac.ObjCRuntime;
+
+namespace Avalonia.MonoMac
+{
+    public static class ThreadingUtils
+    {
+        private static readonly IntPtr selUnlockFocusHandle = Selector.GetHandle("unlockFocus");
+        private static readonly IntPtr selLockFocusIfCanDrawHandle = Selector.GetHandle("lockFocusIfCanDraw");
+        private static readonly IntPtr selWindowHandle = Selector.GetHandle("window");
+        private static readonly IntPtr selCanDrawHandle = Selector.GetHandle("canDraw");
+
+        public static bool NonUILockFocusIfCanDraw(this NSView view)
+        {
+            return Messaging.bool_objc_msgSend(view.Handle, selLockFocusIfCanDrawHandle);
+        }
+
+        public static void NonUIUnlockFocus(this NSView view)
+        {
+            Messaging.void_objc_msgSend(view.Handle, selUnlockFocusHandle);
+        }
+
+        public static NSWindow NonUIGetWindow(this NSView view)
+        {
+            return (NSWindow) Runtime.GetNSObject(Messaging.IntPtr_objc_msgSendSuper(view.Handle, selWindowHandle));
+        }
+
+        public static bool BaseCanDraw(this NSView view)
+        {
+            return Messaging.bool_objc_msgSendSuper(view.SuperHandle, selCanDrawHandle);
+        }
+    }
+}
diff --git a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
index 2744474214..ce30deea88 100644
--- a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
+++ b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
@@ -5,6 +5,7 @@ using Avalonia.Input.Raw;
 using Avalonia.Platform;
 using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Rendering;
+using Avalonia.Threading;
 using MonoMac.AppKit;
 
 using MonoMac.CoreGraphics;
@@ -37,6 +38,13 @@ namespace Avalonia.MonoMac
             private NSTrackingArea _area;
             private NSCursor _cursor;
 
+            public CGSize PixelSize { get; set; }
+
+            public CGSize LogicalSize { get; set; }
+
+            private SavedImage _backBuffer;
+            public object SyncRoot { get; } = new object();
+
             public TopLevelView(TopLevelImpl tl)
             {
                 _tl = tl;
@@ -44,17 +52,50 @@ namespace Avalonia.MonoMac
                 _keyboard = AvaloniaLocator.Current.GetService<IKeyboardDevice>();
             }
 
+            protected override void Dispose(bool disposing)
+            {
+                if (disposing)
+                    SetBackBufferImage(null);
+                base.Dispose(disposing);
+            }
+
             public override bool ConformsToProtocol(IntPtr protocol)
             {
                 var rv = base.ConformsToProtocol(protocol);
                 return rv;
             }
 
+            public override bool IsOpaque => false;
+
             public override void DrawRect(CGRect dirtyRect)
             {
+                lock (SyncRoot)
+                {
+                    if (_backBuffer != null)
+                    {
+                        using (var context = NSGraphicsContext.CurrentContext.GraphicsPort)
+                        {
+                            context.SetFillColor(255, 255, 255, 255);
+                            context.FillRect(new CGRect(default(CGPoint), LogicalSize));
+                            context.TranslateCTM(0, LogicalSize.Height - _backBuffer.LogicalSize.Height);
+                            context.DrawImage(new CGRect(default(CGPoint), _backBuffer.LogicalSize), _backBuffer.Image);
+                            context.Flush();
+                            NSGraphicsContext.CurrentContext.FlushGraphics();
+                        }
+                    }
+                }
                 _tl.Paint?.Invoke(dirtyRect.ToAvaloniaRect());
             }
 
+            public void SetBackBufferImage(SavedImage image)
+            {
+                lock (SyncRoot)
+                {
+                    _backBuffer?.Dispose();
+                    _backBuffer = image;
+                }
+            }
+            
             [Export("viewDidChangeBackingProperties:")]
             public void ViewDidChangeBackingProperties()
             {
@@ -78,7 +119,12 @@ namespace Avalonia.MonoMac
 
             public override void SetFrameSize(CGSize newSize)
             {
-                base.SetFrameSize(newSize);
+                lock (SyncRoot)
+                {
+                    base.SetFrameSize(newSize);
+                    LogicalSize = Frame.Size;
+                    PixelSize = ConvertSizeToBacking(LogicalSize);
+                }
 
                 if (_area != null)
                 {
@@ -348,9 +394,16 @@ namespace Avalonia.MonoMac
             View.Dispose();
         }
 
-        public IRenderer CreateRenderer(IRenderRoot root) => new ImmediateRenderer(root);
+        public IRenderer CreateRenderer(IRenderRoot root) =>
+            MonoMacPlatform.UseDeferredRendering
+                ? new DeferredRenderer(root, AvaloniaLocator.Current.GetService<IRenderLoop>())
+                : (IRenderer) new ImmediateRenderer(root);
 
-        public void Invalidate(Rect rect) => View.SetNeedsDisplayInRect(View.Frame);
+        public void Invalidate(Rect rect)
+        {
+            if (!MonoMacPlatform.UseDeferredRendering)
+                View.SetNeedsDisplayInRect(View.Frame);
+        }
 
         public abstract Point PointToClient(Point point);
 
@@ -360,6 +413,6 @@ namespace Avalonia.MonoMac
 
         public void SetInputRoot(IInputRoot inputRoot) => InputRoot = inputRoot;
 
-        public ILockedFramebuffer Lock() => new EmulatedFramebuffer(View);
+        public ILockedFramebuffer Lock() => new EmulatedFramebuffer(View, View.LogicalSize, View.PixelSize);
     }
 }
\ No newline at end of file

From 0909a613f2be4aa005152265651721392b2faccb Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sat, 21 Oct 2017 17:36:02 +0300
Subject: [PATCH 125/482] [MONOMAC] Fixed rendering artifacts on resize with
 DeferredRenderer

---
 .../Avalonia.MonoMac/EmulatedFramebuffer.cs   | 87 ++++++++++---------
 src/OSX/Avalonia.MonoMac/TopLevelImpl.cs      |  2 +-
 2 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/src/OSX/Avalonia.MonoMac/EmulatedFramebuffer.cs b/src/OSX/Avalonia.MonoMac/EmulatedFramebuffer.cs
index 02ead65281..713d4b0d18 100644
--- a/src/OSX/Avalonia.MonoMac/EmulatedFramebuffer.cs
+++ b/src/OSX/Avalonia.MonoMac/EmulatedFramebuffer.cs
@@ -11,20 +11,29 @@ namespace Avalonia.MonoMac
     {
         private readonly TopLevelImpl.TopLevelView _view;
         private readonly CGSize _logicalSize;
+        private bool _isDeferred;
 
-        public EmulatedFramebuffer(TopLevelImpl.TopLevelView view, CGSize logicalSize, CGSize pixelSize)
+        [DllImport("libc")]
+        static extern void memset(IntPtr p, int c, IntPtr size);
+
+        public EmulatedFramebuffer(TopLevelImpl.TopLevelView view)
         {
             _view = view;
-            _logicalSize = logicalSize;
+
+            _isDeferred = !Dispatcher.UIThread.CheckAccess();
+            _logicalSize = _view.LogicalSize;
+            var pixelSize = _view.PixelSize;
             Width = (int)pixelSize.Width;
             Height = (int)pixelSize.Height;
             RowBytes = Width * 4;
             Dpi = new Vector(96 * pixelSize.Width / _logicalSize.Width, 96 * pixelSize.Height / _logicalSize.Height);
             Format = PixelFormat.Rgba8888;
-            Address = Marshal.AllocHGlobal(Height * RowBytes);
+            var size = Height * RowBytes;
+            Address = Marshal.AllocHGlobal(size);
+            memset(Address, 0, new IntPtr(size));
         }
 
-        class DeferredRenderingHelper : IDisposable
+        class CocoaDrawLock : IDisposable
         {
             private readonly NSView _view;
             public void Dispose()
@@ -32,17 +41,17 @@ namespace Avalonia.MonoMac
                 _view.NonUIUnlockFocus();
             }
 
-            public DeferredRenderingHelper(NSView view)
+            public CocoaDrawLock(NSView view)
             {
                 _view = view;
             }
         }
 
-        DeferredRenderingHelper SetupWindowContext()
+        CocoaDrawLock LockCocoaDrawing()
         {
             if (!_view.NonUILockFocusIfCanDraw())
                 return null;
-            return new DeferredRenderingHelper(_view);
+            return new CocoaDrawLock(_view);
         }
 
         public void Dispose()
@@ -50,51 +59,45 @@ namespace Avalonia.MonoMac
             if (Address == IntPtr.Zero)
                 return;
             var nfo = (int) CGBitmapFlags.ByteOrder32Big | (int) CGImageAlphaInfo.PremultipliedLast;
-
-            DeferredRenderingHelper deferred = null;
-            var isDeferred = !Dispatcher.UIThread.CheckAccess();
-            if (!isDeferred || (deferred = SetupWindowContext()) != null)
+            IDisposable drawLock = LockCocoaDrawing();
+            CGImage image = null;
+            try
             {
-                CGImage image = null;
-                try
+                using (var colorSpace = CGColorSpace.CreateDeviceRGB())
+                using (var bContext = new CGBitmapContext(Address, Width, Height, 8, Width * 4,
+                    colorSpace, (CGImageAlphaInfo)nfo))
+                    image = bContext.ToImage();
+                lock (_view.SyncRoot)
                 {
-                    lock (_view.SyncRoot)
+                    if (!_isDeferred || drawLock != null)
                     {
-                        using (deferred)
-                        using (var colorSpace = CGColorSpace.CreateDeviceRGB())
-                        using (var bContext = new CGBitmapContext(Address, Width, Height, 8, Width * 4,
-                            colorSpace, (CGImageAlphaInfo) nfo))
+                        using (var nscontext = NSGraphicsContext.CurrentContext)
+                        using (var context = nscontext.GraphicsPort)
                         {
-                            if (!isDeferred || deferred != null)
-                            {
-                                using (var nscontext = NSGraphicsContext.CurrentContext)
-                                using (var context = nscontext.GraphicsPort)
-                                {
-                                    image = bContext.ToImage();
-                                    context.SetFillColor(255, 255, 255, 255);
-                                    context.FillRect(new CGRect(default(CGPoint), _view.LogicalSize));
-                                    context.TranslateCTM(0, _view.LogicalSize.Height - _logicalSize.Height);
-                                    context.DrawImage(new CGRect(default(CGPoint), _logicalSize), image);
-                                    context.Flush();
-                                    nscontext.FlushGraphics();
-                                }
-                            }
+                            context.SetFillColor(255, 255, 255, 255);
+                            context.FillRect(new CGRect(default(CGPoint), _view.LogicalSize));
+                            context.TranslateCTM(0, _view.LogicalSize.Height - _logicalSize.Height);
+                            context.DrawImage(new CGRect(default(CGPoint), _logicalSize), image);
+                            context.Flush();
+                            nscontext.FlushGraphics();
                         }
                     }
                 }
-                finally
+            }
+            finally
+            {
+                if (image != null)
                 {
-                    if (image != null)
-                    {
-                        if (deferred == null)
-                            image.Dispose();
-                        else
-                            _view.SetBackBufferImage(new SavedImage(image, _logicalSize));
-                    }
+                    if (!_isDeferred)
+                        image.Dispose();
+                    else
+                        _view.SetBackBufferImage(new SavedImage(image, _logicalSize));
                 }
+                Marshal.FreeHGlobal(Address);
+                Address = IntPtr.Zero;
+                drawLock?.Dispose();
             }
-            Marshal.FreeHGlobal(Address);
-            Address = IntPtr.Zero;
+
 
         }
 
diff --git a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
index ce30deea88..37b6b16793 100644
--- a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
+++ b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
@@ -413,6 +413,6 @@ namespace Avalonia.MonoMac
 
         public void SetInputRoot(IInputRoot inputRoot) => InputRoot = inputRoot;
 
-        public ILockedFramebuffer Lock() => new EmulatedFramebuffer(View, View.LogicalSize, View.PixelSize);
+        public ILockedFramebuffer Lock() => new EmulatedFramebuffer(View);
     }
 }
\ No newline at end of file

From 8a8a6de9a6f5ef29a5fc08c5f3d6353a6810d03e Mon Sep 17 00:00:00 2001
From: ARSolog <arsolog@mail.ru>
Date: Sat, 21 Oct 2017 19:22:29 +0300
Subject: [PATCH 126/482] Update ExpressionObserverTests_DataValidation.cs

fix Validation_Plugins_Send_Correct_Notifications to non 'en-us' CultureInfo.
---
 .../Data/ExpressionObserverTests_DataValidation.cs          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_DataValidation.cs b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_DataValidation.cs
index 125bd84f3d..9bf1e4711b 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_DataValidation.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_DataValidation.cs
@@ -78,6 +78,10 @@ namespace Avalonia.Markup.UnitTests.Data
             var data = new IndeiTest();
             var observer = new ExpressionObserver(data, nameof(data.MustBePositive), true);
             var result = new List<object>();
+            
+            var errmsg = string.Empty;
+            try { typeof(IndeiTest).GetProperty(nameof(IndeiTest.MustBePositive)).SetValue(data, "foo"); }
+            catch(Exception e) { errmsg = e.Message; }
 
             observer.Subscribe(x => result.Add(x));
             observer.SetValue(5);
@@ -99,7 +103,7 @@ namespace Avalonia.Markup.UnitTests.Data
 
                 // Exception is thrown by trying to set value to "foo".
                 new BindingNotification(
-                    new ArgumentException("Object of type 'System.String' cannot be converted to type 'System.Int32'."),
+                    new ArgumentException(errmsg),
                     BindingErrorType.DataValidationError),
 
                 // Value is set then validation is updated.

From a0c4ec9039ecf4bdb650299073061a4c4123a643 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sat, 21 Oct 2017 20:54:21 +0300
Subject: [PATCH 127/482] [MONOMAC] Pass frames back to UI thread instead of
 using lockFocusIfCanDraw

---
 .../Avalonia.MonoMac/EmulatedFramebuffer.cs   | 29 ++----------------
 src/OSX/Avalonia.MonoMac/TopLevelImpl.cs      | 30 +++++++++++++++++--
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/OSX/Avalonia.MonoMac/EmulatedFramebuffer.cs b/src/OSX/Avalonia.MonoMac/EmulatedFramebuffer.cs
index 713d4b0d18..935ab53432 100644
--- a/src/OSX/Avalonia.MonoMac/EmulatedFramebuffer.cs
+++ b/src/OSX/Avalonia.MonoMac/EmulatedFramebuffer.cs
@@ -11,7 +11,7 @@ namespace Avalonia.MonoMac
     {
         private readonly TopLevelImpl.TopLevelView _view;
         private readonly CGSize _logicalSize;
-        private bool _isDeferred;
+        private readonly bool _isDeferred;
 
         [DllImport("libc")]
         static extern void memset(IntPtr p, int c, IntPtr size);
@@ -32,34 +32,12 @@ namespace Avalonia.MonoMac
             Address = Marshal.AllocHGlobal(size);
             memset(Address, 0, new IntPtr(size));
         }
-
-        class CocoaDrawLock : IDisposable
-        {
-            private readonly NSView _view;
-            public void Dispose()
-            {
-                _view.NonUIUnlockFocus();
-            }
-
-            public CocoaDrawLock(NSView view)
-            {
-                _view = view;
-            }
-        }
-
-        CocoaDrawLock LockCocoaDrawing()
-        {
-            if (!_view.NonUILockFocusIfCanDraw())
-                return null;
-            return new CocoaDrawLock(_view);
-        }
-
+        
         public void Dispose()
         {
             if (Address == IntPtr.Zero)
                 return;
             var nfo = (int) CGBitmapFlags.ByteOrder32Big | (int) CGImageAlphaInfo.PremultipliedLast;
-            IDisposable drawLock = LockCocoaDrawing();
             CGImage image = null;
             try
             {
@@ -69,7 +47,7 @@ namespace Avalonia.MonoMac
                     image = bContext.ToImage();
                 lock (_view.SyncRoot)
                 {
-                    if (!_isDeferred || drawLock != null)
+                    if(!_isDeferred)
                     {
                         using (var nscontext = NSGraphicsContext.CurrentContext)
                         using (var context = nscontext.GraphicsPort)
@@ -95,7 +73,6 @@ namespace Avalonia.MonoMac
                 }
                 Marshal.FreeHGlobal(Address);
                 Address = IntPtr.Zero;
-                drawLock?.Dispose();
             }
 
 
diff --git a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
index 37b6b16793..563dee74c0 100644
--- a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
+++ b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
@@ -7,7 +7,7 @@ using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Rendering;
 using Avalonia.Threading;
 using MonoMac.AppKit;
-
+using MonoMac.CoreFoundation;
 using MonoMac.CoreGraphics;
 using MonoMac.Foundation;
 using MonoMac.ObjCRuntime;
@@ -37,6 +37,7 @@ namespace Avalonia.MonoMac
             private readonly IKeyboardDevice _keyboard;
             private NSTrackingArea _area;
             private NSCursor _cursor;
+            private bool _nonUiRedrawQueued;
 
             public CGSize PixelSize { get; set; }
 
@@ -55,7 +56,10 @@ namespace Avalonia.MonoMac
             protected override void Dispose(bool disposing)
             {
                 if (disposing)
-                    SetBackBufferImage(null);
+                {
+                    _backBuffer?.Dispose();
+                    _backBuffer = null;
+                }
                 base.Dispose(disposing);
             }
 
@@ -69,6 +73,8 @@ namespace Avalonia.MonoMac
 
             public override void DrawRect(CGRect dirtyRect)
             {
+                lock (SyncRoot)
+                    _nonUiRedrawQueued = false;
                 lock (SyncRoot)
                 {
                     if (_backBuffer != null)
@@ -93,6 +99,25 @@ namespace Avalonia.MonoMac
                 {
                     _backBuffer?.Dispose();
                     _backBuffer = image;
+                    if (image == null)
+                        return;
+
+                    if (_nonUiRedrawQueued)
+                        return;
+                    _nonUiRedrawQueued = true;
+                    Dispatcher.UIThread.InvokeAsync(
+                        () =>
+                        {
+                            lock (SyncRoot)
+                            {
+                                if (!_nonUiRedrawQueued)
+                                    return;
+                                _nonUiRedrawQueued = false;
+                            }
+                            SetNeedsDisplayInRect(Frame);
+                            Display();
+                        }, DispatcherPriority.Render);
+
                 }
             }
             
@@ -138,6 +163,7 @@ namespace Avalonia.MonoMac
                 AddTrackingArea(_area);
                 UpdateCursor();
                 _tl?.Resized?.Invoke(_tl.ClientSize);
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Layout);
             }
 
             InputModifiers GetModifiers(NSEventModifierMask mod)

From 5027248bd43fe1654528cb51a3b18a24ba2821a5 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sat, 21 Oct 2017 20:54:39 +0300
Subject: [PATCH 128/482] [MONOMAC] Dispatcher changes

---
 src/Avalonia.Base/Threading/Dispatcher.cs     |  6 ++++
 .../PlatformThreadingInterface.cs             | 32 +++++++++++------
 src/OSX/Avalonia.MonoMac/ThreadingUtils.cs    | 36 -------------------
 src/OSX/Avalonia.MonoMac/TopLevelImpl.cs      |  2 ++
 4 files changed, 30 insertions(+), 46 deletions(-)
 delete mode 100644 src/OSX/Avalonia.MonoMac/ThreadingUtils.cs

diff --git a/src/Avalonia.Base/Threading/Dispatcher.cs b/src/Avalonia.Base/Threading/Dispatcher.cs
index a4b1aaafbc..4a096fc326 100644
--- a/src/Avalonia.Base/Threading/Dispatcher.cs
+++ b/src/Avalonia.Base/Threading/Dispatcher.cs
@@ -72,6 +72,12 @@ namespace Avalonia.Threading
             _jobRunner?.RunJobs(null);
         }
 
+        /// <summary>
+        /// Use this method to ensure that more prioritized tasks are executed
+        /// </summary>
+        /// <param name="minimumPriority"></param>
+        public void RunJobs(DispatcherPriority minimumPriority) => _jobRunner.RunJobs(minimumPriority);
+
         /// <inheritdoc/>
         public Task InvokeTaskAsync(Action action, DispatcherPriority priority = DispatcherPriority.Normal)
         {
diff --git a/src/OSX/Avalonia.MonoMac/PlatformThreadingInterface.cs b/src/OSX/Avalonia.MonoMac/PlatformThreadingInterface.cs
index 184416e77a..88189ba12c 100644
--- a/src/OSX/Avalonia.MonoMac/PlatformThreadingInterface.cs
+++ b/src/OSX/Avalonia.MonoMac/PlatformThreadingInterface.cs
@@ -3,14 +3,18 @@ using System.Threading;
 using Avalonia.Platform;
 using Avalonia.Threading;
 using MonoMac.AppKit;
+using MonoMac.CoreFoundation;
 using MonoMac.CoreGraphics;
 using MonoMac.Foundation;
+using MonoMac.ObjCRuntime;
 
 namespace Avalonia.MonoMac
 {
-    class PlatformThreadingInterface : IPlatformThreadingInterface
+    class PlatformThreadingInterface : NSObject, IPlatformThreadingInterface
     {
         private bool _signaled;
+        private const string SignaledSelectorName = "avaloniauiSignaled";
+        private readonly Selector _signaledSelector = new Selector(SignaledSelectorName);
         public static PlatformThreadingInterface Instance { get; } = new PlatformThreadingInterface();
         public bool CurrentThreadIsLoopThread => NSThread.Current.IsMainThread;
 
@@ -27,18 +31,25 @@ namespace Avalonia.MonoMac
                     return;
                 _signaled = true;
             }
-            NSApplication.SharedApplication.BeginInvokeOnMainThread(() =>
-            {
-                lock (this)
+            PerformSelector(_signaledSelector, NSThread.MainThread, this, false,
+                new[]
                 {
-                    if (!_signaled)
-                        return;
-                    _signaled = false;
-                }
-                Signaled?.Invoke(null);
-            });
+                    NSRunLoop.NSDefaultRunLoopMode, NSRunLoop.NSRunLoopEventTracking, NSRunLoop.NSRunLoopModalPanelMode,
+                    NSRunLoop.NSRunLoopCommonModes, NSRunLoop.NSRunLoopConnectionReplyMode
+                });
         }
 
+        [Export(SignaledSelectorName)]
+        public void CallSignaled()
+        {
+            lock (this)
+            {
+                if (!_signaled)
+                    return;
+                _signaled = false;
+            }
+            Signaled?.Invoke(null);
+        }
 
 
         public void RunLoop(CancellationToken cancellationToken)
@@ -55,6 +66,7 @@ namespace Avalonia.MonoMac
                 var ev = app.NextEvent(NSEventMask.AnyEvent, NSDate.DistantFuture, NSRunLoop.NSDefaultRunLoopMode, true);
                 if (ev != null)
                 {
+                    Console.WriteLine("NSEVENT");
                     app.SendEvent(ev);
                     ev.Dispose();
                 }
diff --git a/src/OSX/Avalonia.MonoMac/ThreadingUtils.cs b/src/OSX/Avalonia.MonoMac/ThreadingUtils.cs
deleted file mode 100644
index 7762d86764..0000000000
--- a/src/OSX/Avalonia.MonoMac/ThreadingUtils.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-
-namespace Avalonia.MonoMac
-{
-    public static class ThreadingUtils
-    {
-        private static readonly IntPtr selUnlockFocusHandle = Selector.GetHandle("unlockFocus");
-        private static readonly IntPtr selLockFocusIfCanDrawHandle = Selector.GetHandle("lockFocusIfCanDraw");
-        private static readonly IntPtr selWindowHandle = Selector.GetHandle("window");
-        private static readonly IntPtr selCanDrawHandle = Selector.GetHandle("canDraw");
-
-        public static bool NonUILockFocusIfCanDraw(this NSView view)
-        {
-            return Messaging.bool_objc_msgSend(view.Handle, selLockFocusIfCanDrawHandle);
-        }
-
-        public static void NonUIUnlockFocus(this NSView view)
-        {
-            Messaging.void_objc_msgSend(view.Handle, selUnlockFocusHandle);
-        }
-
-        public static NSWindow NonUIGetWindow(this NSView view)
-        {
-            return (NSWindow) Runtime.GetNSObject(Messaging.IntPtr_objc_msgSendSuper(view.Handle, selWindowHandle));
-        }
-
-        public static bool BaseCanDraw(this NSView view)
-        {
-            return Messaging.bool_objc_msgSendSuper(view.SuperHandle, selCanDrawHandle);
-        }
-    }
-}
diff --git a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
index 563dee74c0..5ea7972871 100644
--- a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
+++ b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
@@ -25,6 +25,7 @@ namespace Avalonia.MonoMac
 
         protected virtual void OnInput(RawInputEventArgs args)
         {
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Input + 1);
             Input?.Invoke(args);
         }
 
@@ -75,6 +76,7 @@ namespace Avalonia.MonoMac
             {
                 lock (SyncRoot)
                     _nonUiRedrawQueued = false;
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Render);
                 lock (SyncRoot)
                 {
                     if (_backBuffer != null)

From bbfc07b98da2880d8bf6ccdd4b043a2bd80b8342 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sun, 22 Oct 2017 18:16:58 +0300
Subject: [PATCH 129/482] Screw wayland, we aren't dealing with "you can't set
 window coordinates" right now

---
 src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs   | 3 +++
 src/Gtk/Avalonia.Gtk3/Interop/Native.cs | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs b/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
index 2cf893346f..b687d9d447 100644
--- a/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
+++ b/src/Gtk/Avalonia.Gtk3/Gtk3Platform.cs
@@ -35,6 +35,9 @@ namespace Avalonia.Gtk3
                     X11.XInitThreads();
                 }catch{}
                 Resolver.Resolve();
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                    using (var backends = new Utf8Buffer("x11"))
+                        Native.GdkSetAllowedBackends?.Invoke(backends);
                 Native.GtkInit(0, IntPtr.Zero);
                 var disp = Native.GdkGetDefaultDisplay();
                 DisplayClassName =
diff --git a/src/Gtk/Avalonia.Gtk3/Interop/Native.cs b/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
index 3b9007786d..3e945798d4 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
+++ b/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
@@ -48,10 +48,13 @@ namespace Avalonia.Gtk3.Interop
             public delegate void gtk_main_iteration();
 
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Gtk)]
-            public delegate GtkWindow gtk_window_new(GtkWindowType windowType);
-
+            public delegate GtkWindow gtk_window_new(GtkWindowType windowType);           
+            
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Gtk)]
             public delegate IntPtr gtk_init(int argc, IntPtr argv);
+            
+            [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Gdk, optional: true)]
+            public delegate IntPtr gdk_set_allowed_backends (Utf8Buffer backends);
 
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Gtk)]
             public delegate void gtk_window_present(GtkWindow gtkWindow);
@@ -393,6 +396,7 @@ namespace Avalonia.Gtk3.Interop
         public static D.gtk_window_new GtkWindowNew;
         public static D.gtk_window_set_icon GtkWindowSetIcon;
         public static D.gtk_window_set_modal GtkWindowSetModal;
+        public static D.gdk_set_allowed_backends GdkSetAllowedBackends;
         public static D.gtk_init GtkInit;
         public static D.gtk_window_present GtkWindowPresent;
         public static D.gtk_widget_hide GtkWidgetHide;

From bff0403423779c2a744222335d723f4aafbaafda Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 23 Oct 2017 19:38:30 +0300
Subject: [PATCH 130/482] Removed splat

---
 build/Splat.props                             |  5 --
 packages.cake                                 |  4 --
 .../Avalonia.AndroidTestApplication.csproj    |  1 -
 .../Avalonia.Diagnostics.csproj               |  1 -
 src/Avalonia.Diagnostics/LogManager.cs        | 53 -------------------
 .../Avalonia.ReactiveUI.csproj                |  1 -
 6 files changed, 65 deletions(-)
 delete mode 100644 build/Splat.props
 delete mode 100644 src/Avalonia.Diagnostics/LogManager.cs

diff --git a/build/Splat.props b/build/Splat.props
deleted file mode 100644
index bc3367be01..0000000000
--- a/build/Splat.props
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-     <PackageReference Include="Splat" Version="2.0.0" />
-  </ItemGroup>
-</Project>
diff --git a/packages.cake b/packages.cake
index 98075ef36b..9e78ee75d5 100644
--- a/packages.cake
+++ b/packages.cake
@@ -107,7 +107,6 @@ public class Packages
         context.Information("Setting NuGet package dependencies versions:");
 
         var SerilogVersion = packageVersions["Serilog"].FirstOrDefault().Item1;
-        var SplatVersion = packageVersions["Splat"].FirstOrDefault().Item1;
         var SpracheVersion = packageVersions["Sprache"].FirstOrDefault().Item1;
         var SystemReactiveVersion = packageVersions["System.Reactive"].FirstOrDefault().Item1;
         var ReactiveUIVersion = packageVersions["reactiveui"].FirstOrDefault().Item1;
@@ -121,7 +120,6 @@ public class Packages
         var SharpDXDXGIVersion = packageVersions["SharpDX.DXGI"].FirstOrDefault().Item1;
 
         context.Information("Package: Serilog, version: {0}", SerilogVersion);
-        context.Information("Package: Splat, version: {0}", SplatVersion);
         context.Information("Package: Sprache, version: {0}", SpracheVersion);
         context.Information("Package: System.Reactive, version: {0}", SystemReactiveVersion);
         context.Information("Package: reactiveui, version: {0}", ReactiveUIVersion);
@@ -245,7 +243,6 @@ public class Packages
                 Dependencies = new DependencyBuilder(this)
                 {
                     new NuSpecDependency() { Id = "Serilog", Version = SerilogVersion },
-                    new NuSpecDependency() { Id = "Splat", Version = SplatVersion },
                     new NuSpecDependency() { Id = "Sprache", Version = SpracheVersion },
                     new NuSpecDependency() { Id = "System.Reactive", Version = SystemReactiveVersion },
                     new NuSpecDependency() { Id = "Avalonia.Remote.Protocol", Version = parameters.Version },
@@ -253,7 +250,6 @@ public class Packages
                     new NuSpecDependency() { Id = "System.Threading.ThreadPool", TargetFramework = "netcoreapp2.0", Version = "4.3.0" },
                     new NuSpecDependency() { Id = "Microsoft.Extensions.DependencyModel", TargetFramework = "netcoreapp2.0", Version = "1.1.0" },
                     new NuSpecDependency() { Id = "NETStandard.Library", TargetFramework = "netcoreapp2.0", Version = "1.6.0" },
-                    new NuSpecDependency() { Id = "Splat", TargetFramework = "netcoreapp2.0", Version = SplatVersion },
                     new NuSpecDependency() { Id = "Serilog", TargetFramework = "netcoreapp2.0", Version = SerilogVersion },
                     new NuSpecDependency() { Id = "Sprache", TargetFramework = "netcoreapp2.0", Version = SpracheVersion },
                     new NuSpecDependency() { Id = "System.Reactive", TargetFramework = "netcoreapp2.0", Version = SystemReactiveVersion },
diff --git a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
index 5b621b9e08..9977d77978 100644
--- a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
+++ b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
@@ -154,7 +154,6 @@
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\..\..\build\Serilog.props" />
-  <Import Project="..\..\..\build\Splat.props" />
   <Import Project="..\..\..\build\Sprache.props" />
   <Import Project="..\..\..\build\Rx.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
index 5cb56e0be1..abbdd15bed 100644
--- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
+++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
@@ -50,5 +50,4 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\Splat.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Avalonia.Diagnostics/LogManager.cs b/src/Avalonia.Diagnostics/LogManager.cs
deleted file mode 100644
index d08d61836e..0000000000
--- a/src/Avalonia.Diagnostics/LogManager.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using Avalonia.Layout;
-using Splat;
-
-namespace Avalonia.Diagnostics
-{
-    public class LogManager : ILogManager
-    {
-        private static LogManager s_instance;
-
-        public static LogManager Instance => s_instance ?? (s_instance = new LogManager());
-
-        public ILogger Logger
-        {
-            get;
-            set;
-        }
-
-        public bool LogPropertyMessages
-        {
-            get;
-            set;
-        }
-
-        public bool LogLayoutMessages
-        {
-            get;
-            set;
-        }
-
-        public static void Enable(ILogger logger)
-        {
-            Instance.Logger = logger;
-            Locator.CurrentMutable.Register(() => Instance, typeof(ILogManager));
-        }
-
-        public IFullLogger GetLogger(Type type)
-        {
-            if ((type == typeof(AvaloniaObject) && LogPropertyMessages) ||
-                (type == typeof(Layoutable) && LogLayoutMessages))
-            {
-                return new WrappingFullLogger(Logger, type);
-            }
-            else
-            {
-                return new WrappingFullLogger(new NullLogger(), type);
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
index c29dbcd381..b7ad36f8b2 100644
--- a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
+++ b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
@@ -16,5 +16,4 @@
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ReactiveUI.props" />
-  <Import Project="..\..\build\Splat.props" />
 </Project>
\ No newline at end of file

From 7affba47632fde5a0be4c33bd2872f8f1f980b79 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 23 Oct 2017 21:51:20 +0300
Subject: [PATCH 131/482] Cleaning splat

---
 samples/BindingTest/BindingTest.csproj                           | 1 -
 samples/RenderTest/RenderTest.csproj                             | 1 -
 samples/VirtualizationTest/VirtualizationTest.csproj             | 1 -
 .../interop/Direct3DInteropSample/Direct3DInteropSample.csproj   | 1 -
 .../Avalonia.Markup.Xaml.UnitTests.csproj                        | 1 -
 5 files changed, 5 deletions(-)

diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingTest/BindingTest.csproj
index d7d349fbdf..4f82303c3a 100644
--- a/samples/BindingTest/BindingTest.csproj
+++ b/samples/BindingTest/BindingTest.csproj
@@ -152,7 +152,6 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\build\Serilog.props" />
   <Import Project="..\..\build\Serilog.Sinks.Trace.props" />
-  <Import Project="..\..\build\Splat.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ReactiveUI.props" />
 </Project>
\ No newline at end of file
diff --git a/samples/RenderTest/RenderTest.csproj b/samples/RenderTest/RenderTest.csproj
index 0141ad29c6..a71f17ab7a 100644
--- a/samples/RenderTest/RenderTest.csproj
+++ b/samples/RenderTest/RenderTest.csproj
@@ -181,7 +181,6 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\build\Serilog.props" />
   <Import Project="..\..\build\Serilog.Sinks.Trace.props" />
-  <Import Project="..\..\build\Splat.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ReactiveUI.props" />
 </Project>
\ No newline at end of file
diff --git a/samples/VirtualizationTest/VirtualizationTest.csproj b/samples/VirtualizationTest/VirtualizationTest.csproj
index 58775926cc..6d3803b4cf 100644
--- a/samples/VirtualizationTest/VirtualizationTest.csproj
+++ b/samples/VirtualizationTest/VirtualizationTest.csproj
@@ -148,7 +148,6 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\build\Serilog.props" />
   <Import Project="..\..\build\Serilog.Sinks.Trace.props" />
-  <Import Project="..\..\build\Splat.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ReactiveUI.props" />
 </Project>
\ No newline at end of file
diff --git a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
index da230d34c6..e0fc79faea 100644
--- a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
+++ b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
@@ -29,6 +29,5 @@
     </ItemGroup>
     <Import Project="..\..\..\build\Serilog.props" />
     <Import Project="..\..\..\build\Serilog.Sinks.Trace.props" />
-    <Import Project="..\..\..\build\Splat.props" />
     <Import Project="..\..\..\build\Rx.props" />
 </Project>
\ No newline at end of file
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
index 03bb71a383..eb6dc8b5e5 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
@@ -8,7 +8,6 @@
   <Import Project="..\..\build\XUnit.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
-  <Import Project="..\..\build\Splat.props" />
   <Import Project="..\..\build\Sprache.props" />
   <ItemGroup>
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />

From 7db5ae8db97f4fdd8ace8a62bdc3f14e7f8035af Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Mon, 23 Oct 2017 22:58:27 +0300
Subject: [PATCH 132/482] Added unit tests

---
 .../Avalonia.RenderTests.projitems            |   1 +
 .../Avalonia.RenderTests/Shapes/ShapeTests.cs | 112 ++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 tests/Avalonia.RenderTests/Shapes/ShapeTests.cs

diff --git a/tests/Avalonia.RenderTests/Avalonia.RenderTests.projitems b/tests/Avalonia.RenderTests/Avalonia.RenderTests.projitems
index ff729a6b48..4263d7b206 100644
--- a/tests/Avalonia.RenderTests/Avalonia.RenderTests.projitems
+++ b/tests/Avalonia.RenderTests/Avalonia.RenderTests.projitems
@@ -14,6 +14,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Media\RadialGradientBrushTests.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Media\BitmapTests.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)OpacityMaskTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Shapes\ShapeTests.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)SVGPathTests.cs" />
     <Compile Include="Media\FormattedTextImplTests.cs" />
     <Compile Include="Controls\ImageTests.cs" />
diff --git a/tests/Avalonia.RenderTests/Shapes/ShapeTests.cs b/tests/Avalonia.RenderTests/Shapes/ShapeTests.cs
new file mode 100644
index 0000000000..20d3af375c
--- /dev/null
+++ b/tests/Avalonia.RenderTests/Shapes/ShapeTests.cs
@@ -0,0 +1,112 @@
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.Media;
+using Xunit;
+
+
+#if AVALONIA_SKIA
+namespace Avalonia.Skia.RenderTests
+#else
+namespace Avalonia.Direct2D1.RenderTests.Shapes
+#endif
+{
+    public class ShapeTests : TestBase
+    {
+        public ShapeTests()
+            : base(@"Shapes\Shape")
+        { }
+
+        [Fact]
+        public void Shape_Transformation_Calculation_Should_Be_Deferred_To_Arrange_When_Strech_Is_Fill_And_Aviable_Size_Is_Infinite()
+        {
+            var shape = new Polygon()
+            {
+                Points = new List<Point>
+                {
+                    new Point(0, 0),
+                    new Point(10, 5),
+                    new Point(0, 10)
+                },
+                Stretch = Stretch.Fill
+            };
+
+            var availableSize = new Size(double.PositiveInfinity, double.PositiveInfinity);
+            shape.Measure(availableSize);
+            Geometry postMeasureGeometry = shape.RenderedGeometry;
+            Transform postMeasureTransform = postMeasureGeometry.Transform;
+
+            var finalSize = new Size(100, 50);
+            var finalRect = new Rect(finalSize);
+            shape.Arrange(finalRect);
+
+            Geometry postArrangeGeometry = shape.RenderedGeometry;
+            Transform postArrangeTransform = postArrangeGeometry.Transform;
+
+            Assert.NotEqual(postMeasureGeometry, postArrangeGeometry);
+            Assert.NotEqual(postMeasureTransform, postArrangeTransform);
+            Assert.Equal(finalSize, shape.Bounds.Size);
+        }
+
+        [Fact]
+        public void Shape_Transformation_Calculation_Should_Not_Be_Deferred_To_Arrange_When_Strech_Is_Fill_And_Aviable_Size_Is_Finite()
+        {
+            var shape = new Polygon()
+            {
+                Points = new List<Point>
+                {
+                    new Point(0, 0),
+                    new Point(10, 5),
+                    new Point(0, 10)
+                },
+                Stretch = Stretch.Fill
+            };
+
+            var availableSize = new Size(100, 50);
+            shape.Measure(availableSize);
+            Geometry postMeasureGeometry = shape.RenderedGeometry;
+            Transform postMeasureTransform = postMeasureGeometry.Transform;
+
+            var finalRect = new Rect(availableSize);
+            shape.Arrange(finalRect);
+
+            Geometry postArrangeGeometry = shape.RenderedGeometry;
+            Transform postArrangeTransform = postArrangeGeometry.Transform;
+
+            Assert.Equal(postMeasureGeometry, postArrangeGeometry);
+            Assert.Equal(postMeasureTransform, postArrangeTransform);
+            Assert.Equal(availableSize, shape.Bounds.Size);
+        }
+
+        [Fact]
+        public void Shape_Transformation_Calculation_Should_Not_Be_Deferred_To_Arrange_When_Strech_Is_None()
+        {
+            var shape = new Polygon()
+            {
+                Points = new List<Point>
+                {
+                    new Point(0, 0),
+                    new Point(10, 5),
+                    new Point(0, 10)
+                },
+                Stretch = Stretch.None
+            };
+
+            var availableSize = new Size(double.PositiveInfinity, double.PositiveInfinity);
+            shape.Measure(availableSize);
+            Geometry postMeasureGeometry = shape.RenderedGeometry;
+            Transform postMeasureTransform = postMeasureGeometry.Transform;
+
+            var finalSize = new Size(100, 50);
+            var finalRect = new Rect(finalSize);
+            shape.Arrange(finalRect);
+
+            Geometry postArrangeGeometry = shape.RenderedGeometry;
+            Transform postArrangeTransform = postArrangeGeometry.Transform;
+
+            Assert.Equal(postMeasureGeometry, postArrangeGeometry);
+            Assert.Equal(postMeasureTransform, postArrangeTransform);
+            Assert.Equal(finalSize, shape.Bounds.Size);
+        }
+    }
+}

From a4c9f1e40040870053963c24eab95c120ed7ff14 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 23 Oct 2017 23:32:49 +0300
Subject: [PATCH 133/482] Make ShapeLayoutTests use MockPlatformRenderInterface

---
 .../ShapeLayoutTests.cs}                      | 19 +++++++--------
 .../Avalonia.RenderTests.projitems            |  1 -
 .../TestWithServicesBase.cs                   | 23 +++++++++++++++++++
 3 files changed, 33 insertions(+), 10 deletions(-)
 rename tests/{Avalonia.RenderTests/Shapes/ShapeTests.cs => Avalonia.Layout.UnitTests/ShapeLayoutTests.cs} (91%)
 create mode 100644 tests/Avalonia.UnitTests/TestWithServicesBase.cs

diff --git a/tests/Avalonia.RenderTests/Shapes/ShapeTests.cs b/tests/Avalonia.Layout.UnitTests/ShapeLayoutTests.cs
similarity index 91%
rename from tests/Avalonia.RenderTests/Shapes/ShapeTests.cs
rename to tests/Avalonia.Layout.UnitTests/ShapeLayoutTests.cs
index 20d3af375c..2ccd6fb04c 100644
--- a/tests/Avalonia.RenderTests/Shapes/ShapeTests.cs
+++ b/tests/Avalonia.Layout.UnitTests/ShapeLayoutTests.cs
@@ -2,20 +2,21 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Shapes;
 using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.UnitTests;
 using Xunit;
 
+namespace Avalonia.Layout.UnitTests
 
-#if AVALONIA_SKIA
-namespace Avalonia.Skia.RenderTests
-#else
-namespace Avalonia.Direct2D1.RenderTests.Shapes
-#endif
 {
-    public class ShapeTests : TestBase
+    public class ShapeLayoutTests : TestWithServicesBase
     {
-        public ShapeTests()
-            : base(@"Shapes\Shape")
-        { }
+
+        public ShapeLayoutTests()
+        {
+            AvaloniaLocator.CurrentMutable
+                .Bind<IPlatformRenderInterface>().ToSingleton<MockPlatformRenderInterface>();
+        }
 
         [Fact]
         public void Shape_Transformation_Calculation_Should_Be_Deferred_To_Arrange_When_Strech_Is_Fill_And_Aviable_Size_Is_Infinite()
diff --git a/tests/Avalonia.RenderTests/Avalonia.RenderTests.projitems b/tests/Avalonia.RenderTests/Avalonia.RenderTests.projitems
index 4263d7b206..ff729a6b48 100644
--- a/tests/Avalonia.RenderTests/Avalonia.RenderTests.projitems
+++ b/tests/Avalonia.RenderTests/Avalonia.RenderTests.projitems
@@ -14,7 +14,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Media\RadialGradientBrushTests.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Media\BitmapTests.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)OpacityMaskTests.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Shapes\ShapeTests.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)SVGPathTests.cs" />
     <Compile Include="Media\FormattedTextImplTests.cs" />
     <Compile Include="Controls\ImageTests.cs" />
diff --git a/tests/Avalonia.UnitTests/TestWithServicesBase.cs b/tests/Avalonia.UnitTests/TestWithServicesBase.cs
new file mode 100644
index 0000000000..bbd6c7427c
--- /dev/null
+++ b/tests/Avalonia.UnitTests/TestWithServicesBase.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Avalonia.UnitTests
+{
+    public class TestWithServicesBase : IDisposable
+    {
+        private IDisposable _scope;
+
+        public TestWithServicesBase()
+        {
+            _scope = AvaloniaLocator.EnterScope();
+        }
+
+        public void Dispose()
+        {
+            _scope.Dispose();
+        }
+    }
+}

From b5ee3077bcc7f289af825dc1b73ceece8ee94728 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 23 Oct 2017 16:32:37 -0500
Subject: [PATCH 134/482] Fix direct properties by delaying setting values
 until after any currently running property changed notifications for this
 property finish running.

---
 src/Avalonia.Base/AvaloniaObject.cs           | 27 +++++++--
 src/Avalonia.Base/DelayedSetter.cs            | 56 +++++++++++++++++++
 .../AvaloniaObjectTests_Direct.cs             |  2 +-
 3 files changed, 79 insertions(+), 6 deletions(-)
 create mode 100644 src/Avalonia.Base/DelayedSetter.cs

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index efcbb57244..77d6c20608 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -510,6 +510,7 @@ namespace Avalonia
         {
             Contract.Requires<ArgumentNullException>(property != null);
             VerifyAccess();
+            delayedSetter.SetNotifying(property, true);
 
             AvaloniaPropertyChangedEventArgs e = new AvaloniaPropertyChangedEventArgs(
                 this,
@@ -536,9 +537,12 @@ namespace Avalonia
             finally
             {
                 property.Notifying?.Invoke(this, false);
+                delayedSetter.SetNotifying(property, false);
             }
         }
 
+        private DelayedSetter<AvaloniaProperty> delayedSetter = new DelayedSetter<AvaloniaProperty>();
+
         /// <summary>
         /// Sets the backing field for a direct avalonia property, raising the 
         /// <see cref="PropertyChanged"/> event if the value has changed.
@@ -553,15 +557,28 @@ namespace Avalonia
         protected bool SetAndRaise<T>(AvaloniaProperty<T> property, ref T field, T value)
         {
             VerifyAccess();
-            if (!object.Equals(field, value))
+            if (!delayedSetter.IsNotifying(property))
             {
-                var old = field;
-                field = value;
-                RaisePropertyChanged(property, old, value, BindingPriority.LocalValue);
-                return true;
+                if (!object.Equals(field, value))
+                {
+                    var old = field;
+                    field = value;
+                    RaisePropertyChanged(property, old, value, BindingPriority.LocalValue);
+
+                    if (delayedSetter.HasPendingSet(property))
+                    {
+                        SetAndRaise(property, ref field, (T)delayedSetter.GetFirstPendingSet(property));
+                    }
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
             }
             else
             {
+                delayedSetter.RecordPendingSet(property, value);
                 return false;
             }
         }
diff --git a/src/Avalonia.Base/DelayedSetter.cs b/src/Avalonia.Base/DelayedSetter.cs
new file mode 100644
index 0000000000..df0a8b85f4
--- /dev/null
+++ b/src/Avalonia.Base/DelayedSetter.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Avalonia
+{
+    class DelayedSetter<T>
+    {
+        private class SettingStatus
+        {
+            public bool Notifying { get; set; }
+
+            private Queue<object> pendingValues;
+            
+            public Queue<object> PendingValues
+            {
+                get
+                {
+                    return pendingValues ?? (pendingValues = new Queue<object>());
+                }
+            }
+        }
+
+        private readonly Dictionary<T, SettingStatus> setRecords = new Dictionary<T, SettingStatus>();
+
+        public void SetNotifying(T property, bool notifying)
+        {
+            if (!setRecords.ContainsKey(property))
+            {
+                setRecords[property] = new SettingStatus();
+            }
+            setRecords[property].Notifying = notifying;
+        }
+
+        public bool IsNotifying(T property) => setRecords.TryGetValue(property, out var value) && value.Notifying;
+
+        public void RecordPendingSet(T property, object value)
+        {
+            if (!setRecords.ContainsKey(property))
+            {
+                setRecords[property] = new SettingStatus();
+            }
+            setRecords[property].PendingValues.Enqueue(value);
+        }
+
+        public bool HasPendingSet(T property)
+        {
+            return setRecords.ContainsKey(property) && setRecords[property].PendingValues.Count != 0;
+        }
+
+        public object GetFirstPendingSet(T property)
+        {
+            return setRecords[property].PendingValues.Dequeue();
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
index d20ec32893..4123e229dd 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
@@ -485,7 +485,7 @@ namespace Avalonia.Base.UnitTests
             //here in real life stack overflow exception is thrown issue #855 and #824
             target.DoubleValue = 51.001;
 
-            Assert.Equal(2, viewModel.SetterInvokedCount);
+            Assert.Equal(3, viewModel.SetterInvokedCount);
 
             double expected = 51;
 

From 8eb355e99d626b5dc3c277552449f3fe04997d58 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 23 Oct 2017 21:09:52 -0500
Subject: [PATCH 135/482] Fix SelectedItem stack overflow bug. Changes of this
 pattern are basically required for any direct property that is not using
 SetAndRaise.

---
 src/Avalonia.Base/AvaloniaObject.cs           | 24 +++++----
 .../{ => Utilities}/DelayedSetter.cs          | 23 ++++----
 .../Primitives/SelectingItemsControl.cs       | 52 ++++++++++++-------
 3 files changed, 63 insertions(+), 36 deletions(-)
 rename src/Avalonia.Base/{ => Utilities}/DelayedSetter.cs (66%)

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 77d6c20608..91e087abc0 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -51,6 +51,12 @@ namespace Avalonia
         /// </summary>
         private EventHandler<AvaloniaPropertyChangedEventArgs> _propertyChanged;
 
+        /// <summary>
+        /// Delayed setter helper for direct properties. Used to fix #855.
+        /// </summary>
+        protected readonly DelayedSetter<AvaloniaProperty, object> directDelayedSetter = new DelayedSetter<AvaloniaProperty, object>();
+
+
         /// <summary>
         /// Initializes a new instance of the <see cref="AvaloniaObject"/> class.
         /// </summary>
@@ -510,7 +516,6 @@ namespace Avalonia
         {
             Contract.Requires<ArgumentNullException>(property != null);
             VerifyAccess();
-            delayedSetter.SetNotifying(property, true);
 
             AvaloniaPropertyChangedEventArgs e = new AvaloniaPropertyChangedEventArgs(
                 this,
@@ -537,12 +542,9 @@ namespace Avalonia
             finally
             {
                 property.Notifying?.Invoke(this, false);
-                delayedSetter.SetNotifying(property, false);
             }
         }
 
-        private DelayedSetter<AvaloniaProperty> delayedSetter = new DelayedSetter<AvaloniaProperty>();
-
         /// <summary>
         /// Sets the backing field for a direct avalonia property, raising the 
         /// <see cref="PropertyChanged"/> event if the value has changed.
@@ -557,17 +559,21 @@ namespace Avalonia
         protected bool SetAndRaise<T>(AvaloniaProperty<T> property, ref T field, T value)
         {
             VerifyAccess();
-            if (!delayedSetter.IsNotifying(property))
+            if (!directDelayedSetter.IsNotifying(property))
             {
                 if (!object.Equals(field, value))
                 {
                     var old = field;
                     field = value;
-                    RaisePropertyChanged(property, old, value, BindingPriority.LocalValue);
+                    
+                    using (directDelayedSetter.MarkNotifying(property))
+                    {
+                        RaisePropertyChanged(property, old, value, BindingPriority.LocalValue); 
+                    }
 
-                    if (delayedSetter.HasPendingSet(property))
+                    if (directDelayedSetter.HasPendingSet(property))
                     {
-                        SetAndRaise(property, ref field, (T)delayedSetter.GetFirstPendingSet(property));
+                        SetAndRaise(property, ref field, (T)directDelayedSetter.GetFirstPendingSet(property));
                     }
                     return true;
                 }
@@ -578,7 +584,7 @@ namespace Avalonia
             }
             else
             {
-                delayedSetter.RecordPendingSet(property, value);
+                directDelayedSetter.AddPendingSet(property, value);
                 return false;
             }
         }
diff --git a/src/Avalonia.Base/DelayedSetter.cs b/src/Avalonia.Base/Utilities/DelayedSetter.cs
similarity index 66%
rename from src/Avalonia.Base/DelayedSetter.cs
rename to src/Avalonia.Base/Utilities/DelayedSetter.cs
index df0a8b85f4..c8c9c87d95 100644
--- a/src/Avalonia.Base/DelayedSetter.cs
+++ b/src/Avalonia.Base/Utilities/DelayedSetter.cs
@@ -1,40 +1,45 @@
 using System;
 using System.Collections.Generic;
+using System.Reactive.Disposables;
 using System.Text;
 
-namespace Avalonia
+namespace Avalonia.Utilities
 {
-    class DelayedSetter<T>
+    public class DelayedSetter<T, TValue>
     {
         private class SettingStatus
         {
             public bool Notifying { get; set; }
 
-            private Queue<object> pendingValues;
+            private Queue<TValue> pendingValues;
             
-            public Queue<object> PendingValues
+            public Queue<TValue> PendingValues
             {
                 get
                 {
-                    return pendingValues ?? (pendingValues = new Queue<object>());
+                    return pendingValues ?? (pendingValues = new Queue<TValue>());
                 }
             }
         }
 
         private readonly Dictionary<T, SettingStatus> setRecords = new Dictionary<T, SettingStatus>();
 
-        public void SetNotifying(T property, bool notifying)
+        public IDisposable MarkNotifying(T property)
         {
+            Contract.Requires<InvalidOperationException>(!IsNotifying(property));
+
             if (!setRecords.ContainsKey(property))
             {
                 setRecords[property] = new SettingStatus();
             }
-            setRecords[property].Notifying = notifying;
+            setRecords[property].Notifying = true;
+
+            return Disposable.Create(() => setRecords[property].Notifying = false);
         }
 
         public bool IsNotifying(T property) => setRecords.TryGetValue(property, out var value) && value.Notifying;
 
-        public void RecordPendingSet(T property, object value)
+        public void AddPendingSet(T property, TValue value)
         {
             if (!setRecords.ContainsKey(property))
             {
@@ -48,7 +53,7 @@ namespace Avalonia
             return setRecords.ContainsKey(property) && setRecords[property].PendingValues.Count != 0;
         }
 
-        public object GetFirstPendingSet(T property)
+        public TValue GetFirstPendingSet(T property)
         {
             return setRecords[property].PendingValues.Dequeue();
         }
diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
index ab09a4701d..e5f5e8fc30 100644
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@@ -183,30 +183,46 @@ namespace Avalonia.Controls.Primitives
             {
                 if (_updateCount == 0)
                 {
-                    var old = SelectedItem;
-                    var index = IndexOf(Items, value);
-                    var effective = index != -1 ? value : null;
-
-                    if (!object.Equals(effective, old))
+                    if (!directDelayedSetter.IsNotifying(SelectedItemProperty))
                     {
-                        _selectedItem = effective;
-                        RaisePropertyChanged(SelectedItemProperty, old, effective, BindingPriority.LocalValue);
-                        SelectedIndex = index;
+                        var old = SelectedItem;
+                        var index = IndexOf(Items, value);
+                        var effective = index != -1 ? value : null;
 
-                        if (effective != null)
+                        if (!object.Equals(effective, old))
                         {
-                            if (SelectedItems.Count != 1 || SelectedItems[0] != effective)
+                            _selectedItem = effective;
+                            using (directDelayedSetter.MarkNotifying(SelectedItemProperty))
+                            {
+                                RaisePropertyChanged(SelectedItemProperty, old, effective, BindingPriority.LocalValue);
+                            }
+
+                            SelectedIndex = index;
+
+                            if (effective != null)
+                            {
+                                if (SelectedItems.Count != 1 || SelectedItems[0] != effective)
+                                {
+                                    _syncingSelectedItems = true;
+                                    SelectedItems.Clear();
+                                    SelectedItems.Add(effective);
+                                    _syncingSelectedItems = false;
+                                }
+                            }
+                            else if (SelectedItems.Count > 0)
                             {
-                                _syncingSelectedItems = true;
                                 SelectedItems.Clear();
-                                SelectedItems.Add(effective);
-                                _syncingSelectedItems = false;
                             }
-                        }
-                        else if (SelectedItems.Count > 0)
-                        {
-                            SelectedItems.Clear();
-                        }
+
+                            if (directDelayedSetter.HasPendingSet(SelectedItemProperty))
+                            {
+                                SelectedItem = directDelayedSetter.GetFirstPendingSet(SelectedItemProperty);
+                            }
+                        } 
+                    }
+                    else
+                    {
+                        directDelayedSetter.AddPendingSet(SelectedItemProperty, value);
                     }
                 }
                 else

From 6486ffc77f2a888cc891e4502c5d0f31441d0431 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 23 Oct 2017 21:14:08 -0500
Subject: [PATCH 136/482] Apply fix to PriorityValue, which works for
 StyledProperty bindings where the bindings don't have the same priority.

---
 src/Avalonia.Base/PriorityValue.cs            | 83 +++++++++++--------
 .../AvaloniaObjectTests_Binding.cs            |  2 +-
 2 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/src/Avalonia.Base/PriorityValue.cs b/src/Avalonia.Base/PriorityValue.cs
index 3726fb7ae5..cc6f9e465c 100644
--- a/src/Avalonia.Base/PriorityValue.cs
+++ b/src/Avalonia.Base/PriorityValue.cs
@@ -30,6 +30,7 @@ namespace Avalonia
         private readonly SingleOrDictionary<int, PriorityLevel> _levels = new SingleOrDictionary<int, PriorityLevel>();
         private object _value;
         private readonly Func<object, object> _validate;
+        private static readonly DelayedSetter<PriorityValue, (object value, int priority)> delayedSetter = new DelayedSetter<PriorityValue, (object, int)>();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PriorityValue"/> class.
@@ -234,51 +235,67 @@ namespace Avalonia
         /// <param name="priority">The priority level that the value came from.</param>
         private void UpdateValue(object value, int priority)
         {
-            var notification = value as BindingNotification;
-            object castValue;
-
-            if (notification != null)
-            {
-                value = (notification.HasValue) ? notification.Value : null;
-            }
-
-            if (TypeUtilities.TryConvertImplicit(_valueType, value, out castValue))
+            if (!delayedSetter.IsNotifying(this))
             {
-                var old = _value;
+                var notification = value as BindingNotification;
+                object castValue;
 
-                if (_validate != null && castValue != AvaloniaProperty.UnsetValue)
+                if (notification != null)
                 {
-                    castValue = _validate(castValue);
+                    value = (notification.HasValue) ? notification.Value : null;
                 }
 
-                ValuePriority = priority;
-                _value = castValue;
-
-                if (notification?.HasValue == true)
+                if (!object.Equals(value, _value) && TypeUtilities.TryConvertImplicit(_valueType, value, out castValue))
                 {
-                    notification.SetValue(castValue);
-                }
+                    var old = _value;
 
-                if (notification == null || notification.HasValue)
-                {
-                    Owner?.Changed(this, old, _value);
-                }
+                    if (_validate != null && castValue != AvaloniaProperty.UnsetValue)
+                    {
+                        castValue = _validate(castValue);
+                    }
 
-                if (notification != null)
-                {
-                    Owner?.BindingNotificationReceived(this, notification);
+                    ValuePriority = priority;
+                    _value = castValue;
+
+                    if (notification?.HasValue == true)
+                    {
+                        notification.SetValue(castValue);
+                    }
+
+                    if (notification == null || notification.HasValue)
+                    {
+                        using (delayedSetter.MarkNotifying(this))
+                        {
+                            Owner?.Changed(this, old, _value); 
+                        }
+
+                        if (delayedSetter.HasPendingSet(this))
+                        {
+                            var pendingSet = delayedSetter.GetFirstPendingSet(this);
+                            UpdateValue(pendingSet.value, pendingSet.priority);
+                        }
+                    }
+
+                    if (notification != null)
+                    {
+                        Owner?.BindingNotificationReceived(this, notification);
+                    }
                 }
+                else
+                {
+                    Logger.Error(
+                        LogArea.Binding,
+                        Owner,
+                        "Binding produced invalid value for {$Property} ({$PropertyType}): {$Value} ({$ValueType})",
+                        Property.Name,
+                        _valueType,
+                        value,
+                        value?.GetType());
+                } 
             }
             else
             {
-                Logger.Error(
-                    LogArea.Binding, 
-                    Owner,
-                    "Binding produced invalid value for {$Property} ({$PropertyType}): {$Value} ({$ValueType})",
-                    Property.Name, 
-                    _valueType, 
-                    value,
-                    value?.GetType());
+                delayedSetter.AddPendingSet(this, (value, priority));
             }
         }
     }
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
index ff37509847..b266b44cba 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
@@ -428,7 +428,7 @@ namespace Avalonia.Base.UnitTests
             //here in real life stack overflow exception is thrown issue #855 and #824
             target.DoubleValue = 51.001;
 
-            Assert.Equal(2, viewModel.SetterInvokedCount);
+            Assert.Equal(3, viewModel.SetterInvokedCount);
 
             double expected = 51;
 

From 440f2cafc566ff3b17865551907cbdbbe80d4b44 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 23 Oct 2017 21:39:11 -0500
Subject: [PATCH 137/482] Fix SelectedItemsControl and RangeBase Stackoverflow
 bugs.

---
 src/Avalonia.Base/AvaloniaObject.cs           | 26 ++++++++++-
 .../Primitives/SelectingItemsControl.cs       | 44 ++++++++-----------
 .../Primitives/RangeBaseTests.cs              |  2 +-
 3 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 91e087abc0..b5956d681a 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -54,7 +54,7 @@ namespace Avalonia
         /// <summary>
         /// Delayed setter helper for direct properties. Used to fix #855.
         /// </summary>
-        protected readonly DelayedSetter<AvaloniaProperty, object> directDelayedSetter = new DelayedSetter<AvaloniaProperty, object>();
+        private readonly DelayedSetter<AvaloniaProperty, object> directDelayedSetter = new DelayedSetter<AvaloniaProperty, object>();
 
 
         /// <summary>
@@ -589,6 +589,30 @@ namespace Avalonia
             }
         }
 
+        protected void SetAndRaise<T>(AvaloniaProperty<T> property, Action<T, Action<Action>> setterCallback, T value, Action<T> delayedSet)
+        {
+            Contract.Requires<ArgumentNullException>(setterCallback != null);
+            Contract.Requires<ArgumentNullException>(delayedSet != null);
+            if (!directDelayedSetter.IsNotifying(property))
+            {
+                setterCallback(value, notification => 
+                {
+                    using (directDelayedSetter.MarkNotifying(property))
+                    {
+                        notification();
+                    }
+                });
+                if (directDelayedSetter.HasPendingSet(property))
+                {
+                    delayedSet((T)directDelayedSetter.GetFirstPendingSet(property));
+                }
+            }
+            else
+            {
+                directDelayedSetter.AddPendingSet(property, value);
+            }
+        }
+
         /// <summary>
         /// Tries to cast a value to a type, taking into account that the value may be a
         /// <see cref="BindingNotification"/>.
diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
index e5f5e8fc30..294b14b13d 100644
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@@ -151,15 +151,18 @@ namespace Avalonia.Controls.Primitives
             {
                 if (_updateCount == 0)
                 {
-                    var old = SelectedIndex;
-                    var effective = (value >= 0 && value < Items?.Cast<object>().Count()) ? value : -1;
-
-                    if (old != effective)
+                    SetAndRaise(SelectedIndexProperty, (val, notifierWrapper) =>
                     {
-                        _selectedIndex = effective;
-                        RaisePropertyChanged(SelectedIndexProperty, old, effective, BindingPriority.LocalValue);
-                        SelectedItem = ElementAt(Items, effective);
-                    }
+                        var old = SelectedIndex;
+                        var effective = (val >= 0 && val < Items?.Cast<object>().Count()) ? val : -1;
+
+                        if (old != effective)
+                        {
+                            _selectedIndex = effective;
+                            notifierWrapper(() => RaisePropertyChanged(SelectedIndexProperty, old, effective, BindingPriority.LocalValue));
+                            SelectedItem = ElementAt(Items, effective);
+                        }
+                    }, value, val => SelectedIndex = val);
                 }
                 else
                 {
@@ -183,19 +186,17 @@ namespace Avalonia.Controls.Primitives
             {
                 if (_updateCount == 0)
                 {
-                    if (!directDelayedSetter.IsNotifying(SelectedItemProperty))
+                    SetAndRaise(SelectedItemProperty, (val, notifyWrapper) =>
                     {
                         var old = SelectedItem;
-                        var index = IndexOf(Items, value);
-                        var effective = index != -1 ? value : null;
+                        var index = IndexOf(Items, val);
+                        var effective = index != -1 ? val : null;
 
                         if (!object.Equals(effective, old))
                         {
                             _selectedItem = effective;
-                            using (directDelayedSetter.MarkNotifying(SelectedItemProperty))
-                            {
-                                RaisePropertyChanged(SelectedItemProperty, old, effective, BindingPriority.LocalValue);
-                            }
+
+                            notifyWrapper(() => RaisePropertyChanged(SelectedItemProperty, old, effective, BindingPriority.LocalValue));
 
                             SelectedIndex = index;
 
@@ -213,17 +214,8 @@ namespace Avalonia.Controls.Primitives
                             {
                                 SelectedItems.Clear();
                             }
-
-                            if (directDelayedSetter.HasPendingSet(SelectedItemProperty))
-                            {
-                                SelectedItem = directDelayedSetter.GetFirstPendingSet(SelectedItemProperty);
-                            }
-                        } 
-                    }
-                    else
-                    {
-                        directDelayedSetter.AddPendingSet(SelectedItemProperty, value);
-                    }
+                        }
+                    }, value, val => SelectedItem = val);
                 }
                 else
                 {
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
index 0e67581760..062ace2648 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
@@ -151,7 +151,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             //here in real life stack overflow exception is thrown issue #855 and #824
             target.Value = 51.001;
 
-            Assert.Equal(2, viewModel.SetterInvokedCount);
+            Assert.Equal(3, viewModel.SetterInvokedCount);
 
             double expected = 51;
 

From d91b8f8f84a870949a8247e93db610c1f7be696d Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Mon, 23 Oct 2017 13:31:01 -0400
Subject: [PATCH 138/482] Adds a Calendar control ported from Silverlight

---
 samples/ControlCatalog/ControlCatalog.csproj  |    6 +
 samples/ControlCatalog/MainView.xaml          |    1 +
 .../ControlCatalog/Pages/CalendarPage.xaml    |   47 +
 .../ControlCatalog/Pages/CalendarPage.xaml.cs |   28 +
 src/Avalonia.Controls/Calendar/Calendar.cs    | 2129 +++++++++++++++++
 .../CalendarBlackoutDatesCollection.cs        |  223 ++
 .../Calendar/CalendarButton.cs                |  193 ++
 .../Calendar/CalendarDateRange.cs             |   79 +
 .../Calendar/CalendarDayButton.cs             |  253 ++
 .../Calendar/CalendarExtensions.cs            |   78 +
 .../Calendar/CalendarItem.cs                  | 1263 ++++++++++
 .../Calendar/DateTimeHelper.cs                |  155 ++
 .../Calendar/SelectedDatesCollection.cs       |  377 +++
 src/Avalonia.Themes.Default/Calendar.xaml     |   30 +
 .../CalendarButton.xaml                       |   80 +
 .../CalendarDayButton.xaml                    |  116 +
 src/Avalonia.Themes.Default/CalendarItem.xaml |  209 ++
 src/Avalonia.Themes.Default/DefaultTheme.xaml |    4 +
 18 files changed, 5271 insertions(+)
 create mode 100644 samples/ControlCatalog/Pages/CalendarPage.xaml
 create mode 100644 samples/ControlCatalog/Pages/CalendarPage.xaml.cs
 create mode 100644 src/Avalonia.Controls/Calendar/Calendar.cs
 create mode 100644 src/Avalonia.Controls/Calendar/CalendarBlackoutDatesCollection.cs
 create mode 100644 src/Avalonia.Controls/Calendar/CalendarButton.cs
 create mode 100644 src/Avalonia.Controls/Calendar/CalendarDateRange.cs
 create mode 100644 src/Avalonia.Controls/Calendar/CalendarDayButton.cs
 create mode 100644 src/Avalonia.Controls/Calendar/CalendarExtensions.cs
 create mode 100644 src/Avalonia.Controls/Calendar/CalendarItem.cs
 create mode 100644 src/Avalonia.Controls/Calendar/DateTimeHelper.cs
 create mode 100644 src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs
 create mode 100644 src/Avalonia.Themes.Default/Calendar.xaml
 create mode 100644 src/Avalonia.Themes.Default/CalendarButton.xaml
 create mode 100644 src/Avalonia.Themes.Default/CalendarDayButton.xaml
 create mode 100644 src/Avalonia.Themes.Default/CalendarItem.xaml

diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 11ff531514..0b4463ddb7 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -44,6 +44,9 @@
     <EmbeddedResource Include="Pages\ButtonPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Pages\CalendarPage.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Pages\CanvasPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -107,6 +110,9 @@
     <Compile Include="Pages\ButtonPage.xaml.cs">
       <DependentUpon>ButtonPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\CalendarPage.xaml.cs">
+      <DependentUpon>CalendarPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\CanvasPage.xaml.cs">
       <DependentUpon>CanvasPage.xaml</DependentUpon>
     </Compile>
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 0940316ce9..311a61a6dc 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -7,6 +7,7 @@
     </TabControl.Transition>
     <TabItem Header="Border"><pages:BorderPage/></TabItem>
     <TabItem Header="Button"><pages:ButtonPage/></TabItem>
+    <TabItem Header="Calendar"><pages:CalendarPage/></TabItem>
     <TabItem Header="Canvas"><pages:CanvasPage/></TabItem>
     <TabItem Header="Carousel"><pages:CarouselPage/></TabItem>
     <TabItem Header="CheckBox"><pages:CheckBoxPage/></TabItem>
diff --git a/samples/ControlCatalog/Pages/CalendarPage.xaml b/samples/ControlCatalog/Pages/CalendarPage.xaml
new file mode 100644
index 0000000000..a433fd1add
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CalendarPage.xaml
@@ -0,0 +1,47 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <StackPanel Orientation="Vertical" Gap="4">
+    <TextBlock Classes="h1">Calendar</TextBlock>
+    <TextBlock Classes="h2">A calendar control for selecting dates</TextBlock>
+        
+    <StackPanel Orientation="Horizontal"
+                Margin="0,16,0,0"
+                HorizontalAlignment="Center"
+                Gap="16">
+      <StackPanel Orientation="Vertical">
+        <TextBlock Text="SelectionMode: None"/>
+        <Calendar SelectionMode="None"
+                  Margin="0,0,0,8"/>
+
+        <TextBlock Text="SelectionMode: SingleDate"/>
+        <Calendar SelectionMode="SingleDate"
+                  Margin="0,0,0,8"/>
+
+        <TextBlock Text="Disabled"/>
+        <Calendar IsEnabled="False"
+                  SelectionMode="SingleDate"/>
+      </StackPanel>
+
+      <StackPanel Orientation="Vertical">
+        <TextBlock Text="SelectionMode: SingleRange"/>
+        <Calendar SelectionMode="SingleRange"
+                  Margin="0,0,0,8"/>
+
+        <TextBlock Text="SelectionMode: MultipleRange"/>
+        <Calendar SelectionMode="MultipleRange"/>
+      </StackPanel>
+
+      <StackPanel Orientation="Vertical">
+        <TextBlock Text="DisplayDates"/>
+        <Calendar Name="DisplayDatesCalendar"
+                  SelectionMode="SingleDate"
+                  Margin="0,0,0,8"/>
+
+        <TextBlock Text="BlackoutDates"/>
+        <Calendar Name="BlackoutDatesCalendar"
+                  SelectionMode="SingleDate" />
+      </StackPanel>
+      
+    </StackPanel> 
+  </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/CalendarPage.xaml.cs b/samples/ControlCatalog/Pages/CalendarPage.xaml.cs
new file mode 100644
index 0000000000..e3e9a3444e
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CalendarPage.xaml.cs
@@ -0,0 +1,28 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using System;
+
+namespace ControlCatalog.Pages
+{
+    public class CalendarPage : UserControl
+    {
+        public CalendarPage()
+        {
+            this.InitializeComponent();
+
+            var today = DateTime.Today; 
+            var cal1 = this.FindControl<Calendar>("DisplayDatesCalendar");
+            cal1.DisplayDateStart = today.AddDays(-25);
+            cal1.DisplayDateEnd = today.AddDays(25);
+
+            var cal2 = this.FindControl<Calendar>("BlackoutDatesCalendar");
+            cal2.BlackoutDates.AddDatesInPast();
+            cal2.BlackoutDates.Add(new CalendarDateRange(today.AddDays(6)));
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Calendar/Calendar.cs b/src/Avalonia.Controls/Calendar/Calendar.cs
new file mode 100644
index 0000000000..236ac48630
--- /dev/null
+++ b/src/Avalonia.Controls/Calendar/Calendar.cs
@@ -0,0 +1,2129 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using System;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Specifies values for the different modes of operation of a
+    /// <see cref="T:Avalonia.Controls.Calendar" />.
+    /// </summary>
+    public enum CalendarMode
+    {
+        /// <summary>
+        /// The <see cref="T:Avalonia.Controls.Calendar" /> displays a
+        /// month at a time.
+        /// </summary>
+        Month = 0,
+
+        /// <summary>
+        /// The <see cref="T:Avalonia.Controls.Calendar" /> displays a
+        /// year at a time.
+        /// </summary>
+        Year = 1,
+
+        /// <summary>
+        /// The <see cref="T:Avalonia.Controls.Calendar" /> displays a
+        /// decade at a time.
+        /// </summary>
+        Decade = 2,
+    }
+
+    /// <summary>
+    /// Specifies values that describe the available selection modes for a
+    /// <see cref="T:Avalonia.Controls.Calendar" />.
+    /// </summary>
+    /// <remarks>
+    /// This enumeration provides the values that are used by the SelectionMode
+    /// property.
+    /// </remarks>
+    public enum CalendarSelectionMode
+    {
+        /// <summary>
+        /// Only a single date can be selected. Use the
+        /// <see cref="P:Avalonia.Controls.Calendar.SelectedDate" />
+        /// property to retrieve the selected date.
+        /// </summary>
+        SingleDate = 0,
+
+        /// <summary>
+        /// A single range of dates can be selected. Use 
+        /// <see cref="P:Avalonia.Controls.Calendar.SelectedDates" />
+        /// property to retrieve the selected dates.
+        /// </summary>
+        SingleRange = 1,
+
+        /// <summary>
+        /// Multiple non-contiguous ranges of dates can be selected. Use the
+        /// <see cref="P:Avalonia.Controls.Calendar.SelectedDates" />
+        /// property to retrieve the selected dates.
+        /// </summary>
+        MultipleRange = 2,
+
+        /// <summary>
+        /// No selections are allowed.
+        /// </summary>
+        None = 3,
+    }
+
+    /// <summary>
+    /// Provides data for the
+    /// <see cref="E:Avalonia.Controls.Calendar.DisplayDateChanged" />
+    /// event.
+    /// </summary>
+    public class CalendarDateChangedEventArgs : RoutedEventArgs
+    {
+        /// <summary>
+        /// Gets the date that was previously displayed.
+        /// </summary>
+        /// <value>
+        /// The date previously displayed.
+        /// </value>
+        public DateTime? RemovedDate { get; private set; }
+
+        /// <summary>
+        /// Gets the date to be newly displayed.
+        /// </summary>
+        /// <value>The new date to display.</value>
+        public DateTime? AddedDate { get; private set; }
+
+        /// <summary>
+        /// Initializes a new instance of the CalendarDateChangedEventArgs
+        /// class.
+        /// </summary>
+        /// <param name="removedDate">
+        /// The date that was previously displayed.
+        /// </param>
+        /// <param name="addedDate">The date to be newly displayed.</param>
+        internal CalendarDateChangedEventArgs(DateTime? removedDate, DateTime? addedDate)
+        {
+            RemovedDate = removedDate;
+            AddedDate = addedDate;
+        }
+    }
+
+    /// <summary>
+    /// Provides data for the
+    /// <see cref="E:Avalonia.Controls.Calendar.DisplayModeChanged" />
+    /// event.
+    /// </summary>
+    /// <QualityBand>Mature</QualityBand>
+    public class CalendarModeChangedEventArgs : RoutedEventArgs
+    {
+        /// <summary>
+        /// Gets the previous mode of the
+        /// <see cref="T:Avalonia.Controls.Calendar" />.
+        /// </summary>
+        /// <value>
+        /// A <see cref="T:Avalonia.Controls.CalendarMode" /> representing
+        /// the previous mode.
+        /// </value>
+        public CalendarMode OldMode { get; private set; }
+
+        /// <summary>
+        /// Gets the new mode of the
+        /// <see cref="T:Avalonia.Controls.Calendar" />.
+        /// </summary>
+        /// <value>
+        /// A <see cref="T:Avalonia.Controls.CalendarMode" /> 
+        /// the new mode.
+        /// </value>
+        public CalendarMode NewMode { get; private set; }
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.CalendarModeChangedEventArgs" />
+        /// class.
+        /// </summary>
+        /// <param name="oldMode">The previous mode.</param>
+        /// <param name="newMode">The new mode.</param>
+        public CalendarModeChangedEventArgs(CalendarMode oldMode, CalendarMode newMode)
+        {
+            OldMode = oldMode;
+            NewMode = newMode;
+        }
+    }
+
+    /// <summary>
+    /// Represents a control that enables a user to select a date by using a
+    /// visual calendar display.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// A Calendar control can be used on its own, or as a drop-down part of a
+    /// DatePicker control. For more information, see DatePicker.  A Calendar
+    /// displays either the days of a month, the months of a year, or the years
+    /// of a decade, depending on the value of the DisplayMode property.  When
+    /// displaying the days of a month, the user can select a date, a range of
+    /// dates, or multiple ranges of dates.  The kinds of selections that are
+    /// allowed are controlled by the SelectionMode property.
+    /// </para>
+    /// <para>
+    /// The range of dates displayed is governed by the DisplayDateStart and
+    /// DisplayDateEnd properties.  If DisplayMode is Year or Decade, only
+    /// months or years that contain displayable dates will be displayed.
+    /// Setting the displayable range to a range that does not include the
+    /// current DisplayDate will throw an ArgumentOutOfRangeException.
+    /// </para>
+    /// <para>
+    /// The BlackoutDates property can be used to specify dates that cannot be
+    /// selected. These dates will be displayed as dimmed and disabled.
+    /// </para>
+    /// <para>
+    /// By default, Today is highlighted.  This can be disabled by setting
+    /// IsTodayHighlighted to false.
+    /// </para>
+    /// <para>
+    /// The Calendar control provides basic navigation using either the mouse or
+    /// keyboard. The following table summarizes keyboard navigation.
+    /// 
+    ///     Key Combination     DisplayMode     Action
+    ///     ARROW               Any             Change focused date, unselect
+    ///                                         all selected dates, and select
+    ///                                         new focused date.
+    ///                                         
+    ///     SHIFT+ARROW         Any             If SelectionMode is not set to
+    ///                                         SingleDate or None begin
+    ///                                         selecting a range of dates.
+    ///                                         
+    ///     CTRL+UP ARROW       Any             Switch to the next larger
+    ///                                         DisplayMode.  If DisplayMode is
+    ///                                         already Decade, no action.
+    ///                                         
+    ///     CTRL+DOWN ARROW     Any             Switch to the next smaller
+    ///                                         DisplayMode.  If DisplayMode is
+    ///                                         already Month, no action.
+    ///                                         
+    ///     SPACEBAR            Month           Select focused date.
+    ///     
+    ///     SPACEBAR            Year or Decade  Switch DisplayMode to the Month
+    ///                                         or Year represented by focused
+    ///                                         item.
+    /// </para>
+    /// <para>
+    /// XAML Usage for Classes Derived from Calendar
+    /// If you define a class that derives from Calendar, the class can be used
+    /// as an object element in XAML, and all of the inherited properties and
+    /// events that show a XAML usage in the reference for the Calendar members
+    /// can have the same XAML usage for the derived class. However, the object
+    /// element itself must have a different prefix mapping than the controls:
+    /// mapping shown in the usages, because the derived class comes from an
+    /// assembly and namespace that you create and define.  You must define your
+    /// own prefix mapping to an XML namespace to use the class as an object
+    /// element in XAML.
+    /// </para>
+    /// </remarks>
+    public class Calendar : TemplatedControl
+    {
+        internal const int RowsPerMonth = 7;
+        internal const int ColumnsPerMonth = 7;
+        internal const int RowsPerYear = 3;
+        internal const int ColumnsPerYear = 4;
+
+        private DateTime? _selectedDate;
+        private DateTime _selectedMonth;
+        private DateTime _selectedYear;
+
+        private DateTime _displayDate = DateTime.Today;
+        private DateTime? _displayDateStart = null;
+        private DateTime? _displayDateEnd = null;
+
+        private bool _isShiftPressed;
+
+        internal CalendarDayButton FocusButton { get; set; }
+        internal CalendarButton FocusCalendarButton { get; set; }
+
+        internal Panel Root { get; set; }
+        internal CalendarItem MonthControl
+        {
+            get
+            {
+
+                if (Root != null && Root.Children.Count > 0)
+                {
+                    return Root.Children[0] as CalendarItem;
+                }
+                return null;
+            }
+        }
+
+        public static readonly StyledProperty<DayOfWeek> FirstDayOfWeekProperty =
+            AvaloniaProperty.Register<Calendar, DayOfWeek>(
+                    nameof(FirstDayOfWeek),
+                    defaultValue: DateTimeHelper.GetCurrentDateFormat().FirstDayOfWeek);
+        /// <summary>
+        /// Gets or sets the day that is considered the beginning of the week.
+        /// </summary>
+        /// <value>
+        /// A <see cref="T:System.DayOfWeek" /> representing the beginning of
+        /// the week. The default is <see cref="F:System.DayOfWeek.Sunday" />.
+        /// </value>
+        public DayOfWeek FirstDayOfWeek
+        {
+            get { return GetValue(FirstDayOfWeekProperty); }
+            set { SetValue(FirstDayOfWeekProperty, value); }
+        }
+        /// <summary>
+        /// FirstDayOfWeekProperty property changed handler.
+        /// </summary>
+        /// <param name="e">The DependencyPropertyChangedEventArgs.</param>
+        private void OnFirstDayOfWeekChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+
+            if (IsValidFirstDayOfWeek(e.NewValue))
+            {
+                UpdateMonths();
+            }
+            else
+            {
+                throw new ArgumentOutOfRangeException("d", "Invalid DayOfWeek");
+            }
+        }
+        /// <summary>
+        /// Inherited code: Requires comment.
+        /// </summary>
+        /// <param name="value">Inherited code: Requires comment 1.</param>
+        /// <returns>Inherited code: Requires comment 2.</returns>
+        private static bool IsValidFirstDayOfWeek(object value)
+        {
+            DayOfWeek day = (DayOfWeek)value;
+
+            return day == DayOfWeek.Sunday
+                || day == DayOfWeek.Monday
+                || day == DayOfWeek.Tuesday
+                || day == DayOfWeek.Wednesday
+                || day == DayOfWeek.Thursday
+                || day == DayOfWeek.Friday
+                || day == DayOfWeek.Saturday;
+        }
+
+        public static readonly StyledProperty<bool> IsTodayHighlightedProperty =
+            AvaloniaProperty.Register<Calendar, bool>(
+                nameof(IsTodayHighlighted),
+                defaultValue: true);
+        /// <summary>
+        /// Gets or sets a value indicating whether the current date is
+        /// highlighted.
+        /// </summary>
+        /// <value>
+        /// True if the current date is highlighted; otherwise, false. The
+        /// default is true.
+        /// </value>
+        public bool IsTodayHighlighted
+        {
+            get { return GetValue(IsTodayHighlightedProperty); }
+            set { SetValue(IsTodayHighlightedProperty, value); }
+        }
+        /// <summary>
+        /// IsTodayHighlightedProperty property changed handler.
+        /// </summary>
+        /// <param name="e">The DependencyPropertyChangedEventArgs.</param>
+        private void OnIsTodayHighlightedChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (DisplayDate != null)
+            {
+                int i = DateTimeHelper.CompareYearMonth(DisplayDateInternal, DateTime.Today);
+
+                if (i > -2 && i < 2)
+                {
+                    UpdateMonths();
+                }
+            }
+        }
+
+        public static readonly StyledProperty<IBrush> HeaderBackgroundProperty =
+            AvaloniaProperty.Register<Calendar, IBrush>(nameof(HeaderBackground));
+        public IBrush HeaderBackground
+        {
+            get { return GetValue(HeaderBackgroundProperty); }
+            set { SetValue(HeaderBackgroundProperty, value); }
+        }
+
+        public static readonly StyledProperty<CalendarMode> DisplayModeProperty =
+            AvaloniaProperty.Register<Calendar, CalendarMode>(nameof(DisplayMode));
+        /// <summary>
+        /// Gets or sets a value indicating whether the calendar is displayed in
+        /// months, years, or decades.
+        /// </summary>
+        /// <value>
+        /// A value indicating what length of time the
+        /// <see cref="T:System.Windows.Controls.Calendar" /> should display.
+        /// </value>
+        public CalendarMode DisplayMode
+        {
+            get { return GetValue(DisplayModeProperty); }
+            set { SetValue(DisplayModeProperty, value); }
+        }
+        /// <summary>
+        /// DisplayModeProperty property changed handler.
+        /// </summary>
+        /// <param name="e">The DependencyPropertyChangedEventArgs.</param>
+        private void OnDisplayModePropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            CalendarMode mode = (CalendarMode)e.NewValue;
+            CalendarMode oldMode = (CalendarMode)e.OldValue;
+            CalendarItem monthControl = MonthControl;
+
+            if (!this.IsHandlerSuspended(Calendar.DisplayModeProperty))
+            {
+                if (IsValidDisplayMode(mode))
+                {
+                    if (monthControl != null)
+                    {
+                        switch (oldMode)
+                        {
+                            case CalendarMode.Month:
+                                {
+                                    SelectedYear = DisplayDateInternal;
+                                    SelectedMonth = DisplayDateInternal;
+                                    break;
+                                }
+                            case CalendarMode.Year:
+                                {
+                                    DisplayDate = SelectedMonth;
+                                    SelectedYear = SelectedMonth;
+                                    break;
+                                }
+                            case CalendarMode.Decade:
+                                {
+                                    DisplayDate = SelectedYear;
+                                    SelectedMonth = SelectedYear;
+                                    break;
+                                }
+                        }
+
+                        switch (mode)
+                        {
+                            case CalendarMode.Month:
+                                {
+                                    OnMonthClick();
+                                    break;
+                                }
+                            case CalendarMode.Year:
+                            case CalendarMode.Decade:
+                                {
+                                    OnHeaderClick();
+                                    break;
+                                }
+                        }
+                    }
+                    OnDisplayModeChanged(new CalendarModeChangedEventArgs((CalendarMode)e.OldValue, mode));
+                }
+                else
+                {
+                    this.SetValueNoCallback(Calendar.DisplayModeProperty, (CalendarMode)e.OldValue);
+                    throw new ArgumentOutOfRangeException("d", "Invalid DisplayMode");
+                }
+            }
+        }
+        /// <summary>
+        /// Inherited code: Requires comment.
+        /// </summary>
+        /// <param name="mode">Inherited code: Requires comment 1.</param>
+        /// <returns>Inherited code: Requires comment 2.</returns>
+        private static bool IsValidDisplayMode(CalendarMode mode)
+        {
+            return mode == CalendarMode.Month
+                || mode == CalendarMode.Year
+                || mode == CalendarMode.Decade;
+        }
+        private void OnDisplayModeChanged(CalendarModeChangedEventArgs args)
+        {
+            DisplayModeChanged?.Invoke(this, args);
+        }
+
+        public static readonly StyledProperty<CalendarSelectionMode> SelectionModeProperty =
+            AvaloniaProperty.Register<Calendar, CalendarSelectionMode>(
+                nameof(SelectionMode),
+                defaultValue: CalendarSelectionMode.SingleDate);
+        /// <summary>
+        /// Gets or sets a value that indicates what kind of selections are
+        /// allowed.
+        /// </summary>
+        /// <value>
+        /// A value that indicates the current selection mode. The default is
+        /// <see cref="F:System.Windows.Controls.CalendarSelectionMode.SingleDate" />.
+        /// </value>
+        /// <remarks>
+        /// <para>
+        /// This property determines whether the Calendar allows no selection,
+        /// selection of a single date, or selection of multiple dates.  The
+        /// selection mode is specified with the CalendarSelectionMode
+        /// enumeration.
+        /// </para>
+        /// <para>
+        /// When this property is changed, all selected dates will be cleared.
+        /// </para>
+        /// </remarks>
+        public CalendarSelectionMode SelectionMode
+        {
+            get { return GetValue(SelectionModeProperty); }
+            set { SetValue(SelectionModeProperty, value); }
+        }
+        private void OnSelectionModeChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (IsValidSelectionMode(e.NewValue))
+            {
+                this.SetValueNoCallback(Calendar.SelectedDateProperty, null);
+                SelectedDates.Clear();
+            }
+            else
+            {
+                throw new ArgumentOutOfRangeException("d", "Invalid SelectionMode");
+            }
+        }
+        /// <summary>
+        /// Inherited code: Requires comment.
+        /// </summary>
+        /// <param name="value">Inherited code: Requires comment 1.</param>
+        /// <returns>Inherited code: Requires comment 2.</returns>
+        private static bool IsValidSelectionMode(object value)
+        {
+            CalendarSelectionMode mode = (CalendarSelectionMode)value;
+
+            return mode == CalendarSelectionMode.SingleDate
+                || mode == CalendarSelectionMode.SingleRange
+                || mode == CalendarSelectionMode.MultipleRange
+                || mode == CalendarSelectionMode.None;
+        }
+
+        public static readonly DirectProperty<Calendar, DateTime?> SelectedDateProperty =
+            AvaloniaProperty.RegisterDirect<Calendar, DateTime?>(
+                nameof(SelectedDate),
+                o => o.SelectedDate,
+                (o, v) => o.SelectedDate = v,
+                defaultBindingMode: BindingMode.TwoWay);
+        /// <summary>
+        /// Gets or sets the currently selected date.
+        /// </summary>
+        /// <value>The date currently selected. The default is null.</value>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">
+        /// The given date is outside the range specified by
+        /// <see cref="P:System.Windows.Controls.Calendar.DisplayDateStart" />
+        /// and <see cref="P:System.Windows.Controls.Calendar.DisplayDateEnd" />
+        /// -or-
+        /// The given date is in the
+        /// <see cref="P:System.Windows.Controls.Calendar.BlackoutDates" />
+        /// collection.
+        /// </exception>
+        /// <exception cref="T:System.InvalidOperationException">
+        /// If set to anything other than null when
+        /// <see cref="P:System.Windows.Controls.Calendar.SelectionMode" /> is
+        /// set to
+        /// <see cref="F:System.Windows.Controls.CalendarSelectionMode.None" />.
+        /// </exception>
+        /// <remarks>
+        /// Use this property when SelectionMode is set to SingleDate.  In other
+        /// modes, this property will always be the first date in SelectedDates.
+        /// </remarks>
+        public DateTime? SelectedDate
+        {
+            get { return _selectedDate; }
+            set { SetAndRaise(SelectedDateProperty, ref _selectedDate, value); }
+        }
+        private void OnSelectedDateChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (!this.IsHandlerSuspended(Calendar.SelectedDateProperty))
+            {
+                if (SelectionMode != CalendarSelectionMode.None)
+                {
+                    DateTime? addedDate;
+
+                    addedDate = (DateTime?)e.NewValue;
+
+                    if (IsValidDateSelection(this, addedDate))
+                    {
+                        if (addedDate == null)
+                        {
+                            SelectedDates.Clear();
+                        }
+                        else
+                        {
+                            if (addedDate.HasValue && !(SelectedDates.Count > 0 && SelectedDates[0] == addedDate.Value))
+                            {
+                                foreach (DateTime item in SelectedDates)
+                                {
+                                    RemovedItems.Add(item);
+                                }
+                                SelectedDates.ClearInternal();
+                                // the value is added as a range so that the
+                                // SelectedDatesChanged event can be thrown with
+                                // all the removed items
+                                SelectedDates.AddRange(addedDate.Value, addedDate.Value);
+                            }
+                        }
+
+                        // We update the LastSelectedDate for only the Single
+                        // mode.  For the other modes it automatically gets
+                        // updated when the HoverEnd is updated.
+                        if (SelectionMode == CalendarSelectionMode.SingleDate)
+                        {
+                            LastSelectedDate = addedDate;
+                        }
+                    }
+                    else
+                    {
+                        throw new ArgumentOutOfRangeException("d", "SelectedDate value is not valid.");
+                    }
+                }
+                else
+                {
+                    throw new InvalidOperationException("The SelectedDate property cannot be set when the selection mode is None.");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of selected dates.
+        /// </summary>
+        /// <value>
+        /// A <see cref="T:System.Windows.Controls.SelectedDatesCollection" />
+        /// object that contains the currently selected dates. The default is an
+        /// empty collection.
+        /// </value>
+        /// <remarks>
+        /// Dates can be added to the collection either individually or in a
+        /// range using the AddRange method.  Depending on the value of the
+        /// SelectionMode property, adding a date or range to the collection may
+        /// cause it to be cleared.  The following table lists how
+        /// CalendarSelectionMode affects the SelectedDates property.
+        /// 
+        ///     CalendarSelectionMode   Description
+        ///     None                    No selections are allowed.  SelectedDate
+        ///                             cannot be set and no values can be added
+        ///                             to SelectedDates.
+        ///                             
+        ///     SingleDate              Only a single date can be selected,
+        ///                             either by setting SelectedDate or the
+        ///                             first value in SelectedDates.  AddRange
+        ///                             cannot be used.
+        ///                             
+        ///     SingleRange             A single range of dates can be selected.
+        ///                             Setting SelectedDate, adding a date
+        ///                             individually to SelectedDates, or using
+        ///                             AddRange will clear all previous values
+        ///                             from SelectedDates.
+        ///     MultipleRange           Multiple non-contiguous ranges of dates
+        ///                             can be selected. Adding a date
+        ///                             individually to SelectedDates or using
+        ///                             AddRange will not clear SelectedDates.
+        ///                             Setting SelectedDate will still clear
+        ///                             SelectedDates, but additional dates or
+        ///                             range can then be added.  Adding a range
+        ///                             that includes some dates that are
+        ///                             already selected or overlaps with
+        ///                             another range results in the union of
+        ///                             the ranges and does not cause an
+        ///                             exception.
+        /// </remarks>
+        public SelectedDatesCollection SelectedDates { get; private set; }
+        private static bool IsSelectionChanged(SelectionChangedEventArgs e)
+        {
+            if (e.AddedItems.Count != e.RemovedItems.Count)
+            {
+                return true;
+            }
+            foreach (DateTime addedDate in e.AddedItems)
+            {
+                if (!e.RemovedItems.Contains(addedDate))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        internal void OnSelectedDatesCollectionChanged(SelectionChangedEventArgs e)
+        {
+            if (IsSelectionChanged(e))
+            {
+                e.RoutedEvent = SelectingItemsControl.SelectionChangedEvent;
+                e.Source = this;
+                SelectedDatesChanged?.Invoke(this, e);
+            }
+        }
+        
+        internal Collection<DateTime> RemovedItems { get; set; }
+        internal DateTime? LastSelectedDateInternal { get; set; }
+        internal DateTime? LastSelectedDate
+        {
+            get { return LastSelectedDateInternal; }
+            set
+            {
+                LastSelectedDateInternal = value;
+
+                if (SelectionMode == CalendarSelectionMode.None)
+                {
+                    if (FocusButton != null)
+                    {
+                        FocusButton.IsCurrent = false;
+                    }
+                    FocusButton = FindDayButtonFromDay(LastSelectedDate.Value);
+                    if (FocusButton != null)
+                    {
+                        FocusButton.IsCurrent = HasFocusInternal;
+                    }
+                }
+            }
+        }
+
+        internal DateTime SelectedMonth
+        {
+            get { return _selectedMonth; }
+            set
+            {
+                int monthDifferenceStart = DateTimeHelper.CompareYearMonth(value, DisplayDateRangeStart);
+                int monthDifferenceEnd = DateTimeHelper.CompareYearMonth(value, DisplayDateRangeEnd);
+
+                if (monthDifferenceStart >= 0 && monthDifferenceEnd <= 0)
+                {
+                    _selectedMonth = DateTimeHelper.DiscardDayTime(value);
+                }
+                else
+                {
+                    if (monthDifferenceStart < 0)
+                    {
+                        _selectedMonth = DateTimeHelper.DiscardDayTime(DisplayDateRangeStart);
+                    }
+                    else
+                    {
+                        Debug.Assert(monthDifferenceEnd > 0, "monthDifferenceEnd should be greater than 0!");
+                        _selectedMonth = DateTimeHelper.DiscardDayTime(DisplayDateRangeEnd);
+                    }
+                }
+            }
+        }
+        internal DateTime SelectedYear
+        {
+            get { return _selectedYear; }
+            set
+            {
+                if (value.Year < DisplayDateRangeStart.Year)
+                {
+                    _selectedYear = DisplayDateRangeStart;
+                }
+                else
+                {
+                    if (value.Year > DisplayDateRangeEnd.Year)
+                    {
+                        _selectedYear = DisplayDateRangeEnd;
+                    }
+                    else
+                    {
+                        _selectedYear = value;
+                    }
+                }
+            }
+        }
+
+        public static readonly DirectProperty<Calendar, DateTime> DisplayDateProperty =
+            AvaloniaProperty.RegisterDirect<Calendar, DateTime>(
+                nameof(DisplayDate),
+                o => o.DisplayDate,
+                (o, v) => o.DisplayDate = v,
+                defaultBindingMode: BindingMode.TwoWay);
+        /// <summary>
+        /// Gets or sets the date to display.
+        /// </summary>
+        /// <value>The date to display.</value>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">
+        /// The given date is not in the range specified by
+        /// <see cref="P:System.Windows.Controls.Calendar.DisplayDateStart" />
+        /// and
+        /// <see cref="P:System.Windows.Controls.Calendar.DisplayDateEnd" />.
+        /// </exception>
+        /// <remarks>
+        /// <para>
+        /// This property allows the developer to specify a date to display.  If
+        /// this property is a null reference (Nothing in Visual Basic),
+        /// SelectedDate is displayed.  If SelectedDate is also a null reference
+        /// (Nothing in Visual Basic), Today is displayed.  The default is
+        /// Today.
+        /// </para>
+        /// <para>
+        /// To set this property in XAML, use a date specified in the format
+        /// yyyy/mm/dd.  The mm and dd components must always consist of two
+        /// characters, with a leading zero if necessary.  For instance, the
+        /// month of May should be specified as 05.
+        /// </para>
+        /// </remarks>
+        public DateTime DisplayDate
+        {
+            get { return _displayDate; }
+            set { SetAndRaise(DisplayDateProperty, ref _displayDate, value); }
+        }
+        internal DateTime DisplayDateInternal { get; private set; }
+
+        private void OnDisplayDateChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            UpdateDisplayDate(this, (DateTime)e.NewValue, (DateTime)e.OldValue);
+        }
+        private static void UpdateDisplayDate(Calendar c, DateTime addedDate, DateTime removedDate)
+        {
+            Debug.Assert(c != null, "c should not be null!");
+
+            // If DisplayDate < DisplayDateStart, DisplayDate = DisplayDateStart
+            if (DateTime.Compare(addedDate, c.DisplayDateRangeStart) < 0)
+            {
+                c.DisplayDate = c.DisplayDateRangeStart;
+                return;
+            }
+
+            // If DisplayDate > DisplayDateEnd, DisplayDate = DisplayDateEnd
+            if (DateTime.Compare(addedDate, c.DisplayDateRangeEnd) > 0)
+            {
+                c.DisplayDate = c.DisplayDateRangeEnd;
+                return;
+            }
+
+            c.DisplayDateInternal = DateTimeHelper.DiscardDayTime(addedDate);
+            c.UpdateMonths();
+            c.OnDisplayDate(new CalendarDateChangedEventArgs(removedDate, addedDate));
+        }
+        private void OnDisplayDate(CalendarDateChangedEventArgs e)
+        {
+            DisplayDateChanged?.Invoke(this, e);
+        }
+
+        public static readonly DirectProperty<Calendar, DateTime?> DisplayDateStartProperty =
+            AvaloniaProperty.RegisterDirect<Calendar, DateTime?>(
+                nameof(DisplayDateStart),
+                o => o.DisplayDateStart,
+                (o, v) => o.DisplayDateStart = v,
+                defaultBindingMode: BindingMode.TwoWay);
+        /// <summary>
+        /// Gets or sets the first date to be displayed.
+        /// </summary>
+        /// <value>The first date to display.</value>
+        /// <remarks>
+        /// To set this property in XAML, use a date specified in the format
+        /// yyyy/mm/dd.  The mm and dd components must always consist of two
+        /// characters, with a leading zero if necessary.  For instance, the
+        /// month of May should be specified as 05.
+        /// </remarks>
+        public DateTime? DisplayDateStart
+        {
+            get { return _displayDateStart; }
+            set { SetAndRaise(DisplayDateStartProperty, ref _displayDateStart, value); }
+        }
+        private void OnDisplayDateStartChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (!this.IsHandlerSuspended(Calendar.DisplayDateStartProperty))
+            {
+                DateTime? newValue = e.NewValue as DateTime?;
+
+                if (newValue.HasValue)
+                {
+                    // DisplayDateStart coerces to the value of the
+                    // SelectedDateMin if SelectedDateMin < DisplayDateStart
+                    DateTime? selectedDateMin = SelectedDateMin(this);
+
+                    if (selectedDateMin.HasValue && DateTime.Compare(selectedDateMin.Value, newValue.Value) < 0)
+                    {
+                        DisplayDateStart = selectedDateMin.Value;
+                        return;
+                    }
+
+                    // if DisplayDateStart > DisplayDateEnd,
+                    // DisplayDateEnd = DisplayDateStart
+                    if (DateTime.Compare(newValue.Value, DisplayDateRangeEnd) > 0)
+                    {
+                        DisplayDateEnd = DisplayDateStart;
+                    }
+
+                    // If DisplayDate < DisplayDateStart,
+                    // DisplayDate = DisplayDateStart
+                    if (DateTimeHelper.CompareYearMonth(newValue.Value, DisplayDateInternal) > 0)
+                    {
+                        DisplayDate = newValue.Value;
+                    }
+                }
+                UpdateMonths();
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of dates that are marked as not selectable.
+        /// </summary>
+        /// <value>
+        /// A collection of dates that cannot be selected. The default value is
+        /// an empty collection.
+        /// </value>
+        /// <exception cref="System.ArgumentOutOfRangeException">
+        /// Adding a date to this collection when it is already selected or
+        /// adding a date outside the range specified by DisplayDateStart and
+        /// DisplayDateEnd.
+        /// </exception>
+        /// <remarks>
+        /// <para>
+        /// Dates in this collection will appear as disabled on the calendar.
+        /// </para>
+        /// <para>
+        /// To make all past dates not selectable, you can use the
+        /// AddDatesInPast method provided by the collection returned by this
+        /// property.
+        /// </para>
+        /// </remarks>
+        public CalendarBlackoutDatesCollection BlackoutDates { get; private set; }
+
+        private static DateTime? SelectedDateMin(Calendar cal)
+        {
+            DateTime selectedDateMin;
+
+            if (cal.SelectedDates.Count > 0)
+            {
+                selectedDateMin = cal.SelectedDates[0];
+                Debug.Assert(DateTime.Compare(cal.SelectedDate.Value, selectedDateMin) == 0, "The SelectedDate should be the minimum selected date!");
+            }
+            else
+            {
+                return null;
+            }
+
+            foreach (DateTime selectedDate in cal.SelectedDates)
+            {
+                if (DateTime.Compare(selectedDate, selectedDateMin) < 0)
+                {
+                    selectedDateMin = selectedDate;
+                }
+            }
+            return selectedDateMin;
+        }
+        internal DateTime DisplayDateRangeStart
+        {
+            get { return DisplayDateStart.GetValueOrDefault(DateTime.MinValue); }
+        }
+
+        public static readonly DirectProperty<Calendar, DateTime?> DisplayDateEndProperty =
+            AvaloniaProperty.RegisterDirect<Calendar, DateTime?>(
+                nameof(DisplayDateEnd),
+                o => o.DisplayDateEnd,
+                (o, v) => o.DisplayDateEnd = v,
+                defaultBindingMode: BindingMode.TwoWay);
+        
+        /// <summary>
+        /// Gets or sets the last date to be displayed.
+        /// </summary>
+        /// <value>The last date to display.</value>
+        /// <remarks>
+        /// To set this property in XAML, use a date specified in the format
+        /// yyyy/mm/dd.  The mm and dd components must always consist of two
+        /// characters, with a leading zero if necessary.  For instance, the
+        /// month of May should be specified as 05.
+        /// </remarks>
+        public DateTime? DisplayDateEnd
+        {
+            get { return _displayDateEnd; }
+            set { SetAndRaise(DisplayDateEndProperty, ref _displayDateEnd, value); }
+        }
+
+        private void OnDisplayDateEndChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (!this.IsHandlerSuspended(Calendar.DisplayDateEndProperty))
+            {
+                DateTime? newValue = e.NewValue as DateTime?;
+
+                if (newValue.HasValue)
+                {
+                    // DisplayDateEnd coerces to the value of the
+                    // SelectedDateMax if SelectedDateMax > DisplayDateEnd
+                    DateTime? selectedDateMax = SelectedDateMax(this);
+
+                    if (selectedDateMax.HasValue && DateTime.Compare(selectedDateMax.Value, newValue.Value) > 0)
+                    {
+                        DisplayDateEnd = selectedDateMax.Value;
+                        return;
+                    }
+
+                    // if DisplayDateEnd < DisplayDateStart,
+                    // DisplayDateEnd = DisplayDateStart
+                    if (DateTime.Compare(newValue.Value, DisplayDateRangeStart) < 0)
+                    {
+                        DisplayDateEnd = DisplayDateStart;
+                        return;
+                    }
+
+                    // If DisplayDate > DisplayDateEnd,
+                    // DisplayDate = DisplayDateEnd
+                    if (DateTimeHelper.CompareYearMonth(newValue.Value, DisplayDateInternal) < 0)
+                    {
+                        DisplayDate = newValue.Value;
+                    }
+                }
+                UpdateMonths();
+            }
+        }
+
+        private static DateTime? SelectedDateMax(Calendar cal)
+        {
+            DateTime selectedDateMax;
+
+            if (cal.SelectedDates.Count > 0)
+            {
+                selectedDateMax = cal.SelectedDates[0];
+                Debug.Assert(DateTime.Compare(cal.SelectedDate.Value, selectedDateMax) == 0, "The SelectedDate should be the maximum SelectedDate!");
+            }
+            else
+            {
+                return null;
+            }
+
+            foreach (DateTime selectedDate in cal.SelectedDates)
+            {
+                if (DateTime.Compare(selectedDate, selectedDateMax) > 0)
+                {
+                    selectedDateMax = selectedDate;
+                }
+            }
+            return selectedDateMax;
+        }
+        internal DateTime DisplayDateRangeEnd
+        {
+            get { return DisplayDateEnd.GetValueOrDefault(DateTime.MaxValue); }
+        }
+
+        internal DateTime? HoverStart { get; set; }
+        internal int? HoverStartIndex { get; set; }
+        internal DateTime? HoverEndInternal { get; set; }
+        internal DateTime? HoverEnd
+        {
+            get { return HoverEndInternal; }
+            set
+            {
+                HoverEndInternal = value;
+                LastSelectedDate = value;
+            }
+        }
+        internal int? HoverEndIndex { get; set; }
+        internal bool HasFocusInternal { get; set; }
+        internal bool IsMouseSelection { get; set; }
+
+
+        /// <summary>
+        /// Gets or sets a value indicating whether DatePicker should change its 
+        /// DisplayDate because of a SelectedDate change on its Calendar.
+        /// </summary>
+        internal bool DatePickerDisplayDateFlag { get; set; }
+
+        internal CalendarDayButton FindDayButtonFromDay(DateTime day)
+        {
+            CalendarDayButton b;
+            DateTime? d;
+            CalendarItem monthControl = MonthControl;
+
+            // REMOVE_RTM: should be updated if we support MultiCalendar
+            int count = RowsPerMonth * ColumnsPerMonth;
+            if (monthControl != null)
+            {
+                if (monthControl.MonthView != null)
+                {
+                    for (int childIndex = ColumnsPerMonth; childIndex < count; childIndex++)
+                    {
+                        b = monthControl.MonthView.Children[childIndex] as CalendarDayButton;
+                        d = b.DataContext as DateTime?;
+
+                        if (d.HasValue)
+                        {
+                            if (DateTimeHelper.CompareDays(d.Value, day) == 0)
+                            {
+                                return b;
+                            }
+                        }
+                    }
+                }
+            }
+            return null;
+        }
+
+        private void Calendar_SizeChanged(object sender, EventArgs e)
+        {
+            Debug.Assert(sender is Calendar, "The sender should be a Calendar!");
+
+            var size = Bounds.Size;
+            RectangleGeometry rg = new RectangleGeometry();
+            rg.Rect = new Rect(0, 0, size.Width, size.Height);
+
+            if (Root != null)
+            {
+                Root.Clip = rg;
+            }
+        }
+
+        private void OnSelectedMonthChanged(DateTime? selectedMonth)
+        {
+            if (selectedMonth.HasValue)
+            {
+                Debug.Assert(DisplayMode == CalendarMode.Year, "DisplayMode should be Year!");
+                SelectedMonth = selectedMonth.Value;
+                UpdateMonths();
+            }
+        }
+        private void OnSelectedYearChanged(DateTime? selectedYear)
+        {
+            if (selectedYear.HasValue)
+            {
+                Debug.Assert(DisplayMode == CalendarMode.Decade, "DisplayMode should be Decade!");
+                SelectedYear = selectedYear.Value;
+                UpdateMonths();
+            }
+        }
+        internal void OnHeaderClick()
+        {
+            Debug.Assert(DisplayMode == CalendarMode.Year || DisplayMode == CalendarMode.Decade, "The DisplayMode should be Year or Decade");
+            CalendarItem monthControl = MonthControl;
+            if (monthControl != null && monthControl.MonthView != null && monthControl.YearView != null)
+            {
+                monthControl.MonthView.IsVisible = false;
+                monthControl.YearView.IsVisible = true;
+                UpdateMonths();
+            }
+        }
+
+        internal void ResetStates()
+        {
+            CalendarDayButton d;
+            CalendarItem monthControl = MonthControl;
+            int count = RowsPerMonth * ColumnsPerMonth;
+            if (monthControl != null)
+            {
+                if (monthControl.MonthView != null)
+                {
+                    for (int childIndex = ColumnsPerMonth; childIndex < count; childIndex++)
+                    {
+                        d = monthControl.MonthView.Children[childIndex] as CalendarDayButton;
+                        d.IgnoreMouseOverState();
+                    }
+                }
+            }
+
+        }
+
+        internal void UpdateMonths()
+        {
+            CalendarItem monthControl = MonthControl;
+            if (monthControl != null)
+            {
+                switch (DisplayMode)
+                {
+                    case CalendarMode.Month:
+                        {
+                            monthControl.UpdateMonthMode();
+                            break;
+                        }
+                    case CalendarMode.Year:
+                        {
+                            monthControl.UpdateYearMode();
+                            break;
+                        }
+                    case CalendarMode.Decade:
+                        {
+                            monthControl.UpdateDecadeMode();
+                            break;
+                        }
+                }
+            }
+        }
+
+        internal static bool IsValidDateSelection(Calendar cal, DateTime? value)
+        {
+            if (!value.HasValue)
+            {
+                return true;
+            }
+            else
+            {
+                if (cal.BlackoutDates.Contains(value.Value))
+                {
+                    return false;
+                }
+                else
+                {
+                    if (DateTime.Compare(value.Value, cal.DisplayDateRangeStart) < 0)
+                    {
+                        cal.SetValueNoCallback(Calendar.DisplayDateStartProperty, value);
+                    }
+                    else if (DateTime.Compare(value.Value, cal.DisplayDateRangeEnd) > 0)
+                    {
+                        cal.SetValueNoCallback(Calendar.DisplayDateEndProperty, value);
+                    }
+                    return true;
+                }
+            }
+        }
+        private static bool IsValidKeyboardSelection(Calendar cal, DateTime? value)
+        {
+            if (!value.HasValue)
+            {
+                return true;
+            }
+            else
+            {
+                if (cal.BlackoutDates.Contains(value.Value))
+                {
+                    return false;
+                }
+                else
+                {
+                    return (DateTime.Compare(value.Value, cal.DisplayDateRangeStart) >= 0 && DateTime.Compare(value.Value, cal.DisplayDateRangeEnd) <= 0);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This method highlights the days in MultiSelection mode without
+        /// adding them to the SelectedDates collection.
+        /// </summary>
+        internal void HighlightDays()
+        {
+            if (HoverEnd != null && HoverStart != null)
+            {
+                int startIndex, endIndex, i;
+                CalendarDayButton b;
+                DateTime? d;
+                CalendarItem monthControl = MonthControl;
+
+                // This assumes a contiguous set of dates:
+                if (HoverEndIndex != null && HoverStartIndex != null)
+                {
+                    SortHoverIndexes(out startIndex, out endIndex);
+
+                    for (i = startIndex; i <= endIndex; i++)
+                    {
+                        b = monthControl.MonthView.Children[i] as CalendarDayButton;
+                        b.IsSelected = true;
+                        d = b.DataContext as DateTime?;
+
+                        if (d.HasValue && DateTimeHelper.CompareDays(HoverEnd.Value, d.Value) == 0)
+                        {
+                            if (FocusButton != null)
+                            {
+                                FocusButton.IsCurrent = false;
+                            }
+                            b.IsCurrent = HasFocusInternal;
+                            FocusButton = b;
+                        }
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// This method un-highlights the days that were hovered over but not
+        /// added to the SelectedDates collection or un-highlighted the
+        /// previously selected days in SingleRange Mode.
+        /// </summary>
+        internal void UnHighlightDays()
+        {
+            if (HoverEnd != null && HoverStart != null)
+            {
+                CalendarItem monthControl = MonthControl;
+                CalendarDayButton b;
+                DateTime? d;
+
+                if (HoverEndIndex != null && HoverStartIndex != null)
+                {
+                    int i;
+                    SortHoverIndexes(out int startIndex, out int endIndex);
+
+                    if (SelectionMode == CalendarSelectionMode.MultipleRange)
+                    {
+                        for (i = startIndex; i <= endIndex; i++)
+                        {
+                            b = monthControl.MonthView.Children[i] as CalendarDayButton;
+                            d = b.DataContext as DateTime?;
+
+                            if (d.HasValue)
+                            {
+                                if (!SelectedDates.Contains(d.Value))
+                                {
+                                    b.IsSelected = false;
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // It is SingleRange
+                        for (i = startIndex; i <= endIndex; i++)
+                        {
+                            (monthControl.MonthView.Children[i] as CalendarDayButton).IsSelected = false;
+                        }
+                    }
+                }
+            }
+        }
+        internal void SortHoverIndexes(out int startIndex, out int endIndex)
+        {
+            if (DateTimeHelper.CompareDays(HoverEnd.Value, HoverStart.Value) > 0)
+            {
+                startIndex = HoverStartIndex.Value;
+                endIndex = HoverEndIndex.Value;
+            }
+            else
+            {
+                startIndex = HoverEndIndex.Value;
+                endIndex = HoverStartIndex.Value;
+            }
+        }
+
+        internal void OnPreviousClick()
+        {
+            if (DisplayMode == CalendarMode.Month && DisplayDate != null)
+            {
+                DateTime? d = DateTimeHelper.AddMonths(DateTimeHelper.DiscardDayTime(DisplayDate), -1);
+                if (d.HasValue)
+                {
+                    if (!LastSelectedDate.HasValue || DateTimeHelper.CompareYearMonth(LastSelectedDate.Value, d.Value) != 0)
+                    {
+                        LastSelectedDate = d.Value;
+                    }
+                    DisplayDate = d.Value;
+                }
+            }
+            else
+            {
+                if (DisplayMode == CalendarMode.Year)
+                {
+                    DateTime? d = DateTimeHelper.AddYears(new DateTime(SelectedMonth.Year, 1, 1), -1);
+
+                    if (d.HasValue)
+                    {
+                        SelectedMonth = d.Value;
+                    }
+                    else
+                    {
+                        SelectedMonth = DateTimeHelper.DiscardDayTime(DisplayDateRangeStart);
+                    }
+                }
+                else
+                {
+                    Debug.Assert(DisplayMode == CalendarMode.Decade, "DisplayMode should be Decade!");
+
+                    DateTime? d = DateTimeHelper.AddYears(new DateTime(SelectedYear.Year, 1, 1), -10);
+
+                    if (d.HasValue)
+                    {
+                        int decade = Math.Max(1, DateTimeHelper.DecadeOfDate(d.Value));
+                        SelectedYear = new DateTime(decade, 1, 1);
+                    }
+                    else
+                    {
+                        SelectedYear = DateTimeHelper.DiscardDayTime(DisplayDateRangeStart);
+                    }
+                }
+                UpdateMonths();
+            }
+        }
+        internal void OnNextClick()
+        {
+            if (DisplayMode == CalendarMode.Month && DisplayDate != null)
+            {
+                DateTime? d = DateTimeHelper.AddMonths(DateTimeHelper.DiscardDayTime(DisplayDate), 1);
+                if (d.HasValue)
+                {
+                    if (!LastSelectedDate.HasValue || DateTimeHelper.CompareYearMonth(LastSelectedDate.Value, d.Value) != 0)
+                    {
+                        LastSelectedDate = d.Value;
+                    }
+                    DisplayDate = d.Value;
+                }
+            }
+            else
+            {
+                if (DisplayMode == CalendarMode.Year)
+                {
+                    DateTime? d = DateTimeHelper.AddYears(new DateTime(SelectedMonth.Year, 1, 1), 1);
+
+                    if (d.HasValue)
+                    {
+                        SelectedMonth = d.Value;
+                    }
+                    else
+                    {
+                        SelectedMonth = DateTimeHelper.DiscardDayTime(DisplayDateRangeEnd);
+                    }
+                }
+                else
+                {
+                    Debug.Assert(DisplayMode == CalendarMode.Decade, "DisplayMode should be Decade");
+
+                    DateTime? d = DateTimeHelper.AddYears(new DateTime(SelectedYear.Year, 1, 1), 10);
+
+                    if (d.HasValue)
+                    {
+                        int decade = Math.Max(1, DateTimeHelper.DecadeOfDate(d.Value));
+                        SelectedYear = new DateTime(decade, 1, 1);
+                    }
+                    else
+                    {
+                        SelectedYear = DateTimeHelper.DiscardDayTime(DisplayDateRangeEnd);
+                    }
+                }
+                UpdateMonths();
+            }
+        }
+
+        /// <summary>
+        /// If the day is a trailing day, Update the DisplayDate.
+        /// </summary>
+        /// <param name="selectedDate">Inherited code: Requires comment.</param>
+        internal void OnDayClick(DateTime selectedDate)
+        {
+            Debug.Assert(DisplayMode == CalendarMode.Month, "DisplayMode should be Month!");
+            int i = DateTimeHelper.CompareYearMonth(selectedDate, DisplayDateInternal);
+
+            if (SelectionMode == CalendarSelectionMode.None)
+            {
+                LastSelectedDate = selectedDate;
+            }
+
+            if (i > 0)
+            {
+                OnNextClick();
+            }
+            else if (i < 0)
+            {
+                OnPreviousClick();
+            }
+        }
+        private void OnMonthClick()
+        {
+            CalendarItem monthControl = MonthControl;
+            if (monthControl != null && monthControl.YearView != null && monthControl.MonthView != null)
+            {
+                monthControl.YearView.IsVisible = false;
+                monthControl.MonthView.IsVisible = true;
+
+                if (!LastSelectedDate.HasValue || DateTimeHelper.CompareYearMonth(LastSelectedDate.Value, DisplayDate) != 0)
+                {
+                    LastSelectedDate = DisplayDate;
+                }
+
+                UpdateMonths();
+            }
+        }
+
+        public override string ToString()
+        {
+            if (SelectedDate != null)
+            {
+                return SelectedDate.Value.ToString(DateTimeHelper.GetCurrentDateFormat());
+            }
+            else
+            {
+                return string.Empty;
+            }
+        }
+
+        public event EventHandler<SelectionChangedEventArgs> SelectedDatesChanged;
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="P:System.Windows.Controls.Calendar.DisplayDate" />
+        /// property is changed.
+        /// </summary>
+        /// <remarks>
+        /// This event occurs after DisplayDate is assigned its new value.
+        /// </remarks>
+        public event EventHandler<CalendarDateChangedEventArgs> DisplayDateChanged;
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="P:System.Windows.Controls.Calendar.DisplayMode" />
+        /// property is changed.
+        /// </summary>
+        public event EventHandler<CalendarModeChangedEventArgs> DisplayModeChanged;
+
+        /// <summary>
+        /// Inherited code: Requires comment.
+        /// </summary>
+        internal event EventHandler<PointerReleasedEventArgs> DayButtonMouseUp;
+
+        /// <summary>
+        /// This method adds the days that were selected by Keyboard to the
+        /// SelectedDays Collection.
+        /// </summary>
+        private void AddSelection()
+        {
+            if (HoverEnd != null && HoverStart != null)
+            {
+                foreach (DateTime item in SelectedDates)
+                {
+                    RemovedItems.Add(item);
+                }
+
+                SelectedDates.ClearInternal();
+                // In keyboard selection, we are sure that the collection does
+                // not include any blackout days
+                SelectedDates.AddRange(HoverStart.Value, HoverEnd.Value);
+            }
+        }
+        private void ProcessSelection(bool shift, DateTime? lastSelectedDate, int? index)
+        {
+            if (SelectionMode == CalendarSelectionMode.None && lastSelectedDate != null)
+            {
+                OnDayClick(lastSelectedDate.Value);
+                return;
+            }
+            if (lastSelectedDate != null && IsValidKeyboardSelection(this, lastSelectedDate.Value))
+            {
+                if (SelectionMode == CalendarSelectionMode.SingleRange || SelectionMode == CalendarSelectionMode.MultipleRange)
+                {
+                    foreach (DateTime item in SelectedDates)
+                    {
+                        RemovedItems.Add(item);
+                    }
+                    SelectedDates.ClearInternal();
+                    if (shift)
+                    {
+                        CalendarDayButton b;
+                        _isShiftPressed = true;
+                        if (HoverStart == null)
+                        {
+                            if (LastSelectedDate != null)
+                            {
+                                HoverStart = LastSelectedDate;
+                            }
+                            else
+                            {
+                                if (DateTimeHelper.CompareYearMonth(DisplayDateInternal, DateTime.Today) == 0)
+                                {
+                                    HoverStart = DateTime.Today;
+                                }
+                                else
+                                {
+                                    HoverStart = DisplayDateInternal;
+                                }
+                            }
+
+                            b = FindDayButtonFromDay(HoverStart.Value);
+                            if (b != null)
+                            {
+                                HoverStartIndex = b.Index;
+                            }
+                        }
+                        // the index of the SelectedDate is always the last
+                        // selectedDate's index
+                        UnHighlightDays();
+                        // If we hit a BlackOutDay with keyboard we do not
+                        // update the HoverEnd
+                        CalendarDateRange range;
+
+                        if (DateTime.Compare(HoverStart.Value, lastSelectedDate.Value) < 0)
+                        {
+                            range = new CalendarDateRange(HoverStart.Value, lastSelectedDate.Value);
+                        }
+                        else
+                        {
+                            range = new CalendarDateRange(lastSelectedDate.Value, HoverStart.Value);
+                        }
+
+                        if (!BlackoutDates.ContainsAny(range))
+                        {
+                            HoverEnd = lastSelectedDate;
+
+                            if (index.HasValue)
+                            {
+                                HoverEndIndex += index;
+                            }
+                            else
+                            {
+                                // For Home, End, PageUp and PageDown Keys there
+                                // is no easy way to predict the index value
+                                b = FindDayButtonFromDay(HoverEndInternal.Value);
+
+                                if (b != null)
+                                {
+                                    HoverEndIndex = b.Index;
+                                }
+                            }
+                        }
+
+                        OnDayClick(HoverEnd.Value);
+                        HighlightDays();
+                    }
+                    else
+                    {
+                        HoverStart = lastSelectedDate;
+                        HoverEnd = lastSelectedDate;
+                        AddSelection();
+                        OnDayClick(lastSelectedDate.Value);
+                    }
+                }
+                else
+                {
+                    // ON CLEAR 
+                    LastSelectedDate = lastSelectedDate.Value;
+                    if (SelectedDates.Count > 0)
+                    {
+                        SelectedDates[0] = lastSelectedDate.Value;
+                    }
+                    else
+                    {
+                        SelectedDates.Add(lastSelectedDate.Value);
+                    }
+                    OnDayClick(lastSelectedDate.Value);
+                }
+            }
+        }
+
+        protected override void OnPointerReleased(PointerReleasedEventArgs e)
+        {
+            base.OnPointerReleased(e);
+            if (!HasFocusInternal && e.MouseButton == MouseButton.Left)
+            {
+                FocusManager.Instance.Focus(this);
+            }
+        }
+
+        internal void OnDayButtonMouseUp(PointerReleasedEventArgs e)
+        {
+            DayButtonMouseUp?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Default mouse wheel handler for the calendar control.
+        /// </summary>
+        /// <param name="e">Mouse wheel event args.</param>
+        protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
+        {
+            base.OnPointerWheelChanged(e);
+            if (!e.Handled)
+            {
+                CalendarExtensions.GetMetaKeyState(e.InputModifiers, out bool ctrl, out bool shift);
+
+                if (!ctrl)
+                {
+                    if (e.Delta.Y > 0)
+                    {
+                        ProcessPageUpKey(false);
+                    }
+                    else
+                    {
+                        ProcessPageDownKey(false);
+                    }
+                }
+                else
+                {
+                    if (e.Delta.Y > 0)
+                    {
+                        ProcessDownKey(ctrl, shift);
+                    }
+                    else
+                    {
+                        ProcessUpKey(ctrl, shift);
+                    }
+                }
+                e.Handled = true;
+            }
+        }
+        internal void Calendar_KeyDown(object sender, KeyEventArgs e)
+        {
+            Calendar c = sender as Calendar;
+            Debug.Assert(c != null, "c should not be null!");
+
+            if (!e.Handled && c.IsEnabled)
+            {
+                e.Handled = ProcessCalendarKey(e);
+            }
+        }
+        internal bool ProcessCalendarKey(KeyEventArgs e)
+        {
+            if (DisplayMode == CalendarMode.Month)
+            {
+                if (LastSelectedDate.HasValue && DisplayDateInternal != null)
+                {
+                    // If a blackout day is inactive, when clicked on it, the
+                    // previous inactive day which is not a blackout day can get
+                    // the focus.  In this case we should allow keyboard
+                    // functions on that inactive day
+                    if (DateTimeHelper.CompareYearMonth(LastSelectedDate.Value, DisplayDateInternal) != 0 && FocusButton != null && !FocusButton.IsInactive)
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            // Some keys (e.g. Left/Right) need to be translated in RightToLeft mode
+            Key invariantKey = e.Key;  //InteractionHelper.GetLogicalKey(FlowDirection, e.Key);
+
+            CalendarExtensions.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift);
+
+            switch (invariantKey)
+            {
+                case Key.Up:
+                    {
+                        ProcessUpKey(ctrl, shift);
+                        return true;
+                    }
+                case Key.Down:
+                    {
+                        ProcessDownKey(ctrl, shift);
+                        return true;
+                    }
+                case Key.Left:
+                    {
+                        ProcessLeftKey(shift);
+                        return true;
+                    }
+                case Key.Right:
+                    {
+                        ProcessRightKey(shift);
+                        return true;
+                    }
+                case Key.PageDown:
+                    {
+                        ProcessPageDownKey(shift);
+                        return true;
+                    }
+                case Key.PageUp:
+                    {
+                        ProcessPageUpKey(shift);
+                        return true;
+                    }
+                case Key.Home:
+                    {
+                        ProcessHomeKey(shift);
+                        return true;
+                    }
+                case Key.End:
+                    {
+                        ProcessEndKey(shift);
+                        return true;
+                    }
+                case Key.Enter:
+                case Key.Space:
+                    {
+                        return ProcessEnterKey();
+                    }
+            }
+            return false;
+        }
+        internal void ProcessUpKey(bool ctrl, bool shift)
+        {
+            switch (DisplayMode)
+            {
+                case CalendarMode.Month:
+                    {
+                        if (ctrl)
+                        {
+                            SelectedMonth = DisplayDateInternal;
+                            DisplayMode = CalendarMode.Year;
+                        }
+                        else
+                        {
+                            DateTime? selectedDate = DateTimeHelper.AddDays(LastSelectedDate.GetValueOrDefault(DateTime.Today), -ColumnsPerMonth);
+                            ProcessSelection(shift, selectedDate, -ColumnsPerMonth);
+                        }
+                        break;
+                    }
+                case CalendarMode.Year:
+                    {
+                        if (ctrl)
+                        {
+                            SelectedYear = SelectedMonth;
+                            DisplayMode = CalendarMode.Decade;
+                        }
+                        else
+                        {
+                            DateTime? selectedMonth = DateTimeHelper.AddMonths(_selectedMonth, -ColumnsPerYear);
+                            OnSelectedMonthChanged(selectedMonth);
+                        }
+                        break;
+                    }
+                case CalendarMode.Decade:
+                    {
+                        if (!ctrl)
+                        {
+                            DateTime? selectedYear = DateTimeHelper.AddYears(SelectedYear, -ColumnsPerYear);
+                            OnSelectedYearChanged(selectedYear);
+                        }
+                        break;
+                    }
+            }
+        }
+        internal void ProcessDownKey(bool ctrl, bool shift)
+        {
+            switch (DisplayMode)
+            {
+                case CalendarMode.Month:
+                    {
+                        if (!ctrl || shift)
+                        {
+                            DateTime? selectedDate = DateTimeHelper.AddDays(LastSelectedDate.GetValueOrDefault(DateTime.Today), ColumnsPerMonth);
+                            ProcessSelection(shift, selectedDate, ColumnsPerMonth);
+                        }
+                        break;
+                    }
+                case CalendarMode.Year:
+                    {
+                        if (ctrl)
+                        {
+                            DisplayDate = SelectedMonth;
+                            DisplayMode = CalendarMode.Month;
+                        }
+                        else
+                        {
+                            DateTime? selectedMonth = DateTimeHelper.AddMonths(_selectedMonth, ColumnsPerYear);
+                            OnSelectedMonthChanged(selectedMonth);
+                        }
+                        break;
+                    }
+                case CalendarMode.Decade:
+                    {
+                        if (ctrl)
+                        {
+                            SelectedMonth = SelectedYear;
+                            DisplayMode = CalendarMode.Year;
+                        }
+                        else
+                        {
+                            DateTime? selectedYear = DateTimeHelper.AddYears(SelectedYear, ColumnsPerYear);
+                            OnSelectedYearChanged(selectedYear);
+                        }
+                        break;
+                    }
+            }
+        }
+        internal void ProcessLeftKey(bool shift)
+        {
+            switch (DisplayMode)
+            {
+                case CalendarMode.Month:
+                    {
+                        DateTime? selectedDate = DateTimeHelper.AddDays(LastSelectedDate.GetValueOrDefault(DateTime.Today), -1);
+                        ProcessSelection(shift, selectedDate, -1);
+                        break;
+                    }
+                case CalendarMode.Year:
+                    {
+                        DateTime? selectedMonth = DateTimeHelper.AddMonths(_selectedMonth, -1);
+                        OnSelectedMonthChanged(selectedMonth);
+                        break;
+                    }
+                case CalendarMode.Decade:
+                    {
+                        DateTime? selectedYear = DateTimeHelper.AddYears(SelectedYear, -1);
+                        OnSelectedYearChanged(selectedYear);
+                        break;
+                    }
+            }
+        }
+        internal void ProcessRightKey(bool shift)
+        {
+            switch (DisplayMode)
+            {
+                case CalendarMode.Month:
+                    {
+                        DateTime? selectedDate = DateTimeHelper.AddDays(LastSelectedDate.GetValueOrDefault(DateTime.Today), 1);
+                        ProcessSelection(shift, selectedDate, 1);
+                        break;
+                    }
+                case CalendarMode.Year:
+                    {
+                        DateTime? selectedMonth = DateTimeHelper.AddMonths(_selectedMonth, 1);
+                        OnSelectedMonthChanged(selectedMonth);
+                        break;
+                    }
+                case CalendarMode.Decade:
+                    {
+                        DateTime? selectedYear = DateTimeHelper.AddYears(SelectedYear, 1);
+                        OnSelectedYearChanged(selectedYear);
+                        break;
+                    }
+            }
+        }
+        private bool ProcessEnterKey()
+        {
+            switch (DisplayMode)
+            {
+                case CalendarMode.Year:
+                    {
+                        DisplayDate = SelectedMonth;
+                        DisplayMode = CalendarMode.Month;
+                        return true;
+                    }
+                case CalendarMode.Decade:
+                    {
+                        SelectedMonth = SelectedYear;
+                        DisplayMode = CalendarMode.Year;
+                        return true;
+                    }
+            }
+            return false;
+        }
+        internal void ProcessHomeKey(bool shift)
+        {
+            switch (DisplayMode)
+            {
+                case CalendarMode.Month:
+                    {
+                        // REMOVE_RTM: Not all types of calendars start with Day1. If Non-Gregorian is supported check this:
+                        DateTime? selectedDate = new DateTime(DisplayDateInternal.Year, DisplayDateInternal.Month, 1);
+                        ProcessSelection(shift, selectedDate, null);
+                        break;
+                    }
+                case CalendarMode.Year:
+                    {
+                        DateTime selectedMonth = new DateTime(_selectedMonth.Year, 1, 1);
+                        OnSelectedMonthChanged(selectedMonth);
+                        break;
+                    }
+                case CalendarMode.Decade:
+                    {
+                        DateTime? selectedYear = new DateTime(DateTimeHelper.DecadeOfDate(SelectedYear), 1, 1);
+                        OnSelectedYearChanged(selectedYear);
+                        break;
+                    }
+            }
+        }
+        internal void ProcessEndKey(bool shift)
+        {
+            switch (DisplayMode)
+            {
+                case CalendarMode.Month:
+                    {
+                        if (DisplayDate != null)
+                        {
+                            DateTime? selectedDate = new DateTime(DisplayDateInternal.Year, DisplayDateInternal.Month, 1);
+
+                            if (DateTimeHelper.CompareYearMonth(DateTime.MaxValue, selectedDate.Value) > 0)
+                            {
+                                // since DisplayDate is not equal to
+                                // DateTime.MaxValue we are sure selectedDate is\
+                                // not null
+                                selectedDate = DateTimeHelper.AddMonths(selectedDate.Value, 1).Value;
+                                selectedDate = DateTimeHelper.AddDays(selectedDate.Value, -1).Value;
+                            }
+                            else
+                            {
+                                selectedDate = DateTime.MaxValue;
+                            }
+                            ProcessSelection(shift, selectedDate, null);
+                        }
+                        break;
+                    }
+                case CalendarMode.Year:
+                    {
+                        DateTime selectedMonth = new DateTime(_selectedMonth.Year, 12, 1);
+                        OnSelectedMonthChanged(selectedMonth);
+                        break;
+                    }
+                case CalendarMode.Decade:
+                    {
+                        DateTime? selectedYear = new DateTime(DateTimeHelper.EndOfDecade(SelectedYear), 1, 1);
+                        OnSelectedYearChanged(selectedYear);
+                        break;
+                    }
+            }
+        }
+        internal void ProcessPageDownKey(bool shift)
+        {
+            switch (DisplayMode)
+            {
+                case CalendarMode.Month:
+                    {
+                        DateTime? selectedDate = DateTimeHelper.AddMonths(LastSelectedDate.GetValueOrDefault(DateTime.Today), 1);
+                        ProcessSelection(shift, selectedDate, null);
+                        break;
+                    }
+                case CalendarMode.Year:
+                    {
+                        DateTime? selectedMonth = DateTimeHelper.AddYears(_selectedMonth, 1);
+                        OnSelectedMonthChanged(selectedMonth);
+                        break;
+                    }
+                case CalendarMode.Decade:
+                    {
+                        DateTime? selectedYear = DateTimeHelper.AddYears(SelectedYear, 10);
+                        OnSelectedYearChanged(selectedYear);
+                        break;
+                    }
+            }
+        }
+        internal void ProcessPageUpKey(bool shift)
+        {
+            switch (DisplayMode)
+            {
+                case CalendarMode.Month:
+                    {
+                        DateTime? selectedDate = DateTimeHelper.AddMonths(LastSelectedDate.GetValueOrDefault(DateTime.Today), -1);
+                        ProcessSelection(shift, selectedDate, null);
+                        break;
+                    }
+                case CalendarMode.Year:
+                    {
+                        DateTime? selectedMonth = DateTimeHelper.AddYears(_selectedMonth, -1);
+                        OnSelectedMonthChanged(selectedMonth);
+                        break;
+                    }
+                case CalendarMode.Decade:
+                    {
+                        DateTime? selectedYear = DateTimeHelper.AddYears(SelectedYear, -10);
+                        OnSelectedYearChanged(selectedYear);
+                        break;
+                    }
+            }
+        }
+        private void Calendar_KeyUp(object sender, KeyEventArgs e)
+        {
+            if (!e.Handled && (e.Key == Key.LeftShift || e.Key == Key.RightShift))
+            {
+                ProcessShiftKeyUp();
+            }
+        }
+        internal void ProcessShiftKeyUp()
+        {
+            if (_isShiftPressed && (SelectionMode == CalendarSelectionMode.SingleRange || SelectionMode == CalendarSelectionMode.MultipleRange))
+            {
+                AddSelection();
+                _isShiftPressed = false;
+            }
+        }
+
+        protected override void OnGotFocus(GotFocusEventArgs e)
+        {
+            base.OnGotFocus(e);
+            HasFocusInternal = true;
+
+            switch (DisplayMode)
+            {
+                case CalendarMode.Month:
+                    {
+                        DateTime focusDate;
+                        if (LastSelectedDate.HasValue && DateTimeHelper.CompareYearMonth(DisplayDateInternal, LastSelectedDate.Value) == 0)
+                        {
+                            focusDate = LastSelectedDate.Value;
+                        }
+                        else
+                        {
+                            focusDate = DisplayDate;
+                            LastSelectedDate = DisplayDate;
+                        }
+                        Debug.Assert(focusDate != null, "focusDate should not be null!");
+                        FocusButton = FindDayButtonFromDay(focusDate);
+
+                        if (FocusButton != null)
+                        {
+                            FocusButton.IsCurrent = true;
+                        }
+                        break;
+                    }
+                case CalendarMode.Year:
+                case CalendarMode.Decade:
+                    {
+                        if (this.FocusCalendarButton != null)
+                        {
+                            FocusCalendarButton.IsCalendarButtonFocused = true;
+                        }
+                        break;
+                    }
+            }
+        }
+        protected override void OnLostFocus(RoutedEventArgs e)
+        {
+            base.OnLostFocus(e);
+            HasFocusInternal = false;
+
+            switch (DisplayMode)
+            {
+                case CalendarMode.Month:
+                    {
+                        if (FocusButton != null)
+                        {
+                            FocusButton.IsCurrent = false;
+                        }
+                        break;
+                    }
+                case CalendarMode.Year:
+                case CalendarMode.Decade:
+                    {
+                        if (FocusCalendarButton != null)
+                        {
+                            FocusCalendarButton.IsCalendarButtonFocused = false;
+                        }
+                        break;
+                    }
+            }
+        }
+        /// <summary>
+        ///  Called when the IsEnabled property changes.
+        /// </summary>
+        /// <param name="e">Property changed args.</param>
+        private void OnIsEnabledChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            Debug.Assert(e.NewValue is bool, "NewValue should be a boolean!");
+            bool isEnabled = (bool)e.NewValue;
+
+            if (MonthControl != null)
+            {
+                MonthControl.UpdateDisabled(isEnabled);
+            }
+        }
+
+        static Calendar()
+        {
+            IsEnabledProperty.Changed.AddClassHandler<Calendar>(x => x.OnIsEnabledChanged);
+            FirstDayOfWeekProperty.Changed.AddClassHandler<Calendar>(x => x.OnFirstDayOfWeekChanged);
+            IsTodayHighlightedProperty.Changed.AddClassHandler<Calendar>(x => x.OnIsTodayHighlightedChanged);
+            DisplayModeProperty.Changed.AddClassHandler<Calendar>(x => x.OnDisplayModePropertyChanged);
+            SelectionModeProperty.Changed.AddClassHandler<Calendar>(x => x.OnSelectionModeChanged);
+            SelectedDateProperty.Changed.AddClassHandler<Calendar>(x => x.OnSelectedDateChanged);
+            DisplayDateProperty.Changed.AddClassHandler<Calendar>(x => x.OnDisplayDateChanged);
+            DisplayDateStartProperty.Changed.AddClassHandler<Calendar>(x => x.OnDisplayDateStartChanged);
+            DisplayDateEndProperty.Changed.AddClassHandler<Calendar>(x => x.OnDisplayDateEndChanged);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:System.Windows.Controls.Calendar" /> class.
+        /// </summary>
+        public Calendar()
+        {
+            UpdateDisplayDate(this, this.DisplayDate, DateTime.MinValue);
+            BlackoutDates = new CalendarBlackoutDatesCollection(this);
+            SelectedDates = new SelectedDatesCollection(this);
+            RemovedItems = new Collection<DateTime>();
+        }
+
+        private const string PART_ElementRoot = "Root";
+        private const string PART_ElementMonth = "CalendarItem";
+        /// <summary>
+        /// Builds the visual tree for the
+        /// <see cref="T:System.Windows.Controls.Calendar" /> when a new
+        /// template is applied.
+        /// </summary>
+        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        {
+            base.OnTemplateApplied(e);
+
+            Root = e.NameScope.Find<Panel>(PART_ElementRoot);
+
+            SelectedMonth = DisplayDate;
+            SelectedYear = DisplayDate;
+
+            if (Root != null)
+            {
+                CalendarItem month = e.NameScope.Find<CalendarItem>(PART_ElementMonth);
+
+                if (month != null)
+                {
+                    month.Owner = this;
+                }
+            }
+
+            LayoutUpdated += Calendar_SizeChanged;
+            KeyDown += Calendar_KeyDown;
+            KeyUp += Calendar_KeyUp;
+        }
+
+    }
+}
diff --git a/src/Avalonia.Controls/Calendar/CalendarBlackoutDatesCollection.cs b/src/Avalonia.Controls/Calendar/CalendarBlackoutDatesCollection.cs
new file mode 100644
index 0000000000..60fdde3e2d
--- /dev/null
+++ b/src/Avalonia.Controls/Calendar/CalendarBlackoutDatesCollection.cs
@@ -0,0 +1,223 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading;
+
+namespace Avalonia.Controls.Primitives
+{
+    public sealed class CalendarBlackoutDatesCollection : ObservableCollection<CalendarDateRange>
+    {
+        /// <summary>
+        /// The Calendar whose dates this object represents.
+        /// </summary>
+        private Calendar _owner;
+
+        /// <summary>
+        /// The dispatcher thread.
+        /// </summary>
+        private Thread _dispatcherThread;
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.Primitives.CalendarBlackoutDatesCollection" />
+        /// class.
+        /// </summary>
+        /// <param name="owner">
+        /// The <see cref="T:Avalonia.Controls.Calendar" /> whose dates
+        /// this object represents.
+        /// </param>
+        public CalendarBlackoutDatesCollection(Calendar owner)
+        {
+            _owner = owner ?? throw new ArgumentNullException(nameof(owner));
+            _dispatcherThread = Thread.CurrentThread;
+        }
+
+        /// <summary>
+        /// Adds all dates before <see cref="P:System.DateTime.Today" /> to the
+        /// collection.
+        /// </summary>
+        public void AddDatesInPast()
+        {
+            Add(new CalendarDateRange(DateTime.MinValue, DateTime.Today.AddDays(-1)));
+        }
+
+        /// <summary>
+        /// Returns a value that represents whether this collection contains the
+        /// specified date.
+        /// </summary>
+        /// <param name="date">The date to search for.</param>
+        /// <returns>
+        /// True if the collection contains the specified date; otherwise,
+        /// false.
+        /// </returns>
+        public bool Contains(DateTime date)
+        {
+            int count = Count;
+            for (int i = 0; i < count; i++)
+            {
+                if (DateTimeHelper.InRange(date, this[i]))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Returns a value that represents whether this collection contains the
+        /// specified range of dates.
+        /// </summary>
+        /// <param name="start">The start of the date range.</param>
+        /// <param name="end">The end of the date range.</param>
+        /// <returns>
+        /// True if all dates in the range are contained in the collection;
+        /// otherwise, false.
+        /// </returns>
+        public bool Contains(DateTime start, DateTime end)
+        {
+            DateTime rangeStart;
+            DateTime rangeEnd;
+
+            if (DateTime.Compare(end, start) > -1)
+            {
+                rangeStart = DateTimeHelper.DiscardTime(start).Value;
+                rangeEnd = DateTimeHelper.DiscardTime(end).Value;
+            }
+            else
+            {
+                rangeStart = DateTimeHelper.DiscardTime(end).Value;
+                rangeEnd = DateTimeHelper.DiscardTime(start).Value;
+            }
+
+            int count = Count;
+            for (int i = 0; i < count; i++)
+            {
+                CalendarDateRange range = this[i];
+                if (DateTime.Compare(range.Start, rangeStart) == 0 && DateTime.Compare(range.End, rangeEnd) == 0)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Returns a value that represents whether this collection contains any
+        /// date in the specified range.
+        /// </summary>
+        /// <param name="range">The range of dates to search for.</param>
+        /// <returns>
+        /// True if any date in the range is contained in the collection;
+        /// otherwise, false.
+        /// </returns>
+        public bool ContainsAny(CalendarDateRange range)
+        {
+            return this.Any(r => r.ContainsAny(range));
+        }
+
+        /// <summary>
+        /// Removes all items from the collection.
+        /// </summary>
+        /// <remarks>
+        /// This implementation raises the CollectionChanged event.
+        /// </remarks>
+        protected override void ClearItems()
+        {
+            EnsureValidThread();
+
+            base.ClearItems();
+            _owner.UpdateMonths();
+        }
+
+        /// <summary>
+        /// Inserts an item into the collection at the specified index.
+        /// </summary>
+        /// <param name="index">
+        /// The zero-based index at which item should be inserted.
+        /// </param>
+        /// <param name="item">The object to insert.</param>
+        /// <remarks>
+        /// This implementation raises the CollectionChanged event.
+        /// </remarks>
+        protected override void InsertItem(int index, CalendarDateRange item)
+        {
+            EnsureValidThread();
+
+            if (!IsValid(item))
+            {
+                throw new ArgumentOutOfRangeException("Value is not valid.");
+            }
+
+            base.InsertItem(index, item);
+            _owner.UpdateMonths();
+        }
+
+        /// <summary>
+        /// Removes the item at the specified index of the collection.
+        /// </summary>
+        /// <param name="index">
+        /// The zero-based index of the element to remove.
+        /// </param>
+        /// <remarks>
+        /// This implementation raises the CollectionChanged event.
+        /// </remarks>
+        protected override void RemoveItem(int index)
+        {
+            EnsureValidThread();
+
+            base.RemoveItem(index);
+            _owner.UpdateMonths();
+        }
+
+        /// <summary>
+        /// Replaces the element at the specified index.
+        /// </summary>
+        /// <param name="index">
+        /// The zero-based index of the element to replace.
+        /// </param>
+        /// <param name="item">
+        /// The new value for the element at the specified index.
+        /// </param>
+        /// <remarks>
+        /// This implementation raises the CollectionChanged event.
+        /// </remarks>
+        protected override void SetItem(int index, CalendarDateRange item)
+        {
+            EnsureValidThread();
+
+            if (!IsValid(item))
+            {
+                throw new ArgumentOutOfRangeException("Value is not valid.");
+            }
+
+            base.SetItem(index, item);
+            _owner.UpdateMonths();
+        }
+        
+        private bool IsValid(CalendarDateRange item)
+        {
+            foreach (DateTime day in _owner.SelectedDates)
+            {
+                if (DateTimeHelper.InRange(day, item))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+        
+        private void EnsureValidThread()
+        {
+            if (Thread.CurrentThread != _dispatcherThread)
+            {
+                throw new NotSupportedException("This type of Collection does not support changes to its SourceCollection from a thread different from the Dispatcher thread.");
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Calendar/CalendarButton.cs b/src/Avalonia.Controls/Calendar/CalendarButton.cs
new file mode 100644
index 0000000000..224d9b782b
--- /dev/null
+++ b/src/Avalonia.Controls/Calendar/CalendarButton.cs
@@ -0,0 +1,193 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using Avalonia.Input;
+using System;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Represents a button on a
+    /// <see cref="T:Avalonia.Controls.Calendar" />.
+    /// </summary>
+    public sealed class CalendarButton : Button
+    {
+        /// <summary>
+        /// A value indicating whether the button is focused.
+        /// </summary>
+        private bool _isCalendarButtonFocused;
+
+        /// <summary>
+        /// A value indicating whether the button is inactive.
+        /// </summary>
+        private bool _isInactive;
+
+        /// <summary>
+        /// A value indicating whether the button is selected.
+        /// </summary>
+        private bool _isSelected;
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.Primitives.CalendarButton" />
+        /// class.
+        /// </summary>
+        public CalendarButton()
+            : base()
+        {
+            Content = DateTimeHelper.GetCurrentDateFormat().AbbreviatedMonthNames[0];
+        }
+
+        /// <summary>
+        /// Gets or sets the Calendar associated with this button.
+        /// </summary>
+        internal Calendar Owner { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the button is focused.
+        /// </summary>
+        internal bool IsCalendarButtonFocused
+        {
+            get { return _isCalendarButtonFocused; }
+            set
+            {
+                if (_isCalendarButtonFocused != value)
+                {
+                    _isCalendarButtonFocused = value;
+                    SetPseudoClasses();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the button is inactive.
+        /// </summary>
+        internal bool IsInactive
+        {
+            get { return _isInactive; }
+            set
+            {
+                if (_isInactive != value)
+                {
+                    _isInactive = value;
+                    SetPseudoClasses();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the button is selected.
+        /// </summary>
+        internal bool IsSelected
+        {
+            get { return _isSelected; }
+            set
+            {
+                if (_isSelected != value)
+                {
+                    _isSelected = value;
+                    SetPseudoClasses();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Builds the visual tree for the
+        /// <see cref="T:System.Windows.Controls.Primitives.CalendarButton" />
+        /// when a new template is applied.
+        /// </summary>
+        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        {
+            base.OnTemplateApplied(e);
+            SetPseudoClasses();
+        }
+        
+        /// <summary>
+        /// Sets PseudoClasses based on current state.
+        /// </summary>
+        private void SetPseudoClasses()
+        {
+            PseudoClasses.Set(":selected", IsSelected);
+            PseudoClasses.Set(":inactive", IsInactive);
+            PseudoClasses.Set(":btnfocused", IsCalendarButtonFocused && IsEnabled);
+        }
+
+        /// <summary>
+        /// Occurs when the left mouse button is pressed (or when the tip of the
+        /// stylus touches the tablet PC) while the mouse pointer is over a
+        /// UIElement.
+        /// </summary>
+        public event EventHandler<PointerPressedEventArgs> CalendarLeftMouseButtonDown;
+
+        /// <summary>
+        /// Occurs when the left mouse button is released (or the tip of the
+        /// stylus is removed from the tablet PC) while the mouse (or the
+        /// stylus) is over a UIElement (or while a UIElement holds mouse
+        /// capture).
+        /// </summary>
+        public event EventHandler<PointerReleasedEventArgs> CalendarLeftMouseButtonUp;
+
+        /// <summary>
+        /// Provides class handling for the MouseLeftButtonDown event that
+        /// occurs when the left mouse button is pressed while the mouse pointer
+        /// is over this control.
+        /// </summary>
+        /// <param name="e">The event data. </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// e is a null reference (Nothing in Visual Basic).
+        /// </exception>
+        /// <remarks>
+        /// This method marks the MouseLeftButtonDown event as handled by
+        /// setting the MouseButtonEventArgs.Handled property of the event data
+        /// to true when the button is enabled and its ClickMode is not set to
+        /// Hover.  Since this method marks the MouseLeftButtonDown event as
+        /// handled in some situations, you should use the Click event instead
+        /// to detect a button click.
+        /// </remarks>
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
+        {
+            base.OnPointerPressed(e);
+            if (e.MouseButton == MouseButton.Left)
+                CalendarLeftMouseButtonDown?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Provides handling for the MouseLeftButtonUp event that occurs when
+        /// the left mouse button is released while the mouse pointer is over
+        /// this control. 
+        /// </summary>
+        /// <param name="e">The event data.</param>
+        /// <exception cref="System.ArgumentNullException">
+        /// e is a null reference (Nothing in Visual Basic).
+        /// </exception>
+        /// <remarks>
+        /// This method marks the MouseLeftButtonUp event as handled by setting
+        /// the MouseButtonEventArgs.Handled property of the event data to true
+        /// when the button is enabled and its ClickMode is not set to Hover.
+        /// Since this method marks the MouseLeftButtonUp event as handled in
+        /// some situations, you should use the Click event instead to detect a
+        /// button click.
+        /// </remarks>
+        protected override void OnPointerReleased(PointerReleasedEventArgs e)
+        {
+            base.OnPointerReleased(e);
+            if (e.MouseButton == MouseButton.Left)
+                CalendarLeftMouseButtonUp?.Invoke(this, e);
+        }
+        
+        /// <summary>
+        /// We need to simulate the MouseLeftButtonUp event for the
+        /// CalendarButton that stays in Pressed state after MouseCapture is
+        /// released since there is no actual MouseLeftButtonUp event for the
+        /// release.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        internal void SendMouseLeftButtonUp(PointerReleasedEventArgs e)
+        {
+            e.Handled = false;
+            base.OnPointerReleased(e);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Calendar/CalendarDateRange.cs b/src/Avalonia.Controls/Calendar/CalendarDateRange.cs
new file mode 100644
index 0000000000..273cda8c5b
--- /dev/null
+++ b/src/Avalonia.Controls/Calendar/CalendarDateRange.cs
@@ -0,0 +1,79 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using System;
+using System.Diagnostics;
+
+namespace Avalonia.Controls
+{
+    public sealed class CalendarDateRange
+    {
+        /// <summary>
+        /// Gets the first date in the represented range.
+        /// </summary>
+        /// <value>The first date in the represented range.</value>
+        public DateTime Start { get; private set; }
+
+        /// <summary>
+        /// Gets the last date in the represented range.
+        /// </summary>
+        /// <value>The last date in the represented range.</value>
+        public DateTime End { get; private set; }
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:System.Windows.Controls.CalendarDateRange" /> class
+        /// with a single date.
+        /// </summary>
+        /// <param name="day">The date to be represented by the range.</param>
+        public CalendarDateRange(DateTime day)
+        {
+            Start = day;
+            End = day;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:System.Windows.Controls.CalendarDateRange" /> class
+        /// with a range of dates.
+        /// </summary>
+        /// <param name="start">
+        /// The start of the range to be represented.
+        /// </param>
+        /// <param name="end">The end of the range to be represented.</param>
+        public CalendarDateRange(DateTime start, DateTime end)
+        {
+            if (DateTime.Compare(end, start) >= 0)
+            {
+                Start = start;
+                End = end;
+            }
+            else
+            {
+                // Always use the start for ranges on the same day
+                Start = start;
+                End = start;
+            }
+        }
+
+        /// <summary>
+        /// Returns true if any day in the given DateTime range is contained in
+        /// the current CalendarDateRange.
+        /// </summary>
+        /// <param name="range">Inherited code: Requires comment 1.</param>
+        /// <returns>Inherited code: Requires comment 2.</returns>
+        internal bool ContainsAny(CalendarDateRange range)
+        {
+            Debug.Assert(range != null, "range should not be null!");
+
+            int start = DateTime.Compare(Start, range.Start);
+
+            // Check if any part of the supplied range is contained by this
+            // range or if the supplied range completely covers this range.
+            return (start <= 0 && DateTime.Compare(End, range.Start) >= 0) ||
+                (start >= 0 && DateTime.Compare(Start, range.End) <= 0);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Calendar/CalendarDayButton.cs b/src/Avalonia.Controls/Calendar/CalendarDayButton.cs
new file mode 100644
index 0000000000..f6d0fbba62
--- /dev/null
+++ b/src/Avalonia.Controls/Calendar/CalendarDayButton.cs
@@ -0,0 +1,253 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using Avalonia.Input;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+
+namespace Avalonia.Controls.Primitives
+{
+    public sealed class CalendarDayButton : Button
+    {
+        /// <summary>
+        /// Default content for the CalendarDayButton.
+        /// </summary>
+        private const int DefaultContent = 1;
+
+        private bool _isCurrent;
+        private bool _ignoringMouseOverState;
+        private bool _isBlackout;
+        private bool _isToday;
+        private bool _isInactive;
+        private bool _isSelected;
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.Primitives.CalendarDayButton" />
+        /// class.
+        /// </summary>
+        public CalendarDayButton()
+            : base()
+        {
+            //Focusable = false;
+            Content = DefaultContent.ToString(CultureInfo.CurrentCulture);
+        }
+
+        /// <summary>
+        /// Gets or sets the Calendar associated with this button.
+        /// </summary>
+        internal Calendar Owner { get; set; }
+        internal int Index { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the button is the focused
+        /// element on the Calendar control.
+        /// </summary>
+        internal bool IsCurrent
+        {
+            get { return _isCurrent; }
+            set
+            {
+                if (_isCurrent != value)
+                {
+                    _isCurrent = value;
+                    SetPseudoClasses();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Ensure the button is not in the MouseOver state.
+        /// </summary>
+        /// <remarks>
+        /// If a button is in the MouseOver state when a Popup is closed (as is
+        /// the case when you select a date in the DatePicker control), it will
+        /// continue to think it's in the mouse over state even when the Popup
+        /// opens again and it's not.  This method is used to forcibly clear the
+        /// state by changing the CommonStates state group.
+        /// </remarks>
+        internal void IgnoreMouseOverState()
+        {
+            // TODO: Investigate whether this needs to be done by changing the
+            // state everytime we change any state, or if it can be done once
+            // to properly reset the control.
+
+            _ignoringMouseOverState = false;
+
+            // If the button thinks it's in the MouseOver state (which can
+            // happen when a Popup is closed before the button can change state)
+            // we will override the state so it shows up as normal.
+            if (IsPointerOver)
+            {
+                _ignoringMouseOverState = true;
+                SetPseudoClasses();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this is a blackout date.
+        /// </summary>
+        internal bool IsBlackout
+        {
+            get { return _isBlackout; }
+            set
+            {
+                if (_isBlackout != value)
+                {
+                    _isBlackout = value;
+                    SetPseudoClasses();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this button represents
+        /// today.
+        /// </summary>
+        internal bool IsToday
+        {
+            get { return _isToday; }
+            set
+            {
+                if (_isToday != value)
+                {
+                    _isToday = value;
+                    SetPseudoClasses();
+                }
+            }
+        }
+        /// <summary>
+        /// Gets or sets a value indicating whether the button is inactive.
+        /// </summary>
+        internal bool IsInactive
+        {
+            get { return _isInactive; }
+            set
+            {
+                if (_isInactive != value)
+                {
+                    _isInactive = value;
+                    SetPseudoClasses();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the button is selected.
+        /// </summary>
+        internal bool IsSelected
+        {
+            get { return _isSelected; }
+            set
+            {
+                if (_isSelected != value)
+                {
+                    _isSelected = value;
+                    SetPseudoClasses();
+                }
+            }
+        }
+
+        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        {
+            base.OnTemplateApplied(e);
+            SetPseudoClasses();
+        }
+        private void SetPseudoClasses()
+        {
+            if (_ignoringMouseOverState)
+            {
+                PseudoClasses.Set(":pressed", IsPressed);
+                PseudoClasses.Set(":disabled", !IsEnabled);
+            }
+
+            PseudoClasses.Set(":selected", IsSelected);
+            PseudoClasses.Set(":inactive", IsInactive);
+            PseudoClasses.Set(":today", IsToday);
+            PseudoClasses.Set(":blackout", IsBlackout);
+            PseudoClasses.Set(":dayfocused", IsCurrent && IsEnabled);
+        }
+
+        /// <summary>
+        /// Occurs when the left mouse button is pressed (or when the tip of the
+        /// stylus touches the tablet PC) while the mouse pointer is over a
+        /// UIElement.
+        /// </summary>
+        public event EventHandler<PointerPressedEventArgs> CalendarDayButtonMouseDown;
+
+        /// <summary>
+        /// Occurs when the left mouse button is released (or the tip of the
+        /// stylus is removed from the tablet PC) while the mouse (or the
+        /// stylus) is over a UIElement (or while a UIElement holds mouse
+        /// capture).
+        /// </summary>
+        public event EventHandler<PointerReleasedEventArgs> CalendarDayButtonMouseUp;
+
+        /// <summary>
+        /// Provides class handling for the MouseLeftButtonDown event that
+        /// occurs when the left mouse button is pressed while the mouse pointer
+        /// is over this control.
+        /// </summary>
+        /// <param name="e">The event data. </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// e is a null reference (Nothing in Visual Basic).
+        /// </exception>
+        /// <remarks>
+        /// This method marks the MouseLeftButtonDown event as handled by
+        /// setting the MouseButtonEventArgs.Handled property of the event data
+        /// to true when the button is enabled and its ClickMode is not set to
+        /// Hover.  Since this method marks the MouseLeftButtonDown event as
+        /// handled in some situations, you should use the Click event instead
+        /// to detect a button click.
+        /// </remarks>
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
+        {
+            base.OnPointerPressed(e);
+
+            if (e.MouseButton == MouseButton.Left)
+                CalendarDayButtonMouseDown?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Provides handling for the MouseLeftButtonUp event that occurs when
+        /// the left mouse button is released while the mouse pointer is over
+        /// this control. 
+        /// </summary>
+        /// <param name="e">The event data.</param>
+        /// <exception cref="System.ArgumentNullException">
+        /// e is a null reference (Nothing in Visual Basic).
+        /// </exception>
+        /// <remarks>
+        /// This method marks the MouseLeftButtonUp event as handled by setting
+        /// the MouseButtonEventArgs.Handled property of the event data to true
+        /// when the button is enabled and its ClickMode is not set to Hover.
+        /// Since this method marks the MouseLeftButtonUp event as handled in
+        /// some situations, you should use the Click event instead to detect a
+        /// button click.
+        /// </remarks>
+        protected override void OnPointerReleased(PointerReleasedEventArgs e)
+        {
+            base.OnPointerReleased(e);
+
+            if (e.MouseButton == MouseButton.Left)
+                CalendarDayButtonMouseUp?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// We need to simulate the MouseLeftButtonUp event for the
+        /// CalendarDayButton that stays in Pressed state after MouseCapture is
+        /// released since there is no actual MouseLeftButtonUp event for the
+        /// release.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        internal void SendMouseLeftButtonUp(PointerReleasedEventArgs e)
+        {
+            e.Handled = false;
+            base.OnPointerReleased(e);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Calendar/CalendarExtensions.cs b/src/Avalonia.Controls/Calendar/CalendarExtensions.cs
new file mode 100644
index 0000000000..485f2dfc95
--- /dev/null
+++ b/src/Avalonia.Controls/Calendar/CalendarExtensions.cs
@@ -0,0 +1,78 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using System;
+using System.Collections.Generic;
+using Avalonia.Input;
+using System.Diagnostics;
+
+namespace Avalonia.Controls.Primitives
+{
+    internal static class CalendarExtensions
+    {
+
+        private static Dictionary<IAvaloniaObject, Dictionary<AvaloniaProperty, bool>> _suspendedHandlers = new Dictionary<IAvaloniaObject, Dictionary<AvaloniaProperty, bool>>();
+
+        public static bool IsHandlerSuspended(this IAvaloniaObject obj, AvaloniaProperty dependencyProperty)
+        {
+            if (_suspendedHandlers.ContainsKey(obj))
+            {
+                return _suspendedHandlers[obj].ContainsKey(dependencyProperty);
+            }
+            else
+            {
+                return false;
+            }
+        }
+        private static void SuspendHandler(this IAvaloniaObject obj, AvaloniaProperty dependencyProperty, bool suspend)
+        {
+            if (_suspendedHandlers.ContainsKey(obj))
+            {
+                Dictionary<AvaloniaProperty, bool> suspensions = _suspendedHandlers[obj];
+
+                if (suspend)
+                {
+                    Debug.Assert(!suspensions.ContainsKey(dependencyProperty), "Suspensions should not contain the property!");
+
+                    // true = dummy value
+                    suspensions[dependencyProperty] = true;
+                }
+                else
+                {
+                    Debug.Assert(suspensions.ContainsKey(dependencyProperty), "Suspensions should contain the property!");
+                    suspensions.Remove(dependencyProperty);
+                    if (suspensions.Count == 0)
+                    {
+                        _suspendedHandlers.Remove(obj);
+                    }
+                }
+            }
+            else
+            {
+                Debug.Assert(suspend, "suspend should be true!");
+                _suspendedHandlers[obj] = new Dictionary<AvaloniaProperty, bool>();
+                _suspendedHandlers[obj][dependencyProperty] = true;
+            }
+        }
+        public static void SetValueNoCallback<T>(this IAvaloniaObject obj, AvaloniaProperty<T> property, T value)
+        {
+            obj.SuspendHandler(property, true);
+            try
+            {
+                obj.SetValue(property, value);
+            }
+            finally
+            {
+                obj.SuspendHandler(property, false);
+            }
+        }
+        
+        public static void GetMetaKeyState(InputModifiers modifiers, out bool ctrl, out bool shift)
+        {
+            ctrl = (modifiers & InputModifiers.Control) == InputModifiers.Control;
+            shift = (modifiers & InputModifiers.Shift) == InputModifiers.Shift;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Calendar/CalendarItem.cs b/src/Avalonia.Controls/Calendar/CalendarItem.cs
new file mode 100644
index 0000000000..fc358ed06e
--- /dev/null
+++ b/src/Avalonia.Controls/Calendar/CalendarItem.cs
@@ -0,0 +1,1263 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using Avalonia.Data;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using System;
+using System.Diagnostics;
+using System.Globalization;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Represents the currently displayed month or year on a
+    /// <see cref="T:Avalonia.Controls.Calendar" />.
+    /// </summary>
+    public sealed class CalendarItem : TemplatedControl
+    {
+        /// <summary>
+        /// The number of days per week.
+        /// </summary>
+        private const int NumberOfDaysPerWeek = 7;
+
+        private const string PART_ElementHeaderButton = "HeaderButton";
+        private const string PART_ElementPreviousButton = "PreviousButton";
+        private const string PART_ElementNextButton = "NextButton";
+        private const string PART_ElementMonthView = "MonthView";
+        private const string PART_ElementYearView = "YearView";
+
+        private Button _headerButton;
+        private Button _nextButton;
+        private Button _previousButton;
+        private Grid _monthView;
+        private Grid _yearView;
+        private ITemplate<IControl> _dayTitleTemplate;
+        private CalendarButton _lastCalendarButton;
+        private CalendarDayButton _lastCalendarDayButton;
+        
+        private DateTime _currentMonth;
+        private bool _isMouseLeftButtonDown = false;
+        private bool _isMouseLeftButtonDownYearView = false;
+        private bool _isControlPressed = false;
+
+        private System.Globalization.Calendar _calendar = new System.Globalization.GregorianCalendar();
+
+        private PointerPressedEventArgs _downEventArg;
+        private PointerPressedEventArgs _downEventArgYearView;
+
+        internal Calendar Owner { get; set; }
+        internal CalendarDayButton CurrentButton { get; set; }
+
+        public static StyledProperty<IBrush> HeaderBackgroundProperty = Calendar.HeaderBackgroundProperty.AddOwner<CalendarItem>();
+        public IBrush HeaderBackground
+        {
+            get { return GetValue(HeaderBackgroundProperty); }
+            set { SetValue(HeaderBackgroundProperty, value); }
+        }
+        public static readonly DirectProperty<CalendarItem, ITemplate<IControl>> DayTitleTemplateProperty =
+                AvaloniaProperty.RegisterDirect<CalendarItem, ITemplate<IControl>>(
+                    nameof(DayTitleTemplate),
+                    o => o.DayTitleTemplate,
+                    (o,v) => o.DayTitleTemplate = v,
+                    defaultBindingMode: BindingMode.OneTime);
+        public ITemplate<IControl> DayTitleTemplate
+        {
+            get { return _dayTitleTemplate; }
+            set { SetAndRaise(DayTitleTemplateProperty, ref _dayTitleTemplate, value); }
+        }
+
+        /// <summary>
+        /// Gets the button that allows switching between month mode, year mode,
+        /// and decade mode. 
+        /// </summary>
+        internal Button HeaderButton
+        {
+            get { return _headerButton; }
+            private set
+            {
+                if (_headerButton != null)
+                    _headerButton.Click -= HeaderButton_Click;
+
+                _headerButton = value;
+
+                if (_headerButton != null)
+                {
+                    _headerButton.Click += HeaderButton_Click;
+                    _headerButton.Focusable = false;
+                }
+            }
+        }
+        /// <summary>
+        /// Gets the button that displays the next page of the calendar when it
+        /// is clicked.
+        /// </summary>
+        internal Button NextButton
+        {
+            get { return _nextButton; }
+            private set
+            {
+                if (_nextButton != null)
+                    _nextButton.Click -= NextButton_Click;
+
+                _nextButton = value;
+
+                if (_nextButton != null)
+                {
+                    // If the user does not provide a Content value in template,
+                    // we provide a helper text that can be used in
+                    // Accessibility this text is not shown on the UI, just used
+                    // for Accessibility purposes
+                    if (_nextButton.Content == null)
+                    {
+                        _nextButton.Content = "next button";
+                    }
+
+                    _nextButton.IsVisible = true;
+                    _nextButton.Click += NextButton_Click;
+                    _nextButton.Focusable = false;
+                }
+            }
+        }
+        /// <summary>
+        /// Gets the button that displays the previous page of the calendar when
+        /// it is clicked.
+        /// </summary>
+        internal Button PreviousButton
+        {
+            get { return _previousButton; }
+            private set
+            {
+                if (_previousButton != null)
+                    _previousButton.Click -= PreviousButton_Click;
+
+                _previousButton = value;
+
+                if (_previousButton != null)
+                {
+                    // If the user does not provide a Content value in template,
+                    // we provide a helper text that can be used in
+                    // Accessibility this text is not shown on the UI, just used
+                    // for Accessibility purposes
+                    if (_previousButton.Content == null)
+                    {
+                        _previousButton.Content = "previous button";
+                    }
+
+                    _previousButton.IsVisible = true;
+                    _previousButton.Click += PreviousButton_Click;
+                    _previousButton.Focusable = false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the Grid that hosts the content when in month mode.
+        /// </summary>
+        internal Grid MonthView
+        {
+            get { return _monthView; }
+            private set
+            {
+                if (_monthView != null)
+                    _monthView.PointerLeave -= MonthView_MouseLeave;
+
+                _monthView = value;
+
+                if (_monthView != null)
+                    _monthView.PointerLeave += MonthView_MouseLeave;
+            }
+        }
+        /// <summary>
+        /// Gets the Grid that hosts the content when in year or decade mode.
+        /// </summary>
+        internal Grid YearView
+        {
+            get { return _yearView; }
+            private set
+            {
+                if (_yearView != null)
+                    _yearView.PointerLeave -= YearView_MouseLeave;
+
+                _yearView = value;
+
+                if (_yearView != null)
+                    _yearView.PointerLeave += YearView_MouseLeave;
+            }
+        }
+
+        private void PopulateGrids()
+        {
+            if (MonthView != null)
+            {
+                for (int i = 0; i < Calendar.RowsPerMonth; i++)
+                {
+                    if (_dayTitleTemplate != null)
+                    {
+                        var cell = _dayTitleTemplate.Build();
+                        cell.SetValue(Grid.RowProperty, 0);
+                        cell.SetValue(Grid.ColumnProperty, i);
+                        MonthView.Children.Add(cell);
+                    }
+                }
+
+                for (int i = 1; i < Calendar.RowsPerMonth; i++)
+                {
+                    for (int j = 0; j < Calendar.ColumnsPerMonth; j++)
+                    {
+                        CalendarDayButton cell = new CalendarDayButton();
+
+                        if (Owner != null)
+                        {
+                            cell.Owner = Owner;
+                        }
+                        cell.SetValue(Grid.RowProperty, i);
+                        cell.SetValue(Grid.ColumnProperty, j);
+                        cell.CalendarDayButtonMouseDown += Cell_MouseLeftButtonDown;
+                        cell.CalendarDayButtonMouseUp += Cell_MouseLeftButtonUp;
+                        cell.PointerEnter += Cell_MouseEnter;
+                        cell.PointerLeave += Cell_MouseLeave;
+                        cell.Click += Cell_Click;
+                        MonthView.Children.Add(cell);
+                    }
+                }
+            }
+
+            if (YearView != null)
+            {
+                CalendarButton month;
+                for (int i = 0; i < Calendar.RowsPerYear; i++)
+                {
+                    for (int j = 0; j < Calendar.ColumnsPerYear; j++)
+                    {
+                        month = new CalendarButton();
+
+                        if (Owner != null)
+                        {
+                            month.Owner = Owner;
+                        }
+                        month.SetValue(Grid.RowProperty, i);
+                        month.SetValue(Grid.ColumnProperty, j);
+                        month.CalendarLeftMouseButtonDown += Month_CalendarButtonMouseDown;
+                        month.CalendarLeftMouseButtonUp += Month_CalendarButtonMouseUp;
+                        month.PointerEnter += Month_MouseEnter;
+                        month.PointerLeave += Month_MouseLeave;
+                        YearView.Children.Add(month);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Builds the visual tree for the
+        /// <see cref="T:System.Windows.Controls.Primitives.CalendarItem" />
+        /// when a new template is applied.
+        /// </summary>
+        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        {
+            base.OnTemplateApplied(e);
+            
+            HeaderButton = e.NameScope.Find<Button>(PART_ElementHeaderButton);
+            PreviousButton = e.NameScope.Find<Button>(PART_ElementPreviousButton);
+            NextButton = e.NameScope.Find<Button>(PART_ElementNextButton);
+            MonthView = e.NameScope.Find<Grid>(PART_ElementMonthView);
+            YearView = e.NameScope.Find<Grid>(PART_ElementYearView);
+            
+            if (Owner != null)
+            {
+                UpdateDisabled(Owner.IsEnabled);
+            }
+
+            PopulateGrids();
+
+            if (MonthView != null && YearView != null)
+            {
+                if (Owner != null)
+                {
+                    Owner.SelectedMonth = Owner.DisplayDateInternal;
+                    Owner.SelectedYear = Owner.DisplayDateInternal;
+
+                    if (Owner.DisplayMode == CalendarMode.Year)
+                    {
+                        UpdateYearMode();
+                    }
+                    else if (Owner.DisplayMode == CalendarMode.Decade)
+                    {
+                        UpdateDecadeMode();
+                    }
+
+                    if (Owner.DisplayMode == CalendarMode.Month)
+                    {
+                        UpdateMonthMode();
+                        MonthView.IsVisible = true;
+                        YearView.IsVisible = false;
+                    }
+                    else
+                    {
+                        YearView.IsVisible = true;
+                        MonthView.IsVisible = false;
+                    }
+                }
+                else
+                {
+                    UpdateMonthMode();
+                    MonthView.IsVisible = true;
+                    YearView.IsVisible = false;
+                }
+            }
+        }
+
+        private void SetDayTitles()
+        {
+            for (int childIndex = 0; childIndex < Calendar.ColumnsPerMonth; childIndex++)
+            {
+                var daytitle = MonthView.Children[childIndex];
+                if (daytitle != null)
+                {
+                    if (Owner != null)
+                    {
+                        daytitle.DataContext = DateTimeHelper.GetCurrentDateFormat().ShortestDayNames[(childIndex + (int)Owner.FirstDayOfWeek) % NumberOfDaysPerWeek];
+                    }
+                    else
+                    {
+                        daytitle.DataContext = DateTimeHelper.GetCurrentDateFormat().ShortestDayNames[(childIndex + (int)DateTimeHelper.GetCurrentDateFormat().FirstDayOfWeek) % NumberOfDaysPerWeek];
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// How many days of the previous month need to be displayed.
+        /// </summary>
+        private int PreviousMonthDays(DateTime firstOfMonth)
+        {
+            DayOfWeek day = _calendar.GetDayOfWeek(firstOfMonth);
+            int i;
+
+            if (Owner != null)
+            {
+                i = ((day - Owner.FirstDayOfWeek + NumberOfDaysPerWeek) % NumberOfDaysPerWeek);
+            }
+            else
+            {
+                i = ((day - DateTimeHelper.GetCurrentDateFormat().FirstDayOfWeek + NumberOfDaysPerWeek) % NumberOfDaysPerWeek);
+            }
+
+            if (i == 0)
+            {
+                return NumberOfDaysPerWeek;
+            }
+            else
+            {
+                return i;
+            }
+        }
+
+        internal void UpdateMonthMode()
+        {
+            if (Owner != null)
+            {
+                Debug.Assert(Owner.DisplayDate != null, "The Owner Calendar's DisplayDate should not be null!");
+                _currentMonth = Owner.DisplayDateInternal;
+            }
+            else
+            {
+                _currentMonth = DateTime.Today;
+            }
+
+            if (_currentMonth != null)
+            {
+                SetMonthModeHeaderButton();
+                SetMonthModePreviousButton(_currentMonth);
+                SetMonthModeNextButton(_currentMonth);
+
+                if (MonthView != null)
+                {
+                    SetDayTitles();
+                    SetCalendarDayButtons(_currentMonth);
+                }
+            }
+        }
+        private void SetMonthModeHeaderButton()
+        {
+            if (HeaderButton != null)
+            {
+                if (Owner != null)
+                {
+                    HeaderButton.Content = Owner.DisplayDateInternal.ToString("Y", DateTimeHelper.GetCurrentDateFormat());
+                    HeaderButton.IsEnabled = true;
+                }
+                else
+                {
+                    HeaderButton.Content = DateTime.Today.ToString("Y", DateTimeHelper.GetCurrentDateFormat());
+                }
+            }
+        }
+        private void SetMonthModeNextButton(DateTime firstDayOfMonth)
+        {
+            if (Owner != null && NextButton != null)
+            {
+                // DisplayDate is equal to DateTime.MaxValue
+                if (DateTimeHelper.CompareYearMonth(firstDayOfMonth, DateTime.MaxValue) == 0)
+                {
+                    NextButton.IsEnabled = false;
+                }
+                else
+                {
+                    // Since we are sure DisplayDate is not equal to
+                    // DateTime.MaxValue, it is safe to use AddMonths  
+                    DateTime firstDayOfNextMonth = _calendar.AddMonths(firstDayOfMonth, 1);
+                    NextButton.IsEnabled = (DateTimeHelper.CompareDays(Owner.DisplayDateRangeEnd, firstDayOfNextMonth) > -1);
+                }
+            }
+        }
+        private void SetMonthModePreviousButton(DateTime firstDayOfMonth)
+        {
+            if (Owner != null && PreviousButton != null)
+            {
+                PreviousButton.IsEnabled = (DateTimeHelper.CompareDays(Owner.DisplayDateRangeStart, firstDayOfMonth) < 0);
+            }
+        }
+
+        private void SetButtonState(CalendarDayButton childButton, DateTime dateToAdd)
+        {
+            if (Owner != null)
+            {
+                childButton.Opacity = 1;
+
+                // If the day is outside the DisplayDateStart/End boundary, do
+                // not show it
+                if (DateTimeHelper.CompareDays(dateToAdd, Owner.DisplayDateRangeStart) < 0 || DateTimeHelper.CompareDays(dateToAdd, Owner.DisplayDateRangeEnd) > 0)
+                {
+                    childButton.IsEnabled = false;
+                    childButton.IsToday = false;
+                    childButton.IsSelected = false;
+                    childButton.Opacity = 0;
+                }
+                else
+                {
+                    // SET IF THE DAY IS SELECTABLE OR NOT
+                    if (Owner.BlackoutDates.Contains(dateToAdd))
+                    {
+                        childButton.IsBlackout = true;
+                    }
+                    else
+                    {
+                        childButton.IsBlackout = false;
+                    }
+                    childButton.IsEnabled = true;
+
+                    // SET IF THE DAY IS INACTIVE OR NOT: set if the day is a
+                    // trailing day or not
+                    childButton.IsInactive = (DateTimeHelper.CompareYearMonth(dateToAdd, Owner.DisplayDateInternal) != 0);
+
+                    // SET IF THE DAY IS TODAY OR NOT
+                    childButton.IsToday = (Owner.IsTodayHighlighted && dateToAdd == DateTime.Today);
+
+                    // SET IF THE DAY IS SELECTED OR NOT
+                    childButton.IsSelected = false;
+                    foreach (DateTime item in Owner.SelectedDates)
+                    {
+                        // Since we should be comparing the Date values not
+                        // DateTime values, we can't use
+                        // Owner.SelectedDates.Contains(dateToAdd) directly
+                        childButton.IsSelected |= (DateTimeHelper.CompareDays(dateToAdd, item) == 0);
+                    }
+
+                    // SET THE FOCUS ELEMENT
+                    if (Owner.LastSelectedDate != null)
+                    {
+                        if (DateTimeHelper.CompareDays(Owner.LastSelectedDate.Value, dateToAdd) == 0)
+                        {
+                            if (Owner.FocusButton != null)
+                            {
+                                Owner.FocusButton.IsCurrent = false;
+                            }
+                            Owner.FocusButton = childButton;
+                            if (Owner.HasFocusInternal)
+                            {
+                                Owner.FocusButton.IsCurrent = true;
+                            }
+                        }
+                        else
+                        {
+                            childButton.IsCurrent = false;
+                        }
+                    }
+                }
+            }
+        }
+        private void SetCalendarDayButtons(DateTime firstDayOfMonth)
+        {
+            int lastMonthToDisplay = PreviousMonthDays(firstDayOfMonth);
+            DateTime dateToAdd;
+
+            if (DateTimeHelper.CompareYearMonth(firstDayOfMonth, DateTime.MinValue) > 0)
+            {
+                // DisplayDate is not equal to DateTime.MinValue we can subtract
+                // days from the DisplayDate
+                dateToAdd = _calendar.AddDays(firstDayOfMonth, -lastMonthToDisplay);
+            }
+            else
+            {
+                dateToAdd = firstDayOfMonth;
+            }
+
+            if (Owner != null && Owner.HoverEnd != null && Owner.HoverStart != null)
+            {
+                Owner.HoverEndIndex = null;
+                Owner.HoverStartIndex = null;
+            }
+
+            int count = Calendar.RowsPerMonth * Calendar.ColumnsPerMonth;
+
+            for (int childIndex = Calendar.ColumnsPerMonth; childIndex < count; childIndex++)
+            {
+                CalendarDayButton childButton = MonthView.Children[childIndex] as CalendarDayButton;
+                Debug.Assert(childButton != null, "childButton should not be null!");
+
+                childButton.Index = childIndex;
+                SetButtonState(childButton, dateToAdd);
+
+                // Update the indexes of hoverStart and hoverEnd
+                if (Owner != null && Owner.HoverEnd != null && Owner.HoverStart != null)
+                {
+                    if (DateTimeHelper.CompareDays(dateToAdd, Owner.HoverEnd.Value) == 0)
+                    {
+                        Owner.HoverEndIndex = childIndex;
+                    }
+
+                    if (DateTimeHelper.CompareDays(dateToAdd, Owner.HoverStart.Value) == 0)
+                    {
+                        Owner.HoverStartIndex = childIndex;
+                    }
+                }
+
+                //childButton.Focusable = false;
+                childButton.Content = dateToAdd.Day.ToString(DateTimeHelper.GetCurrentDateFormat());
+                childButton.DataContext = dateToAdd;
+
+                if (DateTime.Compare((DateTime)DateTimeHelper.DiscardTime(DateTime.MaxValue), dateToAdd) > 0)
+                {
+                    // Since we are sure DisplayDate is not equal to
+                    // DateTime.MaxValue, it is safe to use AddDays 
+                    dateToAdd = _calendar.AddDays(dateToAdd, 1);
+                }
+                else
+                {
+                    // DisplayDate is equal to the DateTime.MaxValue, so there
+                    // are no trailing days
+                    childIndex++;
+                    for (int i = childIndex; i < count; i++)
+                    {
+                        childButton = MonthView.Children[i] as CalendarDayButton;
+                        Debug.Assert(childButton != null, "childButton should not be null!");
+                        // button needs a content to occupy the necessary space
+                        // for the content presenter
+                        childButton.Content = i.ToString(DateTimeHelper.GetCurrentDateFormat());
+                        childButton.IsEnabled = false;
+                        childButton.Opacity = 0;
+                    }
+                    return;
+                }
+            }
+
+            // If the HoverStart or HoverEndInternal could not be found on the
+            // DisplayMonth set the values of the HoverStartIndex or
+            // HoverEndIndex to be the first or last day indexes on the current
+            // month
+            if (Owner != null && Owner.HoverStart.HasValue && Owner.HoverEndInternal.HasValue)
+            {
+                if (!Owner.HoverEndIndex.HasValue)
+                {
+                    if (DateTimeHelper.CompareDays(Owner.HoverEndInternal.Value, Owner.HoverStart.Value) > 0)
+                    {
+                        Owner.HoverEndIndex = Calendar.ColumnsPerMonth * Calendar.RowsPerMonth - 1;
+                    }
+                    else
+                    {
+                        Owner.HoverEndIndex = Calendar.ColumnsPerMonth;
+                    }
+                }
+
+                if (!Owner.HoverStartIndex.HasValue)
+                {
+                    if (DateTimeHelper.CompareDays(Owner.HoverEndInternal.Value, Owner.HoverStart.Value) > 0)
+                    {
+                        Owner.HoverStartIndex = Calendar.ColumnsPerMonth;
+                    }
+                    else
+                    {
+                        Owner.HoverStartIndex = Calendar.ColumnsPerMonth * Calendar.RowsPerMonth - 1;
+                    }
+                }
+            }
+        }
+
+        internal void UpdateYearMode()
+        {
+            if (Owner != null)
+            {
+                Debug.Assert(Owner.SelectedMonth != null, "The Owner Calendar's SelectedMonth should not be null!");
+                _currentMonth = (DateTime)Owner.SelectedMonth;
+            }
+            else
+            {
+                _currentMonth = DateTime.Today;
+            }
+
+            if (_currentMonth != null)
+            {
+                SetYearModeHeaderButton();
+                SetYearModePreviousButton();
+                SetYearModeNextButton();
+
+                if (YearView != null)
+                {
+                    SetMonthButtonsForYearMode();
+                }
+            }
+        }
+        private void SetYearModeHeaderButton()
+        {
+            if (HeaderButton != null)
+            {
+                HeaderButton.IsEnabled = true;
+                HeaderButton.Content = _currentMonth.Year.ToString(DateTimeHelper.GetCurrentDateFormat());
+            }
+        }
+        private void SetYearModePreviousButton()
+        {
+            if (Owner != null && PreviousButton != null)
+            {
+                PreviousButton.IsEnabled = (Owner.DisplayDateRangeStart.Year != _currentMonth.Year);
+            }
+        }
+        private void SetYearModeNextButton()
+        {
+            if (Owner != null && NextButton != null)
+            {
+                NextButton.IsEnabled = (Owner.DisplayDateRangeEnd.Year != _currentMonth.Year);
+            }
+        }
+
+        private void SetMonthButtonsForYearMode()
+        {
+            int count = 0;
+            foreach (object child in YearView.Children)
+            {
+                CalendarButton childButton = child as CalendarButton;
+                Debug.Assert(childButton != null, "childButton should not be null!");
+                // There should be no time component. Time is 12:00 AM
+                DateTime day = new DateTime(_currentMonth.Year, count + 1, 1);
+                childButton.DataContext = day;
+
+                childButton.Content = DateTimeHelper.GetCurrentDateFormat().AbbreviatedMonthNames[count];
+                childButton.IsVisible = true;
+
+                if (Owner != null)
+                {
+                    if (day.Year == _currentMonth.Year && day.Month == _currentMonth.Month && day.Day == _currentMonth.Day)
+                    {
+                        Owner.FocusCalendarButton = childButton;
+                        childButton.IsCalendarButtonFocused = Owner.HasFocusInternal;
+                    }
+                    else
+                    {
+                        childButton.IsCalendarButtonFocused = false;
+                    }
+
+                    Debug.Assert(Owner.DisplayDateInternal != null, "The Owner Calendar's DisplayDateInternal should not be null!");
+                    childButton.IsSelected = (DateTimeHelper.CompareYearMonth(day, Owner.DisplayDateInternal) == 0);
+
+                    if (DateTimeHelper.CompareYearMonth(day, Owner.DisplayDateRangeStart) < 0 || DateTimeHelper.CompareYearMonth(day, Owner.DisplayDateRangeEnd) > 0)
+                    {
+                        childButton.IsEnabled = false;
+                        childButton.Opacity = 0;
+                    }
+                    else
+                    {
+                        childButton.IsEnabled = true;
+                        childButton.Opacity = 1;
+                    }
+                }
+
+                childButton.IsInactive = false;
+                count++;
+            }
+        }
+        internal void UpdateDecadeMode()
+        {
+            DateTime selectedYear;
+
+            if (Owner != null)
+            {
+                Debug.Assert(Owner.SelectedYear != null, "The owning Calendar's selected year should not be null!");
+                selectedYear = Owner.SelectedYear;
+                _currentMonth = (DateTime)Owner.SelectedMonth;
+            }
+            else
+            {
+                _currentMonth = DateTime.Today;
+                selectedYear = DateTime.Today;
+            }
+
+            if (_currentMonth != null)
+            {
+                int decade = DateTimeHelper.DecadeOfDate(selectedYear);
+                int decadeEnd = DateTimeHelper.EndOfDecade(selectedYear);
+
+                SetDecadeModeHeaderButton(decade, decadeEnd);
+                SetDecadeModePreviousButton(decade);
+                SetDecadeModeNextButton(decadeEnd);
+
+                if (YearView != null)
+                {
+                    SetYearButtons(decade, decadeEnd);
+                }
+            }
+        }
+        internal void UpdateYearViewSelection(CalendarButton calendarButton)
+        {
+            if (Owner != null && calendarButton != null && calendarButton.DataContext != null)
+            {
+                Owner.FocusCalendarButton.IsCalendarButtonFocused = false;
+                Owner.FocusCalendarButton = calendarButton;
+                calendarButton.IsCalendarButtonFocused = Owner.HasFocusInternal;
+
+                if (Owner.DisplayMode == CalendarMode.Year)
+                {
+                    Owner.SelectedMonth = (DateTime)calendarButton.DataContext;
+                }
+                else
+                {
+                    Owner.SelectedYear = (DateTime)calendarButton.DataContext;
+                }
+            }
+        }
+
+        private void SetYearButtons(int decade, int decadeEnd)
+        {
+            int year;
+            int count = -1;
+            foreach (object child in YearView.Children)
+            {
+                CalendarButton childButton = child as CalendarButton;
+                Debug.Assert(childButton != null, "childButton should not be null!");
+                year = decade + count;
+
+                if (year <= DateTime.MaxValue.Year && year >= DateTime.MinValue.Year)
+                {
+                    // There should be no time component. Time is 12:00 AM
+                    DateTime day = new DateTime(year, 1, 1);
+                    childButton.DataContext = day;
+                    childButton.Content = year.ToString(DateTimeHelper.GetCurrentDateFormat());
+                    childButton.IsVisible = true;
+
+                    if (Owner != null)
+                    {
+                        if (year == Owner.SelectedYear.Year)
+                        {
+                            Owner.FocusCalendarButton = childButton;
+                            childButton.IsCalendarButtonFocused = Owner.HasFocusInternal;
+                        }
+                        else
+                        {
+                            childButton.IsCalendarButtonFocused = false;
+                        }
+                        childButton.IsSelected = (Owner.DisplayDate.Year == year);
+
+                        if (year < Owner.DisplayDateRangeStart.Year || year > Owner.DisplayDateRangeEnd.Year)
+                        {
+                            childButton.IsEnabled = false;
+                            childButton.Opacity = 0;
+                        }
+                        else
+                        {
+                            childButton.IsEnabled = true;
+                            childButton.Opacity = 1;
+                        }
+                    }
+
+                    // SET IF THE YEAR IS INACTIVE OR NOT: set if the year is a
+                    // trailing year or not
+                    childButton.IsInactive = (year < decade || year > decadeEnd);
+                }
+                else
+                {
+                    childButton.IsEnabled = false;
+                    childButton.Opacity = 0;
+                }
+
+                count++;
+            }
+        }
+        private void SetDecadeModeHeaderButton(int decade, int decadeEnd)
+        {
+            if (HeaderButton != null)
+            {
+                HeaderButton.Content = decade.ToString(CultureInfo.CurrentCulture) + "-" + decadeEnd.ToString(CultureInfo.CurrentCulture);
+                HeaderButton.IsEnabled = false;
+            }
+        }
+        private void SetDecadeModeNextButton(int decadeEnd)
+        {
+            if (Owner != null && NextButton != null)
+            {
+                NextButton.IsEnabled = (Owner.DisplayDateRangeEnd.Year > decadeEnd);
+            }
+        }
+        private void SetDecadeModePreviousButton(int decade)
+        {
+            if (Owner != null && PreviousButton != null)
+            {
+                PreviousButton.IsEnabled = (decade > Owner.DisplayDateRangeStart.Year);
+            }
+        }
+
+        internal void HeaderButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (Owner != null)
+            {
+                if (!Owner.HasFocusInternal)
+                {
+                    Owner.Focus();
+                }
+                Button b = sender as Button;
+                DateTime d;
+
+                if (b.IsEnabled)
+                {
+                    if (Owner.DisplayMode == CalendarMode.Month)
+                    {
+                        if (Owner.DisplayDate != null)
+                        {
+                            d = Owner.DisplayDateInternal;
+                            Owner.SelectedMonth = new DateTime(d.Year, d.Month, 1);
+                        }
+                        Owner.DisplayMode = CalendarMode.Year;
+                    }
+                    else
+                    {
+                        Debug.Assert(Owner.DisplayMode == CalendarMode.Year, "The Owner Calendar's DisplayMode should be Year!");
+
+                        if (Owner.SelectedMonth != null)
+                        {
+                            d = Owner.SelectedMonth;
+                            Owner.SelectedYear = new DateTime(d.Year, d.Month, 1);
+                        }
+                        Owner.DisplayMode = CalendarMode.Decade;
+                    }
+                }
+            }
+        }
+        internal void PreviousButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (Owner != null)
+            {
+                if (!Owner.HasFocusInternal)
+                {
+                    Owner.Focus();
+                }
+
+                Button b = sender as Button;
+                if (b.IsEnabled)
+                {
+                    Owner.OnPreviousClick();
+                }
+            }
+        }
+        internal void NextButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (Owner != null)
+            {
+                if (!Owner.HasFocusInternal)
+                {
+                    Owner.Focus();
+                }
+                Button b = sender as Button;
+
+                if (b.IsEnabled)
+                {
+                    Owner.OnNextClick();
+                }
+            }
+        }
+
+        internal void Cell_MouseEnter(object sender, PointerEventArgs e)
+        {
+            if (Owner != null)
+            {
+                CalendarDayButton b = sender as CalendarDayButton;
+                if (_isMouseLeftButtonDown && b != null && b.IsEnabled && !b.IsBlackout)
+                {
+                    // Update the states of all buttons to be selected starting
+                    // from HoverStart to b
+                    switch (Owner.SelectionMode)
+                    {
+                        case CalendarSelectionMode.SingleDate:
+                            {
+                                DateTime selectedDate = (DateTime)b.DataContext;
+                                Owner.DatePickerDisplayDateFlag = true;
+                                if (Owner.SelectedDates.Count == 0)
+                                {
+                                    Owner.SelectedDates.Add(selectedDate);
+                                }
+                                else
+                                {
+                                    Owner.SelectedDates[0] = selectedDate;
+                                }
+                                return;
+                            }
+                        case CalendarSelectionMode.SingleRange:
+                        case CalendarSelectionMode.MultipleRange:
+                            {
+                                Debug.Assert(b.DataContext != null, "The DataContext should not be null!");
+                                Owner.UnHighlightDays();
+                                Owner.HoverEndIndex = b.Index;
+                                Owner.HoverEnd = (DateTime)b.DataContext;
+                                // Update the States of the buttons
+                                Owner.HighlightDays();
+                                return;
+                            }
+                    }
+                }
+            }
+        }
+        internal void Cell_MouseLeave(object sender, PointerEventArgs e)
+        {
+            if (_isMouseLeftButtonDown)
+            {
+                CalendarDayButton b = sender as CalendarDayButton;
+                // The button is in Pressed state. Change the state to normal.
+                if (e.Device.Captured == b)
+                    e.Device.Capture(null);
+                // null check is added for unit tests
+                if (_downEventArg != null)
+                {
+                    var arg =
+                        new PointerReleasedEventArgs()
+                        {
+                            Device = _downEventArg.Device,
+                            MouseButton = _downEventArg.MouseButton,
+                            Handled = _downEventArg.Handled,
+                            InputModifiers = _downEventArg.InputModifiers,
+                            Route = _downEventArg.Route,
+                            Source = _downEventArg.Source
+                        };
+
+                    b.SendMouseLeftButtonUp(arg);
+                }
+                _lastCalendarDayButton = b;
+            }
+        }
+        internal void Cell_MouseLeftButtonDown(object sender, PointerPressedEventArgs e)
+        {
+            if (Owner != null)
+            {
+                if (!Owner.HasFocusInternal)
+                {
+                    Owner.Focus();
+                }
+
+                bool ctrl, shift;
+                CalendarExtensions.GetMetaKeyState(e.InputModifiers, out ctrl, out shift);
+                CalendarDayButton b = sender as CalendarDayButton;
+
+                if (b != null)
+                {
+                    _isControlPressed = ctrl;
+                    if (b.IsEnabled && !b.IsBlackout)
+                    {
+                        DateTime selectedDate = (DateTime)b.DataContext;
+                        Debug.Assert(selectedDate != null, "selectedDate should not be null!");
+                        _isMouseLeftButtonDown = true;
+                        // null check is added for unit tests
+                        if (e != null)
+                        {
+                            _downEventArg = e;
+                        }
+
+                        switch (Owner.SelectionMode)
+                        {
+                            case CalendarSelectionMode.None:
+                                {
+                                    return;
+                                }
+                            case CalendarSelectionMode.SingleDate:
+                                {
+                                    Owner.DatePickerDisplayDateFlag = true;
+                                    if (Owner.SelectedDates.Count == 0)
+                                    {
+                                        Owner.SelectedDates.Add(selectedDate);
+                                    }
+                                    else
+                                    {
+                                        Owner.SelectedDates[0] = selectedDate;
+                                    }
+                                    return;
+                                }
+                            case CalendarSelectionMode.SingleRange:
+                                {
+                                    // Set the start or end of the selection
+                                    // range
+                                    if (shift)
+                                    {
+                                        Owner.UnHighlightDays();
+                                        Owner.HoverEnd = selectedDate;
+                                        Owner.HoverEndIndex = b.Index;
+                                        Owner.HighlightDays();
+                                    }
+                                    else
+                                    {
+                                        Owner.UnHighlightDays();
+                                        Owner.HoverStart = selectedDate;
+                                        Owner.HoverStartIndex = b.Index;
+                                    }
+                                    return;
+                                }
+                            case CalendarSelectionMode.MultipleRange:
+                                {
+                                    if (shift)
+                                    {
+                                        if (!ctrl)
+                                        {
+                                            // clear the list, set the states to
+                                            // default
+                                            foreach (DateTime item in Owner.SelectedDates)
+                                            {
+                                                Owner.RemovedItems.Add(item);
+                                            }
+                                            Owner.SelectedDates.ClearInternal();
+                                        }
+                                        Owner.HoverEnd = selectedDate;
+                                        Owner.HoverEndIndex = b.Index;
+                                        Owner.HighlightDays();
+                                    }
+                                    else
+                                    {
+                                        if (!ctrl)
+                                        {
+                                            // clear the list, set the states to
+                                            // default
+                                            foreach (DateTime item in Owner.SelectedDates)
+                                            {
+                                                Owner.RemovedItems.Add(item);
+                                            }
+                                            Owner.SelectedDates.ClearInternal();
+                                            Owner.UnHighlightDays();
+                                        }
+                                        Owner.HoverStart = selectedDate;
+                                        Owner.HoverStartIndex = b.Index;
+                                    }
+                                    return;
+                                }
+                        }
+                    }
+                    else
+                    {
+                        // If a click occurs on a BlackOutDay we set the
+                        // HoverStart to be null
+                        Owner.HoverStart = null;
+                    }
+                }
+                else
+                {
+                    _isControlPressed = false;
+                }
+            }
+        }
+        private void AddSelection(CalendarDayButton b)
+        {
+            if (Owner != null)
+            {
+                Owner.HoverEndIndex = b.Index;
+                Owner.HoverEnd = (DateTime)b.DataContext;
+
+                if (Owner.HoverEnd != null && Owner.HoverStart != null)
+                {
+                    // this is selection with Mouse, we do not guarantee the
+                    // range does not include BlackOutDates.  AddRange method
+                    // will throw away the BlackOutDates based on the
+                    // SelectionMode
+                    Owner.IsMouseSelection = true;
+                    Owner.SelectedDates.AddRange(Owner.HoverStart.Value, Owner.HoverEnd.Value);
+                    Owner.OnDayClick((DateTime)b.DataContext);
+                }
+            }
+        }
+        internal void Cell_MouseLeftButtonUp(object sender, PointerReleasedEventArgs e)
+        {
+            if (Owner != null)
+            {
+                CalendarDayButton b = sender as CalendarDayButton;
+                if (b != null && !b.IsBlackout)
+                {
+                    Owner.OnDayButtonMouseUp(e);
+                }
+                _isMouseLeftButtonDown = false;
+                if (b != null && b.DataContext != null)
+                {
+                    if (Owner.SelectionMode == CalendarSelectionMode.None || Owner.SelectionMode == CalendarSelectionMode.SingleDate)
+                    {
+                        Owner.OnDayClick((DateTime)b.DataContext);
+                        return;
+                    }
+                    if (Owner.HoverStart.HasValue)
+                    {
+                        switch (Owner.SelectionMode)
+                        {
+                            case CalendarSelectionMode.SingleRange:
+                                {
+                                    // Update SelectedDates
+                                    foreach (DateTime item in Owner.SelectedDates)
+                                    {
+                                        Owner.RemovedItems.Add(item);
+                                    }
+                                    Owner.SelectedDates.ClearInternal();
+                                    AddSelection(b);
+                                    return;
+                                }
+                            case CalendarSelectionMode.MultipleRange:
+                                {
+                                    // add the selection (either single day or
+                                    // SingleRange day)
+                                    AddSelection(b);
+                                    return;
+                                }
+                        }
+                    }
+                    else
+                    {
+                        // If the day is Disabled but a trailing day we should
+                        // be able to switch months
+                        if (b.IsInactive && b.IsBlackout)
+                        {
+                            Owner.OnDayClick((DateTime)b.DataContext);
+                        }
+                    }
+                }
+            }
+        }
+        private void Cell_Click(object sender, RoutedEventArgs e)
+        {
+            if (Owner != null)
+            {
+                if (_isControlPressed && Owner.SelectionMode == CalendarSelectionMode.MultipleRange)
+                {
+                    CalendarDayButton b = sender as CalendarDayButton;
+                    Debug.Assert(b != null, "The sender should be a non-null CalendarDayButton!");
+
+                    if (b.IsSelected)
+                    {
+                        Owner.HoverStart = null;
+                        _isMouseLeftButtonDown = false;
+                        b.IsSelected = false;
+                        if (b.DataContext != null)
+                        {
+                            Owner.SelectedDates.Remove((DateTime)b.DataContext);
+                        }
+                    }
+                }
+            }
+            _isControlPressed = false;
+        }
+
+        private void Month_CalendarButtonMouseDown(object sender, PointerPressedEventArgs e)
+        {
+            CalendarButton b = sender as CalendarButton;
+            Debug.Assert(b != null, "The sender should be a non-null CalendarDayButton!");
+
+            _isMouseLeftButtonDownYearView = true;
+
+            if (e != null)
+            {
+                _downEventArgYearView = e;
+            }
+
+            UpdateYearViewSelection(b);
+        }
+
+        internal void Month_CalendarButtonMouseUp(object sender, PointerReleasedEventArgs e)
+        {
+            _isMouseLeftButtonDownYearView = false;
+
+            if (Owner != null)
+            {
+                DateTime newmonth = (DateTime)((CalendarButton)sender).DataContext;
+
+                if (Owner.DisplayMode == CalendarMode.Year)
+                {
+                    Owner.DisplayDate = newmonth;
+                    Owner.DisplayMode = CalendarMode.Month;
+                }
+                else
+                {
+                    Debug.Assert(Owner.DisplayMode == CalendarMode.Decade, "The owning Calendar should be in decade mode!");
+                    Owner.SelectedMonth = newmonth;
+                    Owner.DisplayMode = CalendarMode.Year;
+                }
+            }
+        }
+
+        private void Month_MouseEnter(object sender, PointerEventArgs e)
+        {
+            if (_isMouseLeftButtonDownYearView)
+            {
+                CalendarButton b = sender as CalendarButton;
+                Debug.Assert(b != null, "The sender should be a non-null CalendarDayButton!");
+                UpdateYearViewSelection(b);
+            }
+        }
+
+        private void Month_MouseLeave(object sender, PointerEventArgs e)
+        {
+            if (_isMouseLeftButtonDownYearView)
+            {
+                CalendarButton b = sender as CalendarButton;
+                // The button is in Pressed state. Change the state to normal.
+                if (e.Device.Captured == b)
+                    e.Device.Capture(null);
+                //b.ReleaseMouseCapture();
+                if (_downEventArgYearView != null)
+                {
+                    var args =
+                        new PointerReleasedEventArgs()
+                        {
+                            Device = _downEventArgYearView.Device,
+                            MouseButton = _downEventArgYearView.MouseButton,
+                            Handled = _downEventArgYearView.Handled,
+                            InputModifiers = _downEventArgYearView.InputModifiers,
+                            Route = _downEventArgYearView.Route,
+                            Source = _downEventArgYearView.Source
+                        };
+
+                    b.SendMouseLeftButtonUp(args);
+                }
+                _lastCalendarButton = b;
+            }
+        }
+        private void MonthView_MouseLeave(object sender, PointerEventArgs e)
+        {
+            if (_lastCalendarDayButton != null)
+            {
+                e.Device.Capture(_lastCalendarDayButton);
+            }
+        }
+
+        private void YearView_MouseLeave(object sender, PointerEventArgs e)
+        {
+            if (_lastCalendarButton != null)
+            {
+                e.Device.Capture(_lastCalendarButton);
+            }
+        }
+        
+        internal void UpdateDisabled(bool isEnabled)
+        {
+            PseudoClasses.Set(":calendardisabled", !isEnabled);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Calendar/DateTimeHelper.cs b/src/Avalonia.Controls/Calendar/DateTimeHelper.cs
new file mode 100644
index 0000000000..033bfc5726
--- /dev/null
+++ b/src/Avalonia.Controls/Calendar/DateTimeHelper.cs
@@ -0,0 +1,155 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using System;
+using System.Diagnostics;
+using System.Globalization;
+
+namespace Avalonia.Controls
+{
+    internal static class DateTimeHelper
+    {
+        public static DateTime? AddDays(DateTime time, int days)
+        {
+            System.Globalization.Calendar cal = new GregorianCalendar();
+            try
+            {
+                return cal.AddDays(time, days);
+            }
+            catch (ArgumentException)
+            {
+                return null;
+            }
+        }
+
+        public static DateTime? AddMonths(DateTime time, int months)
+        {
+            System.Globalization.Calendar cal = new GregorianCalendar();
+            try
+            {
+                return cal.AddMonths(time, months);
+            }
+            catch (ArgumentException)
+            {
+                return null;
+            }
+        }
+
+        public static DateTime? AddYears(DateTime time, int years)
+        {
+            System.Globalization.Calendar cal = new GregorianCalendar();
+            try
+            {
+                return cal.AddYears(time, years);
+            }
+            catch (ArgumentException)
+            {
+                return null;
+            }
+        }
+
+        public static int CompareDays(DateTime dt1, DateTime dt2)
+        {
+            return DateTime.Compare(DiscardTime(dt1).Value, DiscardTime(dt2).Value);
+        }
+
+        public static int CompareYearMonth(DateTime dt1, DateTime dt2)
+        {
+            return (dt1.Year - dt2.Year) * 12 + (dt1.Month - dt2.Month);
+        }
+
+        public static int DecadeOfDate(DateTime date)
+        {
+            return date.Year - (date.Year % 10);
+        }
+
+        public static DateTime DiscardDayTime(DateTime d)
+        {
+            int year = d.Year;
+            int month = d.Month;
+            DateTime newD = new DateTime(year, month, 1, 0, 0, 0);
+            return newD;
+        }
+
+        public static DateTime? DiscardTime(DateTime? d)
+        {
+            if (d == null)
+            {
+                return null;
+            }
+            return d.Value.Date;
+        }
+
+        public static int EndOfDecade(DateTime date)
+        {
+            return DecadeOfDate(date) + 9;
+        }
+
+        public static DateTimeFormatInfo GetCurrentDateFormat()
+        {
+            if (CultureInfo.CurrentCulture.Calendar is GregorianCalendar)
+            {
+                return CultureInfo.CurrentCulture.DateTimeFormat;
+            }
+            else
+            {
+                foreach (System.Globalization.Calendar cal in CultureInfo.CurrentCulture.OptionalCalendars)
+                {
+                    if (cal is GregorianCalendar)
+                    {
+                        // if the default calendar is not Gregorian, return the
+                        // first supported GregorianCalendar dtfi
+                        DateTimeFormatInfo dtfi = new CultureInfo(CultureInfo.CurrentCulture.Name).DateTimeFormat;
+                        dtfi.Calendar = cal;
+                        return dtfi;
+                    }
+                }
+
+                // if there are no GregorianCalendars in the OptionalCalendars
+                // list, use the invariant dtfi
+                DateTimeFormatInfo dt = new CultureInfo(CultureInfo.InvariantCulture.Name).DateTimeFormat;
+                dt.Calendar = new GregorianCalendar();
+                return dt;
+            }
+        }
+        public static bool InRange(DateTime date, CalendarDateRange range)
+        {
+            Debug.Assert(DateTime.Compare(range.Start, range.End) < 1, "The range should start before it ends!");
+
+            if (CompareDays(date, range.Start) > -1 && CompareDays(date, range.End) < 1)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        public static string ToYearMonthPatternString(DateTime date)
+        {
+            string result = string.Empty;
+            DateTimeFormatInfo format = GetCurrentDateFormat();
+
+            if (format != null)
+            {
+                result = date.ToString(format.YearMonthPattern, format);
+            }
+
+            return result;
+        }
+
+        public static string ToYearString(DateTime date)
+        {
+            string result = string.Empty;
+            DateTimeFormatInfo format = GetCurrentDateFormat();
+
+            if (format != null)
+            {
+                result = date.Year.ToString(format);
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs b/src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs
new file mode 100644
index 0000000000..1d48eaa1df
--- /dev/null
+++ b/src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs
@@ -0,0 +1,377 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using System;
+using System.Collections.ObjectModel;
+using System.Threading;
+
+namespace Avalonia.Controls.Primitives
+{
+    public sealed class SelectedDatesCollection : ObservableCollection<DateTime>
+    {
+        /// <summary>
+        /// Inherited code: Requires comment.
+        /// </summary>
+        private Collection<DateTime> _addedItems;
+
+        /// <summary>
+        /// Inherited code: Requires comment.
+        /// </summary>
+        private Thread _dispatcherThread;
+
+        /// <summary>
+        /// Inherited code: Requires comment.
+        /// </summary>
+        private bool _isCleared;
+
+        /// <summary>
+        /// Inherited code: Requires comment.
+        /// </summary>
+        private bool _isRangeAdded;
+
+        /// <summary>
+        /// Inherited code: Requires comment.
+        /// </summary>
+        private Calendar _owner;
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.Primitives.SelectedDatesCollection" />
+        /// class.
+        /// </summary>
+        /// <param name="owner">
+        /// The <see cref="T:Avalonia.Controls.Calendar" /> associated
+        /// with this object.
+        /// </param>
+        public SelectedDatesCollection(Calendar owner)
+        {
+            _owner = owner;
+            _addedItems = new Collection<DateTime>();
+            _dispatcherThread = Thread.CurrentThread;
+        }
+
+        private void InvokeCollectionChanged(System.Collections.IList removedItems, System.Collections.IList addedItems)
+        {
+            _owner.OnSelectedDatesCollectionChanged(new SelectionChangedEventArgs(null, addedItems, removedItems));
+        }
+
+        /// <summary>
+        /// Adds all the dates in the specified range, which includes the first
+        /// and last dates, to the collection.
+        /// </summary>
+        /// <param name="start">The first date to add to the collection.</param>
+        /// <param name="end">The last date to add to the collection.</param>
+        public void AddRange(DateTime start, DateTime end)
+        {
+            DateTime? rangeStart;
+
+            // increment parameter specifies if the Days were selected in
+            // Descending order or Ascending order based on this value, we add 
+            // the days in the range either in Ascending order or in Descending
+            // order
+            int increment = (DateTime.Compare(end, start) >= 0) ? 1 : -1;
+
+            _addedItems.Clear();
+
+            rangeStart = start;
+            _isRangeAdded = true;
+
+            if (_owner.IsMouseSelection)
+            {
+                // In Mouse Selection we allow the user to be able to add
+                // multiple ranges in one action in MultipleRange Mode.  In
+                // SingleRange Mode, we only add the first selected range.
+                while (rangeStart.HasValue && DateTime.Compare(end, rangeStart.Value) != -increment)
+                {
+                    if (Calendar.IsValidDateSelection(_owner, rangeStart))
+                    {
+                        Add(rangeStart.Value);
+                    }
+                    else
+                    {
+                        if (_owner.SelectionMode == CalendarSelectionMode.SingleRange)
+                        {
+                            _owner.HoverEnd = rangeStart.Value.AddDays(-increment);
+                            break;
+                        }
+                    }
+
+                    rangeStart = DateTimeHelper.AddDays(rangeStart.Value, increment);
+                }
+            }
+            else
+            {
+                // If CalendarSelectionMode.SingleRange and a user
+                // programmatically tries to add multiple ranges, we will throw
+                // away the old range and replace it with the new one.  In order
+                // to provide the removed items without an additional event, we
+                // are calling ClearInternal
+                if (_owner.SelectionMode == CalendarSelectionMode.SingleRange && Count > 0)
+                {
+                    foreach (DateTime item in this)
+                    {
+                        _owner.RemovedItems.Add(item);
+                    }
+                    ClearInternal();
+                }
+
+                while (rangeStart.HasValue && DateTime.Compare(end, rangeStart.Value) != -increment)
+                {
+                    Add(rangeStart.Value);
+                    rangeStart = DateTimeHelper.AddDays(rangeStart.Value, increment);
+                }
+            }
+
+            _owner.OnSelectedDatesCollectionChanged(new SelectionChangedEventArgs(null, _addedItems, _owner.RemovedItems));
+            _owner.RemovedItems.Clear();
+            _owner.UpdateMonths();
+            _isRangeAdded = false;
+        }
+
+        /// <summary>
+        /// Removes all items from the collection.
+        /// </summary>
+        /// <remarks>
+        /// This implementation raises the CollectionChanged event.
+        /// </remarks>
+        protected override void ClearItems()
+        {
+            if (!IsValidThread())
+            {
+                throw new NotSupportedException("This type of Collection does not support changes to its SourceCollection from a thread different from the Dispatcher thread.");
+            }
+            Collection<DateTime> addedItems = new Collection<DateTime>();
+            Collection<DateTime> removedItems = new Collection<DateTime>();
+
+            foreach (DateTime item in this)
+            {
+                removedItems.Add(item);
+            }
+
+            base.ClearItems();
+
+            // The event fires after SelectedDate changes
+            if (_owner.SelectionMode != CalendarSelectionMode.None && _owner.SelectedDate != null)
+            {
+                _owner.SelectedDate = null;
+            }
+
+            if (removedItems.Count != 0)
+            {
+                InvokeCollectionChanged(removedItems, addedItems);
+            }
+            _owner.UpdateMonths();
+        }
+
+        /// <summary>
+        /// Inserts an item into the collection at the specified index.
+        /// </summary>
+        /// <param name="index">
+        /// The zero-based index at which item should be inserted.
+        /// </param>
+        /// <param name="item">The object to insert.</param>
+        /// <remarks>
+        /// This implementation raises the CollectionChanged event.
+        /// </remarks>
+        protected override void InsertItem(int index, DateTime item)
+        {
+            if (!IsValidThread())
+            {
+                throw new NotSupportedException("This type of Collection does not support changes to its SourceCollection from a thread different from the Dispatcher thread.");
+            }
+
+            if (!Contains(item))
+            {
+                Collection<DateTime> addedItems = new Collection<DateTime>();
+
+                if (CheckSelectionMode())
+                {
+                    if (Calendar.IsValidDateSelection(_owner, item))
+                    {
+                        // If the Collection is cleared since it is SingleRange
+                        // and it had another range set the index to 0
+                        if (_isCleared)
+                        {
+                            index = 0;
+                            _isCleared = false;
+                        }
+
+                        base.InsertItem(index, item);
+
+                        // The event fires after SelectedDate changes
+                        if (index == 0 && !(_owner.SelectedDate.HasValue && DateTime.Compare(_owner.SelectedDate.Value, item) == 0))
+                        {
+                            _owner.SelectedDate = item;
+                        }
+
+                        if (!_isRangeAdded)
+                        {
+                            addedItems.Add(item);
+
+                            InvokeCollectionChanged(_owner.RemovedItems, addedItems);
+                            _owner.RemovedItems.Clear();
+                            int monthDifference = DateTimeHelper.CompareYearMonth(item, _owner.DisplayDateInternal);
+
+                            if (monthDifference < 2 && monthDifference > -2)
+                            {
+                                _owner.UpdateMonths();
+                            }
+                        }
+                        else
+                        {
+                            _addedItems.Add(item);
+                        }
+                    }
+                    else
+                    {
+                        throw new ArgumentOutOfRangeException("SelectedDate value is not valid.");
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Removes the item at the specified index of the collection.
+        /// </summary>
+        /// <param name="index">
+        /// The zero-based index of the element to remove.
+        /// </param>
+        /// <remarks>
+        /// This implementation raises the CollectionChanged event.
+        /// </remarks>
+        protected override void RemoveItem(int index)
+        {
+            if (!IsValidThread())
+            {
+                throw new NotSupportedException("This type of Collection does not support changes to its SourceCollection from a thread different from the Dispatcher thread.");
+            }
+
+            if (index >= Count)
+            {
+                base.RemoveItem(index);
+            }
+            else
+            {
+                Collection<DateTime> addedItems = new Collection<DateTime>();
+                Collection<DateTime> removedItems = new Collection<DateTime>();
+                int monthDifference = DateTimeHelper.CompareYearMonth(this[index], _owner.DisplayDateInternal);
+
+                removedItems.Add(this[index]);
+                base.RemoveItem(index);
+
+                // The event fires after SelectedDate changes
+                if (index == 0)
+                {
+                    if (Count > 0)
+                    {
+                        _owner.SelectedDate = this[0];
+                    }
+                    else
+                    {
+                        _owner.SelectedDate = null;
+                    }
+                }
+
+                InvokeCollectionChanged(removedItems, addedItems);
+
+                if (monthDifference < 2 && monthDifference > -2)
+                {
+                    _owner.UpdateMonths();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Replaces the element at the specified index.
+        /// </summary>
+        /// <param name="index">
+        /// The zero-based index of the element to replace.
+        /// </param>
+        /// <param name="item">
+        /// The new value for the element at the specified index.
+        /// </param>
+        /// <remarks>
+        /// This implementation raises the CollectionChanged event.
+        /// </remarks>
+        protected override void SetItem(int index, DateTime item)
+        {
+            if (!IsValidThread())
+            {
+                throw new NotSupportedException("This type of Collection does not support changes to its SourceCollection from a thread different from the Dispatcher thread.");
+            }
+
+            if (!Contains(item))
+            {
+                Collection<DateTime> addedItems = new Collection<DateTime>();
+                Collection<DateTime> removedItems = new Collection<DateTime>();
+
+                if (index >= Count)
+                {
+                    base.SetItem(index, item);
+                }
+                else
+                {
+                    if (item != null && DateTime.Compare(this[index], item) != 0 && Calendar.IsValidDateSelection(_owner, item))
+                    {
+                        removedItems.Add(this[index]);
+                        base.SetItem(index, item);
+                        addedItems.Add(item);
+
+                        // The event fires after SelectedDate changes
+                        if (index == 0 && !(_owner.SelectedDate.HasValue && DateTime.Compare(_owner.SelectedDate.Value, item) == 0))
+                        {
+                            _owner.SelectedDate = item;
+                        }
+                        InvokeCollectionChanged(removedItems, addedItems);
+
+                        int monthDifference = DateTimeHelper.CompareYearMonth(item, _owner.DisplayDateInternal);
+
+                        if (monthDifference < 2 && monthDifference > -2)
+                        {
+                            _owner.UpdateMonths();
+                        }
+                    }
+                }
+            }
+        }
+        
+        internal void ClearInternal()
+        {
+            base.ClearItems();
+        }
+        
+        private bool CheckSelectionMode()
+        {
+            if (_owner.SelectionMode == CalendarSelectionMode.None)
+            {
+                throw new InvalidOperationException("The SelectedDate property cannot be set when the selection mode is None.");
+            }
+            if (_owner.SelectionMode == CalendarSelectionMode.SingleDate && Count > 0)
+            {
+                throw new InvalidOperationException("The SelectedDates collection can be changed only in a multiple selection mode. Use the SelectedDate in a single selection mode.");
+            }
+
+            // if user tries to add an item into the SelectedDates in
+            // SingleRange mode, we throw away the old range and replace it with
+            // the new one in order to provide the removed items without an
+            // additional event, we are calling ClearInternal
+            if (_owner.SelectionMode == CalendarSelectionMode.SingleRange && !_isRangeAdded && Count > 0)
+            {
+                foreach (DateTime item in this)
+                {
+                    _owner.RemovedItems.Add(item);
+                }
+                ClearInternal();
+                _isCleared = true;
+            }
+            return true;
+        }
+        
+        private bool IsValidThread()
+        {
+            return Thread.CurrentThread == _dispatcherThread;
+        }
+    }
+}
diff --git a/src/Avalonia.Themes.Default/Calendar.xaml b/src/Avalonia.Themes.Default/Calendar.xaml
new file mode 100644
index 0000000000..5e4306c217
--- /dev/null
+++ b/src/Avalonia.Themes.Default/Calendar.xaml
@@ -0,0 +1,30 @@
+<!--
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+-->
+
+<Styles xmlns="https://github.com/avaloniaui">
+  <Style Selector="Calendar">
+    <!--<Setter Property="Focusable" Value="False" />-->
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderDarkBrush}" />
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="HeaderBackground" Value="{DynamicResource ThemeAccentBrush2}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <StackPanel Name="Root"
+                    HorizontalAlignment="Center">
+
+          <CalendarItem Name="CalendarItem"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        HeaderBackground="{TemplateBinding HeaderBackground}"/>
+
+        </StackPanel>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+</Styles>
\ No newline at end of file
diff --git a/src/Avalonia.Themes.Default/CalendarButton.xaml b/src/Avalonia.Themes.Default/CalendarButton.xaml
new file mode 100644
index 0000000000..5f3cba5c7a
--- /dev/null
+++ b/src/Avalonia.Themes.Default/CalendarButton.xaml
@@ -0,0 +1,80 @@
+<!--
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+-->
+
+<Styles xmlns="https://github.com/avaloniaui">
+  <Style Selector="CalendarButton">
+    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeSmall}" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="MinWidth" Value="37" />
+    <Setter Property="MinHeight" Value="38" />
+    <Setter Property="Focusable" Value="False"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid>
+
+          <Rectangle Name="SelectedBackground"
+                     Opacity="0.75"
+                     Fill="{TemplateBinding Background}"/>
+
+          <Rectangle Name="Background"
+                     Opacity="0.5"
+                     Fill="{TemplateBinding Background}"/>
+
+          <!--Focusable="False"-->
+          <ContentControl Name="Content"
+                          Foreground="#FF333333"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                          FontSize="{TemplateBinding FontSize}"
+                          Margin="1,0,1,1"/>
+
+          <Rectangle Name="FocusVisual"
+                     StrokeThickness="1"
+                     Stroke="{DynamicResource HighlightBrush}"
+                     IsHitTestVisible="False"/>
+
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="CalendarButton /template/ Rectangle#Background">
+    <Setter Property="IsVisible" Value="False"/>
+  </Style>
+  <Style Selector="CalendarButton:pointerover /template/ Rectangle#Background">
+    <Setter Property="IsVisible" Value="True"/>
+  </Style>
+  <Style Selector="CalendarButton:pressed /template/ Rectangle#Background">
+    <Setter Property="IsVisible" Value="True"/>
+  </Style>
+
+  <Style Selector="CalendarButton /template/ Rectangle#SelectedBackground">
+    <Setter Property="IsVisible" Value="False"/>
+  </Style>
+  <Style Selector="CalendarButton:selected /template/ Rectangle#SelectedBackground">
+    <Setter Property="IsVisible" Value="True"/>
+  </Style>
+
+  <Style Selector="CalendarButton /template/ ContentControl#Content">
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
+  </Style>
+  <Style Selector="CalendarButton:inactive /template/ ContentControl#Content">
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLightBrush}"/>
+  </Style>
+
+
+  <Style Selector="CalendarButton /template/ Rectangle#FocusVisual">
+    <Setter Property="IsVisible" Value="False"/>
+  </Style>
+  <Style Selector="CalendarButton:btnfocused /template/ Rectangle#FocusVisual">
+    <Setter Property="IsVisible" Value="True"/>
+  </Style>
+</Styles>
\ No newline at end of file
diff --git a/src/Avalonia.Themes.Default/CalendarDayButton.xaml b/src/Avalonia.Themes.Default/CalendarDayButton.xaml
new file mode 100644
index 0000000000..fcb5cab0c9
--- /dev/null
+++ b/src/Avalonia.Themes.Default/CalendarDayButton.xaml
@@ -0,0 +1,116 @@
+<!--
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+-->
+
+<Styles xmlns="https://github.com/avaloniaui">
+  <Style Selector="CalendarDayButton">
+    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeSmall}" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="MinWidth" Value="5" />
+    <Setter Property="MinHeight" Value="5" />
+    <Setter Property="Focusable" Value="False"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+
+          <Rectangle Name="TodayBackground"
+                     Fill="{DynamicResource HighlightBrush}"/>
+
+          <Rectangle Name="SelectedBackground"
+                     Opacity="0.75"
+                     Fill="{TemplateBinding Background}"/>
+
+          <Rectangle Name="Background"
+                     Opacity="0.5"
+                     Fill="{TemplateBinding Background}"/>
+
+          <ContentControl Name="Content"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                          FontSize="{TemplateBinding FontSize}"
+                          Margin="5,1,5,1"/>
+
+          <Path Name="BlackoutVisual"
+                Margin="3"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                RenderTransformOrigin="0.5,0.5"
+                Fill="#FF000000"
+                Stretch="Fill"
+                Data="M8.1772461,11.029181 L10.433105,11.029181 L11.700684,12.801641 L12.973633,11.029181 L15.191895,11.029181 L12.844727,13.999395 L15.21875,17.060919 L12.962891,17.060919 L11.673828,15.256231 L10.352539,17.060919 L8.1396484,17.060919 L10.519043,14.042364 z" />
+          
+          <Rectangle Name="FocusVisual"
+                     StrokeThickness="1"
+                     Stroke="{DynamicResource HighlightBrush}"
+                     IsHitTestVisible="False"/>
+
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="CalendarDayButton /template/ Rectangle#Background">
+    <Setter Property="IsVisible" Value="False"/>
+  </Style>
+  <Style Selector="CalendarDayButton:pointerover /template/ Rectangle#Background">
+    <Setter Property="IsVisible" Value="True"/>
+  </Style>
+  <Style Selector="CalendarDayButton:pressed /template/ Rectangle#Background">
+    <Setter Property="IsVisible" Value="True"/>
+  </Style>
+
+  <Style Selector="CalendarDayButton /template/ Rectangle#SelectedBackground">
+    <Setter Property="IsVisible" Value="False"/>
+  </Style>
+  <Style Selector="CalendarDayButton:selected /template/ Rectangle#SelectedBackground">
+    <Setter Property="IsVisible" Value="True"/>
+  </Style>
+
+  <Style Selector="CalendarDayButton /template/ ContentControl#Content">
+    <Setter Property="Opacity" Value="1"/>
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
+  </Style>
+  <Style Selector="CalendarDayButton:disabled /template/ Rectangle#Background">
+    <Setter Property="IsVisible" Value="False"/>
+  </Style>
+  <Style Selector="CalendarDayButton:disabled /template/ ContentControl#Content">
+    <Setter Property="Opacity" Value="0.3"/>
+  </Style>
+
+  <Style Selector="CalendarDayButton /template/ Rectangle#FocusVisual">
+    <Setter Property="IsVisible" Value="False"/>
+  </Style>
+  <Style Selector="CalendarDayButton:dayfocused /template/ Rectangle#FocusVisual">
+    <Setter Property="IsVisible" Value="True"/>
+  </Style>
+
+  <Style Selector="CalendarDayButton /template/ Rectangle#TodayBackground">
+    <Setter Property="IsVisible" Value="False"/>
+  </Style>
+  <Style Selector="CalendarDayButton:today /template/ Rectangle#TodayBackground">
+    <Setter Property="IsVisible" Value="True"/>
+  </Style>
+
+
+  <Style Selector="CalendarDayButton:inactive /template/ ContentControl#Content">
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLightBrush}"/>
+  </Style>
+  <Style Selector="CalendarDayButton:today /template/ ContentControl#Content">
+    <Setter Property="Foreground" Value="#FFFFFFFF"/>
+  </Style>
+
+  <Style Selector="CalendarDayButton /template/ Path#BlackoutVisual">
+    <Setter Property="Opacity" Value="0"/>
+  </Style>
+  <Style Selector="CalendarDayButton:blackout /template/ Path#BlackoutVisual">
+    <Setter Property="Opacity" Value="0.3"/>
+  </Style>  
+
+</Styles>
\ No newline at end of file
diff --git a/src/Avalonia.Themes.Default/CalendarItem.xaml b/src/Avalonia.Themes.Default/CalendarItem.xaml
new file mode 100644
index 0000000000..73d9945677
--- /dev/null
+++ b/src/Avalonia.Themes.Default/CalendarItem.xaml
@@ -0,0 +1,209 @@
+<!--
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+-->
+
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Style Selector="CalendarItem">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <Border BorderThickness="{TemplateBinding BorderThickness}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  Background="{TemplateBinding Background}"
+                  Margin="0,2,0,2"
+                  CornerRadius="1">
+
+            <Border CornerRadius="1"
+                    BorderBrush="{DynamicResource ThemeBackgroundBrush}"
+                    BorderThickness="2">
+              <Grid>
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <Grid.Styles>
+                  <Style Selector="Button.Header">
+                    <Setter Property="Template">
+                      <ControlTemplate>
+                        <Panel Cursor="Hand">
+                          <ContentControl Name="Content"
+                                          Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          Margin="1,5,1,9"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        </Panel>
+                      </ControlTemplate>
+                    </Setter>
+                  </Style>
+                  <Style Selector="Button.Header /template/ ContentControl#Content">
+                    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
+                  </Style>
+                  <Style Selector="Button.Header:pointerover /template/ ContentControl#Content">
+                    <Setter Property="Foreground" Value="{DynamicResource HighlightBrush}"/>
+                  </Style>
+
+                  <Style Selector="Button.Previous">
+                    <Setter Property="Template">
+                      <ControlTemplate>
+                        <Panel Cursor="Hand">
+                          <Path Name="IconPath"
+                                Margin="14,-6,0,0"
+                                Height="10"
+                                Width="6"
+                                VerticalAlignment="Center"
+                                HorizontalAlignment="Left"
+                                Stretch="Fill"
+                                Data="M288.75,232.25 L288.75,240.625 L283,236.625 z" />
+                        </Panel>
+                      </ControlTemplate>
+                    </Setter>
+                  </Style>
+                  <Style Selector="Button.Previous /template/ Path#IconPath">
+                    <Setter Property="Fill" Value="{DynamicResource ThemeForegroundBrush}"/>
+                  </Style>
+                  <Style Selector="Button.Previous:pointerover /template/ Path#IconPath">
+                    <Setter Property="Fill" Value="{DynamicResource HighlightBrush}"/>
+                  </Style>
+
+                  <Style Selector="Button.Next">
+                    <Setter Property="Template">
+                      <ControlTemplate>
+                        <Panel Cursor="Hand">
+                          <Path Name="IconPath"
+                                Margin="0,-6,14,0"
+                                Height="10"
+                                Width="6"
+                                Stretch="Fill"
+                                VerticalAlignment="Center"
+                                HorizontalAlignment="Right"
+                                Data="M282.875,231.875 L282.875,240.375 L288.625,236 z" />
+                        </Panel>
+                      </ControlTemplate>
+                    </Setter>
+                  </Style>
+                  <Style Selector="Button.Next /template/ Path#IconPath">
+                    <Setter Property="Fill" Value="{DynamicResource ThemeForegroundBrush}"/>
+                  </Style>
+                  <Style Selector="Button.Next:pointerover /template/ Path#IconPath">
+                    <Setter Property="Fill" Value="{DynamicResource HighlightBrush}"/>
+                  </Style>
+                </Grid.Styles>
+
+                <Rectangle Grid.ColumnSpan="3"
+                           Fill="{TemplateBinding HeaderBackground}"
+                           Stretch="Fill"
+                           VerticalAlignment="Top"
+                           Height="22"/>
+
+                <Button Name="PreviousButton"
+                        Classes="Previous"
+                        Height="20"
+                        Width="28"
+                        IsVisible="False"
+                        HorizontalAlignment="Left"/>
+
+                <Button Name="HeaderButton"
+                        Classes="Header"
+                        Grid.Column="1"
+                        FontWeight="Bold"
+                        FontSize="10.5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center" />
+
+                <Button Name="NextButton"
+                        Classes="Next"
+                        Grid.Column="2"
+                        Height="20"
+                        Width="28"
+                        IsVisible="False"
+                        HorizontalAlignment="Right" />
+
+                <Grid Name="MonthView"
+                      Grid.Row="1"
+                      Grid.ColumnSpan="3"
+                      IsVisible="False"
+                      Margin="6,-1,6,6">
+                  <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                  </Grid.RowDefinitions>
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                  </Grid.ColumnDefinitions>
+                </Grid>
+
+                <Grid Name="YearView"
+                      Grid.Row="1"
+                      Grid.ColumnSpan="3"
+                      IsVisible="False"
+                      Margin="6,-3,7,6">
+                  <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                  </Grid.RowDefinitions>
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                  </Grid.ColumnDefinitions>
+                </Grid>
+
+              </Grid>
+            </Border>
+          </Border>
+
+
+          <Rectangle Name="DisabledVisual"
+                     Stretch="Fill"
+                     Fill="#FFFFFFFF"
+                     Opacity="{DynamicResource ThemeDisabledOpacity}"
+                     Margin="0,2,0,2" />
+
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+    <Setter Property="DayTitleTemplate">
+      <Template>
+        <TextBlock FontWeight="Bold"
+                   FontSize="9.5"
+                   Margin="0,4,0,4"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Center"
+                   Text="{Binding}" />
+      </Template>
+
+    </Setter>
+  </Style>
+
+  <Style Selector="CalendarItem /template/ Rectangle#DisabledVisual">
+    <Setter Property="IsVisible" Value="False"/>
+  </Style>
+  <Style Selector="CalendarItem:calendardisabled /template/ Rectangle#DisabledVisual">
+    <Setter Property="IsVisible" Value="True"/>
+  </Style>
+
+</Styles>
\ No newline at end of file
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
index 48f530cca8..ae00f0757a 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml
@@ -36,4 +36,8 @@
   <StyleInclude Source="resm:Avalonia.Themes.Default.TreeViewItem.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.Window.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.EmbeddableControlRoot.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.CalendarButton.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.CalendarDayButton.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.CalendarItem.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.Calendar.xaml?assembly=Avalonia.Themes.Default"/>
 </Styles>

From bd17aeffe20046c7bc35e5012e24cb9827727ab3 Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Tue, 24 Oct 2017 04:44:58 -0400
Subject: [PATCH 139/482] Adds Unit Tests for the Calendar Control

---
 .../CalendarTests.cs                          | 277 ++++++++++++++++++
 1 file changed, 277 insertions(+)
 create mode 100644 tests/Avalonia.Controls.UnitTests/CalendarTests.cs

diff --git a/tests/Avalonia.Controls.UnitTests/CalendarTests.cs b/tests/Avalonia.Controls.UnitTests/CalendarTests.cs
new file mode 100644
index 0000000000..4c45b1b230
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/CalendarTests.cs
@@ -0,0 +1,277 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Xunit;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Avalonia.Controls.UnitTests
+{
+    public class CalendarTests
+    {
+        private static bool CompareDates(DateTime first, DateTime second)
+        {
+            return first.Year == second.Year && 
+                first.Month == second.Month &&
+                first.Day == second.Day;
+        }
+
+        [Fact]
+        public void SelectedDatesChanged_Should_Fire_When_SelectedDate_Set()
+        {
+            bool handled = false;
+            Calendar calendar = new Calendar();
+            calendar.SelectionMode = CalendarSelectionMode.SingleDate;
+            calendar.SelectedDatesChanged += new EventHandler<SelectionChangedEventArgs>(delegate
+            {
+                handled = true;
+            });
+            DateTime value = new DateTime(2000, 10, 10);
+            calendar.SelectedDate = value;
+            Assert.True(handled);
+        }
+
+        [Fact]
+        public void DisplayDateChanged_Should_Fire_When_DisplayDate_Set()
+        {
+            bool handled = false;
+            Calendar calendar = new Calendar();
+            calendar.SelectionMode = CalendarSelectionMode.SingleDate;
+            calendar.DisplayDateChanged += new EventHandler<CalendarDateChangedEventArgs>(delegate
+            {
+                handled = true;
+            });
+            DateTime value = new DateTime(2000, 10, 10);
+            calendar.DisplayDate = value;
+            Assert.True(handled);
+        }
+
+        [Fact]
+        public void Setting_Selected_Date_To_Blackout_Date_Should_Throw()
+        {
+            Calendar calendar = new Calendar();
+            calendar.BlackoutDates.AddDatesInPast();
+
+            Assert.ThrowsAny<ArgumentOutOfRangeException>(
+                () => calendar.SelectedDate = DateTime.Today.AddDays(-1));
+        }
+
+        [Fact]
+        public void Setting_Selected_Date_To_Blackout_Date_Should_Throw_Range()
+        {
+            Calendar calendar = new Calendar();
+            calendar.BlackoutDates.Add(new CalendarDateRange(DateTime.Today, DateTime.Today.AddDays(10)));
+
+            calendar.SelectedDate = DateTime.Today.AddDays(-1);
+            Assert.True(CompareDates(calendar.SelectedDate.Value, DateTime.Today.AddDays(-1)));
+            Assert.True(CompareDates(calendar.SelectedDate.Value, calendar.SelectedDates[0]));
+
+            calendar.SelectedDate = DateTime.Today.AddDays(11);
+            Assert.True(CompareDates(calendar.SelectedDate.Value, DateTime.Today.AddDays(11)));
+            Assert.True(CompareDates(calendar.SelectedDate.Value, calendar.SelectedDates[0]));
+
+            Assert.ThrowsAny<ArgumentOutOfRangeException>(
+                () => calendar.SelectedDate = DateTime.Today.AddDays(5));
+        }
+
+        [Fact]
+        public void Adding_Blackout_Dates_Containing_Selected_Date_Should_Throw()
+        {
+            Calendar calendar = new Calendar();
+            calendar.SelectedDate = DateTime.Today.AddDays(5);
+
+            Assert.ThrowsAny<ArgumentOutOfRangeException>(
+                () => calendar.BlackoutDates.Add(new CalendarDateRange(DateTime.Today, DateTime.Today.AddDays(10))));
+        }
+
+        [Fact]
+        public void DisplayDateStartEnd_Should_Constrain_Display_Date()
+        {
+            Calendar calendar = new Calendar();
+            calendar.SelectionMode = CalendarSelectionMode.SingleDate;
+            calendar.DisplayDateStart = new DateTime(2005, 12, 30);
+
+            DateTime value = new DateTime(2005, 12, 15);
+            calendar.DisplayDate = value;
+            Assert.True(CompareDates(calendar.DisplayDate, calendar.DisplayDateStart.Value));
+
+            value = new DateTime(2005, 12, 30);
+            calendar.DisplayDate = value;
+            Assert.True(CompareDates(calendar.DisplayDate, value));
+
+            value = DateTime.MaxValue;
+            calendar.DisplayDate = value;
+            Assert.True(CompareDates(calendar.DisplayDate, value));
+
+            calendar.DisplayDateEnd = new DateTime(2010, 12, 30);
+            Assert.True(CompareDates(calendar.DisplayDate, calendar.DisplayDateEnd.Value));
+        }
+
+        [Fact]
+        public void Setting_DisplayDateEnd_Should_Alter_DispalyDate_And_DisplayDateStart()
+        {
+            Calendar calendar = new Calendar();
+            DateTime value = new DateTime(2000, 1, 30);
+
+            calendar.DisplayDate = value;
+            calendar.DisplayDateEnd = value;
+            calendar.DisplayDateStart = value;
+            Assert.True(CompareDates(calendar.DisplayDateStart.Value, value));
+            Assert.True(CompareDates(calendar.DisplayDateEnd.Value, value));
+
+            value = value.AddMonths(2);
+            calendar.DisplayDateStart = value;
+            Assert.True(CompareDates(calendar.DisplayDateStart.Value, value));
+            Assert.True(CompareDates(calendar.DisplayDateEnd.Value, value));
+            Assert.True(CompareDates(calendar.DisplayDate, value));
+        }
+
+        [Fact]
+        public void Display_Date_Range_End_Will_Contain_SelectedDate()
+        {
+            Calendar calendar = new Calendar();
+            calendar.SelectionMode = CalendarSelectionMode.SingleDate;
+
+            calendar.SelectedDate = DateTime.MaxValue;
+            Assert.True(CompareDates((DateTime)calendar.SelectedDate, DateTime.MaxValue));
+
+            calendar.DisplayDateEnd = DateTime.MaxValue.AddDays(-1);
+            Assert.True(CompareDates((DateTime)calendar.DisplayDateEnd, DateTime.MaxValue));
+        }
+
+
+        /// <summary>
+        /// The days added to the SelectedDates collection.
+        /// </summary>
+        private IList<object> _selectedDatesChangedAddedDays;
+
+        /// <summary>
+        /// The days removed from the SelectedDates collection.
+        /// </summary>
+        private IList<object> _selectedDateChangedRemovedDays;
+
+        /// <summary>
+        /// The number of times the SelectedDatesChanged event has been fired.
+        /// </summary>
+        private int _selectedDatesChangedCount;
+
+        /// <summary>
+        /// Handle the SelectedDatesChanged event.
+        /// </summary>
+        /// <param name="sender">The calendar.</param>
+        /// <param name="e">Event arguments.</param>
+        private void OnSelectedDatesChanged(object sender, SelectionChangedEventArgs e)
+        {
+            _selectedDatesChangedAddedDays =
+                e.AddedItems
+                 .Cast<object>()
+                 .ToList();
+            _selectedDateChangedRemovedDays = 
+                e.RemovedItems
+                 .Cast<object>()
+                 .ToList();
+            _selectedDatesChangedCount++;
+        }
+
+        /// <summary>
+        /// Clear the variables used to track the SelectedDatesChanged event.
+        /// </summary>
+        private void ResetSelectedDatesChanged()
+        {
+            if (_selectedDatesChangedAddedDays != null)
+            {
+                _selectedDatesChangedAddedDays.Clear();
+            }
+
+            if (_selectedDateChangedRemovedDays != null)
+            {
+                _selectedDateChangedRemovedDays.Clear();
+            }
+
+            _selectedDatesChangedCount = 0;
+        }
+
+        [Fact]
+        public void SingleDate_Selection_Behavior()
+        {
+            ResetSelectedDatesChanged();
+            Calendar calendar = new Calendar();
+            calendar.SelectedDatesChanged += new EventHandler<SelectionChangedEventArgs>(OnSelectedDatesChanged);
+            calendar.SelectionMode = CalendarSelectionMode.SingleDate;
+            calendar.SelectedDate = DateTime.Today;
+            Assert.True(CompareDates(calendar.SelectedDate.Value, DateTime.Today));
+            Assert.True(calendar.SelectedDates.Count == 1);
+            Assert.True(CompareDates(calendar.SelectedDates[0], DateTime.Today));
+            Assert.True(_selectedDatesChangedCount == 1);
+            Assert.True(_selectedDatesChangedAddedDays.Count == 1);
+            Assert.True(_selectedDateChangedRemovedDays.Count == 0);
+            ResetSelectedDatesChanged();
+
+            calendar.SelectedDate = DateTime.Today;
+            Assert.True(CompareDates(calendar.SelectedDate.Value, DateTime.Today));
+            Assert.True(calendar.SelectedDates.Count == 1);
+            Assert.True(CompareDates(calendar.SelectedDates[0], DateTime.Today));
+            Assert.True(_selectedDatesChangedCount == 0);
+
+            calendar.ClearValue(Calendar.SelectedDateProperty);
+
+            calendar.SelectionMode = CalendarSelectionMode.None;
+            Assert.True(calendar.SelectedDates.Count == 0);
+            Assert.Null(calendar.SelectedDate);
+
+            calendar.SelectionMode = CalendarSelectionMode.SingleDate;
+
+            calendar.SelectedDates.Add(DateTime.Today.AddDays(1));
+            Assert.True(CompareDates(calendar.SelectedDate.Value, DateTime.Today.AddDays(1)));
+            Assert.True(calendar.SelectedDates.Count == 1);
+
+            Assert.ThrowsAny<InvalidOperationException>(
+                () => calendar.SelectedDates.Add(DateTime.Today.AddDays(2)));
+        }
+
+        [Fact]
+        public void SingleRange_Selection_Behavior()
+        {
+            ResetSelectedDatesChanged();
+            Calendar calendar = new Calendar();
+            calendar.SelectedDatesChanged += new EventHandler<SelectionChangedEventArgs>(OnSelectedDatesChanged);
+            calendar.SelectionMode = CalendarSelectionMode.SingleRange;
+            calendar.SelectedDate = DateTime.Today;
+            Assert.True(CompareDates(calendar.SelectedDate.Value, DateTime.Today));
+            Assert.True(calendar.SelectedDates.Count == 1);
+            Assert.True(CompareDates(calendar.SelectedDates[0], DateTime.Today));
+            Assert.True(_selectedDatesChangedCount == 1);
+            Assert.True(_selectedDatesChangedAddedDays.Count == 1);
+            Assert.True(_selectedDateChangedRemovedDays.Count == 0);
+            ResetSelectedDatesChanged();
+
+            calendar.SelectedDates.Clear();
+            Assert.Null(calendar.SelectedDate);
+            ResetSelectedDatesChanged();
+
+            calendar.SelectedDates.AddRange(DateTime.Today, DateTime.Today.AddDays(10));
+            Assert.True(CompareDates(calendar.SelectedDate.Value, DateTime.Today));
+            Assert.True(calendar.SelectedDates.Count == 11);
+            ResetSelectedDatesChanged();
+
+            calendar.SelectedDates.AddRange(DateTime.Today, DateTime.Today.AddDays(10));
+            Assert.True(calendar.SelectedDates.Count == 11);
+            Assert.True(_selectedDatesChangedCount == 0);
+            ResetSelectedDatesChanged();
+
+            calendar.SelectedDates.AddRange(DateTime.Today.AddDays(-20), DateTime.Today);
+            Assert.True(CompareDates(calendar.SelectedDate.Value, DateTime.Today.AddDays(-20)));
+            Assert.True(calendar.SelectedDates.Count == 21);
+            Assert.True(_selectedDatesChangedCount == 1);
+            Assert.True(_selectedDatesChangedAddedDays.Count == 21);
+            Assert.True(_selectedDateChangedRemovedDays.Count == 11);
+            ResetSelectedDatesChanged();
+
+            calendar.SelectedDates.Add(DateTime.Today.AddDays(100));
+            Assert.True(CompareDates(calendar.SelectedDate.Value, DateTime.Today.AddDays(100)));
+            Assert.True(calendar.SelectedDates.Count == 1);
+        }
+    }
+}

From da8267ade75006766cbb97438b2ce8ad0584512b Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Tue, 24 Oct 2017 12:00:17 -0500
Subject: [PATCH 140/482] Fix last binding test. Two-way bindings via the
 indexer binding should not cause a PriorityBindingEntry to be created in the
 target. So instead use SetValue + GetObservable (similar to our higher level
 implementations in Avalonia.Markup).

---
 src/Avalonia.Base/AvaloniaObject.cs           | 23 +--------
 src/Avalonia.Base/AvaloniaObjectExtensions.cs | 24 ++-------
 .../Reactive/AnonymousSubject`1.cs            | 16 ------
 .../Reactive/AnonymousSubject`2.cs            | 49 -------------------
 src/Avalonia.Base/Utilities/DelayedSetter.cs  | 26 +++++++++-
 .../AvaloniaObjectTests_Binding.cs            |  1 +
 6 files changed, 31 insertions(+), 108 deletions(-)
 delete mode 100644 src/Avalonia.Base/Reactive/AnonymousSubject`1.cs
 delete mode 100644 src/Avalonia.Base/Reactive/AnonymousSubject`2.cs

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index b5956d681a..3f53a3735c 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -590,28 +590,7 @@ namespace Avalonia
         }
 
         protected void SetAndRaise<T>(AvaloniaProperty<T> property, Action<T, Action<Action>> setterCallback, T value, Action<T> delayedSet)
-        {
-            Contract.Requires<ArgumentNullException>(setterCallback != null);
-            Contract.Requires<ArgumentNullException>(delayedSet != null);
-            if (!directDelayedSetter.IsNotifying(property))
-            {
-                setterCallback(value, notification => 
-                {
-                    using (directDelayedSetter.MarkNotifying(property))
-                    {
-                        notification();
-                    }
-                });
-                if (directDelayedSetter.HasPendingSet(property))
-                {
-                    delayedSet((T)directDelayedSetter.GetFirstPendingSet(property));
-                }
-            }
-            else
-            {
-                directDelayedSetter.AddPendingSet(property, value);
-            }
-        }
+            => directDelayedSetter.SetAndNotify(property, (val, notify) => setterCallback((T)val, notify), value, val => delayedSet((T)val));
 
         /// <summary>
         /// Tries to cast a value to a type, taking into account that the value may be a
diff --git a/src/Avalonia.Base/AvaloniaObjectExtensions.cs b/src/Avalonia.Base/AvaloniaObjectExtensions.cs
index 685bf83a75..7967852bfa 100644
--- a/src/Avalonia.Base/AvaloniaObjectExtensions.cs
+++ b/src/Avalonia.Base/AvaloniaObjectExtensions.cs
@@ -138,17 +138,9 @@ namespace Avalonia
             AvaloniaProperty property,
             BindingPriority priority = BindingPriority.LocalValue)
         {
-            // TODO: Subject.Create<T> is not yet in stable Rx : once it is, remove the 
-            // AnonymousSubject classes and use Subject.Create<T>.
-            var output = new Subject<object>();
-            var result = new AnonymousSubject<object>(
-                Observer.Create<object>(
-                    x => output.OnNext(x),
-                    e => output.OnError(e),
-                    () => output.OnCompleted()),
+            return Subject.Create<object>(
+                Observer.Create<object>(x => o.SetValue(property, x, priority)),
                 o.GetObservable(property));
-            o.Bind(property, output, priority);
-            return result;
         }
 
         /// <summary>
@@ -169,17 +161,9 @@ namespace Avalonia
             AvaloniaProperty<T> property,
             BindingPriority priority = BindingPriority.LocalValue)
         {
-            // TODO: Subject.Create<T> is not yet in stable Rx : once it is, remove the 
-            // AnonymousSubject classes from this file and use Subject.Create<T>.
-            var output = new Subject<T>();
-            var result = new AnonymousSubject<T>(
-                Observer.Create<T>(
-                    x => output.OnNext(x),
-                    e => output.OnError(e),
-                    () => output.OnCompleted()),
+            return Subject.Create<T>(
+                Observer.Create<T>(x => o.SetValue(property, x, priority)),
                 o.GetObservable(property));
-            o.Bind(property, output, priority);
-            return result;
         }
 
         /// <summary>
diff --git a/src/Avalonia.Base/Reactive/AnonymousSubject`1.cs b/src/Avalonia.Base/Reactive/AnonymousSubject`1.cs
deleted file mode 100644
index c7bed15ecb..0000000000
--- a/src/Avalonia.Base/Reactive/AnonymousSubject`1.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Reactive.Subjects;
-
-namespace Avalonia.Reactive
-{
-    public class AnonymousSubject<T> : AnonymousSubject<T, T>, ISubject<T>
-    {
-        public AnonymousSubject(IObserver<T> observer, IObservable<T> observable)
-            : base(observer, observable)
-        {
-        }
-    }
-}
diff --git a/src/Avalonia.Base/Reactive/AnonymousSubject`2.cs b/src/Avalonia.Base/Reactive/AnonymousSubject`2.cs
deleted file mode 100644
index 18551d564e..0000000000
--- a/src/Avalonia.Base/Reactive/AnonymousSubject`2.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Reactive.Subjects;
-
-namespace Avalonia.Reactive
-{
-    public class AnonymousSubject<T, U> : ISubject<T, U>
-    {
-        private readonly IObserver<T> _observer;
-        private readonly IObservable<U> _observable;
-
-        public AnonymousSubject(IObserver<T> observer, IObservable<U> observable)
-        {
-            _observer = observer;
-            _observable = observable;
-        }
-
-        public void OnCompleted()
-        {
-            _observer.OnCompleted();
-        }
-
-        public void OnError(Exception error)
-        {
-            if (error == null)
-                throw new ArgumentNullException("error");
-
-            _observer.OnError(error);
-        }
-
-        public void OnNext(T value)
-        {
-            _observer.OnNext(value);
-        }
-
-        public IDisposable Subscribe(IObserver<U> observer)
-        {
-            if (observer == null)
-                throw new ArgumentNullException("observer");
-
-            //
-            // [OK] Use of unsafe Subscribe: non-pretentious wrapping of an observable sequence.
-            //
-            return _observable.Subscribe/*Unsafe*/(observer);
-        }
-    }
-}
diff --git a/src/Avalonia.Base/Utilities/DelayedSetter.cs b/src/Avalonia.Base/Utilities/DelayedSetter.cs
index c8c9c87d95..3abffbdd3d 100644
--- a/src/Avalonia.Base/Utilities/DelayedSetter.cs
+++ b/src/Avalonia.Base/Utilities/DelayedSetter.cs
@@ -5,7 +5,7 @@ using System.Text;
 
 namespace Avalonia.Utilities
 {
-    public class DelayedSetter<T, TValue>
+    class DelayedSetter<T, TValue>
     {
         private class SettingStatus
         {
@@ -57,5 +57,29 @@ namespace Avalonia.Utilities
         {
             return setRecords[property].PendingValues.Dequeue();
         }
+
+        public void SetAndNotify(T property, Action<TValue, Action<Action>> setterCallback, TValue value, Action<TValue> delayedSet)
+        {
+            Contract.Requires<ArgumentNullException>(setterCallback != null);
+            Contract.Requires<ArgumentNullException>(delayedSet != null);
+            if (!IsNotifying(property))
+            {
+                setterCallback(value, notification =>
+                {
+                    using (MarkNotifying(property))
+                    {
+                        notification();
+                    }
+                });
+                if (HasPendingSet(property))
+                {
+                    delayedSet(GetFirstPendingSet(property));
+                }
+            }
+            else
+            {
+                AddPendingSet(property, value);
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
index b266b44cba..211c7c985e 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
@@ -14,6 +14,7 @@ using Avalonia.Markup.Xaml.Data;
 using Avalonia.Platform;
 using Avalonia.Threading;
 using Avalonia.UnitTests;
+using Avalonia.Diagnostics;
 using Microsoft.Reactive.Testing;
 using Moq;
 using Xunit;

From 8acf94d3e4f651b34a9480b13ab69f8fabeba266 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Tue, 24 Oct 2017 16:52:29 -0500
Subject: [PATCH 141/482] Fix bug in DelayedSetter and change recursive delayed
 setting to prevent possible issues down the road.

---
 src/Avalonia.Base/AvaloniaObject.cs           | 35 +++----
 src/Avalonia.Base/PriorityValue.cs            | 91 ++++++++++---------
 src/Avalonia.Base/Utilities/DelayedSetter.cs  | 13 ++-
 .../Primitives/SelectingItemsControl.cs       |  4 +-
 .../AvaloniaObjectTests_Binding.cs            |  8 +-
 .../AvaloniaObjectTests_Direct.cs             |  8 +-
 6 files changed, 80 insertions(+), 79 deletions(-)

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 3f53a3735c..1c4f727161 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -563,34 +563,35 @@ namespace Avalonia
             {
                 if (!object.Equals(field, value))
                 {
-                    var old = field;
-                    field = value;
-                    
-                    using (directDelayedSetter.MarkNotifying(property))
-                    {
-                        RaisePropertyChanged(property, old, value, BindingPriority.LocalValue); 
-                    }
+                    SetAndRaiseCore(property, ref field, value);
 
-                    if (directDelayedSetter.HasPendingSet(property))
+                    while (directDelayedSetter.HasPendingSet(property))
                     {
-                        SetAndRaise(property, ref field, (T)directDelayedSetter.GetFirstPendingSet(property));
+                        SetAndRaiseCore(property, ref field, (T)directDelayedSetter.GetFirstPendingSet(property));
                     }
                     return true;
                 }
-                else
-                {
-                    return false;
-                }
             }
-            else
+            else if(!object.Equals(field, value))
             {
                 directDelayedSetter.AddPendingSet(property, value);
-                return false;
+            }
+            return false;
+        }
+
+        private void SetAndRaiseCore<T>(AvaloniaProperty<T> property, ref T field, T value)
+        {
+            var old = field;
+            field = value;
+
+            using (directDelayedSetter.MarkNotifying(property))
+            {
+                RaisePropertyChanged(property, old, value, BindingPriority.LocalValue);
             }
         }
 
-        protected void SetAndRaise<T>(AvaloniaProperty<T> property, Action<T, Action<Action>> setterCallback, T value, Action<T> delayedSet)
-            => directDelayedSetter.SetAndNotify(property, (val, notify) => setterCallback((T)val, notify), value, val => delayedSet((T)val));
+        protected void SetAndRaise<T>(AvaloniaProperty<T> property, Action<T, Action<Action>> setterCallback, T value)
+            => directDelayedSetter.SetAndNotify(property, (val, notify) => setterCallback((T)val, notify), value);
 
         /// <summary>
         /// Tries to cast a value to a type, taking into account that the value may be a
diff --git a/src/Avalonia.Base/PriorityValue.cs b/src/Avalonia.Base/PriorityValue.cs
index cc6f9e465c..df138c88f5 100644
--- a/src/Avalonia.Base/PriorityValue.cs
+++ b/src/Avalonia.Base/PriorityValue.cs
@@ -237,66 +237,73 @@ namespace Avalonia
         {
             if (!delayedSetter.IsNotifying(this))
             {
-                var notification = value as BindingNotification;
-                object castValue;
+                value = UpdateValueCore(value, priority);
 
-                if (notification != null)
+                while (delayedSetter.HasPendingSet(this))
                 {
-                    value = (notification.HasValue) ? notification.Value : null;
+                    var pendingSet = delayedSetter.GetFirstPendingSet(this);
+                    UpdateValueCore(pendingSet.value, pendingSet.priority);
                 }
+            }
+            else if(!object.Equals(value, _value))
+            {
+                delayedSetter.AddPendingSet(this, (value, priority));
+            }
+        }
 
-                if (!object.Equals(value, _value) && TypeUtilities.TryConvertImplicit(_valueType, value, out castValue))
-                {
-                    var old = _value;
+        private object UpdateValueCore(object value, int priority)
+        {
+            var notification = value as BindingNotification;
+            object castValue;
 
-                    if (_validate != null && castValue != AvaloniaProperty.UnsetValue)
-                    {
-                        castValue = _validate(castValue);
-                    }
+            if (notification != null)
+            {
+                value = (notification.HasValue) ? notification.Value : null;
+            }
 
-                    ValuePriority = priority;
-                    _value = castValue;
+            if (TypeUtilities.TryConvertImplicit(_valueType, value, out castValue))
+            {
+                var old = _value;
 
-                    if (notification?.HasValue == true)
-                    {
-                        notification.SetValue(castValue);
-                    }
+                if (_validate != null && castValue != AvaloniaProperty.UnsetValue)
+                {
+                    castValue = _validate(castValue);
+                }
 
-                    if (notification == null || notification.HasValue)
-                    {
-                        using (delayedSetter.MarkNotifying(this))
-                        {
-                            Owner?.Changed(this, old, _value); 
-                        }
+                ValuePriority = priority;
+                _value = castValue;
 
-                        if (delayedSetter.HasPendingSet(this))
-                        {
-                            var pendingSet = delayedSetter.GetFirstPendingSet(this);
-                            UpdateValue(pendingSet.value, pendingSet.priority);
-                        }
-                    }
+                if (notification?.HasValue == true)
+                {
+                    notification.SetValue(castValue);
+                }
 
-                    if (notification != null)
+                if (notification == null || notification.HasValue)
+                {
+                    using (delayedSetter.MarkNotifying(this))
                     {
-                        Owner?.BindingNotificationReceived(this, notification);
+                        Owner?.Changed(this, old, _value);
                     }
                 }
-                else
+
+                if (notification != null)
                 {
-                    Logger.Error(
-                        LogArea.Binding,
-                        Owner,
-                        "Binding produced invalid value for {$Property} ({$PropertyType}): {$Value} ({$ValueType})",
-                        Property.Name,
-                        _valueType,
-                        value,
-                        value?.GetType());
-                } 
+                    Owner?.BindingNotificationReceived(this, notification);
+                }
             }
             else
             {
-                delayedSetter.AddPendingSet(this, (value, priority));
+                Logger.Error(
+                    LogArea.Binding,
+                    Owner,
+                    "Binding produced invalid value for {$Property} ({$PropertyType}): {$Value} ({$ValueType})",
+                    Property.Name,
+                    _valueType,
+                    value,
+                    value?.GetType());
             }
+
+            return value;
         }
     }
 }
diff --git a/src/Avalonia.Base/Utilities/DelayedSetter.cs b/src/Avalonia.Base/Utilities/DelayedSetter.cs
index 3abffbdd3d..6d611dfa46 100644
--- a/src/Avalonia.Base/Utilities/DelayedSetter.cs
+++ b/src/Avalonia.Base/Utilities/DelayedSetter.cs
@@ -58,10 +58,9 @@ namespace Avalonia.Utilities
             return setRecords[property].PendingValues.Dequeue();
         }
 
-        public void SetAndNotify(T property, Action<TValue, Action<Action>> setterCallback, TValue value, Action<TValue> delayedSet)
+        public void SetAndNotify(T property, Action<TValue, Action<Action>> setterCallback, TValue value)
         {
             Contract.Requires<ArgumentNullException>(setterCallback != null);
-            Contract.Requires<ArgumentNullException>(delayedSet != null);
             if (!IsNotifying(property))
             {
                 setterCallback(value, notification =>
@@ -71,9 +70,15 @@ namespace Avalonia.Utilities
                         notification();
                     }
                 });
-                if (HasPendingSet(property))
+                while (HasPendingSet(property))
                 {
-                    delayedSet(GetFirstPendingSet(property));
+                    setterCallback(GetFirstPendingSet(property), notification =>
+                    {
+                        using (MarkNotifying(property))
+                        {
+                            notification();
+                        }
+                    });
                 }
             }
             else
diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
index 294b14b13d..13d8480978 100644
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@@ -162,7 +162,7 @@ namespace Avalonia.Controls.Primitives
                             notifierWrapper(() => RaisePropertyChanged(SelectedIndexProperty, old, effective, BindingPriority.LocalValue));
                             SelectedItem = ElementAt(Items, effective);
                         }
-                    }, value, val => SelectedIndex = val);
+                    }, value);
                 }
                 else
                 {
@@ -215,7 +215,7 @@ namespace Avalonia.Controls.Primitives
                                 SelectedItems.Clear();
                             }
                         }
-                    }, value, val => SelectedItem = val);
+                    }, value);
                 }
                 else
                 {
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
index 211c7c985e..192f5258ab 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
@@ -399,12 +399,6 @@ namespace Avalonia.Base.UnitTests
 
             var target = new Class1();
 
-            //note: if the initialization of the child binding is here target/child binding work fine!!!
-            //var child = new Class1()
-            //{
-            //    [~~Class1.DoubleValueProperty] = target[~~Class1.DoubleValueProperty]
-            //};
-
             target.Bind(Class1.DoubleValueProperty,
                 new Binding("Value") { Mode = BindingMode.TwoWay, Source = viewModel });
 
@@ -429,7 +423,7 @@ namespace Avalonia.Base.UnitTests
             //here in real life stack overflow exception is thrown issue #855 and #824
             target.DoubleValue = 51.001;
 
-            Assert.Equal(3, viewModel.SetterInvokedCount);
+            Assert.Equal(2, viewModel.SetterInvokedCount);
 
             double expected = 51;
 
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
index 4123e229dd..249528e9b2 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
@@ -452,12 +452,6 @@ namespace Avalonia.Base.UnitTests
 
             var target = new Class1();
 
-            //note: if the initialization of the child binding is here there is no stackoverflow!!!
-            //var child = new Class1()
-            //{
-            //    [~~Class1.DoubleValueProperty] = target[~~Class1.DoubleValueProperty]
-            //};
-
             target.Bind(Class1.DoubleValueProperty, new Binding("Value")
                                                     {
                                                         Mode = BindingMode.TwoWay,
@@ -485,7 +479,7 @@ namespace Avalonia.Base.UnitTests
             //here in real life stack overflow exception is thrown issue #855 and #824
             target.DoubleValue = 51.001;
 
-            Assert.Equal(3, viewModel.SetterInvokedCount);
+            Assert.Equal(2, viewModel.SetterInvokedCount);
 
             double expected = 51;
 

From 36fe461b4a4ad568b0c0df380ad759f8f02e50d2 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Tue, 24 Oct 2017 17:22:09 -0500
Subject: [PATCH 142/482] Have PriorityValue use SetAndNotify infrastructure.

---
 src/Avalonia.Base/PriorityValue.cs           | 89 ++++++++------------
 src/Avalonia.Base/Utilities/DelayedSetter.cs |  7 +-
 2 files changed, 40 insertions(+), 56 deletions(-)

diff --git a/src/Avalonia.Base/PriorityValue.cs b/src/Avalonia.Base/PriorityValue.cs
index df138c88f5..3930b6c224 100644
--- a/src/Avalonia.Base/PriorityValue.cs
+++ b/src/Avalonia.Base/PriorityValue.cs
@@ -235,75 +235,56 @@ namespace Avalonia
         /// <param name="priority">The priority level that the value came from.</param>
         private void UpdateValue(object value, int priority)
         {
-            if (!delayedSetter.IsNotifying(this))
+            delayedSetter.SetAndNotify(this, (update, notify) =>
             {
-                value = UpdateValueCore(value, priority);
+                var val = update.value;
+                var notification = val as BindingNotification;
+                object castValue;
 
-                while (delayedSetter.HasPendingSet(this))
+                if (notification != null)
                 {
-                    var pendingSet = delayedSetter.GetFirstPendingSet(this);
-                    UpdateValueCore(pendingSet.value, pendingSet.priority);
+                    val = (notification.HasValue) ? notification.Value : null;
                 }
-            }
-            else if(!object.Equals(value, _value))
-            {
-                delayedSetter.AddPendingSet(this, (value, priority));
-            }
-        }
-
-        private object UpdateValueCore(object value, int priority)
-        {
-            var notification = value as BindingNotification;
-            object castValue;
 
-            if (notification != null)
-            {
-                value = (notification.HasValue) ? notification.Value : null;
-            }
+                if (TypeUtilities.TryConvertImplicit(_valueType, val, out castValue))
+                {
+                    var old = _value;
 
-            if (TypeUtilities.TryConvertImplicit(_valueType, value, out castValue))
-            {
-                var old = _value;
+                    if (_validate != null && castValue != AvaloniaProperty.UnsetValue)
+                    {
+                        castValue = _validate(castValue);
+                    }
 
-                if (_validate != null && castValue != AvaloniaProperty.UnsetValue)
-                {
-                    castValue = _validate(castValue);
-                }
+                    ValuePriority = priority;
+                    _value = castValue;
 
-                ValuePriority = priority;
-                _value = castValue;
+                    if (notification?.HasValue == true)
+                    {
+                        notification.SetValue(castValue);
+                    }
 
-                if (notification?.HasValue == true)
-                {
-                    notification.SetValue(castValue);
-                }
+                    if (notification == null || notification.HasValue)
+                    {
+                        notify(() => Owner?.Changed(this, old, _value));
+                    }
 
-                if (notification == null || notification.HasValue)
-                {
-                    using (delayedSetter.MarkNotifying(this))
+                    if (notification != null)
                     {
-                        Owner?.Changed(this, old, _value);
+                        Owner?.BindingNotificationReceived(this, notification);
                     }
                 }
-
-                if (notification != null)
+                else
                 {
-                    Owner?.BindingNotificationReceived(this, notification);
+                    Logger.Error(
+                        LogArea.Binding,
+                        Owner,
+                        "Binding produced invalid value for {$Property} ({$PropertyType}): {$Value} ({$ValueType})",
+                        Property.Name,
+                        _valueType,
+                        val,
+                        val?.GetType());
                 }
-            }
-            else
-            {
-                Logger.Error(
-                    LogArea.Binding,
-                    Owner,
-                    "Binding produced invalid value for {$Property} ({$PropertyType}): {$Value} ({$ValueType})",
-                    Property.Name,
-                    _valueType,
-                    value,
-                    value?.GetType());
-            }
-
-            return value;
+            }, (value, priority), val => !object.Equals(val.value, _value));
         }
     }
 }
diff --git a/src/Avalonia.Base/Utilities/DelayedSetter.cs b/src/Avalonia.Base/Utilities/DelayedSetter.cs
index 6d611dfa46..155e4509a2 100644
--- a/src/Avalonia.Base/Utilities/DelayedSetter.cs
+++ b/src/Avalonia.Base/Utilities/DelayedSetter.cs
@@ -58,7 +58,7 @@ namespace Avalonia.Utilities
             return setRecords[property].PendingValues.Dequeue();
         }
 
-        public void SetAndNotify(T property, Action<TValue, Action<Action>> setterCallback, TValue value)
+        public void SetAndNotify(T property, Action<TValue, Action<Action>> setterCallback, TValue value, Predicate<TValue> pendingSetCondition)
         {
             Contract.Requires<ArgumentNullException>(setterCallback != null);
             if (!IsNotifying(property))
@@ -81,10 +81,13 @@ namespace Avalonia.Utilities
                     });
                 }
             }
-            else
+            else if(pendingSetCondition?.Invoke(value) ?? true)
             {
                 AddPendingSet(property, value);
             }
         }
+
+        public void SetAndNotify(T property, Action<TValue, Action<Action>> setterCallback, TValue value)
+            => SetAndNotify(property, setterCallback, value, null);
     }
 }

From a87ee4e49de7b862220da654962624b9c85daf40 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Tue, 24 Oct 2017 17:36:17 -0500
Subject: [PATCH 143/482] Clean up DelayedSetter code.

---
 src/Avalonia.Base/AvaloniaObject.cs          | 4 ++--
 src/Avalonia.Base/Utilities/DelayedSetter.cs | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 1c4f727161..f0e385cf94 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -590,8 +590,8 @@ namespace Avalonia
             }
         }
 
-        protected void SetAndRaise<T>(AvaloniaProperty<T> property, Action<T, Action<Action>> setterCallback, T value)
-            => directDelayedSetter.SetAndNotify(property, (val, notify) => setterCallback((T)val, notify), value);
+        protected void SetAndRaise<T>(AvaloniaProperty<T> property, Action<T, Action<Action>> setterCallback, T value, Predicate<T> pendingSetCondition = null)
+            => directDelayedSetter.SetAndNotify(property, (val, notify) => setterCallback((T)val, notify), value, o => pendingSetCondition((T)o));
 
         /// <summary>
         /// Tries to cast a value to a type, taking into account that the value may be a
diff --git a/src/Avalonia.Base/Utilities/DelayedSetter.cs b/src/Avalonia.Base/Utilities/DelayedSetter.cs
index 155e4509a2..a8eb7554be 100644
--- a/src/Avalonia.Base/Utilities/DelayedSetter.cs
+++ b/src/Avalonia.Base/Utilities/DelayedSetter.cs
@@ -86,8 +86,5 @@ namespace Avalonia.Utilities
                 AddPendingSet(property, value);
             }
         }
-
-        public void SetAndNotify(T property, Action<TValue, Action<Action>> setterCallback, TValue value)
-            => SetAndNotify(property, setterCallback, value, null);
     }
 }

From d775d2384ea2155cc1756fdf07ed977fa858765f Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Tue, 24 Oct 2017 18:04:36 -0500
Subject: [PATCH 144/482] Refactor AvaloniaObject.SetAndRaise and comment
 DelayedSetter.

---
 src/Avalonia.Base/AvaloniaObject.cs          | 14 +++--
 src/Avalonia.Base/Utilities/DelayedSetter.cs | 61 +++++++++++++++++---
 2 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index f0e385cf94..7b978175bd 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -561,16 +561,20 @@ namespace Avalonia
             VerifyAccess();
             if (!directDelayedSetter.IsNotifying(property))
             {
+                var valueChanged = false;
                 if (!object.Equals(field, value))
                 {
                     SetAndRaiseCore(property, ref field, value);
 
-                    while (directDelayedSetter.HasPendingSet(property))
-                    {
-                        SetAndRaiseCore(property, ref field, (T)directDelayedSetter.GetFirstPendingSet(property));
-                    }
-                    return true;
+                    valueChanged = true;
+                }
+
+                while (directDelayedSetter.HasPendingSet(property))
+                {
+                    SetAndRaiseCore(property, ref field, (T)directDelayedSetter.GetFirstPendingSet(property));
+                    valueChanged = true;
                 }
+                return valueChanged;
             }
             else if(!object.Equals(field, value))
             {
diff --git a/src/Avalonia.Base/Utilities/DelayedSetter.cs b/src/Avalonia.Base/Utilities/DelayedSetter.cs
index a8eb7554be..4e1a39dd31 100644
--- a/src/Avalonia.Base/Utilities/DelayedSetter.cs
+++ b/src/Avalonia.Base/Utilities/DelayedSetter.cs
@@ -5,8 +5,16 @@ using System.Text;
 
 namespace Avalonia.Utilities
 {
-    class DelayedSetter<T, TValue>
+    /// <summary>
+    /// A utility class to enable deferring assignment until after property-changed notifications are sent.
+    /// </summary>
+    /// <typeparam name="TProperty">The type of the object that represents the property.</typeparam>
+    /// <typeparam name="TValue">The type of value with which to track the delayed assignment.</typeparam>
+    class DelayedSetter<TProperty, TValue>
     {
+        /// <summary>
+        /// Information on current setting/notification status of a property.
+        /// </summary>
         private class SettingStatus
         {
             public bool Notifying { get; set; }
@@ -22,9 +30,14 @@ namespace Avalonia.Utilities
             }
         }
 
-        private readonly Dictionary<T, SettingStatus> setRecords = new Dictionary<T, SettingStatus>();
+        private readonly Dictionary<TProperty, SettingStatus> setRecords = new Dictionary<TProperty, SettingStatus>();
 
-        public IDisposable MarkNotifying(T property)
+        /// <summary>
+        /// Mark the property as currently notifying.
+        /// </summary>
+        /// <param name="property">The property to mark as notifying.</param>
+        /// <returns>Returns a disposable that when disposed, marks the property as done notifying.</returns>
+        internal IDisposable MarkNotifying(TProperty property)
         {
             Contract.Requires<InvalidOperationException>(!IsNotifying(property));
 
@@ -37,10 +50,22 @@ namespace Avalonia.Utilities
             return Disposable.Create(() => setRecords[property].Notifying = false);
         }
 
-        public bool IsNotifying(T property) => setRecords.TryGetValue(property, out var value) && value.Notifying;
+        /// <summary>
+        /// Check if the property is currently notifying listeners.
+        /// </summary>
+        /// <param name="property">The property.</param>
+        /// <returns>If the property is currently notifying listeners.</returns>
+        internal bool IsNotifying(TProperty property)
+            => setRecords.TryGetValue(property, out var value) && value.Notifying;
 
-        public void AddPendingSet(T property, TValue value)
+        /// <summary>
+        /// Add a pending assignment for the property.
+        /// </summary>
+        /// <param name="property">The property.</param>
+        /// <param name="value">The value to assign.</param>
+        internal void AddPendingSet(TProperty property, TValue value)
         {
+            Contract.Requires<InvalidOperationException>(IsNotifying(property));
             if (!setRecords.ContainsKey(property))
             {
                 setRecords[property] = new SettingStatus();
@@ -48,17 +73,37 @@ namespace Avalonia.Utilities
             setRecords[property].PendingValues.Enqueue(value);
         }
 
-        public bool HasPendingSet(T property)
+        /// <summary>
+        /// Checks if there are any pending assignments for the property.
+        /// </summary>
+        /// <param name="property">The property to check.</param>
+        /// <returns>If the property has any pending assignments.</returns>
+        internal bool HasPendingSet(TProperty property)
         {
             return setRecords.ContainsKey(property) && setRecords[property].PendingValues.Count != 0;
         }
 
-        public TValue GetFirstPendingSet(T property)
+        /// <summary>
+        /// Gets the first pending assignment for the property.
+        /// </summary>
+        /// <param name="property">The property to check.</param>
+        /// <returns>The first pending assignment for the property.</returns>
+        internal TValue GetFirstPendingSet(TProperty property)
         {
             return setRecords[property].PendingValues.Dequeue();
         }
 
-        public void SetAndNotify(T property, Action<TValue, Action<Action>> setterCallback, TValue value, Predicate<TValue> pendingSetCondition)
+        /// <summary>
+        /// Set the property and notify listeners while ensuring we don't get into a stack overflow as happens with #855 and #824
+        /// </summary>
+        /// <param name="property">The property to set.</param>
+        /// <param name="setterCallback">
+        /// A callback that actually sets the property.
+        /// The first parameter is the value to set, and the second is a wrapper that takes a callback that sends the property-changed notification.
+        /// </param>
+        /// <param name="value">The value to try to set.</param>
+        /// <param name="pendingSetCondition">A predicate to filter what possible values should be added as pending sets (i.e. only values not equal to the current value).</param>
+        public void SetAndNotify(TProperty property, Action<TValue, Action<Action>> setterCallback, TValue value, Predicate<TValue> pendingSetCondition)
         {
             Contract.Requires<ArgumentNullException>(setterCallback != null);
             if (!IsNotifying(property))

From e9e0de662ba43d48dbd289db13bb28c2035bc6ac Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Tue, 24 Oct 2017 18:08:03 -0500
Subject: [PATCH 145/482] Fix NRE

---
 src/Avalonia.Base/AvaloniaObject.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 7b978175bd..456db70d77 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -595,7 +595,7 @@ namespace Avalonia
         }
 
         protected void SetAndRaise<T>(AvaloniaProperty<T> property, Action<T, Action<Action>> setterCallback, T value, Predicate<T> pendingSetCondition = null)
-            => directDelayedSetter.SetAndNotify(property, (val, notify) => setterCallback((T)val, notify), value, o => pendingSetCondition((T)o));
+            => directDelayedSetter.SetAndNotify(property, (val, notify) => setterCallback((T)val, notify), value, o => pendingSetCondition?.Invoke((T)o) ?? true);
 
         /// <summary>
         /// Tries to cast a value to a type, taking into account that the value may be a

From 4469bafe28a148ac200c28347d8039e3c6718185 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Tue, 24 Oct 2017 18:14:04 -0500
Subject: [PATCH 146/482] Fix incorrect assert in RangeBaseTests.

---
 tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
index 062ace2648..0e67581760 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
@@ -151,7 +151,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             //here in real life stack overflow exception is thrown issue #855 and #824
             target.Value = 51.001;
 
-            Assert.Equal(3, viewModel.SetterInvokedCount);
+            Assert.Equal(2, viewModel.SetterInvokedCount);
 
             double expected = 51;
 

From bb838f2af92bfe55c67737868a7a2d53e799fbe8 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 25 Oct 2017 17:13:48 +0300
Subject: [PATCH 147/482] [MONO] Added names to MonoMacPlatform.cs

---
 src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs b/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs
index c11ac0d6ee..a6b1f1d5b4 100644
--- a/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs
+++ b/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs
@@ -51,7 +51,8 @@ namespace Avalonia.MonoMac
         class ThreadHelper : NSObject
         {
             private readonly AutoResetEvent _event = new AutoResetEvent(false);
-            [Export("doNothing")]
+            private const string InitThreadingName = "initThreading";
+            [Export(InitThreadingName)]
             public void DoNothing()
             {
                 _event.Set();
@@ -60,7 +61,7 @@ namespace Avalonia.MonoMac
             public static void InitializeCocoaThreadingLocks()
             {
                 var helper = new ThreadHelper();
-                var thread = new NSThread(helper, Selector.FromHandle(Selector.GetHandle("doNothing")), new NSObject());
+                var thread = new NSThread(helper, Selector.FromHandle(Selector.GetHandle(InitThreadingName)), new NSObject());
                 thread.Start();
                 helper._event.WaitOne();
                 helper._event.Dispose();
@@ -126,7 +127,7 @@ namespace Avalonia
         {
             if (useDeferredRendering.HasValue)
                 MonoMac.MonoMacPlatform.UseDeferredRendering = useDeferredRendering.Value;
-            return builder.UseWindowingSubsystem(MonoMac.MonoMacPlatform.Initialize);
+            return builder.UseWindowingSubsystem(MonoMac.MonoMacPlatform.Initialize, "MonoMac");
         }
     }
 }
\ No newline at end of file

From 2bd26bd9b8006695451aa6470448699cd9e78b40 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 26 Oct 2017 00:57:41 +0200
Subject: [PATCH 148/482] Added failing test for #1245.

---
 .../Primitives/PopupTests.cs                  | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
index ccbf04533d..85a450e1dc 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
@@ -249,6 +249,37 @@ namespace Avalonia.Controls.UnitTests.Primitives
             }
         }
 
+        [Fact]
+        public void DataContextBeginUpdate_Should_Not_Be_Called_For_Controls_That_Dont_Inherit()
+        {
+            using (CreateServices())
+            {
+                TestControl child;
+                var popup = new Popup
+                {
+                    Child = child = new TestControl(),
+                    DataContext = "foo",
+                };
+
+                var beginCalled = false;
+                child.DataContextBeginUpdate += (s, e) => beginCalled = true;
+
+                // Test for #1245. Here, the child's logical parent is the popup but it's not yet
+                // attached to a visual tree because the popup hasn't been opened.
+                Assert.Same(popup, ((ILogical)child).LogicalParent);
+                Assert.Same(popup, child.InheritanceParent);
+                Assert.Null(child.GetVisualRoot());
+
+                popup.Open();
+
+                // #1245 was caused by the fact that DataContextBeginUpdate was called on `target`
+                // when the PopupRoot was created, even though PopupRoot isn't the
+                // InheritanceParent of child.
+                Assert.False(beginCalled);
+            }
+        }
+
+
         private static IDisposable CreateServices()
         {
             var result = AvaloniaLocator.EnterScope();
@@ -304,5 +335,18 @@ namespace Avalonia.Controls.UnitTests.Primitives
         private class PopupContentControl : ContentControl
         {
         }
+
+        private class TestControl : Decorator
+        {
+            public event EventHandler DataContextBeginUpdate;
+
+            public new IAvaloniaObject InheritanceParent => base.InheritanceParent;
+
+            protected override void OnDataContextBeginUpdate()
+            {
+                DataContextBeginUpdate?.Invoke(this, EventArgs.Empty);
+                base.OnDataContextBeginUpdate();
+            }
+        }
     }
 }

From 6421d422cbf884a265e00a92c84a56a00c9cae62 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 26 Oct 2017 01:01:07 +0200
Subject: [PATCH 149/482] Fix data context change notification.

Don't notify a non-inheritance child that the data context has begun changing, because it won't receive the accompanying end change notification.

Fixes #1245.
---
 src/Avalonia.Controls/Control.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index a7aafbf6e8..d4777b2f8a 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -774,7 +774,9 @@ namespace Avalonia.Controls
 
                     foreach (var child in control.LogicalChildren)
                     {
-                        if (child is Control c && !c.IsSet(DataContextProperty))
+                        if (child is Control c && 
+                            c.InheritanceParent == control &&
+                            !c.IsSet(DataContextProperty))
                         {
                             DataContextNotifying(c, notifying);
                         }

From 3b1b3cb9cd5880de1c011b68e5450fa783e95737 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 25 Oct 2017 22:25:37 -0500
Subject: [PATCH 150/482] Change test logic to working version.

---
 .../Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
index 3205a0e76a..03dc5374e0 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
@@ -770,15 +770,8 @@ do we need it?")]
 <Window xmlns='https://github.com/avaloniaui'
                 xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
                 xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
-    <Window.Styles>
-        <Style Selector='local|InitializationOrderTracker'> 
-            <Style.Resources> 
-                 <x:Double x:Key='Double'>100</x:Double> 
-            </Style.Resources> 
-        </Style> 
-   </Window.Styles>     
-<local:InitializationOrderTracker Width='100' Height='{DynamicResource Double}'
-                     Tag='{Binding Height, RelativeSource={RelativeSource Self}}' />
+    <local:InitializationOrderTracker Width='100' Height='100'
+        Tag='{Binding Height, RelativeSource={RelativeSource Self}}' />
 </Window>";
 
 

From 5e1f5046c03ca91344276a3b1f71705d092234eb Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 25 Oct 2017 23:12:09 -0500
Subject: [PATCH 151/482] Updated implementation based on PR feedback.

---
 .../Avalonia.Markup.Xaml/Data/Binding.cs      | 15 +--
 .../Data/RelativeSource.cs                    |  2 +
 .../MarkupExtensions/BindingExtension.cs      |  5 +-
 src/Markup/Avalonia.Markup/ControlLocator.cs  | 92 +++++++++++--------
 4 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
index c0e0915006..d4d53b091f 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
@@ -219,18 +219,9 @@ namespace Avalonia.Markup.Xaml.Data
         {
             Contract.Requires<ArgumentNullException>(target != null);
 
-            if (relativeSource.AncestorType == null)
-            {
-                return new ExpressionObserver(
-                    ControlLocator.Track(target, relativeSource.AncestorLevel - 1),
-                    path);
-            }
-            else
-            {
-                return new ExpressionObserver(
-                    ControlLocator.Track(target, relativeSource.AncestorType, relativeSource.AncestorLevel - 1),
-                    path); 
-            }
+            return new ExpressionObserver(
+                ControlLocator.Track(target, relativeSource.AncestorType != null ? relativeSource.Tree : TreeType.Logical, relativeSource.AncestorLevel - 1, relativeSource.AncestorType),
+                path);
         }
 
         private ExpressionObserver CreateSourceObserver(
diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/RelativeSource.cs b/src/Markup/Avalonia.Markup.Xaml/Data/RelativeSource.cs
index f77df6853b..825d3b8ba5 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/RelativeSource.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Data/RelativeSource.cs
@@ -87,5 +87,7 @@ namespace Avalonia.Markup.Xaml.Data
         /// Gets or sets a value that describes the type of relative source lookup.
         /// </summary>
         public RelativeSourceMode Mode { get; set; }
+
+        public TreeType Tree { get; set; } = TreeType.Visual;
     }
 }
\ No newline at end of file
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
index 2896e9803d..58637d26c9 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
@@ -103,7 +103,10 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
             }
             else if (path.StartsWith("$"))
             {
-                var relativeSource = new RelativeSource();
+                var relativeSource = new RelativeSource
+                {
+                    Tree = TreeType.Logical
+                };
                 result.RelativeSource = relativeSource;
                 var dot = path.IndexOf('.');
                 string relativeSourceMode;
diff --git a/src/Markup/Avalonia.Markup/ControlLocator.cs b/src/Markup/Avalonia.Markup/ControlLocator.cs
index 41851ca288..e533c6922c 100644
--- a/src/Markup/Avalonia.Markup/ControlLocator.cs
+++ b/src/Markup/Avalonia.Markup/ControlLocator.cs
@@ -11,6 +11,21 @@ using Avalonia.VisualTree;
 
 namespace Avalonia.Markup
 {
+    /// <summary>
+    /// The type of tree via which to track a control.
+    /// </summary>
+    public enum TreeType
+    {
+        /// <summary>
+        /// The visual tree.
+        /// </summary>
+        Visual,
+        /// <summary>
+        /// The logical tree.
+        /// </summary>
+        Logical,
+    }
+
     /// <summary>
     /// Locates controls relative to other controls.
     /// </summary>
@@ -68,12 +83,44 @@ namespace Avalonia.Markup
         /// <param name="relativeTo">
         /// The control relative from which the other control should be found.
         /// </param>
-        /// <param name="ancestorType">The type of the ancestor to find.</param>
+        /// <param name="tree">The tree via which to track the control.</param>
         /// <param name="ancestorLevel">
         /// The level of ancestor control to look for. Use 0 for the first ancestor of the
         /// requested type.
         /// </param>
-        public static IObservable<IControl> Track(IControl relativeTo, Type ancestorType, int ancestorLevel)
+        /// <param name="ancestorType">The type of the ancestor to find.</param>
+        public static IObservable<IControl> Track(IControl relativeTo, TreeType tree, int ancestorLevel, Type ancestorType = null)
+        {
+            return TrackAttachmentToTree(relativeTo, tree).Select(isAttachedToTree =>
+            {
+                if (isAttachedToTree)
+                {
+                    if (tree == TreeType.Visual)
+                    {
+                        return relativeTo.GetVisualAncestors()
+                            .Where(x => ancestorType?.GetTypeInfo().IsAssignableFrom(x.GetType().GetTypeInfo()) ?? true)
+                            .ElementAtOrDefault(ancestorLevel) as IControl; 
+                    }
+                    else
+                    {
+                        return relativeTo.GetLogicalAncestors()
+                            .Where(x => ancestorType?.GetTypeInfo().IsAssignableFrom(x.GetType().GetTypeInfo()) ?? true)
+                            .ElementAtOrDefault(ancestorLevel) as IControl;
+                    }
+                }
+                else
+                {
+                    return null;
+                }
+            });
+        }
+
+        private static IObservable<bool> TrackAttachmentToTree(IControl relativeTo, TreeType tree)
+        {
+            return tree == TreeType.Visual ? TrackAttachmentToVisualTree(relativeTo) : TrackAttachmentToLogicalTree(relativeTo);
+        }
+
+        private static IObservable<bool> TrackAttachmentToVisualTree(IControl relativeTo)
         {
             var attached = Observable.FromEventPattern<VisualTreeAttachmentEventArgs>(
                 x => relativeTo.AttachedToVisualTree += x,
@@ -86,32 +133,11 @@ namespace Avalonia.Markup
                 x => relativeTo.DetachedFromVisualTree -= x)
                 .Select(x => false);
 
-            return attached.Merge(detached).Select(isAttachedToVisualTree =>
-            {
-                if (isAttachedToVisualTree)
-                {
-                    return relativeTo.GetVisualAncestors()
-                        .Where(x => ancestorType.GetTypeInfo().IsAssignableFrom(x.GetType().GetTypeInfo()))
-                        .ElementAtOrDefault(ancestorLevel) as IControl;
-                }
-                else
-                {
-                    return null;
-                }
-            });
+            var attachmentStatus = attached.Merge(detached);
+            return attachmentStatus;
         }
 
-        /// <summary>
-        /// Tracks a typed logical ancestor control.
-        /// </summary>
-        /// <param name="relativeTo">
-        /// The control relative from which the other control should be found.
-        /// </param>
-        /// <param name="ancestorLevel">
-        /// The level of ancestor control to look for. Use 0 for the first ancestor of the
-        /// requested type.
-        /// </param>
-        public static IObservable<IControl> Track(IControl relativeTo, int ancestorLevel)
+        private static IObservable<bool> TrackAttachmentToLogicalTree(IControl relativeTo)
         {
             var attached = Observable.FromEventPattern<LogicalTreeAttachmentEventArgs>(
                 x => relativeTo.AttachedToLogicalTree += x,
@@ -124,18 +150,8 @@ namespace Avalonia.Markup
                 x => relativeTo.DetachedFromLogicalTree += x)
                 .Select(x => false);
 
-            return attached.Merge(detached).Select(isAttachedToLogicalTree =>
-            {
-                if (isAttachedToLogicalTree)
-                {
-                    return relativeTo.GetLogicalAncestors()
-                        .ElementAtOrDefault(ancestorLevel) as IControl;
-                }
-                else
-                {
-                    return null;
-                }
-            });
+            var attachmentStatus = attached.Merge(detached);
+            return attachmentStatus;
         }
     }
 }

From 0440794d79a6677ec8c84d380d75daa15cbdc231 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 25 Oct 2017 23:27:13 -0500
Subject: [PATCH 152/482] Clean up tests and fix PR feedback.

---
 .../Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs   | 1 -
 .../Xaml/BindingTests_RelativeSource.cs                         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
index 58637d26c9..ee8ce03288 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
@@ -128,7 +128,6 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
                 else if (relativeSourceMode == "parent")
                 {
                     relativeSource.Mode = RelativeSourceMode.FindAncestor;
-                    relativeSource.AncestorType = typeof(IControl);
                     relativeSource.AncestorLevel = 1;
                 }
                 else if (relativeSourceMode.StartsWith("parent["))
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs
index 8bd042e98a..8ff802f96b 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs
@@ -152,7 +152,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 
                 // This isn't needed in `Binding_To_First_Ancestor_Without_AncestorType_Uses_LogicalTree` -
                 // why is it needed to get non-null value here?
-                contentControl.ApplyTemplate();
+                //contentControl.ApplyTemplate();
 
                 Assert.Equal("contentControl", button.Content);
             }

From edf2018149018c9bfd7da44d5e01c19a23f1cd78 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 25 Oct 2017 23:50:02 -0500
Subject: [PATCH 153/482] Refactored tests to move XAML Binding class tests
 into Avalonia.Markup.Xaml.UnitTests.

---
 .../Avalonia.Base.UnitTests.csproj            |  12 --
 .../AvaloniaObjectTests_Binding.cs            |  20 +--
 .../AvaloniaObjectTests_Direct.cs             |  20 +--
 .../Avalonia.Markup.Xaml.UnitTests.csproj     |   1 +
 .../Data/BindingTests.cs                      | 139 ++++++++++++++++++
 5 files changed, 146 insertions(+), 46 deletions(-)

diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
index e86aec4be1..8692cdef42 100644
--- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
+++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
@@ -13,18 +13,6 @@
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj">
-      <Project>{B09B78D8-9B26-48B0-9149-D64A2F120F3F}</Project>
-      <Name>Avalonia.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj">
-      <Project>{3E53A01A-B331-47F3-B828-4A5717E77A24}</Project>
-      <Name>Avalonia.Markup.Xaml</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj">
-      <Project>{88060192-33d5-4932-b0f9-8bd2763e857d}</Project>
-      <Name>Avalonia.UnitTests</Name>
-    </ProjectReference>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
index 192f5258ab..529e35d92c 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
@@ -387,10 +387,8 @@ namespace Avalonia.Base.UnitTests
             }
         }
 
-        [Theory]
-        [InlineData(true)]
-        [InlineData(false)]
-        public void SetValue_Should_Not_Cause_StackOverflow_And_Have_Correct_Values(bool useXamlBinding)
+        [Fact]
+        public void SetValue_Should_Not_Cause_StackOverflow_And_Have_Correct_Values()
         {
             var viewModel = new TestStackOverflowViewModel()
             {
@@ -404,19 +402,7 @@ namespace Avalonia.Base.UnitTests
 
             var child = new Class1();
 
-            if (useXamlBinding)
-            {
-                child.Bind(Class1.DoubleValueProperty,
-                    new Binding("DoubleValue")
-                    {
-                        Mode = BindingMode.TwoWay,
-                        Source = target
-                    });
-            }
-            else
-            {
-                child[!!Class1.DoubleValueProperty] = target[!!Class1.DoubleValueProperty];
-            }
+            child[!!Class1.DoubleValueProperty] = target[!!Class1.DoubleValueProperty];
 
             Assert.Equal(1, viewModel.SetterInvokedCount);
 
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
index 249528e9b2..ffea0fd2d6 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
@@ -440,10 +440,8 @@ namespace Avalonia.Base.UnitTests
             Assert.Equal(BindingMode.OneWayToSource, bar.GetMetadata<Class2>().DefaultBindingMode);
         }
 
-        [Theory]
-        [InlineData(true)]
-        [InlineData(false)]
-        public void SetValue_Should_Not_Cause_StackOverflow_And_Have_Correct_Values(bool useXamlBinding)
+        [Fact]
+        public void SetValue_Should_Not_Cause_StackOverflow_And_Have_Correct_Values()
         {
             var viewModel = new TestStackOverflowViewModel()
             {
@@ -460,19 +458,7 @@ namespace Avalonia.Base.UnitTests
 
             var child = new Class1();
 
-            if (useXamlBinding)
-            {
-                child.Bind(Class1.DoubleValueProperty,
-                    new Binding("DoubleValue")
-                    {
-                        Mode = BindingMode.TwoWay,
-                        Source = target
-                    });
-            }
-            else
-            {
-                child[!!Class1.DoubleValueProperty] = target[!!Class1.DoubleValueProperty];
-            }
+            child[!!Class1.DoubleValueProperty] = target[!!Class1.DoubleValueProperty];
 
             Assert.Equal(1, viewModel.SetterInvokedCount);
 
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
index 03bb71a383..b2d71d7fa8 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
@@ -22,6 +22,7 @@
     <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\Avalonia.Base.UnitTests\Avalonia.Base.UnitTests.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
index 230e61f300..11a1154b26 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
@@ -337,6 +337,145 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
             Assert.Equal("foo", target.Content);
         }
 
+
+        [Fact]
+        public void StyledProperty_SetValue_Should_Not_Cause_StackOverflow_And_Have_Correct_Values()
+        {
+            var viewModel = new TestStackOverflowViewModel()
+            {
+                Value = 50
+            };
+
+            var target = new StyledPropertyClass();
+
+            target.Bind(StyledPropertyClass.DoubleValueProperty,
+                new Binding("Value") { Mode = BindingMode.TwoWay, Source = viewModel });
+
+            var child = new StyledPropertyClass();
+
+            child.Bind(StyledPropertyClass.DoubleValueProperty,
+                new Binding("DoubleValue")
+                {
+                    Mode = BindingMode.TwoWay,
+                    Source = target
+                });
+
+            Assert.Equal(1, viewModel.SetterInvokedCount);
+
+            //here in real life stack overflow exception is thrown issue #855 and #824
+            target.DoubleValue = 51.001;
+
+            Assert.Equal(2, viewModel.SetterInvokedCount);
+
+            double expected = 51;
+
+            Assert.Equal(expected, viewModel.Value);
+            Assert.Equal(expected, target.DoubleValue);
+            Assert.Equal(expected, child.DoubleValue);
+        }
+
+        [Fact]
+        public void SetValue_Should_Not_Cause_StackOverflow_And_Have_Correct_Values()
+        {
+            var viewModel = new TestStackOverflowViewModel()
+            {
+                Value = 50
+            };
+
+            var target = new DirectPropertyClass();
+
+            target.Bind(DirectPropertyClass.DoubleValueProperty, new Binding("Value")
+            {
+                Mode = BindingMode.TwoWay,
+                Source = viewModel
+            });
+
+            var child = new DirectPropertyClass();
+
+            child.Bind(DirectPropertyClass.DoubleValueProperty,
+                new Binding("DoubleValue")
+                {
+                    Mode = BindingMode.TwoWay,
+                    Source = target
+                });
+
+            Assert.Equal(1, viewModel.SetterInvokedCount);
+
+            //here in real life stack overflow exception is thrown issue #855 and #824
+            target.DoubleValue = 51.001;
+
+            Assert.Equal(2, viewModel.SetterInvokedCount);
+
+            double expected = 51;
+
+            Assert.Equal(expected, viewModel.Value);
+            Assert.Equal(expected, target.DoubleValue);
+            Assert.Equal(expected, child.DoubleValue);
+        }
+
+        private class StyledPropertyClass : AvaloniaObject
+        {
+            public static readonly StyledProperty<double> DoubleValueProperty =
+                        AvaloniaProperty.Register<StyledPropertyClass, double>(nameof(DoubleValue));
+
+            public double DoubleValue
+            {
+                get { return GetValue(DoubleValueProperty); }
+                set { SetValue(DoubleValueProperty, value); }
+            }
+        }
+
+        private class DirectPropertyClass : AvaloniaObject
+        {
+            public static readonly DirectProperty<DirectPropertyClass, double> DoubleValueProperty =
+                AvaloniaProperty.RegisterDirect<DirectPropertyClass, double>(
+                    nameof(DoubleValue),
+                    o => o.DoubleValue,
+                    (o, v) => o.DoubleValue = v);
+
+            private double _doubleValue;
+            public double DoubleValue
+            {
+                get { return _doubleValue; }
+                set { SetAndRaise(DoubleValueProperty, ref _doubleValue, value); }
+            }
+        }
+
+        private class TestStackOverflowViewModel : INotifyPropertyChanged
+        {
+            public int SetterInvokedCount { get; private set; }
+
+            public const int MaxInvokedCount = 1000;
+
+            private double _value;
+
+            public event PropertyChangedEventHandler PropertyChanged;
+
+            public double Value
+            {
+                get { return _value; }
+                set
+                {
+                    if (_value != value)
+                    {
+                        SetterInvokedCount++;
+                        if (SetterInvokedCount < MaxInvokedCount)
+                        {
+                            _value = (int)value;
+                            if (_value > 75) _value = 75;
+                            if (_value < 25) _value = 25;
+                        }
+                        else
+                        {
+                            _value = value;
+                        }
+
+                        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Value)));
+                    }
+                }
+            }
+        }
+        
         private class TwoWayBindingTest : Control
         {
             public static readonly StyledProperty<string> TwoWayProperty =

From 3561c71bf3965e6ba94a892edd31fc6de01e452a Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 26 Oct 2017 16:59:28 -0500
Subject: [PATCH 154/482] Remove code coverage uploading from appveyor script

---
 appveyor.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index aa8c19ace4..76d1ae3e1c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,10 +23,6 @@ before_build:
 - git submodule update --init
 build_script:
 - ps: .\build.ps1 -Target "AppVeyor" -Platform "$env:platform" -Configuration "$env:configuration"
-after_build:
-- "SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%"
-- pip install codecov
-- codecov -f "./artifacts/coverage.xml"
 
 test: off
 artifacts:

From 479c11710360a79fd52303cec93f1445e30169e9 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sun, 29 Oct 2017 18:08:40 +0300
Subject: [PATCH 155/482] Allow to pass CancellationToken to Application.Run

---
 src/Avalonia.Controls/Application.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Avalonia.Controls/Application.cs b/src/Avalonia.Controls/Application.cs
index abae080515..06c1a8b4cc 100644
--- a/src/Avalonia.Controls/Application.cs
+++ b/src/Avalonia.Controls/Application.cs
@@ -175,6 +175,15 @@ namespace Avalonia
             closable.Closed += (s, e) => source.Cancel();
             Dispatcher.UIThread.MainLoop(source.Token);
         }
+        
+        /// <summary>
+        /// Runs the application's main loop until the <see cref="CancellationToken"/> is cancelled.
+        /// </summary>
+        /// <param name="token">The token to track</param>
+        public void Run(CancellationToken token)
+        {
+            Dispatcher.UIThread.MainLoop(token);
+        }
 
         /// <summary>
         /// Exits the application

From 37c5414922ec93d77716764cef1a92a3d4934d91 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sun, 29 Oct 2017 18:09:03 +0300
Subject: [PATCH 156/482] Don't allow to call AppBuilder.Setup twice

---
 src/Avalonia.Controls/AppBuilderBase.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Avalonia.Controls/AppBuilderBase.cs b/src/Avalonia.Controls/AppBuilderBase.cs
index 1610d33f9b..4167539455 100644
--- a/src/Avalonia.Controls/AppBuilderBase.cs
+++ b/src/Avalonia.Controls/AppBuilderBase.cs
@@ -14,6 +14,8 @@ namespace Avalonia.Controls
     /// <typeparam name="TAppBuilder">The type of the AppBuilder class itself.</typeparam>
     public abstract class AppBuilderBase<TAppBuilder> where TAppBuilder : AppBuilderBase<TAppBuilder>, new()
     {
+        private static bool s_setupWasAlreadyCalled;
+        
         /// <summary>
         /// Gets or sets the <see cref="IRuntimePlatform"/> instance.
         /// </summary>
@@ -252,6 +254,9 @@ namespace Avalonia.Controls
                 throw new InvalidOperationException("No rendering system configured.");
             }
 
+            if (s_setupWasAlreadyCalled)
+                throw new InvalidOperationException("Setup was already called on one of AppBuilder instances");
+
             Instance.RegisterServices();
             RuntimePlatformServicesInitializer();
             WindowingSubsystemInitializer();

From 8ce4be62944b485c4b8834ea82dce63cdb0b3f39 Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Mon, 30 Oct 2017 11:17:50 -0400
Subject: [PATCH 157/482] Correctly verified access from UI thread

Used Dispatcher.UIThread.VerifyAccess() instead of a
custom implementation
---
 .../CalendarBlackoutDatesCollection.cs        | 14 ++------
 .../Calendar/SelectedDatesCollection.cs       | 34 +++++--------------
 2 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/src/Avalonia.Controls/Calendar/CalendarBlackoutDatesCollection.cs b/src/Avalonia.Controls/Calendar/CalendarBlackoutDatesCollection.cs
index 60fdde3e2d..0d48418683 100644
--- a/src/Avalonia.Controls/Calendar/CalendarBlackoutDatesCollection.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarBlackoutDatesCollection.cs
@@ -3,6 +3,7 @@
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
+using Avalonia.Threading;
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -16,12 +17,7 @@ namespace Avalonia.Controls.Primitives
         /// The Calendar whose dates this object represents.
         /// </summary>
         private Calendar _owner;
-
-        /// <summary>
-        /// The dispatcher thread.
-        /// </summary>
-        private Thread _dispatcherThread;
-
+        
         /// <summary>
         /// Initializes a new instance of the
         /// <see cref="T:Avalonia.Controls.Primitives.CalendarBlackoutDatesCollection" />
@@ -34,7 +30,6 @@ namespace Avalonia.Controls.Primitives
         public CalendarBlackoutDatesCollection(Calendar owner)
         {
             _owner = owner ?? throw new ArgumentNullException(nameof(owner));
-            _dispatcherThread = Thread.CurrentThread;
         }
 
         /// <summary>
@@ -214,10 +209,7 @@ namespace Avalonia.Controls.Primitives
         
         private void EnsureValidThread()
         {
-            if (Thread.CurrentThread != _dispatcherThread)
-            {
-                throw new NotSupportedException("This type of Collection does not support changes to its SourceCollection from a thread different from the Dispatcher thread.");
-            }
+            Dispatcher.UIThread.VerifyAccess();
         }
     }
 }
diff --git a/src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs b/src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs
index 1d48eaa1df..e6e0cf7c4f 100644
--- a/src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs
+++ b/src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs
@@ -3,6 +3,7 @@
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
+using Avalonia.Threading;
 using System;
 using System.Collections.ObjectModel;
 using System.Threading;
@@ -15,12 +16,7 @@ namespace Avalonia.Controls.Primitives
         /// Inherited code: Requires comment.
         /// </summary>
         private Collection<DateTime> _addedItems;
-
-        /// <summary>
-        /// Inherited code: Requires comment.
-        /// </summary>
-        private Thread _dispatcherThread;
-
+        
         /// <summary>
         /// Inherited code: Requires comment.
         /// </summary>
@@ -49,7 +45,6 @@ namespace Avalonia.Controls.Primitives
         {
             _owner = owner;
             _addedItems = new Collection<DateTime>();
-            _dispatcherThread = Thread.CurrentThread;
         }
 
         private void InvokeCollectionChanged(System.Collections.IList removedItems, System.Collections.IList addedItems)
@@ -138,10 +133,8 @@ namespace Avalonia.Controls.Primitives
         /// </remarks>
         protected override void ClearItems()
         {
-            if (!IsValidThread())
-            {
-                throw new NotSupportedException("This type of Collection does not support changes to its SourceCollection from a thread different from the Dispatcher thread.");
-            }
+            EnsureValidThread();
+
             Collection<DateTime> addedItems = new Collection<DateTime>();
             Collection<DateTime> removedItems = new Collection<DateTime>();
 
@@ -177,10 +170,7 @@ namespace Avalonia.Controls.Primitives
         /// </remarks>
         protected override void InsertItem(int index, DateTime item)
         {
-            if (!IsValidThread())
-            {
-                throw new NotSupportedException("This type of Collection does not support changes to its SourceCollection from a thread different from the Dispatcher thread.");
-            }
+            EnsureValidThread();
 
             if (!Contains(item))
             {
@@ -243,10 +233,7 @@ namespace Avalonia.Controls.Primitives
         /// </remarks>
         protected override void RemoveItem(int index)
         {
-            if (!IsValidThread())
-            {
-                throw new NotSupportedException("This type of Collection does not support changes to its SourceCollection from a thread different from the Dispatcher thread.");
-            }
+            EnsureValidThread();
 
             if (index >= Count)
             {
@@ -297,10 +284,7 @@ namespace Avalonia.Controls.Primitives
         /// </remarks>
         protected override void SetItem(int index, DateTime item)
         {
-            if (!IsValidThread())
-            {
-                throw new NotSupportedException("This type of Collection does not support changes to its SourceCollection from a thread different from the Dispatcher thread.");
-            }
+            EnsureValidThread();
 
             if (!Contains(item))
             {
@@ -369,9 +353,9 @@ namespace Avalonia.Controls.Primitives
             return true;
         }
         
-        private bool IsValidThread()
+        private void EnsureValidThread()
         {
-            return Thread.CurrentThread == _dispatcherThread;
+            Dispatcher.UIThread.VerifyAccess();
         }
     }
 }

From c132065cf0af55420d738c57adc4c62f67ec06fd Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Mon, 30 Oct 2017 12:11:32 -0400
Subject: [PATCH 158/482] Removed dependency on IsHandlerSuspended extensions

Replaced the IsHandlerSuspended and SetValueNoCallback extension
methods with a Validate function for the CalendarMode property and
a _displayDateIsChanging flag for the various DisplayDate properties
---
 src/Avalonia.Controls/Calendar/Calendar.cs    | 109 +++++++++---------
 .../Calendar/CalendarExtensions.cs            |  57 ---------
 2 files changed, 56 insertions(+), 110 deletions(-)

diff --git a/src/Avalonia.Controls/Calendar/Calendar.cs b/src/Avalonia.Controls/Calendar/Calendar.cs
index 236ac48630..8c79e5dce5 100644
--- a/src/Avalonia.Controls/Calendar/Calendar.cs
+++ b/src/Avalonia.Controls/Calendar/Calendar.cs
@@ -239,6 +239,7 @@ namespace Avalonia.Controls
         private DateTime? _displayDateEnd = null;
 
         private bool _isShiftPressed;
+        private bool _displayDateIsChanging = false;
 
         internal CalendarDayButton FocusButton { get; set; }
         internal CalendarButton FocusCalendarButton { get; set; }
@@ -350,7 +351,9 @@ namespace Avalonia.Controls
         }
 
         public static readonly StyledProperty<CalendarMode> DisplayModeProperty =
-            AvaloniaProperty.Register<Calendar, CalendarMode>(nameof(DisplayMode));
+            AvaloniaProperty.Register<Calendar, CalendarMode>(
+                nameof(DisplayMode),
+                validate: ValidateDisplayMode);
         /// <summary>
         /// Gets or sets a value indicating whether the calendar is displayed in
         /// months, years, or decades.
@@ -374,63 +377,58 @@ namespace Avalonia.Controls
             CalendarMode oldMode = (CalendarMode)e.OldValue;
             CalendarItem monthControl = MonthControl;
 
-            if (!this.IsHandlerSuspended(Calendar.DisplayModeProperty))
+            if (monthControl != null)
             {
-                if (IsValidDisplayMode(mode))
+                switch (oldMode)
                 {
-                    if (monthControl != null)
-                    {
-                        switch (oldMode)
+                    case CalendarMode.Month:
                         {
-                            case CalendarMode.Month:
-                                {
-                                    SelectedYear = DisplayDateInternal;
-                                    SelectedMonth = DisplayDateInternal;
-                                    break;
-                                }
-                            case CalendarMode.Year:
-                                {
-                                    DisplayDate = SelectedMonth;
-                                    SelectedYear = SelectedMonth;
-                                    break;
-                                }
-                            case CalendarMode.Decade:
-                                {
-                                    DisplayDate = SelectedYear;
-                                    SelectedMonth = SelectedYear;
-                                    break;
-                                }
+                            SelectedYear = DisplayDateInternal;
+                            SelectedMonth = DisplayDateInternal;
+                            break;
                         }
-
-                        switch (mode)
+                    case CalendarMode.Year:
                         {
-                            case CalendarMode.Month:
-                                {
-                                    OnMonthClick();
-                                    break;
-                                }
-                            case CalendarMode.Year:
-                            case CalendarMode.Decade:
-                                {
-                                    OnHeaderClick();
-                                    break;
-                                }
+                            DisplayDate = SelectedMonth;
+                            SelectedYear = SelectedMonth;
+                            break;
+                        }
+                    case CalendarMode.Decade:
+                        {
+                            DisplayDate = SelectedYear;
+                            SelectedMonth = SelectedYear;
+                            break;
                         }
-                    }
-                    OnDisplayModeChanged(new CalendarModeChangedEventArgs((CalendarMode)e.OldValue, mode));
                 }
-                else
+
+                switch (mode)
                 {
-                    this.SetValueNoCallback(Calendar.DisplayModeProperty, (CalendarMode)e.OldValue);
-                    throw new ArgumentOutOfRangeException("d", "Invalid DisplayMode");
+                    case CalendarMode.Month:
+                        {
+                            OnMonthClick();
+                            break;
+                        }
+                    case CalendarMode.Year:
+                    case CalendarMode.Decade:
+                        {
+                            OnHeaderClick();
+                            break;
+                        }
                 }
             }
+            OnDisplayModeChanged(new CalendarModeChangedEventArgs((CalendarMode)e.OldValue, mode));
+        }
+        private static CalendarMode ValidateDisplayMode(Calendar o, CalendarMode mode)
+        {
+            if(IsValidDisplayMode(mode))
+            {
+                return mode;
+            }
+            else
+            {
+                throw new ArgumentOutOfRangeException(nameof(mode), "Invalid DisplayMode");
+            }
         }
-        /// <summary>
-        /// Inherited code: Requires comment.
-        /// </summary>
-        /// <param name="mode">Inherited code: Requires comment 1.</param>
-        /// <returns>Inherited code: Requires comment 2.</returns>
         private static bool IsValidDisplayMode(CalendarMode mode)
         {
             return mode == CalendarMode.Month
@@ -474,7 +472,9 @@ namespace Avalonia.Controls
         {
             if (IsValidSelectionMode(e.NewValue))
             {
-                this.SetValueNoCallback(Calendar.SelectedDateProperty, null);
+                _displayDateIsChanging = true;
+                SelectedDate = null;
+                _displayDateIsChanging = false;
                 SelectedDates.Clear();
             }
             else
@@ -533,7 +533,7 @@ namespace Avalonia.Controls
         }
         private void OnSelectedDateChanged(AvaloniaPropertyChangedEventArgs e)
         {
-            if (!this.IsHandlerSuspended(Calendar.SelectedDateProperty))
+            if (!_displayDateIsChanging)
             {
                 if (SelectionMode != CalendarSelectionMode.None)
                 {
@@ -817,7 +817,7 @@ namespace Avalonia.Controls
         }
         private void OnDisplayDateStartChanged(AvaloniaPropertyChangedEventArgs e)
         {
-            if (!this.IsHandlerSuspended(Calendar.DisplayDateStartProperty))
+            if (!_displayDateIsChanging)
             {
                 DateTime? newValue = e.NewValue as DateTime?;
 
@@ -928,7 +928,7 @@ namespace Avalonia.Controls
 
         private void OnDisplayDateEndChanged(AvaloniaPropertyChangedEventArgs e)
         {
-            if (!this.IsHandlerSuspended(Calendar.DisplayDateEndProperty))
+            if (!_displayDateIsChanging)
             {
                 DateTime? newValue = e.NewValue as DateTime?;
 
@@ -1147,14 +1147,17 @@ namespace Avalonia.Controls
                 }
                 else
                 {
+                    cal._displayDateIsChanging = true;
                     if (DateTime.Compare(value.Value, cal.DisplayDateRangeStart) < 0)
                     {
-                        cal.SetValueNoCallback(Calendar.DisplayDateStartProperty, value);
+                        cal.DisplayDateStart = value;
                     }
                     else if (DateTime.Compare(value.Value, cal.DisplayDateRangeEnd) > 0)
                     {
-                        cal.SetValueNoCallback(Calendar.DisplayDateEndProperty, value);
+                        cal.DisplayDateEnd = value;
                     }
+                    cal._displayDateIsChanging = false;
+
                     return true;
                 }
             }
diff --git a/src/Avalonia.Controls/Calendar/CalendarExtensions.cs b/src/Avalonia.Controls/Calendar/CalendarExtensions.cs
index 485f2dfc95..4fda02bff3 100644
--- a/src/Avalonia.Controls/Calendar/CalendarExtensions.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarExtensions.cs
@@ -12,63 +12,6 @@ namespace Avalonia.Controls.Primitives
 {
     internal static class CalendarExtensions
     {
-
-        private static Dictionary<IAvaloniaObject, Dictionary<AvaloniaProperty, bool>> _suspendedHandlers = new Dictionary<IAvaloniaObject, Dictionary<AvaloniaProperty, bool>>();
-
-        public static bool IsHandlerSuspended(this IAvaloniaObject obj, AvaloniaProperty dependencyProperty)
-        {
-            if (_suspendedHandlers.ContainsKey(obj))
-            {
-                return _suspendedHandlers[obj].ContainsKey(dependencyProperty);
-            }
-            else
-            {
-                return false;
-            }
-        }
-        private static void SuspendHandler(this IAvaloniaObject obj, AvaloniaProperty dependencyProperty, bool suspend)
-        {
-            if (_suspendedHandlers.ContainsKey(obj))
-            {
-                Dictionary<AvaloniaProperty, bool> suspensions = _suspendedHandlers[obj];
-
-                if (suspend)
-                {
-                    Debug.Assert(!suspensions.ContainsKey(dependencyProperty), "Suspensions should not contain the property!");
-
-                    // true = dummy value
-                    suspensions[dependencyProperty] = true;
-                }
-                else
-                {
-                    Debug.Assert(suspensions.ContainsKey(dependencyProperty), "Suspensions should contain the property!");
-                    suspensions.Remove(dependencyProperty);
-                    if (suspensions.Count == 0)
-                    {
-                        _suspendedHandlers.Remove(obj);
-                    }
-                }
-            }
-            else
-            {
-                Debug.Assert(suspend, "suspend should be true!");
-                _suspendedHandlers[obj] = new Dictionary<AvaloniaProperty, bool>();
-                _suspendedHandlers[obj][dependencyProperty] = true;
-            }
-        }
-        public static void SetValueNoCallback<T>(this IAvaloniaObject obj, AvaloniaProperty<T> property, T value)
-        {
-            obj.SuspendHandler(property, true);
-            try
-            {
-                obj.SetValue(property, value);
-            }
-            finally
-            {
-                obj.SuspendHandler(property, false);
-            }
-        }
-        
         public static void GetMetaKeyState(InputModifiers modifiers, out bool ctrl, out bool shift)
         {
             ctrl = (modifiers & InputModifiers.Control) == InputModifiers.Control;

From ebcaa0742c79e6c9d9eae3d024056b43346125d5 Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Mon, 30 Oct 2017 12:50:22 -0400
Subject: [PATCH 159/482] Expanded HitTest regions of internal elements

Set Backgrounds to Transparent for various buttons in the control
templates to allow for expanded HitTest regions allowing for better
PointerOver and Clicking behavior
---
 src/Avalonia.Themes.Default/CalendarDayButton.xaml |  2 +-
 src/Avalonia.Themes.Default/CalendarItem.xaml      | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Themes.Default/CalendarDayButton.xaml b/src/Avalonia.Themes.Default/CalendarDayButton.xaml
index fcb5cab0c9..01c6e6a708 100644
--- a/src/Avalonia.Themes.Default/CalendarDayButton.xaml
+++ b/src/Avalonia.Themes.Default/CalendarDayButton.xaml
@@ -16,7 +16,7 @@
     <Setter Property="Focusable" Value="False"/>
     <Setter Property="Template">
       <ControlTemplate>
-        <Panel>
+        <Panel Background="Transparent">
 
           <Rectangle Name="TodayBackground"
                      Fill="{DynamicResource HighlightBrush}"/>
diff --git a/src/Avalonia.Themes.Default/CalendarItem.xaml b/src/Avalonia.Themes.Default/CalendarItem.xaml
index 73d9945677..454bcff32c 100644
--- a/src/Avalonia.Themes.Default/CalendarItem.xaml
+++ b/src/Avalonia.Themes.Default/CalendarItem.xaml
@@ -35,7 +35,8 @@
                   <Style Selector="Button.Header">
                     <Setter Property="Template">
                       <ControlTemplate>
-                        <Panel Cursor="Hand">
+                        <Panel Cursor="Hand"
+                               Background="Transparent">
                           <ContentControl Name="Content"
                                           Content="{TemplateBinding Content}"
                                           ContentTemplate="{TemplateBinding ContentTemplate}"
@@ -56,7 +57,8 @@
                   <Style Selector="Button.Previous">
                     <Setter Property="Template">
                       <ControlTemplate>
-                        <Panel Cursor="Hand">
+                        <Panel Cursor="Hand"
+                               Background="Transparent">
                           <Path Name="IconPath"
                                 Margin="14,-6,0,0"
                                 Height="10"
@@ -79,7 +81,8 @@
                   <Style Selector="Button.Next">
                     <Setter Property="Template">
                       <ControlTemplate>
-                        <Panel Cursor="Hand">
+                        <Panel Cursor="Hand"
+                               Background="Transparent">
                           <Path Name="IconPath"
                                 Margin="0,-6,14,0"
                                 Height="10"
@@ -105,7 +108,7 @@
                            Stretch="Fill"
                            VerticalAlignment="Top"
                            Height="22"/>
-
+                
                 <Button Name="PreviousButton"
                         Classes="Previous"
                         Height="20"
@@ -205,5 +208,5 @@
   <Style Selector="CalendarItem:calendardisabled /template/ Rectangle#DisabledVisual">
     <Setter Property="IsVisible" Value="True"/>
   </Style>
-
+  
 </Styles>
\ No newline at end of file

From aa81573218839033b1c4549971bbf0e4e06c7d5b Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Mon, 30 Oct 2017 12:59:19 -0400
Subject: [PATCH 160/482] Fixed binding errors caused by DayTitleTemplate

Fixed by initializing the DataContext before adding elements to the
VisualTree
---
 src/Avalonia.Controls/Calendar/CalendarItem.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Avalonia.Controls/Calendar/CalendarItem.cs b/src/Avalonia.Controls/Calendar/CalendarItem.cs
index fc358ed06e..3432fa549d 100644
--- a/src/Avalonia.Controls/Calendar/CalendarItem.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarItem.cs
@@ -198,6 +198,7 @@ namespace Avalonia.Controls.Primitives
                     if (_dayTitleTemplate != null)
                     {
                         var cell = _dayTitleTemplate.Build();
+                        cell.DataContext = string.Empty;
                         cell.SetValue(Grid.RowProperty, 0);
                         cell.SetValue(Grid.ColumnProperty, i);
                         MonthView.Children.Add(cell);

From f8eaf185ad9e748859477840aa8094864a2b0b8a Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Mon, 30 Oct 2017 13:40:03 -0400
Subject: [PATCH 161/482] Updated Theme template to avoid retemplating buttons

Removed the re-templating of the navigation buttons within the Calendar
header
---
 src/Avalonia.Themes.Default/CalendarItem.xaml | 113 +++++++-----------
 1 file changed, 42 insertions(+), 71 deletions(-)

diff --git a/src/Avalonia.Themes.Default/CalendarItem.xaml b/src/Avalonia.Themes.Default/CalendarItem.xaml
index 454bcff32c..a9756fdb5f 100644
--- a/src/Avalonia.Themes.Default/CalendarItem.xaml
+++ b/src/Avalonia.Themes.Default/CalendarItem.xaml
@@ -32,74 +32,28 @@
                 </Grid.ColumnDefinitions>
 
                 <Grid.Styles>
-                  <Style Selector="Button.Header">
-                    <Setter Property="Template">
-                      <ControlTemplate>
-                        <Panel Cursor="Hand"
-                               Background="Transparent">
-                          <ContentControl Name="Content"
-                                          Content="{TemplateBinding Content}"
-                                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                                          Margin="1,5,1,9"
-                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-                        </Panel>
-                      </ControlTemplate>
-                    </Setter>
+                  <Style Selector="Button.CalendarHeader">
+                    <Setter Property="Cursor" Value="Hand"/>
+                    <Setter Property="Background" Value="Transparent"/>
+                    <Setter Property="BorderThickness" Value="0"/>
                   </Style>
-                  <Style Selector="Button.Header /template/ ContentControl#Content">
-                    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-                  </Style>
-                  <Style Selector="Button.Header:pointerover /template/ ContentControl#Content">
-                    <Setter Property="Foreground" Value="{DynamicResource HighlightBrush}"/>
+                    <Style Selector="Button.CalendarHeader:pressed  /template/ ContentPresenter">
+                    <Setter Property="Background" Value="Transparent"/>
                   </Style>
 
-                  <Style Selector="Button.Previous">
-                    <Setter Property="Template">
-                      <ControlTemplate>
-                        <Panel Cursor="Hand"
-                               Background="Transparent">
-                          <Path Name="IconPath"
-                                Margin="14,-6,0,0"
-                                Height="10"
-                                Width="6"
-                                VerticalAlignment="Center"
-                                HorizontalAlignment="Left"
-                                Stretch="Fill"
-                                Data="M288.75,232.25 L288.75,240.625 L283,236.625 z" />
-                        </Panel>
-                      </ControlTemplate>
-                    </Setter>
+                  <Style Selector="Button.CalendarNavigation">
+                    <Setter Property="Height" Value="20"/>
+                    <Setter Property="Width" Value="28"/>
                   </Style>
-                  <Style Selector="Button.Previous /template/ Path#IconPath">
+                  <Style Selector="Button.CalendarNavigation > Path">
                     <Setter Property="Fill" Value="{DynamicResource ThemeForegroundBrush}"/>
                   </Style>
-                  <Style Selector="Button.Previous:pointerover /template/ Path#IconPath">
+                  <Style Selector="Button.CalendarNavigation:pointerover > Path">
                     <Setter Property="Fill" Value="{DynamicResource HighlightBrush}"/>
                   </Style>
 
-                  <Style Selector="Button.Next">
-                    <Setter Property="Template">
-                      <ControlTemplate>
-                        <Panel Cursor="Hand"
-                               Background="Transparent">
-                          <Path Name="IconPath"
-                                Margin="0,-6,14,0"
-                                Height="10"
-                                Width="6"
-                                Stretch="Fill"
-                                VerticalAlignment="Center"
-                                HorizontalAlignment="Right"
-                                Data="M282.875,231.875 L282.875,240.375 L288.625,236 z" />
-                        </Panel>
-                      </ControlTemplate>
-                    </Setter>
-                  </Style>
-                  <Style Selector="Button.Next /template/ Path#IconPath">
-                    <Setter Property="Fill" Value="{DynamicResource ThemeForegroundBrush}"/>
-                  </Style>
-                  <Style Selector="Button.Next:pointerover /template/ Path#IconPath">
-                    <Setter Property="Fill" Value="{DynamicResource HighlightBrush}"/>
+                  <Style Selector="Button#HeaderButton:pointerover">
+                    <Setter Property="Foreground" Value="{DynamicResource HighlightBrush}"/>
                   </Style>
                 </Grid.Styles>
 
@@ -108,29 +62,46 @@
                            Stretch="Fill"
                            VerticalAlignment="Top"
                            Height="22"/>
-                
+
                 <Button Name="PreviousButton"
-                        Classes="Previous"
-                        Height="20"
-                        Width="28"
+                        Classes="CalendarHeader CalendarNavigation"
                         IsVisible="False"
-                        HorizontalAlignment="Left"/>
-
+                        HorizontalAlignment="Left">
+
+                  <Path Margin="14,-6,0,0"
+                        Height="10"
+                        Width="6"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Left"
+                        Stretch="Fill"
+                        Data="M288.75,232.25 L288.75,240.625 L283,236.625 z" />
+                  
+                </Button>
+                
                 <Button Name="HeaderButton"
-                        Classes="Header"
+                        Classes="CalendarHeader"
                         Grid.Column="1"
                         FontWeight="Bold"
                         FontSize="10.5"
                         HorizontalAlignment="Center"
-                        VerticalAlignment="Center" />
+                        VerticalAlignment="Center" 
+                        Padding="1,5,1,9"/>
 
                 <Button Name="NextButton"
-                        Classes="Next"
+                        Classes="CalendarHeader CalendarNavigation"
                         Grid.Column="2"
-                        Height="20"
-                        Width="28"
                         IsVisible="False"
-                        HorizontalAlignment="Right" />
+                        HorizontalAlignment="Right" >
+
+                  <Path Margin="0,-6,14,0"
+                        Height="10"
+                        Width="6"
+                        Stretch="Fill"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Right"
+                        Data="M282.875,231.875 L282.875,240.375 L288.625,236 z" />
+                  
+                </Button>
 
                 <Grid Name="MonthView"
                       Grid.Row="1"

From ed7055095c96cb057f00f31613685a6c9f60dec1 Mon Sep 17 00:00:00 2001
From: John Stevans <john.stevans@outlook.com>
Date: Tue, 31 Oct 2017 21:15:27 -0700
Subject: [PATCH 162/482] Add Vertical Animation.PageSlide orientation

---
 src/Avalonia.Visuals/Animation/PageSlide.cs | 25 +++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Visuals/Animation/PageSlide.cs b/src/Avalonia.Visuals/Animation/PageSlide.cs
index 015f22ec14..ebc358379d 100644
--- a/src/Avalonia.Visuals/Animation/PageSlide.cs
+++ b/src/Avalonia.Visuals/Animation/PageSlide.cs
@@ -15,6 +15,15 @@ namespace Avalonia.Animation
     /// </summary>
     public class PageSlide : IPageTransition
     {
+        /// <summary>
+        /// The axis on which the PageSlide should occur
+        /// </summary>
+        public enum SlideAxis
+        {
+            Horizontal,
+            Vertical
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PageSlide"/> class.
         /// </summary>
@@ -26,9 +35,11 @@ namespace Avalonia.Animation
         /// Initializes a new instance of the <see cref="PageSlide"/> class.
         /// </summary>
         /// <param name="duration">The duration of the animation.</param>
-        public PageSlide(TimeSpan duration)
+        /// <param name="orientation">The axis on which the animation should occur</param>
+        public PageSlide(TimeSpan duration, SlideAxis orientation = SlideAxis.Horizontal)
         {
             Duration = duration;
+            Orientation = orientation;
         }
 
         /// <summary>
@@ -36,6 +47,11 @@ namespace Avalonia.Animation
         /// </summary>
         public TimeSpan Duration { get; set; }
 
+        /// <summary>
+        /// Gets the duration of the animation.
+        /// </summary>
+        public SlideAxis Orientation { get; set; }
+
         /// <summary>
         /// Starts the animation.
         /// </summary>
@@ -55,7 +71,8 @@ namespace Avalonia.Animation
         {
             var tasks = new List<Task>();
             var parent = GetVisualParent(from, to);
-            var distance = parent.Bounds.Width;
+            var distance = Orientation == SlideAxis.Horizontal ? parent.Bounds.Width : parent.Bounds.Height;
+            var translateProperty = Orientation == SlideAxis.Horizontal ? TranslateTransform.XProperty : TranslateTransform.YProperty;
 
             if (from != null)
             {
@@ -63,7 +80,7 @@ namespace Avalonia.Animation
                 from.RenderTransform = transform;
                 tasks.Add(Animate.Property(
                     transform,
-                    TranslateTransform.XProperty,
+                    translateProperty,
                     0.0,
                     forward ? -distance : distance,
                     LinearEasing.For<double>(),
@@ -77,7 +94,7 @@ namespace Avalonia.Animation
                 to.IsVisible = true;
                 tasks.Add(Animate.Property(
                     transform,
-                    TranslateTransform.XProperty,
+                    translateProperty,
                     forward ? distance : -distance,
                     0.0,
                     LinearEasing.For<double>(),

From 57ab463743b90e2cd8bb635048752d603f238271 Mon Sep 17 00:00:00 2001
From: John Stevans <john.stevans@outlook.com>
Date: Tue, 31 Oct 2017 21:15:53 -0700
Subject: [PATCH 163/482] Add option for vertical PageSlide to Carousel test
 page in ControlCatalog

---
 samples/ControlCatalog/Pages/CarouselPage.xaml    | 10 +++++++++-
 samples/ControlCatalog/Pages/CarouselPage.xaml.cs |  5 ++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/samples/ControlCatalog/Pages/CarouselPage.xaml b/samples/ControlCatalog/Pages/CarouselPage.xaml
index 317159cd8d..4a5b2cea26 100644
--- a/samples/ControlCatalog/Pages/CarouselPage.xaml
+++ b/samples/ControlCatalog/Pages/CarouselPage.xaml
@@ -9,7 +9,7 @@
       </Button>
       <Carousel Name="carousel">
         <Carousel.Transition>
-          <PageSlide Duration="0.25"/>
+          <PageSlide Duration="0.25" Orientation="Vertical" />
         </Carousel.Transition>
         <Image Source="resm:ControlCatalog.Assets.delicate-arch-896885_640.jpg"/>
         <Image Source="resm:ControlCatalog.Assets.hirsch-899118_640.jpg"/>
@@ -28,6 +28,14 @@
         <DropDownItem>Crossfade</DropDownItem>
       </DropDown>
     </StackPanel>
+
+    <StackPanel Orientation="Horizontal" Gap="4">
+      <TextBlock VerticalAlignment="Center">Orientation</TextBlock>
+      <DropDown Name="orientation" SelectedIndex="1" VerticalAlignment="Center">
+        <DropDownItem>Horizontal</DropDownItem>
+        <DropDownItem>Vertical</DropDownItem>
+      </DropDown>
+    </StackPanel>
     
   </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/CarouselPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage.xaml.cs
index 1c408c8ed7..272290e679 100644
--- a/samples/ControlCatalog/Pages/CarouselPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CarouselPage.xaml.cs
@@ -11,6 +11,7 @@ namespace ControlCatalog.Pages
         private Button _left;
         private Button _right;
         private DropDown _transition;
+        private DropDown _orientation;
 
         public CarouselPage()
         {
@@ -18,6 +19,7 @@ namespace ControlCatalog.Pages
             _left.Click += (s, e) => _carousel.Previous();
             _right.Click += (s, e) => _carousel.Next();
             _transition.SelectionChanged += TransitionChanged;
+            _orientation.SelectionChanged += TransitionChanged;
         }
 
         private void InitializeComponent()
@@ -27,6 +29,7 @@ namespace ControlCatalog.Pages
             _left = this.FindControl<Button>("left");
             _right = this.FindControl<Button>("right");
             _transition = this.FindControl<DropDown>("transition");
+            _orientation = this.FindControl<DropDown>("orientation");
         }
 
         private void TransitionChanged(object sender, SelectionChangedEventArgs e)
@@ -37,7 +40,7 @@ namespace ControlCatalog.Pages
                     _carousel.Transition = null;
                     break;
                 case 1:
-                    _carousel.Transition = new PageSlide(TimeSpan.FromSeconds(0.25));
+                    _carousel.Transition = new PageSlide(TimeSpan.FromSeconds(0.25), _orientation.SelectedIndex == 0 ? PageSlide.SlideAxis.Horizontal : PageSlide.SlideAxis.Vertical);
                     break;
                 case 2:
                     _carousel.Transition = new CrossFade(TimeSpan.FromSeconds(0.25));

From 4ebd4a34dd36d7d42fec5d2a7db6d8e3fb35cc7d Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Thu, 2 Nov 2017 00:13:26 +0300
Subject: [PATCH 164/482] Removed unneded Task.Yield

---
 src/Avalonia.Remote.Protocol/BsonStreamTransport.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs b/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs
index 604703cac8..93a3b60599 100644
--- a/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs
+++ b/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs
@@ -64,7 +64,6 @@ namespace Avalonia.Remote.Protocol
 
         async Task Reader()
         {
-            Task.Yield();
             try
             {
                 while (true)
@@ -147,4 +146,4 @@ namespace Avalonia.Remote.Protocol
         public event Action<IAvaloniaRemoteTransportConnection, object> OnMessage;
         public event Action<IAvaloniaRemoteTransportConnection, Exception> OnException;
     }
-}
\ No newline at end of file
+}

From af1da0a9c9bdc89db52ea88eb59a47d7e6289aa9 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 2 Nov 2017 23:34:37 -0500
Subject: [PATCH 165/482] Add missing assignment.

---
 src/Avalonia.Controls/AppBuilderBase.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Avalonia.Controls/AppBuilderBase.cs b/src/Avalonia.Controls/AppBuilderBase.cs
index 4167539455..ebbd682f28 100644
--- a/src/Avalonia.Controls/AppBuilderBase.cs
+++ b/src/Avalonia.Controls/AppBuilderBase.cs
@@ -255,7 +255,11 @@ namespace Avalonia.Controls
             }
 
             if (s_setupWasAlreadyCalled)
+            {
                 throw new InvalidOperationException("Setup was already called on one of AppBuilder instances");
+            }
+
+            s_setupWasAlreadyCalled = true;
 
             Instance.RegisterServices();
             RuntimePlatformServicesInitializer();

From 4116bc54c0ca8104b4a7b935e964dd8e86e136c7 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 5 Nov 2017 16:30:14 +0100
Subject: [PATCH 166/482] Added failing unit test for #1260.

---
 .../Avalonia.Styling.UnitTests/SetterTests.cs | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/tests/Avalonia.Styling.UnitTests/SetterTests.cs b/tests/Avalonia.Styling.UnitTests/SetterTests.cs
index b65b8dcc68..f376df4d0b 100644
--- a/tests/Avalonia.Styling.UnitTests/SetterTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/SetterTests.cs
@@ -86,6 +86,77 @@ namespace Avalonia.Styling.UnitTests
             Assert.Null(control.Tag);
         }
 
+        [Fact]
+        public void Setter_Should_Apply_Value_Without_Activator_With_Style_Priority()
+        {
+            var control = new Mock<IStyleable>();
+            var style = Mock.Of<Style>();
+            var setter = new Setter(TextBlock.TextProperty, "foo");
+
+            setter.Apply(style, control.Object, null);
+
+            control.Verify(x => x.Bind(
+                TextBlock.TextProperty,
+                It.IsAny<IObservable<object>>(),
+                BindingPriority.Style));
+        }
+
+        [Fact]
+        public void Setter_Should_Apply_Value_With_Activator_With_StyleTrigger_Priority()
+        {
+            var control = new Mock<IStyleable>();
+            var style = Mock.Of<Style>();
+            var setter = new Setter(TextBlock.TextProperty, "foo");
+            var activator = new Subject<bool>();
+
+            setter.Apply(style, control.Object, activator);
+
+            control.Verify(x => x.Bind(
+                TextBlock.TextProperty,
+                It.IsAny<IObservable<object>>(),
+                BindingPriority.StyleTrigger));
+        }
+
+        [Fact]
+        public void Setter_Should_Apply_Binding_Without_Activator_With_Style_Priority()
+        {
+            var control = new Mock<IStyleable>();
+            var style = Mock.Of<Style>();
+            var setter = new Setter(TextBlock.TextProperty, CreateMockBinding(TextBlock.TextProperty));
+
+            setter.Apply(style, control.Object, null);
+
+            control.Verify(x => x.Bind(
+                TextBlock.TextProperty,
+                It.IsAny<IObservable<object>>(),
+                BindingPriority.Style));
+        }
+
+        [Fact]
+        public void Setter_Should_Apply_Binding_With_Activator_With_StyleTrigger_Priority()
+        {
+            var control = new Mock<IStyleable>();
+            var style = Mock.Of<Style>();
+            var setter = new Setter(TextBlock.TextProperty, CreateMockBinding(TextBlock.TextProperty));
+            var activator = new Subject<bool>();
+
+            setter.Apply(style, control.Object, activator);
+
+            control.Verify(x => x.Bind(
+                TextBlock.TextProperty,
+                It.IsAny<IObservable<object>>(),
+                BindingPriority.StyleTrigger));
+        }
+
+        private IBinding CreateMockBinding(AvaloniaProperty property)
+        {
+            var subject = new Subject<object>();
+            var descriptor = InstancedBinding.OneWay(subject);
+            var binding = Mock.Of<IBinding>(x => 
+                x.Initiate(It.IsAny<IAvaloniaObject>(), property, null, false) == descriptor);
+            return binding;
+        }
+
         private class TestConverter : IValueConverter
         {
             public object Convert(object value, Type targetType, object parameter, CultureInfo culture)

From a7d440ca02ef782474f3b47f16e4fbd908980efd Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 5 Nov 2017 16:31:24 +0100
Subject: [PATCH 167/482] Fix #1260.

Setters without an activator should binding with `Style` priority, not `StyleTrigger`.

Fixes #1260
---
 src/Avalonia.Styling/Styling/Setter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Styling/Styling/Setter.cs b/src/Avalonia.Styling/Styling/Setter.cs
index 95db18a465..e4d0ce5fab 100644
--- a/src/Avalonia.Styling/Styling/Setter.cs
+++ b/src/Avalonia.Styling/Styling/Setter.cs
@@ -174,7 +174,7 @@ namespace Avalonia.Styling
             }
             else
             {
-                return sourceInstance.WithPriority(BindingPriority.StyleTrigger);
+                return sourceInstance.WithPriority(BindingPriority.Style);
             }
         }
     }

From d6ef7c805b494fb337d31d4966a8130b8816f300 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 6 Nov 2017 01:37:39 +0300
Subject: [PATCH 168/482] Update MonoMac.props

---
 build/MonoMac.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/MonoMac.props b/build/MonoMac.props
index 452177ca5d..5cf19ef503 100644
--- a/build/MonoMac.props
+++ b/build/MonoMac.props
@@ -1,5 +1,5 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="MonoMac.NetStandard" Version="0.0.3" />
+    <PackageReference Include="MonoMac.NetStandard" Version="0.0.4" />
   </ItemGroup>
 </Project>

From 755531631e4d438d105a2608a919377950cb39fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Mon, 6 Nov 2017 21:03:54 +0000
Subject: [PATCH 169/482] Implemented three states on ToggleButton, CheckBox
 and RadioButton.

---
 .../ControlCatalog/Pages/CheckBoxPage.xaml    | 25 ++++++--
 .../ControlCatalog/Pages/DialogsPage.xaml.cs  |  2 +-
 .../ControlCatalog/Pages/RadioButtonPage.xaml | 23 ++++++--
 .../Primitives/ToggleButton.cs                | 27 ++++++---
 src/Avalonia.Controls/RadioButton.cs          |  9 +--
 src/Avalonia.Themes.Default/CheckBox.xaml     | 31 +++++++---
 src/Avalonia.Themes.Default/RadioButton.xaml  | 14 +++++
 .../Primitives/ToggleButtonTests.cs           | 57 +++++++++++++++++++
 .../RadioButtonTests.cs                       | 36 ++++++++++++
 9 files changed, 191 insertions(+), 33 deletions(-)
 create mode 100644 tests/Avalonia.Controls.UnitTests/Primitives/ToggleButtonTests.cs
 create mode 100644 tests/Avalonia.Controls.UnitTests/RadioButtonTests.cs

diff --git a/samples/ControlCatalog/Pages/CheckBoxPage.xaml b/samples/ControlCatalog/Pages/CheckBoxPage.xaml
index 4a6db5bed9..a00b3a7bef 100644
--- a/samples/ControlCatalog/Pages/CheckBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/CheckBoxPage.xaml
@@ -1,15 +1,28 @@
-<UserControl xmlns="https://github.com/avaloniaui">
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <StackPanel Orientation="Vertical" Gap="4">
     <TextBlock Classes="h1">CheckBox</TextBlock>
     <TextBlock Classes="h2">A check box control</TextBlock>
 
-    <StackPanel Orientation="Vertical"
+    <StackPanel Orientation="Horizontal"
                 Margin="0,16,0,0"
                 HorizontalAlignment="Center"
                 Gap="16">
-      <CheckBox>Unchecked</CheckBox>
-      <CheckBox IsChecked="True">Checked</CheckBox>
-      <CheckBox IsChecked="True" IsEnabled="False">Disabled</CheckBox>
-    </StackPanel>    
+      <StackPanel Orientation="Vertical"
+                  Gap="16">
+        <CheckBox>Unchecked</CheckBox>
+        <CheckBox IsChecked="True">Checked</CheckBox>
+        <CheckBox IsChecked="{x:Null}">Indeterminate</CheckBox>
+        <CheckBox IsChecked="True" IsEnabled="False">Disabled</CheckBox>
+      </StackPanel>
+      <StackPanel Orientation="Vertical"
+                  HorizontalAlignment="Center"
+                  Gap="16">
+        <CheckBox IsChecked="False" IsThreeState="True">Three State: Unchecked</CheckBox>
+        <CheckBox IsChecked="True" IsThreeState="True">Three State: Checked</CheckBox>
+        <CheckBox IsChecked="{x:Null}" IsThreeState="True">Three State: Indeterminate</CheckBox>
+        <CheckBox IsChecked="{x:Null}" IsThreeState="True" IsEnabled="False">Three State: Disabled</CheckBox>
+      </StackPanel>
+    </StackPanel>
   </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
index 94364da698..8b3e810f0a 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
@@ -36,7 +36,7 @@ namespace ControlCatalog.Pages
             };
         }
 
-        Window GetWindow() => this.FindControl<CheckBox>("IsModal").IsChecked ? (Window)this.VisualRoot : null;
+        Window GetWindow() => this.FindControl<CheckBox>("IsModal").IsChecked.Value ? (Window)this.VisualRoot : null;
 
         private void InitializeComponent()
         {
diff --git a/samples/ControlCatalog/Pages/RadioButtonPage.xaml b/samples/ControlCatalog/Pages/RadioButtonPage.xaml
index a40477a679..29bac2c2c5 100644
--- a/samples/ControlCatalog/Pages/RadioButtonPage.xaml
+++ b/samples/ControlCatalog/Pages/RadioButtonPage.xaml
@@ -1,15 +1,26 @@
-<UserControl xmlns="https://github.com/avaloniaui">
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <StackPanel Orientation="Vertical" Gap="4">
     <TextBlock Classes="h1">RadioButton</TextBlock>
     <TextBlock Classes="h2">Allows the selection of a single option of many</TextBlock>
 
-    <StackPanel Orientation="Vertical"
+    <StackPanel Orientation="Horizontal"
                 Margin="0,16,0,0"
                 HorizontalAlignment="Center"
                 Gap="16">
-      <RadioButton IsChecked="True">Option 1</RadioButton>
-      <RadioButton>Option 2</RadioButton>
-      <RadioButton IsEnabled="False">Disabled</RadioButton>
-    </StackPanel>    
+      <StackPanel Orientation="Vertical"
+                  Gap="16">
+        <RadioButton IsChecked="True">Option 1</RadioButton>
+        <RadioButton>Option 2</RadioButton>
+        <RadioButton IsEnabled="False">Disabled</RadioButton>
+      </StackPanel>
+      <StackPanel Orientation="Vertical"
+                  Gap="16">
+        <RadioButton IsChecked="True" IsThreeState="True">Three States: Option 1</RadioButton>
+        <RadioButton IsChecked="False" IsThreeState="True">Three States: Option 2</RadioButton>
+        <RadioButton IsChecked="{x:Null}" IsThreeState="True">Three States: Option 3</RadioButton>
+        <RadioButton IsChecked="{x:Null}" IsThreeState="True" IsEnabled="False">Disabled</RadioButton>
+      </StackPanel>
+    </StackPanel>
   </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/src/Avalonia.Controls/Primitives/ToggleButton.cs b/src/Avalonia.Controls/Primitives/ToggleButton.cs
index 4e9e326997..b9a517db4c 100644
--- a/src/Avalonia.Controls/Primitives/ToggleButton.cs
+++ b/src/Avalonia.Controls/Primitives/ToggleButton.cs
@@ -9,26 +9,37 @@ namespace Avalonia.Controls.Primitives
 {
     public class ToggleButton : Button
     {
-        public static readonly DirectProperty<ToggleButton, bool> IsCheckedProperty =
-            AvaloniaProperty.RegisterDirect<ToggleButton, bool>(
-                "IsChecked",
+        public static readonly DirectProperty<ToggleButton, bool?> IsCheckedProperty =
+            AvaloniaProperty.RegisterDirect<ToggleButton, bool?>(
+                nameof(IsChecked),
                 o => o.IsChecked,
-                (o,v) => o.IsChecked = v,
+                (o, v) => o.IsChecked = v,
                 defaultBindingMode: BindingMode.TwoWay);
 
-        private bool _isChecked;
+        public static readonly StyledProperty<bool> IsThreeStateProperty =
+            AvaloniaProperty.Register<ToggleButton, bool>(nameof(IsThreeState));
+
+        private bool? _isChecked = false;
 
         static ToggleButton()
         {
-            PseudoClass(IsCheckedProperty, ":checked");
+            PseudoClass(IsCheckedProperty, c => c == true, ":checked");
+            PseudoClass(IsCheckedProperty, c => c == false, ":unchecked");
+            PseudoClass(IsCheckedProperty, c => c == null, ":indeterminate");
         }
 
-        public bool IsChecked
+        public bool? IsChecked
         {
             get { return _isChecked; }
             set { SetAndRaise(IsCheckedProperty, ref _isChecked, value); }
         }
 
+        public bool IsThreeState
+        {
+            get => GetValue(IsThreeStateProperty);
+            set => SetValue(IsThreeStateProperty, value);
+        }
+
         protected override void OnClick()
         {
             Toggle();
@@ -37,7 +48,7 @@ namespace Avalonia.Controls.Primitives
 
         protected virtual void Toggle()
         {
-            IsChecked = !IsChecked;
+            IsChecked = IsChecked.HasValue ? (IsChecked.Value ? (IsThreeState ? (bool?)null : false) : true) : false;
         }
     }
 }
diff --git a/src/Avalonia.Controls/RadioButton.cs b/src/Avalonia.Controls/RadioButton.cs
index 25ab0f9c12..945335b8f7 100644
--- a/src/Avalonia.Controls/RadioButton.cs
+++ b/src/Avalonia.Controls/RadioButton.cs
@@ -17,17 +17,17 @@ namespace Avalonia.Controls
 
         protected override void Toggle()
         {
-            if (!IsChecked)
+            if (!IsChecked.GetValueOrDefault())
             {
                 IsChecked = true;
             }
         }
 
-        private void IsCheckedChanged(bool value)
+        private void IsCheckedChanged(bool? value)
         {
             var parent = this.GetVisualParent();
 
-            if (value && parent != null)
+            if (value.GetValueOrDefault() && parent != null)
             {
                 var siblings = parent
                     .GetVisualChildren()
@@ -36,7 +36,8 @@ namespace Avalonia.Controls
 
                 foreach (var sibling in siblings)
                 {
-                    sibling.IsChecked = false;
+                    if (sibling.IsChecked.GetValueOrDefault())
+                        sibling.IsChecked = false;
                 }
             }
         }
diff --git a/src/Avalonia.Themes.Default/CheckBox.xaml b/src/Avalonia.Themes.Default/CheckBox.xaml
index 195ec098c9..ef96e7ed4f 100644
--- a/src/Avalonia.Themes.Default/CheckBox.xaml
+++ b/src/Avalonia.Themes.Default/CheckBox.xaml
@@ -12,14 +12,23 @@
                   Width="18"
                   Height="18"
                   VerticalAlignment="Center">
-            <Path Name="checkMark"
-                  Fill="{DynamicResource HighlightBrush}"
-                  Width="11"
-                  Height="10"
-                  Stretch="Uniform"
-                  HorizontalAlignment="Center"
-                  VerticalAlignment="Center"
-                  Data="M 1145.607177734375,430 C1145.607177734375,430 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1138,434.5538330078125 1138,434.5538330078125 1138,434.5538330078125 1141.482177734375,438 1141.482177734375,438 1141.482177734375,438 1141.96875,437.9375 1141.96875,437.9375 1141.96875,437.9375 1147,431.34619140625 1147,431.34619140625 1147,431.34619140625 1145.607177734375,430 1145.607177734375,430 z"/>
+            <Panel>
+              <Path Name="checkMark"
+                    Fill="{DynamicResource HighlightBrush}"
+                    Width="11"
+                    Height="10"
+                    Stretch="Uniform"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Data="M 1145.607177734375,430 C1145.607177734375,430 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1138,434.5538330078125 1138,434.5538330078125 1138,434.5538330078125 1141.482177734375,438 1141.482177734375,438 1141.482177734375,438 1141.96875,437.9375 1141.96875,437.9375 1141.96875,437.9375 1147,431.34619140625 1147,431.34619140625 1147,431.34619140625 1145.607177734375,430 1145.607177734375,430 z"/>
+              <Rectangle Name="indeterminateMark"
+                         Fill="{DynamicResource HighlightBrush}"
+                         Width="10"
+                         Height="10"
+                         Stretch="Uniform"
+                         HorizontalAlignment="Center"
+                         VerticalAlignment="Center"/>
+            </Panel>
           </Border>
           <ContentPresenter Name="PART_ContentPresenter"
                             Content="{TemplateBinding Content}"
@@ -37,9 +46,15 @@
   <Style Selector="CheckBox /template/ Path#checkMark">
     <Setter Property="IsVisible" Value="False"/>
   </Style>
+  <Style Selector="CheckBox /template/ Rectangle#indeterminateMark">
+    <Setter Property="IsVisible" Value="False"/>
+  </Style>
   <Style Selector="CheckBox:checked /template/ Path#checkMark">
     <Setter Property="IsVisible" Value="True"/>
   </Style>
+  <Style Selector="CheckBox:indeterminate /template/ Rectangle#indeterminateMark">
+    <Setter Property="IsVisible" Value="True"/>
+  </Style>
   <Style Selector="CheckBox:disabled /template/ Border#border">
     <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
   </Style>
diff --git a/src/Avalonia.Themes.Default/RadioButton.xaml b/src/Avalonia.Themes.Default/RadioButton.xaml
index 996f46023e..0a0eb48564 100644
--- a/src/Avalonia.Themes.Default/RadioButton.xaml
+++ b/src/Avalonia.Themes.Default/RadioButton.xaml
@@ -20,6 +20,14 @@
                    UseLayoutRounding="False"
                    HorizontalAlignment="Center"
                    VerticalAlignment="Center"/>
+          <Ellipse Name="indeterminateMark"
+                   Fill="{DynamicResource ThemeAccentBrush}"
+                   Width="10"
+                   Height="10"
+                   Stretch="Uniform"
+                   UseLayoutRounding="False"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Center"/>
           <ContentPresenter Name="PART_ContentPresenter"
                             Content="{TemplateBinding Content}"
                             ContentTemplate="{TemplateBinding ContentTemplate}"
@@ -36,9 +44,15 @@
   <Style Selector="RadioButton /template/ Ellipse#checkMark">
     <Setter Property="IsVisible" Value="False"/>
   </Style>
+  <Style Selector="RadioButton /template/ Ellipse#indeterminateMark">
+    <Setter Property="IsVisible" Value="False"/>
+  </Style>
   <Style Selector="RadioButton:checked /template/ Ellipse#checkMark">
     <Setter Property="IsVisible" Value="True"/>
   </Style>
+  <Style Selector="RadioButton:indeterminate /template/ Ellipse#indeterminateMark">
+    <Setter Property="IsVisible" Value="True"/>
+  </Style>
   <Style Selector="RadioButton:disabled /template/ Ellipse#border">
     <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
   </Style>
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/ToggleButtonTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/ToggleButtonTests.cs
new file mode 100644
index 0000000000..db60d05a34
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/ToggleButtonTests.cs
@@ -0,0 +1,57 @@
+using Avalonia.Markup.Xaml.Data;
+using Avalonia.UnitTests;
+
+using Xunit;
+
+namespace Avalonia.Controls.Primitives.UnitTests
+{
+    public class ToggleButtonTests
+    {
+        private const string uncheckedClass = ":unchecked";
+        private const string checkedClass = ":checked";
+        private const string indeterminateClass = ":indeterminate";
+
+        [Theory]
+        [InlineData(false, uncheckedClass, false)]
+        [InlineData(false, uncheckedClass, true)]
+        [InlineData(true, checkedClass, false)]
+        [InlineData(true, checkedClass, true)]
+        [InlineData(null, indeterminateClass, false)]
+        [InlineData(null, indeterminateClass, true)]
+        public void ToggleButton_Has_Correct_Class_According_To_Is_Checked(bool? isChecked, string expectedClass, bool isThreeState)
+        {
+            var toggleButton = new ToggleButton();
+            toggleButton.IsThreeState = isThreeState;
+            toggleButton.IsChecked = isChecked;
+
+            Assert.Contains(expectedClass, toggleButton.Classes);
+        }
+
+        [Fact]
+        public void ToggleButton_Is_Checked_Binds_To_Bool()
+        {
+            var toggleButton = new ToggleButton();
+            var source = new Class1();
+
+            toggleButton.DataContext = source;
+            toggleButton.Bind(ToggleButton.IsCheckedProperty, new Binding("Foo"));
+
+            source.Foo = true;
+            Assert.True(toggleButton.IsChecked);
+
+            source.Foo = false;
+            Assert.False(toggleButton.IsChecked);
+        }
+
+        private class Class1 : NotifyingBase
+        {
+            private bool _foo;
+
+            public bool Foo
+            {
+                get { return _foo; }
+                set { _foo = value; RaisePropertyChanged(); }
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/RadioButtonTests.cs b/tests/Avalonia.Controls.UnitTests/RadioButtonTests.cs
new file mode 100644
index 0000000000..37fb52beeb
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/RadioButtonTests.cs
@@ -0,0 +1,36 @@
+using Avalonia.Markup.Xaml.Data;
+using Avalonia.UnitTests;
+
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests
+{
+    public class RadioButtonTests
+    {
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void Indeterminate_RadioButton_Is_Not_Unchecked_After_Checking_Other_Radio_Button(bool isThreeState)
+        {
+            var panel = new Panel();
+
+            var radioButton1 = new RadioButton();
+            radioButton1.IsThreeState = false;
+            radioButton1.IsChecked = false;
+
+            var radioButton2 = new RadioButton();
+            radioButton2.IsThreeState = isThreeState;
+            radioButton2.IsChecked = null;
+
+            panel.Children.Add(radioButton1);
+            panel.Children.Add(radioButton2);
+
+            Assert.Null(radioButton2.IsChecked);
+
+            radioButton1.IsChecked = true;
+
+            Assert.True(radioButton1.IsChecked);
+            Assert.Null(radioButton2.IsChecked);
+        }
+    }
+}

From ebc66cfaac0a5d5642fb6aa632743fdb71694035 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 6 Nov 2017 23:36:30 +0100
Subject: [PATCH 170/482] Added failing test for #1255.

---
 tests/Avalonia.Controls.UnitTests/ClassesTests.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/Avalonia.Controls.UnitTests/ClassesTests.cs b/tests/Avalonia.Controls.UnitTests/ClassesTests.cs
index c9b9d9f82c..8d2e23d027 100644
--- a/tests/Avalonia.Controls.UnitTests/ClassesTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ClassesTests.cs
@@ -161,5 +161,15 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Equal(new[] { ":baz" }, target);
         }
+
+        [Fact]
+        public void RemoveAll_Should_Remove_Classes()
+        {
+            var target = new Classes("foo", "bar", "baz");
+
+            target.RemoveAll(new[] { "bar", "baz" });
+
+            Assert.Equal(new[] { "foo" }, target);
+        }
     }
 }

From 70f9554518d486366c6c6f66f0e61075d18766c0 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 6 Nov 2017 23:37:03 +0100
Subject: [PATCH 171/482] Fixed #1255.

---
 src/Avalonia.Controls/Classes.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Classes.cs b/src/Avalonia.Controls/Classes.cs
index c897e86697..613273d5c7 100644
--- a/src/Avalonia.Controls/Classes.cs
+++ b/src/Avalonia.Controls/Classes.cs
@@ -179,7 +179,7 @@ namespace Avalonia.Controls
             {
                 ThrowIfPseudoclass(name, "removed");
 
-                if (!Contains(name))
+                if (Contains(name))
                 {
                     c.Add(name);
                 }

From 3f9a79d82d5051cf811d52c8ffe8954e55f228ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Tue, 7 Nov 2017 14:02:09 +0000
Subject: [PATCH 172/482] Requested change.

---
 samples/ControlCatalog/Pages/RadioButtonPage.xaml |  1 +
 src/Avalonia.Controls/Primitives/ToggleButton.cs  | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/samples/ControlCatalog/Pages/RadioButtonPage.xaml b/samples/ControlCatalog/Pages/RadioButtonPage.xaml
index 29bac2c2c5..d382b94f2c 100644
--- a/samples/ControlCatalog/Pages/RadioButtonPage.xaml
+++ b/samples/ControlCatalog/Pages/RadioButtonPage.xaml
@@ -12,6 +12,7 @@
                   Gap="16">
         <RadioButton IsChecked="True">Option 1</RadioButton>
         <RadioButton>Option 2</RadioButton>
+        <RadioButton IsChecked="{x:Null}">Option 3</RadioButton>
         <RadioButton IsEnabled="False">Disabled</RadioButton>
       </StackPanel>
       <StackPanel Orientation="Vertical"
diff --git a/src/Avalonia.Controls/Primitives/ToggleButton.cs b/src/Avalonia.Controls/Primitives/ToggleButton.cs
index b9a517db4c..7d500975f0 100644
--- a/src/Avalonia.Controls/Primitives/ToggleButton.cs
+++ b/src/Avalonia.Controls/Primitives/ToggleButton.cs
@@ -48,7 +48,16 @@ namespace Avalonia.Controls.Primitives
 
         protected virtual void Toggle()
         {
-            IsChecked = IsChecked.HasValue ? (IsChecked.Value ? (IsThreeState ? (bool?)null : false) : true) : false;
+            if (IsChecked.HasValue)
+                if (IsChecked.Value)
+                    if (IsThreeState)
+                        IsChecked = null;
+                    else
+                        IsChecked = false;
+                else
+                    IsChecked = true;
+            else
+                IsChecked = false;
         }
     }
 }

From 174c8a9e636e7ea6a0671bcb6f26a0b24b34baed Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sat, 11 Nov 2017 16:27:26 +0300
Subject: [PATCH 173/482] Updated portable.xaml

---
 .../Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
index f226a516fe..d50ae8335e 160000
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
@@ -1 +1 @@
-Subproject commit f226a516fe2bc191145c1fbf732f5a087f121a33
+Subproject commit d50ae8335eb50d4b9606de6f5fa1cbbc78bfd72f

From 9152cbbe7223b9ccaa28a99073ded51d463e95d5 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Fri, 10 Nov 2017 17:20:07 +0300
Subject: [PATCH 174/482] Added a unit test for attached properties with
 namespace

---
 .../Xaml/BasicTests.cs                        | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
index 03dc5374e0..ec6afb74ca 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
@@ -79,6 +79,20 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             Assert.Equal(21.0, TextBlock.GetFontSize(target));
         }
 
+        [Fact]
+        public void Attached_Property_With_Namespace_Is_Set()
+        {
+            var xaml =
+                @"<ContentControl xmlns='https://github.com/avaloniaui' 
+                    xmlns:test='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'
+                    test:BasicTestsAttachedPropertyHolder.Foo='Bar'/>";
+
+            var target = AvaloniaXamlLoader.Parse<ContentControl>(xaml);
+
+            Assert.NotNull(target);
+            Assert.Equal("Bar", BasicTestsAttachedPropertyHolder.GetFoo(target));
+        }
+
         [Fact]
         public void Attached_Property_Supports_Binding()
         {
@@ -873,4 +887,13 @@ do we need it?")]
             }
         }
     }
+    public class BasicTestsAttachedPropertyHolder
+    {
+        public static AvaloniaProperty<string> FooProperty =
+            AvaloniaProperty.RegisterAttached<BasicTestsAttachedPropertyHolder, AvaloniaObject, string>("Foo");
+
+        public static void SetFoo(AvaloniaObject target, string value) => target.SetValue(FooProperty, value);
+        public static string GetFoo(AvaloniaObject target) => (string)target.GetValue(FooProperty);
+
+    }
 }
\ No newline at end of file

From 5cc5b91930e96ea58468b7bac4a6e8e497aa2299 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 12 Nov 2017 01:38:28 +0100
Subject: [PATCH 175/482] Fix xunit warnings.

---
 .../AvaloniaPropertyTests.cs                  |  4 +-
 .../PriorityValueTests.cs                     |  4 +-
 .../CarouselTests.cs                          |  8 ++--
 .../ControlTests.cs                           |  2 +-
 .../ItemsControlTests.cs                      |  6 +--
 .../Presenters/CarouselPresenterTests.cs      | 40 +++++++++----------
 .../ContentPresenterTests_Standalone.cs       |  6 +--
 .../Presenters/ItemsPresenterTests.cs         |  2 +-
 ...emsPresenterTests_Virtualization_Simple.cs |  2 +-
 .../Primitives/PopupTests.cs                  |  2 +-
 .../Primitives/ScrollBarTests.cs              |  6 +--
 .../TextBoxTests_DataValidation.cs            |  8 ++--
 .../FullLayoutTests.cs                        |  2 +-
 tests/Avalonia.LeakTests/ControlTests.cs      |  4 +-
 .../Data/ExpressionObserverTests_Negation.cs  | 10 ++---
 .../Data/ExpressionObserverTests_Task.cs      |  2 +-
 .../Data/BindingTests_Source.cs               |  2 +-
 .../Xaml/BasicTests.cs                        | 12 +++---
 .../Xaml/StyleTests.cs                        |  2 +-
 .../SelectorTests_Template.cs                 |  2 +-
 .../SceneGraph/SceneBuilderTests_Layers.cs    |  8 ++--
 .../Avalonia.Visuals.UnitTests/VisualTests.cs |  2 +-
 22 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs
index 28d384fabd..2933893f7a 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs
@@ -113,8 +113,8 @@ namespace Avalonia.Base.UnitTests
         {
             var p1 = new TestProperty<string>("p1", typeof(Class1));
 
-            Assert.NotEqual(p1, null);
-            Assert.NotEqual(null, p1);
+            Assert.NotNull(p1);
+            Assert.NotNull(p1);
             Assert.False(p1 == null);
             Assert.False(null == p1);
             Assert.False(p1.Equals(null));
diff --git a/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs b/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs
index 7956f385e1..6ca1364f96 100644
--- a/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs
+++ b/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs
@@ -206,7 +206,7 @@ namespace Avalonia.Base.UnitTests
 
             Assert.Equal(2, target.GetBindings().Count());
             disposable.Dispose();
-            Assert.Equal(1, target.GetBindings().Count());
+            Assert.Single(target.GetBindings());
         }
 
         [Fact]
@@ -248,7 +248,7 @@ namespace Avalonia.Base.UnitTests
 
             Assert.Equal(2, target.GetBindings().Count());
             subject.OnCompleted();
-            Assert.Equal(1, target.GetBindings().Count());
+            Assert.Single(target.GetBindings());
         }
 
         [Fact]
diff --git a/tests/Avalonia.Controls.UnitTests/CarouselTests.cs b/tests/Avalonia.Controls.UnitTests/CarouselTests.cs
index e91ab02327..4ce83056c6 100644
--- a/tests/Avalonia.Controls.UnitTests/CarouselTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/CarouselTests.cs
@@ -47,7 +47,7 @@ namespace Avalonia.Controls.UnitTests
             target.ApplyTemplate();
             target.Presenter.ApplyTemplate();
 
-            Assert.Equal(1, target.GetLogicalChildren().Count());
+            Assert.Single(target.GetLogicalChildren());
 
             var child = target.GetLogicalChildren().Single();
             
@@ -69,9 +69,9 @@ namespace Avalonia.Controls.UnitTests
             target.ApplyTemplate();
             target.Presenter.ApplyTemplate();
 
-            Assert.Equal(1, target.ItemContainerGenerator.Containers.Count());
+            Assert.Single(target.ItemContainerGenerator.Containers);
             target.SelectedIndex = 1;
-            Assert.Equal(1, target.ItemContainerGenerator.Containers.Count());
+            Assert.Single(target.ItemContainerGenerator.Containers);
         }
 
         [Fact]
@@ -88,7 +88,7 @@ namespace Avalonia.Controls.UnitTests
             target.ApplyTemplate();
             target.Presenter.ApplyTemplate();
 
-            Assert.Equal(1, target.ItemContainerGenerator.Containers.Count());
+            Assert.Single(target.ItemContainerGenerator.Containers);
             target.SelectedIndex = 1;
             Assert.Equal(2, target.ItemContainerGenerator.Containers.Count());
         }
diff --git a/tests/Avalonia.Controls.UnitTests/ControlTests.cs b/tests/Avalonia.Controls.UnitTests/ControlTests.cs
index 3506a1606b..313c0b1253 100644
--- a/tests/Avalonia.Controls.UnitTests/ControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ControlTests.cs
@@ -19,7 +19,7 @@ namespace Avalonia.Controls.UnitTests
         {
             var target = new Control();
 
-            Assert.Equal(0, target.Classes.Count);
+            Assert.Empty(target.Classes);
         }
 
         [Fact]
diff --git a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
index f01eecf647..50610cf595 100644
--- a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
@@ -323,7 +323,7 @@ namespace Avalonia.Controls.UnitTests
                 Template = GetTemplate(),
             };
 
-            Assert.True(target.Classes.Contains(":empty"));
+            Assert.Contains(":empty", target.Classes);
         }
 
         [Fact]
@@ -335,7 +335,7 @@ namespace Avalonia.Controls.UnitTests
                 Items = new[] { 1, 2, 3 },
             };
 
-            Assert.False(target.Classes.Contains(":empty"));
+            Assert.DoesNotContain(":empty", target.Classes);
         }
 
         [Fact]
@@ -349,7 +349,7 @@ namespace Avalonia.Controls.UnitTests
 
             target.Items = new int[0];
 
-            Assert.True(target.Classes.Contains(":empty"));
+            Assert.Contains(":empty", target.Classes);
         }
 
         [Fact]
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/CarouselPresenterTests.cs b/tests/Avalonia.Controls.UnitTests/Presenters/CarouselPresenterTests.cs
index 260c070406..a50fe852c3 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/CarouselPresenterTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/CarouselPresenterTests.cs
@@ -91,9 +91,9 @@ namespace Avalonia.Controls.UnitTests.Presenters
             };
 
             target.ApplyTemplate();
-            Assert.Equal(1, target.ItemContainerGenerator.Containers.Count());
+            Assert.Single(target.ItemContainerGenerator.Containers);
             target.SelectedIndex = 1;
-            Assert.Equal(1, target.ItemContainerGenerator.Containers.Count());
+            Assert.Single(target.ItemContainerGenerator.Containers);
         }
 
         [Fact]
@@ -107,8 +107,8 @@ namespace Avalonia.Controls.UnitTests.Presenters
             };
 
             target.ApplyTemplate();
-            Assert.Equal(1, target.ItemContainerGenerator.Containers.Count());
-            Assert.Equal(1, target.Panel.Children.Count);
+            Assert.Single(target.ItemContainerGenerator.Containers);
+            Assert.Single(target.Panel.Children);
             target.SelectedIndex = 1;
             Assert.Equal(2, target.ItemContainerGenerator.Containers.Count());
             Assert.Equal(2, target.Panel.Children.Count);
@@ -134,24 +134,24 @@ namespace Avalonia.Controls.UnitTests.Presenters
             items.Add("foo");
             target.SelectedIndex = 0;
 
-            Assert.Equal(1, target.ItemContainerGenerator.Containers.Count());
-            Assert.Equal(1, target.Panel.Children.Count);
+            Assert.Single(target.ItemContainerGenerator.Containers);
+            Assert.Single(target.Panel.Children);
 
             items.Add("bar");
-            Assert.Equal(1, target.ItemContainerGenerator.Containers.Count());
-            Assert.Equal(1, target.Panel.Children.Count);
+            Assert.Single(target.ItemContainerGenerator.Containers);
+            Assert.Single(target.Panel.Children);
 
             target.SelectedIndex = 1;
             Assert.Equal(2, target.ItemContainerGenerator.Containers.Count());
             Assert.Equal(2, target.Panel.Children.Count);            
 
             items.Remove(items[0]);
-            Assert.Equal(1, target.ItemContainerGenerator.Containers.Count());
-            Assert.Equal(1, target.Panel.Children.Count);            
+            Assert.Single(target.ItemContainerGenerator.Containers);
+            Assert.Single(target.Panel.Children);            
 
             items.Remove(items[0]);
-            Assert.Equal(0, target.ItemContainerGenerator.Containers.Count());
-            Assert.Equal(0, target.Panel.Children.Count);            
+            Assert.Empty(target.ItemContainerGenerator.Containers);
+            Assert.Empty(target.Panel.Children);            
         }
 
         [Fact]
@@ -171,12 +171,12 @@ namespace Avalonia.Controls.UnitTests.Presenters
             items.Add("foo");
             target.SelectedIndex = 0;
 
-            Assert.Equal(1, target.ItemContainerGenerator.Containers.Count());
-            Assert.Equal(1, target.Panel.Children.Count);
+            Assert.Single(target.ItemContainerGenerator.Containers);
+            Assert.Single(target.Panel.Children);
 
             items.Add("bar");
-            Assert.Equal(1, target.ItemContainerGenerator.Containers.Count());
-            Assert.Equal(1, target.Panel.Children.Count);
+            Assert.Single(target.ItemContainerGenerator.Containers);
+            Assert.Single(target.Panel.Children);
 
             target.SelectedIndex = 1;
             Assert.Equal(2, target.ItemContainerGenerator.Containers.Count());
@@ -184,13 +184,13 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.Equal(0, target.ItemContainerGenerator.Containers.First().Index);
 
             items.Remove(items[0]);
-            Assert.Equal(1, target.ItemContainerGenerator.Containers.Count());
-            Assert.Equal(1, target.Panel.Children.Count);
+            Assert.Single(target.ItemContainerGenerator.Containers);
+            Assert.Single(target.Panel.Children);
             Assert.Equal(0, target.ItemContainerGenerator.Containers.First().Index);
 
             items.Remove(items[0]);
-            Assert.Equal(0, target.ItemContainerGenerator.Containers.Count());
-            Assert.Equal(0, target.Panel.Children.Count);            
+            Assert.Empty(target.ItemContainerGenerator.Containers);
+            Assert.Empty(target.Panel.Children);            
         }
 
         private class TestItem : ContentControl
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
index 027e162877..6716456c78 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
@@ -42,7 +42,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
             var logicalChildren = target.GetLogicalChildren();
 
-            Assert.Equal(1, logicalChildren.Count());
+            Assert.Single(logicalChildren);
             Assert.Equal(content, logicalChildren.First());
         }
 
@@ -190,7 +190,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
             var logicalChildren = target.GetLogicalChildren();
 
-            Assert.Equal(1, logicalChildren.Count());
+            Assert.Single(logicalChildren);
 
             target.Content = "bar";
             target.UpdateChild();
@@ -199,7 +199,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
             logicalChildren = target.GetLogicalChildren();
 
-            Assert.Equal(1, logicalChildren.Count());
+            Assert.Single(logicalChildren);
             Assert.NotEqual(foo, logicalChildren.First());
         }
 
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests.cs
index ef7e1062ec..048cdb2ccb 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests.cs
@@ -87,7 +87,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
             target.ApplyTemplate();
             items.RemoveAt(0);
 
-            Assert.Equal(1, target.Panel.Children.Count);
+            Assert.Single(target.Panel.Children);
             Assert.Equal("bar", ((ContentPresenter)target.Panel.Children[0]).Content);
             Assert.Equal("bar", ((ContentPresenter)target.ItemContainerGenerator.ContainerFromIndex(0)).Content);
         }
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
index 51433cc08e..80cc13ab78 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
@@ -704,7 +704,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
             target.Measure(new Size(100, 100));
             target.Arrange(new Rect(target.DesiredSize));
 
-            Assert.Equal(0, target.Panel.Children.Count);
+            Assert.Empty(target.Panel.Children);
 
             items.AddRange(defaultItems.Select(s => s + " new"));
 
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
index 85a450e1dc..06b3202a83 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
@@ -194,7 +194,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
                 target.Open();
 
-                Assert.Equal(1, target.PopupRoot.GetVisualChildren().Count());
+                Assert.Single(target.PopupRoot.GetVisualChildren());
 
                 var templatedChild = target.PopupRoot.GetVisualChildren().Single();
                 Assert.IsType<ContentPresenter>(templatedChild);
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/ScrollBarTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/ScrollBarTests.cs
index 5b1ade9c47..0af4d791c7 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/ScrollBarTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/ScrollBarTests.cs
@@ -24,7 +24,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             var track = (Track)target.GetTemplateChildren().First(x => x.Name == "track");
             target.Value = 50;
 
-            Assert.Equal(track.Value, 50);
+            Assert.Equal(50, track.Value);
         }
 
         [Fact]
@@ -39,7 +39,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             var track = (Track)target.GetTemplateChildren().First(x => x.Name == "track");
             track.Value = 50;
 
-            Assert.Equal(target.Value, 50);
+            Assert.Equal(50, target.Value);
         }
 
         [Fact]
@@ -56,7 +56,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.Value = 25;
             track.Value = 50;
 
-            Assert.Equal(target.Value, 50);
+            Assert.Equal(50, target.Value);
         }
 
         [Fact]
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs
index ff3634b9fe..daf2715d84 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs
@@ -33,11 +33,11 @@ namespace Avalonia.Controls.UnitTests
 
                 target.ApplyTemplate();
 
-                Assert.False(target.Classes.Contains(":error"));
+                Assert.DoesNotContain(":error", target.Classes);
                 target.Text = "20";
-                Assert.True(target.Classes.Contains(":error"));
+                Assert.Contains(":error", target.Classes);
                 target.Text = "1";
-                Assert.False(target.Classes.Contains(":error"));
+                Assert.DoesNotContain(":error", target.Classes);
             }
         }
 
@@ -57,7 +57,7 @@ namespace Avalonia.Controls.UnitTests
 
                 Assert.Null(target.DataValidationErrors);
                 target.Text = "20";
-                Assert.Equal(1, target.DataValidationErrors.Count());
+                Assert.Single(target.DataValidationErrors);
                 Assert.IsType<InvalidOperationException>(target.DataValidationErrors.Single());
                 target.Text = "1";
                 Assert.Null(target.DataValidationErrors);
diff --git a/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs b/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
index 00d4af7e4d..1a07bdc7d1 100644
--- a/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
+++ b/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
@@ -109,7 +109,7 @@ namespace Avalonia.Layout.UnitTests
                 var presenters = scrollViewer.GetTemplateChildren().OfType<ScrollContentPresenter>().ToList();
 
                 Assert.Equal(2, scrollBars.Count);
-                Assert.Equal(1, presenters.Count);
+                Assert.Single(presenters);
 
                 var presenter = presenters[0];
                 Assert.Equal(new Size(190, 190), presenter.Bounds.Size);
diff --git a/tests/Avalonia.LeakTests/ControlTests.cs b/tests/Avalonia.LeakTests/ControlTests.cs
index 979127cd14..fe3ad59bb4 100644
--- a/tests/Avalonia.LeakTests/ControlTests.cs
+++ b/tests/Avalonia.LeakTests/ControlTests.cs
@@ -155,7 +155,7 @@ namespace Avalonia.LeakTests
                     // template applied.
                     LayoutManager.Instance.ExecuteInitialLayoutPass(window);
                     Assert.IsType<TextBox>(window.Presenter.Child);
-                    Assert.NotEqual(0, window.Presenter.Child.GetVisualChildren().Count());
+                    Assert.NotEmpty(window.Presenter.Child.GetVisualChildren());
 
                     // Clear the content and ensure the TextBox is removed.
                     window.Content = null;
@@ -290,7 +290,7 @@ namespace Avalonia.LeakTests
 
                     // Do a layout and make sure that TreeViewItems get realized.
                     LayoutManager.Instance.ExecuteInitialLayoutPass(window);
-                    Assert.Equal(1, target.ItemContainerGenerator.Containers.Count());
+                    Assert.Single(target.ItemContainerGenerator.Containers);
 
                     // Clear the content and ensure the TreeView is removed.
                     window.Content = null;
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Negation.cs b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Negation.cs
index 6a23a24051..f4aa85c393 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Negation.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Negation.cs
@@ -19,7 +19,7 @@ namespace Avalonia.Markup.UnitTests.Data
             var target = new ExpressionObserver(data, "!Foo");
             var result = await target.Take(1);
 
-            Assert.Equal(false, result);
+            Assert.False((bool)result);
 
             GC.KeepAlive(data);
         }
@@ -31,7 +31,7 @@ namespace Avalonia.Markup.UnitTests.Data
             var target = new ExpressionObserver(data, "!Foo");
             var result = await target.Take(1);
 
-            Assert.Equal(true, result);
+            Assert.True((bool)result);
 
             GC.KeepAlive(data);
         }
@@ -43,7 +43,7 @@ namespace Avalonia.Markup.UnitTests.Data
             var target = new ExpressionObserver(data, "!Foo");
             var result = await target.Take(1);
 
-            Assert.Equal(false, result);
+            Assert.False((bool)result);
 
             GC.KeepAlive(data);
         }
@@ -55,7 +55,7 @@ namespace Avalonia.Markup.UnitTests.Data
             var target = new ExpressionObserver(data, "!Foo");
             var result = await target.Take(1);
 
-            Assert.Equal(true, result);
+            Assert.True((bool)result);
 
             GC.KeepAlive(data);
         }
@@ -67,7 +67,7 @@ namespace Avalonia.Markup.UnitTests.Data
             var target = new ExpressionObserver(data, "!Foo");
             var result = await target.Take(1);
 
-            Assert.Equal(false, result);
+            Assert.False((bool)result);
 
             GC.KeepAlive(data);
         }
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Task.cs b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Task.cs
index c251f4398a..87a8be045b 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Task.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Task.cs
@@ -28,7 +28,7 @@ namespace Avalonia.Markup.UnitTests.Data
                 tcs.SetResult("foo");
                 sync.ExecutePostedCallbacks();
 
-                Assert.Equal(1, result.Count);
+                Assert.Single(result);
                 Assert.IsType<Task<string>>(result[0]);
 
                 GC.KeepAlive(data);
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Source.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Source.cs
index c6006f3afb..1fbf8b679d 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Source.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Source.cs
@@ -23,7 +23,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
 
             target.Bind(TextBlock.TextProperty, binding);
 
-            Assert.Equal(target.Text, "foo");
+            Assert.Equal("foo", target.Text);
         }
         
         public class Source : INotifyPropertyChanged
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
index ec6afb74ca..ffd666fe12 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
@@ -119,7 +119,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 
             var target = AvaloniaXamlLoader.Parse<Panel>(xaml);
 
-            Assert.Equal(0, target.Children.Count);
+            Assert.Empty(target.Children);
 
             Assert.Equal("Foo", ToolTip.GetTip(target));
         }
@@ -377,7 +377,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 
             var styles = AvaloniaXamlLoader.Parse<Styles>(xaml);
 
-            Assert.Equal(1, styles.Count);
+            Assert.Single(styles);
 
             var style = (Style)styles[0];
 
@@ -405,13 +405,13 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 
             var styles = AvaloniaXamlLoader.Parse<Styles>(xaml);
 
-            Assert.Equal(1, styles.Count);
+            Assert.Single(styles);
 
             var style = (Style)styles[0];
 
             var setters = style.Setters.Cast<Setter>().ToArray();
 
-            Assert.Equal(1, setters.Length);
+            Assert.Single(setters);
 
             Assert.Equal(TextBlock.FontSizeProperty, setters[0].Property);
             Assert.Equal(21.0, setters[0].Value);
@@ -459,7 +459,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 ";
                 var styles = AvaloniaXamlLoader.Parse<Styles>(xaml);
 
-                Assert.Equal(1, styles.Count);
+                Assert.Single(styles);
 
                 var style = (Style)styles[0];
 
@@ -688,7 +688,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 
             var style = AvaloniaXamlLoader.Parse<Style>(xaml);
 
-            Assert.Equal(1, style.Setters.Count());
+            Assert.Single(style.Setters);
 
             var setter = (Setter)style.Setters.First();
 
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
index b339972029..f1f4792d34 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
@@ -76,7 +76,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 
                 var window = AvaloniaXamlLoader.Parse<ContentControl>(xaml);
 
-                Assert.Equal(1, window.Styles.Count);
+                Assert.Single(window.Styles);
 
                 var styleInclude = window.Styles[0] as StyleInclude;
 
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Template.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Template.cs
index 43f30f8e4d..5c34479eb2 100644
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Template.cs
+++ b/tests/Avalonia.Styling.UnitTests/SelectorTests_Template.cs
@@ -133,7 +133,7 @@ namespace Avalonia.Styling.UnitTests
 
             using (activator.Subscribe(_ => { }))
             {
-                Assert.Equal(1, inccDebug.GetCollectionChangedSubscribers().Length);
+                Assert.Single(inccDebug.GetCollectionChangedSubscribers());
             }
 
             Assert.Null(inccDebug.GetCollectionChangedSubscribers());
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
index e65487ac44..ed74f12075 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
@@ -70,11 +70,11 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 Assert.Same(tree, rootNode.LayerRoot);
                 Assert.Same(tree, borderNode.LayerRoot);
                 Assert.Same(tree, canvasNode.LayerRoot);
-                Assert.Equal(1, scene.Layers.Count());
+                Assert.Single(scene.Layers);
 
                 var rootDirty = scene.Layers[tree].Dirty;
 
-                Assert.Equal(1, rootDirty.Count());
+                Assert.Single(rootDirty);
                 Assert.Equal(new Rect(21, 21, 58, 78), rootDirty.Single());
             }
         }
@@ -136,11 +136,11 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 Assert.Same(tree, rootNode.LayerRoot);
                 Assert.Same(tree, borderNode.LayerRoot);
                 Assert.Same(tree, canvasNode.LayerRoot);
-                Assert.Equal(1, scene.Layers.Count());
+                Assert.Single(scene.Layers);
 
                 var rootDirty = scene.Layers[tree].Dirty;
 
-                Assert.Equal(1, rootDirty.Count());
+                Assert.Single(rootDirty);
                 Assert.Equal(new Rect(21, 21, 58, 78), rootDirty.Single());
             }
         }
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTests.cs b/tests/Avalonia.Visuals.UnitTests/VisualTests.cs
index f20c59fabe..b62bf5858d 100644
--- a/tests/Avalonia.Visuals.UnitTests/VisualTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/VisualTests.cs
@@ -190,7 +190,7 @@ namespace Avalonia.Visuals.UnitTests
             root1.Child = child;
 
             Assert.Throws<InvalidOperationException>(() => root2.Child = child);
-            Assert.Equal(0, root2.GetVisualChildren().Count());
+            Assert.Empty(root2.GetVisualChildren());
         }
     }
 }

From f9b578ab0ed4faa63568992a3b1370b2c192564d Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sat, 11 Nov 2017 23:57:58 -0600
Subject: [PATCH 176/482] Make AncestorType required for ancestor searching via
 the visual tree.

---
 src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs |  5 +++++
 .../Xaml/BindingTests_RelativeSource.cs         | 17 ++++-------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
index d4d53b091f..ae9d2d87f1 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
@@ -126,6 +126,11 @@ namespace Avalonia.Markup.Xaml.Data
             }
             else if (RelativeSource.Mode == RelativeSourceMode.FindAncestor)
             {
+                if (RelativeSource.Tree == TreeType.Visual && RelativeSource.AncestorType == null)
+                {
+                    throw new InvalidOperationException("AncestorType must be set for RelativeSourceModel.FindAncestor when searching the visual tree.");
+                }
+
                 observer = CreateFindAncestorObserver(
                     (target as IControl) ?? (anchor as IControl),
                     RelativeSource,
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs
index 8ff802f96b..095aae7742 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs
@@ -3,6 +3,7 @@
 
 using Avalonia.Controls;
 using Avalonia.UnitTests;
+using System;
 using Xunit;
 
 namespace Avalonia.Markup.Xaml.UnitTests.Xaml
@@ -78,7 +79,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         }
 
         [Fact]
-        public void Binding_To_First_Ancestor_Without_AncestorType_Uses_LogicalTree()
+        public void Binding_To_First_Ancestor_Without_AncestorType_Throws_Exception()
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
@@ -93,13 +94,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     </Border>
 </Window>";
                 var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
-                var contentControl = window.FindControl<ContentControl>("contentControl");
-                var button = window.FindControl<Button>("button");
-
-                window.ApplyTemplate();
-
-                Assert.Equal("contentControl", button.Content);
+                Assert.Throws<InvalidOperationException>( () => loader.Load(xaml));
             }
         }
 
@@ -149,11 +144,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 var button = window.FindControl<Button>("button");
 
                 window.ApplyTemplate();
-
-                // This isn't needed in `Binding_To_First_Ancestor_Without_AncestorType_Uses_LogicalTree` -
-                // why is it needed to get non-null value here?
-                //contentControl.ApplyTemplate();
-
+                
                 Assert.Equal("contentControl", button.Content);
             }
         }

From add5f0451b947e2a1523ba3792342bdc52be5168 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 12 Nov 2017 01:21:25 -0600
Subject: [PATCH 177/482] DelayedSetter -> DeferredSetter

---
 src/Avalonia.Base/AvaloniaObject.cs                             | 2 +-
 src/Avalonia.Base/PriorityValue.cs                              | 2 +-
 .../Utilities/{DelayedSetter.cs => DeferredSetter.cs}           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename src/Avalonia.Base/Utilities/{DelayedSetter.cs => DeferredSetter.cs} (99%)

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 456db70d77..2583b7ac97 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -54,7 +54,7 @@ namespace Avalonia
         /// <summary>
         /// Delayed setter helper for direct properties. Used to fix #855.
         /// </summary>
-        private readonly DelayedSetter<AvaloniaProperty, object> directDelayedSetter = new DelayedSetter<AvaloniaProperty, object>();
+        private readonly DeferredSetter<AvaloniaProperty, object> directDelayedSetter = new DeferredSetter<AvaloniaProperty, object>();
 
 
         /// <summary>
diff --git a/src/Avalonia.Base/PriorityValue.cs b/src/Avalonia.Base/PriorityValue.cs
index 3930b6c224..2a6c5bc2c6 100644
--- a/src/Avalonia.Base/PriorityValue.cs
+++ b/src/Avalonia.Base/PriorityValue.cs
@@ -30,7 +30,7 @@ namespace Avalonia
         private readonly SingleOrDictionary<int, PriorityLevel> _levels = new SingleOrDictionary<int, PriorityLevel>();
         private object _value;
         private readonly Func<object, object> _validate;
-        private static readonly DelayedSetter<PriorityValue, (object value, int priority)> delayedSetter = new DelayedSetter<PriorityValue, (object, int)>();
+        private static readonly DeferredSetter<PriorityValue, (object value, int priority)> delayedSetter = new DeferredSetter<PriorityValue, (object, int)>();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PriorityValue"/> class.
diff --git a/src/Avalonia.Base/Utilities/DelayedSetter.cs b/src/Avalonia.Base/Utilities/DeferredSetter.cs
similarity index 99%
rename from src/Avalonia.Base/Utilities/DelayedSetter.cs
rename to src/Avalonia.Base/Utilities/DeferredSetter.cs
index 4e1a39dd31..4b2709c141 100644
--- a/src/Avalonia.Base/Utilities/DelayedSetter.cs
+++ b/src/Avalonia.Base/Utilities/DeferredSetter.cs
@@ -10,7 +10,7 @@ namespace Avalonia.Utilities
     /// </summary>
     /// <typeparam name="TProperty">The type of the object that represents the property.</typeparam>
     /// <typeparam name="TValue">The type of value with which to track the delayed assignment.</typeparam>
-    class DelayedSetter<TProperty, TValue>
+    class DeferredSetter<TProperty, TValue>
     {
         /// <summary>
         /// Information on current setting/notification status of a property.

From 03621a86646597991866edb565b1978c8d544699 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 12 Nov 2017 15:02:07 +0100
Subject: [PATCH 178/482] Added AppBuilder methods for logging.

You can now set up serilog logging to `Debug` or `Trace` by calling e.g.:

```
AppBuilder.Configure<App()
    .LogToDebug()
    .UsePlatformDetect();
```

The methods accept an optional `level` parameter to control the minimum log level.
---
 Avalonia.sln                                  |  3 +-
 build/Serilog.Sinks.Trace.props               |  5 --
 build/Serilog.props                           |  4 +-
 samples/BindingTest/App.xaml.cs               | 13 +----
 samples/ControlCatalog.Desktop/Program.cs     | 15 +-----
 samples/RenderTest/Program.cs                 | 14 +----
 samples/VirtualizationTest/Program.cs         | 13 +----
 .../Avalonia.Logging.Serilog.csproj           |  1 +
 .../SerilogExtensions.cs                      | 51 +++++++++++++++++++
 9 files changed, 60 insertions(+), 59 deletions(-)
 delete mode 100644 build/Serilog.Sinks.Trace.props
 create mode 100644 src/Avalonia.Logging.Serilog/SerilogExtensions.cs

diff --git a/Avalonia.sln b/Avalonia.sln
index c6509817ce..a29f3dd754 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.10
+VisualStudioVersion = 15.0.27004.2008
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Base", "src\Avalonia.Base\Avalonia.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
 EndProject
@@ -155,7 +155,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1
 		build\ReactiveUI.props = build\ReactiveUI.props
 		build\Rx.props = build\Rx.props
 		build\Serilog.props = build\Serilog.props
-		build\Serilog.Sinks.Trace.props = build\Serilog.Sinks.Trace.props
 		build\SharpDX.props = build\SharpDX.props
 		build\SkiaSharp.Desktop.props = build\SkiaSharp.Desktop.props
 		build\SkiaSharp.props = build\SkiaSharp.props
diff --git a/build/Serilog.Sinks.Trace.props b/build/Serilog.Sinks.Trace.props
deleted file mode 100644
index ef79fd7669..0000000000
--- a/build/Serilog.Sinks.Trace.props
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-     <PackageReference Include="Serilog.Sinks.Trace" Version="2.1.0" />
-  </ItemGroup>
-</Project>
diff --git a/build/Serilog.props b/build/Serilog.props
index e9bd39f6af..a814cf998d 100644
--- a/build/Serilog.props
+++ b/build/Serilog.props
@@ -1,5 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-     <PackageReference Include="Serilog" Version="2.4.0" />
+    <PackageReference Include="Serilog" Version="2.5.0" />
+    <PackageReference Include="Serilog.Sinks.Trace" Version="2.1.0" />
+    <PackageReference Include="Serilog.Sinks.Debug" Version="1.0.0" />
   </ItemGroup>
 </Project>
diff --git a/samples/BindingTest/App.xaml.cs b/samples/BindingTest/App.xaml.cs
index 42e5716541..ccad1d0ba9 100644
--- a/samples/BindingTest/App.xaml.cs
+++ b/samples/BindingTest/App.xaml.cs
@@ -16,22 +16,11 @@ namespace BindingTest
 
         private static void Main()
         {
-            InitializeLogging();
-
             AppBuilder.Configure<App>()
                 .UsePlatformDetect()
                 .UseReactiveUI()
+                .LogToDebug()
                 .Start<MainWindow>();
         }
-
-        private static void InitializeLogging()
-        {
-#if DEBUG
-            SerilogLogger.Initialize(new LoggerConfiguration()
-                .MinimumLevel.Warning()
-                .WriteTo.Trace(outputTemplate: "{Area}: {Message}")
-                .CreateLogger());
-#endif
-        }
     }
 }
diff --git a/samples/ControlCatalog.Desktop/Program.cs b/samples/ControlCatalog.Desktop/Program.cs
index 20bf4ed342..b151cabf43 100644
--- a/samples/ControlCatalog.Desktop/Program.cs
+++ b/samples/ControlCatalog.Desktop/Program.cs
@@ -12,8 +12,6 @@ namespace ControlCatalog
     {
         static void Main(string[] args)
         {
-            InitializeLogging();
-
             // TODO: Make this work with GTK/Skia/Cairo depending on command-line args
             // again.
             BuildAvaloniaApp().Start<MainWindow>();
@@ -23,18 +21,7 @@ namespace ControlCatalog
         /// This method is needed for IDE previewer infrastructure
         /// </summary>
         public static AppBuilder BuildAvaloniaApp()
-            => AppBuilder.Configure<App>().UsePlatformDetect();
-
-        // This will be made into a runtime configuration extension soon!
-        private static void InitializeLogging()
-        {
-#if DEBUG
-            SerilogLogger.Initialize(new LoggerConfiguration()
-                .MinimumLevel.Warning()
-                .WriteTo.Trace(outputTemplate: "{Area}: {Message}")
-                .CreateLogger());
-#endif
-        }
+            => AppBuilder.Configure<App>().LogToDebug().UsePlatformDetect();
 
         private static void ConfigureAssetAssembly(AppBuilder builder)
         {
diff --git a/samples/RenderTest/Program.cs b/samples/RenderTest/Program.cs
index 514771097f..a1a2b8c410 100644
--- a/samples/RenderTest/Program.cs
+++ b/samples/RenderTest/Program.cs
@@ -12,25 +12,13 @@ namespace RenderTest
     {
         static void Main(string[] args)
         {
-            InitializeLogging();
-
             // TODO: Make this work with GTK/Skia/Cairo depending on command-line args
             // again.
             AppBuilder.Configure<App>()
                 .UsePlatformDetect()
                 .UseReactiveUI()
+                .LogToDebug()
                 .Start<MainWindow>();
         }
-
-        // This will be made into a runtime configuration extension soon!
-        private static void InitializeLogging()
-        {
-#if DEBUG
-            SerilogLogger.Initialize(new LoggerConfiguration()
-                .MinimumLevel.Warning()
-                .WriteTo.Trace(outputTemplate: "{Area}: {Message}")
-                .CreateLogger());
-#endif
-        }
     }
 }
diff --git a/samples/VirtualizationTest/Program.cs b/samples/VirtualizationTest/Program.cs
index e9156d803f..097f0cfdc7 100644
--- a/samples/VirtualizationTest/Program.cs
+++ b/samples/VirtualizationTest/Program.cs
@@ -13,22 +13,11 @@ namespace VirtualizationTest
     {
         static void Main(string[] args)
         {
-            InitializeLogging();
-
             AppBuilder.Configure<App>()
                .UsePlatformDetect()
                .UseReactiveUI()
+               .LogToDebug()
                .Start<MainWindow>();
         }
-
-        private static void InitializeLogging()
-        {
-#if DEBUG
-            SerilogLogger.Initialize(new LoggerConfiguration()
-                .MinimumLevel.Warning()
-                .WriteTo.Trace(outputTemplate: "{Area}: {Message}")
-                .CreateLogger());
-#endif
-        }
     }
 }
diff --git a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj
index b9fa2f208b..5aa2cd67ba 100644
--- a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj
+++ b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj
@@ -28,6 +28,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Serilog.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Avalonia.Logging.Serilog/SerilogExtensions.cs b/src/Avalonia.Logging.Serilog/SerilogExtensions.cs
new file mode 100644
index 0000000000..6abc7e4684
--- /dev/null
+++ b/src/Avalonia.Logging.Serilog/SerilogExtensions.cs
@@ -0,0 +1,51 @@
+using System;
+using Avalonia.Controls;
+using Serilog;
+using SerilogLevel = Serilog.Events.LogEventLevel;
+
+namespace Avalonia.Logging.Serilog
+{
+    /// <summary>
+    /// Extension methods for Serilog logging.
+    /// </summary>
+    public static class SerilogExtensions
+    {
+        /// <summary>
+        /// Logs Avalonia events to the <see cref="System.Diagnostics.Debug"/> 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>
+        /// <returns>The app builder instance.</returns>
+        public static T LogToDebug<T>(
+            this T builder,
+            LogEventLevel level = LogEventLevel.Warning)
+                where T : AppBuilderBase<T>, new()
+        {
+            SerilogLogger.Initialize(new LoggerConfiguration()
+                .MinimumLevel.Is((SerilogLevel)level)
+                .WriteTo.Debug(outputTemplate: "{Area}: {Message}")
+                .CreateLogger());
+            return builder;
+        }
+
+        /// <summary>
+        /// 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>
+        /// <returns>The app builder instance.</returns>
+        public static T LogToTrace<T>(
+            this T builder,
+            LogEventLevel level = LogEventLevel.Warning)
+                where T : AppBuilderBase<T>, new()
+        {
+            SerilogLogger.Initialize(new LoggerConfiguration()
+                .MinimumLevel.Is((SerilogLevel)level)
+                .WriteTo.Trace(outputTemplate: "{Area}: {Message}")
+                .CreateLogger());
+            return builder;
+        }
+    }
+}

From c02514f162f034faffcb2c857f2c4003895a0b5b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 12 Nov 2017 15:41:50 +0100
Subject: [PATCH 179/482] Removed imports of deleted .props file.

---
 samples/BindingTest/BindingTest.csproj                           | 1 -
 samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj     | 1 -
 samples/RenderTest/RenderTest.csproj                             | 1 -
 samples/VirtualizationTest/VirtualizationTest.csproj             | 1 -
 .../interop/Direct3DInteropSample/Direct3DInteropSample.csproj   | 1 -
 5 files changed, 5 deletions(-)

diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingTest/BindingTest.csproj
index 4f82303c3a..9f3fed5522 100644
--- a/samples/BindingTest/BindingTest.csproj
+++ b/samples/BindingTest/BindingTest.csproj
@@ -151,7 +151,6 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\build\Serilog.props" />
-  <Import Project="..\..\build\Serilog.Sinks.Trace.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ReactiveUI.props" />
 </Project>
\ No newline at end of file
diff --git a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
index 3f4679086e..cfa2f89b0e 100644
--- a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
+++ b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
@@ -135,5 +135,4 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\build\Serilog.props" />
   <Import Project="..\..\build\SkiaSharp.props" />
-  <Import Project="..\..\build\Serilog.Sinks.Trace.props" />
 </Project>
\ No newline at end of file
diff --git a/samples/RenderTest/RenderTest.csproj b/samples/RenderTest/RenderTest.csproj
index a71f17ab7a..4a471a831a 100644
--- a/samples/RenderTest/RenderTest.csproj
+++ b/samples/RenderTest/RenderTest.csproj
@@ -180,7 +180,6 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\build\Serilog.props" />
-  <Import Project="..\..\build\Serilog.Sinks.Trace.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ReactiveUI.props" />
 </Project>
\ No newline at end of file
diff --git a/samples/VirtualizationTest/VirtualizationTest.csproj b/samples/VirtualizationTest/VirtualizationTest.csproj
index 6d3803b4cf..147355aed1 100644
--- a/samples/VirtualizationTest/VirtualizationTest.csproj
+++ b/samples/VirtualizationTest/VirtualizationTest.csproj
@@ -147,7 +147,6 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\build\Serilog.props" />
-  <Import Project="..\..\build\Serilog.Sinks.Trace.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ReactiveUI.props" />
 </Project>
\ No newline at end of file
diff --git a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
index e0fc79faea..4271d05f91 100644
--- a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
+++ b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
@@ -28,6 +28,5 @@
         <ProjectReference Include="..\..\..\src\Windows\Avalonia.Win32\Avalonia.Win32.csproj" />
     </ItemGroup>
     <Import Project="..\..\..\build\Serilog.props" />
-    <Import Project="..\..\..\build\Serilog.Sinks.Trace.props" />
     <Import Project="..\..\..\build\Rx.props" />
 </Project>
\ No newline at end of file

From 5119828b8d184b7522f11419f4319fcc92c7a0e8 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 12 Nov 2017 15:52:45 +0100
Subject: [PATCH 180/482] Add serilog sink dependencies to build script.

---
 packages.cake | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages.cake b/packages.cake
index 9e78ee75d5..35738b6863 100644
--- a/packages.cake
+++ b/packages.cake
@@ -243,6 +243,8 @@ public class Packages
                 Dependencies = new DependencyBuilder(this)
                 {
                     new NuSpecDependency() { Id = "Serilog", Version = SerilogVersion },
+                    new NuSpecDependency() { Id = "Serilog.Sinks.Debug", Version = "1.0.0" },
+                    new NuSpecDependency() { Id = "Serilog.Sinks.Trace", Version = "2.1.0" },
                     new NuSpecDependency() { Id = "Sprache", Version = SpracheVersion },
                     new NuSpecDependency() { Id = "System.Reactive", Version = SystemReactiveVersion },
                     new NuSpecDependency() { Id = "Avalonia.Remote.Protocol", Version = parameters.Version },
@@ -251,6 +253,8 @@ public class Packages
                     new NuSpecDependency() { Id = "Microsoft.Extensions.DependencyModel", TargetFramework = "netcoreapp2.0", Version = "1.1.0" },
                     new NuSpecDependency() { Id = "NETStandard.Library", TargetFramework = "netcoreapp2.0", Version = "1.6.0" },
                     new NuSpecDependency() { Id = "Serilog", TargetFramework = "netcoreapp2.0", Version = SerilogVersion },
+                    new NuSpecDependency() { Id = "Serilog.Sinks.Debug", TargetFramework = "netcoreapp2.0", VersionVersion = "1.0.0" },
+                    new NuSpecDependency() { Id = "Serilog.Sinks.Trace", TargetFramework = "netcoreapp2.0", VersionVersion = "2.1.0" },
                     new NuSpecDependency() { Id = "Sprache", TargetFramework = "netcoreapp2.0", Version = SpracheVersion },
                     new NuSpecDependency() { Id = "System.Reactive", TargetFramework = "netcoreapp2.0", Version = SystemReactiveVersion },
                     new NuSpecDependency() { Id = "Avalonia.Remote.Protocol", TargetFramework = "netcoreapp2.0", Version = parameters.Version },

From f6830df1026aa7ad5100ae47041bd13f5048608a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 12 Nov 2017 15:59:59 +0100
Subject: [PATCH 181/482] Get serilog versions automatically.

---
 packages.cake | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages.cake b/packages.cake
index 35738b6863..bc290fce22 100644
--- a/packages.cake
+++ b/packages.cake
@@ -107,6 +107,8 @@ public class Packages
         context.Information("Setting NuGet package dependencies versions:");
 
         var SerilogVersion = packageVersions["Serilog"].FirstOrDefault().Item1;
+        var SerilogSinksDebugVersion = packageVersions["Serilog.Sinks.Debug"].FirstOrDefault().Item1;
+        var SerilogSinksTraceVersion = packageVersions["Serilog.Sinks.Trace"].FirstOrDefault().Item1;
         var SpracheVersion = packageVersions["Sprache"].FirstOrDefault().Item1;
         var SystemReactiveVersion = packageVersions["System.Reactive"].FirstOrDefault().Item1;
         var ReactiveUIVersion = packageVersions["reactiveui"].FirstOrDefault().Item1;
@@ -243,8 +245,8 @@ public class Packages
                 Dependencies = new DependencyBuilder(this)
                 {
                     new NuSpecDependency() { Id = "Serilog", Version = SerilogVersion },
-                    new NuSpecDependency() { Id = "Serilog.Sinks.Debug", Version = "1.0.0" },
-                    new NuSpecDependency() { Id = "Serilog.Sinks.Trace", Version = "2.1.0" },
+                    new NuSpecDependency() { Id = "Serilog.Sinks.Debug", Version = SerilogSinksDebugVersion },
+                    new NuSpecDependency() { Id = "Serilog.Sinks.Trace", Version = SerilogSinksTraceVersion },
                     new NuSpecDependency() { Id = "Sprache", Version = SpracheVersion },
                     new NuSpecDependency() { Id = "System.Reactive", Version = SystemReactiveVersion },
                     new NuSpecDependency() { Id = "Avalonia.Remote.Protocol", Version = parameters.Version },
@@ -253,8 +255,8 @@ public class Packages
                     new NuSpecDependency() { Id = "Microsoft.Extensions.DependencyModel", TargetFramework = "netcoreapp2.0", Version = "1.1.0" },
                     new NuSpecDependency() { Id = "NETStandard.Library", TargetFramework = "netcoreapp2.0", Version = "1.6.0" },
                     new NuSpecDependency() { Id = "Serilog", TargetFramework = "netcoreapp2.0", Version = SerilogVersion },
-                    new NuSpecDependency() { Id = "Serilog.Sinks.Debug", TargetFramework = "netcoreapp2.0", VersionVersion = "1.0.0" },
-                    new NuSpecDependency() { Id = "Serilog.Sinks.Trace", TargetFramework = "netcoreapp2.0", VersionVersion = "2.1.0" },
+                    new NuSpecDependency() { Id = "Serilog.Sinks.Debug", TargetFramework = "netcoreapp2.0", Version = SerilogSinksDebugVersion },
+                    new NuSpecDependency() { Id = "Serilog.Sinks.Trace", TargetFramework = "netcoreapp2.0", Version = SerilogSinksTraceVersion },
                     new NuSpecDependency() { Id = "Sprache", TargetFramework = "netcoreapp2.0", Version = SpracheVersion },
                     new NuSpecDependency() { Id = "System.Reactive", TargetFramework = "netcoreapp2.0", Version = SystemReactiveVersion },
                     new NuSpecDependency() { Id = "Avalonia.Remote.Protocol", TargetFramework = "netcoreapp2.0", Version = parameters.Version },

From 72f766e5d6c72ea0637694365ece8391686d52ff Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Tue, 14 Nov 2017 17:27:03 +0300
Subject: [PATCH 182/482] Ref-counting infrastructure for bitmaps

---
 src/Avalonia.Base/Utilities/Ref.cs            | 143 ++++++++++++++++++
 src/Avalonia.Controls/WindowIcon.cs           |   2 +-
 src/Avalonia.Visuals/Media/Imaging/Bitmap.cs  |  41 +++--
 src/Avalonia.Visuals/Media/Imaging/IBitmap.cs |   6 +-
 .../Media/Imaging/RenderTargetBitmap.cs       |  16 +-
 .../Media/Imaging/WritableBitmap.cs           |   5 +-
 src/Avalonia.Visuals/Platform/IBitmapImpl.cs  |   3 +-
 .../Platform/IDrawingContextImpl.cs           |   5 +-
 .../Rendering/DeferredRenderer.cs             |  21 +--
 src/Avalonia.Visuals/Rendering/RenderLayer.cs |   9 +-
 .../SceneGraph/DeferredDrawingContextImpl.cs  |   5 +-
 .../Rendering/SceneGraph/ImageNode.cs         |  18 ++-
 src/Skia/Avalonia.Skia/DrawingContextImpl.cs  |  13 +-
 .../Media/DrawingContextImpl.cs               |   9 +-
 .../Media/ImageBrushImpl.cs                   |   4 +-
 15 files changed, 241 insertions(+), 59 deletions(-)
 create mode 100644 src/Avalonia.Base/Utilities/Ref.cs

diff --git a/src/Avalonia.Base/Utilities/Ref.cs b/src/Avalonia.Base/Utilities/Ref.cs
new file mode 100644
index 0000000000..eb73488bd0
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/Ref.cs
@@ -0,0 +1,143 @@
+using System;
+using System.Runtime.ConstrainedExecution;
+using System.Threading;
+
+namespace Avalonia.Utilities
+{
+    public interface IRef<out T> : IDisposable where T : class
+    {
+        T Item { get; }
+        IRef<T> Clone();
+        IRef<TResult> CloneAs<TResult>() where TResult : class;
+    }
+
+    
+
+    public static class RefCountable
+    {
+        public static IRef<T> Create<T>(T item) where T : class, IDisposable
+        {
+            return new Ref<T>(item, new RefCounter(item));
+        }
+
+        public static IRef<T> CreateUnownedNotClonable<T>(T item) where T : class
+            => new TempRef<T>(item);
+
+        class TempRef<T> : IRef<T> where T : class
+        {
+            public void Dispose()
+            {
+                
+            }
+
+            public TempRef(T item)
+            {
+                Item = item;
+            }
+            
+            public T Item { get; }
+            public IRef<T> Clone() => throw new NotSupportedException();
+
+            public IRef<TResult> CloneAs<TResult>() where TResult : class
+                => throw new NotSupportedException();
+        }
+        
+        class RefCounter
+        {
+            private IDisposable _item;
+            private volatile int _refs;
+            private object _lock = new object();
+
+            public RefCounter(IDisposable item)
+            {
+                _item = item;
+            }
+
+            public void AddRef()
+            {
+                Interlocked.Increment(ref _refs);
+            }
+
+            public void Release()
+            {
+                if (Interlocked.Decrement(ref _refs) == 0)
+                {
+                    lock (_lock)
+                    {
+                        _item?.Dispose();
+                        _item = null;
+                    }
+                }
+
+            }
+        }
+
+        class Ref<T> : CriticalFinalizerObject, IRef<T> where T : class
+        {
+            private T _item;
+            private RefCounter _counter;
+            private object _lock = new object();
+
+            public Ref(T item, RefCounter counter)
+            {
+                _item = item;
+                _counter = counter;
+                Thread.MemoryBarrier();
+                _counter.AddRef();
+            }
+
+            public void Dispose()
+            {
+                lock (_lock)
+                {
+                    if (_item != null)
+                    {
+                        _counter.Release();
+                        _item = null;
+                    }
+                    GC.SuppressFinalize(this);
+                }
+            }
+
+            ~Ref()
+            {
+                _counter?.Release();
+            }
+
+            public T Item
+            {
+                get
+                {
+                    lock (_lock)
+                    {
+                        return _item;
+                    }
+                }
+            }
+
+            public IRef<T> Clone()
+            {
+                lock (_lock)
+                {
+                    if (_item != null)
+                        return new Ref<T>(_item, _counter);
+                    throw new ObjectDisposedException("Ref<" + typeof(T) + ">");
+                }
+            }
+
+            public IRef<TResult> CloneAs<TResult>() where TResult : class
+            {
+                lock (_lock)
+                {
+                    lock (_lock)
+                    {
+                        if (_item != null)
+                            return new Ref<TResult>((TResult) (object) _item, _counter);
+                        throw new ObjectDisposedException("Ref<" + typeof(T) + ">");
+                    }
+                }
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/WindowIcon.cs b/src/Avalonia.Controls/WindowIcon.cs
index dff84ff6ef..26195e6d76 100644
--- a/src/Avalonia.Controls/WindowIcon.cs
+++ b/src/Avalonia.Controls/WindowIcon.cs
@@ -16,7 +16,7 @@ namespace Avalonia.Controls
     {
         public WindowIcon(IBitmap bitmap)
         {
-            PlatformImpl = AvaloniaLocator.Current.GetService<IPlatformIconLoader>().LoadIcon(bitmap.PlatformImpl);
+            PlatformImpl = AvaloniaLocator.Current.GetService<IPlatformIconLoader>().LoadIcon(bitmap.PlatformImpl.Item);
         }
 
         public WindowIcon(string fileName)
diff --git a/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs b/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs
index c9f7e0f7ac..892cd935cf 100644
--- a/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs
+++ b/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using Avalonia.Platform;
+using Avalonia.Utilities;
 
 namespace Avalonia.Media.Imaging
 {
@@ -19,7 +20,7 @@ namespace Avalonia.Media.Imaging
         public Bitmap(string fileName)
         {
             IPlatformRenderInterface factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
-            PlatformImpl = factory.LoadBitmap(fileName);
+            PlatformImpl = RefCountable.Create(factory.LoadBitmap(fileName));
         }
 
         /// <summary>
@@ -29,18 +30,33 @@ namespace Avalonia.Media.Imaging
         public Bitmap(Stream stream)
         {
             IPlatformRenderInterface factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
-            PlatformImpl = factory.LoadBitmap(stream);
+            PlatformImpl = RefCountable.Create(factory.LoadBitmap(stream));
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Bitmap"/> class.
         /// </summary>
         /// <param name="impl">A platform-specific bitmap implementation.</param>
+        protected Bitmap(IRef<IBitmapImpl> impl)
+        {
+            PlatformImpl = impl.Clone();
+        }
+        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Bitmap"/> class.
+        /// </summary>
+        /// <param name="impl">A platform-specific bitmap implementation. Bitmap class takes the ownership.</param>
         protected Bitmap(IBitmapImpl impl)
         {
-            PlatformImpl = impl;
+            PlatformImpl = RefCountable.Create(impl);
         }
-
+        
+        /// <inheritdoc/>
+        public virtual void Dispose()
+        {
+            PlatformImpl.Dispose();
+        }
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="Bitmap"/> class.
         /// </summary>
@@ -51,27 +67,24 @@ namespace Avalonia.Media.Imaging
         /// <param name="stride">Bytes per row</param>
         public Bitmap(PixelFormat format, IntPtr data, int width, int height, int stride)
         {
-            PlatformImpl = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>()
-                .LoadBitmap(format, data, width, height, stride);
+            PlatformImpl = RefCountable.Create(AvaloniaLocator.Current.GetService<IPlatformRenderInterface>()
+                .LoadBitmap(format, data, width, height, stride));
         }
 
         /// <summary>
         /// Gets the width of the bitmap, in pixels.
         /// </summary>
-        public int PixelWidth => PlatformImpl.PixelWidth;
+        public int PixelWidth => PlatformImpl.Item.PixelWidth;
 
         /// <summary>
         /// Gets the height of the bitmap, in pixels.
         /// </summary>
-        public int PixelHeight => PlatformImpl.PixelHeight;
+        public int PixelHeight => PlatformImpl.Item.PixelHeight;
 
         /// <summary>
         /// Gets the platform-specific bitmap implementation.
         /// </summary>
-        public IBitmapImpl PlatformImpl
-        {
-            get;
-        }
+        public IRef<IBitmapImpl> PlatformImpl { get; }
 
         /// <summary>
         /// Saves the bitmap to a file.
@@ -79,12 +92,12 @@ namespace Avalonia.Media.Imaging
         /// <param name="fileName">The filename.</param>
         public void Save(string fileName)
         {
-            PlatformImpl.Save(fileName);
+            PlatformImpl.Item.Save(fileName);
         }
 
         public void Save(Stream stream)
         {
-            PlatformImpl.Save(stream);
+            PlatformImpl.Item.Save(stream);
         }
     }
 }
diff --git a/src/Avalonia.Visuals/Media/Imaging/IBitmap.cs b/src/Avalonia.Visuals/Media/Imaging/IBitmap.cs
index 5a10145d84..465173059e 100644
--- a/src/Avalonia.Visuals/Media/Imaging/IBitmap.cs
+++ b/src/Avalonia.Visuals/Media/Imaging/IBitmap.cs
@@ -1,15 +1,17 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using System;
 using System.IO;
 using Avalonia.Platform;
+using Avalonia.Utilities;
 
 namespace Avalonia.Media.Imaging
 {
     /// <summary>
     /// Represents a bitmap image.
     /// </summary>
-    public interface IBitmap
+    public interface IBitmap : IDisposable
     {
         /// <summary>
         /// Gets the width of the bitmap, in pixels.
@@ -24,7 +26,7 @@ namespace Avalonia.Media.Imaging
         /// <summary>
         /// Gets the platform-specific bitmap implementation.
         /// </summary>
-        IBitmapImpl PlatformImpl { get; }
+        IRef<IBitmapImpl> PlatformImpl { get; }
 
         /// <summary>
         /// Saves the bitmap to a file.
diff --git a/src/Avalonia.Visuals/Media/Imaging/RenderTargetBitmap.cs b/src/Avalonia.Visuals/Media/Imaging/RenderTargetBitmap.cs
index 9d3f15f69a..3968c05efb 100644
--- a/src/Avalonia.Visuals/Media/Imaging/RenderTargetBitmap.cs
+++ b/src/Avalonia.Visuals/Media/Imaging/RenderTargetBitmap.cs
@@ -2,8 +2,10 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
+using System.Runtime.CompilerServices;
 using Avalonia.Platform;
 using Avalonia.Rendering;
+using Avalonia.Utilities;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Media.Imaging
@@ -21,14 +23,19 @@ namespace Avalonia.Media.Imaging
         /// <param name="dpiX">The horizontal DPI of the bitmap.</param>
         /// <param name="dpiY">The vertical DPI of the bitmap.</param>
         public RenderTargetBitmap(int pixelWidth, int pixelHeight, double dpiX = 96, double dpiY = 96)
-            : base(CreateImpl(pixelWidth, pixelHeight, dpiX, dpiY))
+           : this(RefCountable.Create(CreateImpl(pixelWidth, pixelHeight, dpiX, dpiY)))
         {
         }
 
+        private RenderTargetBitmap(IRef<IRenderTargetBitmapImpl> impl) : base(impl)
+        {
+            PlatformImpl = impl;
+        }
+
         /// <summary>
         /// Gets the platform-specific bitmap implementation.
         /// </summary>
-        public new IRenderTargetBitmapImpl PlatformImpl => (IRenderTargetBitmapImpl)base.PlatformImpl;
+        public new IRef<IRenderTargetBitmapImpl> PlatformImpl { get; }
 
         /// <summary>
         /// Disposes of the bitmap.
@@ -36,6 +43,7 @@ namespace Avalonia.Media.Imaging
         public void Dispose()
         {
             PlatformImpl.Dispose();
+            base.Dispose();
         }
 
         /// <summary>
@@ -52,13 +60,13 @@ namespace Avalonia.Media.Imaging
         /// <param name="dpiX">The horizontal DPI of the bitmap.</param>
         /// <param name="dpiY">The vertical DPI of the bitmap.</param>
         /// <returns>The platform-specific implementation.</returns>
-        private static IBitmapImpl CreateImpl(int width, int height, double dpiX, double dpiY)
+        private static IRenderTargetBitmapImpl CreateImpl(int width, int height, double dpiX, double dpiY)
         {
             IPlatformRenderInterface factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
             return factory.CreateRenderTargetBitmap(width, height, dpiX, dpiY);
         }
 
         /// <inheritdoc/>
-        public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer vbr) => PlatformImpl.CreateDrawingContext(vbr);
+        public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer vbr) => PlatformImpl.Item.CreateDrawingContext(vbr);
     }
 }
diff --git a/src/Avalonia.Visuals/Media/Imaging/WritableBitmap.cs b/src/Avalonia.Visuals/Media/Imaging/WritableBitmap.cs
index 5c5b516ddd..df3e71dc85 100644
--- a/src/Avalonia.Visuals/Media/Imaging/WritableBitmap.cs
+++ b/src/Avalonia.Visuals/Media/Imaging/WritableBitmap.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Avalonia.Platform;
+using Avalonia.Utilities;
 
 namespace Avalonia.Media.Imaging
 {
@@ -16,7 +17,7 @@ namespace Avalonia.Media.Imaging
             : base(AvaloniaLocator.Current.GetService<IPlatformRenderInterface>().CreateWritableBitmap(width, height, format))
         {
         }
-
-        public ILockedFramebuffer Lock() => ((IWritableBitmapImpl) PlatformImpl).Lock();
+        
+        public ILockedFramebuffer Lock() => ((IWritableBitmapImpl) PlatformImpl.Item).Lock();
     }
 }
diff --git a/src/Avalonia.Visuals/Platform/IBitmapImpl.cs b/src/Avalonia.Visuals/Platform/IBitmapImpl.cs
index 12ac28e880..d60838452e 100644
--- a/src/Avalonia.Visuals/Platform/IBitmapImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IBitmapImpl.cs
@@ -1,6 +1,7 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using System;
 using System.IO;
 
 namespace Avalonia.Platform
@@ -8,7 +9,7 @@ namespace Avalonia.Platform
     /// <summary>
     /// Defines the platform-specific interface for a <see cref="Avalonia.Media.Imaging.Bitmap"/>.
     /// </summary>
-    public interface IBitmapImpl
+    public interface IBitmapImpl : IDisposable
     {
         /// <summary>
         /// Gets the width of the bitmap, in pixels.
diff --git a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
index 3db4527bfb..04bbe713f2 100644
--- a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Avalonia.Media;
+using Avalonia.Utilities;
 
 namespace Avalonia.Platform
 {
@@ -29,7 +30,7 @@ namespace Avalonia.Platform
         /// <param name="opacity">The opacity to draw with.</param>
         /// <param name="sourceRect">The rect in the image to draw.</param>
         /// <param name="destRect">The rect in the output to draw to.</param>
-        void DrawImage(IBitmapImpl source, double opacity, Rect sourceRect, Rect destRect);
+        void DrawImage(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect);
 
         /// <summary>
         /// Draws a bitmap image.
@@ -38,7 +39,7 @@ namespace Avalonia.Platform
         /// <param name="opacityMask">The opacity mask to draw with.</param>
         /// <param name="opacityMaskRect">The destination rect for the opacity mask.</param>
         /// <param name="destRect">The rect in the output to draw to.</param>
-        void DrawImage(IBitmapImpl source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect);
+        void DrawImage(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect);
 
         /// <summary>
         /// Draws a line.
diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index f7befa646a..26b5244b00 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -12,6 +12,7 @@ using System.IO;
 using Avalonia.Media.Immutable;
 using System.Threading;
 using System.Linq;
+using Avalonia.Utilities;
 
 namespace Avalonia.Rendering
 {
@@ -31,7 +32,7 @@ namespace Avalonia.Rendering
         private Scene _scene;
         private IRenderTarget _renderTarget;
         private DirtyVisuals _dirty;
-        private IRenderTargetBitmapImpl _overlay;
+        private IRef<IRenderTargetBitmapImpl> _overlay;
         private bool _updateQueued;
         private object _rendering = new object();
         private int _lastSceneId = -1;
@@ -267,7 +268,7 @@ namespace Avalonia.Rendering
 
                     if (node != null)
                     {
-                        using (var context = renderTarget.CreateDrawingContext(this))
+                        using (var context = renderTarget.Item.CreateDrawingContext(this))
                         {
                             foreach (var rect in layer.Dirty)
                             {
@@ -294,7 +295,7 @@ namespace Avalonia.Rendering
             {
                 var overlay = GetOverlay(parentContent, scene.Size, scene.Scaling);
 
-                using (var context = overlay.CreateDrawingContext(this))
+                using (var context = overlay.Item.CreateDrawingContext(this))
                 {
                     context.Clear(Colors.Transparent);
                     RenderDirtyRects(context);
@@ -323,7 +324,7 @@ namespace Avalonia.Rendering
             foreach (var layer in scene.Layers)
             {
                 var bitmap = _layers[layer.LayerRoot].Bitmap;
-                var sourceRect = new Rect(0, 0, bitmap.PixelWidth, bitmap.PixelHeight);
+                var sourceRect = new Rect(0, 0, bitmap.Item.PixelWidth, bitmap.Item.PixelHeight);
 
                 if (layer.GeometryClip != null)
                 {
@@ -347,7 +348,7 @@ namespace Avalonia.Rendering
 
             if (_overlay != null)
             {
-                var sourceRect = new Rect(0, 0, _overlay.PixelWidth, _overlay.PixelHeight);
+                var sourceRect = new Rect(0, 0, _overlay.Item.PixelWidth, _overlay.Item.PixelHeight);
                 context.DrawImage(_overlay, 0.5, sourceRect, clientRect);
             }
 
@@ -420,7 +421,7 @@ namespace Avalonia.Rendering
             }
         }
 
-        private IRenderTargetBitmapImpl GetOverlay(
+        private IRef<IRenderTargetBitmapImpl> GetOverlay(
             IDrawingContextImpl parentContext,
             Size size,
             double scaling)
@@ -428,11 +429,11 @@ namespace Avalonia.Rendering
             var pixelSize = size * scaling;
 
             if (_overlay == null ||
-                _overlay.PixelWidth != pixelSize.Width ||
-                _overlay.PixelHeight != pixelSize.Height)
+                _overlay.Item.PixelWidth != pixelSize.Width ||
+                _overlay.Item.PixelHeight != pixelSize.Height)
             {
                 _overlay?.Dispose();
-                _overlay = parentContext.CreateLayer(size);
+                _overlay = RefCountable.Create(parentContext.CreateLayer(size));
             }
 
             return _overlay;
@@ -445,7 +446,7 @@ namespace Avalonia.Rendering
             foreach (var layer in _layers)
             {
                 var fileName = Path.Combine(DebugFramesPath, $"frame-{id}-layer-{index++}.png");
-                layer.Bitmap.Save(fileName);
+                layer.Bitmap.Item.Save(fileName);
             }
         }
     }
diff --git a/src/Avalonia.Visuals/Rendering/RenderLayer.cs b/src/Avalonia.Visuals/Rendering/RenderLayer.cs
index ed33295db6..d1b1f1440a 100644
--- a/src/Avalonia.Visuals/Rendering/RenderLayer.cs
+++ b/src/Avalonia.Visuals/Rendering/RenderLayer.cs
@@ -1,6 +1,7 @@
 using System;
 using Avalonia.Media;
 using Avalonia.Platform;
+using Avalonia.Utilities;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Rendering
@@ -16,13 +17,13 @@ namespace Avalonia.Rendering
             IVisual layerRoot)
         {
             _drawingContext = drawingContext;
-            Bitmap = drawingContext.CreateLayer(size);
+            Bitmap = RefCountable.Create(drawingContext.CreateLayer(size));
             Size = size;
             Scaling = scaling;
             LayerRoot = layerRoot;
         }
 
-        public IRenderTargetBitmapImpl Bitmap { get; private set; }
+        public IRef<IRenderTargetBitmapImpl> Bitmap { get; private set; }
         public double Scaling { get; private set; }
         public Size Size { get; private set; }
         public IVisual LayerRoot { get; }
@@ -31,9 +32,9 @@ namespace Avalonia.Rendering
         {
             if (Size != size || Scaling != scaling)
             {
-                var resized = _drawingContext.CreateLayer(size);
+                var resized = RefCountable.Create(_drawingContext.CreateLayer(size));
 
-                using (var context = resized.CreateDrawingContext(null))
+                using (var context = resized.Item.CreateDrawingContext(null))
                 {
                     context.Clear(Colors.Transparent);
                     context.DrawImage(Bitmap, 1, new Rect(Size), new Rect(Size));
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
index 29c482c336..38a10a7b7f 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using Avalonia.Media;
 using Avalonia.Platform;
+using Avalonia.Utilities;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Rendering.SceneGraph
@@ -113,7 +114,7 @@ namespace Avalonia.Rendering.SceneGraph
         }
 
         /// <inheritdoc/>
-        public void DrawImage(IBitmapImpl source, double opacity, Rect sourceRect, Rect destRect)
+        public void DrawImage(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect)
         {
             var next = NextDrawAs<ImageNode>();
 
@@ -128,7 +129,7 @@ namespace Avalonia.Rendering.SceneGraph
         }
 
         /// <inheritdoc/>
-        public void DrawImage(IBitmapImpl source, IBrush opacityMask, Rect opacityMaskRect, Rect sourceRect)
+        public void DrawImage(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect sourceRect)
         {
             // This method is currently only used to composite layers so shouldn't be called here.
             throw new NotSupportedException();
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs
index 8291d1c0bb..8a1a5cb481 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs
@@ -3,13 +3,14 @@
 
 using System;
 using Avalonia.Platform;
+using Avalonia.Utilities;
 
 namespace Avalonia.Rendering.SceneGraph
 {
     /// <summary>
     /// A node in the scene graph which represents an image draw.
     /// </summary>
-    internal class ImageNode : DrawOperation
+    internal class ImageNode : DrawOperation, IDisposable
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageNode"/> class.
@@ -19,11 +20,11 @@ namespace Avalonia.Rendering.SceneGraph
         /// <param name="opacity">The draw opacity.</param>
         /// <param name="sourceRect">The source rect.</param>
         /// <param name="destRect">The destination rect.</param>
-        public ImageNode(Matrix transform, IBitmapImpl source, double opacity, Rect sourceRect, Rect destRect)
+        public ImageNode(Matrix transform, IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect)
             : base(destRect, transform, null)
         {
             Transform = transform;
-            Source = source;
+            Source = source.Clone();
             Opacity = opacity;
             SourceRect = sourceRect;
             DestRect = destRect;
@@ -37,7 +38,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// <summary>
         /// Gets the image to draw.
         /// </summary>
-        public IBitmapImpl Source { get; }
+        public IRef<IBitmapImpl> Source { get; }
 
         /// <summary>
         /// Gets the draw opacity.
@@ -67,10 +68,10 @@ namespace Avalonia.Rendering.SceneGraph
         /// The properties of the other draw operation are passed in as arguments to prevent
         /// allocation of a not-yet-constructed draw operation object.
         /// </remarks>
-        public bool Equals(Matrix transform, IBitmapImpl source, double opacity, Rect sourceRect, Rect destRect)
+        public bool Equals(Matrix transform, IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect)
         {
             return transform == Transform &&
-                Equals(source, Source) &&
+                Equals(source.Item, Source.Item) &&
                 opacity == Opacity &&
                 sourceRect == SourceRect &&
                 destRect == DestRect;
@@ -87,5 +88,10 @@ namespace Avalonia.Rendering.SceneGraph
 
         /// <inheritdoc/>
         public override bool HitTest(Point p) => Bounds.Contains(p);
+
+        public void Dispose()
+        {
+            Source?.Dispose();
+        }
     }
 }
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index dd3ced1d89..0bc133e9df 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Rendering.Utilities;
+using Avalonia.Utilities;
 
 namespace Avalonia.Skia
 {
@@ -39,9 +40,9 @@ namespace Avalonia.Skia
             Canvas.Clear(color.ToSKColor());
         }
 
-        public void DrawImage(IBitmapImpl source, double opacity, Rect sourceRect, Rect destRect)
+        public void DrawImage(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect)
         {
-            var impl = (BitmapImpl)source;
+            var impl = (BitmapImpl)source.Item;
             var s = sourceRect.ToSKRect();
             var d = destRect.ToSKRect();
             using (var paint = new SKPaint()
@@ -51,10 +52,10 @@ namespace Avalonia.Skia
             }
         }
 
-        public void DrawImage(IBitmapImpl source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect)
+        public void DrawImage(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect)
         {
             PushOpacityMask(opacityMask, opacityMaskRect);
-            DrawImage(source, 1, new Rect(0, 0, source.PixelWidth, source.PixelHeight), destRect);
+            DrawImage(source, 1, new Rect(0, 0, source.Item.PixelWidth, source.Item.PixelHeight), destRect);
             PopOpacityMask();
         }
 
@@ -237,7 +238,7 @@ namespace Avalonia.Skia
             }
             else
             {
-                tileBrushImage = (BitmapImpl)((tileBrush as IImageBrush)?.Source?.PlatformImpl);
+                tileBrushImage = (BitmapImpl)((tileBrush as IImageBrush)?.Source?.PlatformImpl.Item);
             }
 
             if (tileBrush != null && tileBrushImage != null)
@@ -252,7 +253,7 @@ namespace Avalonia.Skia
                     context.Clear(Colors.Transparent);
                     context.PushClip(calc.IntermediateClip);
                     context.Transform = calc.IntermediateTransform;
-                    context.DrawImage(tileBrushImage, 1, rect, rect);
+                    context.DrawImage(RefCountable.CreateUnownedNotClonable(tileBrushImage), 1, rect, rect);
                     context.PopClip();
                 }
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
index 6a72923ce3..afbca14346 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Rendering;
+using Avalonia.Utilities;
 using SharpDX;
 using SharpDX.Direct2D1;
 using SharpDX.Mathematics.Interop;
@@ -100,9 +101,9 @@ namespace Avalonia.Direct2D1.Media
         /// <param name="opacity">The opacity to draw with.</param>
         /// <param name="sourceRect">The rect in the image to draw.</param>
         /// <param name="destRect">The rect in the output to draw to.</param>
-        public void DrawImage(IBitmapImpl source, double opacity, Rect sourceRect, Rect destRect)
+        public void DrawImage(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect)
         {
-            using (var d2d = ((BitmapImpl)source).GetDirect2DBitmap(_renderTarget))
+            using (var d2d = ((BitmapImpl)source.Item).GetDirect2DBitmap(_renderTarget))
             {
                 _renderTarget.DrawBitmap(
                     d2d.Value,
@@ -120,9 +121,9 @@ namespace Avalonia.Direct2D1.Media
         /// <param name="opacityMask">The opacity mask to draw with.</param>
         /// <param name="opacityMaskRect">The destination rect for the opacity mask.</param>
         /// <param name="destRect">The rect in the output to draw to.</param>
-        public void DrawImage(IBitmapImpl source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect)
+        public void DrawImage(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect)
         {
-            using (var d2dSource = ((BitmapImpl)source).GetDirect2DBitmap(_renderTarget))
+            using (var d2dSource = ((BitmapImpl)source.Item).GetDirect2DBitmap(_renderTarget))
             using (var sourceBrush = new BitmapBrush(_renderTarget, d2dSource.Value))
             using (var d2dOpacityMask = CreateBrush(opacityMask, opacityMaskRect.Size))
             using (var geometry = new SharpDX.Direct2D1.RectangleGeometry(_renderTarget.Factory, destRect.ToDirect2D()))
diff --git a/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs
index 08cfed2ace..75b397edd6 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs
@@ -4,6 +4,7 @@
 using System;
 using Avalonia.Media;
 using Avalonia.Rendering.Utilities;
+using Avalonia.Utilities;
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
@@ -100,7 +101,8 @@ namespace Avalonia.Direct2D1.Media
                 context.Clear(Colors.Transparent);
                 context.PushClip(calc.IntermediateClip);
                 context.Transform = calc.IntermediateTransform;
-                context.DrawImage(bitmap, 1, rect, rect);
+                
+                context.DrawImage(RefCountable.CreateUnownedNotClonable(bitmap), 1, rect, rect);
                 context.PopClip();
             }
 

From 33218879704fb1cb08a2ebb7773e78b6faa3a7f6 Mon Sep 17 00:00:00 2001
From: Jurjen Biewenga <j.f.biewenga@gmail.com>
Date: Fri, 17 Nov 2017 10:50:58 +0100
Subject: [PATCH 183/482] Made the invalidCharacters array static readonly and
 replaced the DEL char with the unicode representation

---
 src/Avalonia.Controls/TextBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 7b6d5ac52e..67a45140c8 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -97,7 +97,7 @@ namespace Avalonia.Controls
         private UndoRedoHelper<UndoRedoState> _undoRedoHelper;
         private bool _ignoreTextChanges;
         private IEnumerable<Exception> _dataValidationErrors;
-        private string[] invalidCharacters = new String[1]{""};
+        private static readonly string[] invalidCharacters = new String[1]{"\u007f"};
 
         static TextBox()
         {

From 1d2d2067c4430b1b85b1b8d91b4625bc3de8d122 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 19 Nov 2017 17:29:21 -0600
Subject: [PATCH 184/482] Remove tree-switching on AncestorType == null

---
 src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
index 2a65504347..8ba637de50 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
@@ -131,7 +131,7 @@ namespace Avalonia.Markup.Xaml.Data
             {
                 if (RelativeSource.Tree == TreeType.Visual && RelativeSource.AncestorType == null)
                 {
-                    throw new InvalidOperationException("AncestorType must be set for RelativeSourceModel.FindAncestor when searching the visual tree.");
+                    throw new InvalidOperationException("AncestorType must be set for RelativeSourceMode.FindAncestor when searching the visual tree.");
                 }
 
                 observer = CreateFindAncestorObserver(
@@ -228,7 +228,7 @@ namespace Avalonia.Markup.Xaml.Data
             Contract.Requires<ArgumentNullException>(target != null);
 
             return new ExpressionObserver(
-                ControlLocator.Track(target, relativeSource.AncestorType != null ? relativeSource.Tree : TreeType.Logical, relativeSource.AncestorLevel - 1, relativeSource.AncestorType),
+                ControlLocator.Track(target, relativeSource.Tree, relativeSource.AncestorLevel - 1, relativeSource.AncestorType),
                 path);
         }
 
@@ -283,4 +283,4 @@ namespace Avalonia.Markup.Xaml.Data
             public RelativeSource RelativeSource { get; set; }
         }
     }
-}
\ No newline at end of file
+}

From 2e8521e690ee67cfd952244ea8c01bc2827cd243 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 20 Nov 2017 23:10:42 +0100
Subject: [PATCH 185/482] Added failing test for #1271.

---
 .../ContentControlTests.cs                    | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs b/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs
index 5f86b9878d..653ab17b63 100644
--- a/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs
@@ -1,6 +1,7 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using System;
 using System.Collections.Specialized;
 using System.Linq;
 using Moq;
@@ -11,6 +12,9 @@ using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
 using Xunit;
+using Avalonia.Markup.Xaml.Data;
+using Avalonia.Data;
+using System.Collections.Generic;
 
 namespace Avalonia.Controls.UnitTests
 {
@@ -273,6 +277,60 @@ namespace Avalonia.Controls.UnitTests
             Assert.Null(target.Presenter.Child.DataContext);
         }
 
+        [Fact]
+        public void Binding_ContentTemplate_After_Content_Does_Not_Leave_Orpaned_TextBlock()
+        {
+            // Test for #1271.
+            var children = new List<IControl>();
+            var presenter = new ContentPresenter();
+
+            // The content and then the content template property need to be bound with delayed bindings
+            // as they are in Avalonia.Markup.Xaml.
+            DelayedBinding.Add(presenter, ContentPresenter.ContentProperty, new Binding("Content")
+            {
+                Priority = BindingPriority.TemplatedParent,
+                RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
+            });
+
+            DelayedBinding.Add(presenter, ContentPresenter.ContentTemplateProperty, new Binding("ContentTemplate")
+            {
+                Priority = BindingPriority.TemplatedParent,
+                RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
+            });
+
+            presenter.GetObservable(ContentPresenter.ChildProperty).Subscribe(children.Add);
+
+            var target = new ContentControl
+            {
+                Template = new FuncControlTemplate<ContentControl>(_ => presenter),
+                ContentTemplate = new FuncDataTemplate<string>(x => new Canvas()),
+                Content = "foo",
+            };
+                        
+            // The control must be rooted.
+            var root = new TestRoot
+            {
+                Child = target,
+            };
+
+            target.ApplyTemplate();
+
+            // When the template is applied, the Content property is bound before the ContentTemplate
+            // property, causing a TextBlock to be created by the default template before ContentTemplate
+            // is bound.
+            Assert.Collection(
+                children,
+                x => Assert.Null(x),
+                x => Assert.IsType<TextBlock>(x),
+                x => Assert.IsType<Canvas>(x));
+
+            var textBlock = (TextBlock)children[1];
+
+            // The leak in #1271 was caused by the TextBlock's logical parent not being cleared when
+            // it is replaced by the Canvas.
+            Assert.Null(textBlock.GetLogicalParent());
+        }
+
         private FuncControlTemplate GetTemplate()
         {
             return new FuncControlTemplate<ContentControl>(parent =>

From 9b68067a15f3beff2edc9e4db06b9545cac6e0a1 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 20 Nov 2017 23:14:26 +0100
Subject: [PATCH 186/482] Fix ContentPresenter logical parent logic.

`ContentPresenter` should only be manually setting its child's logical parent when it is outside of a control template. When it's inside a control template, setting the logical parent will be handled by `ContentControlMixin`.

Fixes #1271.
---
 .../Presenters/ContentPresenter.cs                  | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index c1adff402a..97760b5632 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -255,18 +255,9 @@ namespace Avalonia.Controls.Presenters
                     LogicalChildren.Remove(oldChild);
                 }
 
-                if (newChild.Parent == null)
+                if (newChild.Parent == null && TemplatedParent == null)
                 {
-                    var templatedLogicalParent = TemplatedParent as ILogical;
-
-                    if (templatedLogicalParent != null)
-                    {
-                        ((ISetLogicalParent)newChild).SetParent(templatedLogicalParent);
-                    }
-                    else
-                    {
-                        LogicalChildren.Add(newChild);
-                    }
+                    LogicalChildren.Add(newChild);
                 }
 
                 VisualChildren.Add(newChild);

From 3dd11f9046f38a4b50757776de6366039fd2428a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 20 Nov 2017 23:48:11 +0100
Subject: [PATCH 187/482] Make Content depend on ContentTemplate.

Make the `ContentPresenter.Content` property depend on `ContentPresenter.ContentTemplate` because otherwise a temporary control will be created by the presenter using the default template between the time `Content` and `ContentTemplate` is bound.

However, because Portable.Xaml doesn't actually _support_ `DependsOnAttribute` yet, also move the bindings for `ContentTemplate` above `Content` in the default themes.

This works around #1271 although #1284 fixes the underlying cause of the leak - this is more to prevent unnecessary controls being created.
---
 src/Avalonia.Controls/ContentControl.cs                 | 1 +
 src/Avalonia.Controls/Presenters/ContentPresenter.cs    | 2 ++
 src/Avalonia.Themes.Default/Button.xaml                 | 2 +-
 src/Avalonia.Themes.Default/CalendarButton.xaml         | 2 +-
 src/Avalonia.Themes.Default/CalendarDayButton.xaml      | 2 +-
 src/Avalonia.Themes.Default/CheckBox.xaml               | 2 +-
 src/Avalonia.Themes.Default/ContentControl.xaml         | 2 +-
 src/Avalonia.Themes.Default/DropDownItem.xaml           | 2 +-
 src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml  | 2 +-
 src/Avalonia.Themes.Default/Expander.xaml               | 8 ++++----
 src/Avalonia.Themes.Default/LayoutTransformControl.xaml | 2 +-
 src/Avalonia.Themes.Default/ListBoxItem.xaml            | 2 +-
 src/Avalonia.Themes.Default/PopupRoot.xaml              | 2 +-
 src/Avalonia.Themes.Default/RadioButton.xaml            | 2 +-
 src/Avalonia.Themes.Default/RepeatButton.xaml           | 2 +-
 src/Avalonia.Themes.Default/TabStripItem.xaml           | 2 +-
 src/Avalonia.Themes.Default/ToggleButton.xaml           | 2 +-
 src/Avalonia.Themes.Default/ToolTip.xaml                | 2 +-
 src/Avalonia.Themes.Default/Window.xaml                 | 2 +-
 19 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/Avalonia.Controls/ContentControl.cs b/src/Avalonia.Controls/ContentControl.cs
index 0eba3c13ae..6da6da54a5 100644
--- a/src/Avalonia.Controls/ContentControl.cs
+++ b/src/Avalonia.Controls/ContentControl.cs
@@ -51,6 +51,7 @@ namespace Avalonia.Controls
         /// Gets or sets the content to display.
         /// </summary>
         [Content]
+        [DependsOn(nameof(ContentTemplate))]
         public object Content
         {
             get { return GetValue(ContentProperty); }
diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index c1adff402a..52c0a25caa 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -8,6 +8,7 @@ using Avalonia.Controls.Templates;
 using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
+using Avalonia.Metadata;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Presenters
@@ -139,6 +140,7 @@ namespace Avalonia.Controls.Presenters
         /// <summary>
         /// Gets or sets the content to be displayed by the presenter.
         /// </summary>
+        [DependsOn(nameof(ContentTemplate))]
         public object Content
         {
             get { return GetValue(ContentProperty); }
diff --git a/src/Avalonia.Themes.Default/Button.xaml b/src/Avalonia.Themes.Default/Button.xaml
index 908f293fa7..94fcce5e0c 100644
--- a/src/Avalonia.Themes.Default/Button.xaml
+++ b/src/Avalonia.Themes.Default/Button.xaml
@@ -13,8 +13,8 @@
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
-                          Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
                           Padding="{TemplateBinding Padding}"
                           TextBlock.Foreground="{TemplateBinding Foreground}"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
diff --git a/src/Avalonia.Themes.Default/CalendarButton.xaml b/src/Avalonia.Themes.Default/CalendarButton.xaml
index 5f3cba5c7a..84969c135f 100644
--- a/src/Avalonia.Themes.Default/CalendarButton.xaml
+++ b/src/Avalonia.Themes.Default/CalendarButton.xaml
@@ -29,8 +29,8 @@
           <!--Focusable="False"-->
           <ContentControl Name="Content"
                           Foreground="#FF333333"
-                          Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                           FontSize="{TemplateBinding FontSize}"
diff --git a/src/Avalonia.Themes.Default/CalendarDayButton.xaml b/src/Avalonia.Themes.Default/CalendarDayButton.xaml
index 01c6e6a708..ee7afdc73b 100644
--- a/src/Avalonia.Themes.Default/CalendarDayButton.xaml
+++ b/src/Avalonia.Themes.Default/CalendarDayButton.xaml
@@ -30,8 +30,8 @@
                      Fill="{TemplateBinding Background}"/>
 
           <ContentControl Name="Content"
-                          Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                           FontSize="{TemplateBinding FontSize}"
diff --git a/src/Avalonia.Themes.Default/CheckBox.xaml b/src/Avalonia.Themes.Default/CheckBox.xaml
index ef96e7ed4f..62a05a3525 100644
--- a/src/Avalonia.Themes.Default/CheckBox.xaml
+++ b/src/Avalonia.Themes.Default/CheckBox.xaml
@@ -31,8 +31,8 @@
             </Panel>
           </Border>
           <ContentPresenter Name="PART_ContentPresenter"
-                            Content="{TemplateBinding Content}"
                             ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
                             Margin="4,0,0,0"
                             VerticalAlignment="Center"
                             Grid.Column="1"/>
diff --git a/src/Avalonia.Themes.Default/ContentControl.xaml b/src/Avalonia.Themes.Default/ContentControl.xaml
index 27f6648548..7584ae0dfe 100644
--- a/src/Avalonia.Themes.Default/ContentControl.xaml
+++ b/src/Avalonia.Themes.Default/ContentControl.xaml
@@ -5,8 +5,8 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
-                        Content="{TemplateBinding Content}"
                         ContentTemplate="{TemplateBinding ContentTemplate}"
+                        Content="{TemplateBinding Content}"
                         Padding="{TemplateBinding Padding}"/>
     </ControlTemplate>
   </Setter>
diff --git a/src/Avalonia.Themes.Default/DropDownItem.xaml b/src/Avalonia.Themes.Default/DropDownItem.xaml
index 48d791f629..257030d8af 100644
--- a/src/Avalonia.Themes.Default/DropDownItem.xaml
+++ b/src/Avalonia.Themes.Default/DropDownItem.xaml
@@ -10,8 +10,8 @@
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
-                          Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                           Padding="{TemplateBinding Padding}"/>
diff --git a/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml b/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml
index f39720bb65..de364c0108 100644
--- a/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml
+++ b/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml
@@ -7,8 +7,8 @@
       <Border Background="{TemplateBinding Background}">
         <AdornerDecorator>
           <ContentPresenter Name="PART_ContentPresenter" 
-                            Content="{TemplateBinding Content}" 
                             ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}" 
                             Margin="{TemplateBinding Padding}"/>
         </AdornerDecorator>
       </Border>
diff --git a/src/Avalonia.Themes.Default/Expander.xaml b/src/Avalonia.Themes.Default/Expander.xaml
index 51efec6b95..5e05dcf608 100644
--- a/src/Avalonia.Themes.Default/Expander.xaml
+++ b/src/Avalonia.Themes.Default/Expander.xaml
@@ -16,8 +16,8 @@
             <ContentPresenter Name="PART_ContentPresenter"
                               Grid.Row="1"
                               IsVisible="{TemplateBinding IsExpanded}"
-                              Content="{TemplateBinding Content}"
                               ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"
                               HorizontalAlignment="Stretch"
                               VerticalAlignment="Stretch" />
           </Grid>
@@ -34,8 +34,8 @@
             <ContentPresenter Name="PART_ContentPresenter"
                               Grid.Row="0"
                               IsVisible="{TemplateBinding IsExpanded}"
-                              Content="{TemplateBinding Content}"
                               ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"
                               HorizontalAlignment="Stretch"
                               VerticalAlignment="Stretch" />
           </Grid>
@@ -52,8 +52,8 @@
             <ContentPresenter Name="PART_ContentPresenter"
                               Grid.Column="1"
                               IsVisible="{TemplateBinding IsExpanded}"
-                              Content="{TemplateBinding Content}"
                               ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"
                               HorizontalAlignment="Stretch"
                               VerticalAlignment="Stretch" />
           </Grid>
@@ -70,8 +70,8 @@
             <ContentPresenter Name="PART_ContentPresenter"
                               Grid.Column="0"
                               IsVisible="{TemplateBinding IsExpanded}"
-                              Content="{TemplateBinding Content}"
                               ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"
                               HorizontalAlignment="Stretch"
                               VerticalAlignment="Stretch" />
           </Grid>
diff --git a/src/Avalonia.Themes.Default/LayoutTransformControl.xaml b/src/Avalonia.Themes.Default/LayoutTransformControl.xaml
index c9df62625f..b26f053622 100644
--- a/src/Avalonia.Themes.Default/LayoutTransformControl.xaml
+++ b/src/Avalonia.Themes.Default/LayoutTransformControl.xaml
@@ -5,8 +5,8 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
-                        Content="{TemplateBinding Content}" 
                         ContentTemplate="{TemplateBinding ContentTemplate}"
+                        Content="{TemplateBinding Content}" 
                         Padding="{TemplateBinding Padding}"/>
     </ControlTemplate>
   </Setter>
diff --git a/src/Avalonia.Themes.Default/ListBoxItem.xaml b/src/Avalonia.Themes.Default/ListBoxItem.xaml
index 64fc62ba73..a0405f2875 100644
--- a/src/Avalonia.Themes.Default/ListBoxItem.xaml
+++ b/src/Avalonia.Themes.Default/ListBoxItem.xaml
@@ -7,8 +7,8 @@
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
-                          Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
                           Padding="{TemplateBinding Padding}"/>
       </ControlTemplate>
     </Setter>
diff --git a/src/Avalonia.Themes.Default/PopupRoot.xaml b/src/Avalonia.Themes.Default/PopupRoot.xaml
index 47e519bf90..cc23367ac0 100644
--- a/src/Avalonia.Themes.Default/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Default/PopupRoot.xaml
@@ -4,8 +4,8 @@
     <ControlTemplate>
       <ContentPresenter Name="PART_ContentPresenter"
                         Background="{TemplateBinding Background}"
-                        Content="{TemplateBinding Content}" 
                         ContentTemplate="{TemplateBinding ContentTemplate}"
+                        Content="{TemplateBinding Content}" 
                         Padding="{TemplateBinding Padding}"/>
     </ControlTemplate>
   </Setter>
diff --git a/src/Avalonia.Themes.Default/RadioButton.xaml b/src/Avalonia.Themes.Default/RadioButton.xaml
index 0a0eb48564..fb71432595 100644
--- a/src/Avalonia.Themes.Default/RadioButton.xaml
+++ b/src/Avalonia.Themes.Default/RadioButton.xaml
@@ -29,8 +29,8 @@
                    HorizontalAlignment="Center"
                    VerticalAlignment="Center"/>
           <ContentPresenter Name="PART_ContentPresenter"
-                            Content="{TemplateBinding Content}"
                             ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
                             Margin="4,0,0,0"
                             VerticalAlignment="Center"
                             Grid.Column="1"/>
diff --git a/src/Avalonia.Themes.Default/RepeatButton.xaml b/src/Avalonia.Themes.Default/RepeatButton.xaml
index 1caaa266de..872f390ac5 100644
--- a/src/Avalonia.Themes.Default/RepeatButton.xaml
+++ b/src/Avalonia.Themes.Default/RepeatButton.xaml
@@ -20,8 +20,8 @@
                                   Background="{TemplateBinding Background}"
                                   BorderBrush="{TemplateBinding BorderBrush}"
                                   BorderThickness="{TemplateBinding BorderThickness}"
-                                  Content="{TemplateBinding Content}"
                                   ContentTemplate="{TemplateBinding ContentTemplate}"
+                                  Content="{TemplateBinding Content}"
                                   Padding="{TemplateBinding Padding}"
                                   TextBlock.Foreground="{TemplateBinding Foreground}"
                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
diff --git a/src/Avalonia.Themes.Default/TabStripItem.xaml b/src/Avalonia.Themes.Default/TabStripItem.xaml
index 7f7fef0a1a..408cfaa3d7 100644
--- a/src/Avalonia.Themes.Default/TabStripItem.xaml
+++ b/src/Avalonia.Themes.Default/TabStripItem.xaml
@@ -9,8 +9,8 @@
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
-                          Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
                           Padding="{TemplateBinding Padding}"/>
       </ControlTemplate>
     </Setter>
diff --git a/src/Avalonia.Themes.Default/ToggleButton.xaml b/src/Avalonia.Themes.Default/ToggleButton.xaml
index 12d7daacda..dadc45d854 100644
--- a/src/Avalonia.Themes.Default/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Default/ToggleButton.xaml
@@ -13,8 +13,8 @@
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
-                          Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
                           Padding="{TemplateBinding Padding}"
                           TextBlock.Foreground="{TemplateBinding Foreground}"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
diff --git a/src/Avalonia.Themes.Default/ToolTip.xaml b/src/Avalonia.Themes.Default/ToolTip.xaml
index f3e819c101..1fc0202dd3 100644
--- a/src/Avalonia.Themes.Default/ToolTip.xaml
+++ b/src/Avalonia.Themes.Default/ToolTip.xaml
@@ -9,8 +9,8 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
-                        Content="{TemplateBinding Content}" 
                         ContentTemplate="{TemplateBinding ContentTemplate}"
+                        Content="{TemplateBinding Content}" 
                         Padding="{TemplateBinding Padding}"/>
     </ControlTemplate>
   </Setter>
diff --git a/src/Avalonia.Themes.Default/Window.xaml b/src/Avalonia.Themes.Default/Window.xaml
index 06922addad..d19bf41c4d 100644
--- a/src/Avalonia.Themes.Default/Window.xaml
+++ b/src/Avalonia.Themes.Default/Window.xaml
@@ -7,8 +7,8 @@
       <Border Background="{TemplateBinding Background}">
         <AdornerDecorator>
           <ContentPresenter Name="PART_ContentPresenter" 
-                            Content="{TemplateBinding Content}" 
                             ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}" 
                             Margin="{TemplateBinding Padding}"/>
         </AdornerDecorator>
       </Border>

From b49a7abbd1879142d0df3f21b863a8ff2e1a8b00 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Tue, 21 Nov 2017 17:54:45 +0300
Subject: [PATCH 188/482] Fixed if clause in ProgressBar.UpdateIsIndeterminate

Found by PVS studio
---
 src/Avalonia.Controls/ProgressBar.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Avalonia.Controls/ProgressBar.cs b/src/Avalonia.Controls/ProgressBar.cs
index 0ff3a78c1f..de02c10764 100644
--- a/src/Avalonia.Controls/ProgressBar.cs
+++ b/src/Avalonia.Controls/ProgressBar.cs
@@ -112,8 +112,10 @@ namespace Avalonia.Controls
         private void UpdateIsIndeterminate(bool isIndeterminate)
         {
             if (isIndeterminate)
+            {
                 if (_indeterminateAnimation == null || _indeterminateAnimation.Disposed)
                     _indeterminateAnimation = IndeterminateAnimation.StartAnimation(this);
+            }
             else
                 _indeterminateAnimation?.Dispose();
         }

From 3eac2134e02e5c27171f21d8ac64f93e727b7459 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 21 Nov 2017 23:25:21 +0100
Subject: [PATCH 189/482] Trying previous appveyor image.

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 76d1ae3e1c..ba3680d0b9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-os: Visual Studio 2017
+os: Previous Visual Studio 2017
 platform:
 - Any CPU
 skip_branch_with_pr: true

From 6dd497bbc82bbc6e7ddb429244dd72b8b8b31817 Mon Sep 17 00:00:00 2001
From: Goldy <goldy345302@gmail.com>
Date: Wed, 22 Nov 2017 14:46:08 +0300
Subject: [PATCH 190/482] Code improvement Removed unused or duplicated code

---
 src/Avalonia.Controls/Calendar/Calendar.cs             |  2 +-
 src/Avalonia.Controls/Control.cs                       |  1 -
 .../Primitives/SelectingItemsControl.cs                |  2 +-
 src/Avalonia.Controls/TreeView.cs                      |  5 +----
 src/Avalonia.Visuals/Media/PathMarkupParser.cs         |  2 +-
 .../Rendering/SceneGraph/SceneBuilder.cs               |  2 +-
 .../Avalonia.Markup/Data/Parsers/ArgumentListParser.cs | 10 +---------
 .../Avalonia.Direct2D1/Media/DrawingContextImpl.cs     |  1 -
 8 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/Avalonia.Controls/Calendar/Calendar.cs b/src/Avalonia.Controls/Calendar/Calendar.cs
index 8c79e5dce5..59281c5ad0 100644
--- a/src/Avalonia.Controls/Calendar/Calendar.cs
+++ b/src/Avalonia.Controls/Calendar/Calendar.cs
@@ -549,7 +549,7 @@ namespace Avalonia.Controls
                         }
                         else
                         {
-                            if (addedDate.HasValue && !(SelectedDates.Count > 0 && SelectedDates[0] == addedDate.Value))
+                            if (!(SelectedDates.Count > 0 && SelectedDates[0] == addedDate.Value))
                             {
                                 foreach (DateTime item in SelectedDates)
                                 {
diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index d4777b2f8a..6e1e1a05f1 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -621,7 +621,6 @@ namespace Avalonia.Controls
             Contract.Requires<ArgumentNullException>(property != null);
             Contract.Requires<ArgumentNullException>(selector != null);
             Contract.Requires<ArgumentNullException>(className != null);
-            Contract.Requires<ArgumentNullException>(property != null);
 
             if (string.IsNullOrWhiteSpace(className))
             {
diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
index ab09a4701d..563d394919 100644
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@@ -297,7 +297,7 @@ namespace Avalonia.Controls.Primitives
                 .OfType<IControl>()
                 .FirstOrDefault(x => x.LogicalParent == this && ItemContainerGenerator?.IndexFromContainer(x) != -1);
 
-            return item as IControl;
+            return item;
         }
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Controls/TreeView.cs b/src/Avalonia.Controls/TreeView.cs
index 079e571d29..fa3ecdedef 100644
--- a/src/Avalonia.Controls/TreeView.cs
+++ b/src/Avalonia.Controls/TreeView.cs
@@ -176,10 +176,7 @@ namespace Avalonia.Controls
 
                 SelectedItem = item;
 
-                if (SelectedItem != null)
-                {
-                    MarkContainerSelected(container, true);
-                }
+                MarkContainerSelected(container, true);
             }
         }
 
diff --git a/src/Avalonia.Visuals/Media/PathMarkupParser.cs b/src/Avalonia.Visuals/Media/PathMarkupParser.cs
index fbc189546c..9e4a3cbeae 100644
--- a/src/Avalonia.Visuals/Media/PathMarkupParser.cs
+++ b/src/Avalonia.Visuals/Media/PathMarkupParser.cs
@@ -320,7 +320,7 @@ namespace Avalonia.Media
                     if (c == 'E')
                     {
                         readSign = false;
-                        readExponent = c == 'E';
+                        readExponent = true;
                     }
                 }
                 else
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
index 90ef78de37..b5ac7e4077 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
@@ -192,7 +192,7 @@ namespace Avalonia.Rendering.SceneGraph
                             UpdateLayer(node, scene.Layers[node.LayerRoot]);
                         }
                     }
-                    else if (!startLayer && node.LayerRoot == node.Visual && node.Parent != null)
+                    else if (node.LayerRoot == node.Visual && node.Parent != null)
                     {
                         ClearLayer(scene, node);
                     }
diff --git a/src/Markup/Avalonia.Markup/Data/Parsers/ArgumentListParser.cs b/src/Markup/Avalonia.Markup/Data/Parsers/ArgumentListParser.cs
index a824a38867..563b372c78 100644
--- a/src/Markup/Avalonia.Markup/Data/Parsers/ArgumentListParser.cs
+++ b/src/Markup/Avalonia.Markup/Data/Parsers/ArgumentListParser.cs
@@ -51,15 +51,7 @@ namespace Avalonia.Markup.Data.Parsers
                     }
                 }
 
-                if (!r.End)
-                {
-                    r.Take();
-                    return result;
-                }
-                else
-                {
-                    throw new ExpressionParseException(r.Position, "Expected ']'.");
-                }
+                throw new ExpressionParseException(r.Position, "Expected ']'.");
             }
 
             return null;
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
index 6a72923ce3..b1bfdcbfeb 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
@@ -54,7 +54,6 @@ namespace Avalonia.Direct2D1.Media
             _finishedCallback = finishedCallback;
             _directWriteFactory = directWriteFactory;
             _imagingFactory = imagingFactory;
-            _swapChain = swapChain;
             _renderTarget.BeginDraw();
         }
 

From d4a32764cad02f4b65a3dfa7b0d7a12137d35c1e Mon Sep 17 00:00:00 2001
From: Goldy <goldy345302@gmail.com>
Date: Wed, 22 Nov 2017 14:56:33 +0300
Subject: [PATCH 191/482] Add null check for parameter Remove unused variable

---
 src/Avalonia.Controls/VirtualizingStackPanel.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/VirtualizingStackPanel.cs b/src/Avalonia.Controls/VirtualizingStackPanel.cs
index 834f6d218b..409dd231ad 100644
--- a/src/Avalonia.Controls/VirtualizingStackPanel.cs
+++ b/src/Avalonia.Controls/VirtualizingStackPanel.cs
@@ -134,12 +134,14 @@ namespace Avalonia.Controls
 
         protected override IInputElement GetControlInDirection(NavigationDirection direction, IControl from)
         {
+            if (from == null)
+                return null;
+
             var logicalScrollable = Parent as ILogicalScrollable;
-            var fromControl = from as IControl;
 
-            if (logicalScrollable?.IsLogicalScrollEnabled == true && fromControl != null)
+            if (logicalScrollable?.IsLogicalScrollEnabled == true)
             {
-                return logicalScrollable.GetControlInDirection(direction, fromControl);
+                return logicalScrollable.GetControlInDirection(direction, from);
             }
             else
             {

From 546cbca0eff72adbfb15e962fc5ef2c8ef0258eb Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 1 Dec 2017 12:39:55 +0100
Subject: [PATCH 192/482] Added failing test for #1247.

---
 .../Primitives/PopupRootTests.cs              | 51 ++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
index 64344a1584..b3f91ce937 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
@@ -2,11 +2,13 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
+using System.Linq;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.LogicalTree;
 using Avalonia.UnitTests;
+using Avalonia.VisualTree;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests.Primitives
@@ -90,14 +92,33 @@ namespace Avalonia.Controls.UnitTests.Primitives
             }
         }
 
+        [Fact]
+        public void Clearing_Content_Of_Popup_In_ControlTemplate_Doesnt_Crash()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var target = new TemplatedControlWithPopup
+                {
+                    PopupContent = new Canvas(),
+                };
+
+                var root = new TestRoot { Child = target };
+
+                target.ApplyTemplate();
+                target.Popup.Open();
+                target.PopupContent = null;
+            }
+        }
+
         private PopupRoot CreateTarget()
         {
             var result = new PopupRoot
             {
-                Template = new FuncControlTemplate<PopupRoot>(_ =>
+                Template = new FuncControlTemplate<PopupRoot>(parent =>
                     new ContentPresenter
                     {
                         Name = "PART_ContentPresenter",
+                        [!ContentPresenter.ContentProperty] = parent[!PopupRoot.ContentProperty],
                     }),
             };
 
@@ -105,5 +126,33 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
             return result;
         }
+
+        private class TemplatedControlWithPopup : TemplatedControl
+        {
+            public static readonly AvaloniaProperty<Control> PopupContentProperty =
+                AvaloniaProperty.Register<TemplatedControlWithPopup, Control>(nameof(PopupContent));
+
+            public TemplatedControlWithPopup()
+            {
+                Template = new FuncControlTemplate<TemplatedControlWithPopup>(parent =>
+                    new Popup
+                    {
+                        [!Popup.ChildProperty] = parent[!TemplatedControlWithPopup.PopupContentProperty],
+                    });
+            }
+
+            public Popup Popup { get; private set; }
+
+            public Control PopupContent
+            {
+                get => GetValue(PopupContentProperty);
+                set => SetValue(PopupContentProperty, value);
+            }
+
+            protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+            {
+                Popup = (Popup)this.GetVisualChildren().Single();
+            }
+        }
     }
 }

From d1ebb8fc7d4360b1f10dcadeba2039e07dc22442 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 1 Dec 2017 12:43:00 +0100
Subject: [PATCH 193/482] Handle PopupRoot.Content = null.

Handle `PopupRoot.Content` being set to null.

Fixes #1247
---
 src/Avalonia.Controls/Primitives/PopupRoot.cs | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs
index a999e4ae37..00d43500c3 100644
--- a/src/Avalonia.Controls/Primitives/PopupRoot.cs
+++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs
@@ -90,20 +90,23 @@ namespace Avalonia.Controls.Primitives
 
         private void SetTemplatedParentAndApplyChildTemplates(IControl control)
         {
-            var templatedParent = Parent.TemplatedParent;
-
-            if (control.TemplatedParent == null)
+            if (control != null)
             {
-                control.SetValue(TemplatedParentProperty, templatedParent);
-            }
+                var templatedParent = Parent.TemplatedParent;
+
+                if (control.TemplatedParent == null)
+                {
+                    control.SetValue(TemplatedParentProperty, templatedParent);
+                }
 
-            control.ApplyTemplate();
+                control.ApplyTemplate();
 
-            if (!(control is IPresenter) && control.TemplatedParent == templatedParent)
-            {
-                foreach (IControl child in control.GetVisualChildren())
+                if (!(control is IPresenter) && control.TemplatedParent == templatedParent)
                 {
-                    SetTemplatedParentAndApplyChildTemplates(child);
+                    foreach (IControl child in control.GetVisualChildren())
+                    {
+                        SetTemplatedParentAndApplyChildTemplates(child);
+                    }
                 }
             }
         }

From 29a2b1d74fcc5d3162e5ccb1dfa33534ea9da364 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 1 Dec 2017 15:26:56 +0100
Subject: [PATCH 194/482] Use previous appveyor image.

https://github.com/dotnet/standard/issues/567
---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 76d1ae3e1c..ba3680d0b9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-os: Visual Studio 2017
+os: Previous Visual Studio 2017
 platform:
 - Any CPU
 skip_branch_with_pr: true

From 22baf62f096f748b00588ac46e007ae5caf22c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Fri, 1 Dec 2017 17:19:03 +0000
Subject: [PATCH 195/482] Fixed ProgressBar default alignment.

---
 src/Avalonia.Controls/ProgressBar.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Avalonia.Controls/ProgressBar.cs b/src/Avalonia.Controls/ProgressBar.cs
index de02c10764..8cf6b149cb 100644
--- a/src/Avalonia.Controls/ProgressBar.cs
+++ b/src/Avalonia.Controls/ProgressBar.cs
@@ -28,9 +28,6 @@ namespace Avalonia.Controls
         {
             ValueProperty.Changed.AddClassHandler<ProgressBar>(x => x.ValueChanged);
 
-            HorizontalAlignmentProperty.OverrideDefaultValue<ProgressBar>(HorizontalAlignment.Left);
-            VerticalAlignmentProperty.OverrideDefaultValue<ProgressBar>(VerticalAlignment.Top);
-
             IsIndeterminateProperty.Changed.AddClassHandler<ProgressBar>(
                 (p, e) => { if (p._indicator != null) p.UpdateIsIndeterminate((bool)e.NewValue); });
             OrientationProperty.Changed.AddClassHandler<ProgressBar>(

From 26b2771864834a9db1bc00852850d145999ca742 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 1 Dec 2017 18:58:20 +0100
Subject: [PATCH 196/482] Added failing test for #1297

---
 .../Primitives/TrackTests.cs                  | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/TrackTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/TrackTests.cs
index f07a5f5095..5396a43f3a 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/TrackTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/TrackTests.cs
@@ -140,5 +140,31 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.Same(thumb.Parent, target);
             Assert.Equal(new[] { thumb }, ((ILogical)target).LogicalChildren);
         }
+
+        [Fact]
+        public void Should_Not_Pass_Invalid_Arrange_Rect()
+        {
+            var thumb = new Thumb { Width = 100.873106060606 };
+            var increaseButton = new Button { Width = 10 };
+            var decreaseButton = new Button { Width = 10 };
+
+            var target = new Track
+            {
+                Height = 12,
+                Thumb = thumb,
+                IncreaseButton = increaseButton,
+                DecreaseButton = decreaseButton,
+                Orientation = Orientation.Horizontal,
+                Minimum = 0,
+                Maximum = 287,
+                Value = 287,
+                ViewportSize = 241,
+            };
+
+            target.Measure(Size.Infinity);
+
+            // #1297 was occuring here.
+            target.Arrange(new Rect(0, 0, 221, 12));
+        }
     }
 }

From 91edffd8d20ce93239c33f592793d17643593ba1 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 1 Dec 2017 18:59:12 +0100
Subject: [PATCH 197/482] Fixed #1297

Handle rounding errors when calculating increase button arrange rect.
---
 src/Avalonia.Controls/Primitives/Track.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Primitives/Track.cs b/src/Avalonia.Controls/Primitives/Track.cs
index 8c577665d5..3a16e51851 100644
--- a/src/Avalonia.Controls/Primitives/Track.cs
+++ b/src/Avalonia.Controls/Primitives/Track.cs
@@ -154,7 +154,11 @@ namespace Avalonia.Controls.Primitives
 
                 if (increaseButton != null)
                 {
-                    increaseButton.Arrange(new Rect(firstWidth + thumbWidth, 0, remaining - firstWidth, finalSize.Height));
+                    increaseButton.Arrange(new Rect(
+                        firstWidth + thumbWidth,
+                        0,
+                        Math.Max(0, remaining - firstWidth),
+                        Math.Max(0, finalSize.Height)));
                 }
             }
             else

From 299d0666424e6f00db46ee88de61237d88e17d5b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 1 Dec 2017 19:05:51 +0100
Subject: [PATCH 198/482] Make sure old adorner is removed.

Control enter/leave events seem to sometimes get raised in the wrong order, this needs investigation. However in the meantime, make sure that if there's an existing adorner it's removed before adding a new one.

Fixes #1299
---
 src/Avalonia.Diagnostics/Views/TreePage.xaml.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Avalonia.Diagnostics/Views/TreePage.xaml.cs b/src/Avalonia.Diagnostics/Views/TreePage.xaml.cs
index 7e4e5a8564..d445f1cd70 100644
--- a/src/Avalonia.Diagnostics/Views/TreePage.xaml.cs
+++ b/src/Avalonia.Diagnostics/Views/TreePage.xaml.cs
@@ -27,6 +27,12 @@ namespace Avalonia.Diagnostics.Views
 
             if (layer != null)
             {
+                if (_adorner != null)
+                {
+                    ((Panel)_adorner.Parent).Children.Remove(_adorner);
+                    _adorner = null;
+                }
+
                 _adorner = new Rectangle
                 {
                     Fill = new SolidColorBrush(0x80a0c5e8),

From fc7a83ee720dcbbf6590c7897404fba5b8331fde Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 2 Dec 2017 00:30:30 +0100
Subject: [PATCH 199/482] Fixed panel collection change actions.

As suggested in #1286
---
 .../Collections/IAvaloniaList.cs              | 15 +++++
 src/Avalonia.Controls/Panel.cs                | 11 ++--
 src/Avalonia.Visuals/Visual.cs                | 13 ++++
 .../Avalonia.Controls.UnitTests/PanelTests.cs | 63 ++++++++++++++++---
 4 files changed, 87 insertions(+), 15 deletions(-)

diff --git a/src/Avalonia.Base/Collections/IAvaloniaList.cs b/src/Avalonia.Base/Collections/IAvaloniaList.cs
index 0233cee7a9..48c36976a5 100644
--- a/src/Avalonia.Base/Collections/IAvaloniaList.cs
+++ b/src/Avalonia.Base/Collections/IAvaloniaList.cs
@@ -36,6 +36,21 @@ namespace Avalonia.Collections
         /// <param name="items">The items.</param>
         void InsertRange(int index, IEnumerable<T> items);
 
+        /// <summary>
+        /// Moves an item to a new index.
+        /// </summary>
+        /// <param name="oldIndex">The index of the item to move.</param>
+        /// <param name="newIndex">The index to move the item to.</param>
+        void Move(int oldIndex, int newIndex);
+
+        /// <summary>
+        /// Moves multiple items to a new index.
+        /// </summary>
+        /// <param name="oldIndex">The first index of the items to move.</param>
+        /// <param name="count">The number of items to move.</param>
+        /// <param name="newIndex">The index to move the items to.</param>
+        void MoveRange(int oldIndex, int count, int newIndex);
+
         /// <summary>
         /// Removes multiple items from the collection.
         /// </summary>
diff --git a/src/Avalonia.Controls/Panel.cs b/src/Avalonia.Controls/Panel.cs
index 3272d3779b..6448f11491 100644
--- a/src/Avalonia.Controls/Panel.cs
+++ b/src/Avalonia.Controls/Panel.cs
@@ -115,6 +115,11 @@ namespace Avalonia.Controls
                     VisualChildren.AddRange(e.NewItems.OfType<Visual>());
                     break;
 
+                case NotifyCollectionChangedAction.Move:
+                    LogicalChildren.MoveRange(e.OldStartingIndex, e.OldItems.Count, e.NewStartingIndex);
+                    VisualChildren.MoveRange(e.OldStartingIndex, e.OldItems.Count, e.NewStartingIndex);
+                    break;
+
                 case NotifyCollectionChangedAction.Remove:
                     controls = e.OldItems.OfType<Control>().ToList();
                     LogicalChildren.RemoveAll(controls);
@@ -132,11 +137,7 @@ namespace Avalonia.Controls
                     break;
 
                 case NotifyCollectionChangedAction.Reset:
-                    controls = e.OldItems.OfType<Control>().ToList();
-                    LogicalChildren.Clear();
-                    VisualChildren.Clear();
-                    VisualChildren.AddRange(_children);
-                    break;
+                    throw new NotSupportedException();
             }
 
             InvalidateMeasure();
diff --git a/src/Avalonia.Visuals/Visual.cs b/src/Avalonia.Visuals/Visual.cs
index bc65d4f69f..3662fe50be 100644
--- a/src/Avalonia.Visuals/Visual.cs
+++ b/src/Avalonia.Visuals/Visual.cs
@@ -537,6 +537,19 @@ namespace Avalonia
                         v.SetVisualParent(null);
                     }
 
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    foreach (Visual v in e.OldItems)
+                    {
+                        v.SetVisualParent(null);
+                    }
+
+                    foreach (Visual v in e.NewItems)
+                    {
+                        v.SetVisualParent(this);
+                    }
+
                     break;
             }
         }
diff --git a/tests/Avalonia.Controls.UnitTests/PanelTests.cs b/tests/Avalonia.Controls.UnitTests/PanelTests.cs
index fb1ae3ba1a..29acdaa8d4 100644
--- a/tests/Avalonia.Controls.UnitTests/PanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/PanelTests.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using Avalonia.Collections;
 using Avalonia.LogicalTree;
+using Avalonia.VisualTree;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
@@ -18,8 +19,9 @@ namespace Avalonia.Controls.UnitTests
 
             panel.Children.Add(child);
 
-            Assert.Equal(child.Parent, panel);
-            Assert.Equal(child.GetLogicalParent(), panel);
+            Assert.Same(child.Parent, panel);
+            Assert.Same(child.GetLogicalParent(), panel);
+            Assert.Same(child.GetVisualParent(), panel);
         }
 
         [Fact]
@@ -45,6 +47,7 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Null(child.Parent);
             Assert.Null(child.GetLogicalParent());
+            Assert.Null(child.GetVisualParent());
         }
 
         [Fact]
@@ -60,8 +63,10 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Null(child1.Parent);
             Assert.Null(child1.GetLogicalParent());
+            Assert.Null(child1.GetVisualParent());
             Assert.Null(child2.Parent);
             Assert.Null(child2.GetLogicalParent());
+            Assert.Null(child2.GetVisualParent());
         }
 
         [Fact]
@@ -77,24 +82,32 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Null(child1.Parent);
             Assert.Null(child1.GetLogicalParent());
+            Assert.Null(child1.GetVisualParent());
             Assert.Null(child2.Parent);
             Assert.Null(child2.GetLogicalParent());
+            Assert.Null(child2.GetVisualParent());
         }
 
         [Fact]
-        public void Setting_Children_Should_Make_Controls_Appear_In_Panel_Children()
+        public void Replacing_Panel_Children_Should_Clear_And_Set_Control_Parent()
         {
             var panel = new Panel();
-            var child = new Control();
+            var child1 = new Control();
+            var child2 = new Control();
 
-            panel.Children = new Controls { child };
+            panel.Children.Add(child1);
+            panel.Children[0] = child2;
 
-            Assert.Equal(new[] { child }, panel.Children);
-            Assert.Equal(new[] { child }, panel.GetLogicalChildren());
+            Assert.Null(child1.Parent);
+            Assert.Null(child1.GetLogicalParent());
+            Assert.Null(child1.GetVisualParent());
+            Assert.Same(child2.Parent, panel);
+            Assert.Same(child2.GetLogicalParent(), panel);
+            Assert.Same(child2.GetVisualParent(), panel);
         }
 
         [Fact]
-        public void Child_Control_Should_Appear_In_Panel_Children()
+        public void Child_Control_Should_Appear_In_Panel_Logical_And_Visual_Children()
         {
             var panel = new Panel();
             var child = new Control();
@@ -103,10 +116,11 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Equal(new[] { child }, panel.Children);
             Assert.Equal(new[] { child }, panel.GetLogicalChildren());
+            Assert.Equal(new[] { child }, panel.GetVisualChildren());
         }
 
         [Fact]
-        public void Removing_Child_Control_Should_Remove_From_Panel_Children()
+        public void Removing_Child_Control_Should_Remove_From_Panel_Logical_And_Visual_Children()
         {
             var panel = new Panel();
             var child = new Control();
@@ -115,7 +129,36 @@ namespace Avalonia.Controls.UnitTests
             panel.Children.Remove(child);
 
             Assert.Equal(new Control[0], panel.Children);
-            Assert.Equal(new ILogical[0], panel.GetLogicalChildren());
+            Assert.Empty(panel.GetLogicalChildren());
+            Assert.Empty(panel.GetVisualChildren());
+        }
+
+        [Fact]
+        public void Moving_Panel_Children_Should_Reoder_Logical_And_Visual_Children()
+        {
+            var panel = new Panel();
+            var child1 = new Control();
+            var child2 = new Control();
+
+            panel.Children.Add(child1);
+            panel.Children.Add(child2);
+            panel.Children.Move(1, 0);
+
+            Assert.Equal(new[] { child2, child1 }, panel.GetLogicalChildren());
+            Assert.Equal(new[] { child2, child1 }, panel.GetVisualChildren());
+        }
+
+        [Fact]
+        public void Setting_Children_Should_Make_Controls_Appear_In_Logical_And_Visual_Children()
+        {
+            var panel = new Panel();
+            var child = new Control();
+
+            panel.Children = new Controls { child };
+
+            Assert.Equal(new[] { child }, panel.Children);
+            Assert.Equal(new[] { child }, panel.GetLogicalChildren());
+            Assert.Equal(new[] { child }, panel.GetVisualChildren());
         }
     }
 }

From b40be8b1c4f02ac9d87de473d70ae0f06951d4b8 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 2 Dec 2017 11:12:11 +0100
Subject: [PATCH 200/482] Fix error in AvaloniaList.MoveRange event.

It was raising the event with the offset `newIndex` rather than the `newIndex` that was passed.
---
 src/Avalonia.Base/Collections/AvaloniaList.cs |  5 +++--
 .../Collections/AvaloniaListTests.cs          | 22 +++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Base/Collections/AvaloniaList.cs b/src/Avalonia.Base/Collections/AvaloniaList.cs
index a3c3015a38..41c2ad6e54 100644
--- a/src/Avalonia.Base/Collections/AvaloniaList.cs
+++ b/src/Avalonia.Base/Collections/AvaloniaList.cs
@@ -350,14 +350,15 @@ namespace Avalonia.Collections
         public void MoveRange(int oldIndex, int count, int newIndex)
         {
             var items = _inner.GetRange(oldIndex, count);
+            var modifiedNewIndex = newIndex;
             _inner.RemoveRange(oldIndex, count);
 
             if (newIndex > oldIndex)
             {
-                newIndex -= count;
+                modifiedNewIndex -= count;
             }
 
-            _inner.InsertRange(newIndex, items);
+            _inner.InsertRange(modifiedNewIndex, items);
 
             if (_collectionChanged != null)
             {
diff --git a/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListTests.cs b/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListTests.cs
index 587816b07b..fd731455d8 100644
--- a/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListTests.cs
@@ -83,6 +83,28 @@ namespace Avalonia.Base.UnitTests.Collections
             Assert.Equal(new[] { 6, 7, 8, 9, 10, 1, 2, 3, 4, 5 }, target);
         }
 
+        [Fact]
+        public void MoveRange_Raises_Correct_CollectionChanged_Event()
+        {
+            var target = new AvaloniaList<int>(new[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
+            var raised = false;
+
+            target.CollectionChanged += (s, e) =>
+            {
+                Assert.Equal(NotifyCollectionChangedAction.Move, e.Action);
+                Assert.Equal(0, e.OldStartingIndex);
+                Assert.Equal(10, e.NewStartingIndex);
+                Assert.Equal(new[] { 1, 2, 3, 4, 5, 6, 7, 8, 9 }, e.OldItems);
+                Assert.Equal(new[] { 1, 2, 3, 4, 5, 6, 7, 8, 9 }, e.NewItems);
+                raised = true;
+            };
+
+            target.MoveRange(0, 9, 10);
+
+            Assert.True(raised);
+            Assert.Equal(new[] { 10, 1, 2, 3, 4, 5, 6, 7, 8, 9 }, target);
+        }
+
         [Fact]
         public void Adding_Item_Should_Raise_CollectionChanged()
         {

From 3243e0fd158769e84656d63caa085e0aba9f4d75 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 2 Dec 2017 12:04:55 +0100
Subject: [PATCH 201/482] Added failing test for #1303

`TemplateBinding_With_Null_Path_Works` is a failing test for #1303, also added a passing test for the same thing with `Binding`: `Binding_With_Null_Path_Works`.
---
 .../Data/BindingTests.cs                      | 23 +++++++++++++
 .../Data/BindingTests_TemplatedParent.cs      | 32 +++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
index 230e61f300..9a08073920 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
@@ -13,6 +13,7 @@ using Moq;
 using Xunit;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
+using Avalonia.UnitTests;
 
 namespace Avalonia.Markup.Xaml.UnitTests.Data
 {
@@ -337,6 +338,28 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
             Assert.Equal("foo", target.Content);
         }
 
+        [Fact]
+        public void Binding_With_Null_Path_Works()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <TextBlock Name='textBlock' Text='{Binding}'/>
+</Window>";
+                var loader = new AvaloniaXamlLoader();
+                var window = (Window)loader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                window.DataContext = "foo";
+                window.ApplyTemplate();
+
+                Assert.Equal("foo", textBlock.Text);
+            }
+        }
+
         private class TwoWayBindingTest : Control
         {
             public static readonly StyledProperty<string> TwoWayProperty =
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs
index 197afe46ee..ccb13039f1 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs
@@ -11,6 +11,9 @@ using Avalonia.Markup.Xaml.Data;
 using Avalonia.Styling;
 using Xunit;
 using System.Reactive.Disposables;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using System.Linq;
 
 namespace Avalonia.Markup.Xaml.UnitTests.Data
 {
@@ -56,6 +59,35 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
                 BindingPriority.TemplatedParent));
         }
 
+        [Fact]
+        public void TemplateBinding_With_Null_Path_Works()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <Button Name='button'>
+       <Button.Template>
+         <ControlTemplate>
+           <TextBlock Text='{TemplateBinding}'/>
+         </ControlTemplate>
+       </Button.Template>
+    </Button>
+</Window>";
+                var loader = new AvaloniaXamlLoader();
+                var window = (Window)loader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+
+                window.ApplyTemplate();
+                button.ApplyTemplate();
+
+                var textBlock = (TextBlock)button.GetVisualChildren().Single();
+                Assert.Equal("Avalonia.Controls.Button", textBlock.Text);
+            }
+        }
+
         private Mock<IControl> CreateTarget(
             ITemplatedControl templatedParent = null,
             string text = null)

From 0ad1f87927cc477d482bc5b3098c2c26f023b043 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 2 Dec 2017 12:05:46 +0100
Subject: [PATCH 202/482] Fix #1303.

Don't pass a null `Path` to `Binding`.
---
 .../MarkupExtensions/TemplateBindingExtension.cs                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/TemplateBindingExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/TemplateBindingExtension.cs
index 4664947b8e..c5fe83977f 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/TemplateBindingExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/TemplateBindingExtension.cs
@@ -29,7 +29,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
                 ElementName = ElementName,
                 Mode = Mode,
                 RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
-                Path = Path,
+                Path = Path ?? string.Empty,
                 Priority = Priority,
             };
         }

From f014bd576c6f97e1ea93880b13dca8f0f694c151 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 2 Dec 2017 13:05:42 +0100
Subject: [PATCH 203/482] Pass enableDataValidation to all bindings.

#1248 was caused by not passing the `enableDataValidation` setting to all types of binding. Fix this.

Fixes #1248.
---
 .../Avalonia.Markup.Xaml/Data/Binding.cs      | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
index 8ba637de50..7f750144df 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
@@ -104,7 +104,8 @@ namespace Avalonia.Markup.Xaml.Data
                 observer = CreateElementObserver(
                     (target as IControl) ?? (anchor as IControl),
                     ElementName,
-                    Path);
+                    Path,
+                    enableDataValidation);
             }
             else if (Source != null)
             {
@@ -125,7 +126,7 @@ namespace Avalonia.Markup.Xaml.Data
             }
             else if (RelativeSource.Mode == RelativeSourceMode.TemplatedParent)
             {
-                observer = CreateTemplatedParentObserver(target, Path);
+                observer = CreateTemplatedParentObserver(target, Path, enableDataValidation);
             }
             else if (RelativeSource.Mode == RelativeSourceMode.FindAncestor)
             {
@@ -137,7 +138,8 @@ namespace Avalonia.Markup.Xaml.Data
                 observer = CreateFindAncestorObserver(
                     (target as IControl) ?? (anchor as IControl),
                     RelativeSource,
-                    Path);
+                    Path,
+                    enableDataValidation);
             }
             else
             {
@@ -207,7 +209,11 @@ namespace Avalonia.Markup.Xaml.Data
             }
         }
 
-        private ExpressionObserver CreateElementObserver(IControl target, string elementName, string path)
+        private ExpressionObserver CreateElementObserver(
+            IControl target,
+            string elementName,
+            string path,
+            bool enableDataValidation)
         {
             Contract.Requires<ArgumentNullException>(target != null);
 
@@ -215,7 +221,7 @@ namespace Avalonia.Markup.Xaml.Data
             var result = new ExpressionObserver(
                 ControlLocator.Track(target, elementName),
                 path,
-                false,
+                enableDataValidation,
                 description);
             return result;
         }
@@ -223,28 +229,31 @@ namespace Avalonia.Markup.Xaml.Data
         private ExpressionObserver CreateFindAncestorObserver(
             IControl target,
             RelativeSource relativeSource,
-            string path)
+            string path,
+            bool enableDataValidation)
         {
             Contract.Requires<ArgumentNullException>(target != null);
 
             return new ExpressionObserver(
                 ControlLocator.Track(target, relativeSource.Tree, relativeSource.AncestorLevel - 1, relativeSource.AncestorType),
-                path);
+                path,
+                enableDataValidation);
         }
 
         private ExpressionObserver CreateSourceObserver(
             object source,
             string path,
-            bool enabledDataValidation)
+            bool enableDataValidation)
         {
             Contract.Requires<ArgumentNullException>(source != null);
 
-            return new ExpressionObserver(source, path, enabledDataValidation);
+            return new ExpressionObserver(source, path, enableDataValidation);
         }
 
         private ExpressionObserver CreateTemplatedParentObserver(
             IAvaloniaObject target,
-            string path)
+            string path,
+            bool enableDataValidation)
         {
             Contract.Requires<ArgumentNullException>(target != null);
 
@@ -255,7 +264,8 @@ namespace Avalonia.Markup.Xaml.Data
             var result = new ExpressionObserver(
                 () => target.GetValue(Control.TemplatedParentProperty),
                 path,
-                update);
+                update,
+                enableDataValidation);
 
             return result;
         }

From 409e40c8becdbeaf84c4de5223588cc91ae4c85b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 3 Dec 2017 19:14:29 +0100
Subject: [PATCH 204/482] Added AvaloniaObject.IsAnimating(property).

Added a method to test whether a property on an object is currently animating.
---
 src/Avalonia.Base/AvaloniaObject.cs           | 13 ++++++
 src/Avalonia.Base/IAvaloniaObject.cs          |  7 ++++
 src/Avalonia.Base/PriorityValue.cs            |  2 +
 .../AvaloniaObjectTests_Binding.cs            | 40 +++++++++++++++++++
 .../DirectPropertyTests.cs                    | 12 ++++++
 .../SelectorTests_Child.cs                    |  5 +++
 .../SelectorTests_Descendent.cs               |  5 +++
 .../TestControlBase.cs                        |  5 +++
 .../TestTemplatedControl.cs                   |  5 +++
 9 files changed, 94 insertions(+)

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index efcbb57244..8b93cf2fb1 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -225,6 +225,19 @@ namespace Avalonia
             return (T)GetValue((AvaloniaProperty)property);
         }
 
+        /// <summary>
+        /// Checks whether a <see cref="AvaloniaProperty"/> is animating.
+        /// </summary>
+        /// <param name="property">The property.</param>
+        /// <returns>True if the property is animating, otherwise false.</returns>
+        public bool IsAnimating(AvaloniaProperty property)
+        {
+            Contract.Requires<ArgumentNullException>(property != null);
+            VerifyAccess();
+
+            return _values.TryGetValue(property, out PriorityValue value) ? value.IsAnimating : false;
+        }
+
         /// <summary>
         /// Checks whether a <see cref="AvaloniaProperty"/> is set on this object.
         /// </summary>
diff --git a/src/Avalonia.Base/IAvaloniaObject.cs b/src/Avalonia.Base/IAvaloniaObject.cs
index c11bab2236..c11f8ada7e 100644
--- a/src/Avalonia.Base/IAvaloniaObject.cs
+++ b/src/Avalonia.Base/IAvaloniaObject.cs
@@ -31,6 +31,13 @@ namespace Avalonia
         /// <returns>The value.</returns>
         T GetValue<T>(AvaloniaProperty<T> property);
 
+        /// <summary>
+        /// Checks whether a <see cref="AvaloniaProperty"/> is animating.
+        /// </summary>
+        /// <param name="property">The property.</param>
+        /// <returns>True if the property is animating, otherwise false.</returns>
+        bool IsAnimating(AvaloniaProperty property);
+
         /// <summary>
         /// Checks whether a <see cref="AvaloniaProperty"/> is set on this object.
         /// </summary>
diff --git a/src/Avalonia.Base/PriorityValue.cs b/src/Avalonia.Base/PriorityValue.cs
index 3726fb7ae5..e1b62c030c 100644
--- a/src/Avalonia.Base/PriorityValue.cs
+++ b/src/Avalonia.Base/PriorityValue.cs
@@ -52,6 +52,8 @@ namespace Avalonia
             _validate = validate;
         }
 
+        public bool IsAnimating => ValuePriority < 0 && GetLevel(ValuePriority).ActiveBindingIndex != -1;
+
         /// <summary>
         /// Gets the owner of the value.
         /// </summary>
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
index 4d6559a078..cd77d9cc88 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
@@ -387,6 +387,46 @@ namespace Avalonia.Base.UnitTests
             }
         }
 
+        [Fact]
+        public void IsAnimating_On_Property_With_No_Value_Returns_False()
+        {
+            var target = new Class1();
+
+            Assert.False(target.IsAnimating(Class1.FooProperty));
+        }
+
+        [Fact]
+        public void IsAnimating_On_Property_With_Animation_Value_Returns_False()
+        {
+            var target = new Class1();
+
+            target.SetValue(Class1.FooProperty, "foo", BindingPriority.Animation);
+
+            Assert.False(target.IsAnimating(Class1.FooProperty));
+        }
+
+        [Fact]
+        public void IsAnimating_On_Property_With_Non_Animation_Binding_Returns_False()
+        {
+            var target = new Class1();
+            var source = new Subject<string>();
+
+            target.Bind(Class1.FooProperty, source, BindingPriority.LocalValue);
+
+            Assert.False(target.IsAnimating(Class1.FooProperty));
+        }
+
+        [Fact]
+        public void IsAnimating_On_Property_With_Animation_Binding_Returns_True()
+        {
+            var target = new Class1();
+            var source = new BehaviorSubject<string>("foo");
+
+            target.Bind(Class1.FooProperty, source, BindingPriority.Animation);
+
+            Assert.True(target.IsAnimating(Class1.FooProperty));
+        }
+
         /// <summary>
         /// Returns an observable that returns a single value but does not complete.
         /// </summary>
diff --git a/tests/Avalonia.Base.UnitTests/DirectPropertyTests.cs b/tests/Avalonia.Base.UnitTests/DirectPropertyTests.cs
index 3a37585dc0..84ff492512 100644
--- a/tests/Avalonia.Base.UnitTests/DirectPropertyTests.cs
+++ b/tests/Avalonia.Base.UnitTests/DirectPropertyTests.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
+using System.Reactive.Subjects;
 using Avalonia.Data;
 using Xunit;
 
@@ -70,6 +71,17 @@ namespace Avalonia.Base.UnitTests
             Assert.Same(p1.Initialized, p2.Initialized);
         }
 
+        [Fact]
+        public void IsAnimating_On_DirectProperty_With_Binding_Returns_False()
+        {
+            var target = new Class1();
+            var source = new BehaviorSubject<string>("foo");
+
+            target.Bind(Class1.FooProperty, source, BindingPriority.Animation);
+
+            Assert.False(target.IsAnimating(Class1.FooProperty));
+        }
+
         private class Class1 : AvaloniaObject
         {
             public static readonly DirectProperty<Class1, string> FooProperty =
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Child.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Child.cs
index 352efe5358..d837f2cb2f 100644
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Child.cs
+++ b/tests/Avalonia.Styling.UnitTests/SelectorTests_Child.cs
@@ -135,6 +135,11 @@ namespace Avalonia.Styling.UnitTests
                 throw new NotImplementedException();
             }
 
+            public bool IsAnimating(AvaloniaProperty property)
+            {
+                throw new NotImplementedException();
+            }
+
             public bool IsSet(AvaloniaProperty property)
             {
                 throw new NotImplementedException();
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Descendent.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Descendent.cs
index c413904c8f..b75b59c212 100644
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Descendent.cs
+++ b/tests/Avalonia.Styling.UnitTests/SelectorTests_Descendent.cs
@@ -165,6 +165,11 @@ namespace Avalonia.Styling.UnitTests
                 throw new NotImplementedException();
             }
 
+            public bool IsAnimating(AvaloniaProperty property)
+            {
+                throw new NotImplementedException();
+            }
+
             public bool IsSet(AvaloniaProperty property)
             {
                 throw new NotImplementedException();
diff --git a/tests/Avalonia.Styling.UnitTests/TestControlBase.cs b/tests/Avalonia.Styling.UnitTests/TestControlBase.cs
index f57ac836fb..82be755a39 100644
--- a/tests/Avalonia.Styling.UnitTests/TestControlBase.cs
+++ b/tests/Avalonia.Styling.UnitTests/TestControlBase.cs
@@ -59,6 +59,11 @@ namespace Avalonia.Styling.UnitTests
             throw new NotImplementedException();
         }
 
+        public bool IsAnimating(AvaloniaProperty property)
+        {
+            throw new NotImplementedException();
+        }
+
         public bool IsSet(AvaloniaProperty property)
         {
             throw new NotImplementedException();
diff --git a/tests/Avalonia.Styling.UnitTests/TestTemplatedControl.cs b/tests/Avalonia.Styling.UnitTests/TestTemplatedControl.cs
index 07a988f410..03b2f03bf2 100644
--- a/tests/Avalonia.Styling.UnitTests/TestTemplatedControl.cs
+++ b/tests/Avalonia.Styling.UnitTests/TestTemplatedControl.cs
@@ -67,6 +67,11 @@ namespace Avalonia.Styling.UnitTests
             throw new NotImplementedException();
         }
 
+        public bool IsAnimating(AvaloniaProperty property)
+        {
+            throw new NotImplementedException();
+        }
+
         public bool IsSet(AvaloniaProperty property)
         {
             throw new NotImplementedException();

From 05575f9ea843fffa0980acc12a752ec408c17677 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 3 Dec 2017 22:08:55 +0100
Subject: [PATCH 205/482] Display # of layers next to FPS counter.

---
 .../Rendering/DeferredRenderer.cs               |  1 +
 .../Rendering/ImmediateRenderer.cs              |  2 +-
 src/Avalonia.Visuals/Rendering/RendererBase.cs  | 17 +++++++++++------
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index f7befa646a..599b224b63 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -354,6 +354,7 @@ namespace Avalonia.Rendering
             if (DrawFps)
             {
                 RenderFps(context, clientRect, true);
+                RenderFps(context, clientRect, scene.Layers.Count);
             }
         }
 
diff --git a/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs b/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
index 2d5a864089..84313f0906 100644
--- a/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
@@ -69,7 +69,7 @@ namespace Avalonia.Rendering
 
                     if (DrawFps)
                     {
-                        RenderFps(context.PlatformImpl, _root.Bounds, true);
+                        RenderFps(context.PlatformImpl, _root.Bounds, null);
                     }
                 }
             }
diff --git a/src/Avalonia.Visuals/Rendering/RendererBase.cs b/src/Avalonia.Visuals/Rendering/RendererBase.cs
index 707b31998a..eac362e997 100644
--- a/src/Avalonia.Visuals/Rendering/RendererBase.cs
+++ b/src/Avalonia.Visuals/Rendering/RendererBase.cs
@@ -22,15 +22,12 @@ namespace Avalonia.Rendering
             };
         }
 
-        protected void RenderFps(IDrawingContextImpl context, Rect clientRect, bool incrementFrameCount)
+        protected void RenderFps(IDrawingContextImpl context, Rect clientRect, int? layerCount)
         {
             var now = _stopwatch.Elapsed;
             var elapsed = now - _lastFpsUpdate;
 
-            if (incrementFrameCount)
-            {
-                ++_framesThisSecond;
-            }
+            ++_framesThisSecond;
 
             if (elapsed.TotalSeconds > 1)
             {
@@ -39,7 +36,15 @@ namespace Avalonia.Rendering
                 _lastFpsUpdate = now;
             }
 
-            _fpsText.Text = string.Format("FPS: {0:000}", _fps);
+            if (layerCount.HasValue)
+            {
+                _fpsText.Text = string.Format("Layers: {0} FPS: {1:000}", layerCount, _fps);
+            }
+            else
+            {
+                _fpsText.Text = string.Format("FPS: {0:000}", _fps);
+            }
+
             var size = _fpsText.Measure();
             var rect = new Rect(clientRect.Right - size.Width, 0, size.Width, size.Height);
 

From 68bdbca8992ee35d9aa482a69fe24504cf1c1f88 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 3 Dec 2017 22:09:12 +0100
Subject: [PATCH 206/482] Only create render layers when Opacity is animating.

Previously we were creating a new render layer for all controls with `Opacity != 1`. This was causing the `Calendar` page in ControlCatalog to render _really_ slowly. Instead, only create a new render layer when `Opacity` is being animated.

Also don't even render controls where `Opacity == 0`.
---
 .../Rendering/DeferredRenderer.cs             |   3 +-
 .../Rendering/SceneGraph/SceneBuilder.cs      |   2 +-
 .../Rendering/SceneGraph/VisualNode.cs        |  10 ++
 .../Rendering/DeferredRendererTests.cs        |  98 ++++++++++++++++-
 .../Rendering/SceneGraph/SceneBuilderTests.cs |   6 +-
 .../SceneGraph/SceneBuilderTests_Layers.cs    | 100 ++++--------------
 6 files changed, 131 insertions(+), 88 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index 599b224b63..cba09297f3 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -235,7 +235,7 @@ namespace Avalonia.Rendering
             {
                 clipBounds = node.ClipBounds.Intersect(clipBounds);
 
-                if (!clipBounds.IsEmpty)
+                if (!clipBounds.IsEmpty && node.Opacity > 0)
                 {
                     node.BeginRender(context);
 
@@ -353,7 +353,6 @@ namespace Avalonia.Rendering
 
             if (DrawFps)
             {
-                RenderFps(context, clientRect, true);
                 RenderFps(context, clientRect, scene.Layers.Count);
             }
         }
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
index b5ac7e4077..6c92ff022c 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
@@ -167,7 +167,7 @@ namespace Avalonia.Rendering.SceneGraph
                 using (context.PushPostTransform(m))
                 using (context.PushTransformContainer())
                 {
-                    var startLayer = opacity < 1 || visual.OpacityMask != null;
+                    var startLayer = (visual as IAvaloniaObject)?.IsAnimating(Visual.OpacityProperty) ?? false;
                     var clipBounds = bounds.TransformToAABB(contextImpl.Transform).Intersect(clip);
 
                     forceRecurse = forceRecurse ||
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
index dd5740e4a9..ea3b07ffe3 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
@@ -226,6 +226,11 @@ namespace Avalonia.Rendering.SceneGraph
                 context.PushClip(ClipBounds);
             }
 
+            if (Opacity != 1)
+            {
+                context.PushOpacity(Opacity);
+            }
+
             context.Transform = Transform;
 
             if (GeometryClip != null)
@@ -242,6 +247,11 @@ namespace Avalonia.Rendering.SceneGraph
                 context.PopGeometryClip();
             }
 
+            if (Opacity != 1)
+            {
+                context.PopOpacity();
+            }
+
             if (ClipToBounds)
             {
                 context.PopClip();
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
index cec95d4807..9d90ae23af 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive.Subjects;
 using Avalonia.Controls;
+using Avalonia.Data;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Rendering;
@@ -126,6 +128,94 @@ namespace Avalonia.Visuals.UnitTests.Rendering
             Assert.Equal(new List<IVisual> { root, decorator, border, canvas }, result);
         }
 
+        [Fact]
+        public void Should_Push_Opacity_For_Controls_With_Less_Than_1_Opacity()
+        {
+            var root = new TestRoot
+            {
+                Width = 100,
+                Height = 100,
+                Child = new Border
+                {
+                    Background = Brushes.Red,
+                    Opacity = 0.5,
+                }
+            };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(root.DesiredSize));
+
+            var rootLayer = CreateLayer();
+            var borderLayer = CreateLayer();
+            var renderTargetContext = Mock.Get(root.CreateRenderTarget().CreateDrawingContext(null));
+            renderTargetContext.SetupSequence(x => x.CreateLayer(It.IsAny<Size>()))
+                .Returns(rootLayer)
+                .Returns(borderLayer);
+
+            var loop = new Mock<IRenderLoop>();
+            var target = new DeferredRenderer(
+                root,
+                loop.Object,
+                dispatcher: new ImmediateDispatcher());
+            root.Renderer = target;
+
+            target.Start();
+            RunFrame(loop);
+
+            var context = Mock.Get(rootLayer.CreateDrawingContext(null));
+            var animation = new BehaviorSubject<double>(0.5);
+
+            context.Verify(x => x.PushOpacity(0.5), Times.Once);
+            context.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
+            context.Verify(x => x.PopOpacity(), Times.Once);
+        }
+
+        [Fact]
+        public void Should_Not_Draw_Controls_With_0_Opacity()
+        {
+            var root = new TestRoot
+            {
+                Width = 100,
+                Height = 100,
+                Child = new Border
+                {
+                    Background = Brushes.Red,
+                    Opacity = 0,
+                    Child = new Border
+                    {
+                        Background = Brushes.Green,
+                    }
+                }
+            };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(root.DesiredSize));
+
+            var rootLayer = CreateLayer();
+            var borderLayer = CreateLayer();
+            var renderTargetContext = Mock.Get(root.CreateRenderTarget().CreateDrawingContext(null));
+            renderTargetContext.SetupSequence(x => x.CreateLayer(It.IsAny<Size>()))
+                .Returns(rootLayer)
+                .Returns(borderLayer);
+
+            var loop = new Mock<IRenderLoop>();
+            var target = new DeferredRenderer(
+                root,
+                loop.Object,
+                dispatcher: new ImmediateDispatcher());
+            root.Renderer = target;
+
+            target.Start();
+            RunFrame(loop);
+
+            var context = Mock.Get(rootLayer.CreateDrawingContext(null));
+            var animation = new BehaviorSubject<double>(0.5);
+
+            context.Verify(x => x.PushOpacity(0.5), Times.Never);
+            context.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Never);
+            context.Verify(x => x.PopOpacity(), Times.Never);
+        }
+
         [Fact]
         public void Frame_Should_Create_Layer_For_Root()
         {
@@ -148,7 +238,6 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root,
                 loop.Object,
                 sceneBuilder: sceneBuilder.Object,
-                //layerFactory: layers.Object,
                 dispatcher: dispatcher);
 
             target.Start();
@@ -159,7 +248,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
         }
 
         [Fact]
-        public void Should_Create_And_Delete_Layers_For_Transparent_Controls()
+        public void Should_Create_And_Delete_Layers_For_Controls_With_Animated_Opacity()
         {
             Border border;
             var root = new TestRoot
@@ -198,6 +287,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
 
             var rootContext = Mock.Get(rootLayer.CreateDrawingContext(null));
             var borderContext = Mock.Get(borderLayer.CreateDrawingContext(null));
+            var animation = new BehaviorSubject<double>(0.5);
 
             rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
             rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once);
@@ -205,7 +295,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
 
             rootContext.ResetCalls();
             borderContext.ResetCalls();
-            border.Opacity = 0.5;
+            border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
             RunFrame(loop);
 
             rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
@@ -214,7 +304,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
 
             rootContext.ResetCalls();
             borderContext.ResetCalls();
-            border.Opacity = 1;
+            animation.OnCompleted();
             RunFrame(loop);
 
             Mock.Get(borderLayer).Verify(x => x.Dispose());
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
index d0f7671956..44b9ebe8ce 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
@@ -9,6 +9,8 @@ using Xunit;
 using Avalonia.Layout;
 using Moq;
 using Avalonia.Platform;
+using System.Reactive.Subjects;
+using Avalonia.Data;
 
 namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
 {
@@ -620,13 +622,15 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                         Margin = new Thickness(0, 10, 0, 0),
                         Child = border = new Border
                         {
-                            Opacity = 0.5,
                             Background = Brushes.Red,
                             Child = canvas = new Canvas(),
                         }
                     }
                 };
 
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
                 var scene = new Scene(tree);
                 var sceneBuilder = new SceneBuilder();
                 sceneBuilder.UpdateAll(scene);
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
index ed74f12075..10372c7d8c 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
@@ -7,14 +7,15 @@ using Avalonia.UnitTests;
 using Avalonia.VisualTree;
 using Xunit;
 using Avalonia.Layout;
-using Avalonia.Rendering;
+using System.Reactive.Subjects;
+using Avalonia.Data;
 
 namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
 {
     public partial class SceneBuilderTests
     {
         [Fact]
-        public void Control_With_Transparency_Should_Start_New_Layer()
+        public void Control_With_Animated_Opacity_Should_Start_New_Layer()
         {
             using (TestApplication())
             {
@@ -31,7 +32,6 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                         Padding = new Thickness(11),
                         Child = border = new Border
                         {
-                            Opacity = 0.5,
                             Background = Brushes.Red,
                             Padding = new Thickness(12),
                             Child = canvas = new Canvas(),
@@ -42,6 +42,9 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 var layout = AvaloniaLocator.Current.GetService<ILayoutManager>();
                 layout.ExecuteInitialLayoutPass(tree);
 
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
                 var scene = new Scene(tree);
                 var sceneBuilder = new SceneBuilder();
                 sceneBuilder.UpdateAll(scene);
@@ -58,7 +61,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 Assert.Equal(2, scene.Layers.Count());
                 Assert.Empty(scene.Layers.Select(x => x.LayerRoot).Except(new IVisual[] { tree, border }));
 
-                border.Opacity = 1;
+                animation.OnCompleted();
                 scene = scene.Clone();
 
                 sceneBuilder.Update(scene, border);
@@ -80,7 +83,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
         }
 
         [Fact]
-        public void Control_With_OpacityMask_Should_Start_New_Layer()
+        public void Removing_Control_With_Animated_Opacity_Should_Remove_Layers()
         {
             using (TestApplication())
             {
@@ -97,10 +100,9 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                         Padding = new Thickness(11),
                         Child = border = new Border
                         {
-                            OpacityMask = Brushes.Red,
                             Background = Brushes.Red,
                             Padding = new Thickness(12),
-                            Child = canvas = new Canvas(),
+                            Child = canvas = new Canvas()
                         }
                     }
                 };
@@ -108,74 +110,9 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 var layout = AvaloniaLocator.Current.GetService<ILayoutManager>();
                 layout.ExecuteInitialLayoutPass(tree);
 
-                var scene = new Scene(tree);
-                var sceneBuilder = new SceneBuilder();
-                sceneBuilder.UpdateAll(scene);
-
-                var rootNode = (VisualNode)scene.Root;
-                var borderNode = (VisualNode)scene.FindNode(border);
-                var canvasNode = (VisualNode)scene.FindNode(canvas);
-
-                Assert.Same(tree, rootNode.LayerRoot);
-                Assert.Same(border, borderNode.LayerRoot);
-                Assert.Same(border, canvasNode.LayerRoot);
-                Assert.Equal(Brushes.Red, scene.Layers[border].OpacityMask);
-
-                Assert.Equal(2, scene.Layers.Count());
-                Assert.Empty(scene.Layers.Select(x => x.LayerRoot).Except(new IVisual[] { tree, border }));
-
-                border.OpacityMask = null;
-                scene = scene.Clone();
-
-                sceneBuilder.Update(scene, border);
-
-                rootNode = (VisualNode)scene.Root;
-                borderNode = (VisualNode)scene.FindNode(border);
-                canvasNode = (VisualNode)scene.FindNode(canvas);
-
-                Assert.Same(tree, rootNode.LayerRoot);
-                Assert.Same(tree, borderNode.LayerRoot);
-                Assert.Same(tree, canvasNode.LayerRoot);
-                Assert.Single(scene.Layers);
-
-                var rootDirty = scene.Layers[tree].Dirty;
-
-                Assert.Single(rootDirty);
-                Assert.Equal(new Rect(21, 21, 58, 78), rootDirty.Single());
-            }
-        }
-
-        [Fact]
-        public void Removing_Transparent_Control_Should_Remove_Layers()
-        {
-            using (TestApplication())
-            {
-                Decorator decorator;
-                Border border;
-                Canvas canvas;
-                var tree = new TestRoot
-                {
-                    Padding = new Thickness(10),
-                    Width = 100,
-                    Height = 120,
-                    Child = decorator = new Decorator
-                    {
-                        Padding = new Thickness(11),
-                        Child = border = new Border
-                        {
-                            Opacity = 0.5,
-                            Background = Brushes.Red,
-                            Padding = new Thickness(12),
-                            Child = canvas = new Canvas
-                            {
-                                Opacity = 0.75,
-                            },
-                        }
-                    }
-                };
-
-                var layout = AvaloniaLocator.Current.GetService<ILayoutManager>();
-                layout.ExecuteInitialLayoutPass(tree);
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+                canvas.Bind(Canvas.OpacityProperty, animation, BindingPriority.Animation);
 
                 var scene = new Scene(tree);
                 var sceneBuilder = new SceneBuilder();
@@ -210,13 +147,9 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                         Padding = new Thickness(11),
                         Child = border = new Border
                         {
-                            Opacity = 0.5,
                             Background = Brushes.Red,
                             Padding = new Thickness(12),
-                            Child = canvas = new Canvas
-                            {
-                                Opacity = 0.75,
-                            },
+                            Child = canvas = new Canvas(),
                         }
                     }
                 };
@@ -224,6 +157,10 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 var layout = AvaloniaLocator.Current.GetService<ILayoutManager>();
                 layout.ExecuteInitialLayoutPass(tree);
 
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+                canvas.Bind(Canvas.OpacityProperty, animation, BindingPriority.Animation);
+
                 var scene = new Scene(tree);
                 var sceneBuilder = new SceneBuilder();
                 sceneBuilder.UpdateAll(scene);
@@ -263,6 +200,9 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 var layout = AvaloniaLocator.Current.GetService<ILayoutManager>();
                 layout.ExecuteInitialLayoutPass(tree);
 
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
                 var scene = new Scene(tree);
                 var sceneBuilder = new SceneBuilder();
                 sceneBuilder.UpdateAll(scene);

From 9609d93f3b253f5c364b0605df30a025c2c87fe1 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 4 Dec 2017 09:25:19 +0100
Subject: [PATCH 207/482] Don't create render layers for non-parent controls.

Only create a new render layer when a control has both an animating opacity _and_ children.
---
 .../Rendering/SceneGraph/SceneBuilder.cs      | 11 +++-
 .../Rendering/DeferredRendererTests.cs        |  1 +
 .../SceneGraph/SceneBuilderTests_Layers.cs    | 51 +++++++++++++++++--
 3 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
index 6c92ff022c..4f5f094e29 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
@@ -167,7 +167,6 @@ namespace Avalonia.Rendering.SceneGraph
                 using (context.PushPostTransform(m))
                 using (context.PushTransformContainer())
                 {
-                    var startLayer = (visual as IAvaloniaObject)?.IsAnimating(Visual.OpacityProperty) ?? false;
                     var clipBounds = bounds.TransformToAABB(contextImpl.Transform).Intersect(clip);
 
                     forceRecurse = forceRecurse ||
@@ -181,7 +180,7 @@ namespace Avalonia.Rendering.SceneGraph
                     node.Opacity = opacity;
                     node.OpacityMask = visual.OpacityMask;
 
-                    if (startLayer)
+                    if (ShouldStartLayer(visual))
                     {
                         if (node.LayerRoot != visual)
                         {
@@ -366,6 +365,14 @@ namespace Avalonia.Rendering.SceneGraph
             }
         }
 
+        private static bool ShouldStartLayer(IVisual visual)
+        {
+            var o = visual as IAvaloniaObject;
+            return visual.VisualChildren.Count > 0 &&
+                o != null &&
+                o.IsAnimating(Visual.OpacityProperty);
+        }
+
         private static IGeometryImpl CreateLayerGeometryClip(VisualNode node)
         {
             IGeometryImpl result = null;
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
index 9d90ae23af..afe7b04664 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
@@ -261,6 +261,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                     Child = border = new Border
                     {
                         Background = Brushes.Green,
+                        Child = new Canvas(),
                     }
                 }
             };
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
index 10372c7d8c..f2d137249a 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
@@ -15,7 +15,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
     public partial class SceneBuilderTests
     {
         [Fact]
-        public void Control_With_Animated_Opacity_Should_Start_New_Layer()
+        public void Control_With_Animated_Opacity_And_Children_Should_Start_New_Layer()
         {
             using (TestApplication())
             {
@@ -34,7 +34,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                         {
                             Background = Brushes.Red,
                             Padding = new Thickness(12),
-                            Child = canvas = new Canvas(),
+                            Child = canvas = new Canvas()
                         }
                     }
                 };
@@ -82,6 +82,42 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             }
         }
 
+        [Fact]
+        public void Control_With_Animated_Opacity_And_No_Children_Should_Not_Start_New_Layer()
+        {
+            using (TestApplication())
+            {
+                Decorator decorator;
+                Border border;
+                var tree = new TestRoot
+                {
+                    Padding = new Thickness(10),
+                    Width = 100,
+                    Height = 120,
+                    Child = decorator = new Decorator
+                    {
+                        Padding = new Thickness(11),
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                        }
+                    }
+                };
+
+                var layout = AvaloniaLocator.Current.GetService<ILayoutManager>();
+                layout.ExecuteInitialLayoutPass(tree);
+
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                Assert.Single(scene.Layers);
+            }
+        }
+
         [Fact]
         public void Removing_Control_With_Animated_Opacity_Should_Remove_Layers()
         {
@@ -102,7 +138,10 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                         {
                             Background = Brushes.Red,
                             Padding = new Thickness(12),
-                            Child = canvas = new Canvas()
+                            Child = canvas = new Canvas
+                            {
+                                Children = { new TextBlock() },
+                            }
                         }
                     }
                 };
@@ -149,7 +188,10 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                         {
                             Background = Brushes.Red,
                             Padding = new Thickness(12),
-                            Child = canvas = new Canvas(),
+                            Child = canvas = new Canvas
+                            {
+                                Children = { new TextBlock() },
+                            }
                         }
                     }
                 };
@@ -193,6 +235,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                         Child = border = new Border
                         {
                             Opacity = 0.5,
+                            Child = new Canvas(),
                         }
                     }
                 };

From d0be429bd29a73027eb7782980fdfa47f4906529 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 4 Dec 2017 22:39:59 +0100
Subject: [PATCH 208/482] Tried to make IsAnimating logic clearer.

---
 src/Avalonia.Base/PriorityValue.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/PriorityValue.cs b/src/Avalonia.Base/PriorityValue.cs
index e1b62c030c..12a9e20528 100644
--- a/src/Avalonia.Base/PriorityValue.cs
+++ b/src/Avalonia.Base/PriorityValue.cs
@@ -52,7 +52,17 @@ namespace Avalonia
             _validate = validate;
         }
 
-        public bool IsAnimating => ValuePriority < 0 && GetLevel(ValuePriority).ActiveBindingIndex != -1;
+        /// <summary>
+        /// Gets a value indicating whether the property is animating.
+        /// </summary>
+        public bool IsAnimating
+        {
+            get
+            {
+                return ValuePriority <= (int)BindingPriority.Animation && 
+                    GetLevel(ValuePriority).ActiveBindingIndex != -1;
+            }
+        }
 
         /// <summary>
         /// Gets the owner of the value.

From 4f8f5e9c719bcf2e4fc336d758bdea997ad6f5b0 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 5 Dec 2017 00:54:37 +0100
Subject: [PATCH 209/482] Added some benchmarks

Added some benchmarks to test setting and binding properties.
---
 .../Avalonia.Benchmarks.csproj                |  1 +
 tests/Avalonia.Benchmarks/Base/Properties.cs  | 43 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 tests/Avalonia.Benchmarks/Base/Properties.cs

diff --git a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
index 1d987e2238..c16b89e0b6 100644
--- a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
+++ b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
@@ -49,6 +49,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Base\Properties.cs" />
     <Compile Include="Layout\Measure.cs" />
     <Compile Include="Styling\ApplyStyling.cs" />
     <Compile Include="Program.cs" />
diff --git a/tests/Avalonia.Benchmarks/Base/Properties.cs b/tests/Avalonia.Benchmarks/Base/Properties.cs
new file mode 100644
index 0000000000..0a020961d5
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Base/Properties.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Reactive.Subjects;
+using BenchmarkDotNet.Attributes;
+
+namespace Avalonia.Benchmarks.Base
+{
+    [MemoryDiagnoser]
+    public class AvaloniaObjectBenchmark
+    {
+        private Class1 target = new Class1();
+        private Subject<int> intBinding = new Subject<int>();
+
+        public AvaloniaObjectBenchmark()
+        {
+            target.SetValue(Class1.IntProperty, 123);
+        }
+
+        [Benchmark]
+        public void ClearAndSetIntProperty()
+        {
+            target.ClearValue(Class1.IntProperty);
+            target.SetValue(Class1.IntProperty, 123);
+        }
+
+        [Benchmark]
+        public void BindIntProperty()
+        {
+            using (target.Bind(Class1.IntProperty, intBinding))
+            {
+                for (var i = 0; i < 100; ++i)
+                {
+                    intBinding.OnNext(i);
+                }
+            }
+        }
+
+        class Class1 : AvaloniaObject
+        {
+            public static readonly AvaloniaProperty<int> IntProperty =
+                AvaloniaProperty.Register<Class1, int>("Int");
+        }
+    }
+}

From d8efff505d82d61650edf7ab0f79773c8e45bc90 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 4 Dec 2017 20:05:10 -0600
Subject: [PATCH 210/482] Clean up formatting. Fix bug in PriorityValue usage
 of DeferredSetter. Change DeferredSetter to use ConditionalWeakTable to not
 hold strong references to PriorityValue objects.

---
 src/Avalonia.Base/AvaloniaObject.cs           | 15 +++-
 src/Avalonia.Base/PriorityValue.cs            | 85 ++++++++++---------
 src/Avalonia.Base/Utilities/DeferredSetter.cs | 47 ++++++----
 .../AvaloniaObjectTests_Binding.cs            |  2 +-
 4 files changed, 89 insertions(+), 60 deletions(-)

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 2583b7ac97..12b7e3d529 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -594,8 +594,19 @@ namespace Avalonia
             }
         }
 
-        protected void SetAndRaise<T>(AvaloniaProperty<T> property, Action<T, Action<Action>> setterCallback, T value, Predicate<T> pendingSetCondition = null)
-            => directDelayedSetter.SetAndNotify(property, (val, notify) => setterCallback((T)val, notify), value, o => pendingSetCondition?.Invoke((T)o) ?? true);
+        protected void SetAndRaise<T>(
+            AvaloniaProperty<T> property,
+            Action<T, Action<Action>> setterCallback,
+            T value,
+            Predicate<T> pendingSetCondition = null)
+        {
+            Contract.Requires<ArgumentNullException>(setterCallback != null);
+            directDelayedSetter.SetAndNotify(
+                property,
+                (val, notify) => setterCallback((T)val, notify),
+                value,
+                pendingSetCondition != null ? o => pendingSetCondition((T)o) : (Predicate<object>)null);
+        }
 
         /// <summary>
         /// Tries to cast a value to a type, taking into account that the value may be a
diff --git a/src/Avalonia.Base/PriorityValue.cs b/src/Avalonia.Base/PriorityValue.cs
index 2a6c5bc2c6..5d223c3cf8 100644
--- a/src/Avalonia.Base/PriorityValue.cs
+++ b/src/Avalonia.Base/PriorityValue.cs
@@ -235,56 +235,61 @@ namespace Avalonia
         /// <param name="priority">The priority level that the value came from.</param>
         private void UpdateValue(object value, int priority)
         {
-            delayedSetter.SetAndNotify(this, (update, notify) =>
+            delayedSetter.SetAndNotify(this,
+                UpdateCore,
+                (value, priority),
+                val => !object.Equals(val.value, _value));
+        }
+
+        private void UpdateCore((object value, int priority) update, Action<Action> notify)
+        {
+            var val = update.value;
+            var notification = val as BindingNotification;
+            object castValue;
+
+            if (notification != null)
             {
-                var val = update.value;
-                var notification = val as BindingNotification;
-                object castValue;
+                val = (notification.HasValue) ? notification.Value : null;
+            }
 
-                if (notification != null)
-                {
-                    val = (notification.HasValue) ? notification.Value : null;
-                }
+            if (TypeUtilities.TryConvertImplicit(_valueType, val, out castValue))
+            {
+                var old = _value;
 
-                if (TypeUtilities.TryConvertImplicit(_valueType, val, out castValue))
+                if (_validate != null && castValue != AvaloniaProperty.UnsetValue)
                 {
-                    var old = _value;
-
-                    if (_validate != null && castValue != AvaloniaProperty.UnsetValue)
-                    {
-                        castValue = _validate(castValue);
-                    }
+                    castValue = _validate(castValue);
+                }
 
-                    ValuePriority = priority;
-                    _value = castValue;
+                ValuePriority = update.priority;
+                _value = castValue;
 
-                    if (notification?.HasValue == true)
-                    {
-                        notification.SetValue(castValue);
-                    }
-
-                    if (notification == null || notification.HasValue)
-                    {
-                        notify(() => Owner?.Changed(this, old, _value));
-                    }
+                if (notification?.HasValue == true)
+                {
+                    notification.SetValue(castValue);
+                }
 
-                    if (notification != null)
-                    {
-                        Owner?.BindingNotificationReceived(this, notification);
-                    }
+                if (notification == null || notification.HasValue)
+                {
+                    notify(() => Owner?.Changed(this, old, _value));
                 }
-                else
+
+                if (notification != null)
                 {
-                    Logger.Error(
-                        LogArea.Binding,
-                        Owner,
-                        "Binding produced invalid value for {$Property} ({$PropertyType}): {$Value} ({$ValueType})",
-                        Property.Name,
-                        _valueType,
-                        val,
-                        val?.GetType());
+                    Owner?.BindingNotificationReceived(this, notification);
                 }
-            }, (value, priority), val => !object.Equals(val.value, _value));
+            }
+            else
+            {
+                Logger.Error(
+                    LogArea.Binding,
+                    Owner,
+                    "Binding produced invalid value for {$Property} ({$PropertyType}): {$Value} ({$ValueType})",
+                    Property.Name,
+                    _valueType,
+                    val,
+                    val?.GetType());
+            }
         }
     }
 }
diff --git a/src/Avalonia.Base/Utilities/DeferredSetter.cs b/src/Avalonia.Base/Utilities/DeferredSetter.cs
index 4b2709c141..b87711c1d9 100644
--- a/src/Avalonia.Base/Utilities/DeferredSetter.cs
+++ b/src/Avalonia.Base/Utilities/DeferredSetter.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reactive.Disposables;
+using System.Runtime.CompilerServices;
 using System.Text;
 
 namespace Avalonia.Utilities
@@ -11,7 +12,24 @@ namespace Avalonia.Utilities
     /// <typeparam name="TProperty">The type of the object that represents the property.</typeparam>
     /// <typeparam name="TValue">The type of value with which to track the delayed assignment.</typeparam>
     class DeferredSetter<TProperty, TValue>
+        where TProperty: class
     {
+        private struct NotifyDisposable : IDisposable
+        {
+            private readonly SettingStatus status;
+
+            public NotifyDisposable(SettingStatus status)
+            {
+                this.status = status;
+                status.Notifying = true;
+            }
+
+            public void Dispose()
+            {
+                status.Notifying = false;
+            }
+        }
+
         /// <summary>
         /// Information on current setting/notification status of a property.
         /// </summary>
@@ -30,7 +48,7 @@ namespace Avalonia.Utilities
             }
         }
 
-        private readonly Dictionary<TProperty, SettingStatus> setRecords = new Dictionary<TProperty, SettingStatus>();
+        private readonly ConditionalWeakTable<TProperty, SettingStatus> setRecords = new ConditionalWeakTable<TProperty, SettingStatus>();
 
         /// <summary>
         /// Mark the property as currently notifying.
@@ -40,14 +58,8 @@ namespace Avalonia.Utilities
         internal IDisposable MarkNotifying(TProperty property)
         {
             Contract.Requires<InvalidOperationException>(!IsNotifying(property));
-
-            if (!setRecords.ContainsKey(property))
-            {
-                setRecords[property] = new SettingStatus();
-            }
-            setRecords[property].Notifying = true;
-
-            return Disposable.Create(() => setRecords[property].Notifying = false);
+            
+            return new NotifyDisposable(setRecords.GetOrCreateValue(property));
         }
 
         /// <summary>
@@ -66,11 +78,8 @@ namespace Avalonia.Utilities
         internal void AddPendingSet(TProperty property, TValue value)
         {
             Contract.Requires<InvalidOperationException>(IsNotifying(property));
-            if (!setRecords.ContainsKey(property))
-            {
-                setRecords[property] = new SettingStatus();
-            }
-            setRecords[property].PendingValues.Enqueue(value);
+
+            setRecords.GetOrCreateValue(property).PendingValues.Enqueue(value);
         }
 
         /// <summary>
@@ -80,7 +89,7 @@ namespace Avalonia.Utilities
         /// <returns>If the property has any pending assignments.</returns>
         internal bool HasPendingSet(TProperty property)
         {
-            return setRecords.ContainsKey(property) && setRecords[property].PendingValues.Count != 0;
+            return setRecords.TryGetValue(property, out var status) && status.PendingValues.Count != 0;
         }
 
         /// <summary>
@@ -90,7 +99,7 @@ namespace Avalonia.Utilities
         /// <returns>The first pending assignment for the property.</returns>
         internal TValue GetFirstPendingSet(TProperty property)
         {
-            return setRecords[property].PendingValues.Dequeue();
+            return setRecords.GetOrCreateValue(property).PendingValues.Dequeue();
         }
 
         /// <summary>
@@ -103,7 +112,11 @@ namespace Avalonia.Utilities
         /// </param>
         /// <param name="value">The value to try to set.</param>
         /// <param name="pendingSetCondition">A predicate to filter what possible values should be added as pending sets (i.e. only values not equal to the current value).</param>
-        public void SetAndNotify(TProperty property, Action<TValue, Action<Action>> setterCallback, TValue value, Predicate<TValue> pendingSetCondition)
+        public void SetAndNotify(
+            TProperty property,
+            Action<TValue, Action<Action>> setterCallback,
+            TValue value,
+            Predicate<TValue> pendingSetCondition)
         {
             Contract.Requires<ArgumentNullException>(setterCallback != null);
             if (!IsNotifying(property))
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
index 529e35d92c..cb61a663a1 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
@@ -406,7 +406,7 @@ namespace Avalonia.Base.UnitTests
 
             Assert.Equal(1, viewModel.SetterInvokedCount);
 
-            //here in real life stack overflow exception is thrown issue #855 and #824
+            // Issues #855 and #824 were causing a StackOverflowException at this point.
             target.DoubleValue = 51.001;
 
             Assert.Equal(2, viewModel.SetterInvokedCount);

From ca9a4c4128a3a1ef4f3c92b4500f3074f56a3689 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Tue, 5 Dec 2017 17:18:32 -0600
Subject: [PATCH 211/482] PR Feedback.

---
 src/Avalonia.Base/AvaloniaObject.cs           | 28 +++++++++++++------
 src/Avalonia.Base/PriorityValue.cs            | 24 ++++++----------
 src/Avalonia.Base/Utilities/DeferredSetter.cs | 11 ++++----
 .../Primitives/SelectingItemsControl.cs       | 20 +++++++++----
 .../ListBoxTests_Single.cs                    |  2 +-
 5 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 12b7e3d529..8506414289 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -51,10 +51,19 @@ namespace Avalonia
         /// </summary>
         private EventHandler<AvaloniaPropertyChangedEventArgs> _propertyChanged;
 
+        private DeferredSetter<AvaloniaProperty, object> _directDeferredSetter;
+
         /// <summary>
         /// Delayed setter helper for direct properties. Used to fix #855.
         /// </summary>
-        private readonly DeferredSetter<AvaloniaProperty, object> directDelayedSetter = new DeferredSetter<AvaloniaProperty, object>();
+        private DeferredSetter<AvaloniaProperty, object> DirectDelayedSetter
+        {
+            get
+            {
+                return _directDeferredSetter ??
+                    (_directDeferredSetter = new DeferredSetter<AvaloniaProperty, object>());
+            }
+        }
 
 
         /// <summary>
@@ -559,7 +568,7 @@ namespace Avalonia
         protected bool SetAndRaise<T>(AvaloniaProperty<T> property, ref T field, T value)
         {
             VerifyAccess();
-            if (!directDelayedSetter.IsNotifying(property))
+            if (!DirectDelayedSetter.IsNotifying(property))
             {
                 var valueChanged = false;
                 if (!object.Equals(field, value))
@@ -569,16 +578,16 @@ namespace Avalonia
                     valueChanged = true;
                 }
 
-                while (directDelayedSetter.HasPendingSet(property))
+                while (DirectDelayedSetter.HasPendingSet(property))
                 {
-                    SetAndRaiseCore(property, ref field, (T)directDelayedSetter.GetFirstPendingSet(property));
+                    SetAndRaiseCore(property, ref field, (T)DirectDelayedSetter.GetFirstPendingSet(property));
                     valueChanged = true;
                 }
                 return valueChanged;
             }
             else if(!object.Equals(field, value))
             {
-                directDelayedSetter.AddPendingSet(property, value);
+                DirectDelayedSetter.AddPendingSet(property, value);
             }
             return false;
         }
@@ -588,7 +597,7 @@ namespace Avalonia
             var old = field;
             field = value;
 
-            using (directDelayedSetter.MarkNotifying(property))
+            using (DirectDelayedSetter.MarkNotifying(property))
             {
                 RaisePropertyChanged(property, old, value, BindingPriority.LocalValue);
             }
@@ -598,14 +607,15 @@ namespace Avalonia
             AvaloniaProperty<T> property,
             Action<T, Action<Action>> setterCallback,
             T value,
-            Predicate<T> pendingSetCondition = null)
+            Predicate<T> pendingSetCondition)
         {
             Contract.Requires<ArgumentNullException>(setterCallback != null);
-            directDelayedSetter.SetAndNotify(
+            Contract.Requires<ArgumentNullException>(pendingSetCondition != null);
+            DirectDelayedSetter.SetAndNotify(
                 property,
                 (val, notify) => setterCallback((T)val, notify),
                 value,
-                pendingSetCondition != null ? o => pendingSetCondition((T)o) : (Predicate<object>)null);
+                o => pendingSetCondition((T)o));
         }
 
         /// <summary>
diff --git a/src/Avalonia.Base/PriorityValue.cs b/src/Avalonia.Base/PriorityValue.cs
index 5d223c3cf8..ea10427b10 100644
--- a/src/Avalonia.Base/PriorityValue.cs
+++ b/src/Avalonia.Base/PriorityValue.cs
@@ -28,9 +28,10 @@ namespace Avalonia
     {
         private readonly Type _valueType;
         private readonly SingleOrDictionary<int, PriorityLevel> _levels = new SingleOrDictionary<int, PriorityLevel>();
-        private object _value;
+
         private readonly Func<object, object> _validate;
         private static readonly DeferredSetter<PriorityValue, (object value, int priority)> delayedSetter = new DeferredSetter<PriorityValue, (object, int)>();
+        private (object value, int priority) _value;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PriorityValue"/> class.
@@ -47,9 +48,7 @@ namespace Avalonia
         {
             Owner = owner;
             Property = property;
-            _valueType = valueType;
-            _value = AvaloniaProperty.UnsetValue;
-            ValuePriority = int.MaxValue;
+            _value = (AvaloniaProperty.UnsetValue, int.MaxValue);
             _validate = validate;
         }
 
@@ -66,16 +65,12 @@ namespace Avalonia
         /// <summary>
         /// Gets the current value.
         /// </summary>
-        public object Value => _value;
+        public object Value => _value.value;
 
         /// <summary>
         /// Gets the priority of the binding that is currently active.
         /// </summary>
-        public int ValuePriority
-        {
-            get;
-            private set;
-        }
+        public int ValuePriority => _value.priority;
 
         /// <summary>
         /// Adds a new binding.
@@ -238,7 +233,7 @@ namespace Avalonia
             delayedSetter.SetAndNotify(this,
                 UpdateCore,
                 (value, priority),
-                val => !object.Equals(val.value, _value));
+                val => !object.Equals(val.value, val.value));
         }
 
         private void UpdateCore((object value, int priority) update, Action<Action> notify)
@@ -254,15 +249,14 @@ namespace Avalonia
 
             if (TypeUtilities.TryConvertImplicit(_valueType, val, out castValue))
             {
-                var old = _value;
+                var old = this._value.value;
 
                 if (_validate != null && castValue != AvaloniaProperty.UnsetValue)
                 {
                     castValue = _validate(castValue);
                 }
 
-                ValuePriority = update.priority;
-                _value = castValue;
+                this._value = (castValue, update.priority);
 
                 if (notification?.HasValue == true)
                 {
@@ -271,7 +265,7 @@ namespace Avalonia
 
                 if (notification == null || notification.HasValue)
                 {
-                    notify(() => Owner?.Changed(this, old, _value));
+                    notify(() => Owner?.Changed(this, old, Value));
                 }
 
                 if (notification != null)
diff --git a/src/Avalonia.Base/Utilities/DeferredSetter.cs b/src/Avalonia.Base/Utilities/DeferredSetter.cs
index b87711c1d9..b42ca0bf3d 100644
--- a/src/Avalonia.Base/Utilities/DeferredSetter.cs
+++ b/src/Avalonia.Base/Utilities/DeferredSetter.cs
@@ -14,11 +14,11 @@ namespace Avalonia.Utilities
     class DeferredSetter<TProperty, TValue>
         where TProperty: class
     {
-        private struct NotifyDisposable : IDisposable
+        internal struct NotifyDisposable : IDisposable
         {
             private readonly SettingStatus status;
 
-            public NotifyDisposable(SettingStatus status)
+            internal NotifyDisposable(SettingStatus status)
             {
                 this.status = status;
                 status.Notifying = true;
@@ -33,7 +33,7 @@ namespace Avalonia.Utilities
         /// <summary>
         /// Information on current setting/notification status of a property.
         /// </summary>
-        private class SettingStatus
+        internal class SettingStatus
         {
             public bool Notifying { get; set; }
 
@@ -55,7 +55,7 @@ namespace Avalonia.Utilities
         /// </summary>
         /// <param name="property">The property to mark as notifying.</param>
         /// <returns>Returns a disposable that when disposed, marks the property as done notifying.</returns>
-        internal IDisposable MarkNotifying(TProperty property)
+        internal NotifyDisposable MarkNotifying(TProperty property)
         {
             Contract.Requires<InvalidOperationException>(!IsNotifying(property));
             
@@ -119,6 +119,7 @@ namespace Avalonia.Utilities
             Predicate<TValue> pendingSetCondition)
         {
             Contract.Requires<ArgumentNullException>(setterCallback != null);
+            Contract.Requires<ArgumentNullException>(pendingSetCondition != null);
             if (!IsNotifying(property))
             {
                 setterCallback(value, notification =>
@@ -139,7 +140,7 @@ namespace Avalonia.Utilities
                     });
                 }
             }
-            else if(pendingSetCondition?.Invoke(value) ?? true)
+            else if(pendingSetCondition(value))
             {
                 AddPendingSet(property, value);
             }
diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
index 1a401c82bc..3d34bae7eb 100644
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@@ -151,7 +151,7 @@ namespace Avalonia.Controls.Primitives
             {
                 if (_updateCount == 0)
                 {
-                    SetAndRaise(SelectedIndexProperty, (val, notifierWrapper) =>
+                    SetAndRaise(SelectedIndexProperty, (val, notifyWrapper) =>
                     {
                         var old = SelectedIndex;
                         var effective = (val >= 0 && val < Items?.Cast<object>().Count()) ? val : -1;
@@ -159,10 +159,15 @@ namespace Avalonia.Controls.Primitives
                         if (old != effective)
                         {
                             _selectedIndex = effective;
-                            notifierWrapper(() => RaisePropertyChanged(SelectedIndexProperty, old, effective, BindingPriority.LocalValue));
+                            notifyWrapper(() =>
+                                RaisePropertyChanged(
+                                    SelectedIndexProperty,
+                                    old,
+                                    effective,
+                                    BindingPriority.LocalValue));
                             SelectedItem = ElementAt(Items, effective);
                         }
-                    }, value);
+                    }, value, val => val != SelectedIndex);
                 }
                 else
                 {
@@ -196,7 +201,12 @@ namespace Avalonia.Controls.Primitives
                         {
                             _selectedItem = effective;
 
-                            notifyWrapper(() => RaisePropertyChanged(SelectedItemProperty, old, effective, BindingPriority.LocalValue));
+                            notifyWrapper(() =>
+                                RaisePropertyChanged(
+                                    SelectedItemProperty,
+                                    old,
+                                    effective,
+                                    BindingPriority.LocalValue));
 
                             SelectedIndex = index;
 
@@ -215,7 +225,7 @@ namespace Avalonia.Controls.Primitives
                                 SelectedItems.Clear();
                             }
                         }
-                    }, value);
+                    }, value, val => val != SelectedItem);
                 }
                 else
                 {
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
index d95acbdb7f..fee4994ee3 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
@@ -223,7 +223,7 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Equal(0, viewModel.SetterInvokedCount);
 
-            //here in real life stack overflow exception is thrown issue #855
+            // In Issue #855, a Stackoverflow occured here.
             target.SelectedItem = viewModel.Items[2];
 
             Assert.Equal(viewModel.Items[1], target.SelectedItem);

From 05eda280de538a815324032fd65c4ba403e70777 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Tue, 5 Dec 2017 19:35:33 -0600
Subject: [PATCH 212/482] Refactor DeferredSetter logic to allow passing
 references to backing fields and utilizing that in all usages. Refactor
 SetAndRaise logic to be combined and simplified between the two use cases.
 Now the common case delegates to the less specialized case.

---
 src/Avalonia.Base/AvaloniaObject.cs           | 104 ++++++++++--------
 src/Avalonia.Base/PriorityValue.cs            |  15 ++-
 src/Avalonia.Base/Utilities/DeferredSetter.cs |  57 ++++++----
 .../Primitives/SelectingItemsControl.cs       |  16 +--
 .../AvaloniaObjectTests_Direct.cs             |   2 +-
 .../Primitives/RangeBaseTests.cs              |   2 +-
 6 files changed, 116 insertions(+), 80 deletions(-)

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 8506414289..2035b6f2aa 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -56,7 +56,7 @@ namespace Avalonia
         /// <summary>
         /// Delayed setter helper for direct properties. Used to fix #855.
         /// </summary>
-        private DeferredSetter<AvaloniaProperty, object> DirectDelayedSetter
+        private DeferredSetter<AvaloniaProperty, object> DirectPropertyDeferredSetter
         {
             get
             {
@@ -554,6 +554,15 @@ namespace Avalonia
             }
         }
 
+        /// <summary>
+        /// A callback type for encapsulating complex logic for setting direct properties.
+        /// </summary>
+        /// <typeparam name="T">The type of the property.</typeparam>
+        /// <param name="value">The value to which to set the property.</param>
+        /// <param name="field">The backing field for the property.</param>
+        /// <param name="notifyWrapper">A wrapper for the property-changed notification.</param>
+        protected delegate void SetAndRaiseCallback<T>(T value, ref T field, Action<Action> notifyWrapper);
+
         /// <summary>
         /// Sets the backing field for a direct avalonia property, raising the 
         /// <see cref="PropertyChanged"/> event if the value has changed.
@@ -561,61 +570,70 @@ namespace Avalonia
         /// <typeparam name="T">The type of the property.</typeparam>
         /// <param name="property">The property.</param>
         /// <param name="field">The backing field.</param>
+        /// <param name="setterCallback">A callback called to actually set the value to the backing field.</param>
         /// <param name="value">The value.</param>
         /// <returns>
         /// True if the value changed, otherwise false.
         /// </returns>
-        protected bool SetAndRaise<T>(AvaloniaProperty<T> property, ref T field, T value)
+        protected bool SetAndRaise<T>(
+            AvaloniaProperty<T> property,
+            ref T field,
+            SetAndRaiseCallback<T> setterCallback,
+            T value)
         {
-            VerifyAccess();
-            if (!DirectDelayedSetter.IsNotifying(property))
-            {
-                var valueChanged = false;
-                if (!object.Equals(field, value))
+            Contract.Requires<ArgumentNullException>(setterCallback != null);
+            return DirectPropertyDeferredSetter.SetAndNotify(
+                property,
+                ref field,
+                (object val, ref T backing, Action<Action> notify) =>
                 {
-                    SetAndRaiseCore(property, ref field, value);
-
-                    valueChanged = true;
-                }
+                    setterCallback((T)val, ref backing, notify);
+                    return true;
+                },
+                value,
+                (object o, ref T backing) => !object.Equals(o, backing));
+        }
 
-                while (DirectDelayedSetter.HasPendingSet(property))
-                {
-                    SetAndRaiseCore(property, ref field, (T)DirectDelayedSetter.GetFirstPendingSet(property));
-                    valueChanged = true;
-                }
-                return valueChanged;
-            }
-            else if(!object.Equals(field, value))
-            {
-                DirectDelayedSetter.AddPendingSet(property, value);
-            }
-            return false;
+        /// <summary>
+        /// Sets the backing field for a direct avalonia property, raising the 
+        /// <see cref="PropertyChanged"/> event if the value has changed.
+        /// </summary>
+        /// <typeparam name="T">The type of the property.</typeparam>
+        /// <param name="property">The property.</param>
+        /// <param name="field">The backing field.</param>
+        /// <param name="value">The value.</param>
+        /// <returns>
+        /// True if the value changed, otherwise false.
+        /// </returns>
+        protected bool SetAndRaise<T>(AvaloniaProperty<T> property, ref T field, T value)
+        {
+            VerifyAccess();
+            return SetAndRaise(
+                property,
+                ref field,
+                (T val, ref T backing, Action<Action> notifyWrapper)
+                    => SetAndRaiseCore(property, ref backing, val, notifyWrapper),
+                value);
         }
 
-        private void SetAndRaiseCore<T>(AvaloniaProperty<T> property, ref T field, T value)
+        /// <summary>
+        /// Default assignment logic for SetAndRaise.
+        /// </summary>
+        /// <typeparam name="T">The type of the property.</typeparam>
+        /// <param name="property">The property.</param>
+        /// <param name="field">The backing field.</param>
+        /// <param name="value">The value.</param>
+        /// <param name="notifyWrapper">A wrapper for the property-changed notification.</param>
+        /// <returns>
+        /// True if the value changed, otherwise false.
+        /// </returns>
+        private bool SetAndRaiseCore<T>(AvaloniaProperty property, ref T field, T value, Action<Action> notifyWrapper)
         {
             var old = field;
             field = value;
 
-            using (DirectDelayedSetter.MarkNotifying(property))
-            {
-                RaisePropertyChanged(property, old, value, BindingPriority.LocalValue);
-            }
-        }
-
-        protected void SetAndRaise<T>(
-            AvaloniaProperty<T> property,
-            Action<T, Action<Action>> setterCallback,
-            T value,
-            Predicate<T> pendingSetCondition)
-        {
-            Contract.Requires<ArgumentNullException>(setterCallback != null);
-            Contract.Requires<ArgumentNullException>(pendingSetCondition != null);
-            DirectDelayedSetter.SetAndNotify(
-                property,
-                (val, notify) => setterCallback((T)val, notify),
-                value,
-                o => pendingSetCondition((T)o));
+            notifyWrapper(() => RaisePropertyChanged(property, old, value, BindingPriority.LocalValue));
+            return true;
         }
 
         /// <summary>
diff --git a/src/Avalonia.Base/PriorityValue.cs b/src/Avalonia.Base/PriorityValue.cs
index ea10427b10..cad86b5dea 100644
--- a/src/Avalonia.Base/PriorityValue.cs
+++ b/src/Avalonia.Base/PriorityValue.cs
@@ -48,6 +48,7 @@ namespace Avalonia
         {
             Owner = owner;
             Property = property;
+            _valueType = valueType;
             _value = (AvaloniaProperty.UnsetValue, int.MaxValue);
             _validate = validate;
         }
@@ -231,12 +232,17 @@ namespace Avalonia
         private void UpdateValue(object value, int priority)
         {
             delayedSetter.SetAndNotify(this,
+                ref _value,
                 UpdateCore,
                 (value, priority),
-                val => !object.Equals(val.value, val.value));
+                ((object value, int) val, ref (object value, int) backing)
+                    => !object.Equals(val.value, backing.value));
         }
 
-        private void UpdateCore((object value, int priority) update, Action<Action> notify)
+        private bool UpdateCore(
+            (object value, int priority) update,
+            ref (object value, int priority) backing,
+            Action<Action> notify)
         {
             var val = update.value;
             var notification = val as BindingNotification;
@@ -249,14 +255,14 @@ namespace Avalonia
 
             if (TypeUtilities.TryConvertImplicit(_valueType, val, out castValue))
             {
-                var old = this._value.value;
+                var old = backing.value;
 
                 if (_validate != null && castValue != AvaloniaProperty.UnsetValue)
                 {
                     castValue = _validate(castValue);
                 }
 
-                this._value = (castValue, update.priority);
+                backing = (castValue, update.priority);
 
                 if (notification?.HasValue == true)
                 {
@@ -284,6 +290,7 @@ namespace Avalonia
                     val,
                     val?.GetType());
             }
+            return true;
         }
     }
 }
diff --git a/src/Avalonia.Base/Utilities/DeferredSetter.cs b/src/Avalonia.Base/Utilities/DeferredSetter.cs
index b42ca0bf3d..2c8c7f8887 100644
--- a/src/Avalonia.Base/Utilities/DeferredSetter.cs
+++ b/src/Avalonia.Base/Utilities/DeferredSetter.cs
@@ -10,11 +10,11 @@ namespace Avalonia.Utilities
     /// A utility class to enable deferring assignment until after property-changed notifications are sent.
     /// </summary>
     /// <typeparam name="TProperty">The type of the object that represents the property.</typeparam>
-    /// <typeparam name="TValue">The type of value with which to track the delayed assignment.</typeparam>
-    class DeferredSetter<TProperty, TValue>
+    /// <typeparam name="TSetRecord">The type of value with which to track the delayed assignment.</typeparam>
+    class DeferredSetter<TProperty, TSetRecord>
         where TProperty: class
     {
-        internal struct NotifyDisposable : IDisposable
+        private struct NotifyDisposable : IDisposable
         {
             private readonly SettingStatus status;
 
@@ -33,17 +33,17 @@ namespace Avalonia.Utilities
         /// <summary>
         /// Information on current setting/notification status of a property.
         /// </summary>
-        internal class SettingStatus
+        private class SettingStatus
         {
             public bool Notifying { get; set; }
 
-            private Queue<TValue> pendingValues;
+            private Queue<TSetRecord> pendingValues;
             
-            public Queue<TValue> PendingValues
+            public Queue<TSetRecord> PendingValues
             {
                 get
                 {
-                    return pendingValues ?? (pendingValues = new Queue<TValue>());
+                    return pendingValues ?? (pendingValues = new Queue<TSetRecord>());
                 }
             }
         }
@@ -55,7 +55,7 @@ namespace Avalonia.Utilities
         /// </summary>
         /// <param name="property">The property to mark as notifying.</param>
         /// <returns>Returns a disposable that when disposed, marks the property as done notifying.</returns>
-        internal NotifyDisposable MarkNotifying(TProperty property)
+        private NotifyDisposable MarkNotifying(TProperty property)
         {
             Contract.Requires<InvalidOperationException>(!IsNotifying(property));
             
@@ -67,7 +67,7 @@ namespace Avalonia.Utilities
         /// </summary>
         /// <param name="property">The property.</param>
         /// <returns>If the property is currently notifying listeners.</returns>
-        internal bool IsNotifying(TProperty property)
+        private bool IsNotifying(TProperty property)
             => setRecords.TryGetValue(property, out var value) && value.Notifying;
 
         /// <summary>
@@ -75,7 +75,7 @@ namespace Avalonia.Utilities
         /// </summary>
         /// <param name="property">The property.</param>
         /// <param name="value">The value to assign.</param>
-        internal void AddPendingSet(TProperty property, TValue value)
+        private void AddPendingSet(TProperty property, TSetRecord value)
         {
             Contract.Requires<InvalidOperationException>(IsNotifying(property));
 
@@ -87,7 +87,7 @@ namespace Avalonia.Utilities
         /// </summary>
         /// <param name="property">The property to check.</param>
         /// <returns>If the property has any pending assignments.</returns>
-        internal bool HasPendingSet(TProperty property)
+        private bool HasPendingSet(TProperty property)
         {
             return setRecords.TryGetValue(property, out var status) && status.PendingValues.Count != 0;
         }
@@ -97,41 +97,50 @@ namespace Avalonia.Utilities
         /// </summary>
         /// <param name="property">The property to check.</param>
         /// <returns>The first pending assignment for the property.</returns>
-        internal TValue GetFirstPendingSet(TProperty property)
+        private TSetRecord GetFirstPendingSet(TProperty property)
         {
             return setRecords.GetOrCreateValue(property).PendingValues.Dequeue();
         }
 
+        public delegate bool SetterDelegate<TValue>(TSetRecord record, ref TValue backing, Action<Action> notifyCallback);
+        public delegate bool PendingSetPredicate<TValue>(TSetRecord record, ref TValue backing);
+
         /// <summary>
         /// Set the property and notify listeners while ensuring we don't get into a stack overflow as happens with #855 and #824
         /// </summary>
         /// <param name="property">The property to set.</param>
+        /// <param name="backing">The backing field for the property</param>
         /// <param name="setterCallback">
         /// A callback that actually sets the property.
         /// The first parameter is the value to set, and the second is a wrapper that takes a callback that sends the property-changed notification.
         /// </param>
         /// <param name="value">The value to try to set.</param>
         /// <param name="pendingSetCondition">A predicate to filter what possible values should be added as pending sets (i.e. only values not equal to the current value).</param>
-        public void SetAndNotify(
+        public bool SetAndNotify<TValue>(
             TProperty property,
-            Action<TValue, Action<Action>> setterCallback,
-            TValue value,
-            Predicate<TValue> pendingSetCondition)
+            ref TValue backing,
+            SetterDelegate<TValue> setterCallback,
+            TSetRecord value,
+            PendingSetPredicate<TValue> pendingSetCondition)
         {
             Contract.Requires<ArgumentNullException>(setterCallback != null);
             Contract.Requires<ArgumentNullException>(pendingSetCondition != null);
             if (!IsNotifying(property))
             {
-                setterCallback(value, notification =>
+                bool updated = false;
+                if (pendingSetCondition(value, ref backing))
                 {
-                    using (MarkNotifying(property))
+                    updated = setterCallback(value, ref backing, notification =>
                     {
-                        notification();
-                    }
-                });
+                        using (MarkNotifying(property))
+                        {
+                            notification();
+                        }
+                    });
+                }
                 while (HasPendingSet(property))
                 {
-                    setterCallback(GetFirstPendingSet(property), notification =>
+                    updated |= setterCallback(GetFirstPendingSet(property), ref backing, notification =>
                     {
                         using (MarkNotifying(property))
                         {
@@ -139,11 +148,13 @@ namespace Avalonia.Utilities
                         }
                     });
                 }
+                return updated;
             }
-            else if(pendingSetCondition(value))
+            else if(pendingSetCondition(value, ref backing))
             {
                 AddPendingSet(property, value);
             }
+            return false;
         }
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
index 3d34bae7eb..2e668fda95 100644
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@@ -151,14 +151,14 @@ namespace Avalonia.Controls.Primitives
             {
                 if (_updateCount == 0)
                 {
-                    SetAndRaise(SelectedIndexProperty, (val, notifyWrapper) =>
+                    SetAndRaise(SelectedIndexProperty, ref _selectedIndex, (int val, ref int backing, Action<Action> notifyWrapper) =>
                     {
-                        var old = SelectedIndex;
+                        var old = backing;
                         var effective = (val >= 0 && val < Items?.Cast<object>().Count()) ? val : -1;
 
                         if (old != effective)
                         {
-                            _selectedIndex = effective;
+                            backing = effective;
                             notifyWrapper(() =>
                                 RaisePropertyChanged(
                                     SelectedIndexProperty,
@@ -167,7 +167,7 @@ namespace Avalonia.Controls.Primitives
                                     BindingPriority.LocalValue));
                             SelectedItem = ElementAt(Items, effective);
                         }
-                    }, value, val => val != SelectedIndex);
+                    }, value);
                 }
                 else
                 {
@@ -191,15 +191,15 @@ namespace Avalonia.Controls.Primitives
             {
                 if (_updateCount == 0)
                 {
-                    SetAndRaise(SelectedItemProperty, (val, notifyWrapper) =>
+                    SetAndRaise(SelectedItemProperty, ref _selectedItem, (object val, ref object backing, Action<Action> notifyWrapper) =>
                     {
-                        var old = SelectedItem;
+                        var old = backing;
                         var index = IndexOf(Items, val);
                         var effective = index != -1 ? val : null;
 
                         if (!object.Equals(effective, old))
                         {
-                            _selectedItem = effective;
+                            backing = effective;
 
                             notifyWrapper(() =>
                                 RaisePropertyChanged(
@@ -225,7 +225,7 @@ namespace Avalonia.Controls.Primitives
                                 SelectedItems.Clear();
                             }
                         }
-                    }, value, val => val != SelectedItem);
+                    }, value);
                 }
                 else
                 {
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
index ffea0fd2d6..6d10f50276 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
@@ -462,7 +462,7 @@ namespace Avalonia.Base.UnitTests
 
             Assert.Equal(1, viewModel.SetterInvokedCount);
 
-            //here in real life stack overflow exception is thrown issue #855 and #824
+            // Issues #855 and #824 were causing a StackOverflowException at this point.
             target.DoubleValue = 51.001;
 
             Assert.Equal(2, viewModel.SetterInvokedCount);
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
index 0e67581760..2dfb30a9f0 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
@@ -148,7 +148,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
             Assert.Equal(1, viewModel.SetterInvokedCount);
 
-            //here in real life stack overflow exception is thrown issue #855 and #824
+            // Issues #855 and #824 were causing a StackOverflowException at this point.
             target.Value = 51.001;
 
             Assert.Equal(2, viewModel.SetterInvokedCount);

From 04c489daa594b4dc6570132c2968fb44702c4a8b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 6 Dec 2017 08:56:24 +0100
Subject: [PATCH 213/482] Make Collection Properties get-only

Fixes #1302.
---
 src/Avalonia.Controls/IPanel.cs               |   4 +-
 src/Avalonia.Controls/Panel.cs                |  32 +---
 .../DockPanelTests.cs                         |   4 +-
 .../DropDownTests.cs                          |   2 +-
 .../GridSplitterTests.cs                      |  84 ++++-----
 .../Avalonia.Controls.UnitTests/GridTests.cs  |   2 +-
 .../Avalonia.Controls.UnitTests/PanelTests.cs |  57 +-----
 .../Primitives/TemplatedControlTests.cs       |   8 +-
 .../ScrollViewerTests.cs                      |   2 +-
 .../StackPanelTests.cs                        |  12 +-
 .../TabControlTests.cs                        |   2 +-
 .../TreeViewTests.cs                          |   2 +-
 .../WrapPanelTests.cs                         |  52 +++---
 .../KeyboardNavigationTests_Arrows.cs         | 124 +++++++------
 .../KeyboardNavigationTests_Tab.cs            | 168 +++++++++---------
 .../LayoutManagerTests.cs                     |   8 +-
 .../ControlLocatorTests.cs                    |  10 +-
 .../Data/BindingTests_ElementName.cs          |   8 +-
 .../GeometryClippingTests.cs                  |   2 +-
 .../Media/VisualBrushTests.cs                 |   2 +-
 .../Avalonia.RenderTests/OpacityMaskTests.cs  |   2 +-
 tests/Avalonia.RenderTests/SVGPathTests.cs    |   2 +-
 .../RenderTests_Culling.cs                    |  12 +-
 .../DeferredRendererTests_HitTesting.cs       |  14 +-
 .../ImmediateRendererTests_HitTesting.cs      |  14 +-
 25 files changed, 277 insertions(+), 352 deletions(-)

diff --git a/src/Avalonia.Controls/IPanel.cs b/src/Avalonia.Controls/IPanel.cs
index 5bcfd33e86..ce2c63ffc8 100644
--- a/src/Avalonia.Controls/IPanel.cs
+++ b/src/Avalonia.Controls/IPanel.cs
@@ -9,8 +9,8 @@ namespace Avalonia.Controls
     public interface IPanel : IControl
     {
         /// <summary>
-        /// Gets or sets the children of the <see cref="Panel"/>.
+        /// Gets the children of the <see cref="Panel"/>.
         /// </summary>
-        Controls Children { get; set; }
+        Controls Children { get; }
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Controls/Panel.cs b/src/Avalonia.Controls/Panel.cs
index 6448f11491..a2cb013300 100644
--- a/src/Avalonia.Controls/Panel.cs
+++ b/src/Avalonia.Controls/Panel.cs
@@ -25,8 +25,6 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<IBrush> BackgroundProperty =
             Border.BackgroundProperty.AddOwner<Panel>();
 
-        private readonly Controls _children = new Controls();
-
         /// <summary>
         /// Initializes static members of the <see cref="Panel"/> class.
         /// </summary>
@@ -40,38 +38,14 @@ namespace Avalonia.Controls
         /// </summary>
         public Panel()
         {
-            _children.CollectionChanged += ChildrenChanged;
+            Children.CollectionChanged += ChildrenChanged;
         }
 
         /// <summary>
-        /// Gets or sets the children of the <see cref="Panel"/>.
+        /// Gets the children of the <see cref="Panel"/>.
         /// </summary>
-        /// <remarks>
-        /// Even though this property can be set, the setter is only intended for use in object
-        /// initializers. Assigning to this property does not change the underlying collection,
-        /// it simply clears the existing collection and adds the contents of the assigned
-        /// collection.
-        /// </remarks>
         [Content]
-        public Controls Children
-        {
-            get
-            {
-                return _children;
-            }
-
-            set
-            {
-                Contract.Requires<ArgumentNullException>(value != null);
-
-                if (_children != value)
-                {
-                    VisualChildren.Clear();
-                    _children.Clear();
-                    _children.AddRange(value);
-                }
-            }
-        }
+        public Controls Children { get; } = new Controls();
 
         /// <summary>
         /// Gets or Sets Panel background brush.
diff --git a/tests/Avalonia.Controls.UnitTests/DockPanelTests.cs b/tests/Avalonia.Controls.UnitTests/DockPanelTests.cs
index db4c3c0eca..3de67839a7 100644
--- a/tests/Avalonia.Controls.UnitTests/DockPanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/DockPanelTests.cs
@@ -12,7 +12,7 @@ namespace Avalonia.Controls.UnitTests
         {
             var target = new DockPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new Border { Width = 500, Height = 50, [DockPanel.DockProperty] = Dock.Top },
                     new Border { Width = 500, Height = 50, [DockPanel.DockProperty] = Dock.Bottom },
@@ -38,7 +38,7 @@ namespace Avalonia.Controls.UnitTests
         {
             var target = new DockPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new Border { Width = 50, Height = 400, [DockPanel.DockProperty] = Dock.Left },
                     new Border { Width = 50, Height = 400, [DockPanel.DockProperty] = Dock.Right },
diff --git a/tests/Avalonia.Controls.UnitTests/DropDownTests.cs b/tests/Avalonia.Controls.UnitTests/DropDownTests.cs
index b5de8c67fa..29e60a8f83 100644
--- a/tests/Avalonia.Controls.UnitTests/DropDownTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/DropDownTests.cs
@@ -89,7 +89,7 @@ namespace Avalonia.Controls.UnitTests
                 return new Panel
                 {
                     Name = "container",
-                    Children = new Controls
+                    Children =
                     {
                         new ContentControl
                         {
diff --git a/tests/Avalonia.Controls.UnitTests/GridSplitterTests.cs b/tests/Avalonia.Controls.UnitTests/GridSplitterTests.cs
index 5d622a5fc1..a1ba608ec6 100644
--- a/tests/Avalonia.Controls.UnitTests/GridSplitterTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/GridSplitterTests.cs
@@ -22,14 +22,14 @@ namespace Avalonia.Controls.UnitTests
         {
             var grid = new Grid()
                        {
-                           RowDefinitions = new RowDefinitions("*,Auto,*"),
-                           ColumnDefinitions = new ColumnDefinitions("*,*"),
-                           Children = new Controls()
-                                      {
-                                          new Border { [Grid.RowProperty] = 0 },
-                                          new GridSplitter { [Grid.RowProperty] = 1, Name = "splitter" },
-                                          new Border { [Grid.RowProperty] = 2 }
-                                      }
+                            RowDefinitions = new RowDefinitions("*,Auto,*"),
+                            ColumnDefinitions = new ColumnDefinitions("*,*"),
+                            Children =
+                            {
+                                new Border { [Grid.RowProperty] = 0 },
+                                new GridSplitter { [Grid.RowProperty] = 1, Name = "splitter" },
+                                new Border { [Grid.RowProperty] = 2 }
+                            }
                        };
 
             var root = new TestRoot { Child = grid };
@@ -43,14 +43,14 @@ namespace Avalonia.Controls.UnitTests
         {
             var grid = new Grid()
                        {
-                           ColumnDefinitions = new ColumnDefinitions("*,Auto,*"),
-                           RowDefinitions = new RowDefinitions("*,*"),
-                           Children = new Controls()
-                                      {
-                                          new Border { [Grid.ColumnProperty] = 0 },
-                                          new GridSplitter { [Grid.ColumnProperty] = 1, Name = "splitter" },
-                                          new Border { [Grid.ColumnProperty] = 2 },
-                                      }
+                            ColumnDefinitions = new ColumnDefinitions("*,Auto,*"),
+                            RowDefinitions = new RowDefinitions("*,*"),
+                            Children =
+                            {
+                                new Border { [Grid.ColumnProperty] = 0 },
+                                new GridSplitter { [Grid.ColumnProperty] = 1, Name = "splitter" },
+                                new Border { [Grid.ColumnProperty] = 2 },
+                            }
                        };
 
             var root = new TestRoot { Child = grid };
@@ -64,14 +64,14 @@ namespace Avalonia.Controls.UnitTests
         {
             var grid = new Grid()
                        {
-                           ColumnDefinitions = new ColumnDefinitions("Auto,Auto,Auto"),
-                           RowDefinitions = new RowDefinitions("Auto,Auto"),
-                           Children = new Controls()
-                                      {
-                                          new Border { [Grid.ColumnProperty] = 0 },
-                                          new GridSplitter { [Grid.ColumnProperty] = 1, Name = "splitter" },
-                                          new Border { [Grid.ColumnProperty] = 2 },
-                                      }
+                            ColumnDefinitions = new ColumnDefinitions("Auto,Auto,Auto"),
+                            RowDefinitions = new RowDefinitions("Auto,Auto"),
+                            Children =
+                            {
+                                new Border { [Grid.ColumnProperty] = 0 },
+                                new GridSplitter { [Grid.ColumnProperty] = 1, Name = "splitter" },
+                                new Border { [Grid.ColumnProperty] = 2 },
+                            }
                        };
 
             var root = new TestRoot { Child = grid };
@@ -99,11 +99,11 @@ namespace Avalonia.Controls.UnitTests
 
             var grid = new Grid()
                        {
-                           RowDefinitions = rowDefinitions,
-                           Children = new Controls()
-                                      {
-                                          control1, splitter, control2
-                                      }
+                            RowDefinitions = rowDefinitions,
+                            Children =
+                            {
+                                control1, splitter, control2
+                            }
                        };
 
             var root = new TestRoot { Child = grid };
@@ -131,14 +131,14 @@ namespace Avalonia.Controls.UnitTests
         {
             var grid = new Grid()
                        {
-                           ColumnDefinitions = new ColumnDefinitions("Auto,*,*"),
-                           RowDefinitions = new RowDefinitions("*,*"),
-                           Children = new Controls()
-                                      {
-                                          new GridSplitter { [Grid.ColumnProperty] = 0, Name = "splitter" },
-                                          new Border { [Grid.ColumnProperty] = 1 },
-                                          new Border { [Grid.ColumnProperty] = 2 },
-                                      }
+                            ColumnDefinitions = new ColumnDefinitions("Auto,*,*"),
+                            RowDefinitions = new RowDefinitions("*,*"),
+                            Children =
+                            {
+                                new GridSplitter { [Grid.ColumnProperty] = 0, Name = "splitter" },
+                                new Border { [Grid.ColumnProperty] = 1 },
+                                new Border { [Grid.ColumnProperty] = 2 },
+                            }
                        };
 
             var root = new TestRoot { Child = grid };
@@ -171,11 +171,11 @@ namespace Avalonia.Controls.UnitTests
 
             var grid = new Grid()
                        {
-                           ColumnDefinitions = columnDefinitions,
-                           Children = new Controls()
-                                      {
-                                          control1, splitter, control2
-                                      }
+                            ColumnDefinitions = columnDefinitions,
+                            Children =
+                            {
+                                control1, splitter, control2
+                            }
                        };
 
             var root = new TestRoot { Child = grid };
diff --git a/tests/Avalonia.Controls.UnitTests/GridTests.cs b/tests/Avalonia.Controls.UnitTests/GridTests.cs
index a10bb38322..c5aea6501f 100644
--- a/tests/Avalonia.Controls.UnitTests/GridTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/GridTests.cs
@@ -24,7 +24,7 @@ namespace Avalonia.Controls.UnitTests
                     new RowDefinition(GridLength.Auto),
                     new RowDefinition(GridLength.Auto),
                 },
-                Children = new Controls
+                Children =
                 {
                     new Border
                     {
diff --git a/tests/Avalonia.Controls.UnitTests/PanelTests.cs b/tests/Avalonia.Controls.UnitTests/PanelTests.cs
index 29acdaa8d4..fdae707491 100644
--- a/tests/Avalonia.Controls.UnitTests/PanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/PanelTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System.Linq;
-using Avalonia.Collections;
 using Avalonia.LogicalTree;
 using Avalonia.VisualTree;
 using Xunit;
@@ -24,18 +23,6 @@ namespace Avalonia.Controls.UnitTests
             Assert.Same(child.GetVisualParent(), panel);
         }
 
-        [Fact]
-        public void Setting_Controls_Should_Set_Child_Controls_Parent()
-        {
-            var panel = new Panel();
-            var child = new Control();
-
-            panel.Children = new Controls { child };
-
-            Assert.Equal(child.Parent, panel);
-            Assert.Equal(child.GetLogicalParent(), panel);
-        }
-
         [Fact]
         public void Removing_Control_From_Panel_Should_Clear_Child_Controls_Parent()
         {
@@ -69,25 +56,6 @@ namespace Avalonia.Controls.UnitTests
             Assert.Null(child2.GetVisualParent());
         }
 
-        [Fact]
-        public void Resetting_Panel_Children_Should_Clear_Child_Controls_Parent()
-        {
-            var panel = new Panel();
-            var child1 = new Control();
-            var child2 = new Control();
-
-            panel.Children.Add(child1);
-            panel.Children.Add(child2);
-            panel.Children = new Controls();
-
-            Assert.Null(child1.Parent);
-            Assert.Null(child1.GetLogicalParent());
-            Assert.Null(child1.GetVisualParent());
-            Assert.Null(child2.Parent);
-            Assert.Null(child2.GetLogicalParent());
-            Assert.Null(child2.GetVisualParent());
-        }
-
         [Fact]
         public void Replacing_Panel_Children_Should_Clear_And_Set_Control_Parent()
         {
@@ -114,9 +82,9 @@ namespace Avalonia.Controls.UnitTests
 
             panel.Children.Add(child);
 
-            Assert.Equal(new[] { child }, panel.Children);
-            Assert.Equal(new[] { child }, panel.GetLogicalChildren());
-            Assert.Equal(new[] { child }, panel.GetVisualChildren());
+            Assert.Same(new[] { child }, panel.Children);
+            Assert.Same(new[] { child }, panel.GetLogicalChildren());
+            Assert.Same(new[] { child }, panel.GetVisualChildren());
         }
 
         [Fact]
@@ -128,7 +96,7 @@ namespace Avalonia.Controls.UnitTests
             panel.Children.Add(child);
             panel.Children.Remove(child);
 
-            Assert.Equal(new Control[0], panel.Children);
+            Assert.Same(new Control[0], panel.Children);
             Assert.Empty(panel.GetLogicalChildren());
             Assert.Empty(panel.GetVisualChildren());
         }
@@ -144,21 +112,8 @@ namespace Avalonia.Controls.UnitTests
             panel.Children.Add(child2);
             panel.Children.Move(1, 0);
 
-            Assert.Equal(new[] { child2, child1 }, panel.GetLogicalChildren());
-            Assert.Equal(new[] { child2, child1 }, panel.GetVisualChildren());
-        }
-
-        [Fact]
-        public void Setting_Children_Should_Make_Controls_Appear_In_Logical_And_Visual_Children()
-        {
-            var panel = new Panel();
-            var child = new Control();
-
-            panel.Children = new Controls { child };
-
-            Assert.Equal(new[] { child }, panel.Children);
-            Assert.Equal(new[] { child }, panel.GetLogicalChildren());
-            Assert.Equal(new[] { child }, panel.GetVisualChildren());
+            Assert.Same(new[] { child2, child1 }, panel.GetLogicalChildren());
+            Assert.Same(new[] { child2, child1 }, panel.GetVisualChildren());
         }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests.cs
index be3c34ac2e..cd71717619 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests.cs
@@ -67,7 +67,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 {
                     Child = new Panel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new TextBlock(),
                             new Border(),
@@ -101,7 +101,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 {
                     Child = new Panel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new TextBlock(),
                             new Border(),
@@ -124,7 +124,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 {
                     Child = new Panel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new TextBlock(),
                             new Border(),
@@ -189,7 +189,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                         {
                             return new StackPanel
                             {
-                                Children = new Controls
+                                Children =
                                 {
                                     new TextBlock
                                     {
diff --git a/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs b/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs
index 8f815a85c9..68dcfcb770 100644
--- a/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs
@@ -50,7 +50,7 @@ namespace Avalonia.Controls.UnitTests
                     new RowDefinition(1, GridUnitType.Star),
                     new RowDefinition(GridLength.Auto),
                 },
-                Children = new Controls
+                Children =
                 {
                     new ScrollContentPresenter
                     {
diff --git a/tests/Avalonia.Controls.UnitTests/StackPanelTests.cs b/tests/Avalonia.Controls.UnitTests/StackPanelTests.cs
index 56412d732b..ba80cb779a 100644
--- a/tests/Avalonia.Controls.UnitTests/StackPanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/StackPanelTests.cs
@@ -13,7 +13,7 @@ namespace Avalonia.Controls.UnitTests
         {
             var target = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new Border { Height = 20, Width = 120 },
                     new Border { Height = 30 },
@@ -36,7 +36,7 @@ namespace Avalonia.Controls.UnitTests
             var target = new StackPanel
             {
                 Orientation = Orientation.Horizontal,
-                Children = new Controls
+                Children =
                 {
                     new Border { Width = 20, Height = 120 },
                     new Border { Width = 30 },
@@ -59,7 +59,7 @@ namespace Avalonia.Controls.UnitTests
             var target = new StackPanel
             {
                 Gap = 10,
-                Children = new Controls
+                Children =
                 {
                     new Border { Height = 20, Width = 120 },
                     new Border { Height = 30 },
@@ -83,7 +83,7 @@ namespace Avalonia.Controls.UnitTests
             {
                 Gap = 10,
                 Orientation = Orientation.Horizontal,
-                Children = new Controls
+                Children =
                 {
                     new Border { Width = 20, Height = 120 },
                     new Border { Width = 30 },
@@ -106,7 +106,7 @@ namespace Avalonia.Controls.UnitTests
             var target = new StackPanel
             {
                 Height = 60,
-                Children = new Controls
+                Children =
                 {
                     new Border { Height = 20, Width = 120 },
                     new Border { Height = 30 },
@@ -130,7 +130,7 @@ namespace Avalonia.Controls.UnitTests
             {
                 Width = 60,
                 Orientation = Orientation.Horizontal,
-                Children = new Controls
+                Children =
                 {
                     new Border { Width = 20, Height = 120 },
                     new Border { Width = 30 },
diff --git a/tests/Avalonia.Controls.UnitTests/TabControlTests.cs b/tests/Avalonia.Controls.UnitTests/TabControlTests.cs
index 638d773cd0..67b224d6a0 100644
--- a/tests/Avalonia.Controls.UnitTests/TabControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TabControlTests.cs
@@ -272,7 +272,7 @@ namespace Avalonia.Controls.UnitTests
         {
             return new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new TabStrip
                     {
diff --git a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
index 17eccc96bc..625d9eb26e 100644
--- a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
@@ -432,7 +432,7 @@ namespace Avalonia.Controls.UnitTests
         {
             return new FuncControlTemplate<TreeViewItem>(parent => new Panel
             {
-                Children = new Controls
+                Children =
                 {
                     new ContentPresenter
                     {
diff --git a/tests/Avalonia.Controls.UnitTests/WrapPanelTests.cs b/tests/Avalonia.Controls.UnitTests/WrapPanelTests.cs
index 1a46e24b16..cd35627064 100644
--- a/tests/Avalonia.Controls.UnitTests/WrapPanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WrapPanelTests.cs
@@ -12,12 +12,12 @@ namespace Avalonia.Controls.UnitTests
         {
             var target = new WrapPanel()
                          {
-                             Width = 100,
-                             Children = new Controls
-                                        {
-                                            new Border { Height = 50, Width = 100 },
-                                            new Border { Height = 50, Width = 100 },
-                                        }
+                            Width = 100,
+                            Children =
+                            {
+                                new Border { Height = 50, Width = 100 },
+                                new Border { Height = 50, Width = 100 },
+                            }
                          };
 
             target.Measure(Size.Infinity);
@@ -33,12 +33,12 @@ namespace Avalonia.Controls.UnitTests
         {
             var target = new WrapPanel()
                          {
-                             Width = 200,
-                             Children = new Controls
-                                        {
-                                            new Border { Height = 50, Width = 100 },
-                                            new Border { Height = 50, Width = 100 },
-                                        }
+                            Width = 200,
+                            Children =
+                            {
+                                new Border { Height = 50, Width = 100 },
+                                new Border { Height = 50, Width = 100 },
+                            }
                          };
 
             target.Measure(Size.Infinity);
@@ -54,13 +54,13 @@ namespace Avalonia.Controls.UnitTests
         {
             var target = new WrapPanel()
                          {
-                             Orientation = Orientation.Vertical,
-                             Height = 120,
-                             Children = new Controls
-                                        {
-                                            new Border { Height = 50, Width = 100 },
-                                            new Border { Height = 50, Width = 100 },
-                                        }
+                            Orientation = Orientation.Vertical,
+                            Height = 120,
+                            Children =
+                            {
+                                new Border { Height = 50, Width = 100 },
+                                new Border { Height = 50, Width = 100 },
+                            }
                          };
 
             target.Measure(Size.Infinity);
@@ -76,13 +76,13 @@ namespace Avalonia.Controls.UnitTests
         {
             var target = new WrapPanel()
                          {
-                             Orientation = Orientation.Vertical,
-                             Height = 60,
-                             Children = new Controls
-                                        {
-                                            new Border { Height = 50, Width = 100 },
-                                            new Border { Height = 50, Width = 100 },
-                                        }
+                            Orientation = Orientation.Vertical,
+                            Height = 60,
+                            Children =
+                            {
+                                new Border { Height = 50, Width = 100 },
+                                new Border { Height = 50, Width = 100 },
+                            }
                          };
 
             target.Measure(Size.Infinity);
diff --git a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Arrows.cs b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Arrows.cs
index 2b9b0baf01..b81b724e2a 100644
--- a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Arrows.cs
+++ b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Arrows.cs
@@ -6,8 +6,6 @@ using Xunit;
 
 namespace Avalonia.Input.UnitTests
 {
-    using Controls = Controls.Controls;
-
     public class KeyboardNavigationTests_Arrows
     {
         [Fact]
@@ -18,12 +16,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             (current = new Button { Name = "Button2" }),
@@ -33,7 +31,7 @@ namespace Avalonia.Input.UnitTests
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -56,12 +54,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             new Button { Name = "Button2" },
@@ -71,7 +69,7 @@ namespace Avalonia.Input.UnitTests
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                        Children = new Controls
+                        Children =
                         {
                             (next = new Button { Name = "Button4" }),
                             new Button { Name = "Button5" },
@@ -94,12 +92,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             new Button { Name = "Button2" },
@@ -123,16 +121,16 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new StackPanel
                             {
                                 [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                                Children = new Controls
+                                Children =
                                 {
                                     new Button { Name = "Button1" },
                                     new Button { Name = "Button2" },
@@ -144,7 +142,7 @@ namespace Avalonia.Input.UnitTests
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                        Children = new Controls
+                        Children =
                         {
                             (next = new Button { Name = "Button4" }),
                             new Button { Name = "Button5" },
@@ -167,7 +165,7 @@ namespace Avalonia.Input.UnitTests
             var top = new StackPanel
             {
                 [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                Children = new Controls
+                Children =
                 {
                     (next = new Button { Name = "Button1" }),
                 }
@@ -187,17 +185,17 @@ namespace Avalonia.Input.UnitTests
             var top = new StackPanel
             {
                 [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                        Children = new Controls
+                        Children =
                         {
                             new StackPanel
                             {
                                 [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                                Children = new Controls
+                                Children =
                                 {
                                     (next = new Button { Name = "Button1" }),
                                     new Button { Name = "Button2" },
@@ -209,7 +207,7 @@ namespace Avalonia.Input.UnitTests
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -232,12 +230,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Cycle,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             (current = new Button { Name = "Button2" }),
@@ -246,7 +244,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -269,12 +267,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Cycle,
-                        Children = new Controls
+                        Children =
                         {
                             (next = new Button { Name = "Button1" }),
                             new Button { Name = "Button2" },
@@ -283,7 +281,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -306,12 +304,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             (current = new Button { Name = "Button2" }),
@@ -321,7 +319,7 @@ namespace Avalonia.Input.UnitTests
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -343,12 +341,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             new Button { Name = "Button2" },
@@ -358,7 +356,7 @@ namespace Avalonia.Input.UnitTests
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -380,12 +378,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.None,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             (current = new Button { Name = "Button2" }),
@@ -395,7 +393,7 @@ namespace Avalonia.Input.UnitTests
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -418,12 +416,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             (next = new Button { Name = "Button2" }),
@@ -433,7 +431,7 @@ namespace Avalonia.Input.UnitTests
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -456,12 +454,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             new Button { Name = "Button2" },
@@ -471,7 +469,7 @@ namespace Avalonia.Input.UnitTests
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                        Children = new Controls
+                        Children =
                         {
                             (current = new Button { Name = "Button4" }),
                             new Button { Name = "Button5" },
@@ -495,12 +493,12 @@ namespace Avalonia.Input.UnitTests
             var top = new StackPanel
             {
                 [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             new Button { Name = "Button2" },
@@ -524,16 +522,16 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new StackPanel
                             {
                                 [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                                Children = new Controls
+                                Children =
                                 {
                                     new Button { Name = "Button1" },
                                     new Button { Name = "Button2" },
@@ -545,7 +543,7 @@ namespace Avalonia.Input.UnitTests
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                        Children = new Controls
+                        Children =
                         {
                             (current = new Button { Name = "Button4" }),
                             new Button { Name = "Button5" },
@@ -568,16 +566,16 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new StackPanel
                             {
                                 [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                                Children = new Controls
+                                Children =
                                 {
                                     (current = new Button { Name = "Button1" }),
                                     new Button { Name = "Button2" },
@@ -589,7 +587,7 @@ namespace Avalonia.Input.UnitTests
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -632,12 +630,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Cycle,
-                        Children = new Controls
+                        Children =
                         {
                             (next = new Button { Name = "Button1" }),
                             (current = new Button { Name = "Button2" }),
@@ -647,7 +645,7 @@ namespace Avalonia.Input.UnitTests
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Cycle,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -670,12 +668,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Cycle,
-                        Children = new Controls
+                        Children =
                         {
                             (current = new Button { Name = "Button1" }),
                             new Button { Name = "Button2" },
@@ -685,7 +683,7 @@ namespace Avalonia.Input.UnitTests
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Cycle,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -708,12 +706,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children = new Controls
+                        Children =
                         {
                             (next = new Button { Name = "Button1" }),
                             (current = new Button { Name = "Button2" }),
@@ -723,7 +721,7 @@ namespace Avalonia.Input.UnitTests
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -745,12 +743,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children = new Controls
+                        Children =
                         {
                             (current = new Button { Name = "Button1" }),
                             new Button { Name = "Button2" },
@@ -760,7 +758,7 @@ namespace Avalonia.Input.UnitTests
                     new StackPanel
                     {
                         [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -783,7 +781,7 @@ namespace Avalonia.Input.UnitTests
             var top = new StackPanel
             {
                 [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Contained,
-                Children = new Controls
+                Children =
                 {
                     (current = new Decorator
                     {
diff --git a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
index 2cc7a4281b..ad70dcd470 100644
--- a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
+++ b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
@@ -6,8 +6,6 @@ using Xunit;
 
 namespace Avalonia.Input.UnitTests
 {
-    using Controls = Controls.Controls;
-
     public class KeyboardNavigationTests_Tab
     {
         [Fact]
@@ -18,11 +16,11 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             (current = new Button { Name = "Button2" }),
@@ -31,7 +29,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -54,11 +52,11 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             new Button { Name = "Button2" },
@@ -67,7 +65,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             (next = new Button { Name = "Button4" }),
                             new Button { Name = "Button5" },
@@ -90,11 +88,11 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             (next = new Button { Name = "Button1" }),
                             new Button { Name = "Button2" },
@@ -104,11 +102,11 @@ namespace Avalonia.Input.UnitTests
                     new StackPanel
                     {
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.None,
-                        Children = new Controls
+                        Children =
                         {
                             new StackPanel
                             {
-                                Children = new Controls
+                                Children =
                                 {
                                     new Button { Name = "Button4" },
                                     new Button { Name = "Button5" },
@@ -133,11 +131,11 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             new Button { Name = "Button2" },
@@ -161,15 +159,15 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new StackPanel
                             {
-                                Children = new Controls
+                                Children =
                                 {
                                     new Button { Name = "Button1" },
                                     new Button { Name = "Button2" },
@@ -180,7 +178,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             (next = new Button { Name = "Button4" }),
                             new Button { Name = "Button5" },
@@ -202,7 +200,7 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     (next = new Button { Name = "Button1" }),
                 }
@@ -221,15 +219,15 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new StackPanel
                             {
-                                Children = new Controls
+                                Children =
                                 {
                                     (next = new Button { Name = "Button1" }),
                                     new Button { Name = "Button2" },
@@ -240,7 +238,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -263,12 +261,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             (current = new Button { Name = "Button2" }),
@@ -277,7 +275,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -300,12 +298,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                        Children = new Controls
+                        Children =
                         {
                             (next = new Button { Name = "Button1" }),
                             new Button { Name = "Button2" },
@@ -314,7 +312,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -337,12 +335,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             (current = new Button { Name = "Button2" }),
@@ -351,7 +349,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -373,12 +371,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             new Button { Name = "Button2" },
@@ -387,7 +385,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -410,12 +408,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             (current = new Button { Name = "Button2" }),
@@ -424,7 +422,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             (next = new Button { Name = "Button4" }),
                             new Button { Name = "Button5" },
@@ -448,12 +446,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     (container = new StackPanel
                     {
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             (next = new Button { Name = "Button2" }),
@@ -462,7 +460,7 @@ namespace Avalonia.Input.UnitTests
                     }),
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -487,12 +485,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.None,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             (current = new Button { Name = "Button2" }),
@@ -501,7 +499,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             (next = new Button { Name = "Button4" }),
                             new Button { Name = "Button5" },
@@ -525,12 +523,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     (container = new StackPanel
                     {
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.None,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             new Button { Name = "Button2" },
@@ -539,7 +537,7 @@ namespace Avalonia.Input.UnitTests
                     }),
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             (next = new Button { Name = "Button4" }),
                             new Button { Name = "Button5" },
@@ -564,11 +562,11 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             (next = new Button { Name = "Button2" }),
@@ -577,7 +575,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -600,11 +598,11 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             new Button { Name = "Button2" },
@@ -613,7 +611,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             (current = new Button { Name = "Button4" }),
                             new Button { Name = "Button5" },
@@ -636,11 +634,11 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             new Button { Name = "Button2" },
@@ -664,15 +662,15 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new StackPanel
                             {
-                                Children = new Controls
+                                Children =
                                 {
                                     new Button { Name = "Button1" },
                                     new Button { Name = "Button2" },
@@ -683,7 +681,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             (current = new Button { Name = "Button4" }),
                             new Button { Name = "Button5" },
@@ -706,15 +704,15 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new StackPanel
                             {
-                                Children = new Controls
+                                Children =
                                 {
                                     (current = new Button { Name = "Button1" }),
                                     new Button { Name = "Button2" },
@@ -725,7 +723,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -767,12 +765,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                        Children = new Controls
+                        Children =
                         {
                             (next = new Button { Name = "Button1" }),
                             (current = new Button { Name = "Button2" }),
@@ -781,7 +779,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -804,12 +802,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
-                        Children = new Controls
+                        Children =
                         {
                             (current = new Button { Name = "Button1" }),
                             new Button { Name = "Button2" },
@@ -818,7 +816,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -841,12 +839,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children = new Controls
+                        Children =
                         {
                             (next = new Button { Name = "Button1" }),
                             (current = new Button { Name = "Button2" }),
@@ -855,7 +853,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -877,12 +875,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
-                        Children = new Controls
+                        Children =
                         {
                             (current = new Button { Name = "Button1" }),
                             new Button { Name = "Button2" },
@@ -891,7 +889,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             new Button { Name = "Button5" },
@@ -914,11 +912,11 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             new Button { Name = "Button2" },
@@ -928,7 +926,7 @@ namespace Avalonia.Input.UnitTests
                     new StackPanel
                     {
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button4" },
                             (current = new Button { Name = "Button5" }),
@@ -952,12 +950,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     (container = new StackPanel
                     {
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
-                        Children = new Controls
+                        Children =
                         {
                             new Button { Name = "Button1" },
                             (next = new Button { Name = "Button2" }),
@@ -966,7 +964,7 @@ namespace Avalonia.Input.UnitTests
                     }),
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             (current = new Button { Name = "Button4" }),
                             new Button { Name = "Button5" },
@@ -991,12 +989,12 @@ namespace Avalonia.Input.UnitTests
 
             var top = new StackPanel
             {
-                Children = new Controls
+                Children =
                 {
                     new StackPanel
                     {
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
-                        Children = new Controls
+                        Children =
                         {
                             (next = new Button { Name = "Button1" }),
                             new Button { Name = "Button2" },
@@ -1005,7 +1003,7 @@ namespace Avalonia.Input.UnitTests
                     },
                     new StackPanel
                     {
-                        Children = new Controls
+                        Children =
                         {
                             (current = new Button { Name = "Button4" }),
                             new Button { Name = "Button5" },
@@ -1028,7 +1026,7 @@ namespace Avalonia.Input.UnitTests
             var top = new StackPanel
             {
                 [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Contained,
-                Children = new Controls
+                Children =
                 {
                     (current = new Decorator
                     {
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs b/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs
index 361e7678be..4fce3fec0e 100644
--- a/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs
+++ b/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs
@@ -275,10 +275,10 @@ namespace Avalonia.Layout.UnitTests
                 {
                     Child = panel = new StackPanel
                     {
-                        Children = new Controls.Controls
-                    {
-                        (border = new Border())
-                    }
+                        Children =
+                        {
+                            (border = new Border())
+                        }
                     }
                 };
 
diff --git a/tests/Avalonia.Markup.UnitTests/ControlLocatorTests.cs b/tests/Avalonia.Markup.UnitTests/ControlLocatorTests.cs
index a5414f1e8c..b3e983036d 100644
--- a/tests/Avalonia.Markup.UnitTests/ControlLocatorTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/ControlLocatorTests.cs
@@ -23,7 +23,7 @@ namespace Avalonia.Markup.UnitTests
             {
                 Child = new StackPanel
                 {
-                    Children = new Controls.Controls
+                    Children =
                     {
                         (target = new TextBlock { Name = "target" }),
                         (relativeTo = new TextBlock { Name = "start" }),
@@ -49,7 +49,7 @@ namespace Avalonia.Markup.UnitTests
             {
                 Child = (panel = new StackPanel
                 {
-                    Children = new Controls.Controls
+                    Children =
                     {
                         (relativeTo = new TextBlock
                         {
@@ -84,7 +84,7 @@ namespace Avalonia.Markup.UnitTests
             {
                 Child = panel = new StackPanel
                 {
-                    Children = new Controls.Controls
+                    Children =
                     {
                         (target = new TextBlock { Name = "target" }),
                         (relativeTo = new TextBlock { Name = "start" }),
@@ -114,7 +114,7 @@ namespace Avalonia.Markup.UnitTests
             {
                 Child = new StackPanel
                 {
-                    Children = new Controls.Controls
+                    Children =
                     {
                         (relativeTo = new TextBlock
                         {
@@ -129,7 +129,7 @@ namespace Avalonia.Markup.UnitTests
             {
                 Child = new StackPanel
                 {
-                    Children = new Controls.Controls
+                    Children =
                     {
                         (target2 = new TextBlock { Name = "target" }),
                     }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_ElementName.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_ElementName.cs
index 40a4a6f0b3..d582964987 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_ElementName.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_ElementName.cs
@@ -18,7 +18,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
             {
                 Child = new StackPanel
                 {
-                    Children = new Controls.Controls
+                    Children =
                     {
                         new TextBlock
                         {
@@ -54,7 +54,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
             {
                 Child = new StackPanel
                 {
-                    Children = new Controls.Controls
+                    Children =
                     {
                         (source = new TextBlock
                         {
@@ -89,7 +89,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
             {
                 Child = stackPanel = new StackPanel
                 {
-                    Children = new Controls.Controls
+                    Children =
                     {
                         (target = new TextBlock
                         {
@@ -126,7 +126,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
             {
                 Child = stackPanel = new StackPanel
                 {
-                    Children = new Controls.Controls
+                    Children =
                     {
                         (target = new ContentControl
                         {
diff --git a/tests/Avalonia.RenderTests/GeometryClippingTests.cs b/tests/Avalonia.RenderTests/GeometryClippingTests.cs
index 01af638e6d..7a01c308a4 100644
--- a/tests/Avalonia.RenderTests/GeometryClippingTests.cs
+++ b/tests/Avalonia.RenderTests/GeometryClippingTests.cs
@@ -29,7 +29,7 @@ namespace Avalonia.Direct2D1.RenderTests
                 Clip = StreamGeometry.Parse("F1 M 0,0  H 76 V 76 Z"),
                 Width = 76,
                 Height = 76,
-                Children = new Avalonia.Controls.Controls
+                Children =
                 {
                     new Path
                     {
diff --git a/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs b/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs
index 60589f6a00..099b022862 100644
--- a/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs
+++ b/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs
@@ -33,7 +33,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             {
                 return new Panel
                 {
-                    Children = new Avalonia.Controls.Controls
+                    Children =
                     {
                         new Image
                         {
diff --git a/tests/Avalonia.RenderTests/OpacityMaskTests.cs b/tests/Avalonia.RenderTests/OpacityMaskTests.cs
index b53d9a70b1..1934654c26 100644
--- a/tests/Avalonia.RenderTests/OpacityMaskTests.cs
+++ b/tests/Avalonia.RenderTests/OpacityMaskTests.cs
@@ -37,7 +37,7 @@ namespace Avalonia.Direct2D1.RenderTests
                 },
                 Width = 76,
                 Height = 76,
-                Children = new Avalonia.Controls.Controls
+                Children =
                 {
                     new Path
                     {
diff --git a/tests/Avalonia.RenderTests/SVGPathTests.cs b/tests/Avalonia.RenderTests/SVGPathTests.cs
index d1ed0ae1cf..3d0275c072 100644
--- a/tests/Avalonia.RenderTests/SVGPathTests.cs
+++ b/tests/Avalonia.RenderTests/SVGPathTests.cs
@@ -30,7 +30,7 @@ namespace Avalonia.Direct2D1.RenderTests
                 Background = Brushes.Yellow,
                 Width = 76,
                 Height = 76,
-                Children = new Avalonia.Controls.Controls
+                Children =
                 {
                     new Path
                     {
diff --git a/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs b/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs
index bcb5250be6..b87e72516b 100644
--- a/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs
+++ b/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs
@@ -21,7 +21,7 @@ namespace Avalonia.Visuals.UnitTests
                 Width = 100,
                 Height = 100,
                 ClipToBounds = true,
-                Children = new Controls.Controls
+                Children =
                 {
                     (target = new TestControl
                     {
@@ -47,7 +47,7 @@ namespace Avalonia.Visuals.UnitTests
                 Width = 100,
                 Height = 100,
                 ClipToBounds = true,
-                Children = new Controls.Controls
+                Children =
                 {
                     (target = new TestControl
                     {
@@ -74,7 +74,7 @@ namespace Avalonia.Visuals.UnitTests
                 Width = 100,
                 Height = 100,
                 ClipToBounds = true,
-                Children = new Controls.Controls
+                Children =
                 {
                     new Canvas
                     {
@@ -82,7 +82,7 @@ namespace Avalonia.Visuals.UnitTests
                         Height = 100,
                         [Canvas.LeftProperty] = 50,
                         [Canvas.TopProperty] = 50,
-                        Children = new Controls.Controls
+                        Children =
                         {
                             (target = new TestControl
                             {
@@ -111,7 +111,7 @@ namespace Avalonia.Visuals.UnitTests
                 Width = 100,
                 Height = 100,
                 ClipToBounds = true,
-                Children = new Controls.Controls
+                Children =
                 {
                     (target = new TestControl
                     {
@@ -138,7 +138,7 @@ namespace Avalonia.Visuals.UnitTests
                 Width = 100,
                 Height = 100,
                 ClipToBounds = true,
-                Children = new Controls.Controls
+                Children =
                 {
                     new Border
                     {
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
index 9e2f1fc293..3a9e45a02b 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
@@ -154,7 +154,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                     {
                         Width = 200,
                         Height = 200,
-                        Children = new Controls.Controls
+                        Children =
                         {
                             new Border
                             {
@@ -198,7 +198,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                     {
                         Width = 200,
                         Height = 200,
-                        Children = new Controls.Controls
+                        Children =
                         {
                             new Border
                             {
@@ -255,7 +255,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                         Height = 200,
                         Background = Brushes.Red,
                         ClipToBounds = false,
-                        Children = new Controls.Controls
+                        Children =
                         {
                             new Border
                             {
@@ -303,7 +303,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                         Width = 100,
                         Height = 200,
                         Background = Brushes.Red,
-                        Children = new Controls.Controls
+                        Children =
                         {
                             new Panel()
                             {
@@ -312,7 +312,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                                 Background = Brushes.Red,
                                 Margin = new Thickness(0, 100, 0, 0),
                                 ClipToBounds = true,
-                                Children = new Controls.Controls
+                                Children =
                                 {
                                     (target = new Border()
                                     {
@@ -354,7 +354,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                         Width = 100,
                         Height = 200,
                         Background = Brushes.Red,
-                        Children = new Controls.Controls
+                        Children =
                         {
                             (target = new Border()
                             {
@@ -374,7 +374,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                                 {
                                     Content = new StackPanel()
                                     {
-                                        Children = new Controls.Controls
+                                        Children =
                                         {
                                             (item1 = new Border()
                                             {
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
index c8a19a9f46..9a1d8cb59c 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
@@ -126,7 +126,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                     {
                         Width = 200,
                         Height = 200,
-                        Children = new Controls.Controls
+                        Children =
                         {
                             new Border
                             {
@@ -171,7 +171,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                     {
                         Width = 200,
                         Height = 200,
-                        Children = new Controls.Controls
+                        Children =
                         {
                             new Border
                             {
@@ -238,7 +238,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                         Height = 200,
                         Background = Brushes.Red,
                         ClipToBounds = false,
-                        Children = new Controls.Controls
+                        Children =
                         {
                             new Border
                             {
@@ -287,7 +287,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                         Width = 100,
                         Height = 200,
                         Background = Brushes.Red,
-                        Children = new Controls.Controls
+                        Children =
                         {
                             new Panel()
                             {
@@ -296,7 +296,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                                 Background = Brushes.Red,
                                 Margin = new Thickness(0, 100, 0, 0),
                                 ClipToBounds = true,
-                                Children = new Controls.Controls
+                                Children =
                                 {
                                     (target = new Border()
                                     {
@@ -339,7 +339,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                         Width = 100,
                         Height = 200,
                         Background = Brushes.Red,
-                        Children = new Controls.Controls
+                        Children =
                         {
                             (target = new Border()
                             {
@@ -359,7 +359,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                                 {
                                     Content = new StackPanel()
                                     {
-                                        Children = new Controls.Controls
+                                        Children =
                                         {
                                             (item1 = new Border()
                                             {

From ea0e4217a7695c3cd3b67e5be1ffead2b4146d14 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 6 Dec 2017 09:12:43 +0100
Subject: [PATCH 214/482] Run D2D render tests in ncrunch.

---
 .ncrunch/Avalonia.Direct2D1.RenderTests.v3.ncrunchproject | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.ncrunch/Avalonia.Direct2D1.RenderTests.v3.ncrunchproject b/.ncrunch/Avalonia.Direct2D1.RenderTests.v3.ncrunchproject
index a8c3abe8f2..04ab17c4e1 100644
--- a/.ncrunch/Avalonia.Direct2D1.RenderTests.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Direct2D1.RenderTests.v3.ncrunchproject
@@ -1,7 +1,6 @@
 <ProjectConfiguration>
   <Settings>
-    <DefaultTestTimeout>1000</DefaultTestTimeout>
-    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+    <DefaultTestTimeout>3000</DefaultTestTimeout>
     <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
   </Settings>
 </ProjectConfiguration>
\ No newline at end of file

From e6b5df8d089aaef984627fa43ecc61402f91eb8c Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 6 Dec 2017 10:21:52 +0100
Subject: [PATCH 215/482] Simplified DeferredRendererTests,

---
 .../Rendering/DeferredRenderer.cs             |  18 ++-
 tests/Avalonia.UnitTests/TestRoot.cs          |  18 ++-
 .../Rendering/DeferredRendererTests.cs        | 140 +++++-------------
 3 files changed, 63 insertions(+), 113 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index cba09297f3..2bc7121d73 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -25,7 +25,6 @@ namespace Avalonia.Rendering
         private readonly IRenderLoop _renderLoop;
         private readonly IVisual _root;
         private readonly ISceneBuilder _sceneBuilder;
-        private readonly RenderLayers _layers;
 
         private bool _running;
         private Scene _scene;
@@ -56,7 +55,7 @@ namespace Avalonia.Rendering
             _dispatcher = dispatcher ?? Dispatcher.UIThread;
             _root = root;
             _sceneBuilder = sceneBuilder ?? new SceneBuilder();
-            _layers = new RenderLayers();
+            Layers = new RenderLayers();
             _renderLoop = renderLoop;
         }
 
@@ -80,7 +79,7 @@ namespace Avalonia.Rendering
             _root = root;
             _renderTarget = renderTarget;
             _sceneBuilder = sceneBuilder ?? new SceneBuilder();
-            _layers = new RenderLayers();
+            Layers = new RenderLayers();
         }
 
         /// <inheritdoc/>
@@ -94,6 +93,11 @@ namespace Avalonia.Rendering
         /// </summary>
         public string DebugFramesPath { get; set; }
 
+        /// <summary>
+        /// Gets the render layers.
+        /// </summary>
+        internal RenderLayers Layers { get; }
+
         /// <inheritdoc/>
         public void AddDirty(IVisual visual)
         {
@@ -192,7 +196,7 @@ namespace Avalonia.Rendering
                     if (scene.Generation != _lastSceneId)
                     {
                         context = _renderTarget.CreateDrawingContext(this);
-                        _layers.Update(scene, context);
+                        Layers.Update(scene, context);
 
                         RenderToLayers(scene);
 
@@ -262,7 +266,7 @@ namespace Avalonia.Rendering
             {
                 foreach (var layer in scene.Layers)
                 {
-                    var renderTarget = _layers[layer.LayerRoot].Bitmap;
+                    var renderTarget = Layers[layer.LayerRoot].Bitmap;
                     var node = (VisualNode)scene.FindNode(layer.LayerRoot);
 
                     if (node != null)
@@ -322,7 +326,7 @@ namespace Avalonia.Rendering
 
             foreach (var layer in scene.Layers)
             {
-                var bitmap = _layers[layer.LayerRoot].Bitmap;
+                var bitmap = Layers[layer.LayerRoot].Bitmap;
                 var sourceRect = new Rect(0, 0, bitmap.PixelWidth, bitmap.PixelHeight);
 
                 if (layer.GeometryClip != null)
@@ -442,7 +446,7 @@ namespace Avalonia.Rendering
         {
             var index = 0;
 
-            foreach (var layer in _layers)
+            foreach (var layer in Layers)
             {
                 var fileName = Path.Combine(DebugFramesPath, $"frame-{id}-layer-{index++}.png");
                 layer.Bitmap.Save(fileName);
diff --git a/tests/Avalonia.UnitTests/TestRoot.cs b/tests/Avalonia.UnitTests/TestRoot.cs
index 9ec053f075..dc137e3533 100644
--- a/tests/Avalonia.UnitTests/TestRoot.cs
+++ b/tests/Avalonia.UnitTests/TestRoot.cs
@@ -16,8 +16,6 @@ namespace Avalonia.UnitTests
     public class TestRoot : Decorator, IFocusScope, ILayoutRoot, IInputRoot, INameScope, IRenderRoot, IStyleRoot
     {
         private readonly NameScope _nameScope = new NameScope();
-        private readonly IRenderTarget _renderTarget = Mock.Of<IRenderTarget>(
-            x => x.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>()) == Mock.Of<IDrawingContextImpl>());
 
         public TestRoot()
         {
@@ -65,7 +63,21 @@ namespace Avalonia.UnitTests
 
         IStyleHost IStyleHost.StylingParent => StylingParent;
 
-        public IRenderTarget CreateRenderTarget() => _renderTarget;
+        public IRenderTarget CreateRenderTarget()
+        {
+            var dc = new Mock<IDrawingContextImpl>();
+            dc.Setup(x => x.CreateLayer(It.IsAny<Size>())).Returns(() =>
+            {
+                var layerDc = new Mock<IDrawingContextImpl>();
+                var layer = new Mock<IRenderTargetBitmapImpl>();
+                layer.Setup(x => x.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>())).Returns(layerDc.Object);
+                return layer.Object;
+            });
+
+            var result = new Mock<IRenderTarget>();
+            result.Setup(x => x.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>())).Returns(dc.Object);
+            return result.Object;
+        }
 
         public void Invalidate(Rect rect)
         {
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
index afe7b04664..e3b2577e79 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
@@ -21,28 +21,18 @@ namespace Avalonia.Visuals.UnitTests.Rendering
         [Fact]
         public void First_Frame_Calls_UpdateScene_On_Dispatcher()
         {
-            var loop = new Mock<IRenderLoop>();
             var root = new TestRoot();
 
             var dispatcher = new Mock<IDispatcher>();
             dispatcher.Setup(x => x.InvokeAsync(It.IsAny<Action>(), DispatcherPriority.Render))
                 .Callback<Action, DispatcherPriority>((a, p) => a());
 
-            var target = new DeferredRenderer(
-                root,
-                loop.Object,
-                sceneBuilder: MockSceneBuilder(root).Object,
-                dispatcher: dispatcher.Object);
+            CreateTargetAndRunFrame(root, dispatcher: dispatcher.Object);
 
-            target.Start();
-            RunFrame(loop);
-
-#if !NETCOREAPP1_1 // Delegate.Method is not available in netcoreapp1.1
             dispatcher.Verify(x => 
                 x.InvokeAsync(
                     It.Is<Action>(a => a.Method.Name == "UpdateScene"),
                     DispatcherPriority.Render));
-#endif
         }
 
         [Fact]
@@ -51,15 +41,8 @@ namespace Avalonia.Visuals.UnitTests.Rendering
             var loop = new Mock<IRenderLoop>();
             var root = new TestRoot();
             var sceneBuilder = MockSceneBuilder(root);
-            var dispatcher = new ImmediateDispatcher();
-            var target = new DeferredRenderer(
-                root,
-                loop.Object,
-                sceneBuilder: sceneBuilder.Object,
-                dispatcher: dispatcher);
 
-            target.Start();
-            RunFrame(loop);
+            CreateTargetAndRunFrame(root, sceneBuilder: sceneBuilder.Object);
 
             sceneBuilder.Verify(x => x.UpdateAll(It.IsAny<Scene>()));
         }
@@ -70,12 +53,10 @@ namespace Avalonia.Visuals.UnitTests.Rendering
             var loop = new Mock<IRenderLoop>();
             var root = new TestRoot();
             var sceneBuilder = MockSceneBuilder(root);
-            var dispatcher = new ImmediateDispatcher();
             var target = new DeferredRenderer(
                 root,
                 loop.Object,
-                sceneBuilder: sceneBuilder.Object,
-                dispatcher: dispatcher);
+                sceneBuilder: sceneBuilder.Object);
 
             target.Start();
             IgnoreFirstFrame(loop, sceneBuilder);
@@ -145,24 +126,8 @@ namespace Avalonia.Visuals.UnitTests.Rendering
             root.Measure(Size.Infinity);
             root.Arrange(new Rect(root.DesiredSize));
 
-            var rootLayer = CreateLayer();
-            var borderLayer = CreateLayer();
-            var renderTargetContext = Mock.Get(root.CreateRenderTarget().CreateDrawingContext(null));
-            renderTargetContext.SetupSequence(x => x.CreateLayer(It.IsAny<Size>()))
-                .Returns(rootLayer)
-                .Returns(borderLayer);
-
-            var loop = new Mock<IRenderLoop>();
-            var target = new DeferredRenderer(
-                root,
-                loop.Object,
-                dispatcher: new ImmediateDispatcher());
-            root.Renderer = target;
-
-            target.Start();
-            RunFrame(loop);
-
-            var context = Mock.Get(rootLayer.CreateDrawingContext(null));
+            var target = CreateTargetAndRunFrame(root);
+            var context = GetLayerContext(target, root);
             var animation = new BehaviorSubject<double>(0.5);
 
             context.Verify(x => x.PushOpacity(0.5), Times.Once);
@@ -191,24 +156,8 @@ namespace Avalonia.Visuals.UnitTests.Rendering
             root.Measure(Size.Infinity);
             root.Arrange(new Rect(root.DesiredSize));
 
-            var rootLayer = CreateLayer();
-            var borderLayer = CreateLayer();
-            var renderTargetContext = Mock.Get(root.CreateRenderTarget().CreateDrawingContext(null));
-            renderTargetContext.SetupSequence(x => x.CreateLayer(It.IsAny<Size>()))
-                .Returns(rootLayer)
-                .Returns(borderLayer);
-
-            var loop = new Mock<IRenderLoop>();
-            var target = new DeferredRenderer(
-                root,
-                loop.Object,
-                dispatcher: new ImmediateDispatcher());
-            root.Renderer = target;
-
-            target.Start();
-            RunFrame(loop);
-
-            var context = Mock.Get(rootLayer.CreateDrawingContext(null));
+            var target = CreateTargetAndRunFrame(root);
+            var context = GetLayerContext(target, root);
             var animation = new BehaviorSubject<double>(0.5);
 
             context.Verify(x => x.PushOpacity(0.5), Times.Never);
@@ -217,12 +166,11 @@ namespace Avalonia.Visuals.UnitTests.Rendering
         }
 
         [Fact]
-        public void Frame_Should_Create_Layer_For_Root()
+        public void Should_Create_Layer_For_Root()
         {
             var loop = new Mock<IRenderLoop>();
             var root = new TestRoot();
             var rootLayer = new Mock<IRenderTargetBitmapImpl>();
-            var dispatcher = new ImmediateDispatcher();
 
             var sceneBuilder = new Mock<ISceneBuilder>();
             sceneBuilder.Setup(x => x.UpdateAll(It.IsAny<Scene>()))
@@ -233,18 +181,9 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 });
 
             var renderInterface = new Mock<IPlatformRenderInterface>();
+            var target = CreateTargetAndRunFrame(root, sceneBuilder: sceneBuilder.Object);
 
-            var target = new DeferredRenderer(
-                root,
-                loop.Object,
-                sceneBuilder: sceneBuilder.Object,
-                dispatcher: dispatcher);
-
-            target.Start();
-            RunFrame(loop);
-
-            var context = Mock.Get(root.CreateRenderTarget().CreateDrawingContext(null));
-            context.Verify(x => x.CreateLayer(root.ClientSize));
+            Assert.Single(target.Layers);
         }
 
         [Fact]
@@ -269,49 +208,44 @@ namespace Avalonia.Visuals.UnitTests.Rendering
             root.Measure(Size.Infinity);
             root.Arrange(new Rect(root.DesiredSize));
 
-            var rootLayer = CreateLayer();
-            var borderLayer = CreateLayer();
-            var renderTargetContext = Mock.Get(root.CreateRenderTarget().CreateDrawingContext(null));
-            renderTargetContext.SetupSequence(x => x.CreateLayer(It.IsAny<Size>()))
-                .Returns(rootLayer)
-                .Returns(borderLayer);
-
             var loop = new Mock<IRenderLoop>();
-            var target = new DeferredRenderer(
-                root,
-                loop.Object,
-                dispatcher: new ImmediateDispatcher());
-            root.Renderer = target;
+            var target = CreateTargetAndRunFrame(root, loop: loop);
 
-            target.Start();
-            RunFrame(loop);
+            Assert.Equal(new[] { root }, target.Layers.Select(x => x.LayerRoot));
 
-            var rootContext = Mock.Get(rootLayer.CreateDrawingContext(null));
-            var borderContext = Mock.Get(borderLayer.CreateDrawingContext(null));
             var animation = new BehaviorSubject<double>(0.5);
-
-            rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
-            rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once);
-            borderContext.Verify(x => x.FillRectangle(It.IsAny<IBrush>(), It.IsAny<Rect>(), It.IsAny<float>()), Times.Never);
-
-            rootContext.ResetCalls();
-            borderContext.ResetCalls();
             border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
             RunFrame(loop);
 
-            rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
-            rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Never);
-            borderContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once);
+            Assert.Equal(new IVisual[] { root, border }, target.Layers.Select(x => x.LayerRoot));
 
-            rootContext.ResetCalls();
-            borderContext.ResetCalls();
             animation.OnCompleted();
             RunFrame(loop);
 
-            Mock.Get(borderLayer).Verify(x => x.Dispose());
-            rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
-            rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once);
-            borderContext.Verify(x => x.FillRectangle(It.IsAny<IBrush>(), It.IsAny<Rect>(), It.IsAny<float>()), Times.Never);
+            Assert.Equal(new[] { root }, target.Layers.Select(x => x.LayerRoot));
+        }
+
+        private DeferredRenderer CreateTargetAndRunFrame(
+            TestRoot root,
+            Mock<IRenderLoop> loop = null,
+            ISceneBuilder sceneBuilder = null,
+            IDispatcher dispatcher = null)
+        {
+            loop = loop ?? new Mock<IRenderLoop>();
+            var target = new DeferredRenderer(
+                root,
+                loop.Object,
+                sceneBuilder: sceneBuilder,
+                dispatcher: dispatcher ?? new ImmediateDispatcher());
+            root.Renderer = target;
+            target.Start();
+            RunFrame(loop);
+            return target;
+        }
+
+        private Mock<IDrawingContextImpl> GetLayerContext(DeferredRenderer renderer, IControl layerRoot)
+        {
+            return Mock.Get(renderer.Layers[layerRoot].Bitmap.CreateDrawingContext(null));
         }
 
         private void IgnoreFirstFrame(Mock<IRenderLoop> loop, Mock<ISceneBuilder> sceneBuilder)

From 1d1f31794e56f5ed54b83209a43eb5b9678b9fb6 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 6 Dec 2017 10:41:38 +0100
Subject: [PATCH 216/482] Fix layers with opacity.

We were pushing the opacity twice.
---
 .../Rendering/DeferredRenderer.cs             | 28 +++---
 .../Rendering/SceneGraph/IVisualNode.cs       |  6 +-
 .../Rendering/SceneGraph/VisualNode.cs        | 10 +--
 .../Rendering/DeferredRendererTests.cs        | 88 +++++++++++++++++++
 4 files changed, 114 insertions(+), 18 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index 2bc7121d73..041d8f8f6b 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -28,7 +28,6 @@ namespace Avalonia.Rendering
 
         private bool _running;
         private Scene _scene;
-        private IRenderTarget _renderTarget;
         private DirtyVisuals _dirty;
         private IRenderTargetBitmapImpl _overlay;
         private bool _updateQueued;
@@ -77,7 +76,7 @@ namespace Avalonia.Rendering
             Contract.Requires<ArgumentNullException>(renderTarget != null);
 
             _root = root;
-            _renderTarget = renderTarget;
+            RenderTarget = renderTarget;
             _sceneBuilder = sceneBuilder ?? new SceneBuilder();
             Layers = new RenderLayers();
         }
@@ -98,6 +97,11 @@ namespace Avalonia.Rendering
         /// </summary>
         internal RenderLayers Layers { get; }
 
+        /// <summary>
+        /// Gets the current render target.
+        /// </summary>
+        internal IRenderTarget RenderTarget { get; private set; }
+
         /// <inheritdoc/>
         public void AddDirty(IVisual visual)
         {
@@ -177,9 +181,9 @@ namespace Avalonia.Rendering
             bool renderOverlay = DrawDirtyRects || DrawFps;
             bool composite = false;
 
-            if (_renderTarget == null)
+            if (RenderTarget == null)
             {
-                _renderTarget = ((IRenderRoot)_root).CreateRenderTarget();
+                RenderTarget = ((IRenderRoot)_root).CreateRenderTarget();
             }
 
             if (renderOverlay)
@@ -195,7 +199,7 @@ namespace Avalonia.Rendering
 
                     if (scene.Generation != _lastSceneId)
                     {
-                        context = _renderTarget.CreateDrawingContext(this);
+                        context = RenderTarget.CreateDrawingContext(this);
                         Layers.Update(scene, context);
 
                         RenderToLayers(scene);
@@ -212,13 +216,13 @@ namespace Avalonia.Rendering
 
                     if (renderOverlay)
                     {
-                        context = context ?? _renderTarget.CreateDrawingContext(this);
+                        context = context ?? RenderTarget.CreateDrawingContext(this);
                         RenderOverlay(scene, context);
                         RenderComposite(scene, context);
                     }
                     else if (composite)
                     {
-                        context = context ?? _renderTarget.CreateDrawingContext(this);
+                        context = context ?? RenderTarget.CreateDrawingContext(this);
                         RenderComposite(scene, context);
                     }
 
@@ -228,8 +232,8 @@ namespace Avalonia.Rendering
             catch (RenderTargetCorruptedException ex)
             {
                 Logging.Logger.Information("Renderer", this, "Render target was corrupted. Exception: {0}", ex);
-                _renderTarget?.Dispose();
-                _renderTarget = null;
+                RenderTarget?.Dispose();
+                RenderTarget = null;
             }
         }
 
@@ -241,7 +245,9 @@ namespace Avalonia.Rendering
 
                 if (!clipBounds.IsEmpty && node.Opacity > 0)
                 {
-                    node.BeginRender(context);
+                    var isLayerRoot = node.Visual == layer;
+
+                    node.BeginRender(context, isLayerRoot);
 
                     foreach (var operation in node.DrawOperations)
                     {
@@ -255,7 +261,7 @@ namespace Avalonia.Rendering
                         Render(context, (VisualNode)child, layer, clipBounds);
                     }
 
-                    node.EndRender(context);
+                    node.EndRender(context, isLayerRoot);
                 }
             }
         }
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs
index 0d2fc17b95..234cadbf31 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs
@@ -72,13 +72,15 @@ namespace Avalonia.Rendering.SceneGraph
         /// Sets up the drawing context for rendering the node's geometry.
         /// </summary>
         /// <param name="context">The drawing context.</param>
-        void BeginRender(IDrawingContextImpl context);
+        /// <param name="skipOpacity">Whether to skip pushing the control's opacity.</param>
+        void BeginRender(IDrawingContextImpl context, bool skipOpacity);
 
         /// <summary>
         /// Resets the drawing context after rendering the node's geometry.
         /// </summary>
         /// <param name="context">The drawing context.</param>
-        void EndRender(IDrawingContextImpl context);
+        /// <param name="skipOpacity">Whether to skip popping the control's opacity.</param>
+        void EndRender(IDrawingContextImpl context, bool skipOpacity);
 
         /// <summary>
         /// Hit test the geometry in this node.
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
index ea3b07ffe3..e9e20557bd 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
@@ -218,15 +218,15 @@ namespace Avalonia.Rendering.SceneGraph
         }
 
         /// <inheritdoc/>
-        public void BeginRender(IDrawingContextImpl context)
+        public void BeginRender(IDrawingContextImpl context, bool skipOpacity)
         {
             if (ClipToBounds)
             {
                 context.Transform = Matrix.Identity;
                 context.PushClip(ClipBounds);
             }
-
-            if (Opacity != 1)
+            
+            if (Opacity != 1 && !skipOpacity)
             {
                 context.PushOpacity(Opacity);
             }
@@ -240,14 +240,14 @@ namespace Avalonia.Rendering.SceneGraph
         }
 
         /// <inheritdoc/>
-        public void EndRender(IDrawingContextImpl context)
+        public void EndRender(IDrawingContextImpl context, bool skipOpacity)
         {
             if (GeometryClip != null)
             {
                 context.PopGeometryClip();
             }
 
-            if (Opacity != 1)
+            if (Opacity != 1 && !skipOpacity)
             {
                 context.PopOpacity();
             }
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
index e3b2577e79..21065cb6b5 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
@@ -201,6 +201,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                     {
                         Background = Brushes.Green,
                         Child = new Canvas(),
+                        Opacity = 0.9,
                     }
                 }
             };
@@ -225,6 +226,93 @@ namespace Avalonia.Visuals.UnitTests.Rendering
             Assert.Equal(new[] { root }, target.Layers.Select(x => x.LayerRoot));
         }
 
+        [Fact]
+        public void Should_Not_Create_Layer_For_Childless_Control_With_Animated_Opacity()
+        {
+            Border border;
+            var root = new TestRoot
+            {
+                Width = 100,
+                Height = 100,
+                Child = new Border
+                {
+                    Background = Brushes.Red,
+                    Child = border = new Border
+                    {
+                        Background = Brushes.Green,
+                    }
+                }
+            };
+
+            var animation = new BehaviorSubject<double>(0.5);
+            border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(root.DesiredSize));
+
+            var loop = new Mock<IRenderLoop>();
+            var target = CreateTargetAndRunFrame(root, loop: loop);
+
+            Assert.Single(target.Layers);
+        }
+
+        [Fact]
+        public void Should_Not_Push_Opacity_For_Transparent_Layer_Root_Control()
+        {
+            Border border;
+            var root = new TestRoot
+            {
+                Width = 100,
+                Height = 100,
+                Child = border = new Border
+                {
+                    Background = Brushes.Red,
+                    Child = new Canvas(),
+                }
+            };
+
+            var animation = new BehaviorSubject<double>(0.5);
+            border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(root.DesiredSize));
+
+            var target = CreateTargetAndRunFrame(root);
+            var context = GetLayerContext(target, border);
+
+            context.Verify(x => x.PushOpacity(0.5), Times.Never);
+            context.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
+            context.Verify(x => x.PopOpacity(), Times.Never);
+        }
+
+        [Fact]
+        public void Should_Draw_Transparent_Layer_With_Correct_Opacity()
+        {
+            Border border;
+            var root = new TestRoot
+            {
+                Width = 100,
+                Height = 100,
+                Child = border = new Border
+                {
+                    Background = Brushes.Red,
+                    Child = new Canvas(),
+                }
+            };
+
+            var animation = new BehaviorSubject<double>(0.5);
+            border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(root.DesiredSize));
+
+            var target = CreateTargetAndRunFrame(root);
+            var context = Mock.Get(target.RenderTarget.CreateDrawingContext(null));
+            var borderLayer = target.Layers[border].Bitmap;
+
+            context.Verify(x => x.DrawImage(borderLayer, 0.5, It.IsAny<Rect>(), It.IsAny<Rect>()));
+        }
+
         private DeferredRenderer CreateTargetAndRunFrame(
             TestRoot root,
             Mock<IRenderLoop> loop = null,

From 2a87dbd6caf4e90bef242fb49562e494546d048f Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 6 Dec 2017 10:53:55 +0100
Subject: [PATCH 217/482] Fix opacity mask rendering.

We're potentially creating a new immutable version of the opacity mask each time the `VisualNode` is updated. Need to implement comparison between mutable and immutable brushes.
---
 .../Rendering/SceneGraph/SceneBuilder.cs      |  4 ++-
 .../Rendering/SceneGraph/VisualNode.cs        | 10 +++++++
 .../Rendering/DeferredRendererTests.cs        | 26 +++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
index 4f5f094e29..8f4f487e08 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
@@ -178,7 +178,9 @@ namespace Avalonia.Rendering.SceneGraph
                     node.ClipToBounds = clipToBounds;
                     node.GeometryClip = visual.Clip?.PlatformImpl;
                     node.Opacity = opacity;
-                    node.OpacityMask = visual.OpacityMask;
+
+                    // TODO: Check equality between node.OpacityMask and visual.OpacityMask before assigning.
+                    node.OpacityMask = visual.OpacityMask?.ToImmutable();
 
                     if (ShouldStartLayer(visual))
                     {
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
index e9e20557bd..ecff1a1077 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
@@ -231,6 +231,11 @@ namespace Avalonia.Rendering.SceneGraph
                 context.PushOpacity(Opacity);
             }
 
+            if (OpacityMask != null)
+            {
+                context.PushOpacityMask(OpacityMask, ClipBounds);
+            }
+
             context.Transform = Transform;
 
             if (GeometryClip != null)
@@ -247,6 +252,11 @@ namespace Avalonia.Rendering.SceneGraph
                 context.PopGeometryClip();
             }
 
+            if (OpacityMask != null)
+            {
+                context.PopOpacityMask();
+            }
+
             if (Opacity != 1 && !skipOpacity)
             {
                 context.PopOpacity();
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
index 21065cb6b5..c97070a2aa 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
@@ -165,6 +165,32 @@ namespace Avalonia.Visuals.UnitTests.Rendering
             context.Verify(x => x.PopOpacity(), Times.Never);
         }
 
+        [Fact]
+        public void Should_Push_Opacity_Mask()
+        {
+            var root = new TestRoot
+            {
+                Width = 100,
+                Height = 100,
+                Child = new Border
+                {
+                    Background = Brushes.Red,
+                    OpacityMask = Brushes.Green,
+                }
+            };
+
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(root.DesiredSize));
+
+            var target = CreateTargetAndRunFrame(root);
+            var context = GetLayerContext(target, root);
+            var animation = new BehaviorSubject<double>(0.5);
+
+            context.Verify(x => x.PushOpacityMask(Brushes.Green, new Rect(0, 0, 100, 100)), Times.Once);
+            context.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
+            context.Verify(x => x.PopOpacityMask(), Times.Once);
+        }
+
         [Fact]
         public void Should_Create_Layer_For_Root()
         {

From b3fca2360de4fa933c2bf3a7cf650659e3876794 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 7 Dec 2017 02:10:58 +0100
Subject: [PATCH 218/482] Fix failing skia render test

Make sure we restore the transform in `EndRender` and use the same order of pushing/popping operations that `ImmediateRenderer` uses.
---
 .../Rendering/SceneGraph/VisualNode.cs        | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
index ecff1a1077..6bea4d9bd6 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
@@ -22,6 +22,7 @@ namespace Avalonia.Rendering.SceneGraph
         private List<IVisualNode> _children;
         private List<IDrawOperation> _drawOperations;
         private bool _drawOperationsCloned;
+        private Matrix transformRestore;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="VisualNode"/> class.
@@ -220,41 +221,43 @@ namespace Avalonia.Rendering.SceneGraph
         /// <inheritdoc/>
         public void BeginRender(IDrawingContextImpl context, bool skipOpacity)
         {
+            transformRestore = context.Transform;
+
             if (ClipToBounds)
             {
                 context.Transform = Matrix.Identity;
                 context.PushClip(ClipBounds);
             }
-            
+
+            context.Transform = Transform;
+
             if (Opacity != 1 && !skipOpacity)
             {
                 context.PushOpacity(Opacity);
             }
 
-            if (OpacityMask != null)
+            if (GeometryClip != null)
             {
-                context.PushOpacityMask(OpacityMask, ClipBounds);
+                context.PushGeometryClip(GeometryClip);
             }
 
-            context.Transform = Transform;
-
-            if (GeometryClip != null)
+            if (OpacityMask != null)
             {
-                context.PushGeometryClip(GeometryClip);
+                context.PushOpacityMask(OpacityMask, ClipBounds);
             }
         }
 
         /// <inheritdoc/>
         public void EndRender(IDrawingContextImpl context, bool skipOpacity)
         {
-            if (GeometryClip != null)
+            if (OpacityMask != null)
             {
-                context.PopGeometryClip();
+                context.PopOpacityMask();
             }
 
-            if (OpacityMask != null)
+            if (GeometryClip != null)
             {
-                context.PopOpacityMask();
+                context.PopGeometryClip();
             }
 
             if (Opacity != 1 && !skipOpacity)
@@ -264,8 +267,11 @@ namespace Avalonia.Rendering.SceneGraph
 
             if (ClipToBounds)
             {
+                context.Transform = Matrix.Identity;
                 context.PopClip();
             }
+
+            context.Transform = transformRestore;
         }
 
         private Rect CalculateBounds()

From a02515fe19fd4161904b620effc75d1c6094499c Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 6 Dec 2017 22:19:50 -0600
Subject: [PATCH 219/482] Make pending set condition always !object.Equals
 since the other condition in PriorityValue didn't match expected behavior as
 per new unit tests.

---
 src/Avalonia.Base/AvaloniaObject.cs           | 3 +--
 src/Avalonia.Base/PriorityValue.cs            | 4 +---
 src/Avalonia.Base/Utilities/DeferredSetter.cs | 9 +++------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 624274cc96..34278c397f 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -603,8 +603,7 @@ namespace Avalonia
                     setterCallback((T)val, ref backing, notify);
                     return true;
                 },
-                value,
-                (object o, ref T backing) => !object.Equals(o, backing));
+                value);
         }
 
         /// <summary>
diff --git a/src/Avalonia.Base/PriorityValue.cs b/src/Avalonia.Base/PriorityValue.cs
index 6b82b202be..9b5318083a 100644
--- a/src/Avalonia.Base/PriorityValue.cs
+++ b/src/Avalonia.Base/PriorityValue.cs
@@ -246,9 +246,7 @@ namespace Avalonia
             delayedSetter.SetAndNotify(this,
                 ref _value,
                 UpdateCore,
-                (value, priority),
-                ((object value, int) val, ref (object value, int) backing)
-                    => !object.Equals(val.value, backing.value));
+                (value, priority));
         }
 
         private bool UpdateCore(
diff --git a/src/Avalonia.Base/Utilities/DeferredSetter.cs b/src/Avalonia.Base/Utilities/DeferredSetter.cs
index 2c8c7f8887..957bcdc942 100644
--- a/src/Avalonia.Base/Utilities/DeferredSetter.cs
+++ b/src/Avalonia.Base/Utilities/DeferredSetter.cs
@@ -103,7 +103,6 @@ namespace Avalonia.Utilities
         }
 
         public delegate bool SetterDelegate<TValue>(TSetRecord record, ref TValue backing, Action<Action> notifyCallback);
-        public delegate bool PendingSetPredicate<TValue>(TSetRecord record, ref TValue backing);
 
         /// <summary>
         /// Set the property and notify listeners while ensuring we don't get into a stack overflow as happens with #855 and #824
@@ -120,15 +119,13 @@ namespace Avalonia.Utilities
             TProperty property,
             ref TValue backing,
             SetterDelegate<TValue> setterCallback,
-            TSetRecord value,
-            PendingSetPredicate<TValue> pendingSetCondition)
+            TSetRecord value)
         {
             Contract.Requires<ArgumentNullException>(setterCallback != null);
-            Contract.Requires<ArgumentNullException>(pendingSetCondition != null);
             if (!IsNotifying(property))
             {
                 bool updated = false;
-                if (pendingSetCondition(value, ref backing))
+                if (!object.Equals(value, backing))
                 {
                     updated = setterCallback(value, ref backing, notification =>
                     {
@@ -150,7 +147,7 @@ namespace Avalonia.Utilities
                 }
                 return updated;
             }
-            else if(pendingSetCondition(value, ref backing))
+            else if(!object.Equals(value, backing))
             {
                 AddPendingSet(property, value);
             }

From 1cfc9fe47fe88323a50748d93dadbbecba0feb1d Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 7 Dec 2017 12:48:47 -0600
Subject: [PATCH 220/482] Remove extraneous documentation comment.

---
 src/Avalonia.Base/Utilities/DeferredSetter.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Avalonia.Base/Utilities/DeferredSetter.cs b/src/Avalonia.Base/Utilities/DeferredSetter.cs
index 957bcdc942..fdfa160134 100644
--- a/src/Avalonia.Base/Utilities/DeferredSetter.cs
+++ b/src/Avalonia.Base/Utilities/DeferredSetter.cs
@@ -114,7 +114,6 @@ namespace Avalonia.Utilities
         /// The first parameter is the value to set, and the second is a wrapper that takes a callback that sends the property-changed notification.
         /// </param>
         /// <param name="value">The value to try to set.</param>
-        /// <param name="pendingSetCondition">A predicate to filter what possible values should be added as pending sets (i.e. only values not equal to the current value).</param>
         public bool SetAndNotify<TValue>(
             TProperty property,
             ref TValue backing,

From 4676ac5fb2c87df6244307b2991ab0b8b43f4b7c Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Dec 2017 00:57:03 +0100
Subject: [PATCH 221/482] Don't use ObserveOn in Bindings.

Instead of using `Observable.ObserveOn` in bindings, interface with `Dispatcher.UIThread` to schedule binding notifications on the UI thread. This saves a significant amount of memory.
---
 src/Avalonia.Base/AvaloniaObject.cs           | 45 +++++++++++-------
 src/Avalonia.Base/PriorityBindingEntry.cs     | 46 +++++++++++++------
 .../AvaloniaObjectTests_Direct.cs             | 27 +++++++++++
 3 files changed, 88 insertions(+), 30 deletions(-)

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 8b93cf2fb1..c76b43f04f 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -325,7 +325,6 @@ namespace Avalonia
             var description = GetDescription(source);
 
             var scheduler = AvaloniaLocator.Current.GetService<IScheduler>() ?? ImmediateScheduler.Instance;
-            source = source.ObserveOn(scheduler); 
 
             if (property.IsDirect)
             {
@@ -674,29 +673,41 @@ namespace Avalonia
         /// <param name="value">The value.</param>
         private void SetDirectValue(AvaloniaProperty property, object value)
         {
-            var notification = value as BindingNotification;
-
-            if (notification != null)
+            void Set()
             {
-                notification.LogIfError(this, property);
-                value = notification.Value;
-            }
+                var notification = value as BindingNotification;
 
-            if (notification == null || notification.ErrorType == BindingErrorType.Error || notification.HasValue)
-            {
-                var metadata = (IDirectPropertyMetadata)property.GetMetadata(GetType());
-                var accessor = (IDirectPropertyAccessor)GetRegistered(property);
-                var finalValue = value == AvaloniaProperty.UnsetValue ? 
-                    metadata.UnsetValue : value;
+                if (notification != null)
+                {
+                    notification.LogIfError(this, property);
+                    value = notification.Value;
+                }
+
+                if (notification == null || notification.ErrorType == BindingErrorType.Error || notification.HasValue)
+                {
+                    var metadata = (IDirectPropertyMetadata)property.GetMetadata(GetType());
+                    var accessor = (IDirectPropertyAccessor)GetRegistered(property);
+                    var finalValue = value == AvaloniaProperty.UnsetValue ?
+                        metadata.UnsetValue : value;
+
+                    LogPropertySet(property, value, BindingPriority.LocalValue);
 
-                LogPropertySet(property, value, BindingPriority.LocalValue);
+                    accessor.SetValue(this, finalValue);
+                }
 
-                accessor.SetValue(this, finalValue);
+                if (notification != null)
+                {
+                    UpdateDataValidation(property, notification);
+                }
             }
 
-            if (notification != null)
+            if (Dispatcher.UIThread.CheckAccess())
+            {
+                Set();
+            }
+            else
             {
-                UpdateDataValidation(property, notification);
+                Dispatcher.UIThread.InvokeAsync(Set);
             }
         }
 
diff --git a/src/Avalonia.Base/PriorityBindingEntry.cs b/src/Avalonia.Base/PriorityBindingEntry.cs
index 63f582a34c..0e293e4fc6 100644
--- a/src/Avalonia.Base/PriorityBindingEntry.cs
+++ b/src/Avalonia.Base/PriorityBindingEntry.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Avalonia.Data;
+using Avalonia.Threading;
 
 namespace Avalonia
 {
@@ -92,33 +93,52 @@ namespace Avalonia
 
         private void ValueChanged(object value)
         {
-            _owner.Owner.Owner?.VerifyAccess();
+            void Signal()
+            {
+                _owner.Owner.Owner?.VerifyAccess();
 
-            var notification = value as BindingNotification;
+                var notification = value as BindingNotification;
 
-            if (notification != null)
-            {
-                if (notification.HasValue || notification.ErrorType == BindingErrorType.Error)
+                if (notification != null)
                 {
-                    Value = notification.Value;
-                    _owner.Changed(this);
+                    if (notification.HasValue || notification.ErrorType == BindingErrorType.Error)
+                    {
+                        Value = notification.Value;
+                        _owner.Changed(this);
+                    }
+
+                    if (notification.ErrorType != BindingErrorType.None)
+                    {
+                        _owner.Error(this, notification);
+                    }
                 }
-
-                if (notification.ErrorType != BindingErrorType.None)
+                else
                 {
-                    _owner.Error(this, notification);
+                    Value = value;
+                    _owner.Changed(this);
                 }
             }
+
+            if (Dispatcher.UIThread.CheckAccess())
+            {
+                Signal();
+            }
             else
             {
-                Value = value;
-                _owner.Changed(this);
+                Dispatcher.UIThread.InvokeAsync(Signal);
             }
         }
 
         private void Completed()
         {
-            _owner.Completed(this);
+            if (Dispatcher.UIThread.CheckAccess())
+            {
+                _owner.Completed(this);
+            }
+            else
+            {
+                Dispatcher.UIThread.InvokeAsync(() => _owner.Completed(this));
+            }
         }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
index e9cb2bf450..b874a1cbc6 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
@@ -4,10 +4,15 @@
 using System;
 using System.Collections.Generic;
 using System.Reactive.Subjects;
+using System.Threading;
+using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Data;
 using Avalonia.Logging;
+using Avalonia.Platform;
+using Avalonia.Threading;
 using Avalonia.UnitTests;
+using Moq;
 using Xunit;
 
 namespace Avalonia.Base.UnitTests
@@ -411,6 +416,28 @@ namespace Avalonia.Base.UnitTests
             Assert.True(called);
         }
 
+        [Fact]
+        public async Task Bind_Executes_On_UIThread()
+        {
+            var target = new Class1();
+            var source = new Subject<object>();
+            var currentThreadId = Thread.CurrentThread.ManagedThreadId;
+
+            var threadingInterfaceMock = new Mock<IPlatformThreadingInterface>();
+            threadingInterfaceMock.SetupGet(mock => mock.CurrentThreadIsLoopThread)
+                .Returns(() => Thread.CurrentThread.ManagedThreadId == currentThreadId);
+
+            var services = new TestServices(
+                threadingInterface: threadingInterfaceMock.Object);
+
+            using (UnitTestApplication.Start(services))
+            {
+                target.Bind(Class1.FooProperty, source);
+
+                await Task.Run(() => source.OnNext("foobar"));
+            }
+        }
+
         [Fact]
         public void AddOwner_Should_Inherit_DefaultBindingMode()
         {

From 78cbaee3a098185c024e17db89f840c14e321d29 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Dec 2017 12:22:46 +0100
Subject: [PATCH 222/482] FIx collection comparisons.

---
 tests/Avalonia.Controls.UnitTests/PanelTests.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/Avalonia.Controls.UnitTests/PanelTests.cs b/tests/Avalonia.Controls.UnitTests/PanelTests.cs
index fdae707491..ed239120d6 100644
--- a/tests/Avalonia.Controls.UnitTests/PanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/PanelTests.cs
@@ -82,9 +82,9 @@ namespace Avalonia.Controls.UnitTests
 
             panel.Children.Add(child);
 
-            Assert.Same(new[] { child }, panel.Children);
-            Assert.Same(new[] { child }, panel.GetLogicalChildren());
-            Assert.Same(new[] { child }, panel.GetVisualChildren());
+            Assert.Equal(new[] { child }, panel.Children);
+            Assert.Equal(new[] { child }, panel.GetLogicalChildren());
+            Assert.Equal(new[] { child }, panel.GetVisualChildren());
         }
 
         [Fact]
@@ -96,7 +96,7 @@ namespace Avalonia.Controls.UnitTests
             panel.Children.Add(child);
             panel.Children.Remove(child);
 
-            Assert.Same(new Control[0], panel.Children);
+            Assert.Equal(new Control[0], panel.Children);
             Assert.Empty(panel.GetLogicalChildren());
             Assert.Empty(panel.GetVisualChildren());
         }
@@ -112,8 +112,8 @@ namespace Avalonia.Controls.UnitTests
             panel.Children.Add(child2);
             panel.Children.Move(1, 0);
 
-            Assert.Same(new[] { child2, child1 }, panel.GetLogicalChildren());
-            Assert.Same(new[] { child2, child1 }, panel.GetVisualChildren());
+            Assert.Equal(new[] { child2, child1 }, panel.GetLogicalChildren());
+            Assert.Equal(new[] { child2, child1 }, panel.GetVisualChildren());
         }
     }
 }

From 222ded0c33487b6c61e7ea11967564b1ce58d3f2 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Dec 2017 19:00:29 +0100
Subject: [PATCH 223/482] Removed remaining collection set.

---
 src/Android/Avalonia.AndroidTestApplication/MainActivity.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs b/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
index 7973ad72e5..ad2cec2ae3 100644
--- a/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
+++ b/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
@@ -56,7 +56,7 @@ namespace Avalonia.AndroidTestApplication
                 {
                     Margin = new Thickness(30),
                     Background = Brushes.Yellow,
-                    Children = new Avalonia.Controls.Controls
+                    Children =
                     {
                         new TextBlock
                         {

From 7405cd79520a4bd19877b8f3f3f033fb49c98e00 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 9 Dec 2017 12:34:14 +0100
Subject: [PATCH 224/482] Match formatting of other block.

---
 src/Avalonia.Controls/Primitives/Track.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Primitives/Track.cs b/src/Avalonia.Controls/Primitives/Track.cs
index 3a16e51851..3f50e11a48 100644
--- a/src/Avalonia.Controls/Primitives/Track.cs
+++ b/src/Avalonia.Controls/Primitives/Track.cs
@@ -189,7 +189,11 @@ namespace Avalonia.Controls.Primitives
 
                 if (increaseButton != null)
                 {
-                    increaseButton.Arrange(new Rect(0, firstHeight + thumbHeight, finalSize.Width, Math.Max(remaining - firstHeight, 0)));
+                    increaseButton.Arrange(new Rect(
+                        0,
+                        firstHeight + thumbHeight,
+                        finalSize.Width,
+                        Math.Max(remaining - firstHeight, 0)));
                 }
             }
 

From 8733547cae8d6b982fa8822f573d66a9f3504f7c Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sat, 9 Dec 2017 13:33:10 -0600
Subject: [PATCH 225/482] Make RangeBase.Value bind TwoWay by default. Fixes
 #841.

---
 src/Avalonia.Controls/Primitives/RangeBase.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Primitives/RangeBase.cs b/src/Avalonia.Controls/Primitives/RangeBase.cs
index b69dbba637..b46562e99e 100644
--- a/src/Avalonia.Controls/Primitives/RangeBase.cs
+++ b/src/Avalonia.Controls/Primitives/RangeBase.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
+using Avalonia.Data;
 using Avalonia.Utilities;
 
 namespace Avalonia.Controls.Primitives
@@ -36,7 +37,8 @@ namespace Avalonia.Controls.Primitives
             AvaloniaProperty.RegisterDirect<RangeBase, double>(
                 nameof(Value),
                 o => o.Value,
-                (o, v) => o.Value = v);
+                (o, v) => o.Value = v,
+                defaultBindingMode: BindingMode.TwoWay);
 
         /// <summary>
         /// Defines the <see cref="SmallChange"/> property.

From e49e682f9ced0e0b0887350fefbf73d509cde811 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 10 Dec 2017 20:09:20 +0100
Subject: [PATCH 226/482] This Max shouldn't be needed.

---
 src/Avalonia.Controls/Primitives/Track.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Primitives/Track.cs b/src/Avalonia.Controls/Primitives/Track.cs
index 3f50e11a48..648fe5f4b0 100644
--- a/src/Avalonia.Controls/Primitives/Track.cs
+++ b/src/Avalonia.Controls/Primitives/Track.cs
@@ -158,7 +158,7 @@ namespace Avalonia.Controls.Primitives
                         firstWidth + thumbWidth,
                         0,
                         Math.Max(0, remaining - firstWidth),
-                        Math.Max(0, finalSize.Height)));
+                        finalSize.Height));
                 }
             }
             else

From bf2ca5da720f7783be58dc5403d89f46e83d47f9 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 10 Dec 2017 20:18:51 +0100
Subject: [PATCH 227/482] Removed unneeded code.

---
 src/Avalonia.Base/AvaloniaObject.cs       | 2 --
 src/Avalonia.Base/PriorityBindingEntry.cs | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index e547af633e..17e6ea8f0f 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -339,8 +339,6 @@ namespace Avalonia
 
             var description = GetDescription(source);
 
-            var scheduler = AvaloniaLocator.Current.GetService<IScheduler>() ?? ImmediateScheduler.Instance;
-
             if (property.IsDirect)
             {
                 if (property.IsReadOnly)
diff --git a/src/Avalonia.Base/PriorityBindingEntry.cs b/src/Avalonia.Base/PriorityBindingEntry.cs
index 0e293e4fc6..b44b845f25 100644
--- a/src/Avalonia.Base/PriorityBindingEntry.cs
+++ b/src/Avalonia.Base/PriorityBindingEntry.cs
@@ -95,8 +95,6 @@ namespace Avalonia
         {
             void Signal()
             {
-                _owner.Owner.Owner?.VerifyAccess();
-
                 var notification = value as BindingNotification;
 
                 if (notification != null)

From f65ae1918f882e47cd04f14643a89b306f891ef2 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 10 Dec 2017 16:10:58 -0600
Subject: [PATCH 228/482] Change TransformedBounds to a direct property on
 Visual (exposed on IVisual) instead of using an attached property in
 BoundsTracker.

---
 .../Primitives/AdornerLayer.cs                |  4 +-
 .../Rendering/ImmediateRenderer.cs            |  9 ++--
 .../Rendering/SceneGraph/SceneBuilder.cs      | 12 ++---
 src/Avalonia.Visuals/Visual.cs                | 17 +++++++
 .../VisualTree/BoundsTracker.cs               | 51 -------------------
 src/Avalonia.Visuals/VisualTree/IVisual.cs    |  5 ++
 ...ckerTests.cs => TransformedBoundsTests.cs} |  4 +-
 7 files changed, 31 insertions(+), 71 deletions(-)
 delete mode 100644 src/Avalonia.Visuals/VisualTree/BoundsTracker.cs
 rename tests/Avalonia.Visuals.UnitTests/VisualTree/{BoundsTrackerTests.cs => TransformedBoundsTests.cs} (93%)

diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
index d7862881fb..a469f09867 100644
--- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
@@ -18,8 +18,6 @@ namespace Avalonia.Controls.Primitives
         private static readonly AttachedProperty<AdornedElementInfo> s_adornedElementInfoProperty =
             AvaloniaProperty.RegisterAttached<AdornerLayer, Visual, AdornedElementInfo>("AdornedElementInfo");
 
-        private readonly BoundsTracker _tracker = new BoundsTracker();
-
         static AdornerLayer()
         {
             AdornedElementProperty.Changed.Subscribe(AdornedElementChanged);
@@ -118,7 +116,7 @@ namespace Avalonia.Controls.Primitives
                     adorner.SetValue(s_adornedElementInfoProperty, info);
                 }
 
-                info.Subscription = _tracker.Track(adorned).Subscribe(x =>
+                info.Subscription = adorned.GetObservable(TransformedBoundsProperty).Subscribe(x =>
                 {
                     info.Bounds = x;
                     InvalidateArrange();
diff --git a/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs b/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
index 84313f0906..e830d5c313 100644
--- a/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
@@ -169,7 +169,7 @@ namespace Avalonia.Rendering
         {
             foreach (var e in visual.GetSelfAndVisualDescendants())
             {
-                BoundsTracker.SetTransformedBounds((Visual)visual, null);
+                visual.TransformedBounds = null;
             }
         }
 
@@ -197,7 +197,7 @@ namespace Avalonia.Rendering
 
             if (filter?.Invoke(visual) != false)
             {
-                bool containsPoint = BoundsTracker.GetTransformedBounds((Visual)visual)?.Contains(p) == true;
+                bool containsPoint = visual.TransformedBounds?.Contains(p) == true;
 
                 if ((containsPoint || !visual.ClipToBounds) && visual.VisualChildren.Count > 0)
                 {
@@ -257,10 +257,7 @@ namespace Avalonia.Rendering
                         new TransformedBounds(bounds, new Rect(), context.CurrentContainerTransform);
 #pragma warning restore 0618
 
-                    if (visual is Visual)
-                    {
-                        BoundsTracker.SetTransformedBounds((Visual)visual, transformed);
-                    }
+                    visual.TransformedBounds = transformed;
 
                     foreach (var child in visual.VisualChildren.OrderBy(x => x, ZIndexComparer.Instance))
                     {
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
index 8f4f487e08..41ff802164 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
@@ -209,11 +209,8 @@ namespace Avalonia.Rendering.SceneGraph
                     }
                     catch { }
 
-                    if (visual is Visual)
-                    {
-                        var transformed = new TransformedBounds(new Rect(visual.Bounds.Size), clip, node.Transform);
-                        BoundsTracker.SetTransformedBounds((Visual)visual, transformed);
-                    }
+                    var transformed = new TransformedBounds(new Rect(visual.Bounds.Size), clip, node.Transform);
+                    visual.TransformedBounds = transformed;
 
                     if (forceRecurse)
                     {
@@ -279,10 +276,7 @@ namespace Avalonia.Rendering.SceneGraph
 
             scene.Layers[node.LayerRoot].Dirty.Add(node.Bounds);
 
-            if (node.Visual is Visual v)
-            {
-                BoundsTracker.SetTransformedBounds(v, null);
-            }
+            node.Visual.TransformedBounds = null;
 
             foreach (VisualNode child in node.Children)
             {
diff --git a/src/Avalonia.Visuals/Visual.cs b/src/Avalonia.Visuals/Visual.cs
index 3662fe50be..5f3861a51a 100644
--- a/src/Avalonia.Visuals/Visual.cs
+++ b/src/Avalonia.Visuals/Visual.cs
@@ -32,6 +32,11 @@ namespace Avalonia
         public static readonly DirectProperty<Visual, Rect> BoundsProperty =
             AvaloniaProperty.RegisterDirect<Visual, Rect>(nameof(Bounds), o => o.Bounds);
 
+        public static readonly DirectProperty<Visual, TransformedBounds?> TransformedBoundsProperty =
+            AvaloniaProperty.RegisterDirect<Visual, TransformedBounds?>(
+                nameof(TransformedBounds),
+                o => o.TransformedBounds);
+
         /// <summary>
         /// Defines the <see cref="ClipToBounds"/> property.
         /// </summary>
@@ -87,6 +92,7 @@ namespace Avalonia
             AvaloniaProperty.Register<Visual, int>(nameof(ZIndex));
 
         private Rect _bounds;
+        private TransformedBounds? _transformedBounds;
         private IRenderRoot _visualRoot;
         private IVisual _visualParent;
 
@@ -135,6 +141,11 @@ namespace Avalonia
             protected set { SetAndRaise(BoundsProperty, ref _bounds, value); }
         }
 
+        /// <summary>
+        /// Gets the bounds of the control relative to the window, accounting for rendering transforms.
+        /// </summary>
+        public TransformedBounds? TransformedBounds => _transformedBounds;
+
         /// <summary>
         /// Gets a value indicating whether the control should be clipped to its bounds.
         /// </summary>
@@ -253,6 +264,12 @@ namespace Avalonia
         /// Gets the root of the visual tree, if the control is attached to a visual tree.
         /// </summary>
         IRenderRoot IVisual.VisualRoot => VisualRoot;
+        
+        TransformedBounds? IVisual.TransformedBounds
+        {
+            get { return _transformedBounds; }
+            set { SetAndRaise(TransformedBoundsProperty, ref _transformedBounds, value); }
+        }
 
         /// <summary>
         /// Invalidates the visual and queues a repaint.
diff --git a/src/Avalonia.Visuals/VisualTree/BoundsTracker.cs b/src/Avalonia.Visuals/VisualTree/BoundsTracker.cs
deleted file mode 100644
index 42c4e3c98e..0000000000
--- a/src/Avalonia.Visuals/VisualTree/BoundsTracker.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-
-namespace Avalonia.VisualTree
-{
-    /// <summary>
-    /// Tracks the bounds of a control.
-    /// </summary>
-    /// <remarks>
-    /// This class is used to track a controls's bounds for hit testing.
-    /// TODO: This shouldn't be implemented as an attached property: it would be more performant
-    /// to just store bounds in some sort of central repository.
-    /// </remarks>
-    public class BoundsTracker
-    {
-        /// <summary>
-        /// Defines the TransformedBounds attached property.
-        /// </summary>
-        private static AttachedProperty<TransformedBounds?> TransformedBoundsProperty =
-            AvaloniaProperty.RegisterAttached<BoundsTracker, Visual, TransformedBounds?>("TransformedBounds");
-
-        /// <summary>
-        /// Starts tracking the specified visual.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <returns>An observable that returns the tracked bounds.</returns>
-        public IObservable<TransformedBounds?> Track(Visual visual)
-        {
-            return visual.GetObservable(TransformedBoundsProperty);
-        }
-
-        /// <summary>
-        /// Sets the transformed bounds of the visual.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <param name="value">The transformed bounds.</param>
-        internal static void SetTransformedBounds(Visual visual, TransformedBounds? value)
-        {
-            visual.SetValue(TransformedBoundsProperty, value);
-        }
-
-        /// <summary>
-        /// Gets the transformed bounds of the visual.
-        /// </summary>
-        /// <param name="visual">The visual.</param>
-        /// <returns>The transformed bounds or null if the visual is not visible.</returns>
-        public static TransformedBounds? GetTransformedBounds(Visual visual) => visual.GetValue(TransformedBoundsProperty);
-    }
-}
diff --git a/src/Avalonia.Visuals/VisualTree/IVisual.cs b/src/Avalonia.Visuals/VisualTree/IVisual.cs
index 2047996c3e..278a802597 100644
--- a/src/Avalonia.Visuals/VisualTree/IVisual.cs
+++ b/src/Avalonia.Visuals/VisualTree/IVisual.cs
@@ -36,6 +36,11 @@ namespace Avalonia.VisualTree
         /// </summary>
         Rect Bounds { get; }
 
+        /// <summary>
+        /// Gets the bounds of the control relative to the window, accounting for rendering transforms.
+        /// </summary>
+        TransformedBounds? TransformedBounds { get; set; }
+
         /// <summary>
         /// Gets a value indicating whether the control should be clipped to its bounds.
         /// </summary>
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTree/BoundsTrackerTests.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/TransformedBoundsTests.cs
similarity index 93%
rename from tests/Avalonia.Visuals.UnitTests/VisualTree/BoundsTrackerTests.cs
rename to tests/Avalonia.Visuals.UnitTests/VisualTree/TransformedBoundsTests.cs
index ea3a1cdd78..aabaac902d 100644
--- a/tests/Avalonia.Visuals.UnitTests/VisualTree/BoundsTrackerTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/VisualTree/TransformedBoundsTests.cs
@@ -17,7 +17,7 @@ using Avalonia.Platform;
 
 namespace Avalonia.Visuals.UnitTests.VisualTree
 {
-    public class BoundsTrackerTests
+    public class TransformedBoundsTests
     {
         [Fact]
         public void Should_Track_Bounds()
@@ -46,7 +46,7 @@ namespace Avalonia.Visuals.UnitTests.VisualTree
                 tree.Arrange(new Rect(0, 0, 100, 100));
                 ImmediateRenderer.Render(tree, context);
 
-                var track = target.Track(control);
+                var track = control.GetObservable(Visual.TransformedBoundsProperty);
                 var results = new List<TransformedBounds?>();
                 track.Subscribe(results.Add);
 

From 39d5ac957fe99913b765d36d5d8d379389cc0dc3 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 10 Dec 2017 16:28:29 -0600
Subject: [PATCH 229/482] Fix test.

---
 .../VisualTree/TransformedBoundsTests.cs                         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTree/TransformedBoundsTests.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/TransformedBoundsTests.cs
index aabaac902d..7bc0b72bef 100644
--- a/tests/Avalonia.Visuals.UnitTests/VisualTree/TransformedBoundsTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/VisualTree/TransformedBoundsTests.cs
@@ -24,7 +24,6 @@ namespace Avalonia.Visuals.UnitTests.VisualTree
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                var target = new BoundsTracker();
                 var control = default(Rectangle);
                 var tree = new Decorator
                 {

From d01e19e3f43e71c21e02642bc551e7a562d20b7b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 12 Dec 2017 22:05:36 +0100
Subject: [PATCH 230/482] Added failing test for #1275.

---
 .../Xaml/BasicTests.cs                        | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
index ffd666fe12..fb432c30d4 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
@@ -868,6 +868,25 @@ do we need it?")]
             }
         }
 
+        [Fact]
+        public void Element_Whitespace_Should_Be_Trimmed()
+        {
+            using (UnitTestApplication.Start(TestServices.MockWindowingPlatform))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'>
+    <TextBlock>
+        Hello World!
+    </TextBlock>
+</Window>";
+
+                var window = AvaloniaXamlLoader.Parse<Window>(xaml);
+                var textBlock = (TextBlock)window.Content;
+
+                Assert.Equal("Hello World!", textBlock.Text);
+            }
+        }
+
         private class SelectedItemsViewModel : INotifyPropertyChanged
         {
             public string[] Items { get; set; }

From 05da271376bbe8b0c0a3a5f6e8ad8cf6895914b0 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 12 Dec 2017 22:21:39 +0100
Subject: [PATCH 231/482] Updated Portable.Xaml

Merged `fixes/76-trim-whitespace` into `avalonia` branch (https://github.com/cwensley/Portable.Xaml/pull/77). Fixes whitespace trimming in Xaml reader.

Fixes #1275
---
 .../Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
index d50ae8335e..c066401445 160000
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
@@ -1 +1 @@
-Subproject commit d50ae8335eb50d4b9606de6f5fa1cbbc78bfd72f
+Subproject commit c0664014455392ac221a765e66f9837704339b6f

From ea65626a462f1312f4fe30aa54b0a46cda859c85 Mon Sep 17 00:00:00 2001
From: Unknown <dan@walms.co.uk>
Date: Wed, 13 Dec 2017 13:26:25 +0000
Subject: [PATCH 232/482] use lower case extensions for avalonia documentation
 files.

---
 src/Avalonia.Animation/Avalonia.Animation.csproj              | 4 ++--
 src/Avalonia.Base/Avalonia.Base.csproj                        | 4 ++--
 src/Avalonia.Controls/Avalonia.Controls.csproj                | 4 ++--
 src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj          | 4 ++--
 .../Avalonia.DotNetCoreRuntime.csproj                         | 2 +-
 src/Avalonia.Input/Avalonia.Input.csproj                      | 4 ++--
 src/Avalonia.Interactivity/Avalonia.Interactivity.csproj      | 4 ++--
 src/Avalonia.Layout/Avalonia.Layout.csproj                    | 4 ++--
 src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj  | 4 ++--
 src/Avalonia.Styling/Avalonia.Styling.csproj                  | 4 ++--
 src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj    | 4 ++--
 src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj   | 2 +-
 src/Markup/Avalonia.Markup/Avalonia.Markup.csproj             | 4 ++--
 src/Windows/Avalonia.Win32/Avalonia.Win32.csproj              | 4 ++--
 14 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/Avalonia.Animation/Avalonia.Animation.csproj b/src/Avalonia.Animation/Avalonia.Animation.csproj
index bafac2b261..2101c5669d 100644
--- a/src/Avalonia.Animation/Avalonia.Animation.csproj
+++ b/src/Avalonia.Animation/Avalonia.Animation.csproj
@@ -11,7 +11,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Avalonia.Animation.XML</DocumentationFile>
+    <DocumentationFile>bin\Debug\Avalonia.Animation.xml</DocumentationFile>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -21,7 +21,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Avalonia.Animation.XML</DocumentationFile>
+    <DocumentationFile>bin\Release\Avalonia.Animation.xml</DocumentationFile>
     <NoWarn>CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj
index 58c510f483..54537841a9 100644
--- a/src/Avalonia.Base/Avalonia.Base.csproj
+++ b/src/Avalonia.Base/Avalonia.Base.csproj
@@ -12,7 +12,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Avalonia.Base.XML</DocumentationFile>
+    <DocumentationFile>bin\Debug\Avalonia.Base.xml</DocumentationFile>
     <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -22,7 +22,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Avalonia.Base.XML</DocumentationFile>
+    <DocumentationFile>bin\Release\Avalonia.Base.xml</DocumentationFile>
     <NoWarn>CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj
index c8f6b4e65a..997e15050f 100644
--- a/src/Avalonia.Controls/Avalonia.Controls.csproj
+++ b/src/Avalonia.Controls/Avalonia.Controls.csproj
@@ -11,7 +11,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Avalonia.Controls.XML</DocumentationFile>
+    <DocumentationFile>bin\Debug\Avalonia.Controls.xml</DocumentationFile>
     <NoWarn>CS1591;CS0067</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -21,7 +21,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Avalonia.Controls.XML</DocumentationFile>
+    <DocumentationFile>bin\Release\Avalonia.Controls.xml</DocumentationFile>
     <NoWarn>CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
index abbdd15bed..5f8e25269b 100644
--- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
+++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
@@ -11,7 +11,7 @@
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Avalonia.Diagnostics.XML</DocumentationFile>
+    <DocumentationFile>bin\Debug\Avalonia.Diagnostics.xml</DocumentationFile>
     <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -21,7 +21,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Avalonia.Diagnostics.XML</DocumentationFile>
+    <DocumentationFile>bin\Release\Avalonia.Diagnostics.xml</DocumentationFile>
     <NoWarn>CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
diff --git a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj
index 53b2c997d0..8630e7b228 100644
--- a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj
+++ b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj
@@ -5,7 +5,7 @@
     <DefineConstants>$(DefineConstants);DOTNETCORE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
-    <DocumentationFile>bin\$(Configuration)\Avalonia.DotNetCoreRuntime.XML</DocumentationFile>
+    <DocumentationFile>bin\$(Configuration)\Avalonia.DotNetCoreRuntime.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\Shared\SharedAssemblyInfo.cs">
diff --git a/src/Avalonia.Input/Avalonia.Input.csproj b/src/Avalonia.Input/Avalonia.Input.csproj
index 901f7b5675..c82601ac2c 100644
--- a/src/Avalonia.Input/Avalonia.Input.csproj
+++ b/src/Avalonia.Input/Avalonia.Input.csproj
@@ -11,7 +11,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Avalonia.Input.XML</DocumentationFile>
+    <DocumentationFile>bin\Debug\Avalonia.Input.xml</DocumentationFile>
     <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -21,7 +21,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Avalonia.Input.XML</DocumentationFile>
+    <DocumentationFile>bin\Release\Avalonia.Input.xml</DocumentationFile>
     <NoWarn>CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
diff --git a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj
index d683c77468..4f6f9ad6fe 100644
--- a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj
+++ b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj
@@ -11,7 +11,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Avalonia.Interactivity.XML</DocumentationFile>
+    <DocumentationFile>bin\Debug\Avalonia.Interactivity.xml</DocumentationFile>
     <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -21,7 +21,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Avalonia.Interactivity.XML</DocumentationFile>
+    <DocumentationFile>bin\Release\Avalonia.Interactivity.xml</DocumentationFile>
     <NoWarn>CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
diff --git a/src/Avalonia.Layout/Avalonia.Layout.csproj b/src/Avalonia.Layout/Avalonia.Layout.csproj
index 810a985e36..58c18921f5 100644
--- a/src/Avalonia.Layout/Avalonia.Layout.csproj
+++ b/src/Avalonia.Layout/Avalonia.Layout.csproj
@@ -11,7 +11,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Avalonia.Layout.XML</DocumentationFile>
+    <DocumentationFile>bin\Debug\Avalonia.Layout.xml</DocumentationFile>
     <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -21,7 +21,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Avalonia.Layout.XML</DocumentationFile>
+    <DocumentationFile>bin\Release\Avalonia.Layout.xml</DocumentationFile>
     <NoWarn>CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
diff --git a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj
index 5aa2cd67ba..4d9d141d0d 100644
--- a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj
+++ b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj
@@ -11,7 +11,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Avalonia.Logging.Serilog.XML</DocumentationFile>
+    <DocumentationFile>bin\Debug\Avalonia.Logging.Serilog.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DebugType>pdbonly</DebugType>
@@ -20,7 +20,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Avalonia.Logging.Serilog.XML</DocumentationFile>
+    <DocumentationFile>bin\Release\Avalonia.Logging.Serilog.xml</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj
index 6c0b957bf4..b8083b52db 100644
--- a/src/Avalonia.Styling/Avalonia.Styling.csproj
+++ b/src/Avalonia.Styling/Avalonia.Styling.csproj
@@ -12,7 +12,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Avalonia.Styling.XML</DocumentationFile>
+    <DocumentationFile>bin\Debug\Avalonia.Styling.xml</DocumentationFile>
     <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -22,7 +22,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Avalonia.Styling.XML</DocumentationFile>
+    <DocumentationFile>bin\Release\Avalonia.Styling.xml</DocumentationFile>
     <NoWarn>CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
index b4b200834b..d8260226e9 100644
--- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
+++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
@@ -11,7 +11,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Avalonia.Themes.Default.XML</DocumentationFile>
+    <DocumentationFile>bin\Debug\Avalonia.Themes.Default.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DebugType>pdbonly</DebugType>
@@ -20,7 +20,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Avalonia.Themes.Default.XML</DocumentationFile>
+    <DocumentationFile>bin\Release\Avalonia.Themes.Default.xml</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index a1db5c2915..cf6afbe620 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -22,7 +22,7 @@
     <DefineConstants>NETSTANDARD1_3;PCL;NETSTANDARD</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Avalonia.Markup.Xaml.XML</DocumentationFile>
+    <DocumentationFile>bin\Release\Avalonia.Markup.Xaml.xml</DocumentationFile>
     <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
     <ItemGroup>
diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
index 57552f852c..a6d3c3336f 100644
--- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
+++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
@@ -11,7 +11,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Avalonia.Markup.XML</DocumentationFile>
+    <DocumentationFile>bin\Debug\Avalonia.Markup.xml</DocumentationFile>
     <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -21,7 +21,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Avalonia.Markup.XML</DocumentationFile>
+    <DocumentationFile>bin\Release\Avalonia.Markup.xml</DocumentationFile>
     <NoWarn>CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
index b2b42877b7..92d973238e 100644
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@@ -22,7 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Avalonia.Win32.XML</DocumentationFile>
+    <DocumentationFile>bin\Debug\Avalonia.Win32.xml</DocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
@@ -33,7 +33,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Avalonia.Win32.XML</DocumentationFile>
+    <DocumentationFile>bin\Release\Avalonia.Win32.xml</DocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

From bdaf4a2046b776c16135b5ef47864b25d2005e83 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 13 Dec 2017 15:41:27 -0600
Subject: [PATCH 233/482] Fix #1182.

---
 src/Avalonia.Controls/Control.cs              | 14 ++++++++-----
 src/Avalonia.Controls/Primitives/PopupRoot.cs |  8 +++++++-
 .../ControlTests_Resources.cs                 | 16 +++++++++++++++
 .../Primitives/PopupRootTests.cs              | 20 +++++++++++++++++++
 4 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index 6e1e1a05f1..89721e2e05 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -487,11 +487,6 @@ namespace Avalonia.Controls
         void ILogical.NotifyResourcesChanged(ResourcesChangedEventArgs e)
         {
             ResourcesChanged?.Invoke(this, new ResourcesChangedEventArgs());
-
-            foreach (var child in LogicalChildren)
-            {
-                child.NotifyResourcesChanged(e);
-            }
         }
 
         /// <inheritdoc/>
@@ -536,6 +531,15 @@ namespace Avalonia.Controls
                 }
 
                 _parent = (IControl)parent;
+
+                if (old != null)
+                {
+                    old.ResourcesChanged -= ThisResourcesChanged; 
+                }
+                if (_parent != null)
+                {
+                    _parent.ResourcesChanged += ThisResourcesChanged; 
+                }
                 ((ILogical)this).NotifyResourcesChanged(new ResourcesChangedEventArgs());
 
                 if (_parent is IStyleRoot || _parent?.IsAttachedToLogicalTree == true || this is IStyleRoot)
diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs
index 00d43500c3..b0b0659f63 100644
--- a/src/Avalonia.Controls/Primitives/PopupRoot.cs
+++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs
@@ -8,6 +8,7 @@ using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Platform;
+using Avalonia.Styling;
 using Avalonia.VisualTree;
 using JetBrains.Annotations;
 
@@ -16,7 +17,7 @@ namespace Avalonia.Controls.Primitives
     /// <summary>
     /// The root window of a <see cref="Popup"/>.
     /// </summary>
-    public class PopupRoot : WindowBase, IInteractive, IHostedVisualTreeRoot, IDisposable
+    public class PopupRoot : WindowBase, IInteractive, IHostedVisualTreeRoot, IDisposable, IResourceNode
     {
         private IDisposable _presenterSubscription;
 
@@ -66,6 +67,11 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         IVisual IHostedVisualTreeRoot.Host => Parent;
 
+        /// <summary>
+        /// Gets the styling parent of the popup root.
+        /// </summary>
+        IResourceNode IResourceNode.ResourceParent => Parent;
+
         /// <inheritdoc/>
         public void Dispose() => PlatformImpl?.Dispose();
 
diff --git a/tests/Avalonia.Controls.UnitTests/ControlTests_Resources.cs b/tests/Avalonia.Controls.UnitTests/ControlTests_Resources.cs
index 6a6cb48001..6acd224fe2 100644
--- a/tests/Avalonia.Controls.UnitTests/ControlTests_Resources.cs
+++ b/tests/Avalonia.Controls.UnitTests/ControlTests_Resources.cs
@@ -204,6 +204,22 @@ namespace Avalonia.Controls.UnitTests
             Assert.True(raised);
         }
 
+        [Fact]
+        public void Setting_Logical_Parent_Subscribes_To_Parents_ResourceChanged_Event()
+        {
+            var parent = new ContentControl();
+            var child = new Border();
+
+            ((ISetLogicalParent)child).SetParent(parent);
+            var raisedOnChild = false;
+
+            child.ResourcesChanged += (_, __) => raisedOnChild = true;
+
+            parent.Resources.Add("foo", "bar");
+
+            Assert.True(raisedOnChild);
+        }
+
         private IControlTemplate ContentControlTemplate()
         {
             return new FuncControlTemplate<ContentControl>(x =>
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
index b3f91ce937..68a1f1d90f 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
@@ -7,6 +7,7 @@ using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.LogicalTree;
+using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
 using Xunit;
@@ -37,6 +38,25 @@ namespace Avalonia.Controls.UnitTests.Primitives
             }
         }
 
+        [Fact]
+        public void PopupRoot_ResourceParent_Is_Popup()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var target = new TemplatedControlWithPopup
+                {
+                    PopupContent = new Canvas(),
+                };
+
+                var root = new TestRoot { Child = target };
+
+                target.ApplyTemplate();
+                target.Popup.Open();
+
+                Assert.Equal(target.Popup, ((IResourceNode)target.Popup.PopupRoot).ResourceParent);
+            }
+        }
+
         [Fact]
         public void Attaching_PopupRoot_To_Parent_Logical_Tree_Raises_DetachedFromLogicalTree_And_AttachedToLogicalTree()
         {

From 8bcd07730a4fe557e9c308937a732a21c5042660 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 14 Dec 2017 22:06:56 -0600
Subject: [PATCH 234/482] Change StylingParent for Popup to be PopupRoot so
 local styles flow to it.

---
 src/Avalonia.Controls/Primitives/PopupRoot.cs                 | 4 ++--
 tests/Avalonia.Controls.UnitTests/ControlTests_Resources.cs   | 2 +-
 .../Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs
index b0b0659f63..927a54a838 100644
--- a/src/Avalonia.Controls/Primitives/PopupRoot.cs
+++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs
@@ -17,7 +17,7 @@ namespace Avalonia.Controls.Primitives
     /// <summary>
     /// The root window of a <see cref="Popup"/>.
     /// </summary>
-    public class PopupRoot : WindowBase, IInteractive, IHostedVisualTreeRoot, IDisposable, IResourceNode
+    public class PopupRoot : WindowBase, IInteractive, IHostedVisualTreeRoot, IDisposable, IStyleHost
     {
         private IDisposable _presenterSubscription;
 
@@ -70,7 +70,7 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Gets the styling parent of the popup root.
         /// </summary>
-        IResourceNode IResourceNode.ResourceParent => Parent;
+        IStyleRoot IStyleHost.StylingParent => Parent;
 
         /// <inheritdoc/>
         public void Dispose() => PlatformImpl?.Dispose();
diff --git a/tests/Avalonia.Controls.UnitTests/ControlTests_Resources.cs b/tests/Avalonia.Controls.UnitTests/ControlTests_Resources.cs
index 6acd224fe2..9ee6e3e456 100644
--- a/tests/Avalonia.Controls.UnitTests/ControlTests_Resources.cs
+++ b/tests/Avalonia.Controls.UnitTests/ControlTests_Resources.cs
@@ -168,7 +168,7 @@ namespace Avalonia.Controls.UnitTests
             target.Resources.Add("foo", "bar");
 
             Assert.True(raisedOnTarget);
-            Assert.False(raisedOnPresenter);
+            Assert.True(raisedOnPresenter);
             Assert.True(raisedOnChild);
         }
 
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
index 68a1f1d90f..d4b5d01a6b 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
@@ -39,7 +39,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
         }
 
         [Fact]
-        public void PopupRoot_ResourceParent_Is_Popup()
+        public void PopupRoot_StylingParent_Is_Popup()
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
@@ -53,7 +53,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 target.ApplyTemplate();
                 target.Popup.Open();
 
-                Assert.Equal(target.Popup, ((IResourceNode)target.Popup.PopupRoot).ResourceParent);
+                Assert.Equal(target.Popup, ((IStyleHost)target.Popup.PopupRoot).StylingParent);
             }
         }
 

From 6d075ad27be32cc149bfd1fd27fb5f3f49f40159 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 14 Dec 2017 22:31:45 -0600
Subject: [PATCH 235/482] Fix #424.

---
 src/Avalonia.Controls/TextBox.cs                 |  8 ++++++++
 .../Avalonia.Controls.UnitTests/TextBoxTests.cs  | 16 ++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 67a45140c8..36ef8d05c3 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -178,6 +178,10 @@ namespace Avalonia.Controls
             {
                 value = CoerceCaretIndex(value);
                 SetAndRaise(SelectionStartProperty, ref _selectionStart, value);
+                if (SelectionStart == SelectionEnd)
+                {
+                    CaretIndex = SelectionStart;
+                }
             }
         }
 
@@ -192,6 +196,10 @@ namespace Avalonia.Controls
             {
                 value = CoerceCaretIndex(value);
                 SetAndRaise(SelectionEndProperty, ref _selectionEnd, value);
+                if (SelectionStart == SelectionEnd)
+                {
+                    CaretIndex = SelectionEnd;
+                }
             }
         }
 
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
index 26fc2a2461..b091f6826e 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
@@ -202,6 +202,22 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Setting_SelectionStart_To_SelectionEnd_Sets_CaretPosition_To_SelectionStart()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var textBox = new TextBox
+                {
+                    Text = "0123456789"
+                };
+
+                textBox.SelectionStart = 2;
+                textBox.SelectionEnd = 2;
+                Assert.Equal(2, textBox.CaretIndex);
+            }
+        }
+
         [Fact]
         public void Setting_Text_Updates_CaretPosition()
         {

From b463d04e9f1c7d236e6002bd34ce84face1de188 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 14 Dec 2017 23:11:26 -0600
Subject: [PATCH 236/482] Make KeyGestures with +,-,. in them match with both
 the non-numpad keys and the matching numpad keys.

Fixes #225
---
 src/Avalonia.Input/KeyGesture.cs              | 17 ++++++-
 .../KeyGestureParseTests.cs                   | 28 ------------
 .../KeyGestureTests.cs                        | 44 +++++++++++++++++++
 3 files changed, 60 insertions(+), 29 deletions(-)
 delete mode 100644 tests/Avalonia.Input.UnitTests/KeyGestureParseTests.cs
 create mode 100644 tests/Avalonia.Input.UnitTests/KeyGestureTests.cs

diff --git a/src/Avalonia.Input/KeyGesture.cs b/src/Avalonia.Input/KeyGesture.cs
index 88d3c99839..954333b80f 100644
--- a/src/Avalonia.Input/KeyGesture.cs
+++ b/src/Avalonia.Input/KeyGesture.cs
@@ -111,6 +111,21 @@ namespace Avalonia.Input
             return string.Join(" + ", parts);
         }
 
-        public bool Matches(KeyEventArgs keyEvent) => keyEvent.Key == Key && keyEvent.Modifiers == Modifiers;
+        public bool Matches(KeyEventArgs keyEvent) => ResolveNumPadOperationKey(keyEvent.Key) == Key && keyEvent.Modifiers == Modifiers;
+
+        private Key ResolveNumPadOperationKey(Key key)
+        {
+            switch (key)
+            {
+                case Key.Add:
+                    return Key.OemPlus;
+                case Key.Subtract:
+                    return Key.OemMinus;
+                case Key.Decimal:
+                    return Key.OemPeriod;
+                default:
+                    return key;
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Input.UnitTests/KeyGestureParseTests.cs b/tests/Avalonia.Input.UnitTests/KeyGestureParseTests.cs
deleted file mode 100644
index d26b03ad80..0000000000
--- a/tests/Avalonia.Input.UnitTests/KeyGestureParseTests.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace Avalonia.Input.UnitTests
-{
-    public class KeyGestureParseTests
-    {
-        private static readonly Dictionary<string, KeyGesture> SampleData = new Dictionary<string, KeyGesture>
-        {
-            {"Ctrl+A", new KeyGesture {Key = Key.A, Modifiers = InputModifiers.Control}},
-            {"  \tShift\t+Alt +B", new KeyGesture {Key = Key.B, Modifiers = InputModifiers.Shift|InputModifiers.Alt} },
-            {"Control++", new KeyGesture {Key = Key.OemPlus, Modifiers = InputModifiers.Control} }
-        };
-            
-            
-            
-        [Fact]
-        public void Key_Gesture_Is_Able_To_Parse_Sample_Data()
-        {
-            foreach (var d in SampleData)
-                Assert.Equal(d.Value, KeyGesture.Parse(d.Key));
-        }
-    }
-}
diff --git a/tests/Avalonia.Input.UnitTests/KeyGestureTests.cs b/tests/Avalonia.Input.UnitTests/KeyGestureTests.cs
new file mode 100644
index 0000000000..006ed1140e
--- /dev/null
+++ b/tests/Avalonia.Input.UnitTests/KeyGestureTests.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Avalonia.Input.UnitTests
+{
+    public class KeyGestureTests
+    {
+        public static readonly IEnumerable<object[]> SampleData = new object[][]
+        {
+            new object[]{"Ctrl+A", new KeyGesture {Key = Key.A, Modifiers = InputModifiers.Control}},
+            new object[]{"  \tShift\t+Alt +B", new KeyGesture {Key = Key.B, Modifiers = InputModifiers.Shift|InputModifiers.Alt} },
+            new object[]{"Control++", new KeyGesture {Key = Key.OemPlus, Modifiers = InputModifiers.Control} }
+        };
+            
+            
+            
+        [Theory]
+        [MemberData(nameof(SampleData))]
+        public void Key_Gesture_Is_Able_To_Parse_Sample_Data(string text, KeyGesture gesture)
+        {
+            Assert.Equal(gesture, KeyGesture.Parse(text));
+        }
+
+        [Theory]
+        [InlineData(Key.OemMinus, Key.Subtract)]
+        [InlineData(Key.OemPlus, Key.Add)]
+        [InlineData(Key.OemPeriod, Key.Decimal)]
+        public void Key_Gesture_Matches_NumPad_To_Regular_Digit(Key gestureKey, Key pressedKey)
+        {
+            var keyGesture = new KeyGesture
+            {
+                Key = gestureKey
+            };
+            Assert.True(keyGesture.Matches(new KeyEventArgs
+            {
+                Key = pressedKey
+            }));
+        }
+    }
+}

From 23af42e4233444e556a6ab718036611c47eb70e3 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 14 Dec 2017 23:16:56 -0600
Subject: [PATCH 237/482] Fix explicit StylingParent definition.

---
 src/Avalonia.Controls/Primitives/PopupRoot.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs
index 927a54a838..507a085fed 100644
--- a/src/Avalonia.Controls/Primitives/PopupRoot.cs
+++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs
@@ -70,7 +70,7 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Gets the styling parent of the popup root.
         /// </summary>
-        IStyleRoot IStyleHost.StylingParent => Parent;
+        IStyleHost IStyleHost.StylingParent => Parent;
 
         /// <inheritdoc/>
         public void Dispose() => PlatformImpl?.Dispose();

From 381cd64b1f1859ce0c78638b573bb3fccb8570ad Mon Sep 17 00:00:00 2001
From: "M. ter Woord" <matthijs@terwoord.eu>
Date: Fri, 15 Dec 2017 17:40:54 +0100
Subject: [PATCH 238/482] Add the uri to the error message, that way nested
 load errors can be diagnosed much quicker.

---
 .../AvaloniaXamlLoaderPortableXaml.cs              | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoaderPortableXaml.cs b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoaderPortableXaml.cs
index 0419db5d0f..906bb00863 100644
--- a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoaderPortableXaml.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoaderPortableXaml.cs
@@ -127,7 +127,19 @@ namespace Avalonia.Markup.Xaml
 
             using (var stream = assetLocator.Open(uri, baseUri))
             {
-                return Load(stream, rootInstance, uri);
+                try
+                {
+                    return Load(stream, rootInstance, uri);
+                }
+                catch (Exception e)
+                {
+                    var uriString = uri.ToString();
+                    if (!uri.IsAbsoluteUri)
+                    {
+                        uriString = new Uri(baseUri, uri).AbsoluteUri;
+                    }
+                    throw new Exception("Error loading xaml at " + uriString, e);
+                }
             }
         }
 

From b0d013ad25fbcbcfea0836cbed58cfc1424006ff Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Fri, 15 Dec 2017 12:25:20 -0600
Subject: [PATCH 239/482] Fix tests.

---
 .../Avalonia.Controls.UnitTests/Primitives/PopupTests.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
index 06b3202a83..84ea717bab 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
@@ -15,6 +15,7 @@ using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
 using Xunit;
+using Avalonia.Input;
 
 namespace Avalonia.Controls.UnitTests.Primitives
 {
@@ -189,9 +190,11 @@ namespace Avalonia.Controls.UnitTests.Primitives
         {
             using (CreateServices())
             {
+                var window = new Window();
                 var target = new Popup();
                 var child = new Control();
 
+                window.Content = target;
                 target.Open();
 
                 Assert.Single(target.PopupRoot.GetVisualChildren());
@@ -214,7 +217,8 @@ namespace Avalonia.Controls.UnitTests.Primitives
                     {
                         Content = new Border(),
                         Template = new FuncControlTemplate<PopupContentControl>(PopupContentControlTemplate),
-                    }
+                    },
+                    StylingParent = AvaloniaLocator.Current.GetService<IGlobalStyles>()
                 };
 
                 target.ApplyTemplate();
@@ -306,7 +310,8 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 .Bind<IGlobalStyles>().ToFunc(() => globalStyles.Object)
                 .Bind<IWindowingPlatform>().ToConstant(new WindowingPlatformMock())
                 .Bind<IStyler>().ToTransient<Styler>()
-                .Bind<IPlatformRenderInterface>().ToFunc(() => renderInterface.Object);
+                .Bind<IPlatformRenderInterface>().ToFunc(() => renderInterface.Object)
+                .Bind<IInputManager>().ToConstant(new InputManager());
             
             return result;
         }

From ba481365f6469d2d3379d2a5d648a3acf935b45e Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Fri, 15 Dec 2017 20:27:30 -0600
Subject: [PATCH 240/482] Enable turning off the setup check for appbuilder
 tests.

---
 src/Avalonia.Controls/AppBuilderBase.cs             | 13 ++++++++++++-
 .../Avalonia.Controls.UnitTests/AppBuilderTests.cs  |  6 +++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/AppBuilderBase.cs b/src/Avalonia.Controls/AppBuilderBase.cs
index ebbd682f28..7af3deef34 100644
--- a/src/Avalonia.Controls/AppBuilderBase.cs
+++ b/src/Avalonia.Controls/AppBuilderBase.cs
@@ -209,6 +209,17 @@ namespace Avalonia.Controls
 
         public TAppBuilder UseAvaloniaModules() => AfterSetup(builder => SetupAvaloniaModules());
 
+        private bool CheckSetup { get; set; } = true;
+
+        /// <summary>
+        /// Set this AppBuilder to ignore the setup check. Used for testing purposes.
+        /// </summary>
+        internal TAppBuilder IgnoreSetupCheck()
+        {
+            CheckSetup = false;
+            return Self;
+        }
+
         private void SetupAvaloniaModules()
         {
             var moduleInitializers = from assembly in AvaloniaLocator.Current.GetService<IRuntimePlatform>().GetLoadedAssemblies()
@@ -254,7 +265,7 @@ namespace Avalonia.Controls
                 throw new InvalidOperationException("No rendering system configured.");
             }
 
-            if (s_setupWasAlreadyCalled)
+            if (s_setupWasAlreadyCalled && CheckSetup)
             {
                 throw new InvalidOperationException("Setup was already called on one of AppBuilder instances");
             }
diff --git a/tests/Avalonia.Controls.UnitTests/AppBuilderTests.cs b/tests/Avalonia.Controls.UnitTests/AppBuilderTests.cs
index 867f740a3a..60c53d126c 100644
--- a/tests/Avalonia.Controls.UnitTests/AppBuilderTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/AppBuilderTests.cs
@@ -65,6 +65,7 @@ namespace Avalonia.Controls.UnitTests
             {
                 ResetModuleLoadStates();
                 AppBuilder.Configure<App>()
+                    .IgnoreSetupCheck()
                     .UseWindowingSubsystem(() => { })
                     .UseRenderingSubsystem(() => { })
                     .UseAvaloniaModules()
@@ -81,6 +82,7 @@ namespace Avalonia.Controls.UnitTests
             {
                 ResetModuleLoadStates();
                 var builder = AppBuilder.Configure<App>()
+                    .IgnoreSetupCheck()
                     .UseWindowingSubsystem(() => { })
                     .UseRenderingSubsystem(() => { }, "Direct2D1");
                 builder.UseAvaloniaModules().SetupWithoutStarting();
@@ -90,6 +92,7 @@ namespace Avalonia.Controls.UnitTests
 
                 ResetModuleLoadStates();
                 builder = AppBuilder.Configure<App>()
+                    .IgnoreSetupCheck()
                     .UseWindowingSubsystem(() => { })
                     .UseRenderingSubsystem(() => { }, "Skia");
                 builder.UseAvaloniaModules().SetupWithoutStarting();
@@ -99,13 +102,14 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        [Fact (Skip = "We don't have rendering modules with dependencies right now")]
+        [Fact]
         public void LoadsRenderingModuleWithoutDependenciesWhenNoModuleMatches()
         {
             using (AvaloniaLocator.EnterScope())
             {
                 ResetModuleLoadStates();
                 var builder = AppBuilder.Configure<App>()
+                    .IgnoreSetupCheck()
                     .UseWindowingSubsystem(() => { })
                     .UseRenderingSubsystem(() => { }, "TBD");
                 builder.UseAvaloniaModules().SetupWithoutStarting();

From 401ea4fe99b07d1812dbbfe667305e27892203c0 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Fri, 15 Dec 2017 20:53:48 -0600
Subject: [PATCH 241/482] Fix concurrency primative usage in Ref.cs

---
 src/Avalonia.Base/Utilities/Ref.cs | 42 +++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/Avalonia.Base/Utilities/Ref.cs b/src/Avalonia.Base/Utilities/Ref.cs
index eb73488bd0..f78544b416 100644
--- a/src/Avalonia.Base/Utilities/Ref.cs
+++ b/src/Avalonia.Base/Utilities/Ref.cs
@@ -46,7 +46,6 @@ namespace Avalonia.Utilities
         {
             private IDisposable _item;
             private volatile int _refs;
-            private object _lock = new object();
 
             public RefCounter(IDisposable item)
             {
@@ -55,20 +54,39 @@ namespace Avalonia.Utilities
 
             public void AddRef()
             {
-                Interlocked.Increment(ref _refs);
+                var old = _refs;
+                while (true)
+                {
+                    var current = Interlocked.CompareExchange(ref _refs, old + 1, old);
+                    if (current == old)
+                    {
+                        if (current == 0)
+                        {
+                            throw new ObjectDisposedException("Cannot add a reference to a 0-referenced item");
+                        }
+                    }
+                    old = current;
+                }
             }
 
             public void Release()
             {
-                if (Interlocked.Decrement(ref _refs) == 0)
+                var old = _refs;
+                while (true)
                 {
-                    lock (_lock)
+                    var current = Interlocked.CompareExchange(ref _refs, old - 1, old);
+
+                    if (current == old)
                     {
-                        _item?.Dispose();
-                        _item = null;
+                        if (current == 1)
+                        {
+                            _item.Dispose();
+                            _item = null;
+                        }
+                        return;
                     }
+                    old = current;
                 }
-
             }
         }
 
@@ -82,7 +100,6 @@ namespace Avalonia.Utilities
             {
                 _item = item;
                 _counter = counter;
-                Thread.MemoryBarrier();
                 _counter.AddRef();
             }
 
@@ -129,12 +146,13 @@ namespace Avalonia.Utilities
             {
                 lock (_lock)
                 {
-                    lock (_lock)
+                    if (_item != null)
                     {
-                        if (_item != null)
-                            return new Ref<TResult>((TResult) (object) _item, _counter);
-                        throw new ObjectDisposedException("Ref<" + typeof(T) + ">");
+                        TResult castItem = null;
+                        Volatile.Write(ref castItem, (TResult)(object)_item);
+                        return new Ref<TResult>(castItem, _counter);
                     }
+                    throw new ObjectDisposedException("Ref<" + typeof(T) + ">");
                 }
             }
         }

From ad02c53a4629d92b0aa0f301807c0e127e992082 Mon Sep 17 00:00:00 2001
From: "M. ter Woord" <matthijs@terwoord.eu>
Date: Sat, 16 Dec 2017 10:38:49 +0100
Subject: [PATCH 242/482] - Add XamlLoadException

- Use it for the new load exception info.
---
 src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj     | 1 +
 .../Avalonia.Markup.Xaml/AvaloniaXamlLoaderPortableXaml.cs      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index cf6afbe620..0ce2a1a992 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -91,6 +91,7 @@
         <Compile Include="Templates\TemplateContent.cs" />
         <Compile Include="Templates\TemplateLoader.cs" />
         <Compile Include="Templates\TreeDataTemplate.cs" />
+        <Compile Include="XamlLoadException.cs" />
         <Compile Include="PortableXaml\portable.xaml.github\src\Portable.Xaml\**\*.cs" Exclude="PortableXaml\portable.xaml.github\src\Portable.Xaml\Assembly\**\*.cs" />
         <Compile Remove="**\UriTypeConverter.cs" />
     </ItemGroup>
diff --git a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoaderPortableXaml.cs b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoaderPortableXaml.cs
index 906bb00863..de2a79c54e 100644
--- a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoaderPortableXaml.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoaderPortableXaml.cs
@@ -138,7 +138,7 @@ namespace Avalonia.Markup.Xaml
                     {
                         uriString = new Uri(baseUri, uri).AbsoluteUri;
                     }
-                    throw new Exception("Error loading xaml at " + uriString, e);
+                    throw new XamlLoadException("Error loading xaml at " + uriString, e);
                 }
             }
         }

From 09c7c32e1912f205a117a49e2f9459e91413ca5f Mon Sep 17 00:00:00 2001
From: "M. ter Woord" <matthijs@terwoord.eu>
Date: Sat, 16 Dec 2017 13:24:27 +0100
Subject: [PATCH 243/482] Add the missing file.

---
 .../Avalonia.Markup.Xaml/XamlLoadException.cs | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 src/Markup/Avalonia.Markup.Xaml/XamlLoadException.cs

diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlLoadException.cs b/src/Markup/Avalonia.Markup.Xaml/XamlLoadException.cs
new file mode 100644
index 0000000000..e66b8ddf54
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/XamlLoadException.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace Avalonia.Markup.Xaml
+{
+    public class XamlLoadException: Exception
+    {
+        public XamlLoadException()
+        {
+        }
+
+        protected XamlLoadException(SerializationInfo info, StreamingContext context): base(info, context)
+        {
+        }
+
+        public XamlLoadException(string message): base(message)
+        {
+        }
+
+        public XamlLoadException(string message, Exception innerException): base(message, innerException)
+        {
+        }
+    }
+}
\ No newline at end of file

From acaedd866ba3184eba7c60f87196e28847116bd8 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 20 Dec 2017 13:34:50 -0600
Subject: [PATCH 244/482] Fix PR feedback.

---
 src/Avalonia.Base/Utilities/Ref.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Avalonia.Base/Utilities/Ref.cs b/src/Avalonia.Base/Utilities/Ref.cs
index f78544b416..98077cd4fd 100644
--- a/src/Avalonia.Base/Utilities/Ref.cs
+++ b/src/Avalonia.Base/Utilities/Ref.cs
@@ -57,13 +57,14 @@ namespace Avalonia.Utilities
                 var old = _refs;
                 while (true)
                 {
+                    if (old == 0)
+                    {
+                        throw new ObjectDisposedException("Cannot add a reference to a nonreferenced item");
+                    }
                     var current = Interlocked.CompareExchange(ref _refs, old + 1, old);
                     if (current == old)
                     {
-                        if (current == 0)
-                        {
-                            throw new ObjectDisposedException("Cannot add a reference to a 0-referenced item");
-                        }
+                        break;
                     }
                     old = current;
                 }
@@ -78,12 +79,12 @@ namespace Avalonia.Utilities
 
                     if (current == old)
                     {
-                        if (current == 1)
+                        if (old == 1)
                         {
                             _item.Dispose();
                             _item = null;
                         }
-                        return;
+                        break;
                     }
                     old = current;
                 }
@@ -100,6 +101,7 @@ namespace Avalonia.Utilities
             {
                 _item = item;
                 _counter = counter;
+                Interlocked.MemoryBarrier();
                 _counter.AddRef();
             }
 
@@ -148,9 +150,7 @@ namespace Avalonia.Utilities
                 {
                     if (_item != null)
                     {
-                        TResult castItem = null;
-                        Volatile.Write(ref castItem, (TResult)(object)_item);
-                        return new Ref<TResult>(castItem, _counter);
+                        return new Ref<TResult>((TResult)(object)_item, _counter);
                     }
                     throw new ObjectDisposedException("Ref<" + typeof(T) + ">");
                 }

From b944783c1bbdee452be874a5bffb38dbe4640676 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 20 Dec 2017 20:02:58 +0000
Subject: [PATCH 245/482] fix Skia SetForegroundBrush when length = 1.

---
 src/Skia/Avalonia.Skia/FormattedTextImpl.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs
index f727d033cc..f22722a0b5 100644
--- a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs
+++ b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs
@@ -450,7 +450,7 @@ namespace Avalonia.Skia
                 {
                     var match = _foregroundBrushes[bi];
 
-                    len = match.Key.EndIndex - index + 1;
+                    len = match.Key.EndIndex - index;
                     result = match.Value;
 
                     if (len > 0 && len < length)
@@ -641,7 +641,7 @@ namespace Avalonia.Skia
                 Length = length;
             }
 
-            public int EndIndex => StartIndex + Length - 1;
+            public int EndIndex => StartIndex + Length;
 
             public int Length { get; private set; }
 

From 16b99ae3aafdade0fa99daab8f8c7a5125cf5240 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 20 Dec 2017 20:04:35 +0000
Subject: [PATCH 246/482] add skia to replace scripts so skia issues can be
 debugged from user apps.

---
 scripts/ReplaceNugetCache.ps1        | 1 +
 scripts/ReplaceNugetCache.sh         | 2 ++
 scripts/ReplaceNugetCacheRelease.ps1 | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/ReplaceNugetCache.ps1 b/scripts/ReplaceNugetCache.ps1
index 4ad31db274..a03d442bff 100644
--- a/scripts/ReplaceNugetCache.ps1
+++ b/scripts/ReplaceNugetCache.ps1
@@ -2,3 +2,4 @@ copy ..\samples\ControlCatalog.NetCore\bin\Debug\netcoreapp2.0\Avalonia**.dll ~\
 copy ..\samples\ControlCatalog.NetCore.\bin\Debug\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netstandard2.0\
 copy ..\samples\ControlCatalog.NetCore.\bin\Debug\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.gtk3\$args\lib\netstandard2.0\
 copy ..\samples\ControlCatalog.NetCore.\bin\Debug\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.win32\$args\lib\netstandard2.0\
+copy ..\samples\ControlCatalog.NetCore.\bin\Debug\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.skia\$args\lib\netstandard2.0\
diff --git a/scripts/ReplaceNugetCache.sh b/scripts/ReplaceNugetCache.sh
index 636aec5f23..d50f4152e8 100755
--- a/scripts/ReplaceNugetCache.sh
+++ b/scripts/ReplaceNugetCache.sh
@@ -3,4 +3,6 @@
  cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp2.0/Avalonia**.dll ~/.nuget/packages/avalonia/$1/lib/netcoreapp2.0/
  cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp2.0/Avalonia**.dll ~/.nuget/packages/avalonia/$1/lib/netstandard2.0/
  cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp2.0/Avalonia**.dll ~/.nuget/packages/avalonia.gtk3/$1/lib/netstandard2.0/
+ cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp2.0/Avalonia**.dll ~/.nuget/packages/avalonia.skia/$1/lib/netstandard2.0/
+ 
  
diff --git a/scripts/ReplaceNugetCacheRelease.ps1 b/scripts/ReplaceNugetCacheRelease.ps1
index f188c81c51..1c19e00400 100644
--- a/scripts/ReplaceNugetCacheRelease.ps1
+++ b/scripts/ReplaceNugetCacheRelease.ps1
@@ -1,4 +1,5 @@
 copy ..\samples\ControlCatalog.NetCore\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netcoreapp2.0\
 copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netstandard2.0\
 copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.gtk3\$args\lib\netstandard2.0\
-copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.win32\$args\lib\netstandard2.0\
\ No newline at end of file
+copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.win32\$args\lib\netstandard2.0\
+copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.skia\$args\lib\netstandard2.0\
\ No newline at end of file

From eb7c0104624016a41b1e288e0134ab7db7d3e75c Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 20 Dec 2017 14:20:14 -0600
Subject: [PATCH 247/482] Retarget .Net Framework projects to 4.7

Works around dotnet/standard#567.
---
 build.cake                                    |  2 +-
 samples/BindingTest/App.config                |  2 +-
 samples/BindingTest/BindingTest.csproj        |  2 +-
 samples/ControlCatalog.Desktop/App.config     |  2 +-
 .../ControlCatalog.Desktop.csproj             |  2 +-
 samples/RenderTest/App.config                 |  2 +-
 samples/RenderTest/RenderTest.csproj          |  2 +-
 samples/VirtualizationTest/App.config         |  2 +-
 .../VirtualizationTest.csproj                 |  2 +-
 .../Avalonia.Base.UnitTests.csproj            |  2 +-
 tests/Avalonia.Benchmarks/App.config          |  8 ++--
 .../Avalonia.Benchmarks.csproj                |  2 +-
 .../Avalonia.Controls.UnitTests.csproj        |  2 +-
 .../App.config                                | 14 +++---
 .../Avalonia.DesignerSupport.TestApp.csproj   |  4 +-
 .../Properties/Resources.Designer.cs          | 44 ++++++++-----------
 .../Properties/Settings.Designer.cs           | 22 ++++------
 .../Avalonia.DesignerSupport.Tests.csproj     |  3 +-
 .../Avalonia.Direct2D1.UnitTests.csproj       |  2 +-
 tests/Avalonia.Direct2D1.UnitTests/app.config | 12 ++---
 .../Avalonia.Input.UnitTests.csproj           |  2 +-
 .../Avalonia.Interactivity.UnitTests.csproj   |  2 +-
 .../Avalonia.Layout.UnitTests.csproj          |  2 +-
 .../Avalonia.LeakTests.csproj                 |  2 +-
 tests/Avalonia.LeakTests/app.config           | 12 ++---
 .../Avalonia.Markup.UnitTests.csproj          |  2 +-
 .../Avalonia.Markup.Xaml.UnitTests.csproj     |  2 +-
 .../Avalonia.Direct2D1.RenderTests.csproj     |  2 +-
 .../Avalonia.Styling.UnitTests.csproj         |  2 +-
 .../Avalonia.UnitTests.csproj                 |  2 +-
 .../Avalonia.Visuals.UnitTests.csproj         |  2 +-
 31 files changed, 78 insertions(+), 87 deletions(-)

diff --git a/build.cake b/build.cake
index eb5918832e..06ba84e27f 100644
--- a/build.cake
+++ b/build.cake
@@ -163,7 +163,7 @@ void RunCoreTest(string project, Parameters parameters, bool coreOnly = false)
     DotNetCoreRestore(project);
     var frameworks = new List<string>(){"netcoreapp2.0"};
     if(parameters.IsRunningOnWindows)
-        frameworks.Add("net461");
+        frameworks.Add("net47");
     foreach(var fw in frameworks)
     {
         if(!fw.StartsWith("netcoreapp") && coreOnly)
diff --git a/samples/BindingTest/App.config b/samples/BindingTest/App.config
index 373b3a13f8..538be69997 100644
--- a/samples/BindingTest/App.config
+++ b/samples/BindingTest/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingTest/BindingTest.csproj
index 9f3fed5522..a17fe0eed1 100644
--- a/samples/BindingTest/BindingTest.csproj
+++ b/samples/BindingTest/BindingTest.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BindingTest</RootNamespace>
     <AssemblyName>BindingTest</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
diff --git a/samples/ControlCatalog.Desktop/App.config b/samples/ControlCatalog.Desktop/App.config
index 68403e421f..cd4593817b 100644
--- a/samples/ControlCatalog.Desktop/App.config
+++ b/samples/ControlCatalog.Desktop/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
diff --git a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
index cfa2f89b0e..8a5959e361 100644
--- a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
+++ b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ControlCatalog.Desktop</RootNamespace>
     <AssemblyName>ControlCatalog.Desktop</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
diff --git a/samples/RenderTest/App.config b/samples/RenderTest/App.config
index 68403e421f..cd4593817b 100644
--- a/samples/RenderTest/App.config
+++ b/samples/RenderTest/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
diff --git a/samples/RenderTest/RenderTest.csproj b/samples/RenderTest/RenderTest.csproj
index 4a471a831a..b33d5d3c70 100644
--- a/samples/RenderTest/RenderTest.csproj
+++ b/samples/RenderTest/RenderTest.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RenderTest</RootNamespace>
     <AssemblyName>RenderTest</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
diff --git a/samples/VirtualizationTest/App.config b/samples/VirtualizationTest/App.config
index 68403e421f..cd4593817b 100644
--- a/samples/VirtualizationTest/App.config
+++ b/samples/VirtualizationTest/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
diff --git a/samples/VirtualizationTest/VirtualizationTest.csproj b/samples/VirtualizationTest/VirtualizationTest.csproj
index 147355aed1..0d498d827f 100644
--- a/samples/VirtualizationTest/VirtualizationTest.csproj
+++ b/samples/VirtualizationTest/VirtualizationTest.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>VirtualizationTest</RootNamespace>
     <AssemblyName>VirtualizationTest</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
index 8692cdef42..f8ec52a6c7 100644
--- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
+++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
diff --git a/tests/Avalonia.Benchmarks/App.config b/tests/Avalonia.Benchmarks/App.config
index 121e469348..425e308058 100644
--- a/tests/Avalonia.Benchmarks/App.config
+++ b/tests/Avalonia.Benchmarks/App.config
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.1510.2205" newVersion="4.2.1510.2205" />
+        <assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1510.2205" newVersion="4.2.1510.2205"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
index c16b89e0b6..d40dc596a5 100644
--- a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
+++ b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Avalonia.Benchmarks</RootNamespace>
     <AssemblyName>Avalonia.Benchmarks</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
index 8b2f5093cf..a63898486b 100644
--- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
+++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
diff --git a/tests/Avalonia.DesignerSupport.TestApp/App.config b/tests/Avalonia.DesignerSupport.TestApp/App.config
index 4fe7131d2a..baef7524af 100644
--- a/tests/Avalonia.DesignerSupport.TestApp/App.config
+++ b/tests/Avalonia.DesignerSupport.TestApp/App.config
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="SharpDX" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.1.0" newVersion="3.1.1.0" />
+        <assemblyIdentity name="SharpDX" publicKeyToken="b4dcf0f35e5521f1" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.1.1.0" newVersion="3.1.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="SharpDX.DXGI" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.1.0" newVersion="3.1.1.0" />
+        <assemblyIdentity name="SharpDX.DXGI" publicKeyToken="b4dcf0f35e5521f1" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.1.1.0" newVersion="3.1.1.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
index 7945915e8c..eaae82316e 100644
--- a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
+++ b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Avalonia.DesignerSupport.TestApp</RootNamespace>
     <AssemblyName>Avalonia.DesignerSupport.TestApp</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -62,6 +63,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <EmbeddedResource Include="App.xaml">
       <SubType>Designer</SubType>
diff --git a/tests/Avalonia.DesignerSupport.TestApp/Properties/Resources.Designer.cs b/tests/Avalonia.DesignerSupport.TestApp/Properties/Resources.Designer.cs
index a251d20120..28db9d4dcf 100644
--- a/tests/Avalonia.DesignerSupport.TestApp/Properties/Resources.Designer.cs
+++ b/tests/Avalonia.DesignerSupport.TestApp/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Avalonia.DesignerSupport.TestApp.Properties
-{
-
-
+namespace Avalonia.DesignerSupport.TestApp.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,51 +19,43 @@ namespace Avalonia.DesignerSupport.TestApp.Properties
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Avalonia.DesignerSupport.TestApp.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
diff --git a/tests/Avalonia.DesignerSupport.TestApp/Properties/Settings.Designer.cs b/tests/Avalonia.DesignerSupport.TestApp/Properties/Settings.Designer.cs
index eaf8ac263a..15a90aaf18 100644
--- a/tests/Avalonia.DesignerSupport.TestApp/Properties/Settings.Designer.cs
+++ b/tests/Avalonia.DesignerSupport.TestApp/Properties/Settings.Designer.cs
@@ -8,21 +8,17 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Avalonia.DesignerSupport.TestApp.Properties
-{
-
-
+namespace Avalonia.DesignerSupport.TestApp.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.5.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }
diff --git a/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj b/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj
index 477d44b99d..bc9a4b3e29 100644
--- a/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj
+++ b/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Avalonia.DesignerSupport.Tests</RootNamespace>
     <AssemblyName>Avalonia.DesignerSupport.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
index 4b33d14243..303ebed001 100644
--- a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
+++ b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Avalonia.Direct2D1.UnitTests</RootNamespace>
     <AssemblyName>Avalonia.Direct2D1.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/tests/Avalonia.Direct2D1.UnitTests/app.config b/tests/Avalonia.Direct2D1.UnitTests/app.config
index 6af30494f2..e4df6c253e 100644
--- a/tests/Avalonia.Direct2D1.UnitTests/app.config
+++ b/tests/Avalonia.Direct2D1.UnitTests/app.config
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="SharpDX" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.1.0" newVersion="3.1.1.0" />
+        <assemblyIdentity name="SharpDX" publicKeyToken="b4dcf0f35e5521f1" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.1.1.0" newVersion="3.1.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="SharpDX.DXGI" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.1.0" newVersion="3.1.1.0" />
+        <assemblyIdentity name="SharpDX.DXGI" publicKeyToken="b4dcf0f35e5521f1" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.1.1.0" newVersion="3.1.1.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/></startup></configuration>
diff --git a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
index 98a1312782..1f66290dd9 100644
--- a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
+++ b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
diff --git a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj
index 78d2128478..3fb2439af8 100644
--- a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj
+++ b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
diff --git a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
index 0020ff46d9..ae6f4d463a 100644
--- a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
+++ b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
diff --git a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
index 46bd4ee324..7ecc3797ed 100644
--- a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
+++ b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Avalonia.LeakTests</RootNamespace>
     <AssemblyName>Avalonia.LeakTests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
diff --git a/tests/Avalonia.LeakTests/app.config b/tests/Avalonia.LeakTests/app.config
index 01de951354..71e6d0a02e 100644
--- a/tests/Avalonia.LeakTests/app.config
+++ b/tests/Avalonia.LeakTests/app.config
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Ploeh.AutoFixture" publicKeyToken="b24654c590009d4f" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.40.0.0" newVersion="3.40.0.0" />
+        <assemblyIdentity name="Ploeh.AutoFixture" publicKeyToken="b24654c590009d4f" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.40.0.0" newVersion="3.40.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.1510.2205" newVersion="4.2.1510.2205" />
+        <assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1510.2205" newVersion="4.2.1510.2205"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/></startup></configuration>
diff --git a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj
index 5d3b04e24b..4db9bc45ad 100644
--- a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj
+++ b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
index a3e4ad1418..02fbf23687 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
diff --git a/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj b/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
index 445f8b0368..03f5233546 100644
--- a/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
+++ b/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Avalonia.Direct2D1.RenderTests</RootNamespace>
     <AssemblyName>Avalonia.Direct2D1.RenderTests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj
index ae12269e18..87d6e4504c 100644
--- a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj
+++ b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <NoWarn>CS0067</NoWarn>
   </PropertyGroup>
diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
index b04fd5d2bc..c879fe9c94 100644
--- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
+++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputType>Library</OutputType>
   </PropertyGroup>
diff --git a/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj b/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj
index 6dc9e3324d..74a48f9ce7 100644
--- a/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj
+++ b/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
   <Import Project="..\..\build\Moq.props" />

From bc3e3cb25dc098bc84e52da7c486354e6da0f90b Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 20 Dec 2017 14:35:08 -0600
Subject: [PATCH 248/482] Update project file for Avalonia.UnitTests to use
 net47 instead of net461

---
 tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
index c879fe9c94..24e335f46e 100644
--- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
+++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
@@ -21,7 +21,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net47'">
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -32,7 +32,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Condition="'$(TargetFramework)' == 'net461'" Include="..\..\src\Avalonia.DotNetFrameworkRuntime\Avalonia.DotNetFrameworkRuntime.csproj" />
+    <ProjectReference Condition="'$(TargetFramework)' == 'net47'" Include="..\..\src\Avalonia.DotNetFrameworkRuntime\Avalonia.DotNetFrameworkRuntime.csproj" />
 	<ProjectReference Condition="'$(TargetFramework)' == 'netcoreapp2.0'" Include="..\..\src\Avalonia.DotNetCoreRuntime\Avalonia.DotNetCoreRuntime.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />

From abe1afbb01c1dd597696ae4fa6b7f4e8d3e7539b Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 20 Dec 2017 19:03:16 -0600
Subject: [PATCH 249/482] Retarget base unit tests library (that is just
 included in tests) back to net461.

---
 tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
index 24e335f46e..c2580ec004 100644
--- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
+++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputType>Library</OutputType>
   </PropertyGroup>
@@ -21,7 +21,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net47'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -32,8 +32,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Condition="'$(TargetFramework)' == 'net47'" Include="..\..\src\Avalonia.DotNetFrameworkRuntime\Avalonia.DotNetFrameworkRuntime.csproj" />
-	<ProjectReference Condition="'$(TargetFramework)' == 'netcoreapp2.0'" Include="..\..\src\Avalonia.DotNetCoreRuntime\Avalonia.DotNetCoreRuntime.csproj" />
+    <ProjectReference Condition="'$(TargetFramework)' == 'net461'" Include="..\..\src\Avalonia.DotNetFrameworkRuntime\Avalonia.DotNetFrameworkRuntime.csproj" />
+	  <ProjectReference Condition="'$(TargetFramework)' == 'netcoreapp2.0'" Include="..\..\src\Avalonia.DotNetCoreRuntime\Avalonia.DotNetCoreRuntime.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />

From ee433f741e8b4c39e8db15f07fb7102bc22f3bd0 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 20 Dec 2017 20:12:47 -0600
Subject: [PATCH 250/482] Update appveyor.yml

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index ba3680d0b9..746ded971d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-os: Previous Visual Studio 2017
+os: Visual Studio 2017
 platform:
 - Any CPU
 skip_branch_with_pr: true
@@ -22,7 +22,7 @@ install:
 before_build:
 - git submodule update --init
 build_script:
-- ps: .\build.ps1 -Target "AppVeyor" -Platform "$env:platform" -Configuration "$env:configuration"
+- ps: .\build.ps1 -Target "AppVeyor" -Platform "$env:platform" -Configuration "$env:configuration" -v Diagnostic
 
 test: off
 artifacts:

From f72577cf92e0fc39d1e728b6f3feacb9d25f8321 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 20 Dec 2017 21:03:23 -0600
Subject: [PATCH 251/482] Clean up test scripts

---
 appveyor.yml                                  |   2 +-
 build.cake                                    |  69 +++-------
 .../Resources/Resource.Designer.cs            |   7 +-
 .../Avalonia.DesignerSupport.TestApp.csproj   |   3 +-
 .../Avalonia.DesignerSupport.Tests.csproj     |   3 +-
 .../Avalonia.Direct2D1.RenderTests.csproj     | 125 ++++--------------
 tests/Avalonia.RenderTests/TestBase.cs        |   4 +-
 7 files changed, 54 insertions(+), 159 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 746ded971d..76d1ae3e1c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -22,7 +22,7 @@ install:
 before_build:
 - git submodule update --init
 build_script:
-- ps: .\build.ps1 -Target "AppVeyor" -Platform "$env:platform" -Configuration "$env:configuration" -v Diagnostic
+- ps: .\build.ps1 -Target "AppVeyor" -Platform "$env:platform" -Configuration "$env:configuration"
 
 test: off
 artifacts:
diff --git a/build.cake b/build.cake
index 06ba84e27f..d321109a1e 100644
--- a/build.cake
+++ b/build.cake
@@ -143,8 +143,8 @@ Task("Build")
             settings.WithProperty("Platform", "\"" + parameters.Platform + "\"");
             settings.WithProperty("UseRoslynPathHack", "true");
             settings.SetVerbosity(Verbosity.Minimal);
-            settings.WithProperty("Windows", "True");
             settings.UseToolVersion(MSBuildToolVersion.VS2017);
+            settings.WithProperty("Windows", "True");
             settings.SetNodeReuse(false);
         });
     }
@@ -178,8 +178,11 @@ void RunCoreTest(string project, Parameters parameters, bool coreOnly = false)
     }
 }
 
-Task("Run-Net-Core-Unit-Tests")
-    .IsDependentOn("Clean")
+Task("Run-Unit-Tests")
+    .IsDependentOn("Build")
+    .IsDependentOn("Run-Designer-Unit-Tests")
+    .IsDependentOn("Run-Render-Tests")
+    .WithCriteria(() => !parameters.SkipTests)
     .Does(() => {
         RunCoreTest("./tests/Avalonia.Base.UnitTests", parameters, false);
         RunCoreTest("./tests/Avalonia.Controls.UnitTests", parameters, false);
@@ -190,56 +193,22 @@ Task("Run-Net-Core-Unit-Tests")
         RunCoreTest("./tests/Avalonia.Markup.Xaml.UnitTests", parameters, false);
         RunCoreTest("./tests/Avalonia.Styling.UnitTests", parameters, false);
         RunCoreTest("./tests/Avalonia.Visuals.UnitTests", parameters, false);
-        if(parameters.IsRunningOnWindows)
-            RunCoreTest("./tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj", parameters, true);
     });
 
-Task("Run-Unit-Tests")
-    .IsDependentOn("Run-Net-Core-Unit-Tests")
+Task("Run-Render-Tests")
     .IsDependentOn("Build")
-    //.IsDependentOn("Run-Leak-Tests")
-    .WithCriteria(() => !parameters.SkipTests)
+    .WithCriteria(() => !parameters.SkipTests && parameters.IsRunningOnWindows)
+    .Does(() => {
+        RunCoreTest("./tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj", parameters, true);
+        RunCoreTest("./tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj", parameters, true);
+    })
+
+Task("Run-Designer-Unit-Tests")
+    .IsDependentOn("Build")
+    .WithCriteria(() => !parameters.SkipTests && parameters.IsRunningOnWindows)
     .Does(() =>
 {
-    if(!parameters.IsRunningOnWindows)
-       return;
-
-    var unitTests = GetDirectories("./tests/Avalonia.*.UnitTests")
-        .Select(dir => System.IO.Path.GetFileName(dir.FullPath))
-        .Where( name => !name.Contains("Skia")) // Run in the Run-Net-Core-Unit-Tests target
-        .Where(name => parameters.IsRunningOnWindows ? true : !name.Contains("Direct2D"))
-        .Select(name => MakeAbsolute(File("./tests/" + name + "/bin/" + parameters.DirSuffix + "/" + name + ".dll")))
-        .ToList();
-
-    var toolPath = (parameters.IsPlatformAnyCPU || parameters.IsPlatformX86) ? 
-        Context.Tools.Resolve("xunit.console.x86.exe") :
-        Context.Tools.Resolve("xunit.console.exe");
-
-    var xUnitSettings = new XUnit2Settings 
-    { 
-        ToolPath = toolPath,
-        Parallelism = ParallelismOption.None,
-        ShadowCopy = false
-    };
-
-    xUnitSettings.NoAppDomain = !parameters.IsRunningOnWindows;
-
-    foreach(var test in unitTests.Where(testFile => FileExists(testFile)))
-    {
-        CopyDirectory(test.GetDirectory(), parameters.TestsRoot);
-    }
-
-    var testsInDirectoryToRun = new List<FilePath>();
-    if(parameters.IsRunningOnWindows)
-    {
-        testsInDirectoryToRun.AddRange(GetFiles("./artifacts/tests/*Tests.dll"));
-    }
-    else
-    {
-        testsInDirectoryToRun.AddRange(GetFiles("./artifacts/tests/*.UnitTests.dll"));
-    }
-
-    XUnit2(testsInDirectoryToRun, xUnitSettings);
+    XUnit2(GetFiles("./artifacts/designer-tests/Avalonia.DesignerSupport.Tests.csproj"), xUnitSettings);
 });
 
 Task("Copy-Files")
@@ -427,7 +396,7 @@ Task("Default").Does(() =>
     if(parameters.IsRunningOnWindows)
         RunTarget("Package");
     else
-        RunTarget("Run-Net-Core-Unit-Tests");
+        RunTarget("Run-Unit-Tests");
 });
 Task("AppVeyor")
   .IsDependentOn("Zip-Files")
@@ -435,7 +404,7 @@ Task("AppVeyor")
   .IsDependentOn("Publish-NuGet");
 
 Task("Travis")
-  .IsDependentOn("Run-Net-Core-Unit-Tests");
+  .IsDependentOn("Run-Unit-Tests");
 
 ///////////////////////////////////////////////////////////////////////////////
 // EXECUTE
diff --git a/src/Android/Avalonia.Android/Resources/Resource.Designer.cs b/src/Android/Avalonia.Android/Resources/Resource.Designer.cs
index e66c2800d3..80cbbc51ec 100644
--- a/src/Android/Avalonia.Android/Resources/Resource.Designer.cs
+++ b/src/Android/Avalonia.Android/Resources/Resource.Designer.cs
@@ -40,14 +40,11 @@ namespace Avalonia.Android
 		public partial class String
 		{
 			
-			// aapt resource value: 0x7f020002
-			public static int ApplicationName = 2130837506;
-			
 			// aapt resource value: 0x7f020001
-			public static int Hello = 2130837505;
+			public static int ApplicationName = 2130837505;
 			
 			// aapt resource value: 0x7f020000
-			public static int library_name = 2130837504;
+			public static int Hello = 2130837504;
 			
 			static String()
 			{
diff --git a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
index eaae82316e..fbbd5f0b28 100644
--- a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
+++ b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
@@ -13,13 +13,13 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
+    <OutputPath>..\..\artifacts\designer-tests\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\artifacts\tests\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -28,7 +28,6 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\artifacts\tests\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj b/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj
index bc9a4b3e29..4ce24e1d4c 100644
--- a/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj
+++ b/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj
@@ -12,12 +12,12 @@
     <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <OutputPath>..\..\artifacts\designer-tests\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\artifacts\tests\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -25,7 +25,6 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\artifacts\tests\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj b/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
index 03f5233546..6af8fd8963 100644
--- a/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
+++ b/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
@@ -1,106 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{DABFD304-D6A4-4752-8123-C2CCF7AC7831}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Avalonia.Direct2D1.RenderTests</RootNamespace>
-    <AssemblyName>Avalonia.Direct2D1.RenderTests</AssemblyName>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\artifacts\tests\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>CS1591</NoWarn>
+    <BaseIntermediateOutputPath>obj-Direct2D1</BaseIntermediateOutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\artifacts\tests\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <OutputPath>bin\Direct2D\$(Configuration)</OutputPath>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
+    <DefineConstants>$(DefineConstants);AVALONIA_DIRECT2D</DefineConstants>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Drawing" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj">
-      <Project>{D211E587-D8BC-45B9-95A4-F297C8FA5200}</Project>
-      <Name>Avalonia.Animation</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj">
-      <Project>{B09B78D8-9B26-48B0-9149-D64A2F120F3F}</Project>
-      <Name>Avalonia.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj">
-      <Project>{D2221C82-4A25-4583-9B43-D791E3F6820C}</Project>
-      <Name>Avalonia.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj">
-      <Project>{3E908F67-5543-4879-A1DC-08EACE79B3CD}</Project>
-      <Name>Avalonia.Direct2D1</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj">
-      <Project>{62024B2D-53EB-4638-B26B-85EEAA54866E}</Project>
-      <Name>Avalonia.Input</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj">
-      <Project>{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}</Project>
-      <Name>Avalonia.Interactivity</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj">
-      <Project>{42472427-4774-4C81-8AFF-9F27B8E31721}</Project>
-      <Name>Avalonia.Layout</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj">
-      <Project>{EB582467-6ABB-43A1-B052-E981BA910E3A}</Project>
-      <Name>Avalonia.Visuals</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj">
-      <Project>{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}</Project>
-      <Name>Avalonia.Styling</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+    <EmbeddedResource Remove="obj\**" />
+    <None Remove="obj\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.IO.FileSystem">
-      <Version>4.3.0</Version>
-    </PackageReference>
+    <ProjectReference Include="..\..\src\Avalonia.DotNetCoreRuntime\Avalonia.DotNetCoreRuntime.csproj" />
+    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
+    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj" />
   </ItemGroup>
+  <Import Project="..\..\build\Moq.props" />
+  <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\XUnit.props" />
   <Import Project="Avalonia.RenderTests.projitems" Label="Shared" />
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\build\Magick.NET-Q16-AnyCPU.props" />
-  <Import Project="..\..\build\XUnit.props" />
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
\ No newline at end of file
diff --git a/tests/Avalonia.RenderTests/TestBase.cs b/tests/Avalonia.RenderTests/TestBase.cs
index 84860eefdb..dd6fcb1c06 100644
--- a/tests/Avalonia.RenderTests/TestBase.cs
+++ b/tests/Avalonia.RenderTests/TestBase.cs
@@ -46,9 +46,7 @@ namespace Avalonia.Direct2D1.RenderTests
 
         public TestBase(string outputPath)
         {
-#if AVALONIA_CAIRO
-            string testFiles = Path.GetFullPath(@"..\..\tests\TestFiles\Cairo");
-#elif AVALONIA_SKIA
+#if AVALONIA_SKIA
             string testFiles = Path.GetFullPath(@"..\..\..\..\..\TestFiles\Skia");
 #else
             string testFiles = Path.GetFullPath(@"..\..\tests\TestFiles\Direct2D1");

From 4d9b354d1c36dde7283906205885f2d4b38e80f8 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 20 Dec 2017 21:06:00 -0600
Subject: [PATCH 252/482] Fix cleaned tests-dir.

---
 build.cake      | 2 +-
 parameters.cake | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.cake b/build.cake
index d321109a1e..46dd84d8b6 100644
--- a/build.cake
+++ b/build.cake
@@ -93,7 +93,7 @@ Task("Clean")
     CleanDirectory(parameters.NugetRoot);
     CleanDirectory(parameters.ZipRoot);
     CleanDirectory(parameters.BinRoot);
-    CleanDirectory(parameters.TestsRoot);
+    CleanDirectory(parameters.DesignerTestsRoot);
 });
 
 Task("Restore-NuGet-Packages")
diff --git a/parameters.cake b/parameters.cake
index 7406618763..c727b3107f 100644
--- a/parameters.cake
+++ b/parameters.cake
@@ -30,7 +30,7 @@ public class Parameters
     public DirectoryPath NugetRoot { get; private set; }
     public DirectoryPath ZipRoot { get; private set; }
     public DirectoryPath BinRoot { get; private set; }
-    public DirectoryPath TestsRoot { get; private set; }
+    public DirectoryPath DesignerTestsRoot { get; private set; }
     public string DirSuffix { get; private set; }
     public string DirSuffixIOS { get; private set; }
     public DirectoryPathCollection BuildDirs { get; private set; }
@@ -106,7 +106,7 @@ public class Parameters
         NugetRoot = ArtifactsDir.Combine("nuget");
         ZipRoot = ArtifactsDir.Combine("zip");
         BinRoot = ArtifactsDir.Combine("bin");
-        TestsRoot = ArtifactsDir.Combine("tests");
+        DesignerTestsRoot = ArtifactsDir.Combine("designer-tests");
 
         BuildDirs = context.GetDirectories("**/bin") + context.GetDirectories("**/obj");
 

From ba95a9398dbebc460b358eda6dab3a124578ceb8 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 20 Dec 2017 21:07:32 -0600
Subject: [PATCH 253/482] Add missing close paren in build script.

---
 build.cake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.cake b/build.cake
index 46dd84d8b6..f59a68aee0 100644
--- a/build.cake
+++ b/build.cake
@@ -201,7 +201,7 @@ Task("Run-Render-Tests")
     .Does(() => {
         RunCoreTest("./tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj", parameters, true);
         RunCoreTest("./tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj", parameters, true);
-    })
+    });
 
 Task("Run-Designer-Unit-Tests")
     .IsDependentOn("Build")

From 5b8f906b1ee94b7db7e7dea641532bc94ef100bf Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 20 Dec 2017 21:10:43 -0600
Subject: [PATCH 254/482] Add back xunit settings.

---
 build.cake | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/build.cake b/build.cake
index f59a68aee0..f14ac20958 100644
--- a/build.cake
+++ b/build.cake
@@ -208,6 +208,13 @@ Task("Run-Designer-Unit-Tests")
     .WithCriteria(() => !parameters.SkipTests && parameters.IsRunningOnWindows)
     .Does(() =>
 {
+    var xUnitSettings = new XUnit2Settings 
+    { 
+        ToolPath = toolPath,
+        Parallelism = ParallelismOption.None,
+        ShadowCopy = false,
+    };
+
     XUnit2(GetFiles("./artifacts/designer-tests/Avalonia.DesignerSupport.Tests.csproj"), xUnitSettings);
 });
 

From b502f48ff84116db413d2cdb3e52ad96bbdf7326 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 20 Dec 2017 21:14:41 -0600
Subject: [PATCH 255/482] Make sure Direct2D1 Unit tests (non-render tests) run
 in the build.

---
 build.cake                                    |   4 +
 .../Avalonia.Direct2D1.UnitTests.csproj       | 107 +++---------------
 2 files changed, 21 insertions(+), 90 deletions(-)

diff --git a/build.cake b/build.cake
index f14ac20958..ca969d7fa8 100644
--- a/build.cake
+++ b/build.cake
@@ -193,6 +193,10 @@ Task("Run-Unit-Tests")
         RunCoreTest("./tests/Avalonia.Markup.Xaml.UnitTests", parameters, false);
         RunCoreTest("./tests/Avalonia.Styling.UnitTests", parameters, false);
         RunCoreTest("./tests/Avalonia.Visuals.UnitTests", parameters, false);
+        if (parameters.IsRunningOnWindows)
+        {
+            RunCoreTest("./tests/Avalonia.Direct2D1.UnitTests", parameters, false);
+        }
     });
 
 Task("Run-Render-Tests")
diff --git a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
index 303ebed001..f6b5d11af1 100644
--- a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
+++ b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
@@ -1,95 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Avalonia.Direct2D1.UnitTests</RootNamespace>
-    <AssemblyName>Avalonia.Direct2D1.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Controls\Shapes\PathTests.cs" />
-    <Compile Include="Media\GeometryTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RectComparer.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj">
-      <Project>{D211E587-D8BC-45B9-95A4-F297C8FA5200}</Project>
-      <Name>Avalonia.Animation</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj">
-      <Project>{B09B78D8-9B26-48B0-9149-D64A2F120F3F}</Project>
-      <Name>Avalonia.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj">
-      <Project>{D2221C82-4A25-4583-9B43-D791E3F6820C}</Project>
-      <Name>Avalonia.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj">
-      <Project>{62024B2D-53EB-4638-B26B-85EEAA54866E}</Project>
-      <Name>Avalonia.Input</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj">
-      <Project>{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}</Project>
-      <Name>Avalonia.Interactivity</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj">
-      <Project>{42472427-4774-4C81-8AFF-9F27B8E31721}</Project>
-      <Name>Avalonia.Layout</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj">
-      <Project>{EB582467-6ABB-43A1-B052-E981BA910E3A}</Project>
-      <Name>Avalonia.Visuals</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj">
-      <Project>{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}</Project>
-      <Name>Avalonia.Styling</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj">
-      <Project>{3E908F67-5543-4879-A1DC-08EACE79B3CD}</Project>
-      <Name>Avalonia.Direct2D1</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
+  <Import Project="..\..\build\UnitTests.NetCore.targets" />
+  <Import Project="..\..\build\Moq.props" />
+  <Import Project="..\..\build\XUnit.props" />
+  <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
   <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
+    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
+    <ProjectReference Include="..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\build\XUnit.props" />
 </Project>
\ No newline at end of file

From fb8d2daa8ab6358c19ce719cf39ded13d18bfc5b Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 20 Dec 2017 21:16:10 -0600
Subject: [PATCH 256/482] Add back toolPath.

---
 build.cake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build.cake b/build.cake
index ca969d7fa8..7d612fcdea 100644
--- a/build.cake
+++ b/build.cake
@@ -195,7 +195,7 @@ Task("Run-Unit-Tests")
         RunCoreTest("./tests/Avalonia.Visuals.UnitTests", parameters, false);
         if (parameters.IsRunningOnWindows)
         {
-            RunCoreTest("./tests/Avalonia.Direct2D1.UnitTests", parameters, false);
+            RunCoreTest("./tests/Avalonia.Direct2D1.UnitTests", parameters, true);
         }
     });
 
@@ -212,6 +212,10 @@ Task("Run-Designer-Unit-Tests")
     .WithCriteria(() => !parameters.SkipTests && parameters.IsRunningOnWindows)
     .Does(() =>
 {
+    var toolPath = (parameters.IsPlatformAnyCPU || parameters.IsPlatformX86) ? 
+        Context.Tools.Resolve("xunit.console.x86.exe") :
+        Context.Tools.Resolve("xunit.console.exe");
+        
     var xUnitSettings = new XUnit2Settings 
     { 
         ToolPath = toolPath,

From 1c12cd4bd6cb2cd887065720094c5bbf60d66495 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 20 Dec 2017 23:31:33 -0600
Subject: [PATCH 257/482] Fix x64 builds of Avaloina.Direct2D1.  Refactor build
 scripts to reduce time and fix issues.

---
 .gitignore                                         |  2 ++
 build.cake                                         | 14 ++++----------
 build/Unsafe.props                                 |  5 +++++
 packages.cake                                      |  4 +++-
 .../Resources/Resource.Designer.cs                 |  7 +++++--
 .../Avalonia.Direct2D1/Avalonia.Direct2D1.csproj   |  2 ++
 .../FramebufferShimRenderTarget.cs                 | 12 ++++++++----
 .../Media/Imaging/WicBitmapImpl.cs                 | 10 ++++++++--
 .../Avalonia.Win32/Interop/UnmanagedMethods.cs     |  5 +----
 tests/Avalonia.RenderTests/TestBase.cs             |  7 ++++---
 10 files changed, 42 insertions(+), 26 deletions(-)
 create mode 100644 build/Unsafe.props

diff --git a/.gitignore b/.gitignore
index e67d986a8a..a9a8fd36b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -176,3 +176,5 @@ nuget
 Avalonia.XBuild.sln
 project.lock.json
 .idea/*
+**/obj-Skia/*
+**/obj-Direct2D1/*
diff --git a/build.cake b/build.cake
index 7d612fcdea..61fda13695 100644
--- a/build.cake
+++ b/build.cake
@@ -124,14 +124,9 @@ Task("Restore-NuGet-Packages")
 
 void DotNetCoreBuild()
 {
-    DotNetCoreRestore("samples\\ControlCatalog.NetCore");
-    DotNetBuild("samples\\ControlCatalog.NetCore");
+    DotNetCoreBuild("samples\\ControlCatalog.NetCore");
 }
 
-Task("DotNetCoreBuild")
-    .IsDependentOn("Clean")
-    .Does(() => DotNetCoreBuild());
-
 Task("Build")
     .IsDependentOn("Restore-NuGet-Packages")
     .Does(() =>
@@ -140,9 +135,9 @@ Task("Build")
     {
         MSBuild(parameters.MSBuildSolution, settings => {
             settings.SetConfiguration(parameters.Configuration);
+            settings.SetVerbosity(Verbosity.Minimal);
             settings.WithProperty("Platform", "\"" + parameters.Platform + "\"");
             settings.WithProperty("UseRoslynPathHack", "true");
-            settings.SetVerbosity(Verbosity.Minimal);
             settings.UseToolVersion(MSBuildToolVersion.VS2017);
             settings.WithProperty("Windows", "True");
             settings.SetNodeReuse(false);
@@ -160,7 +155,6 @@ void RunCoreTest(string project, Parameters parameters, bool coreOnly = false)
     if(!project.EndsWith(".csproj"))
         project = System.IO.Path.Combine(project, System.IO.Path.GetFileName(project)+".csproj");
     Information("Running tests from " + project);
-    DotNetCoreRestore(project);
     var frameworks = new List<string>(){"netcoreapp2.0"};
     if(parameters.IsRunningOnWindows)
         frameworks.Add("net47");
@@ -215,7 +209,7 @@ Task("Run-Designer-Unit-Tests")
     var toolPath = (parameters.IsPlatformAnyCPU || parameters.IsPlatformX86) ? 
         Context.Tools.Resolve("xunit.console.x86.exe") :
         Context.Tools.Resolve("xunit.console.exe");
-        
+
     var xUnitSettings = new XUnit2Settings 
     { 
         ToolPath = toolPath,
@@ -223,7 +217,7 @@ Task("Run-Designer-Unit-Tests")
         ShadowCopy = false,
     };
 
-    XUnit2(GetFiles("./artifacts/designer-tests/Avalonia.DesignerSupport.Tests.csproj"), xUnitSettings);
+    XUnit2("./artifacts/designer-tests/Avalonia.DesignerSupport.Tests.dll", xUnitSettings);
 });
 
 Task("Copy-Files")
diff --git a/build/Unsafe.props b/build/Unsafe.props
new file mode 100644
index 0000000000..db96658bdd
--- /dev/null
+++ b/build/Unsafe.props
@@ -0,0 +1,5 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.4.0" />
+  </ItemGroup>
+</Project>
diff --git a/packages.cake b/packages.cake
index bc290fce22..3c2f76205c 100644
--- a/packages.cake
+++ b/packages.cake
@@ -120,6 +120,7 @@ public class Packages
         var SharpDXDirect3D11Version = packageVersions["SharpDX.Direct3D11"].FirstOrDefault().Item1;
         var SharpDXDirect3D9Version = packageVersions["SharpDX.Direct3D9"].FirstOrDefault().Item1;
         var SharpDXDXGIVersion = packageVersions["SharpDX.DXGI"].FirstOrDefault().Item1;
+        var UnsafeVersion = packageVersions["System.Runtime.CompilerServices.Unsafe"].FirstOrDefault().Item1;
 
         context.Information("Package: Serilog, version: {0}", SerilogVersion);
         context.Information("Package: Sprache, version: {0}", SpracheVersion);
@@ -394,7 +395,8 @@ public class Packages
                     new NuSpecDependency() { Id = "SharpDX", Version = SharpDXVersion },
                     new NuSpecDependency() { Id = "SharpDX.Direct2D1", Version = SharpDXDirect2D1Version },
                     new NuSpecDependency() { Id = "SharpDX.Direct3D11", Version = SharpDXDirect3D11Version },
-                    new NuSpecDependency() { Id = "SharpDX.DXGI", Version = SharpDXDXGIVersion }
+                    new NuSpecDependency() { Id = "SharpDX.DXGI", Version = SharpDXDXGIVersion },
+                    new NuSpecDependency() { Id = "System.Runtime.CompilerServices.Unsafe", Version = UnsafeVersion }
                 },
                 Files = new []
                 {
diff --git a/src/Android/Avalonia.Android/Resources/Resource.Designer.cs b/src/Android/Avalonia.Android/Resources/Resource.Designer.cs
index 80cbbc51ec..e66c2800d3 100644
--- a/src/Android/Avalonia.Android/Resources/Resource.Designer.cs
+++ b/src/Android/Avalonia.Android/Resources/Resource.Designer.cs
@@ -40,11 +40,14 @@ namespace Avalonia.Android
 		public partial class String
 		{
 			
+			// aapt resource value: 0x7f020002
+			public static int ApplicationName = 2130837506;
+			
 			// aapt resource value: 0x7f020001
-			public static int ApplicationName = 2130837505;
+			public static int Hello = 2130837505;
 			
 			// aapt resource value: 0x7f020000
-			public static int Hello = 2130837504;
+			public static int library_name = 2130837504;
 			
 			static String()
 			{
diff --git a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
index a84c373886..2b9ce5466b 100644
--- a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
+++ b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
@@ -25,4 +26,5 @@
   <Import Project="..\..\..\build\SharpDX.props" />
   <Import Project="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" />
   <Import Project="..\..\..\build\JetBrains.Annotations.props" />
+  <Import Project="..\..\..\build\Unsafe.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Windows/Avalonia.Direct2D1/FramebufferShimRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/FramebufferShimRenderTarget.cs
index 83bd4d2957..dbba7271e2 100644
--- a/src/Windows/Avalonia.Direct2D1/FramebufferShimRenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/FramebufferShimRenderTarget.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 using System.Text;
 using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Direct2D1.Media;
@@ -67,10 +68,13 @@ namespace Avalonia.Direct2D1
                     {
                         for (var y = 0; y < _target.Height; y++)
                         {
-                            UnmanagedMethods.CopyMemory(
-                                _target.Address + _target.RowBytes * y,
-                                l.Data.DataPointer + l.Stride * y,
-                                (uint) Math.Min(l.Stride, _target.RowBytes));
+                            unsafe
+                            {
+                                Unsafe.CopyBlock(
+                                    (void*)(_target.Address + _target.RowBytes * y),
+                                    (void*)(l.Data.DataPointer + l.Stride * y),
+                                    (uint)Math.Min(l.Stride, _target.RowBytes));
+                            }
                         }
                     }
                     Dispose();
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
index 9b99b4c40a..540810f13c 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Runtime.CompilerServices;
 using Avalonia.Win32.Interop;
 using SharpDX.WIC;
 using APixelFormat = Avalonia.Platform.PixelFormat;
@@ -74,8 +75,13 @@ namespace Avalonia.Direct2D1.Media
             {
                 for (var row = 0; row < height; row++)
                 {
-                    UnmanagedMethods.CopyMemory(new IntPtr(l.Data.DataPointer.ToInt64() + row * l.Stride),
-                        new IntPtr(data.ToInt64() + row * stride), (uint) l.Data.Pitch);
+                    unsafe
+                    {
+                        Unsafe.CopyBlock(
+                            (void*)(l.Data.DataPointer + row * l.Stride),
+                            (void*)(data + row * stride),
+                            (uint) l.Data.Pitch);
+                    }
                 }
             }
         }
diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
index fb4aefbf36..bc81010377 100644
--- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
+++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -947,10 +947,7 @@ namespace Avalonia.Win32.Interop
             uint dwMaximumSizeHigh,
             uint dwMaximumSizeLow,
             string lpName);
-
-        [DllImport("kernel32.dll", EntryPoint = "CopyMemory", SetLastError = false)]
-        public static extern void CopyMemory(IntPtr dest, IntPtr src, uint count);
-
+        
         public enum MONITOR
         {
             MONITOR_DEFAULTTONULL = 0x00000000,
diff --git a/tests/Avalonia.RenderTests/TestBase.cs b/tests/Avalonia.RenderTests/TestBase.cs
index dd6fcb1c06..cf38ef3818 100644
--- a/tests/Avalonia.RenderTests/TestBase.cs
+++ b/tests/Avalonia.RenderTests/TestBase.cs
@@ -46,12 +46,13 @@ namespace Avalonia.Direct2D1.RenderTests
 
         public TestBase(string outputPath)
         {
+            var testFiles = Path.GetFullPath(@"..\..\..\..\..\TestFiles\");
 #if AVALONIA_SKIA
-            string testFiles = Path.GetFullPath(@"..\..\..\..\..\TestFiles\Skia");
+            var platform = "Skia";
 #else
-            string testFiles = Path.GetFullPath(@"..\..\tests\TestFiles\Direct2D1");
+            var platform = "Direct2D1";
 #endif
-            OutputPath = Path.Combine(testFiles, outputPath);
+            OutputPath = Path.Combine(testFiles, platform, outputPath);
 
             threadingInterface.MainThread = Thread.CurrentThread;
         }

From e462e0619348c3e4a949b8499b0c5c5aa82da16d Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sat, 23 Dec 2017 13:51:11 -0600
Subject: [PATCH 258/482] Use memcpy instead of
 System.Runtime.CompilerServices.Unsafe

---
 build/Unsafe.props                                    |  5 -----
 packages.cake                                         |  4 +---
 .../Avalonia.Android/Resources/Resource.Designer.cs   |  7 ++-----
 .../Avalonia.Direct2D1/Avalonia.Direct2D1.csproj      |  2 --
 .../Avalonia.Direct2D1/FramebufferShimRenderTarget.cs | 11 ++++-------
 .../Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs | 11 ++++-------
 .../Avalonia.Win32/Interop/UnmanagedMethods.cs        |  3 +++
 7 files changed, 14 insertions(+), 29 deletions(-)
 delete mode 100644 build/Unsafe.props

diff --git a/build/Unsafe.props b/build/Unsafe.props
deleted file mode 100644
index db96658bdd..0000000000
--- a/build/Unsafe.props
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.4.0" />
-  </ItemGroup>
-</Project>
diff --git a/packages.cake b/packages.cake
index 3c2f76205c..bc290fce22 100644
--- a/packages.cake
+++ b/packages.cake
@@ -120,7 +120,6 @@ public class Packages
         var SharpDXDirect3D11Version = packageVersions["SharpDX.Direct3D11"].FirstOrDefault().Item1;
         var SharpDXDirect3D9Version = packageVersions["SharpDX.Direct3D9"].FirstOrDefault().Item1;
         var SharpDXDXGIVersion = packageVersions["SharpDX.DXGI"].FirstOrDefault().Item1;
-        var UnsafeVersion = packageVersions["System.Runtime.CompilerServices.Unsafe"].FirstOrDefault().Item1;
 
         context.Information("Package: Serilog, version: {0}", SerilogVersion);
         context.Information("Package: Sprache, version: {0}", SpracheVersion);
@@ -395,8 +394,7 @@ public class Packages
                     new NuSpecDependency() { Id = "SharpDX", Version = SharpDXVersion },
                     new NuSpecDependency() { Id = "SharpDX.Direct2D1", Version = SharpDXDirect2D1Version },
                     new NuSpecDependency() { Id = "SharpDX.Direct3D11", Version = SharpDXDirect3D11Version },
-                    new NuSpecDependency() { Id = "SharpDX.DXGI", Version = SharpDXDXGIVersion },
-                    new NuSpecDependency() { Id = "System.Runtime.CompilerServices.Unsafe", Version = UnsafeVersion }
+                    new NuSpecDependency() { Id = "SharpDX.DXGI", Version = SharpDXDXGIVersion }
                 },
                 Files = new []
                 {
diff --git a/src/Android/Avalonia.Android/Resources/Resource.Designer.cs b/src/Android/Avalonia.Android/Resources/Resource.Designer.cs
index e66c2800d3..80cbbc51ec 100644
--- a/src/Android/Avalonia.Android/Resources/Resource.Designer.cs
+++ b/src/Android/Avalonia.Android/Resources/Resource.Designer.cs
@@ -40,14 +40,11 @@ namespace Avalonia.Android
 		public partial class String
 		{
 			
-			// aapt resource value: 0x7f020002
-			public static int ApplicationName = 2130837506;
-			
 			// aapt resource value: 0x7f020001
-			public static int Hello = 2130837505;
+			public static int ApplicationName = 2130837505;
 			
 			// aapt resource value: 0x7f020000
-			public static int library_name = 2130837504;
+			public static int Hello = 2130837504;
 			
 			static String()
 			{
diff --git a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
index 2b9ce5466b..a84c373886 100644
--- a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
+++ b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
@@ -26,5 +25,4 @@
   <Import Project="..\..\..\build\SharpDX.props" />
   <Import Project="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" />
   <Import Project="..\..\..\build\JetBrains.Annotations.props" />
-  <Import Project="..\..\..\build\Unsafe.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Windows/Avalonia.Direct2D1/FramebufferShimRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/FramebufferShimRenderTarget.cs
index dbba7271e2..523cfeed46 100644
--- a/src/Windows/Avalonia.Direct2D1/FramebufferShimRenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/FramebufferShimRenderTarget.cs
@@ -68,13 +68,10 @@ namespace Avalonia.Direct2D1
                     {
                         for (var y = 0; y < _target.Height; y++)
                         {
-                            unsafe
-                            {
-                                Unsafe.CopyBlock(
-                                    (void*)(_target.Address + _target.RowBytes * y),
-                                    (void*)(l.Data.DataPointer + l.Stride * y),
-                                    (uint)Math.Min(l.Stride, _target.RowBytes));
-                            }
+                            UnmanagedMethods.CopyMemory(
+                                (_target.Address + _target.RowBytes * y),
+                                (l.Data.DataPointer + l.Stride * y),
+                                (UIntPtr)Math.Min(l.Stride, _target.RowBytes));
                         }
                     }
                     Dispose();
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
index 540810f13c..371dfcfc3e 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
@@ -75,13 +75,10 @@ namespace Avalonia.Direct2D1.Media
             {
                 for (var row = 0; row < height; row++)
                 {
-                    unsafe
-                    {
-                        Unsafe.CopyBlock(
-                            (void*)(l.Data.DataPointer + row * l.Stride),
-                            (void*)(data + row * stride),
-                            (uint) l.Data.Pitch);
-                    }
+                    UnmanagedMethods.CopyMemory(
+                        (l.Data.DataPointer + row * l.Stride),
+                        (data + row * stride),
+                        (UIntPtr) l.Data.Pitch);
                 }
             }
         }
diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
index bc81010377..a0518cf92e 100644
--- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
+++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -947,6 +947,9 @@ namespace Avalonia.Win32.Interop
             uint dwMaximumSizeHigh,
             uint dwMaximumSizeLow,
             string lpName);
+
+        [DllImport("msvcrt.dll", EntryPoint="memcpy", SetLastError = false, CallingConvention=CallingConvention.Cdecl)]
+        public static extern IntPtr CopyMemory(IntPtr dest, IntPtr src, UIntPtr count); 
         
         public enum MONITOR
         {

From 60a04fbd24e1d90f721d82481b6aaefe9d3ede1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Sun, 31 Dec 2017 19:33:04 +0000
Subject: [PATCH 259/482] Fixed ToggleButton.IsChecked default value.

---
 src/Avalonia.Controls/Primitives/ToggleButton.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Avalonia.Controls/Primitives/ToggleButton.cs b/src/Avalonia.Controls/Primitives/ToggleButton.cs
index 7d500975f0..dc9b70ab8c 100644
--- a/src/Avalonia.Controls/Primitives/ToggleButton.cs
+++ b/src/Avalonia.Controls/Primitives/ToggleButton.cs
@@ -14,6 +14,7 @@ namespace Avalonia.Controls.Primitives
                 nameof(IsChecked),
                 o => o.IsChecked,
                 (o, v) => o.IsChecked = v,
+                unsetValue: false,
                 defaultBindingMode: BindingMode.TwoWay);
 
         public static readonly StyledProperty<bool> IsThreeStateProperty =

From 7cccc6bda01d47d2d26bfbcd27806740d1dad90d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Mon, 1 Jan 2018 21:51:55 +0000
Subject: [PATCH 260/482] Use nameof where possible.

---
 src/Avalonia.Controls/Carousel.cs              |  2 +-
 src/Avalonia.Controls/ColumnDefinition.cs      |  6 +++---
 src/Avalonia.Controls/DropDown.cs              |  2 +-
 .../Primitives/HeaderedContentControl.cs       |  2 +-
 .../Primitives/TemplatedControl.cs             |  2 +-
 src/Avalonia.Controls/Primitives/Thumb.cs      |  6 +++---
 src/Avalonia.Controls/RowDefinition.cs         |  6 +++---
 src/Avalonia.Controls/Shapes/Line.cs           |  4 ++--
 src/Avalonia.Controls/Shapes/Path.cs           |  2 +-
 src/Avalonia.Controls/Shapes/Shape.cs          |  8 ++++----
 src/Avalonia.Controls/TextBox.cs               | 10 +++++-----
 .../Views/ControlDetailsView.cs                |  2 +-
 src/Avalonia.HtmlRenderer/HtmlControl.cs       | 16 ++++++++--------
 src/Avalonia.Input/InputElement.cs             | 18 +++++++++---------
 src/Avalonia.Input/KeyBinding.cs               |  6 +++---
 src/Avalonia.Visuals/Media/Geometry.cs         |  2 +-
 src/Avalonia.Visuals/Media/ImageBrush.cs       |  2 +-
 src/Avalonia.Visuals/Media/MatrixTransform.cs  |  2 +-
 src/Avalonia.Visuals/Media/RotateTransform.cs  |  2 +-
 .../Media/TranslateTransform.cs                |  4 ++--
 src/Avalonia.Visuals/Media/VisualBrush.cs      |  2 +-
 .../AvaloniaObjectTests_Direct.cs              |  6 +++---
 .../AvaloniaObjectTests_GetSubject.cs          |  2 +-
 .../DirectPropertyTests.cs                     |  2 +-
 ...ExpressionObserverTests_AttachedProperty.cs |  2 +-
 .../Data/BindingTests.cs                       |  2 +-
 .../Xaml/NonControl.cs                         |  6 +++---
 tests/Avalonia.Styling.UnitTests/StyleTests.cs |  2 +-
 28 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/src/Avalonia.Controls/Carousel.cs b/src/Avalonia.Controls/Carousel.cs
index 71446c627f..e7c934091a 100644
--- a/src/Avalonia.Controls/Carousel.cs
+++ b/src/Avalonia.Controls/Carousel.cs
@@ -24,7 +24,7 @@ namespace Avalonia.Controls
         /// Defines the <see cref="Transition"/> property.
         /// </summary>
         public static readonly StyledProperty<IPageTransition> TransitionProperty =
-            AvaloniaProperty.Register<Carousel, IPageTransition>("Transition");
+            AvaloniaProperty.Register<Carousel, IPageTransition>(nameof(Transition));
 
         /// <summary>
         /// The default value of <see cref="ItemsControl.ItemsPanelProperty"/> for 
diff --git a/src/Avalonia.Controls/ColumnDefinition.cs b/src/Avalonia.Controls/ColumnDefinition.cs
index 36fadd0f05..a6b34f8a16 100644
--- a/src/Avalonia.Controls/ColumnDefinition.cs
+++ b/src/Avalonia.Controls/ColumnDefinition.cs
@@ -12,19 +12,19 @@ namespace Avalonia.Controls
         /// Defines the <see cref="MaxWidth"/> property.
         /// </summary>
         public static readonly StyledProperty<double> MaxWidthProperty =
-            AvaloniaProperty.Register<ColumnDefinition, double>("MaxWidth", double.PositiveInfinity);
+            AvaloniaProperty.Register<ColumnDefinition, double>(nameof(MaxWidth), double.PositiveInfinity);
 
         /// <summary>
         /// Defines the <see cref="MinWidth"/> property.
         /// </summary>
         public static readonly StyledProperty<double> MinWidthProperty =
-            AvaloniaProperty.Register<ColumnDefinition, double>("MinWidth");
+            AvaloniaProperty.Register<ColumnDefinition, double>(nameof(MinWidth));
 
         /// <summary>
         /// Defines the <see cref="Width"/> property.
         /// </summary>
         public static readonly StyledProperty<GridLength> WidthProperty =
-            AvaloniaProperty.Register<ColumnDefinition, GridLength>("Width", new GridLength(1, GridUnitType.Star));
+            AvaloniaProperty.Register<ColumnDefinition, GridLength>(nameof(Width), new GridLength(1, GridUnitType.Star));
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ColumnDefinition"/> class.
diff --git a/src/Avalonia.Controls/DropDown.cs b/src/Avalonia.Controls/DropDown.cs
index 6b27c479ba..a7ea2da4a4 100644
--- a/src/Avalonia.Controls/DropDown.cs
+++ b/src/Avalonia.Controls/DropDown.cs
@@ -38,7 +38,7 @@ namespace Avalonia.Controls
         /// Defines the <see cref="SelectionBoxItem"/> property.
         /// </summary>
         public static readonly DirectProperty<DropDown, object> SelectionBoxItemProperty =
-            AvaloniaProperty.RegisterDirect<DropDown, object>("SelectionBoxItem", o => o.SelectionBoxItem);
+            AvaloniaProperty.RegisterDirect<DropDown, object>(nameof(SelectionBoxItem), o => o.SelectionBoxItem);
 
         private bool _isDropDownOpen;
         private Popup _popup;
diff --git a/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs b/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs
index a2de1fbf0e..d67ebfd489 100644
--- a/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs
+++ b/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs
@@ -12,7 +12,7 @@ namespace Avalonia.Controls.Primitives
         /// Defines the <see cref="Header"/> property.
         /// </summary>
         public static readonly StyledProperty<object> HeaderProperty =
-            AvaloniaProperty.Register<ContentControl, object>("Header");
+            AvaloniaProperty.Register<ContentControl, object>(nameof(Header));
 
         /// <summary>
         /// Gets or sets the header content.
diff --git a/src/Avalonia.Controls/Primitives/TemplatedControl.cs b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
index 1ddfb97c14..6deef7c7b9 100644
--- a/src/Avalonia.Controls/Primitives/TemplatedControl.cs
+++ b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
@@ -75,7 +75,7 @@ namespace Avalonia.Controls.Primitives
         /// Defines the <see cref="Template"/> property.
         /// </summary>
         public static readonly StyledProperty<IControlTemplate> TemplateProperty =
-            AvaloniaProperty.Register<TemplatedControl, IControlTemplate>("Template");
+            AvaloniaProperty.Register<TemplatedControl, IControlTemplate>(nameof(Template));
 
         /// <summary>
         /// Defines the IsTemplateFocusTarget attached property.
diff --git a/src/Avalonia.Controls/Primitives/Thumb.cs b/src/Avalonia.Controls/Primitives/Thumb.cs
index 065b1aedbe..da4dc63d1e 100644
--- a/src/Avalonia.Controls/Primitives/Thumb.cs
+++ b/src/Avalonia.Controls/Primitives/Thumb.cs
@@ -11,13 +11,13 @@ namespace Avalonia.Controls.Primitives
     public class Thumb : TemplatedControl
     {
         public static readonly RoutedEvent<VectorEventArgs> DragStartedEvent =
-            RoutedEvent.Register<Thumb, VectorEventArgs>("DragStarted", RoutingStrategies.Bubble);
+            RoutedEvent.Register<Thumb, VectorEventArgs>(nameof(DragStarted), RoutingStrategies.Bubble);
 
         public static readonly RoutedEvent<VectorEventArgs> DragDeltaEvent =
-            RoutedEvent.Register<Thumb, VectorEventArgs>("DragDelta", RoutingStrategies.Bubble);
+            RoutedEvent.Register<Thumb, VectorEventArgs>(nameof(DragDelta), RoutingStrategies.Bubble);
 
         public static readonly RoutedEvent<VectorEventArgs> DragCompletedEvent =
-            RoutedEvent.Register<Thumb, VectorEventArgs>("DragCompleted", RoutingStrategies.Bubble);
+            RoutedEvent.Register<Thumb, VectorEventArgs>(nameof(DragCompleted), RoutingStrategies.Bubble);
 
         private Point? _lastPoint;
 
diff --git a/src/Avalonia.Controls/RowDefinition.cs b/src/Avalonia.Controls/RowDefinition.cs
index 265cede17f..7307843417 100644
--- a/src/Avalonia.Controls/RowDefinition.cs
+++ b/src/Avalonia.Controls/RowDefinition.cs
@@ -12,19 +12,19 @@ namespace Avalonia.Controls
         /// Defines the <see cref="MaxHeight"/> property.
         /// </summary>
         public static readonly StyledProperty<double> MaxHeightProperty =
-            AvaloniaProperty.Register<RowDefinition, double>("MaxHeight", double.PositiveInfinity);
+            AvaloniaProperty.Register<RowDefinition, double>(nameof(MaxHeight), double.PositiveInfinity);
 
         /// <summary>
         /// Defines the <see cref="MinHeight"/> property.
         /// </summary>
         public static readonly StyledProperty<double> MinHeightProperty =
-            AvaloniaProperty.Register<RowDefinition, double>("MinHeight");
+            AvaloniaProperty.Register<RowDefinition, double>(nameof(MinHeight));
 
         /// <summary>
         /// Defines the <see cref="Height"/> property.
         /// </summary>
         public static readonly StyledProperty<GridLength> HeightProperty =
-            AvaloniaProperty.Register<RowDefinition, GridLength>("Height", new GridLength(1, GridUnitType.Star));
+            AvaloniaProperty.Register<RowDefinition, GridLength>(nameof(Height), new GridLength(1, GridUnitType.Star));
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RowDefinition"/> class.
diff --git a/src/Avalonia.Controls/Shapes/Line.cs b/src/Avalonia.Controls/Shapes/Line.cs
index 922597e5bf..b06fe40710 100644
--- a/src/Avalonia.Controls/Shapes/Line.cs
+++ b/src/Avalonia.Controls/Shapes/Line.cs
@@ -8,10 +8,10 @@ namespace Avalonia.Controls.Shapes
     public class Line : Shape
     {
         public static readonly StyledProperty<Point> StartPointProperty =
-            AvaloniaProperty.Register<Line, Point>("StartPoint");
+            AvaloniaProperty.Register<Line, Point>(nameof(StartPoint));
 
         public static readonly StyledProperty<Point> EndPointProperty =
-            AvaloniaProperty.Register<Line, Point>("EndPoint");
+            AvaloniaProperty.Register<Line, Point>(nameof(EndPoint));
 
         static Line()
         {
diff --git a/src/Avalonia.Controls/Shapes/Path.cs b/src/Avalonia.Controls/Shapes/Path.cs
index a337e7c6de..08bed79b3a 100644
--- a/src/Avalonia.Controls/Shapes/Path.cs
+++ b/src/Avalonia.Controls/Shapes/Path.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Controls.Shapes
     public class Path : Shape
     {
         public static readonly StyledProperty<Geometry> DataProperty =
-            AvaloniaProperty.Register<Path, Geometry>("Data");
+            AvaloniaProperty.Register<Path, Geometry>(nameof(Data));
 
         static Path()
         {
diff --git a/src/Avalonia.Controls/Shapes/Shape.cs b/src/Avalonia.Controls/Shapes/Shape.cs
index 73b89ca4b7..2ea681891d 100644
--- a/src/Avalonia.Controls/Shapes/Shape.cs
+++ b/src/Avalonia.Controls/Shapes/Shape.cs
@@ -12,19 +12,19 @@ namespace Avalonia.Controls.Shapes
     public abstract class Shape : Control
     {
         public static readonly StyledProperty<IBrush> FillProperty =
-            AvaloniaProperty.Register<Shape, IBrush>("Fill");
+            AvaloniaProperty.Register<Shape, IBrush>(nameof(Fill));
 
         public static readonly StyledProperty<Stretch> StretchProperty =
-            AvaloniaProperty.Register<Shape, Stretch>("Stretch");
+            AvaloniaProperty.Register<Shape, Stretch>(nameof(Stretch));
 
         public static readonly StyledProperty<IBrush> StrokeProperty =
-            AvaloniaProperty.Register<Shape, IBrush>("Stroke");
+            AvaloniaProperty.Register<Shape, IBrush>(nameof(Stroke));
 
         public static readonly StyledProperty<AvaloniaList<double>> StrokeDashArrayProperty =
             AvaloniaProperty.Register<Shape, AvaloniaList<double>>("StrokeDashArray");
 
         public static readonly StyledProperty<double> StrokeThicknessProperty =
-            AvaloniaProperty.Register<Shape, double>("StrokeThickness");
+            AvaloniaProperty.Register<Shape, double>(nameof(StrokeThickness));
 
         private Matrix _transform = Matrix.Identity;
         private Geometry _definingGeometry;
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 36ef8d05c3..1a663ed3b6 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -21,13 +21,13 @@ namespace Avalonia.Controls
     public class TextBox : TemplatedControl, UndoRedoHelper<TextBox.UndoRedoState>.IUndoRedoHost
     {
         public static readonly StyledProperty<bool> AcceptsReturnProperty =
-            AvaloniaProperty.Register<TextBox, bool>("AcceptsReturn");
+            AvaloniaProperty.Register<TextBox, bool>(nameof(AcceptsReturn));
 
         public static readonly StyledProperty<bool> AcceptsTabProperty =
-            AvaloniaProperty.Register<TextBox, bool>("AcceptsTab");
+            AvaloniaProperty.Register<TextBox, bool>(nameof(AcceptsTab));
 
         public static readonly DirectProperty<TextBox, bool> CanScrollHorizontallyProperty =
-            AvaloniaProperty.RegisterDirect<TextBox, bool>("CanScrollHorizontally", o => o.CanScrollHorizontally);
+            AvaloniaProperty.RegisterDirect<TextBox, bool>(nameof(CanScrollHorizontally), o => o.CanScrollHorizontally);
 
         public static readonly DirectProperty<TextBox, int> CaretIndexProperty =
             AvaloniaProperty.RegisterDirect<TextBox, int>(
@@ -69,10 +69,10 @@ namespace Avalonia.Controls
             TextBlock.TextWrappingProperty.AddOwner<TextBox>();
 
         public static readonly StyledProperty<string> WatermarkProperty =
-            AvaloniaProperty.Register<TextBox, string>("Watermark");
+            AvaloniaProperty.Register<TextBox, string>(nameof(Watermark));
 
         public static readonly StyledProperty<bool> UseFloatingWatermarkProperty =
-            AvaloniaProperty.Register<TextBox, bool>("UseFloatingWatermark");
+            AvaloniaProperty.Register<TextBox, bool>(nameof(UseFloatingWatermark));
 
         struct UndoRedoState : IEquatable<UndoRedoState>
         {
diff --git a/src/Avalonia.Diagnostics/Views/ControlDetailsView.cs b/src/Avalonia.Diagnostics/Views/ControlDetailsView.cs
index e58818d31d..381b2e04b4 100644
--- a/src/Avalonia.Diagnostics/Views/ControlDetailsView.cs
+++ b/src/Avalonia.Diagnostics/Views/ControlDetailsView.cs
@@ -14,7 +14,7 @@ namespace Avalonia.Diagnostics.Views
     internal class ControlDetailsView : UserControl
     {
         private static readonly StyledProperty<ControlDetailsViewModel> ViewModelProperty =
-            AvaloniaProperty.Register<ControlDetailsView, ControlDetailsViewModel>("ViewModel");
+            AvaloniaProperty.Register<ControlDetailsView, ControlDetailsViewModel>(nameof(ViewModel));
         private SimpleGrid _grid;
 
         public ControlDetailsView()
diff --git a/src/Avalonia.HtmlRenderer/HtmlControl.cs b/src/Avalonia.HtmlRenderer/HtmlControl.cs
index 0051f6427b..94b2d56f5f 100644
--- a/src/Avalonia.HtmlRenderer/HtmlControl.cs
+++ b/src/Avalonia.HtmlRenderer/HtmlControl.cs
@@ -74,29 +74,29 @@ namespace Avalonia.Controls.Html
         protected Point _lastScrollOffset;
 
         public static readonly AvaloniaProperty AvoidImagesLateLoadingProperty = 
-            PropertyHelper.Register<HtmlControl, bool>("AvoidImagesLateLoading", false, OnAvaloniaProperty_valueChanged);
+            PropertyHelper.Register<HtmlControl, bool>(nameof(AvoidImagesLateLoading), false, OnAvaloniaProperty_valueChanged);
         public static readonly AvaloniaProperty IsSelectionEnabledProperty =
-            PropertyHelper.Register<HtmlControl, bool>("IsSelectionEnabled", true, OnAvaloniaProperty_valueChanged);
+            PropertyHelper.Register<HtmlControl, bool>(nameof(IsSelectionEnabled), true, OnAvaloniaProperty_valueChanged);
         public static readonly AvaloniaProperty IsContextMenuEnabledProperty =
-            PropertyHelper.Register<HtmlControl, bool>("IsContextMenuEnabled", true, OnAvaloniaProperty_valueChanged);
+            PropertyHelper.Register<HtmlControl, bool>(nameof(IsContextMenuEnabled), true, OnAvaloniaProperty_valueChanged);
 
         public static readonly AvaloniaProperty BaseStylesheetProperty =
-            PropertyHelper.Register<HtmlControl, string>("BaseStylesheet", null, OnAvaloniaProperty_valueChanged);
+            PropertyHelper.Register<HtmlControl, string>(nameof(BaseStylesheet), null, OnAvaloniaProperty_valueChanged);
 
         public static readonly AvaloniaProperty TextProperty =
-            PropertyHelper.Register<HtmlControl, string>("Text", null, OnAvaloniaProperty_valueChanged);
+            PropertyHelper.Register<HtmlControl, string>(nameof(Text), null, OnAvaloniaProperty_valueChanged);
 
         public static readonly StyledProperty<IBrush> BackgroundProperty =
             Border.BackgroundProperty.AddOwner<HtmlControl>();
 
         public static readonly AvaloniaProperty BorderThicknessProperty =
-            AvaloniaProperty.Register<HtmlControl, Thickness>("BorderThickness", new Thickness(0));
+            AvaloniaProperty.Register<HtmlControl, Thickness>(nameof(BorderThickness), new Thickness(0));
 
         public static readonly AvaloniaProperty BorderBrushProperty =
-    AvaloniaProperty.Register<HtmlControl, IBrush>("BorderBrush");
+    AvaloniaProperty.Register<HtmlControl, IBrush>(nameof(BorderBrush));
 
         public static readonly AvaloniaProperty PaddingProperty =
-            AvaloniaProperty.Register<HtmlControl, Thickness>("Padding", new Thickness(0));
+            AvaloniaProperty.Register<HtmlControl, Thickness>(nameof(Padding), new Thickness(0));
 
         public static readonly RoutedEvent LoadCompleteEvent =
             RoutedEvent.Register<RoutedEventArgs>("LoadComplete",  RoutingStrategies.Bubble, typeof(HtmlControl));
diff --git a/src/Avalonia.Input/InputElement.cs b/src/Avalonia.Input/InputElement.cs
index 6385f7197b..8ac49df4cd 100644
--- a/src/Avalonia.Input/InputElement.cs
+++ b/src/Avalonia.Input/InputElement.cs
@@ -31,43 +31,43 @@ namespace Avalonia.Input
         /// Defines the <see cref="IsEnabledCore"/> property.
         /// </summary>
         public static readonly StyledProperty<bool> IsEnabledCoreProperty =
-            AvaloniaProperty.Register<InputElement, bool>("IsEnabledCore", true);
+            AvaloniaProperty.Register<InputElement, bool>(nameof(IsEnabledCore), true);
 
         /// <summary>
         /// Gets or sets associated mouse cursor.
         /// </summary>
         public static readonly StyledProperty<Cursor> CursorProperty =
-            AvaloniaProperty.Register<InputElement, Cursor>("Cursor", null, true);
+            AvaloniaProperty.Register<InputElement, Cursor>(nameof(Cursor), null, true);
 
         /// <summary>
         /// Defines the <see cref="IsFocused"/> property.
         /// </summary>
         public static readonly DirectProperty<InputElement, bool> IsFocusedProperty =
-            AvaloniaProperty.RegisterDirect<InputElement, bool>("IsFocused", o => o.IsFocused);
+            AvaloniaProperty.RegisterDirect<InputElement, bool>(nameof(IsFocused), o => o.IsFocused);
 
         /// <summary>
         /// Defines the <see cref="IsHitTestVisible"/> property.
         /// </summary>
         public static readonly StyledProperty<bool> IsHitTestVisibleProperty =
-            AvaloniaProperty.Register<InputElement, bool>("IsHitTestVisible", true);
+            AvaloniaProperty.Register<InputElement, bool>(nameof(IsHitTestVisible), true);
 
         /// <summary>
         /// Defines the <see cref="IsPointerOver"/> property.
         /// </summary>
         public static readonly DirectProperty<InputElement, bool> IsPointerOverProperty =
-            AvaloniaProperty.RegisterDirect<InputElement, bool>("IsPointerOver", o => o.IsPointerOver);
+            AvaloniaProperty.RegisterDirect<InputElement, bool>(nameof(IsPointerOver), o => o.IsPointerOver);
 
         /// <summary>
         /// Defines the <see cref="GotFocus"/> event.
         /// </summary>
         public static readonly RoutedEvent<GotFocusEventArgs> GotFocusEvent =
-            RoutedEvent.Register<InputElement, GotFocusEventArgs>("GotFocus", RoutingStrategies.Bubble);
+            RoutedEvent.Register<InputElement, GotFocusEventArgs>(nameof(GotFocus), RoutingStrategies.Bubble);
 
         /// <summary>
         /// Defines the <see cref="LostFocus"/> event.
         /// </summary>
         public static readonly RoutedEvent<RoutedEventArgs> LostFocusEvent =
-            RoutedEvent.Register<InputElement, RoutedEventArgs>("LostFocus", RoutingStrategies.Bubble);
+            RoutedEvent.Register<InputElement, RoutedEventArgs>(nameof(LostFocus), RoutingStrategies.Bubble);
 
         /// <summary>
         /// Defines the <see cref="KeyDown"/> event.
@@ -97,13 +97,13 @@ namespace Avalonia.Input
         /// Defines the <see cref="PointerEnter"/> event.
         /// </summary>
         public static readonly RoutedEvent<PointerEventArgs> PointerEnterEvent =
-            RoutedEvent.Register<InputElement, PointerEventArgs>("PointerEnter", RoutingStrategies.Direct);
+            RoutedEvent.Register<InputElement, PointerEventArgs>(nameof(PointerEnter), RoutingStrategies.Direct);
 
         /// <summary>
         /// Defines the <see cref="PointerLeave"/> event.
         /// </summary>
         public static readonly RoutedEvent<PointerEventArgs> PointerLeaveEvent =
-            RoutedEvent.Register<InputElement, PointerEventArgs>("PointerLeave", RoutingStrategies.Direct);
+            RoutedEvent.Register<InputElement, PointerEventArgs>(nameof(PointerLeave), RoutingStrategies.Direct);
 
         /// <summary>
         /// Defines the <see cref="PointerMoved"/> event.
diff --git a/src/Avalonia.Input/KeyBinding.cs b/src/Avalonia.Input/KeyBinding.cs
index a14f87beb1..035b6978f4 100644
--- a/src/Avalonia.Input/KeyBinding.cs
+++ b/src/Avalonia.Input/KeyBinding.cs
@@ -10,7 +10,7 @@ namespace Avalonia.Input
     public class KeyBinding : AvaloniaObject
     {
         public static readonly StyledProperty<ICommand> CommandProperty =
-            AvaloniaProperty.Register<KeyBinding, ICommand>("Command");
+            AvaloniaProperty.Register<KeyBinding, ICommand>(nameof(Command));
 
         public ICommand Command
         {
@@ -19,7 +19,7 @@ namespace Avalonia.Input
         }
 
         public static readonly StyledProperty<object> CommandParameterProperty =
-            AvaloniaProperty.Register<KeyBinding, object>("CommandParameter");
+            AvaloniaProperty.Register<KeyBinding, object>(nameof(CommandParameter));
 
         public object CommandParameter
         {
@@ -28,7 +28,7 @@ namespace Avalonia.Input
         }
 
         public static readonly StyledProperty<KeyGesture> GestureProperty =
-            AvaloniaProperty.Register<KeyBinding, KeyGesture>("Gesture");
+            AvaloniaProperty.Register<KeyBinding, KeyGesture>(nameof(Gesture));
 
         public KeyGesture Gesture
         {
diff --git a/src/Avalonia.Visuals/Media/Geometry.cs b/src/Avalonia.Visuals/Media/Geometry.cs
index 591c7d0468..d27626bcc1 100644
--- a/src/Avalonia.Visuals/Media/Geometry.cs
+++ b/src/Avalonia.Visuals/Media/Geometry.cs
@@ -15,7 +15,7 @@ namespace Avalonia.Media
         /// Defines the <see cref="Transform"/> property.
         /// </summary>
         public static readonly StyledProperty<Transform> TransformProperty =
-            AvaloniaProperty.Register<Geometry, Transform>("Transform");
+            AvaloniaProperty.Register<Geometry, Transform>(nameof(Transform));
 
         /// <summary>
         /// Initializes static members of the <see cref="Geometry"/> class.
diff --git a/src/Avalonia.Visuals/Media/ImageBrush.cs b/src/Avalonia.Visuals/Media/ImageBrush.cs
index 69b98fd35c..fa491ed3e1 100644
--- a/src/Avalonia.Visuals/Media/ImageBrush.cs
+++ b/src/Avalonia.Visuals/Media/ImageBrush.cs
@@ -14,7 +14,7 @@ namespace Avalonia.Media
         /// Defines the <see cref="Visual"/> property.
         /// </summary>
         public static readonly StyledProperty<IBitmap> SourceProperty =
-            AvaloniaProperty.Register<ImageBrush, IBitmap>("Source");
+            AvaloniaProperty.Register<ImageBrush, IBitmap>(nameof(Source));
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageBrush"/> class.
diff --git a/src/Avalonia.Visuals/Media/MatrixTransform.cs b/src/Avalonia.Visuals/Media/MatrixTransform.cs
index 1507720305..247a26dac1 100644
--- a/src/Avalonia.Visuals/Media/MatrixTransform.cs
+++ b/src/Avalonia.Visuals/Media/MatrixTransform.cs
@@ -15,7 +15,7 @@ namespace Avalonia.Media
         /// Defines the <see cref="Matrix"/> property.
         /// </summary>
         public static readonly StyledProperty<Matrix> MatrixProperty =
-            AvaloniaProperty.Register<MatrixTransform, Matrix>("Matrix", Matrix.Identity);
+            AvaloniaProperty.Register<MatrixTransform, Matrix>(nameof(Matrix), Matrix.Identity);
 
         /// <summary>
         /// Initializes a new instance of the <see cref="MatrixTransform"/> class.
diff --git a/src/Avalonia.Visuals/Media/RotateTransform.cs b/src/Avalonia.Visuals/Media/RotateTransform.cs
index 41f2335ced..4fe615a6df 100644
--- a/src/Avalonia.Visuals/Media/RotateTransform.cs
+++ b/src/Avalonia.Visuals/Media/RotateTransform.cs
@@ -15,7 +15,7 @@ namespace Avalonia.Media
         /// Defines the <see cref="Angle"/> property.
         /// </summary>
         public static readonly StyledProperty<double> AngleProperty =
-            AvaloniaProperty.Register<RotateTransform, double>("Angle");
+            AvaloniaProperty.Register<RotateTransform, double>(nameof(Angle));
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RotateTransform"/> class.
diff --git a/src/Avalonia.Visuals/Media/TranslateTransform.cs b/src/Avalonia.Visuals/Media/TranslateTransform.cs
index 0c9ca5debc..b66ca7939c 100644
--- a/src/Avalonia.Visuals/Media/TranslateTransform.cs
+++ b/src/Avalonia.Visuals/Media/TranslateTransform.cs
@@ -15,13 +15,13 @@ namespace Avalonia.Media
         /// Defines the <see cref="X"/> property.
         /// </summary>
         public static readonly StyledProperty<double> XProperty =
-            AvaloniaProperty.Register<TranslateTransform, double>("X");
+            AvaloniaProperty.Register<TranslateTransform, double>(nameof(X));
 
         /// <summary>
         /// Defines the <see cref="Y"/> property.
         /// </summary>
         public static readonly StyledProperty<double> YProperty =
-            AvaloniaProperty.Register<TranslateTransform, double>("Y");
+            AvaloniaProperty.Register<TranslateTransform, double>(nameof(Y));
 
         /// <summary>
         /// Initializes a new instance of the <see cref="TranslateTransform"/> class.
diff --git a/src/Avalonia.Visuals/Media/VisualBrush.cs b/src/Avalonia.Visuals/Media/VisualBrush.cs
index a6d2b8ae8f..435f4ba1b1 100644
--- a/src/Avalonia.Visuals/Media/VisualBrush.cs
+++ b/src/Avalonia.Visuals/Media/VisualBrush.cs
@@ -14,7 +14,7 @@ namespace Avalonia.Media
         /// Defines the <see cref="Visual"/> property.
         /// </summary>
         public static readonly StyledProperty<IVisual> VisualProperty =
-            AvaloniaProperty.Register<VisualBrush, IVisual>("Visual");
+            AvaloniaProperty.Register<VisualBrush, IVisual>(nameof(Visual));
 
         /// <summary>
         /// Initializes a new instance of the <see cref="VisualBrush"/> class.
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
index f415d845ce..5cc5bae8b0 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
@@ -506,17 +506,17 @@ namespace Avalonia.Base.UnitTests
         {
             public static readonly DirectProperty<Class1, string> FooProperty =
                 AvaloniaProperty.RegisterDirect<Class1, string>(
-                    "Foo",
+                    nameof(Foo),
                     o => o.Foo,
                     (o, v) => o.Foo = v,
                     unsetValue: "unset");
 
             public static readonly DirectProperty<Class1, string> BarProperty =
-                AvaloniaProperty.RegisterDirect<Class1, string>("Bar", o => o.Bar);
+                AvaloniaProperty.RegisterDirect<Class1, string>(nameof(Bar), o => o.Bar);
 
             public static readonly DirectProperty<Class1, int> BazProperty =
                 AvaloniaProperty.RegisterDirect<Class1, int>(
-                    "Bar",
+                    nameof(Baz),
                     o => o.Baz,
                     (o, v) => o.Baz = v,
                     unsetValue: -1);
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetSubject.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetSubject.cs
index ec872e7cc0..bb6df0e4fb 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetSubject.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetSubject.cs
@@ -37,7 +37,7 @@ namespace Avalonia.Base.UnitTests
         private class Class1 : AvaloniaObject
         {
             public static readonly StyledProperty<string> FooProperty =
-                AvaloniaProperty.Register<Class1, string>("Foo", "foodefault");
+                AvaloniaProperty.Register<Class1, string>(nameof(Foo), "foodefault");
 
             public string Foo
             {
diff --git a/tests/Avalonia.Base.UnitTests/DirectPropertyTests.cs b/tests/Avalonia.Base.UnitTests/DirectPropertyTests.cs
index 84ff492512..fe7186e417 100644
--- a/tests/Avalonia.Base.UnitTests/DirectPropertyTests.cs
+++ b/tests/Avalonia.Base.UnitTests/DirectPropertyTests.cs
@@ -85,7 +85,7 @@ namespace Avalonia.Base.UnitTests
         private class Class1 : AvaloniaObject
         {
             public static readonly DirectProperty<Class1, string> FooProperty =
-                AvaloniaProperty.RegisterDirect<Class1, string>("Foo", o => o.Foo, (o, v) => o.Foo = v);
+                AvaloniaProperty.RegisterDirect<Class1, string>(nameof(Foo), o => o.Foo, (o, v) => o.Foo = v);
 
             private string _foo = "foo";
 
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_AttachedProperty.cs b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_AttachedProperty.cs
index a8069cb75c..5ddff63a0c 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_AttachedProperty.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_AttachedProperty.cs
@@ -136,7 +136,7 @@ namespace Avalonia.Markup.UnitTests.Data
         private class Class1 : AvaloniaObject
         {
             public static readonly StyledProperty<Class1> NextProperty =
-                AvaloniaProperty.Register<Class1, Class1>("Next");
+                AvaloniaProperty.Register<Class1, Class1>(nameof(Next));
 
             public Class1 Next
             {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
index 71c5385c23..c6f89e07a6 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
@@ -558,7 +558,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
         private class InheritanceTest : Decorator
         {
             public static readonly StyledProperty<int> BazProperty =
-                AvaloniaProperty.Register<InheritanceTest, int>("Baz", defaultValue: 6, inherits: true);
+                AvaloniaProperty.Register<InheritanceTest, int>(nameof(Baz), defaultValue: 6, inherits: true);
 
             public int Baz
             {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/NonControl.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/NonControl.cs
index 7562084072..7a728203e6 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/NonControl.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/NonControl.cs
@@ -8,10 +8,10 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     public class NonControl : AvaloniaObject
     {
         public static readonly StyledProperty<Control> ControlProperty =
-            AvaloniaProperty.Register<NonControl, Control>("Control");
+            AvaloniaProperty.Register<NonControl, Control>(nameof(Control));
 
         public static readonly StyledProperty<string> StringProperty =
-            AvaloniaProperty.Register<NonControl, string>("String");
+            AvaloniaProperty.Register<NonControl, string>(nameof(String));
 
         //No getter or setter Avalonia property
         public static readonly StyledProperty<int> FooProperty =
@@ -19,7 +19,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 
         //getter only Avalonia property
         public static readonly StyledProperty<string> BarProperty =
-                AvaloniaProperty.Register<NonControl, string>("Bar");
+                AvaloniaProperty.Register<NonControl, string>(nameof(Bar));
 
         public Control Control
         {
diff --git a/tests/Avalonia.Styling.UnitTests/StyleTests.cs b/tests/Avalonia.Styling.UnitTests/StyleTests.cs
index d9756ebc4b..a7c559668b 100644
--- a/tests/Avalonia.Styling.UnitTests/StyleTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/StyleTests.cs
@@ -170,7 +170,7 @@ namespace Avalonia.Styling.UnitTests
         private class Class1 : Control
         {
             public static readonly StyledProperty<string> FooProperty =
-                AvaloniaProperty.Register<Class1, string>("Foo", "foodefault");
+                AvaloniaProperty.Register<Class1, string>(nameof(Foo), "foodefault");
 
             public string Foo
             {

From f22994a083b0aa9499fa2e937ae8c6075ae07b84 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 6 Jan 2018 19:32:37 +0100
Subject: [PATCH 261/482] Added failing test for #1065.

Also add setter for `ScrollContentPresenter.CanScrollHorizontally`.
---
 .../Presenters/ScrollContentPresenter.cs      | 12 ++++++---
 .../Presenters/ScrollContentPresenterTests.cs | 26 +++++++++++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
index e41c4e1e28..03e56b0747 100644
--- a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
@@ -101,9 +101,13 @@ namespace Avalonia.Controls.Presenters
         }
 
         /// <summary>
-        /// Gets a value indicating whether the content can be scrolled horizontally.
+        /// Gets or sets a value indicating whether the content can be scrolled horizontally.
         /// </summary>
-        public bool CanScrollHorizontally => GetValue(CanScrollHorizontallyProperty);
+        public bool CanScrollHorizontally
+        {
+            get => GetValue(CanScrollHorizontallyProperty);
+            set => SetValue(CanScrollHorizontallyProperty, value);
+        }
 
         /// <summary>
         /// Attempts to bring a portion of the target visual into view by scrolling the content.
@@ -213,8 +217,8 @@ namespace Avalonia.Controls.Presenters
                 if (child != null)
                 {
                     var size = new Size(
-                    Math.Max(finalSize.Width, child.DesiredSize.Width),
-                    Math.Max(finalSize.Height, child.DesiredSize.Height));
+                        Math.Max(finalSize.Width, child.DesiredSize.Width),
+                        Math.Max(finalSize.Height, child.DesiredSize.Height));
                     child.Arrange(new Rect((Point)(-Offset), size));
                     return finalSize;
                 }
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs
index ab16552e12..d8d1f127f8 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs
@@ -201,6 +201,32 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.Equal(new[] { "Viewport", "Extent" }, set);
         }
 
+        [Fact]
+        public void Arrange_Should_Constrain_Child_Width_When_CanScrollHorizontally_False()
+        {
+            var child = new WrapPanel
+            {
+                Children =
+                {
+                    new Border { Width = 40, Height = 50 },
+                    new Border { Width = 40, Height = 50 },
+                    new Border { Width = 40, Height = 50 },
+                }
+            };
+
+            var target = new ScrollContentPresenter
+            {
+                Content = child,
+                CanScrollHorizontally = false,
+            };
+
+            target.UpdateChild();
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(100, child.Bounds.Width);
+        }
+
         [Fact]
         public void Setting_Offset_Should_Invalidate_Arrange()
         {

From 4888d11f2f39402c7ef19741efdc0d9709de947d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 7 Jan 2018 13:06:06 +0100
Subject: [PATCH 262/482] Respect CanScrollHorizontally in Arrange.

Fixes #1065
---
 src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
index 03e56b0747..d982ed4ac4 100644
--- a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
@@ -217,8 +217,11 @@ namespace Avalonia.Controls.Presenters
                 if (child != null)
                 {
                     var size = new Size(
-                        Math.Max(finalSize.Width, child.DesiredSize.Width),
+                        CanScrollHorizontally ?
+                            Math.Max(finalSize.Width, child.DesiredSize.Width) :
+                            Math.Min(finalSize.Width, child.DesiredSize.Width),
                         Math.Max(finalSize.Height, child.DesiredSize.Height));
+
                     child.Arrange(new Rect((Point)(-Offset), size));
                     return finalSize;
                 }

From 46bcbacc53fbf87d73e3a9aa97667d5ec8141aa2 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 11 Jan 2018 23:06:07 +0100
Subject: [PATCH 263/482] Fix layout in ScrollContentPresenter.

- Share common layout logic between `Border`, `ContentPresenter` and `ScrollContentPresenter`
- Added a bunch of tests for things not previously convered
- Fix `ScrollContentPresenter` child layout
---
 src/Avalonia.Controls/Border.cs               |  38 ++--
 .../Presenters/ContentPresenter.cs            | 127 +++++++-----
 .../Presenters/ScrollContentPresenter.cs      |  66 ++----
 .../ContentPresenterTests_Layout.cs           | 194 ++++++++++++++++++
 .../ItemsPresenterTests_Virtualization.cs     |   4 +-
 .../Presenters/ScrollContentPresenterTests.cs | 129 +++++++-----
 .../LayoutableTests.cs                        | 110 ++++++++++
 7 files changed, 495 insertions(+), 173 deletions(-)
 create mode 100644 tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs

diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index f425ae3f01..002c5ea3f2 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -108,18 +108,7 @@ namespace Avalonia.Controls
         /// <returns>The desired size of the control.</returns>
         protected override Size MeasureOverride(Size availableSize)
         {
-            var child = Child;
-            var padding = Padding + new Thickness(BorderThickness);
-
-            if (child != null)
-            {
-                child.Measure(availableSize.Deflate(padding));
-                return child.DesiredSize.Inflate(padding);
-            }
-            else
-            {
-                return new Size(padding.Left + padding.Right, padding.Bottom + padding.Top);
-            }
+            return MeasureOverrideImpl(availableSize, Child, Padding, BorderThickness);
         }
 
         /// <summary>
@@ -129,15 +118,32 @@ namespace Avalonia.Controls
         /// <returns>The space taken.</returns>
         protected override Size ArrangeOverride(Size finalSize)
         {
-            var child = Child;
-
-            if (child != null)
+            if (Child != null)
             {
                 var padding = Padding + new Thickness(BorderThickness);
-                child.Arrange(new Rect(finalSize).Deflate(padding));
+                Child.Arrange(new Rect(finalSize).Deflate(padding));
             }
 
             return finalSize;
         }
+
+        internal static Size MeasureOverrideImpl(
+            Size availableSize,
+            IControl child,
+            Thickness padding,
+            double borderThickness)
+        {
+            padding += new Thickness(borderThickness);
+
+            if (child != null)
+            {
+                child.Measure(availableSize.Deflate(padding));
+                return child.DesiredSize.Inflate(padding);
+            }
+            else
+            {
+                return new Size(padding.Left + padding.Right, padding.Bottom + padding.Top);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index a97fdf8784..d0a438cc2b 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -2,14 +2,12 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
-using System.Reactive.Linq;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.Metadata;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Presenters
 {
@@ -340,94 +338,121 @@ namespace Avalonia.Controls.Presenters
         /// <inheritdoc/>
         protected override Size MeasureOverride(Size availableSize)
         {
-            var child = Child;
-            var padding = Padding + new Thickness(BorderThickness);
+            return Border.MeasureOverrideImpl(availableSize, Child, Padding, BorderThickness);
+        }
+
+        /// <inheritdoc/>
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            return ArrangeOverrideImpl(finalSize, new Vector());
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Content"/> property changes.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private void ContentChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            _createdChild = false;
 
-            if (child != null)
+            if (((ILogical)this).IsAttachedToLogicalTree)
             {
-                child.Measure(availableSize.Deflate(padding));
-                return child.DesiredSize.Inflate(padding);
+                UpdateChild();
             }
-            else
+            else if (Child != null)
             {
-                return new Size(padding.Left + padding.Right, padding.Bottom + padding.Top);
+                VisualChildren.Remove(Child);
+                LogicalChildren.Remove(Child);
+                Child = null;
+                _dataTemplate = null;
             }
+
+            InvalidateMeasure();
         }
 
-        /// <inheritdoc/>
-        protected override Size ArrangeOverride(Size finalSize)
+        internal Size ArrangeOverrideImpl(Size finalSize, Vector offset)
         {
-            var child = Child;
-
-            if (child != null)
+            if (Child != null)
             {
-                var padding = Padding + new Thickness(BorderThickness);
-                var sizeMinusPadding = finalSize.Deflate(padding);
-                var size = sizeMinusPadding;
-                var horizontalAlignment = HorizontalContentAlignment;
-                var verticalAlignment = VerticalContentAlignment;
-                var originX = padding.Left;
-                var originY = padding.Top;
-
-                if (horizontalAlignment != HorizontalAlignment.Stretch)
+                var padding = Padding;
+                var borderThickness = BorderThickness;
+                var horizontalContentAlignment = HorizontalContentAlignment;
+                var verticalContentAlignment = VerticalContentAlignment;
+                var useLayoutRounding = UseLayoutRounding;
+                var availableSizeMinusMargins = new Size(
+                    Math.Max(0, finalSize.Width - padding.Left - padding.Right - borderThickness),
+                    Math.Max(0, finalSize.Height - padding.Top - padding.Bottom - borderThickness));
+                var size = availableSizeMinusMargins;
+                var scale = GetLayoutScale();
+                var originX = offset.X + padding.Left + borderThickness;
+                var originY = offset.Y + padding.Top + borderThickness;
+
+                if (horizontalContentAlignment != HorizontalAlignment.Stretch)
                 {
-                    size = size.WithWidth(child.DesiredSize.Width);
+                    size = size.WithWidth(Math.Min(size.Width, DesiredSize.Width - padding.Left - padding.Right));
                 }
 
-                if (verticalAlignment != VerticalAlignment.Stretch)
+                if (verticalContentAlignment != VerticalAlignment.Stretch)
                 {
-                    size = size.WithHeight(child.DesiredSize.Height);
+                    size = size.WithHeight(Math.Min(size.Height, DesiredSize.Height - padding.Top - padding.Bottom));
                 }
 
-                switch (horizontalAlignment)
+                size = LayoutHelper.ApplyLayoutConstraints(Child, size);
+
+                if (useLayoutRounding)
+                {
+                    size = new Size(
+                        Math.Ceiling(size.Width * scale) / scale,
+                        Math.Ceiling(size.Height * scale) / scale);
+                    availableSizeMinusMargins = new Size(
+                        Math.Ceiling(availableSizeMinusMargins.Width * scale) / scale,
+                        Math.Ceiling(availableSizeMinusMargins.Height * scale) / scale);
+                }
+
+                switch (horizontalContentAlignment)
                 {
-                    case HorizontalAlignment.Stretch:
                     case HorizontalAlignment.Center:
-                        originX += (sizeMinusPadding.Width - size.Width) / 2;
+                    case HorizontalAlignment.Stretch:
+                        originX += (availableSizeMinusMargins.Width - size.Width) / 2;
                         break;
                     case HorizontalAlignment.Right:
-                        originX = size.Width - child.DesiredSize.Width;
+                        originX += availableSizeMinusMargins.Width - size.Width;
                         break;
                 }
 
-                switch (verticalAlignment)
+                switch (verticalContentAlignment)
                 {
-                    case VerticalAlignment.Stretch:
                     case VerticalAlignment.Center:
-                        originY += (sizeMinusPadding.Height - size.Height) / 2;
+                    case VerticalAlignment.Stretch:
+                        originY += (availableSizeMinusMargins.Height - size.Height) / 2;
                         break;
                     case VerticalAlignment.Bottom:
-                        originY = size.Height - child.DesiredSize.Height;
+                        originY += availableSizeMinusMargins.Height - size.Height;
                         break;
                 }
 
-                child.Arrange(new Rect(originX, originY, size.Width, size.Height));
+                if (useLayoutRounding)
+                {
+                    originX = Math.Floor(originX * scale) / scale;
+                    originY = Math.Floor(originY * scale) / scale;
+                }
+
+                Child.Arrange(new Rect(originX, originY, size.Width, size.Height));
             }
 
             return finalSize;
         }
 
-        /// <summary>
-        /// Called when the <see cref="Content"/> property changes.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private void ContentChanged(AvaloniaPropertyChangedEventArgs e)
+        private double GetLayoutScale()
         {
-            _createdChild = false;
+            var result = (VisualRoot as ILayoutRoot)?.LayoutScaling ?? 1.0;
 
-            if (((ILogical)this).IsAttachedToLogicalTree)
+            if (result == 0 || double.IsNaN(result) || double.IsInfinity(result))
             {
-                UpdateChild();
-            }
-            else if (Child != null)
-            {
-                VisualChildren.Remove(Child);
-                LogicalChildren.Remove(Child);
-                Child = null;
-                _dataTemplate = null;
+                throw new Exception($"Invalid LayoutScaling returned from {VisualRoot.GetType()}");
             }
 
-            InvalidateMeasure();
+            return result;
         }
 
         private void TemplatedParentChanged(AvaloniaPropertyChangedEventArgs e)
diff --git a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
index d982ed4ac4..75b1602919 100644
--- a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
@@ -48,7 +48,6 @@ namespace Avalonia.Controls.Presenters
             ScrollViewer.CanScrollHorizontallyProperty.AddOwner<ScrollContentPresenter>();
 
         private Size _extent;
-        private Size _measuredExtent;
         private Vector _offset;
         private IDisposable _logicalScrollSubscription;
         private Size _viewport;
@@ -176,63 +175,36 @@ namespace Avalonia.Controls.Presenters
         /// <inheritdoc/>
         protected override Size MeasureOverride(Size availableSize)
         {
-            var child = Child;
-
-            if (child != null)
+            if (_logicalScrollSubscription != null || Child == null)
             {
-                var measureSize = availableSize;
-
-                if (_logicalScrollSubscription == null)
-                {
-                    measureSize = new Size(double.PositiveInfinity, double.PositiveInfinity);
+                return base.MeasureOverride(availableSize);
+            }
 
-                    if (!CanScrollHorizontally)
-                    {
-                        measureSize = measureSize.WithWidth(availableSize.Width);
-                    }
-                }
+            var constraint = new Size(
+                CanScrollHorizontally ? double.PositiveInfinity : availableSize.Width,
+                double.PositiveInfinity);
 
-                child.Measure(measureSize);
-                var size = child.DesiredSize;
-                _measuredExtent = size;
-                return size.Constrain(availableSize);
-            }
-            else
-            {
-                return Extent = new Size();
-            }
+            Child.Measure(constraint);
+            return Child.DesiredSize.Constrain(availableSize);
         }
 
         /// <inheritdoc/>
         protected override Size ArrangeOverride(Size finalSize)
         {
-            var child = this.GetVisualChildren().SingleOrDefault() as ILayoutable;
-            var logicalScroll = _logicalScrollSubscription != null;
-
-            if (!logicalScroll)
-            {
-                Viewport = finalSize;
-                Extent = _measuredExtent;
-
-                if (child != null)
-                {
-                    var size = new Size(
-                        CanScrollHorizontally ?
-                            Math.Max(finalSize.Width, child.DesiredSize.Width) :
-                            Math.Min(finalSize.Width, child.DesiredSize.Width),
-                        Math.Max(finalSize.Height, child.DesiredSize.Height));
-
-                    child.Arrange(new Rect((Point)(-Offset), size));
-                    return finalSize;
-                }
-            }
-            else if (child != null)
+            if (_logicalScrollSubscription != null || Child == null)
             {
-                child.Arrange(new Rect(finalSize));
-                return finalSize;
+                return base.ArrangeOverride(finalSize);
             }
 
-            return new Size();
+            var size = new Size(
+                CanScrollHorizontally ?
+                    Math.Max(Child.DesiredSize.Width, finalSize.Width) :
+                    finalSize.Width,
+                Math.Max(Child.DesiredSize.Height, finalSize.Height));
+            ArrangeOverrideImpl(size, -Offset);
+            Viewport = finalSize;
+            Extent = Child.Bounds.Size;
+            return finalSize;
         }
 
         /// <inheritdoc/>
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
new file mode 100644
index 0000000000..450b85696e
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
@@ -0,0 +1,194 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Avalonia.Controls.Presenters;
+using Avalonia.Layout;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests.Presenters
+{
+    public class ContentPresenterTests_Layout
+    {
+        [Theory]
+        [InlineData(HorizontalAlignment.Stretch, VerticalAlignment.Stretch, 0, 0, 100, 100)]
+        [InlineData(HorizontalAlignment.Left, VerticalAlignment.Stretch, 0, 0, 16, 100)]
+        [InlineData(HorizontalAlignment.Right, VerticalAlignment.Stretch, 84, 0, 16, 100)]
+        [InlineData(HorizontalAlignment.Center, VerticalAlignment.Stretch, 42, 0, 16, 100)]
+        [InlineData(HorizontalAlignment.Stretch, VerticalAlignment.Top, 0, 0, 100, 16)]
+        [InlineData(HorizontalAlignment.Stretch, VerticalAlignment.Bottom, 0, 84, 100, 16)]
+        [InlineData(HorizontalAlignment.Stretch, VerticalAlignment.Center, 0, 42, 100, 16)]
+        public void Content_Alignment_Is_Applied_To_Child_Bounds(
+            HorizontalAlignment h,
+            VerticalAlignment v,
+            double expectedX,
+            double expectedY,
+            double expectedWidth,
+            double expectedHeight)
+        {
+            Border content;
+            var target = new ContentPresenter
+            {
+                HorizontalContentAlignment = h,
+                VerticalContentAlignment = v,
+                Content = content = new Border
+                {
+                    MinWidth = 16,
+                    MinHeight = 16,
+                },
+            };
+
+            target.UpdateChild();
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Rect(expectedX, expectedY, expectedWidth, expectedHeight), content.Bounds);
+        }
+
+        [Theory]
+        [InlineData(HorizontalAlignment.Stretch, VerticalAlignment.Stretch, 10, 10, 80, 80)]
+        [InlineData(HorizontalAlignment.Left, VerticalAlignment.Stretch, 10, 10, 16, 80)]
+        [InlineData(HorizontalAlignment.Right, VerticalAlignment.Stretch, 74, 10, 16, 80)]
+        [InlineData(HorizontalAlignment.Center, VerticalAlignment.Stretch, 42, 10, 16, 80)]
+        [InlineData(HorizontalAlignment.Stretch, VerticalAlignment.Top, 10, 10, 80, 16)]
+        [InlineData(HorizontalAlignment.Stretch, VerticalAlignment.Bottom, 10, 74, 80, 16)]
+        [InlineData(HorizontalAlignment.Stretch, VerticalAlignment.Center, 10, 42, 80, 16)]
+        public void Content_Alignment_And_Padding_Are_Applied_To_Child_Bounds(
+            HorizontalAlignment h,
+            VerticalAlignment v,
+            double expectedX,
+            double expectedY,
+            double expectedWidth,
+            double expectedHeight)
+        {
+            Border content;
+            var target = new ContentPresenter
+            {
+                HorizontalContentAlignment = h,
+                VerticalContentAlignment = v,
+                Padding = new Thickness(10),
+                Content = content = new Border
+                {
+                    MinWidth = 16,
+                    MinHeight = 16,
+                },
+            };
+
+            target.UpdateChild();
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Rect(expectedX, expectedY, expectedWidth, expectedHeight), content.Bounds);
+        }
+
+        [Fact]
+        public void Content_Can_Be_Stretched()
+        {
+            Border content;
+            var target = new ContentPresenter
+            {
+                Content = content = new Border
+                {
+                    MinWidth = 16,
+                    MinHeight = 16,
+                },
+            };
+
+            target.UpdateChild();
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Rect(0, 0, 100, 100), content.Bounds);
+        }
+
+        [Fact]
+        public void Content_Can_Be_Right_Aligned()
+        {
+            Border content;
+            var target = new ContentPresenter
+            {
+                Content = content = new Border
+                {
+                    MinWidth = 16,
+                    MinHeight = 16,
+                    HorizontalAlignment = HorizontalAlignment.Right
+                },
+            };
+
+            target.UpdateChild();
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Rect(84, 0, 16, 100), content.Bounds);
+        }
+
+        [Fact]
+        public void Content_Can_Be_Bottom_Aligned()
+        {
+            Border content;
+            var target = new ContentPresenter
+            {
+                Content = content = new Border
+                {
+                    MinWidth = 16,
+                    MinHeight = 16,
+                    VerticalAlignment = VerticalAlignment.Bottom,
+                },
+            };
+
+            target.UpdateChild();
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Rect(0, 84, 100, 16), content.Bounds);
+        }
+
+        [Fact]
+        public void Content_Can_Be_TopLeft_Aligned()
+        {
+            Border content;
+            var target = new ContentPresenter
+            {
+                Content = content = new Border
+                {
+                    MinWidth = 16,
+                    MinHeight = 16,
+                    HorizontalAlignment = HorizontalAlignment.Right,
+                    VerticalAlignment = VerticalAlignment.Top,
+                },
+            };
+
+            target.UpdateChild();
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Rect(84, 0, 16, 16), content.Bounds);
+        }
+
+        [Fact]
+        public void Content_Can_Be_TopRight_Aligned()
+        {
+            Border content;
+            var target = new ContentPresenter
+            {
+                Content = content = new Border
+                {
+                    MinWidth = 16,
+                    MinHeight = 16,
+                    HorizontalAlignment = HorizontalAlignment.Right,
+                    VerticalAlignment = VerticalAlignment.Top,
+                },
+            };
+
+            target.UpdateChild();
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Rect(84, 0, 16, 16), content.Bounds);
+        }
+
+        [Fact]
+        public void Padding_Is_Applied_To_TopLeft_Aligned_Content()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs
index 58f4127cdc..ece79d3a95 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs
@@ -204,7 +204,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
             scroll.Arrange(new Rect(0, 0, 100, 100));
 
             Assert.Equal(20, target.Panel.Children.Count);
-            Assert.Equal(new Size(10, 200), scroll.Extent);
+            Assert.Equal(new Size(100, 200), scroll.Extent);
             Assert.Equal(new Size(100, 100), scroll.Viewport);
 
             target.VirtualizationMode = ItemVirtualizationMode.Simple;
@@ -266,7 +266,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
             scroll.Arrange(new Rect(0, 0, 100, 100));
 
             Assert.Equal(20, target.Panel.Children.Count);
-            Assert.Equal(new Size(10, 200), scroll.Extent);
+            Assert.Equal(new Size(100, 200), scroll.Extent);
             Assert.Equal(new Size(100, 100), scroll.Viewport);
         }
 
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs
index d8d1f127f8..1830c3e5c1 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs
@@ -12,55 +12,32 @@ namespace Avalonia.Controls.UnitTests.Presenters
 {
     public class ScrollContentPresenterTests
     {
-        [Fact]
-        public void Content_Can_Be_Left_Aligned()
-        {
-            Border content;
-            var target = new ScrollContentPresenter
-            {
-                Content = content = new Border
-                {
-                    Padding = new Thickness(8),
-                    HorizontalAlignment = HorizontalAlignment.Left
-                },
-            };
-
-            target.UpdateChild();
-            target.Measure(new Size(100, 100));
-            target.Arrange(new Rect(0, 0, 100, 100));
-
-            Assert.Equal(new Rect(0, 0, 16, 100), content.Bounds);
-        }
-
-        [Fact]
-        public void Content_Can_Be_Stretched()
-        {
-            Border content;
-            var target = new ScrollContentPresenter
-            {
-                Content = content = new Border
-                {
-                    Padding = new Thickness(8),
-                },
-            };
-
-            target.UpdateChild();
-            target.Measure(new Size(100, 100));
-            target.Arrange(new Rect(0, 0, 100, 100));
-
-            Assert.Equal(new Rect(0, 0, 100, 100), content.Bounds);
-        }
-
-        [Fact]
-        public void Content_Can_Be_Right_Aligned()
+        [Theory]
+        [InlineData(HorizontalAlignment.Stretch, VerticalAlignment.Stretch, 10, 10, 80, 80)]
+        [InlineData(HorizontalAlignment.Left, VerticalAlignment.Stretch, 10, 10, 16, 80)]
+        [InlineData(HorizontalAlignment.Right, VerticalAlignment.Stretch, 74, 10, 16, 80)]
+        [InlineData(HorizontalAlignment.Center, VerticalAlignment.Stretch, 42, 10, 16, 80)]
+        [InlineData(HorizontalAlignment.Stretch, VerticalAlignment.Top, 10, 10, 80, 16)]
+        [InlineData(HorizontalAlignment.Stretch, VerticalAlignment.Bottom, 10, 74, 80, 16)]
+        [InlineData(HorizontalAlignment.Stretch, VerticalAlignment.Center, 10, 42, 80, 16)]
+        public void Alignment_And_Padding_Are_Applied_To_Child_Bounds(
+            HorizontalAlignment h,
+            VerticalAlignment v,
+            double expectedX,
+            double expectedY,
+            double expectedWidth,
+            double expectedHeight)
         {
             Border content;
             var target = new ScrollContentPresenter
             {
+                Padding = new Thickness(10),
                 Content = content = new Border
                 {
-                    Padding = new Thickness(8),
-                    HorizontalAlignment = HorizontalAlignment.Right
+                    MinWidth = 16,
+                    MinHeight = 16,
+                    HorizontalAlignment = h,
+                    VerticalAlignment = v,
                 },
             };
 
@@ -68,19 +45,19 @@ namespace Avalonia.Controls.UnitTests.Presenters
             target.Measure(new Size(100, 100));
             target.Arrange(new Rect(0, 0, 100, 100));
 
-            Assert.Equal(new Rect(84, 0, 16, 100), content.Bounds);
+            Assert.Equal(new Rect(expectedX, expectedY, expectedWidth, expectedHeight), content.Bounds);
         }
 
         [Fact]
-        public void Content_Can_Be_Bottom_Aligned()
+        public void DesiredSize_Is_Content_Size_When_Smaller_Than_AvailableSize()
         {
-            Border content;
             var target = new ScrollContentPresenter
             {
-                Content = content = new Border
+                Padding = new Thickness(10),
+                Content = new Border
                 {
-                    Padding = new Thickness(8),
-                    VerticalAlignment = VerticalAlignment.Bottom,
+                    MinWidth = 16,
+                    MinHeight = 16,
                 },
             };
 
@@ -88,20 +65,19 @@ namespace Avalonia.Controls.UnitTests.Presenters
             target.Measure(new Size(100, 100));
             target.Arrange(new Rect(0, 0, 100, 100));
 
-            Assert.Equal(new Rect(0, 84, 100, 16), content.Bounds);
+            Assert.Equal(new Size(16, 16), target.DesiredSize);
         }
 
         [Fact]
-        public void Content_Can_Be_TopRight_Aligned()
+        public void DesiredSize_Is_AvailableSize_When_Content_Larger_Than_AvailableSize()
         {
-            Border content;
             var target = new ScrollContentPresenter
             {
-                Content = content = new Border
+                Padding = new Thickness(10),
+                Content = new Border
                 {
-                    Padding = new Thickness(8),
-                    HorizontalAlignment = HorizontalAlignment.Right,
-                    VerticalAlignment = VerticalAlignment.Top,
+                    MinWidth = 160,
+                    MinHeight = 160,
                 },
             };
 
@@ -109,7 +85,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
             target.Measure(new Size(100, 100));
             target.Arrange(new Rect(0, 0, 100, 100));
 
-            Assert.Equal(new Rect(84, 0, 16, 16), content.Bounds);
+            Assert.Equal(new Size(100, 100), target.DesiredSize);
         }
 
         [Fact]
@@ -201,6 +177,19 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.Equal(new[] { "Viewport", "Extent" }, set);
         }
 
+        [Fact]
+        public void Should_Correctly_Arrange_Child_Larger_Than_Viewport()
+        {
+            var child = new Canvas { MinWidth = 150, MinHeight = 150 };
+            var target = new ScrollContentPresenter { Content = child, };
+
+            target.UpdateChild();
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Size(150, 150), child.Bounds.Size);
+        }
+
         [Fact]
         public void Arrange_Should_Constrain_Child_Width_When_CanScrollHorizontally_False()
         {
@@ -227,6 +216,32 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.Equal(100, child.Bounds.Width);
         }
 
+        [Fact]
+        public void Extent_Width_Should_Be_Arrange_Width_When_CanScrollHorizontally_False()
+        {
+            var child = new WrapPanel
+            {
+                Children =
+                {
+                    new Border { Width = 40, Height = 50 },
+                    new Border { Width = 40, Height = 50 },
+                    new Border { Width = 40, Height = 50 },
+                }
+            };
+
+            var target = new ScrollContentPresenter
+            {
+                Content = child,
+                CanScrollHorizontally = false,
+            };
+
+            target.UpdateChild();
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Size(100, 100), target.Extent);
+        }
+
         [Fact]
         public void Setting_Offset_Should_Invalidate_Arrange()
         {
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs b/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs
index dcc65edc74..410b2ffb2e 100644
--- a/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs
+++ b/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs
@@ -7,6 +7,97 @@ namespace Avalonia.Layout.UnitTests
 {
     public class LayoutableTests
     {
+        [Theory]
+        [InlineData(0, 0, 0, 0, 100, 100)]
+        [InlineData(10, 0, 0, 0, 90, 100)]
+        [InlineData(10, 0, 5, 0, 85, 100)]
+        [InlineData(0, 10, 0, 0, 100, 90)]
+        [InlineData(0, 10, 0, 5, 100, 85)]
+        [InlineData(4, 4, 6, 7, 90, 89)]
+        public void Margin_Is_Applied_To_MeasureOverride_Size(
+            double l,
+            double t,
+            double r,
+            double b,
+            double expectedWidth,
+            double expectedHeight)
+        {
+            var target = new TestLayoutable
+            {
+                Margin = new Thickness(l, t, r, b),
+            };
+
+            target.Measure(new Size(100, 100));
+
+            Assert.Equal(new Size(expectedWidth, expectedHeight), target.MeasureSize);
+        }
+
+        [Theory]
+        [InlineData(HorizontalAlignment.Stretch, 100)]
+        [InlineData(HorizontalAlignment.Left, 10)]
+        [InlineData(HorizontalAlignment.Center, 10)]
+        [InlineData(HorizontalAlignment.Right, 10)]
+        public void HorizontalAlignment_Is_Applied_To_ArrangeOverride_Size(
+            HorizontalAlignment h,
+            double expectedWidth)
+        {
+            var target = new TestLayoutable
+            {
+                HorizontalAlignment = h,
+            };
+
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Size(expectedWidth, 100), target.ArrangeSize);
+        }
+
+        [Theory]
+        [InlineData(VerticalAlignment.Stretch, 100)]
+        [InlineData(VerticalAlignment.Top, 10)]
+        [InlineData(VerticalAlignment.Center, 10)]
+        [InlineData(VerticalAlignment.Bottom, 10)]
+        public void VerticalAlignment_Is_Applied_To_ArrangeOverride_Size(
+            VerticalAlignment v,
+            double expectedHeight)
+        {
+            var target = new TestLayoutable
+            {
+                VerticalAlignment = v,
+            };
+
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Size(100, expectedHeight), target.ArrangeSize);
+        }
+
+        [Theory]
+        [InlineData(0, 0, 0, 0, 100, 100)]
+        [InlineData(10, 0, 0, 0, 90, 100)]
+        [InlineData(10, 0, 5, 0, 85, 100)]
+        [InlineData(0, 10, 0, 0, 100, 90)]
+        [InlineData(0, 10, 0, 5, 100, 85)]
+        [InlineData(4, 4, 6, 7, 90, 89)]
+        public void Margin_Is_Applied_To_ArrangeOverride_Size(
+            double l,
+            double t,
+            double r,
+            double b,
+            double expectedWidth,
+            double expectedHeight)
+        {
+            var target = new TestLayoutable
+            {
+                Margin = new Thickness(l, t, r, b),
+            };
+
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Size(expectedWidth, expectedHeight), target.ArrangeSize);
+        }
+
         [Fact]
         public void Only_Calls_LayoutManager_InvalidateMeasure_Once()
         {
@@ -86,5 +177,24 @@ namespace Avalonia.Layout.UnitTests
             AvaloniaLocator.CurrentMutable.Bind<ILayoutManager>().ToConstant(layoutManager);
             return result;
         }
+
+        private class TestLayoutable : Layoutable
+        {
+            public Size ArrangeSize { get; private set; }
+            public Size MeasureResult { get; set; } = new Size(10, 10);
+            public Size MeasureSize { get; private set; }
+
+            protected override Size MeasureOverride(Size availableSize)
+            {
+                MeasureSize = availableSize;
+                return MeasureResult;
+            }
+
+            protected override Size ArrangeOverride(Size finalSize)
+            {
+                ArrangeSize = finalSize;
+                return base.ArrangeOverride(finalSize);
+            }
+        }
     }
 }

From 64ed0761c75713f0d0e0548ef53af3f394daa5dd Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 14 Jan 2018 22:41:21 +0100
Subject: [PATCH 264/482] Rename Dispatcher invoke methods.

`InvokeAsync` -> `Post`
`InvokeTaskAsync` -> `InvokeAsync`
---
 samples/Previewer/MainWindow.xaml.cs                   |  4 ++--
 samples/RemoteTest/Program.cs                          |  4 ++--
 src/Avalonia.Base/AvaloniaObject.cs                    |  2 +-
 src/Avalonia.Base/PriorityBindingEntry.cs              |  4 ++--
 src/Avalonia.Base/Threading/AvaloniaScheduler.cs       |  2 +-
 .../Threading/AvaloniaSynchronizationContext.cs        |  4 ++--
 src/Avalonia.Base/Threading/Dispatcher.cs              |  4 ++--
 src/Avalonia.Base/Threading/IDispatcher.cs             |  4 ++--
 src/Avalonia.Controls/Presenters/TextPresenter.cs      |  2 +-
 src/Avalonia.Controls/Remote/RemoteWidget.cs           |  2 +-
 .../Remote/Server/RemoteServerTopLevelImpl.cs          | 10 +++++-----
 src/Avalonia.Controls/TreeView.cs                      |  2 +-
 .../Remote/PreviewerWindowImpl.cs                      |  2 +-
 .../Remote/RemoteDesignerEntryPoint.cs                 |  2 +-
 src/Avalonia.Layout/LayoutManager.cs                   |  2 +-
 src/Avalonia.Visuals/Rendering/DeferredRenderer.cs     |  2 +-
 src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs                |  2 +-
 .../FramebufferToplevelImpl.cs                         |  2 +-
 .../LinuxFramebufferPlatform.cs                        |  2 +-
 src/OSX/Avalonia.MonoMac/TopLevelImpl.cs               |  2 +-
 tests/Avalonia.UnitTests/ImmediateDispatcher.cs        |  4 ++--
 .../Rendering/DeferredRendererTests.cs                 |  4 ++--
 22 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/samples/Previewer/MainWindow.xaml.cs b/samples/Previewer/MainWindow.xaml.cs
index c72b1f7e55..8eabf44bc3 100644
--- a/samples/Previewer/MainWindow.xaml.cs
+++ b/samples/Previewer/MainWindow.xaml.cs
@@ -39,7 +39,7 @@ namespace Previewer
             }));
             new BsonTcpTransport().Listen(IPAddress.Loopback, 25000, t =>
             {
-                Dispatcher.UIThread.InvokeAsync(() =>
+                Dispatcher.UIThread.Post(() =>
                 {
                     if (_connection != null)
                     {
@@ -61,7 +61,7 @@ namespace Previewer
 
         private void OnMessage(IAvaloniaRemoteTransportConnection transport, object obj)
         {
-            Dispatcher.UIThread.InvokeAsync(() =>
+            Dispatcher.UIThread.Post(() =>
             {
                 if (transport != _connection)
                     return;
diff --git a/samples/RemoteTest/Program.cs b/samples/RemoteTest/Program.cs
index dce168c7ea..f518e77143 100644
--- a/samples/RemoteTest/Program.cs
+++ b/samples/RemoteTest/Program.cs
@@ -25,7 +25,7 @@ namespace RemoteTest
             var transport = new BsonTcpTransport();
             transport.Listen(IPAddress.Loopback, port, sc =>
             {
-                Dispatcher.UIThread.InvokeAsync(() =>
+                Dispatcher.UIThread.Post(() =>
                 {
                     new RemoteServer(sc).Content = new MainView();
                 });
@@ -34,7 +34,7 @@ namespace RemoteTest
             var cts = new CancellationTokenSource();
             transport.Connect(IPAddress.Loopback, port).ContinueWith(t =>
             {
-                Dispatcher.UIThread.InvokeAsync(() =>
+                Dispatcher.UIThread.Post(() =>
                 {
                     var window = new Window()
                     {
diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 17e6ea8f0f..a46d567d28 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -774,7 +774,7 @@ namespace Avalonia
             }
             else
             {
-                Dispatcher.UIThread.InvokeAsync(Set);
+                Dispatcher.UIThread.Post(Set);
             }
         }
 
diff --git a/src/Avalonia.Base/PriorityBindingEntry.cs b/src/Avalonia.Base/PriorityBindingEntry.cs
index b44b845f25..570bfe03dc 100644
--- a/src/Avalonia.Base/PriorityBindingEntry.cs
+++ b/src/Avalonia.Base/PriorityBindingEntry.cs
@@ -123,7 +123,7 @@ namespace Avalonia
             }
             else
             {
-                Dispatcher.UIThread.InvokeAsync(Signal);
+                Dispatcher.UIThread.Post(Signal);
             }
         }
 
@@ -135,7 +135,7 @@ namespace Avalonia
             }
             else
             {
-                Dispatcher.UIThread.InvokeAsync(() => _owner.Completed(this));
+                Dispatcher.UIThread.Post(() => _owner.Completed(this));
             }
         }
     }
diff --git a/src/Avalonia.Base/Threading/AvaloniaScheduler.cs b/src/Avalonia.Base/Threading/AvaloniaScheduler.cs
index f9d67470c1..46529f0a5a 100644
--- a/src/Avalonia.Base/Threading/AvaloniaScheduler.cs
+++ b/src/Avalonia.Base/Threading/AvaloniaScheduler.cs
@@ -33,7 +33,7 @@ namespace Avalonia.Threading
                 if (!Dispatcher.UIThread.CheckAccess())
                 {
                     var cancellation = new CancellationDisposable();
-                    Dispatcher.UIThread.InvokeAsync(() =>
+                    Dispatcher.UIThread.Post(() =>
                     {
                         if (!cancellation.Token.IsCancellationRequested)
                         {
diff --git a/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs b/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs
index 7a0249f876..6af5ab63cf 100644
--- a/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs
+++ b/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs
@@ -36,7 +36,7 @@ namespace Avalonia.Threading
         /// <inheritdoc/>
         public override void Post(SendOrPostCallback d, object state)
         {
-           Dispatcher.UIThread.InvokeAsync(() => d(state), DispatcherPriority.Send);
+           Dispatcher.UIThread.Post(() => d(state), DispatcherPriority.Send);
         }
 
         /// <inheritdoc/>
@@ -45,7 +45,7 @@ namespace Avalonia.Threading
             if (Dispatcher.UIThread.CheckAccess())
                 d(state);
             else
-                Dispatcher.UIThread.InvokeTaskAsync(() => d(state), DispatcherPriority.Send).Wait();
+                Dispatcher.UIThread.InvokeAsync(() => d(state), DispatcherPriority.Send).Wait();
         }
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Base/Threading/Dispatcher.cs b/src/Avalonia.Base/Threading/Dispatcher.cs
index 4a096fc326..7d29a4f969 100644
--- a/src/Avalonia.Base/Threading/Dispatcher.cs
+++ b/src/Avalonia.Base/Threading/Dispatcher.cs
@@ -79,13 +79,13 @@ namespace Avalonia.Threading
         public void RunJobs(DispatcherPriority minimumPriority) => _jobRunner.RunJobs(minimumPriority);
 
         /// <inheritdoc/>
-        public Task InvokeTaskAsync(Action action, DispatcherPriority priority = DispatcherPriority.Normal)
+        public Task InvokeAsync(Action action, DispatcherPriority priority = DispatcherPriority.Normal)
         {
             return _jobRunner?.InvokeAsync(action, priority);
         }
 
         /// <inheritdoc/>
-        public void InvokeAsync(Action action, DispatcherPriority priority = DispatcherPriority.Normal)
+        public void Post(Action action, DispatcherPriority priority = DispatcherPriority.Normal)
         {
             _jobRunner?.Post(action, priority);
         }
diff --git a/src/Avalonia.Base/Threading/IDispatcher.cs b/src/Avalonia.Base/Threading/IDispatcher.cs
index 6301015a9a..4009dcdeab 100644
--- a/src/Avalonia.Base/Threading/IDispatcher.cs
+++ b/src/Avalonia.Base/Threading/IDispatcher.cs
@@ -25,7 +25,7 @@ namespace Avalonia.Threading
         /// <param name="action">The method.</param>
         /// <param name="priority">The priority with which to invoke the method.</param>
         /// <returns>A task that can be used to track the method's execution.</returns>
-        void InvokeAsync(Action action, DispatcherPriority priority = DispatcherPriority.Normal);
+        void Post(Action action, DispatcherPriority priority = DispatcherPriority.Normal);
 
         /// <summary>
         /// Post action that will be invoked on main thread
@@ -34,6 +34,6 @@ namespace Avalonia.Threading
         /// <param name="priority">The priority with which to invoke the method.</param>
         // TODO: The naming of this method is confusing: the Async suffix usually means return a task.
         // Remove this and rename InvokeTaskAsync as InvokeAsync. See #816.
-        Task InvokeTaskAsync(Action action, DispatcherPriority priority = DispatcherPriority.Normal);
+        Task InvokeAsync(Action action, DispatcherPriority priority = DispatcherPriority.Normal);
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs
index 5f6b3ad4c8..d2d4151e3d 100644
--- a/src/Avalonia.Controls/Presenters/TextPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs
@@ -191,7 +191,7 @@ namespace Avalonia.Controls.Presenters
                     // The measure is currently invalid so there's no point trying to bring the 
                     // current char into view until a measure has been carried out as the scroll
                     // viewer extents may not be up-to-date.
-                    Dispatcher.UIThread.InvokeAsync(
+                    Dispatcher.UIThread.Post(
                         () =>
                         {
                             var rect = FormattedText.HitTestTextPosition(caretIndex);
diff --git a/src/Avalonia.Controls/Remote/RemoteWidget.cs b/src/Avalonia.Controls/Remote/RemoteWidget.cs
index c05aeaf970..83360a0010 100644
--- a/src/Avalonia.Controls/Remote/RemoteWidget.cs
+++ b/src/Avalonia.Controls/Remote/RemoteWidget.cs
@@ -18,7 +18,7 @@ namespace Avalonia.Controls.Remote
         public RemoteWidget(IAvaloniaRemoteTransportConnection connection)
         {
             _connection = connection;
-            _connection.OnMessage += (t, msg) => Dispatcher.UIThread.InvokeAsync(() => OnMessage(msg));
+            _connection.OnMessage += (t, msg) => Dispatcher.UIThread.Post(() => OnMessage(msg));
             _connection.Send(new ClientSupportedPixelFormatsMessage
             {
                 Formats = new[]
diff --git a/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs b/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
index c2e6a200f9..cf4cec9268 100644
--- a/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
+++ b/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
@@ -46,16 +46,16 @@ namespace Avalonia.Controls.Remote.Server
                     {
                         _lastReceivedFrame = lastFrame.SequenceId;
                     }
-                    Dispatcher.UIThread.InvokeAsync(RenderIfNeeded);
+                    Dispatcher.UIThread.Post(RenderIfNeeded);
                 }
                 if (obj is ClientSupportedPixelFormatsMessage supportedFormats)
                 {
                     lock (_lock)
                         _supportedFormats = supportedFormats.Formats;
-                    Dispatcher.UIThread.InvokeAsync(RenderIfNeeded);
+                    Dispatcher.UIThread.Post(RenderIfNeeded);
                 }
                 if (obj is MeasureViewportMessage measure)
-                    Dispatcher.UIThread.InvokeAsync(() =>
+                    Dispatcher.UIThread.Post(() =>
                     {
                         var m = Measure(new Size(measure.Width, measure.Height));
                         _transport.Send(new MeasureViewportMessage
@@ -69,7 +69,7 @@ namespace Avalonia.Controls.Remote.Server
                     lock (_lock)
                     {
                         if (_pendingAllocation == null)
-                            Dispatcher.UIThread.InvokeAsync(() =>
+                            Dispatcher.UIThread.Post(() =>
                             {
                                 ClientViewportAllocatedMessage allocation;
                                 lock (_lock)
@@ -168,7 +168,7 @@ namespace Avalonia.Controls.Remote.Server
         public override void Invalidate(Rect rect)
         {
             _invalidated = true;
-            Dispatcher.UIThread.InvokeAsync(RenderIfNeeded);
+            Dispatcher.UIThread.Post(RenderIfNeeded);
         }
 
         public override IMouseDevice MouseDevice { get; } = new MouseDevice();
diff --git a/src/Avalonia.Controls/TreeView.cs b/src/Avalonia.Controls/TreeView.cs
index fa3ecdedef..2e1c011685 100644
--- a/src/Avalonia.Controls/TreeView.cs
+++ b/src/Avalonia.Controls/TreeView.cs
@@ -250,7 +250,7 @@ namespace Avalonia.Controls
 
                         if (AutoScrollToSelectedItem)
                         {
-                            Dispatcher.UIThread.InvokeAsync(container.ContainerControl.BringIntoView);
+                            Dispatcher.UIThread.Post(container.ContainerControl.BringIntoView);
                         }
 
                         break;
diff --git a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
index 535dfd700b..3c7ef86d5d 100644
--- a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
+++ b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
@@ -49,7 +49,7 @@ namespace Avalonia.DesignerSupport.Remote
             // In previewer mode we completely ignore client-side viewport size
             if (obj is ClientViewportAllocatedMessage alloc)
             {
-                Dispatcher.UIThread.InvokeAsync(() => SetDpi(new Vector(alloc.DpiX, alloc.DpiY)));
+                Dispatcher.UIThread.Post(() => SetDpi(new Vector(alloc.DpiX, alloc.DpiY)));
                 return;
             }
             base.OnMessage(transport, obj);
diff --git a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
index ac3438d71c..51cf1d4dde 100644
--- a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
+++ b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
@@ -140,7 +140,7 @@ namespace Avalonia.DesignerSupport.Remote
             };
         }
         
-        private static void OnTransportMessage(IAvaloniaRemoteTransportConnection transport, object obj) => Dispatcher.UIThread.InvokeAsync(() =>
+        private static void OnTransportMessage(IAvaloniaRemoteTransportConnection transport, object obj) => Dispatcher.UIThread.Post(() =>
         {
             if (obj is ClientSupportedPixelFormatsMessage formats)
             {
diff --git a/src/Avalonia.Layout/LayoutManager.cs b/src/Avalonia.Layout/LayoutManager.cs
index f8911dc036..b6b786a077 100644
--- a/src/Avalonia.Layout/LayoutManager.cs
+++ b/src/Avalonia.Layout/LayoutManager.cs
@@ -203,7 +203,7 @@ namespace Avalonia.Layout
         {
             if (!_queued && !_running)
             {
-                Dispatcher.UIThread.InvokeAsync(ExecuteLayoutPass, DispatcherPriority.Layout);
+                Dispatcher.UIThread.Post(ExecuteLayoutPass, DispatcherPriority.Layout);
                 _queued = true;
             }
         }
diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index 041d8f8f6b..82cc0a260d 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -415,7 +415,7 @@ namespace Avalonia.Rendering
                     if (!_updateQueued && (_dirty == null || _dirty.Count > 0))
                     {
                         _updateQueued = true;
-                        _dispatcher.InvokeAsync(UpdateScene, DispatcherPriority.Render);
+                        _dispatcher.Post(UpdateScene, DispatcherPriority.Render);
                     }
 
                     Scene scene = null;
diff --git a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
index 136023c31d..c41a136bce 100644
--- a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
+++ b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
@@ -351,7 +351,7 @@ namespace Avalonia.Gtk3
 
         void OnInput(RawInputEventArgs args)
         {
-            Dispatcher.UIThread.InvokeAsync(() => Input?.Invoke(args), DispatcherPriority.Input);
+            Dispatcher.UIThread.Post(() => Input?.Invoke(args), DispatcherPriority.Input);
         }
 
         public Point PointToClient(Point point)
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs b/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs
index daff4dd751..0db622ba13 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs
@@ -41,7 +41,7 @@ namespace Avalonia.LinuxFramebuffer
             if(_renderQueued)
                 return;
             _renderQueued = true;
-            Dispatcher.UIThread.InvokeAsync(() =>
+            Dispatcher.UIThread.Post(() =>
             {
                 Paint?.Invoke(new Rect(default(Point), ClientSize));
                 _renderQueued = false;
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
index e733beae27..896c91d087 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
@@ -62,7 +62,7 @@ public static class LinuxFramebufferPlatformExtensions
 
         public TokenClosable(CancellationToken token)
         {
-            token.Register(() => Dispatcher.UIThread.InvokeAsync(() => Closed?.Invoke(this, new EventArgs())));
+            token.Register(() => Dispatcher.UIThread.Post(() => Closed?.Invoke(this, new EventArgs())));
         }
     }
 
diff --git a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
index 5ea7972871..667ee12fa0 100644
--- a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
+++ b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
@@ -107,7 +107,7 @@ namespace Avalonia.MonoMac
                     if (_nonUiRedrawQueued)
                         return;
                     _nonUiRedrawQueued = true;
-                    Dispatcher.UIThread.InvokeAsync(
+                    Dispatcher.UIThread.Post(
                         () =>
                         {
                             lock (SyncRoot)
diff --git a/tests/Avalonia.UnitTests/ImmediateDispatcher.cs b/tests/Avalonia.UnitTests/ImmediateDispatcher.cs
index 4019e65bdf..92f64bde6f 100644
--- a/tests/Avalonia.UnitTests/ImmediateDispatcher.cs
+++ b/tests/Avalonia.UnitTests/ImmediateDispatcher.cs
@@ -14,12 +14,12 @@ namespace Avalonia.UnitTests
             return true;
         }
 
-        public void InvokeAsync(Action action, DispatcherPriority priority = DispatcherPriority.Normal)
+        public void Post(Action action, DispatcherPriority priority = DispatcherPriority.Normal)
         {
             action();
         }
 
-        public Task InvokeTaskAsync(Action action, DispatcherPriority priority = DispatcherPriority.Normal)
+        public Task InvokeAsync(Action action, DispatcherPriority priority = DispatcherPriority.Normal)
         {
             action();
             return Task.FromResult<object>(null);
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
index c97070a2aa..8fcb54775b 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
@@ -24,13 +24,13 @@ namespace Avalonia.Visuals.UnitTests.Rendering
             var root = new TestRoot();
 
             var dispatcher = new Mock<IDispatcher>();
-            dispatcher.Setup(x => x.InvokeAsync(It.IsAny<Action>(), DispatcherPriority.Render))
+            dispatcher.Setup(x => x.Post(It.IsAny<Action>(), DispatcherPriority.Render))
                 .Callback<Action, DispatcherPriority>((a, p) => a());
 
             CreateTargetAndRunFrame(root, dispatcher: dispatcher.Object);
 
             dispatcher.Verify(x => 
-                x.InvokeAsync(
+                x.Post(
                     It.Is<Action>(a => a.Method.Name == "UpdateScene"),
                     DispatcherPriority.Render));
         }

From 7a60b790b046af0ae3a2e5e98565699b60073eb2 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 14 Jan 2018 23:53:50 +0100
Subject: [PATCH 265/482] Added failing test for #1341.

---
 .../Avalonia.RenderTests/Shapes/PathTests.cs  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/tests/Avalonia.RenderTests/Shapes/PathTests.cs b/tests/Avalonia.RenderTests/Shapes/PathTests.cs
index 9a580794f8..fab867f428 100644
--- a/tests/Avalonia.RenderTests/Shapes/PathTests.cs
+++ b/tests/Avalonia.RenderTests/Shapes/PathTests.cs
@@ -362,5 +362,28 @@ namespace Avalonia.Direct2D1.RenderTests.Shapes
             await RenderToFile(target);
             CompareImages();
         }
+
+        [Fact]
+        public async Task Path_With_Rotated_Geometry()
+        {
+            var target = new Border
+            {
+                Width = 200,
+                Height = 200,
+                Background = Brushes.White,
+                Child = new Path
+                {
+                    Fill = Brushes.Red,
+                    Data = new RectangleGeometry
+                    {
+                        Rect = new Rect(50, 50, 100, 100),
+                        Transform = new RotateTransform(45),
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
     }
 }

From 438bc89a9066391483c721c9f443c4c2970beca1 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 15 Jan 2018 00:07:24 +0100
Subject: [PATCH 266/482] Preserve defining geometry transform.

Previous logic was overwriting `DefiningGeometry`'s transform with the transform calculated by the layout pass. Be sure to apply both transforms to the `RenderedGeometry`.
---
 src/Avalonia.Controls/Shapes/Shape.cs | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/Shapes/Shape.cs b/src/Avalonia.Controls/Shapes/Shape.cs
index 2ea681891d..a1848a95b1 100644
--- a/src/Avalonia.Controls/Shapes/Shape.cs
+++ b/src/Avalonia.Controls/Shapes/Shape.cs
@@ -61,12 +61,26 @@ namespace Avalonia.Controls.Shapes
         {
             get
             {
-                if (_renderedGeometry == null)
+                if (_renderedGeometry == null && DefiningGeometry != null)
                 {
-                    if (DefiningGeometry != null)
+                    if (_transform == Matrix.Identity)
+                    {
+                        _renderedGeometry = DefiningGeometry;
+                    }
+                    else
                     {
                         _renderedGeometry = DefiningGeometry.Clone();
-                        _renderedGeometry.Transform = new MatrixTransform(_transform);
+
+                        if (_renderedGeometry.Transform == null ||
+                            _renderedGeometry.Transform.Value == Matrix.Identity)
+                        {
+                            _renderedGeometry.Transform = new MatrixTransform(_transform);
+                        }
+                        else
+                        {
+                            _renderedGeometry.Transform = new MatrixTransform(
+                                _renderedGeometry.Transform.Value * _transform);
+                        }
                     }
                 }
 
@@ -193,6 +207,7 @@ namespace Avalonia.Controls.Shapes
 
             return finalSize;
         }
+
         private Size CalculateShapeSizeAndSetTransform(Size availableSize)
         {
             // This should probably use GetRenderBounds(strokeThickness) but then the calculations

From 062f67cd189e4a50d470702b0a070aac351caf86 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 15 Jan 2018 00:10:44 +0100
Subject: [PATCH 267/482] Added expected test output.

---
 .../Path/Path_With_Rotated_Geometry.expected.png | Bin 0 -> 1100 bytes
 .../Path/Path_With_Rotated_Geometry.expected.png | Bin 0 -> 1149 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/TestFiles/Direct2D1/Shapes/Path/Path_With_Rotated_Geometry.expected.png
 create mode 100644 tests/TestFiles/Skia/Shapes/Path/Path_With_Rotated_Geometry.expected.png

diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/Path_With_Rotated_Geometry.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/Path_With_Rotated_Geometry.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..767690045966974d1b2f61cc8feb121c93054348
GIT binary patch
literal 1100
zcmdVa-A|HX0LI}r#6%D^=d6?&Lsx5SlZwikYe1B+m6>Z(H?x<tq>a=q4|KH|T25VH
z*7}%H(Q*Te5Up8lW>QAB8EMWW#Kiobh+8dE{HXi+Gdh6x$HRT?87I`Fr=@b)v22Q>
zxC*%}1J7>qVy(sd(=5w<Jl34gNR?6+2X6)+m<5s}5{hc6<18zKDJsaXkV%f0=FWXn
z=mvz*RekBF&i7=;EYS(uYW5aCy!1GAVRqM9xBihlZO7mI6HCJ{HpS2b{lD1eNEVZ!
z5%d3}M}=`>c5o`w^QHgi=sQ7F)}QAW7h9{DUsoC=GRBkD@EL)oynX-ssL=MG^V^%{
zp1R)`BI`Sk&T69T#jM8a%O5Aiwema8A$%4#%`&zMl+wYF4B6ZKLJq#IamUNoh2D6X
zbWISoxwxEvFfq*60<gh3Mu6!Y0pg)x0J@C}piyrEsB~@tSZh5AP*OMoFzs9g=xxda
zczECgfV4nIfR0DNy<`IR73Ttod~N`hbCCekZUQ88On^KW8=&g>dH}6zCqQg(A%NaI
z2atSh3847;et=Qt3cy=ifPkRi1cb~G5Z+q^;5E+!IFJ1Wu-@2CenZF@0d_k9TrB}{
z8wuDgBsZj}ya1)03*-jlUUEbDF9Nia1jO|akl8?hMM!RFSNZ^0WKzx=-&1du@{?*V
za~Q7@qjDp=8*0b<jZ+b4{Jx>q<<ioLu@9#gm&>xhzbRj}nZ5kmT{aG*Ou@^E>@NC2
zUlG?PFGOgnD`}s&%N94umGN?v4&=>Aj*RD~ElBNTC{n3I-m^!@cqz0OS!u^sP4^%V
z*|Alt%t*T(TQ7YTnHIp-Ynn$o0@(5lpOKOPwmefa(iXs0Z>U2mT-fSObI6Y_Y(<7o
z;x0*o3tLg+Q)HeCTaihNeB{7Z<aHy*92k^%^vEqboR*9`kp(((I(-Le^pjKd2y)7g
z(=hr0uHd)fG%SAzNw<+x)m@|^o}7AHkRBiMu%`o=SV%H2yCdlJvs>2TpuX?;N1zl3
K(_|JYUGWb9wxlKi

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Skia/Shapes/Path/Path_With_Rotated_Geometry.expected.png b/tests/TestFiles/Skia/Shapes/Path/Path_With_Rotated_Geometry.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f258aa9de35ce524d04e6a97c285fd2ff3ce625
GIT binary patch
literal 1149
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yu@pObhHwBu4M$1`kZa=U;uumf
z=j~nFAQ?}Q){EQ=kDfd_<?yO43^%!KEOmU_lq8ayBw5ZjzgxHJk99h0<`;3%t5bh|
zdiL_=OU(nG+t-RS*a~xqurRSUIyfo>2n;dij<fIYuf5K2ch}jwu`W!@?>_rzsML7*
zUoE>J=bSJ9y?1#$=-vPSs1WC$r*H4?QEL1@=O3SvkVjChh6rcP2h~^=op+DdswpKV
z&cEHQDkS#x=h-f$M91fEpNVpITh{O1?GbSz^|_<VAtgO~1E74t-A<>820LH(-|1@U
z%q>=nRq@H%y^vQa(do9IsUYX%n{{vcJ!YJ+E8ggGNadTfjJlB8hW9D16AgC!b?@(L
zX_Pgd9j?OjYRAK?N{J4~{mR8Tn=SwSVxDL)!R&i;M~mZ@-45<5JPY3P1}iNre!D(F
zm{T@e-a|=f*Hw3gPLCHs_Khk^3$1HeCv~)}`yvjKxR?%-aM}-&*tw6{)5R(HFFQ~=
z?HGrOAg6DSFi;Vnc^FWU#gz)6qK5{_Y(Qz}9%-ONnRyvd;>Ojp!Jn>F3C{lU%k<}0
z?Vq2Pe)XDh;)nl)^#1;n+w)J(w_h86$mJQQil>~M%b{h@xPS)Fo~1v*MI|TgoP*HB
z4V{%hdk<ZG#s`!LpJ@-2h{@>%N)${iWdcgvyav*d9tqM>b88mJ5y97ZfkN_8)<B^t
zEI{{^b3U2rVd1Et-`Nt*@@bYwg`>i98yl7T`?trj%Fam7I6Up$yGiryc^eK0KjAI>
z(Bu#&#J-;6$xI8No=%I3=?+I66W=-<ImmvE*F~o0(5%LeX8$OCfx?2etxSUK=~3!H
zW}_*PDL%^{$ZXxoEXW={%UqyvL!%{-DLoUYcEiG*Kn2pXfoeB2TLPKZl0dZ^7H<S9
zu$Bg@Eod+VGT9|T<}TO>RKP9`RD0oo1kg6OU;HjICRfT89xd2d2UI2d!Wbyk`46Z{
z_N6wEIkOJLe5DLzuKd<`=YDr{-qydN_wK9P*QuDB`%Y(kpZT3dkexY0xWhu?$VZ@&
zjWW_e=9xkulTj8VdgUKT^essAP92cR`35LD<H$E4voi-MI^#?kNHiBDdgUufG*%qQ
qyz>;uWQ`H)u!uPF6Uc1+!~Evaw7bmFb9jK|34^DrpUXO@geCx4r>2Vl

literal 0
HcmV?d00001


From 42f0f6a23fa9d457258c201e38c28dcc8cb17982 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 15 Jan 2018 21:13:13 +0100
Subject: [PATCH 268/482] Added failing test for #1343.

---
 .../Media/RectangleGeometryTests.cs           | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 tests/Avalonia.Visuals.UnitTests/Media/RectangleGeometryTests.cs

diff --git a/tests/Avalonia.Visuals.UnitTests/Media/RectangleGeometryTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/RectangleGeometryTests.cs
new file mode 100644
index 0000000000..9f94e7fab4
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/RectangleGeometryTests.cs
@@ -0,0 +1,39 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Visuals.UnitTests.Media
+{
+    public class RectangleGeometryTests
+    {
+        [Fact]
+        public void Rectangle_With_Transform_Can_Be_Changed()
+        {
+            using (UnitTestApplication.Start(GetServices()))
+            {
+                var target = new RectangleGeometry
+                {
+                    Rect = new Rect(0, 0, 100, 100),
+                    Transform = new RotateTransform(45),
+                };
+
+                target.Rect = new Rect(50, 50, 150, 150);
+            }
+        }
+
+        private TestServices GetServices()
+        {
+            var context = Mock.Of<IStreamGeometryContextImpl>();
+            var transformedGeometry = new Mock<IGeometryImpl>();
+            var streamGeometry = Mock.Of<IStreamGeometryImpl>(x => 
+                x.Open() == context &&
+                x.WithTransform(It.IsAny<Matrix>()) == transformedGeometry.Object);
+            var renderInterface = Mock.Of<IPlatformRenderInterface>(x =>
+                x.CreateStreamGeometry() == streamGeometry);
+            return new TestServices(renderInterface: renderInterface);
+        }
+    }
+}

From d2e1eba876bff14206257a1d606052ccb1e7e79d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 18 Jan 2018 00:55:52 +0100
Subject: [PATCH 269/482] Refactored geometry.

There were a number of problems with `Geometry` and its subclasses and platform implementations. Fix these, for more details see the PR that this commit is a part of.
---
 src/Avalonia.Visuals/Media/EllipseGeometry.cs |  33 +++--
 src/Avalonia.Visuals/Media/Geometry.cs        | 126 +++++++++++++++---
 src/Avalonia.Visuals/Media/GeometryDrawing.cs |   3 +-
 src/Avalonia.Visuals/Media/LineGeometry.cs    |  66 ++++-----
 src/Avalonia.Visuals/Media/PathGeometry.cs    |  68 +++-------
 .../Media/PolylineGeometry.cs                 |  73 ++++------
 .../Media/RectangleGeometry.cs                |  24 ++--
 src/Avalonia.Visuals/Media/StreamGeometry.cs  |  20 ++-
 .../Platform/IGeometryImpl.cs                 |  18 +--
 .../Platform/ITransformedGeometryImpl.cs      |  24 ++++
 .../Rendering/SceneGraph/GeometryNode.cs      |   2 +-
 src/Skia/Avalonia.Skia/DrawingContextImpl.cs  |   2 +-
 src/Skia/Avalonia.Skia/GeometryImpl.cs        |  19 +++
 src/Skia/Avalonia.Skia/StreamGeometryImpl.cs  |  58 +++-----
 .../Avalonia.Skia/TransformedGeometryImpl.cs  |  63 +++++++++
 .../Media/DrawingContextImpl.cs               |   2 +-
 .../Avalonia.Direct2D1/Media/GeometryImpl.cs  |  14 +-
 .../Media/TransformedGeometryImpl.cs          |  10 +-
 .../Avalonia.Direct2D1/PrimitiveExtensions.cs |  15 ++-
 .../Media/GeometryTests.cs                    |   3 +-
 .../MockStreamGeometryImpl.cs                 |  12 +-
 .../Media/GeometryTests.cs                    | 126 ++++++++++++++++++
 .../Media/RectangleGeometryTests.cs           |   2 +-
 .../VisualTree/MockRenderInterface.cs         |  19 +--
 24 files changed, 543 insertions(+), 259 deletions(-)
 create mode 100644 src/Avalonia.Visuals/Platform/ITransformedGeometryImpl.cs
 create mode 100644 src/Skia/Avalonia.Skia/GeometryImpl.cs
 create mode 100644 src/Skia/Avalonia.Skia/TransformedGeometryImpl.cs
 create mode 100644 tests/Avalonia.Visuals.UnitTests/Media/GeometryTests.cs

diff --git a/src/Avalonia.Visuals/Media/EllipseGeometry.cs b/src/Avalonia.Visuals/Media/EllipseGeometry.cs
index 591b55cf58..e233eab496 100644
--- a/src/Avalonia.Visuals/Media/EllipseGeometry.cs
+++ b/src/Avalonia.Visuals/Media/EllipseGeometry.cs
@@ -17,15 +17,9 @@ namespace Avalonia.Media
         public static readonly StyledProperty<Rect> RectProperty =
             AvaloniaProperty.Register<EllipseGeometry, Rect>(nameof(Rect));
 
-        public Rect Rect
-        {
-            get => GetValue(RectProperty);
-            set => SetValue(RectProperty, value);
-        }
-
         static EllipseGeometry()
         {
-            RectProperty.Changed.AddClassHandler<EllipseGeometry>(x => x.RectChanged);
+            AffectsGeometry(RectProperty);
         }
 
         /// <summary>
@@ -33,8 +27,6 @@ namespace Avalonia.Media
         /// </summary>
         public EllipseGeometry()
         {
-            IPlatformRenderInterface factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
-            PlatformImpl = factory.CreateStreamGeometry();
         }
 
         /// <summary>
@@ -46,17 +38,30 @@ namespace Avalonia.Media
             Rect = rect;
         }
 
+        /// <summary>
+        /// Gets or sets a rect that defines the bounds of the ellipse.
+        /// </summary>
+        public Rect Rect
+        {
+            get => GetValue(RectProperty);
+            set => SetValue(RectProperty, value);
+        }
+
         /// <inheritdoc/>
         public override Geometry Clone()
         {
             return new EllipseGeometry(Rect);
         }
 
-        private void RectChanged(AvaloniaPropertyChangedEventArgs e)
+        /// <inheritdoc/>
+        protected override IGeometryImpl CreateDefiningGeometry()
         {
-            var rect = (Rect)e.NewValue;
-            using (var ctx = ((IStreamGeometryImpl)PlatformImpl).Open())
+            var factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
+            var geometry = factory.CreateStreamGeometry();
+
+            using (var ctx = geometry.Open())
             {
+                var rect = Rect;
                 double controlPointRatio = (Math.Sqrt(2) - 1) * 4 / 3;
                 var center = rect.Center;
                 var radius = new Vector(rect.Width / 2, rect.Height / 2);
@@ -80,6 +85,10 @@ namespace Avalonia.Media
                 ctx.CubicBezierTo(new Point(x0, y1), new Point(x1, y0), new Point(x2, y0));
                 ctx.EndFigure(true);
             }
+
+            return geometry;
         }
+
+        private void RectChanged(AvaloniaPropertyChangedEventArgs e) => InvalidateGeometry();
     }
 }
diff --git a/src/Avalonia.Visuals/Media/Geometry.cs b/src/Avalonia.Visuals/Media/Geometry.cs
index d27626bcc1..8201736238 100644
--- a/src/Avalonia.Visuals/Media/Geometry.cs
+++ b/src/Avalonia.Visuals/Media/Geometry.cs
@@ -17,26 +17,47 @@ namespace Avalonia.Media
         public static readonly StyledProperty<Transform> TransformProperty =
             AvaloniaProperty.Register<Geometry, Transform>(nameof(Transform));
 
-        /// <summary>
-        /// Initializes static members of the <see cref="Geometry"/> class.
-        /// </summary>
+        private bool _isDirty = true;
+        private IGeometryImpl _platformImpl;
+
         static Geometry()
         {
             TransformProperty.Changed.AddClassHandler<Geometry>(x => x.TransformChanged);
         }
 
+        /// <summary>
+        /// Raised when the geometry changes.
+        /// </summary>
+        public event EventHandler Changed;
+
         /// <summary>
         /// Gets the geometry's bounding rectangle.
         /// </summary>
-        public Rect Bounds => PlatformImpl.Bounds;
+        public Rect Bounds => PlatformImpl?.Bounds ?? Rect.Empty;
 
         /// <summary>
         /// Gets the platform-specific implementation of the geometry.
         /// </summary>
-        public virtual IGeometryImpl PlatformImpl
+        public IGeometryImpl PlatformImpl
         {
-            get;
-            protected set;
+            get
+            {
+                if (_isDirty)
+                {
+                    var geometry = CreateDefiningGeometry();
+                    var transform = Transform;
+
+                    if (geometry != null && transform != null && transform.Value != Matrix.Identity)
+                    {
+                        geometry = geometry.WithTransform(transform.Value);
+                    }
+
+                    _platformImpl = geometry;
+                    _isDirty = false;
+                }
+
+                return _platformImpl;
+            }
         }
 
         /// <summary>
@@ -55,14 +76,11 @@ namespace Avalonia.Media
         public abstract Geometry Clone();
 
         /// <summary>
-        /// Gets the geometry's bounding rectangle with the specified stroke thickness.
+        /// Gets the geometry's bounding rectangle with the specified pen.
         /// </summary>
-        /// <param name="strokeThickness">The stroke thickness.</param>
+        /// <param name="pen">The stroke thickness.</param>
         /// <returns>The bounding rectangle.</returns>
-        public Rect GetRenderBounds(double strokeThickness)
-        {
-            return PlatformImpl.GetRenderBounds(strokeThickness);
-        }
+        public Rect GetRenderBounds(Pen pen) => PlatformImpl?.GetRenderBounds(pen) ?? Rect.Empty;
 
         /// <summary>
         /// Indicates whether the geometry's fill contains the specified point.
@@ -71,7 +89,7 @@ namespace Avalonia.Media
         /// <returns><c>true</c> if the geometry contains the point; otherwise, <c>false</c>.</returns>
         public bool FillContains(Point point)
         {
-            return PlatformImpl.FillContains(point);
+            return PlatformImpl?.FillContains(point) ?? false;
         }
 
         /// <summary>
@@ -82,13 +100,87 @@ namespace Avalonia.Media
         /// <returns><c>true</c> if the geometry contains the point; otherwise, <c>false</c>.</returns>
         public bool StrokeContains(Pen pen, Point point)
         {
-            return PlatformImpl.StrokeContains(pen, point);
+            return PlatformImpl?.StrokeContains(pen, point) ?? false;
+        }
+
+        /// <summary>
+        /// Marks a property as affecting the geometry's <see cref="PlatformImpl"/>.
+        /// </summary>
+        /// <param name="properties">The properties.</param>
+        /// <remarks>
+        /// After a call to this method in a control's static constructor, any change to the
+        /// property will cause <see cref="InvalidateGeometry"/> to be called on the element.
+        /// </remarks>
+        protected static void AffectsGeometry(params AvaloniaProperty[] properties)
+        {
+            foreach (var property in properties)
+            {
+                property.Changed.Subscribe(AffectsGeometryInvalidate);
+            }
+        }
+
+        /// <summary>
+        /// Creates the platform implementation of the geometry, without the transform applied.
+        /// </summary>
+        /// <returns></returns>
+        protected abstract IGeometryImpl CreateDefiningGeometry();
+
+        /// <summary>
+        /// Invalidates the platform implementation of the geometry.
+        /// </summary>
+        protected void InvalidateGeometry()
+        {
+            _isDirty = true;
+            _platformImpl?.Dispose();
+            _platformImpl = null;
+            Changed?.Invoke(this, EventArgs.Empty);
         }
 
         private void TransformChanged(AvaloniaPropertyChangedEventArgs e)
         {
-            var transform = (Transform)e.NewValue;
-            PlatformImpl = PlatformImpl.WithTransform(transform.Value);
+            var oldValue = (Transform)e.OldValue;
+            var newValue = (Transform)e.NewValue;
+
+            if (oldValue != null)
+            {
+                oldValue.Changed -= TransformChanged;
+            }
+
+            if (newValue != null)
+            {
+                newValue.Changed += TransformChanged;
+            }
+
+            TransformChanged(newValue, EventArgs.Empty);
+        }
+
+        private void TransformChanged(object sender, EventArgs e)
+        {
+            var transform = ((Transform)sender)?.Value;
+
+            if (_platformImpl is ITransformedGeometryImpl t)
+            {
+                if (transform == null || transform == Matrix.Identity)
+                {
+                    _platformImpl = t.SourceGeometry;
+                }
+                else if (transform != t.Transform)
+                {
+                    _platformImpl = t.SourceGeometry.WithTransform(transform.Value);
+                }
+            }
+            else if (_platformImpl != null && transform != null && transform != Matrix.Identity)
+            {
+                _platformImpl = PlatformImpl.WithTransform(transform.Value);
+            }
+
+            Changed?.Invoke(this, EventArgs.Empty);
+        }
+
+        private static void AffectsGeometryInvalidate(AvaloniaPropertyChangedEventArgs e)
+        {
+            var control = e.Sender as Geometry;
+            control?.InvalidateGeometry();
         }
     }
 }
diff --git a/src/Avalonia.Visuals/Media/GeometryDrawing.cs b/src/Avalonia.Visuals/Media/GeometryDrawing.cs
index e67e853a84..a26a5341c8 100644
--- a/src/Avalonia.Visuals/Media/GeometryDrawing.cs
+++ b/src/Avalonia.Visuals/Media/GeometryDrawing.cs
@@ -37,7 +37,8 @@
         public override Rect GetBounds()
         {
             // adding the Pen's stroke thickness here could yield wrong results due to transforms
-            return Geometry?.GetRenderBounds(0) ?? new Rect();
+            var pen = new Pen(Brushes.Black, 0);
+            return Geometry?.GetRenderBounds(pen) ?? new Rect();
         }
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Media/LineGeometry.cs b/src/Avalonia.Visuals/Media/LineGeometry.cs
index 0952d9644f..f7ba4ccb0e 100644
--- a/src/Avalonia.Visuals/Media/LineGeometry.cs
+++ b/src/Avalonia.Visuals/Media/LineGeometry.cs
@@ -16,29 +16,15 @@ namespace Avalonia.Media
         public static readonly StyledProperty<Point> StartPointProperty =
             AvaloniaProperty.Register<LineGeometry, Point>(nameof(StartPoint));
 
-        public Point StartPoint
-        {
-            get => GetValue(StartPointProperty);
-            set => SetValue(StartPointProperty, value);
-        }
-
         /// <summary>
         /// Defines the <see cref="EndPoint"/> property.
         /// </summary>
         public static readonly StyledProperty<Point> EndPointProperty =
             AvaloniaProperty.Register<LineGeometry, Point>(nameof(EndPoint));
-        private bool _isDirty = true;
-
-        public Point EndPoint
-        {
-            get => GetValue(EndPointProperty);
-            set => SetValue(EndPointProperty, value);
-        }
 
         static LineGeometry()
         {
-            StartPointProperty.Changed.AddClassHandler<LineGeometry>(x => x.PointsChanged);
-            EndPointProperty.Changed.AddClassHandler<LineGeometry>(x => x.PointsChanged);
+            AffectsGeometry(StartPointProperty, EndPointProperty);
         }
 
         /// <summary>
@@ -46,8 +32,6 @@ namespace Avalonia.Media
         /// </summary>
         public LineGeometry()
         {
-            IPlatformRenderInterface factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
-            PlatformImpl = factory.CreateStreamGeometry();
         }
 
         /// <summary>
@@ -61,38 +45,44 @@ namespace Avalonia.Media
             EndPoint = endPoint;
         }
 
-        public override IGeometryImpl PlatformImpl
+        /// <summary>
+        /// Gets or sets the start point of the line.
+        /// </summary>
+        public Point StartPoint
         {
-            get
-            {
-                PrepareIfNeeded();
-                return base.PlatformImpl;
-            }
-            protected set => base.PlatformImpl = value;
+            get => GetValue(StartPointProperty);
+            set => SetValue(StartPointProperty, value);
         }
 
-        public void PrepareIfNeeded()
+        /// <summary>
+        /// Gets or sets the end point of the line.
+        /// </summary>
+        public Point EndPoint
         {
-            if (_isDirty)
-            {
-                _isDirty = false;
-
-                using (var context = ((IStreamGeometryImpl)PlatformImpl).Open())
-                {
-                    context.BeginFigure(StartPoint, false);
-                    context.LineTo(EndPoint);
-                    context.EndFigure(false);
-                }
-            }
+            get => GetValue(EndPointProperty);
+            set => SetValue(EndPointProperty, value);
         }
 
         /// <inheritdoc/>
         public override Geometry Clone()
         {
-            PrepareIfNeeded();
             return new LineGeometry(StartPoint, EndPoint);
         }
 
-        private void PointsChanged(AvaloniaPropertyChangedEventArgs e) => _isDirty = true;
+        /// <inheritdoc/>
+        protected override IGeometryImpl CreateDefiningGeometry()
+        {
+            var factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
+            var geometry = factory.CreateStreamGeometry();
+
+            using (var context = geometry.Open())
+            {
+                context.BeginFigure(StartPoint, false);
+                context.LineTo(EndPoint);
+                context.EndFigure(false);
+            }
+
+            return geometry;
+        }
     }
 }
diff --git a/src/Avalonia.Visuals/Media/PathGeometry.cs b/src/Avalonia.Visuals/Media/PathGeometry.cs
index df3dd47c8a..3e27d8a461 100644
--- a/src/Avalonia.Visuals/Media/PathGeometry.cs
+++ b/src/Avalonia.Visuals/Media/PathGeometry.cs
@@ -1,10 +1,10 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using System;
 using Avalonia.Collections;
 using Avalonia.Metadata;
 using Avalonia.Platform;
-using System;
 
 namespace Avalonia.Media
 {
@@ -22,12 +22,14 @@ namespace Avalonia.Media
         public static readonly StyledProperty<FillRule> FillRuleProperty =
                                  AvaloniaProperty.Register<PathGeometry, FillRule>(nameof(FillRule));
 
+        private PathFigures _figures;
+        private IDisposable _figuresObserver = null;
+        private IDisposable _figuresPropertiesObserver = null;
+
         static PathGeometry()
         {
-            FiguresProperty.Changed.Subscribe(onNext: v =>
-            {
-                (v.Sender as PathGeometry)?.OnFiguresChanged(v.OldValue as PathFigures, v.NewValue as PathFigures);
-            });
+            FiguresProperty.Changed.AddClassHandler<PathGeometry>((s, e) => 
+                s.OnFiguresChanged(e.NewValue as PathFigures));
         }
 
         /// <summary>
@@ -63,61 +65,33 @@ namespace Avalonia.Media
             set { SetValue(FillRuleProperty, value); }
         }
 
-        public override IGeometryImpl PlatformImpl
+        protected override IGeometryImpl CreateDefiningGeometry()
         {
-            get
-            {
-                PrepareIfNeeded();
-                return base.PlatformImpl;
-            }
+            var factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
+            var geometry = factory.CreateStreamGeometry();
 
-            protected set
+            using (var ctx = new StreamGeometryContext(geometry.Open()))
             {
-                base.PlatformImpl = value;
-            }
-        }
-
-        public override Geometry Clone()
-        {
-            PrepareIfNeeded();
-
-            return base.Clone();
-        }
-
-        public void PrepareIfNeeded()
-        {
-            if (_isDirty)
-            {
-                _isDirty = false;
-
-                using (var ctx = Open())
+                ctx.SetFillRule(FillRule);
+                foreach (var f in Figures)
                 {
-                    ctx.SetFillRule(FillRule);
-                    foreach (var f in Figures)
-                    {
-                        f.ApplyTo(ctx);
-                    }
+                    f.ApplyTo(ctx);
                 }
             }
-        }
 
-        internal void NotifyChanged()
-        {
-            _isDirty = true;
+            return geometry;
         }
 
-        private PathFigures _figures;
-        private IDisposable _figuresObserver = null;
-        private IDisposable _figuresPropertiesObserver = null;
-        private bool _isDirty = true;
-
-        private void OnFiguresChanged(PathFigures oldValue, PathFigures newValue)
+        private void OnFiguresChanged(PathFigures figures)
         {
             _figuresObserver?.Dispose();
             _figuresPropertiesObserver?.Dispose();
 
-            _figuresObserver = newValue?.ForEachItem(f => NotifyChanged(), f => NotifyChanged(), () => NotifyChanged());
-            _figuresPropertiesObserver = newValue?.TrackItemPropertyChanged(t => NotifyChanged());
+            _figuresObserver = figures?.ForEachItem(
+                _ => InvalidateGeometry(),
+                _ => InvalidateGeometry(),
+                () => InvalidateGeometry());
+            _figuresPropertiesObserver = figures?.TrackItemPropertyChanged(_ => InvalidateGeometry());
         }
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Media/PolylineGeometry.cs b/src/Avalonia.Visuals/Media/PolylineGeometry.cs
index b23bb88729..06dbcccf3e 100644
--- a/src/Avalonia.Visuals/Media/PolylineGeometry.cs
+++ b/src/Avalonia.Visuals/Media/PolylineGeometry.cs
@@ -27,14 +27,12 @@ namespace Avalonia.Media
             AvaloniaProperty.Register<PolylineGeometry, bool>(nameof(IsFilled));
 
         private Points _points;
-        private bool _isDirty = true;
         private IDisposable _pointsObserver;
 
         static PolylineGeometry()
         {
-            PointsProperty.Changed.AddClassHandler<PolylineGeometry>((s, e) =>
-                s.OnPointsChanged(e.OldValue as Points, e.NewValue as Points));
-            IsFilledProperty.Changed.AddClassHandler<PolylineGeometry>((s, _) => s.NotifyChanged());
+            AffectsGeometry(IsFilledProperty);
+            PointsProperty.Changed.AddClassHandler<PolylineGeometry>((s, e) => s.OnPointsChanged(e.NewValue as Points));
         }
 
         /// <summary>
@@ -42,9 +40,6 @@ namespace Avalonia.Media
         /// </summary>
         public PolylineGeometry()
         {
-            IPlatformRenderInterface factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
-            PlatformImpl = factory.CreateStreamGeometry();
-
             Points = new Points();
         }
 
@@ -57,29 +52,6 @@ namespace Avalonia.Media
             IsFilled = isFilled;
         }
 
-        public void PrepareIfNeeded()
-        {
-            if (_isDirty)
-            {
-                _isDirty = false;
-
-                using (var context = ((IStreamGeometryImpl)PlatformImpl).Open())
-                {
-                    var points = Points;
-                    var isFilled = IsFilled;
-                    if (points.Count > 0)
-                    {
-                        context.BeginFigure(points[0], isFilled);
-                        for (int i = 1; i < points.Count; i++)
-                        {
-                            context.LineTo(points[i]);
-                        }
-                        context.EndFigure(isFilled);
-                    }
-                }
-            }
-        }
-
         /// <summary>
         /// Gets or sets the figures.
         /// </summary>
@@ -99,33 +71,42 @@ namespace Avalonia.Media
             set => SetValue(IsFilledProperty, value);
         }
 
-        public override IGeometryImpl PlatformImpl
-        {
-            get
-            {
-                PrepareIfNeeded();
-                return base.PlatformImpl;
-            }
-            protected set => base.PlatformImpl = value;
-        }
-
         /// <inheritdoc/>
         public override Geometry Clone()
         {
-            PrepareIfNeeded();
             return new PolylineGeometry(Points, IsFilled);
         }
 
-        private void OnPointsChanged(Points oldValue, Points newValue)
+        protected override IGeometryImpl CreateDefiningGeometry()
         {
-            _pointsObserver?.Dispose();
+            var factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
+            var geometry = factory.CreateStreamGeometry();
+
+            using (var context = geometry.Open())
+            {
+                var points = Points;
+                var isFilled = IsFilled;
+                if (points.Count > 0)
+                {
+                    context.BeginFigure(points[0], isFilled);
+                    for (int i = 1; i < points.Count; i++)
+                    {
+                        context.LineTo(points[i]);
+                    }
+                    context.EndFigure(isFilled);
+                }
+            }
 
-            _pointsObserver = newValue?.ForEachItem(f => NotifyChanged(), f => NotifyChanged(), () => NotifyChanged());
+            return geometry;
         }
 
-        internal void NotifyChanged()
+        private void OnPointsChanged(Points newValue)
         {
-            _isDirty = true;
+            _pointsObserver?.Dispose();
+            _pointsObserver = newValue?.ForEachItem(
+                _ => InvalidateGeometry(),
+                _ => InvalidateGeometry(),
+                InvalidateGeometry);
         }
     }
 }
diff --git a/src/Avalonia.Visuals/Media/RectangleGeometry.cs b/src/Avalonia.Visuals/Media/RectangleGeometry.cs
index 1aa449d9e1..fd1e8ac859 100644
--- a/src/Avalonia.Visuals/Media/RectangleGeometry.cs
+++ b/src/Avalonia.Visuals/Media/RectangleGeometry.cs
@@ -16,6 +16,8 @@ namespace Avalonia.Media
         public static readonly StyledProperty<Rect> RectProperty =
             AvaloniaProperty.Register<RectangleGeometry, Rect>(nameof(Rect));
 
+        bool _isDirty = true;
+
         public Rect Rect
         {
             get => GetValue(RectProperty);
@@ -24,7 +26,7 @@ namespace Avalonia.Media
 
         static RectangleGeometry()
         {
-            RectProperty.Changed.AddClassHandler<RectangleGeometry>(x => x.RectChanged);
+            AffectsGeometry(RectProperty);
         }
 
         /// <summary>
@@ -32,36 +34,36 @@ namespace Avalonia.Media
         /// </summary>
         public RectangleGeometry()
         {
-            IPlatformRenderInterface factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
-            PlatformImpl = factory.CreateStreamGeometry();
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RectangleGeometry"/> class.
         /// </summary>
         /// <param name="rect">The rectangle bounds.</param>
-        public RectangleGeometry(Rect rect) : this()
+        public RectangleGeometry(Rect rect)
         {
             Rect = rect;
         }
 
         /// <inheritdoc/>
-        public override Geometry Clone()
-        {
-            return new RectangleGeometry(Rect);
-        }
+        public override Geometry Clone() => new RectangleGeometry(Rect);
 
-        private void RectChanged(AvaloniaPropertyChangedEventArgs e)
+        protected override IGeometryImpl CreateDefiningGeometry()
         {
-            var rect = (Rect)e.NewValue;
-            using (var context = ((IStreamGeometryImpl)PlatformImpl).Open())
+            var factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
+            var geometry = factory.CreateStreamGeometry();
+
+            using (var context = geometry.Open())
             {
+                var rect = Rect;
                 context.BeginFigure(rect.TopLeft, true);
                 context.LineTo(rect.TopRight);
                 context.LineTo(rect.BottomRight);
                 context.LineTo(rect.BottomLeft);
                 context.EndFigure(true);
             }
+
+            return geometry;
         }
     }
 }
diff --git a/src/Avalonia.Visuals/Media/StreamGeometry.cs b/src/Avalonia.Visuals/Media/StreamGeometry.cs
index a1f62b172d..9c29c62bad 100644
--- a/src/Avalonia.Visuals/Media/StreamGeometry.cs
+++ b/src/Avalonia.Visuals/Media/StreamGeometry.cs
@@ -10,22 +10,22 @@ namespace Avalonia.Media
     /// </summary>
     public class StreamGeometry : Geometry
     {
+        IStreamGeometryImpl _impl;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="StreamGeometry"/> class.
         /// </summary>
         public StreamGeometry()
         {
-            IPlatformRenderInterface factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
-            PlatformImpl = factory.CreateStreamGeometry();
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="StreamGeometry"/> class.
         /// </summary>
         /// <param name="impl">The platform-specific implementation.</param>
-        private StreamGeometry(IGeometryImpl impl)
+        private StreamGeometry(IStreamGeometryImpl impl)
         {
-            PlatformImpl = impl;
+            _impl = impl;
         }
 
         /// <summary>
@@ -61,5 +61,17 @@ namespace Avalonia.Media
         {
             return new StreamGeometryContext(((IStreamGeometryImpl)PlatformImpl).Open());
         }
+
+        /// <inheritdoc/>
+        protected override IGeometryImpl CreateDefiningGeometry()
+        {
+            if (_impl == null)
+            {
+                var factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
+                _impl = factory.CreateStreamGeometry();
+            }
+
+            return _impl;
+        }
     }
 }
diff --git a/src/Avalonia.Visuals/Platform/IGeometryImpl.cs b/src/Avalonia.Visuals/Platform/IGeometryImpl.cs
index 132e00e56b..fb813a5981 100644
--- a/src/Avalonia.Visuals/Platform/IGeometryImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IGeometryImpl.cs
@@ -1,14 +1,15 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using System;
 using Avalonia.Media;
 
 namespace Avalonia.Platform
 {
     /// <summary>
-    /// Defines the platform-specific interface for <see cref="Avalonia.Media.Geometry"/>.
+    /// Defines the platform-specific interface for a <see cref="Geometry"/>.
     /// </summary>
-    public interface IGeometryImpl
+    public interface IGeometryImpl : IDisposable
     {
         /// <summary>
         /// Gets the geometry's bounding rectangle.
@@ -16,16 +17,11 @@ namespace Avalonia.Platform
         Rect Bounds { get; }
 
         /// <summary>
-        /// Gets the transform to applied to the geometry.
+        /// Gets the geometry's bounding rectangle with the specified pen.
         /// </summary>
-        Matrix Transform { get; }
-
-        /// <summary>
-        /// Gets the geometry's bounding rectangle with the specified stroke thickness.
-        /// </summary>
-        /// <param name="strokeThickness">The stroke thickness.</param>
+        /// <param name="pen">The pen to use. May be null.</param>
         /// <returns>The bounding rectangle.</returns>
-        Rect GetRenderBounds(double strokeThickness);
+        Rect GetRenderBounds(Pen pen);
 
         /// <summary>
         /// Indicates whether the geometry's fill contains the specified point.
@@ -54,6 +50,6 @@ namespace Avalonia.Platform
         /// </summary>
         /// <param name="transform">The transform.</param>
         /// <returns>The cloned geometry.</returns>
-        IGeometryImpl WithTransform(Matrix transform);
+        ITransformedGeometryImpl WithTransform(Matrix transform);
     }
 }
diff --git a/src/Avalonia.Visuals/Platform/ITransformedGeometryImpl.cs b/src/Avalonia.Visuals/Platform/ITransformedGeometryImpl.cs
new file mode 100644
index 0000000000..ca68005906
--- /dev/null
+++ b/src/Avalonia.Visuals/Platform/ITransformedGeometryImpl.cs
@@ -0,0 +1,24 @@
+using System;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Represents a geometry with a transform applied.
+    /// </summary>
+    /// <remarks>
+    /// An <see cref="ITransformedGeometryImpl"/> transforms a geometry without transforming its
+    /// stroke thickness.
+    /// </remarks>
+    public interface ITransformedGeometryImpl : IGeometryImpl
+    {
+        /// <summary>
+        /// Gets the source geometry that the <see cref="Transform"/> is applied to.
+        /// </summary>
+        IGeometryImpl SourceGeometry { get; }
+
+        /// <summary>
+        /// Gets the applied transform.
+        /// </summary>
+        Matrix Transform { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs
index 6310122183..7b79ebab4f 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs
@@ -28,7 +28,7 @@ namespace Avalonia.Rendering.SceneGraph
             Pen pen,
             IGeometryImpl geometry,
             IDictionary<IVisual, Scene> childScenes = null)
-            : base(geometry.GetRenderBounds(pen?.Thickness ?? 0), transform, null)
+            : base(geometry.GetRenderBounds(pen), transform, null)
         {
             Transform = transform;
             Brush = brush?.ToImmutable();
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index dd3ced1d89..4defec4c07 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -68,7 +68,7 @@ namespace Avalonia.Skia
 
         public void DrawGeometry(IBrush brush, Pen pen, IGeometryImpl geometry)
         {
-            var impl = (StreamGeometryImpl)geometry;
+            var impl = (GeometryImpl)geometry;
             var size = geometry.Bounds.Size;
 
             using (var fill = brush != null ? CreatePaint(brush, size) : default(PaintWrapper))
diff --git a/src/Skia/Avalonia.Skia/GeometryImpl.cs b/src/Skia/Avalonia.Skia/GeometryImpl.cs
new file mode 100644
index 0000000000..4ecd687777
--- /dev/null
+++ b/src/Skia/Avalonia.Skia/GeometryImpl.cs
@@ -0,0 +1,19 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Platform;
+using SkiaSharp;
+
+namespace Avalonia.Skia
+{
+    abstract class GeometryImpl : IGeometryImpl
+    {
+        public abstract Rect Bounds { get; }
+        public abstract SKPath EffectivePath { get; }
+        public abstract void Dispose();
+        public abstract bool FillContains(Point point);
+        public abstract Rect GetRenderBounds(Pen pen);
+        public abstract IGeometryImpl Intersect(IGeometryImpl geometry);
+        public abstract bool StrokeContains(Pen pen, Point point);
+        public abstract ITransformedGeometryImpl WithTransform(Matrix transform);
+    }
+}
diff --git a/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs b/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
index 9a0a1dc434..e8ab5fc6da 100644
--- a/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
+++ b/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
@@ -1,46 +1,35 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
 using Avalonia.Media;
 using Avalonia.Platform;
-using Avalonia.RenderHelpers;
 using SkiaSharp;
 
 namespace Avalonia.Skia
 {
-    class StreamGeometryImpl : IStreamGeometryImpl
+    class StreamGeometryImpl : GeometryImpl, IStreamGeometryImpl
     {
+        Rect _bounds;
         SKPath _path;
 
-        private Matrix _transform = Matrix.Identity;
+        public override SKPath EffectivePath => _path;
 
-        public SKPath EffectivePath => _path;
-
-        public Rect GetRenderBounds(double strokeThickness)
+        public override Rect GetRenderBounds(Pen pen)
         {
-            // TODO: Calculate properly.
-            return Bounds.TransformToAABB(Transform).Inflate(strokeThickness);
+            return GetRenderBounds(pen?.Thickness ?? 0);
         }
 
-        public Rect Bounds { get; private set; }
-
-        public Matrix Transform
-        {
-            get { return _transform; }
-        }
+        public override Rect Bounds => _bounds;
 
         public IStreamGeometryImpl Clone()
         {
             return new StreamGeometryImpl
             {
                 _path = _path?.Clone(),
-                _transform = Transform,
-                Bounds = Bounds
+                _bounds = Bounds
             };
         }
 
+        public override void Dispose() => _path.Dispose();
+
         public IStreamGeometryContextImpl Open()
         {
             _path = new SKPath();
@@ -49,41 +38,34 @@ namespace Avalonia.Skia
             return new StreamContext(this);
         }
 
-        public bool FillContains(Point point)
+        public override bool FillContains(Point point)
         {
             // TODO: Not supported by SkiaSharp yet, so use expanded Rect
             // return EffectivePath.Contains(point.X, point.Y);
             return GetRenderBounds(0).Contains(point);
         }
 
-        public bool StrokeContains(Pen pen, Point point)
+        public override bool StrokeContains(Pen pen, Point point)
         {
             // TODO: Not supported by SkiaSharp yet, so use expanded Rect
             // return EffectivePath.Contains(point.X, point.Y);
             return GetRenderBounds(0).Contains(point);
         }
 
-        public IGeometryImpl Intersect(IGeometryImpl geometry)
+        public override IGeometryImpl Intersect(IGeometryImpl geometry)
         {
             throw new NotImplementedException();
         }
 
-        public IGeometryImpl WithTransform(Matrix transform)
+        public override ITransformedGeometryImpl WithTransform(Matrix transform)
         {
-            var result = (StreamGeometryImpl)Clone();
-
-            if (result.Transform != Matrix.Identity)
-            {
-                result._path.Transform(result.Transform.Invert().ToSKMatrix());
-            }
-
-            if (transform != Matrix.Identity)
-            {
-                result._path.Transform(transform.ToSKMatrix());
-            }
+            return new TransformedGeometryImpl(this, transform);
+        }
 
-            result._transform = transform;
-            return result;
+        private Rect GetRenderBounds(double strokeThickness)
+        {
+            // TODO: Calculate properly.
+            return Bounds.Inflate(strokeThickness);
         }
 
         class StreamContext : IStreamGeometryContextImpl
@@ -102,7 +84,7 @@ namespace Avalonia.Skia
             {
                 SKRect rc;
                 _path.GetBounds(out rc);
-                _geometryImpl.Bounds = rc.ToAvaloniaRect();
+                _geometryImpl._bounds = rc.ToAvaloniaRect();
             }
 
             public void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
diff --git a/src/Skia/Avalonia.Skia/TransformedGeometryImpl.cs b/src/Skia/Avalonia.Skia/TransformedGeometryImpl.cs
new file mode 100644
index 0000000000..b89a7d2f2e
--- /dev/null
+++ b/src/Skia/Avalonia.Skia/TransformedGeometryImpl.cs
@@ -0,0 +1,63 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Platform;
+using SkiaSharp;
+
+namespace Avalonia.Skia
+{
+    class TransformedGeometryImpl : GeometryImpl, ITransformedGeometryImpl
+    {
+        public TransformedGeometryImpl(GeometryImpl source, Matrix transform)
+        {
+            SourceGeometry = source;
+            Transform = transform;
+            EffectivePath = source.EffectivePath.Clone();
+            EffectivePath.Transform(transform.ToSKMatrix());
+        }
+
+        public override SKPath EffectivePath { get; }
+
+        public IGeometryImpl SourceGeometry { get; }
+
+        public Matrix Transform { get; }
+
+        public override Rect Bounds => SourceGeometry.Bounds.TransformToAABB(Transform);
+
+        public override void Dispose()
+        {
+        }
+
+        public override bool FillContains(Point point)
+        {
+            // TODO: Not supported by SkiaSharp yet, so use expanded Rect
+            return GetRenderBounds(0).Contains(point);
+        }
+
+        public override Rect GetRenderBounds(Pen pen)
+        {
+            return GetRenderBounds(pen.Thickness);
+        }
+
+        public override IGeometryImpl Intersect(IGeometryImpl geometry)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override bool StrokeContains(Pen pen, Point point)
+        {
+            // TODO: Not supported by SkiaSharp yet, so use expanded Rect
+            return GetRenderBounds(0).Contains(point);
+        }
+
+        public override ITransformedGeometryImpl WithTransform(Matrix transform)
+        {
+            return new TransformedGeometryImpl(this, transform);
+        }
+
+        public Rect GetRenderBounds(double strokeThickness)
+        {
+            // TODO: Calculate properly.
+            return Bounds.Inflate(strokeThickness);
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
index b1bfdcbfeb..04303130e5 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
@@ -188,7 +188,7 @@ namespace Avalonia.Direct2D1.Media
 
             if (pen != null)
             {
-                using (var d2dBrush = CreateBrush(pen.Brush, geometry.GetRenderBounds(pen.Thickness).Size))
+                using (var d2dBrush = CreateBrush(pen.Brush, geometry.GetRenderBounds(pen).Size))
                 using (var d2dStroke = pen.ToDirect2DStrokeStyle(_renderTarget))
                 {
                     if (d2dBrush.PlatformBrush != null)
diff --git a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
index 8bb901a1e4..5de0218cce 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
@@ -23,13 +23,13 @@ namespace Avalonia.Direct2D1.Media
         /// <inheritdoc/>
         public Geometry Geometry { get; }
 
-        /// <inheritdoc/>
-        public virtual Matrix Transform => Matrix.Identity;
+        public void Dispose() => Geometry.Dispose();
 
         /// <inheritdoc/>
-        public Rect GetRenderBounds(double strokeThickness)
+        public Rect GetRenderBounds(Avalonia.Media.Pen pen)
         {
-            return Geometry.GetWidenedBounds((float)strokeThickness).ToAvalonia();
+            var factory = AvaloniaLocator.Current.GetService<Factory>();
+            return Geometry.GetWidenedBounds((float)pen.Thickness).ToAvalonia();
         }
 
         /// <inheritdoc/>
@@ -56,15 +56,15 @@ namespace Avalonia.Direct2D1.Media
             return Geometry.StrokeContainsPoint(point.ToSharpDX(), (float)pen.Thickness);
         }
 
-        /// <inheritdoc/>
-        public IGeometryImpl WithTransform(Matrix transform)
+        public ITransformedGeometryImpl WithTransform(Matrix transform)
         {
             var factory = AvaloniaLocator.Current.GetService<Factory>();
             return new TransformedGeometryImpl(
                 new TransformedGeometry(
                     factory,
                     GetSourceGeometry(),
-                    transform.ToDirect2D()));
+                    transform.ToDirect2D()),
+                this);
         }
 
         protected virtual Geometry GetSourceGeometry() => Geometry;
diff --git a/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs
index 4043e180dc..e0e9e340bb 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs
@@ -1,23 +1,27 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
 {
-    public class TransformedGeometryImpl : GeometryImpl
+    public class TransformedGeometryImpl : GeometryImpl, ITransformedGeometryImpl
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StreamGeometryImpl"/> class.
         /// </summary>
         /// <param name="geometry">An existing Direct2D <see cref="TransformedGeometry"/>.</param>
-        public TransformedGeometryImpl(TransformedGeometry geometry)
+        public TransformedGeometryImpl(TransformedGeometry geometry, GeometryImpl source)
             : base(geometry)
         {
+            SourceGeometry = source;
         }
 
+        public IGeometryImpl SourceGeometry { get; }
+
         /// <inheritdoc/>
-        public override Matrix Transform => ((TransformedGeometry)Geometry).Transform.ToAvalonia();
+        public Matrix Transform => ((TransformedGeometry)Geometry).Transform.ToAvalonia();
 
         protected override Geometry GetSourceGeometry() => ((TransformedGeometry)Geometry).SourceGeometry;
     }
diff --git a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
index 118b6deb97..c76a5b5da5 100644
--- a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
+++ b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
@@ -105,7 +105,18 @@ namespace Avalonia.Direct2D1
         /// <param name="pen">The pen to convert.</param>
         /// <param name="target">The render target.</param>
         /// <returns>The Direct2D brush.</returns>
-        public static StrokeStyle ToDirect2DStrokeStyle(this Avalonia.Media.Pen pen, SharpDX.Direct2D1.RenderTarget target)
+        public static StrokeStyle ToDirect2DStrokeStyle(this Avalonia.Media.Pen pen, SharpDX.Direct2D1.RenderTarget renderTarget)
+        {
+            return pen.ToDirect2DStrokeStyle(renderTarget.Factory);
+        }
+
+        /// <summary>
+        /// Converts a pen to a Direct2D stroke style.
+        /// </summary>
+        /// <param name="pen">The pen to convert.</param>
+        /// <param name="target">The render target.</param>
+        /// <returns>The Direct2D brush.</returns>
+        public static StrokeStyle ToDirect2DStrokeStyle(this Avalonia.Media.Pen pen, Factory factory)
         {
             var properties = new StrokeStyleProperties
             {
@@ -123,7 +134,7 @@ namespace Avalonia.Direct2D1
                 properties.DashOffset = (float)pen.DashStyle.Offset;
                 dashes = pen.DashStyle?.Dashes.Select(x => (float)x).ToArray();
             }
-            return new StrokeStyle(target.Factory, properties, dashes);
+            return new StrokeStyle(factory, properties, dashes);
         }
 
         /// <summary>
diff --git a/tests/Avalonia.Direct2D1.UnitTests/Media/GeometryTests.cs b/tests/Avalonia.Direct2D1.UnitTests/Media/GeometryTests.cs
index 4b8933b0f8..963c75078b 100644
--- a/tests/Avalonia.Direct2D1.UnitTests/Media/GeometryTests.cs
+++ b/tests/Avalonia.Direct2D1.UnitTests/Media/GeometryTests.cs
@@ -31,8 +31,9 @@ namespace Avalonia.Direct2D1.UnitTests.Media
                 Direct2D1Platform.Initialize();
 
                 var target = StreamGeometry.Parse("M 0 2 L 4 6 L 0 10 Z");
+                var pen = new Pen(Brushes.Black, 2);
 
-                Assert.Equal(new Rect(-1, -0.414, 6.414, 12.828), target.GetRenderBounds(2), Compare);
+                Assert.Equal(new Rect(-1, -0.414, 6.414, 12.828), target.GetRenderBounds(pen), Compare);
             }
         }
     }
diff --git a/tests/Avalonia.UnitTests/MockStreamGeometryImpl.cs b/tests/Avalonia.UnitTests/MockStreamGeometryImpl.cs
index 4ef864d843..63da9ed3f0 100644
--- a/tests/Avalonia.UnitTests/MockStreamGeometryImpl.cs
+++ b/tests/Avalonia.UnitTests/MockStreamGeometryImpl.cs
@@ -5,7 +5,7 @@ using Avalonia.Platform;
 
 namespace Avalonia.UnitTests
 {
-    public class MockStreamGeometryImpl : IStreamGeometryImpl
+    public class MockStreamGeometryImpl : IStreamGeometryImpl, ITransformedGeometryImpl
     {
         private MockStreamGeometryContext _context;
 
@@ -27,6 +27,8 @@ namespace Avalonia.UnitTests
             _context = context;
         }
 
+        public IGeometryImpl SourceGeometry { get; }
+
         public Rect Bounds => _context.CalculateBounds();
 
         public Matrix Transform { get; }
@@ -36,6 +38,10 @@ namespace Avalonia.UnitTests
             return this;
         }
 
+        public void Dispose()
+        {
+        }
+
         public bool FillContains(Point point)
         {
             return _context.FillContains(point);
@@ -46,7 +52,7 @@ namespace Avalonia.UnitTests
             return false;
         }
 
-        public Rect GetRenderBounds(double strokeThickness) => Bounds;
+        public Rect GetRenderBounds(Pen pen) => Bounds;
 
         public IGeometryImpl Intersect(IGeometryImpl geometry)
         {
@@ -58,7 +64,7 @@ namespace Avalonia.UnitTests
             return _context;
         }
 
-        public IGeometryImpl WithTransform(Matrix transform)
+        public ITransformedGeometryImpl WithTransform(Matrix transform)
         {
             return new MockStreamGeometryImpl(transform, _context);
         }
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/GeometryTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/GeometryTests.cs
new file mode 100644
index 0000000000..3f7e353749
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/GeometryTests.cs
@@ -0,0 +1,126 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Visuals.UnitTests.Media
+{
+    public class GeometryTests
+    {
+        [Fact]
+        public void Changing_AffectsGeometry_Property_Causes_PlatformImpl_To_Be_Updated()
+        {
+            var target = new TestGeometry();
+            var platformImpl = target.PlatformImpl;
+
+            target.Foo = true;
+
+            Assert.NotSame(platformImpl, target.PlatformImpl);
+        }
+
+        [Fact]
+        public void Changing_AffectsGeometry_Property_Causes_Changed_To_Be_Raised()
+        {
+            var target = new TestGeometry();
+            var raised = false;
+
+            target.Changed += (s, e) => raised = true;
+            target.Foo = true;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Old_PlatformImpl_Is_Disposed_When_Updated()
+        {
+            var target = new TestGeometry();
+            var platformImpl = target.PlatformImpl;
+
+            target.Foo = true;
+
+            Mock.Get(platformImpl).Verify(x => x.Dispose());
+        }
+
+        [Fact]
+        public void Setting_Transform_Causes_Changed_To_Be_Raised()
+        {
+            var target = new TestGeometry();
+            var raised = false;
+
+            target.Changed += (s, e) => raised = true;
+            target.Transform = new RotateTransform(45);
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Changing_Transform_Causes_Changed_To_Be_Raised()
+        {
+            var transform = new RotateTransform(45);
+            var target = new TestGeometry { Transform = transform };
+            var raised = false;
+
+            target.Changed += (s, e) => raised = true;
+            transform.Angle = 90;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Removing_Transform_Causes_Changed_To_Be_Raised()
+        {
+            var transform = new RotateTransform(45);
+            var target = new TestGeometry { Transform = transform };
+            var raised = false;
+
+            target.Changed += (s, e) => raised = true;
+            target.Transform = null;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Transform_Produces_Transformed_PlatformImpl()
+        {
+            var target = new TestGeometry();
+            var rotate = new RotateTransform(45);
+
+            Assert.False(target.PlatformImpl is ITransformedGeometryImpl);
+            target.Transform = rotate;
+            Assert.True(target.PlatformImpl is ITransformedGeometryImpl);
+            rotate.Angle = 0;
+            Assert.False(target.PlatformImpl is ITransformedGeometryImpl);
+        }
+
+        private class TestGeometry : Geometry
+        {
+            public static readonly AvaloniaProperty<bool> FooProperty =
+                AvaloniaProperty.Register<TestGeometry, bool>(nameof(Foo));
+
+            static TestGeometry()
+            {
+                AffectsGeometry(FooProperty);
+            }
+
+            public bool Foo
+            {
+                get => GetValue(FooProperty);
+                set => SetValue(FooProperty, value);
+            }
+
+            public override Geometry Clone()
+            {
+                throw new NotImplementedException();
+            }
+
+            protected override IGeometryImpl CreateDefiningGeometry()
+            {
+                return Mock.Of<IGeometryImpl>(
+                    x => x.WithTransform(It.IsAny<Matrix>()) == 
+                        Mock.Of<ITransformedGeometryImpl>(y =>
+                            y.SourceGeometry == x));
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/RectangleGeometryTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/RectangleGeometryTests.cs
index 9f94e7fab4..5af1bb572e 100644
--- a/tests/Avalonia.Visuals.UnitTests/Media/RectangleGeometryTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Media/RectangleGeometryTests.cs
@@ -27,7 +27,7 @@ namespace Avalonia.Visuals.UnitTests.Media
         private TestServices GetServices()
         {
             var context = Mock.Of<IStreamGeometryContextImpl>();
-            var transformedGeometry = new Mock<IGeometryImpl>();
+            var transformedGeometry = new Mock<ITransformedGeometryImpl>();
             var streamGeometry = Mock.Of<IStreamGeometryImpl>(x => 
                 x.Open() == context &&
                 x.WithTransform(It.IsAny<Matrix>()) == transformedGeometry.Object);
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
index 5fcf1cf1f2..54bb5d72d0 100644
--- a/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
+++ b/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
@@ -65,22 +65,13 @@ namespace Avalonia.Visuals.UnitTests.VisualTree
                 }
             }
 
-            public Matrix Transform
+            public IStreamGeometryImpl Clone()
             {
-                get
-                {
-                    throw new NotImplementedException();
-                }
-
-                set
-                {
-                    throw new NotImplementedException();
-                }
+                return this;
             }
 
-            public IStreamGeometryImpl Clone()
+            public void Dispose()
             {
-                return this;
             }
 
             public bool FillContains(Point point)
@@ -88,7 +79,7 @@ namespace Avalonia.Visuals.UnitTests.VisualTree
                 return _impl.FillContains(point);
             }
 
-            public Rect GetRenderBounds(double strokeThickness)
+            public Rect GetRenderBounds(Pen pen)
             {
                 throw new NotImplementedException();
             }
@@ -108,7 +99,7 @@ namespace Avalonia.Visuals.UnitTests.VisualTree
                 throw new NotImplementedException();
             }
 
-            public IGeometryImpl WithTransform(Matrix transform)
+            public ITransformedGeometryImpl WithTransform(Matrix transform)
             {
                 throw new NotImplementedException();
             }

From 589b76e9cd0579a9a62c3cec773d565976b9e446 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 18 Jan 2018 23:30:26 +0100
Subject: [PATCH 270/482] Moved render tests for each platform to their own
 directory.

The test .cs files stay in the `Avalonia.RenderTests` directory but the D2D and Skia render test .csprojs are moved to their own directory: include the test files by using a glob in the .csproj.

This avoids the hack we were having to do to get `BaseIntermediateOutputPath` to work - we no longer have this problem as now each .csproj has its own directory, it can use the default directory for intermediate files.
---
 ...ia.Direct2D1.RenderTests.v3.ncrunchproject |   3 ++
 ...valonia.Skia.RenderTests.v3.ncrunchproject |   6 ++--
 Avalonia.sln                                  |  12 +++----
 .../Avalonia.Direct2D1.RenderTests.csproj     |  16 ++-------
 .../Properties/AssemblyInfo.cs                |   2 --
 tests/Avalonia.RenderTests/.gitignore         |   2 --
 .../Avalonia.RenderTests.projitems            |  33 ------------------
 .../Avalonia.RenderTests.shproj               |  16 ---------
 .../Controls/TextBlockTests.cs                |   5 +--
 .../Properties/AssemblyInfo.cs                |   2 --
 tests/Avalonia.RenderTests/TestBase.cs        |   2 +-
 .../Avalonia.Skia.RenderTests.csproj          |  20 ++---------
 .../Cairo/SVGPath/SVGPath.expected.png        | Bin 1041 -> 0 bytes
 .../TextBlock/Wrapping_NoWrap.expected.png    | Bin 0 -> 1206 bytes
 14 files changed, 20 insertions(+), 99 deletions(-)
 rename tests/{Avalonia.RenderTests => Avalonia.Direct2D1.RenderTests}/Avalonia.Direct2D1.RenderTests.csproj (69%)
 delete mode 100644 tests/Avalonia.RenderTests/.gitignore
 delete mode 100644 tests/Avalonia.RenderTests/Avalonia.RenderTests.projitems
 delete mode 100644 tests/Avalonia.RenderTests/Avalonia.RenderTests.shproj
 rename tests/{Avalonia.RenderTests => Avalonia.Skia.RenderTests}/Avalonia.Skia.RenderTests.csproj (69%)
 delete mode 100644 tests/TestFiles/Cairo/SVGPath/SVGPath.expected.png
 create mode 100644 tests/TestFiles/Skia/Controls/TextBlock/Wrapping_NoWrap.expected.png

diff --git a/.ncrunch/Avalonia.Direct2D1.RenderTests.v3.ncrunchproject b/.ncrunch/Avalonia.Direct2D1.RenderTests.v3.ncrunchproject
index 04ab17c4e1..2627a59093 100644
--- a/.ncrunch/Avalonia.Direct2D1.RenderTests.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Direct2D1.RenderTests.v3.ncrunchproject
@@ -1,5 +1,8 @@
 <ProjectConfiguration>
   <Settings>
+    <AdditionalFilesToIncludeForProject>
+      <Value>..\TestFiles\Direct2D1\**.*</Value>
+    </AdditionalFilesToIncludeForProject>
     <DefaultTestTimeout>3000</DefaultTestTimeout>
     <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
   </Settings>
diff --git a/.ncrunch/Avalonia.Skia.RenderTests.v3.ncrunchproject b/.ncrunch/Avalonia.Skia.RenderTests.v3.ncrunchproject
index a8c3abe8f2..7fe2430013 100644
--- a/.ncrunch/Avalonia.Skia.RenderTests.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Skia.RenderTests.v3.ncrunchproject
@@ -1,7 +1,9 @@
 <ProjectConfiguration>
   <Settings>
-    <DefaultTestTimeout>1000</DefaultTestTimeout>
-    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+    <AdditionalFilesToIncludeForProject>
+      <Value>..\TestFiles\Skia\**.*</Value>
+    </AdditionalFilesToIncludeForProject>
+    <DefaultTestTimeout>3000</DefaultTestTimeout>
     <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
   </Settings>
 </ProjectConfiguration>
\ No newline at end of file
diff --git a/Avalonia.sln b/Avalonia.sln
index a29f3dd754..679ef1579e 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27004.2008
+VisualStudioVersion = 15.0.27130.2024
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Base", "src\Avalonia.Base\Avalonia.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
 EndProject
@@ -45,11 +45,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Layout.UnitTests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Interactivity.UnitTests", "tests\Avalonia.Interactivity.UnitTests\Avalonia.Interactivity.UnitTests.csproj", "{08478EF5-44E8-42E9-92D6-15E00EC038D8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Direct2D1.RenderTests", "tests\Avalonia.RenderTests\Avalonia.Direct2D1.RenderTests.csproj", "{DABFD304-D6A4-4752-8123-C2CCF7AC7831}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Direct2D1.RenderTests", "tests\Avalonia.Direct2D1.RenderTests\Avalonia.Direct2D1.RenderTests.csproj", "{DABFD304-D6A4-4752-8123-C2CCF7AC7831}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Input.UnitTests", "tests\Avalonia.Input.UnitTests\Avalonia.Input.UnitTests.csproj", "{AC18926A-E784-40FE-B09D-BB0FE2B599F0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Direct2D1.UnitTests", "tests\Avalonia.Direct2D1.UnitTests\Avalonia.Direct2D1.UnitTests.csproj", "{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Direct2D1.UnitTests", "tests\Avalonia.Direct2D1.UnitTests\Avalonia.Direct2D1.UnitTests.csproj", "{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Markup.Xaml.UnitTests", "tests\Avalonia.Markup.Xaml.UnitTests\Avalonia.Markup.Xaml.UnitTests.csproj", "{99135EAB-653D-47E4-A378-C96E1278CA44}"
 EndProject
@@ -114,8 +114,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.DesignerSupport.Te
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.DesignerSupport.TestApp", "tests\Avalonia.DesignerSupport.TestApp\Avalonia.DesignerSupport.TestApp.csproj", "{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Avalonia.RenderTests", "tests\Avalonia.RenderTests\Avalonia.RenderTests.shproj", "{48840EDD-24BF-495D-911E-2EB12AE75D3B}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualizationTest", "samples\VirtualizationTest\VirtualizationTest.csproj", "{FBCAF3D0-2808-4934-8E96-3F607594517B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Interop", "Interop", "{A0CC0258-D18C-4AB3-854F-7101680FC3F9}"
@@ -176,7 +174,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Direct3DInteropSample", "sa
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Win32.Interop", "src\Windows\Avalonia.Win32.Interop\Avalonia.Win32.Interop.csproj", "{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Skia.RenderTests", "tests\Avalonia.RenderTests\Avalonia.Skia.RenderTests.csproj", "{E1582370-37B3-403C-917F-8209551B1634}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Skia.RenderTests", "tests\Avalonia.Skia.RenderTests\Avalonia.Skia.RenderTests.csproj", "{E1582370-37B3-403C-917F-8209551B1634}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Remote.Protocol", "src\Avalonia.Remote.Protocol\Avalonia.Remote.Protocol.csproj", "{D78A720C-C0C6-478B-8564-F167F9BDD01B}"
 EndProject
@@ -200,7 +198,6 @@ Global
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{3e908f67-5543-4879-a1dc-08eace79b3cd}*SharedItemsImports = 4
 		src\Windows\Avalonia.Win32\Avalonia.Win32.Shared.projitems*{40759a76-d0f2-464e-8000-6ff0f5c4bd7c}*SharedItemsImports = 4
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{4488ad85-1495-4809-9aa4-ddfe0a48527e}*SharedItemsImports = 4
-		tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{48840edd-24bf-495d-911e-2eb12ae75d3b}*SharedItemsImports = 13
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{4a1abb09-9047-4bd5-a4ad-a055e52c5ee0}*SharedItemsImports = 4
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{7863ea94-f0fb-4386-bf8c-e5bfa761560a}*SharedItemsImports = 4
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{7b92af71-6287-4693-9dcb-bd5b6e927e23}*SharedItemsImports = 4
@@ -2643,7 +2640,6 @@ Global
 		{57E0455D-D565-44BB-B069-EE1AA20F8337} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{52F55355-D120-42AC-8116-8410A7D602FA} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{48840EDD-24BF-495D-911E-2EB12AE75D3B} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{FBCAF3D0-2808-4934-8E96-3F607594517B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{A0CC0258-D18C-4AB3-854F-7101680FC3F9} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{C7A69145-60B6-4882-97D6-A3921DD43978} = {A0CC0258-D18C-4AB3-854F-7101680FC3F9}
diff --git a/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj b/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
similarity index 69%
rename from tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
rename to tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
index 6af8fd8963..42d99cc19a 100644
--- a/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
+++ b/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
@@ -1,19 +1,9 @@
-<Project>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>obj-Direct2D1</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
-    <OutputPath>bin\Direct2D\$(Configuration)</OutputPath>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
-    <DefineConstants>$(DefineConstants);AVALONIA_DIRECT2D</DefineConstants>
-    <OutputType>Library</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <EmbeddedResource Remove="obj\**" />
-    <None Remove="obj\**" />
+    <Compile Include="..\Avalonia.RenderTests\**\*.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.DotNetCoreRuntime\Avalonia.DotNetCoreRuntime.csproj" />
@@ -33,7 +23,5 @@
   <Import Project="..\..\build\Moq.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\XUnit.props" />
-  <Import Project="Avalonia.RenderTests.projitems" Label="Shared" />
   <Import Project="..\..\build\Magick.NET-Q16-AnyCPU.props" />
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
\ No newline at end of file
diff --git a/tests/Avalonia.Direct2D1.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Direct2D1.UnitTests/Properties/AssemblyInfo.cs
index a8edd50b31..a462e5b079 100644
--- a/tests/Avalonia.Direct2D1.UnitTests/Properties/AssemblyInfo.cs
+++ b/tests/Avalonia.Direct2D1.UnitTests/Properties/AssemblyInfo.cs
@@ -4,7 +4,5 @@
 using System.Reflection;
 using Xunit;
 
-[assembly: AssemblyTitle("Avalonia.Direct2D1.UnitTests")]
-
 // Don't run tests in parallel.
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/tests/Avalonia.RenderTests/.gitignore b/tests/Avalonia.RenderTests/.gitignore
deleted file mode 100644
index 76146e97c7..0000000000
--- a/tests/Avalonia.RenderTests/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-Skia/
-obj-Skia/*
\ No newline at end of file
diff --git a/tests/Avalonia.RenderTests/Avalonia.RenderTests.projitems b/tests/Avalonia.RenderTests/Avalonia.RenderTests.projitems
deleted file mode 100644
index ff729a6b48..0000000000
--- a/tests/Avalonia.RenderTests/Avalonia.RenderTests.projitems
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>48840edd-24bf-495d-911e-2eb12ae75d3b</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>Avalonia.RenderTests</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\CustomRenderTests.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)GeometryClippingTests.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Media\RadialGradientBrushTests.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Media\BitmapTests.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)OpacityMaskTests.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)SVGPathTests.cs" />
-    <Compile Include="Media\FormattedTextImplTests.cs" />
-    <Compile Include="Controls\ImageTests.cs" />
-    <Compile Include="Controls\BorderTests.cs" />
-    <Compile Include="Media\ImageBrushTests.cs" />
-    <Compile Include="Media\LinearGradientBrushTests.cs" />
-    <Compile Include="Media\VisualBrushTests.cs" />
-    <Compile Include="Shapes\LineTests.cs" />
-    <Compile Include="Shapes\PathTests.cs" />
-    <Compile Include="Shapes\EllipseTests.cs" />
-    <Compile Include="Shapes\PolygonTests.cs" />
-    <Compile Include="Shapes\PolylineTests.cs" />
-    <Compile Include="Shapes\RectangleTests.cs" />
-    <Compile Include="TestBase.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/tests/Avalonia.RenderTests/Avalonia.RenderTests.shproj b/tests/Avalonia.RenderTests/Avalonia.RenderTests.shproj
deleted file mode 100644
index e3bed80491..0000000000
--- a/tests/Avalonia.RenderTests/Avalonia.RenderTests.shproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>48840edd-24bf-495d-911e-2eb12ae75d3b</ProjectGuid>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <PropertyGroup />
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="Avalonia.RenderTests.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs b/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs
index a5d06a1b0e..80b850635d 100644
--- a/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs
@@ -1,6 +1,7 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Layout;
 using Avalonia.Media;
@@ -20,7 +21,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
         }
 
         [Fact]
-        public void Wrapping_NoWrap()
+        public async Task Wrapping_NoWrap()
         {
             Decorator target = new Decorator
             {
@@ -38,7 +39,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 }
             };
 
-            RenderToFile(target);
+            await RenderToFile(target);
             CompareImages();
         }
     }
diff --git a/tests/Avalonia.RenderTests/Properties/AssemblyInfo.cs b/tests/Avalonia.RenderTests/Properties/AssemblyInfo.cs
index d5ba64ac05..a462e5b079 100644
--- a/tests/Avalonia.RenderTests/Properties/AssemblyInfo.cs
+++ b/tests/Avalonia.RenderTests/Properties/AssemblyInfo.cs
@@ -4,7 +4,5 @@
 using System.Reflection;
 using Xunit;
 
-[assembly: AssemblyTitle("Avalonia.Direct2D1.RenderTests")]
-
 // Don't run tests in parallel.
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/tests/Avalonia.RenderTests/TestBase.cs b/tests/Avalonia.RenderTests/TestBase.cs
index cf38ef3818..ae359c5c5f 100644
--- a/tests/Avalonia.RenderTests/TestBase.cs
+++ b/tests/Avalonia.RenderTests/TestBase.cs
@@ -46,7 +46,7 @@ namespace Avalonia.Direct2D1.RenderTests
 
         public TestBase(string outputPath)
         {
-            var testFiles = Path.GetFullPath(@"..\..\..\..\..\TestFiles\");
+            var testFiles = Path.GetFullPath(@"..\..\..\..\TestFiles\");
 #if AVALONIA_SKIA
             var platform = "Skia";
 #else
diff --git a/tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj b/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
similarity index 69%
rename from tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj
rename to tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
index 370cfac6dd..4a297a340d 100644
--- a/tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj
+++ b/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
@@ -1,21 +1,10 @@
-<Project>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>obj-Skia</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
-    <OutputPath>bin\Skia\$(Configuration)</OutputPath>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
-    <DefineConstants>$(DefineConstants);AVALONIA_SKIA;AVALONIA_SKIA_SKIP_FAIL</DefineConstants>
-    <OutputType>Library</OutputType>
+    <DefineConstants>AVALONIA_SKIA;AVALONIA_SKIA_SKIP_FAIL</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <EmbeddedResource Remove="obj\**" />
-    <None Remove="obj\**" />
+    <Compile Include="..\Avalonia.RenderTests\**\*.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.DotNetCoreRuntime\Avalonia.DotNetCoreRuntime.csproj" />
@@ -35,9 +24,6 @@
   <Import Project="..\..\build\Moq.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\XUnit.props" />
-  <Import Project="Avalonia.RenderTests.projitems" Label="Shared" />
   <Import Project="..\..\build\Magick.NET-Q16-AnyCPU.props" />
   <Import Project="..\..\build\SkiaSharp.props" />
-  
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
\ No newline at end of file
diff --git a/tests/TestFiles/Cairo/SVGPath/SVGPath.expected.png b/tests/TestFiles/Cairo/SVGPath/SVGPath.expected.png
deleted file mode 100644
index 98300488100e4bb5bba799d456efa2cb4ba367e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1041
zcmeAS@N?(olHy`uVBq!ia0vp^J|N7&1|*M957Y)yEX7WqAsj$Z!;#X#z`%UM)5S5Q
zV$R!H4+|d|2(-$Zf0ws95Yhm|4l5X}8cGDT6l57hTS6LEDlB7~!u2NP!S9WW4;pSu
zR9_>r<8PYD<U$$Gy2!QnPUWRa8fk=oUjCBvj<lA9uxL*w*D)8?<V8(}fd^--Nbm_U
zP{Seos40@W=eWb_r^~-q9Y|9AZd3nsm)fyph0_gJxj2|!UTn}{n&!RWF59!>M#fD%
zGed5_oxpfvl1pCCrfpG*#%{~<FRDr&KajvsVl`>;9AOrdZ7j3C%<SMw<JoYZIaABB
zD?aMdd)3~BceCxjPyWIf)%V#l*Ua4Aicy_&)5VTS``@d5w0YF@^mb9_n)~}7K5?`z
z{J87(T-AAwciNwJCPyt|*bv7&`|SDOU-mLr-&Oryt-$m0`SWxI&xU^f2Ng?dg0J?u
z@6xZ=^;{wUo&Q7Yb`I}gt;s!#=JS@Rv=l#nUHbLD-}2|*T?7qeyv}Tq%NKmsv&8T~
z8F!D{mN|zeD6Q|SNwHeP`m46FGw#6bgg}>d@(lOx`!h*6^T$8Ex@KvZ+Kl&qSSw;C
z={>Y&oHy^qF2fLwe6y!NHTqtDPnA12ef{ajz8elV-m3HW*8IOAF`|Bx!OS`F-HSf2
z_}plI&~0(BT(Re!jdy>|I(q)2+Kt!QKTESuCdI5W?_F4|cl`PDX7`AR4?m<Bm+j87
zpSo<zl-+mVUtc?QULvcV_u{0NMzaG~nn;A)&*r%sY}3LrLAL+vU+*(}1rHt)xS3K^
zwZrOQKv7b)=Y;l^s*JbpF6xNc_qbq1`CH!~Yqj>w-=Qa#B0Ohp$D&_Wm+nqJerq!4
zx8Ca<+TD8DC(}aSE;=?r_T>AHUe%h4z71c0RhKYsk$LSWGbh1yR>98(_k(Meep;Rp
z^?1j>hq0DZ)w}*NAB>CBc>iSjw9~$&Y*+Sr{M4;Dop|&Flg2JR*^3s2pO<fKXa37P
z3mAl{fm4=Uk8Z1ZdF4s=ZnyX+WmX}=*B*YFE_|)?Y6zcj|At+EF2A0;@7+wl^NY_$
zZIX6msHqK%zn%N_=L~Tb?*%vCe0wi-JNMU(C3$ytuT^DC$<HtPYpyt>g73F)=>y%0
z6YI+_P5Cs3<x$hmZ4B3f8sEolx-+NR``7g?o0yMBn|?e$x69p_VQ#JNboJ+Q$4l1j
zza4u&KURKH`rk)(YqCDQTb=&B`0n1&JB#@B9tnoI3CywnQ#O10dn;L^&6T@ie{SC7
o#<DwI?oyZs5g7+5KYij~ygI{djdbNVU>;}iboFyt=akR{0Fs#U_y7O^

diff --git a/tests/TestFiles/Skia/Controls/TextBlock/Wrapping_NoWrap.expected.png b/tests/TestFiles/Skia/Controls/TextBlock/Wrapping_NoWrap.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..2296e02d68707f6276a8a875cb38fa99ad3309b5
GIT binary patch
literal 1206
zcmc&z>rdJT6vaAiYo|?@Ewh_W+c=G}K_@j<1R0CgQmeCF8^t2NWsV9~Xng>(wwvoC
z(G;DEI@qj*WfjS!VtEKI%LG(pTK6-Eh}kNL7K!C0D0JBU5&Lk?$vq!V?#;dTUVdJ7
zXvha4AP^`NbuROgUzPhf6zpeS;V{cDZ{d)+ND%1P_9J^`LH_!1-8nP~1Pc3o9{~#D
z&y{{NoSaoi{(@LdZYZm-0@an(5XfLc6*>AeI0>9~4bqb5&pD0CL|$&hT7U<&%V*yW
z%1>dOpTD1gN<fC7;>?rAQSvSBG5R|Zx<6TghPC>Zh_JK-M1VgV1cLp-*C8Hidb=0*
z{s98AGOh?U0*q%QbR<&db0x1vC7MvPYm2d(3O<HVy$hRu{5B)^749H4&Dwg*eZ}1{
zZOG9|1T@y#rC?R-4n8M#!6rho`rvVvB35O^DA-Gy$zAK__km4#1C=NrT*H~qjOQh%
z-kg`;MajlsuIEk*g8l<#<tA#A(e-gLH{HGNv1hdTZj)y!X;|}fS>!IeyMjNrZ5of@
z6>D^I7r7x4TD?04L-Vzs2%J2|#SlM{Hn(0?p}|!X;ImPMvy#>Lz6WeE_yS>|V{6cO
zfGh>Zz+Q?PPz!OYaNA>*Bc0G@^K3RTWEQr}cEa_Wi84hY)*u#3;fV9Y-iHn*b8}%(
zFKwB$xTzUwoMDpEEuCzBZKEtXq$G`NM&xxGC9xJ0#<T}e^7OFJC9_^Q)2a}k05DV0
zv_s?D{VooxPnt&@@b=o-sg3pnFP^1tIj=MA#qaZMg(g9PaFL^Zay9Dji&`wOy)~?v
znd>)-)s8})#!*zV(dnwnoo{H9xK1|gN$^Pue6@TCIc;i=iPA<BJ=fScQ76(kV5BgD
zly0b*sZB&jO=yFeM~!flVU}lx0q&RITSjY~8&2#ul0*e`Meksy^${Tow9Zr|5+G+c
zjLT4;KIIIB4$O#RMLw9kBbBzl{HbWtMaa%xV&;Z8A3ySGZFl7-#sT#osvcer+jVOB
z!ekH4bZ6@N><#M))_7g^jZF;1D78Ksvh2^W(hs<2Y@@VE%aIPz(+q=cM}n<^lnmMN
zdW=F#C(7{izI88}FJf^^_;YUI)+s(v`sS>Jk+QfB<&UI0c4;j`lq7&vsKr!bF+r+W
za8P5{3RFF$<xvB4vCCS_KMGci5@`8?t-k`FDVMBUo~KlfCg#KPE{({U^;NwZjo5Ye
z+C-Wb9v;2Km0Gi>g^Ap>W_q)?TEC-uscXVkwMhtfQ@Ww+?aJlt*9FNw{kI<dD+qwg
z#df79ZgbVnrmh@f@LnlU!a=(pCDV_u*b;o{FK|PeUiYR>-qqe|MGWf31el_O@3}8)
zGc@&P_17oa@j4TF^(Ra1{o{>aQu@k+KU!Mh^xXPRI2K?1pZ(_P{&xz4!)bvXLFJJX
S;fKrjyFq2;We$H<di!4%vPy{n

literal 0
HcmV?d00001


From 6a0b94554811129455977a83c4eaeb396a28e371 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 19 Jan 2018 22:55:48 +0100
Subject: [PATCH 271/482] Update cake script with new render test locations.

---
 build.cake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.cake b/build.cake
index 61fda13695..01aefff093 100644
--- a/build.cake
+++ b/build.cake
@@ -197,8 +197,8 @@ Task("Run-Render-Tests")
     .IsDependentOn("Build")
     .WithCriteria(() => !parameters.SkipTests && parameters.IsRunningOnWindows)
     .Does(() => {
-        RunCoreTest("./tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj", parameters, true);
-        RunCoreTest("./tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj", parameters, true);
+        RunCoreTest("./tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj", parameters, true);
+        RunCoreTest("./tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj", parameters, true);
     });
 
 Task("Run-Designer-Unit-Tests")

From 375e0f0a64e31f598c7c403bbcf83fac26854d0e Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 19 Jan 2018 23:26:02 +0100
Subject: [PATCH 272/482] WIP

---
 src/Avalonia.Controls/Primitives/AdornerLayer.cs | 16 +++++++++++++++-
 src/Avalonia.Themes.Default/FocusAdorner.xaml    |  2 +-
 .../Rendering/DeferredRenderer.cs                |  9 +++++++++
 .../VisualTree/TransformedBounds.cs              |  6 +++---
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
index d7862881fb..1a78493d8e 100644
--- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
@@ -55,12 +55,13 @@ namespace Avalonia.Controls.Primitives
 
             foreach (var child in Children)
             {
-                var info = (AdornedElementInfo)child.GetValue(s_adornedElementInfoProperty);
+                var info = child.GetValue(s_adornedElementInfoProperty);
 
                 if (info != null && info.Bounds.HasValue)
                 {
                     child.RenderTransform = new MatrixTransform(info.Bounds.Value.Transform);
                     child.RenderTransformOrigin = new RelativePoint(new Point(0,0), RelativeUnit.Absolute);
+                    UpdateClip(child, info.Bounds.Value);
                     child.Arrange(info.Bounds.Value.Bounds);
                 }
                 else
@@ -80,6 +81,19 @@ namespace Avalonia.Controls.Primitives
             layer?.UpdateAdornedElement(adorner, adorned);
         }
 
+        private void UpdateClip(IControl control, TransformedBounds bounds)
+        {
+            var clip = control.Clip as RectangleGeometry;
+
+            if (clip == null)
+            {
+                clip = new RectangleGeometry { Transform = new MatrixTransform() };
+                control.Clip = clip;
+            }
+
+            clip.Rect = bounds.Clip.TransformToAABB(-bounds.Transform);
+        }
+
         private void ChildrenCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
             switch (e.Action)
diff --git a/src/Avalonia.Themes.Default/FocusAdorner.xaml b/src/Avalonia.Themes.Default/FocusAdorner.xaml
index 573c43dc8d..3037f5763b 100644
--- a/src/Avalonia.Themes.Default/FocusAdorner.xaml
+++ b/src/Avalonia.Themes.Default/FocusAdorner.xaml
@@ -1,7 +1,7 @@
 <Style xmlns="https://github.com/avaloniaui" Selector=":is(Control)">
   <Setter Property="FocusAdorner">
     <FocusAdornerTemplate>
-      <Rectangle Stroke="Black"
+      <Rectangle Stroke="Black" Name="abcd"
                  StrokeThickness="1"
                  StrokeDashArray="1,2"/>
     </FocusAdornerTemplate>
diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index 041d8f8f6b..68a6aa5baf 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -243,6 +243,15 @@ namespace Avalonia.Rendering
             {
                 clipBounds = node.ClipBounds.Intersect(clipBounds);
 
+                var np = node.Visual.GetType().GetProperty("Name");
+                var name = (string)np.GetValue(node.Visual);
+
+                if (name == "abcd")
+                {
+                    var clip = (IStreamGeometryImpl)node.GeometryClip;
+                    System.Diagnostics.Debug.WriteLine(clip?.GetRenderBounds(new Pen(Brushes.Black, 1)).ToString() ?? "(null)");
+                }
+
                 if (!clipBounds.IsEmpty && node.Opacity > 0)
                 {
                     var isLayerRoot = node.Visual == layer;
diff --git a/src/Avalonia.Visuals/VisualTree/TransformedBounds.cs b/src/Avalonia.Visuals/VisualTree/TransformedBounds.cs
index 4c548669bd..435ca85a05 100644
--- a/src/Avalonia.Visuals/VisualTree/TransformedBounds.cs
+++ b/src/Avalonia.Visuals/VisualTree/TransformedBounds.cs
@@ -24,17 +24,17 @@ namespace Avalonia.VisualTree
         }
 
         /// <summary>
-        /// Gets the control's bounds.
+        /// Gets the control's bounds in its local coordinate space.
         /// </summary>
         public Rect Bounds { get; }
 
         /// <summary>
-        /// Gets the control's clip rectangle.
+        /// Gets the control's clip rectangle in global coordinate space.
         /// </summary>
         public Rect Clip { get; }
 
         /// <summary>
-        /// Gets the control's transform.
+        /// Gets the transform from local to global coordinate space.
         /// </summary>
         public Matrix Transform { get; }
 

From 52dcd41cd96ada41bfdf35a841fc1c4d488cbd1e Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 19 Jan 2018 23:32:48 +0100
Subject: [PATCH 273/482] Don't dispose geometry impls.

We can't do this until we have ref counting infrastructure in, as the impls may still be in use by the deferred renderer.
---
 src/Avalonia.Visuals/Media/Geometry.cs                |  1 -
 src/Skia/Avalonia.Skia/GeometryImpl.cs                |  1 -
 src/Skia/Avalonia.Skia/StreamGeometryImpl.cs          |  2 --
 src/Skia/Avalonia.Skia/TransformedGeometryImpl.cs     |  4 ----
 src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs  |  2 --
 .../Avalonia.Visuals.UnitTests/Media/GeometryTests.cs | 11 -----------
 6 files changed, 21 deletions(-)

diff --git a/src/Avalonia.Visuals/Media/Geometry.cs b/src/Avalonia.Visuals/Media/Geometry.cs
index 8201736238..6aff70624d 100644
--- a/src/Avalonia.Visuals/Media/Geometry.cs
+++ b/src/Avalonia.Visuals/Media/Geometry.cs
@@ -131,7 +131,6 @@ namespace Avalonia.Media
         protected void InvalidateGeometry()
         {
             _isDirty = true;
-            _platformImpl?.Dispose();
             _platformImpl = null;
             Changed?.Invoke(this, EventArgs.Empty);
         }
diff --git a/src/Skia/Avalonia.Skia/GeometryImpl.cs b/src/Skia/Avalonia.Skia/GeometryImpl.cs
index 4ecd687777..fb134b728c 100644
--- a/src/Skia/Avalonia.Skia/GeometryImpl.cs
+++ b/src/Skia/Avalonia.Skia/GeometryImpl.cs
@@ -9,7 +9,6 @@ namespace Avalonia.Skia
     {
         public abstract Rect Bounds { get; }
         public abstract SKPath EffectivePath { get; }
-        public abstract void Dispose();
         public abstract bool FillContains(Point point);
         public abstract Rect GetRenderBounds(Pen pen);
         public abstract IGeometryImpl Intersect(IGeometryImpl geometry);
diff --git a/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs b/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
index e8ab5fc6da..935d6d5e5b 100644
--- a/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
+++ b/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
@@ -28,8 +28,6 @@ namespace Avalonia.Skia
             };
         }
 
-        public override void Dispose() => _path.Dispose();
-
         public IStreamGeometryContextImpl Open()
         {
             _path = new SKPath();
diff --git a/src/Skia/Avalonia.Skia/TransformedGeometryImpl.cs b/src/Skia/Avalonia.Skia/TransformedGeometryImpl.cs
index b89a7d2f2e..e14d3f04be 100644
--- a/src/Skia/Avalonia.Skia/TransformedGeometryImpl.cs
+++ b/src/Skia/Avalonia.Skia/TransformedGeometryImpl.cs
@@ -23,10 +23,6 @@ namespace Avalonia.Skia
 
         public override Rect Bounds => SourceGeometry.Bounds.TransformToAABB(Transform);
 
-        public override void Dispose()
-        {
-        }
-
         public override bool FillContains(Point point)
         {
             // TODO: Not supported by SkiaSharp yet, so use expanded Rect
diff --git a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
index 5de0218cce..8f11d1463b 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
@@ -23,8 +23,6 @@ namespace Avalonia.Direct2D1.Media
         /// <inheritdoc/>
         public Geometry Geometry { get; }
 
-        public void Dispose() => Geometry.Dispose();
-
         /// <inheritdoc/>
         public Rect GetRenderBounds(Avalonia.Media.Pen pen)
         {
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/GeometryTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/GeometryTests.cs
index 3f7e353749..b046910f34 100644
--- a/tests/Avalonia.Visuals.UnitTests/Media/GeometryTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Media/GeometryTests.cs
@@ -31,17 +31,6 @@ namespace Avalonia.Visuals.UnitTests.Media
             Assert.True(raised);
         }
 
-        [Fact]
-        public void Old_PlatformImpl_Is_Disposed_When_Updated()
-        {
-            var target = new TestGeometry();
-            var platformImpl = target.PlatformImpl;
-
-            target.Foo = true;
-
-            Mock.Get(platformImpl).Verify(x => x.Dispose());
-        }
-
         [Fact]
         public void Setting_Transform_Causes_Changed_To_Be_Raised()
         {

From 02c6ae3c1a76baeeda39a56e7984183cd1a4c376 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 20 Jan 2018 19:23:13 +0100
Subject: [PATCH 274/482] Added ScrollBarVisibility.Disabled.

---
 src/Avalonia.Controls/Primitives/ScrollBar.cs           | 1 +
 src/Avalonia.Controls/Primitives/ScrollBarVisibility.cs | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Primitives/ScrollBar.cs b/src/Avalonia.Controls/Primitives/ScrollBar.cs
index 009e1d0ab8..0057b15150 100644
--- a/src/Avalonia.Controls/Primitives/ScrollBar.cs
+++ b/src/Avalonia.Controls/Primitives/ScrollBar.cs
@@ -99,6 +99,7 @@ namespace Avalonia.Controls.Primitives
                 case ScrollBarVisibility.Visible:
                     return true;
 
+                case ScrollBarVisibility.Disabled:
                 case ScrollBarVisibility.Hidden:
                     return false;
 
diff --git a/src/Avalonia.Controls/Primitives/ScrollBarVisibility.cs b/src/Avalonia.Controls/Primitives/ScrollBarVisibility.cs
index 17413d2233..f1cca8f909 100644
--- a/src/Avalonia.Controls/Primitives/ScrollBarVisibility.cs
+++ b/src/Avalonia.Controls/Primitives/ScrollBarVisibility.cs
@@ -5,8 +5,9 @@ namespace Avalonia.Controls.Primitives
 {
     public enum ScrollBarVisibility
     {
+        Disabled,
         Auto,
-        Visible,
         Hidden,
+        Visible,
     }
 }

From 1be39b8f711f63fc7ffe3cfd0200cae6ac16f674 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 20 Jan 2018 19:23:45 +0100
Subject: [PATCH 275/482] Select scrollbar visibility in VirtualizationTest.

Does not currently work.
---
 samples/VirtualizationTest/MainWindow.xaml     | 10 +++++++++-
 .../ViewModels/MainWindowViewModel.cs          | 18 ++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/samples/VirtualizationTest/MainWindow.xaml b/samples/VirtualizationTest/MainWindow.xaml
index 55bd729fec..205e896fc8 100644
--- a/samples/VirtualizationTest/MainWindow.xaml
+++ b/samples/VirtualizationTest/MainWindow.xaml
@@ -21,6 +21,12 @@
             <TextBox Watermark="Viewport"
                      UseFloatingWatermark="True"
                      Text="{Binding #listBox.Scroll.Viewport, Mode=OneWay}"/>
+            <TextBlock>Horiz. ScrollBar</TextBlock>
+            <DropDown Items="{Binding ScrollBarVisibilities}"
+                      SelectedItem="{Binding HorizontalScrollBarVisibility}"/>
+            <TextBlock>Vert. ScrollBar</TextBlock>
+            <DropDown Items="{Binding ScrollBarVisibilities}"
+                      SelectedItem="{Binding VerticalScrollBarVisibility}"/>
             <TextBox Watermark="Item to Create"
                      UseFloatingWatermark="True"
                      Text="{Binding NewItemString}"/>
@@ -35,7 +41,9 @@
                  Items="{Binding Items}" 
                  SelectedItems="{Binding SelectedItems}"
                  SelectionMode="Multiple"
-                 VirtualizationMode="{Binding VirtualizationMode}">
+                 VirtualizationMode="{Binding VirtualizationMode}"
+                 ScrollViewer.HorizontalScrollBarVisibility="{Binding HorizontalScrollBarVisibility, Mode=TwoWay}"
+                 ScrollViewer.VerticalScrollBarVisibility="{Binding VerticalScrollBarVisibility, Mode=TwoWay}">
             <ListBox.ItemsPanel>
                 <ItemsPanelTemplate>
                     <VirtualizingStackPanel Orientation="{Binding Orientation}"/>
diff --git a/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs b/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs
index f47627acb4..722af9e3af 100644
--- a/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs
+++ b/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Collections;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
 using ReactiveUI;
 
 namespace VirtualizationTest.ViewModels
@@ -17,6 +18,8 @@ namespace VirtualizationTest.ViewModels
         private int _newItemIndex;
         private IReactiveList<ItemViewModel> _items;
         private string _prefix = "Item";
+        private ScrollBarVisibility _horizontalScrollBarVisibility;
+        private ScrollBarVisibility _verticalScrollBarVisibility;
         private Orientation _orientation = Orientation.Vertical;
         private ItemVirtualizationMode _virtualizationMode = ItemVirtualizationMode.Simple;
 
@@ -64,6 +67,21 @@ namespace VirtualizationTest.ViewModels
         public IEnumerable<Orientation> Orientations =>
             Enum.GetValues(typeof(Orientation)).Cast<Orientation>();
 
+        public ScrollBarVisibility HorizontalScrollBarVisibility
+        {
+            get { return _horizontalScrollBarVisibility; }
+            set { this.RaiseAndSetIfChanged(ref _horizontalScrollBarVisibility, value); }
+        }
+
+        public ScrollBarVisibility VerticalScrollBarVisibility
+        {
+            get { return _verticalScrollBarVisibility; }
+            set { this.RaiseAndSetIfChanged(ref _verticalScrollBarVisibility, value); }
+        }
+
+        public IEnumerable<ScrollBarVisibility> ScrollBarVisibilities =>
+            Enum.GetValues(typeof(ScrollBarVisibility)).Cast<ScrollBarVisibility>();
+
         public ItemVirtualizationMode VirtualizationMode
         {
             get { return _virtualizationMode; }

From 7e5e9c468baf3c9861e9bb8c74ddd7b4808b18a0 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 20 Jan 2018 19:38:49 +0100
Subject: [PATCH 276/482] Make VirtualizationTest items word-wrap.

---
 samples/VirtualizationTest/MainWindow.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/VirtualizationTest/MainWindow.xaml b/samples/VirtualizationTest/MainWindow.xaml
index 205e896fc8..52c2b33680 100644
--- a/samples/VirtualizationTest/MainWindow.xaml
+++ b/samples/VirtualizationTest/MainWindow.xaml
@@ -51,7 +51,7 @@
             </ListBox.ItemsPanel>
             <ListBox.ItemTemplate>
                 <DataTemplate>
-                    <TextBlock Text="{Binding Header}"/>
+                    <TextBlock Text="{Binding Header}" TextWrapping="Wrap"/>
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>

From 8a80a724d72fde0494a474e08520356a1311332e Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 20 Jan 2018 19:47:24 +0100
Subject: [PATCH 277/482] Implement disabling of ListBox scrollbars.

Fixes #1344.
---
 .../ViewModels/MainWindowViewModel.cs         |  4 +-
 .../Presenters/ItemVirtualizerSimple.cs       | 12 ++-
 .../Presenters/ItemsPresenter.cs              | 27 ++++++
 .../Presenters/ScrollContentPresenter.cs      | 63 +++++++++---
 .../Primitives/ILogicalScrollable.cs          | 10 ++
 src/Avalonia.Controls/ScrollViewer.cs         | 97 ++++++++++++++-----
 src/Avalonia.Controls/TextBox.cs              | 22 +----
 .../VirtualizingStackPanel.cs                 |  2 -
 src/Avalonia.Themes.Default/ListBox.xaml      |  7 +-
 src/Avalonia.Themes.Default/ScrollViewer.xaml |  5 +-
 src/Avalonia.Themes.Default/TextBox.xaml      |  3 +-
 src/Avalonia.Themes.Default/TreeView.xaml     |  2 +-
 .../ItemsPresenterTests_Virtualization.cs     |  2 +
 ...emsPresenterTests_Virtualization_Simple.cs |  2 +
 .../Presenters/ScrollContentPresenterTests.cs | 11 ++-
 ...ontentPresenterTests_ILogicalScrollable.cs | 46 +++++++--
 .../ScrollViewerTests.cs                      | 30 +++++-
 .../FullLayoutTests.cs                        |  2 +-
 .../DeferredRendererTests_HitTesting.cs       |  2 +
 .../ImmediateRendererTests_HitTesting.cs      |  2 +
 20 files changed, 273 insertions(+), 78 deletions(-)

diff --git a/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs b/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs
index 722af9e3af..8eab91e06d 100644
--- a/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs
+++ b/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs
@@ -18,8 +18,8 @@ namespace VirtualizationTest.ViewModels
         private int _newItemIndex;
         private IReactiveList<ItemViewModel> _items;
         private string _prefix = "Item";
-        private ScrollBarVisibility _horizontalScrollBarVisibility;
-        private ScrollBarVisibility _verticalScrollBarVisibility;
+        private ScrollBarVisibility _horizontalScrollBarVisibility = ScrollBarVisibility.Auto;
+        private ScrollBarVisibility _verticalScrollBarVisibility = ScrollBarVisibility.Auto;
         private Orientation _orientation = Orientation.Vertical;
         private ItemVirtualizationMode _virtualizationMode = ItemVirtualizationMode.Simple;
 
diff --git a/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs b/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs
index 20602d5475..c1489e7138 100644
--- a/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs
+++ b/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections;
 using System.Collections.Specialized;
 using System.Linq;
+using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Utils;
 using Avalonia.Input;
 using Avalonia.Layout;
@@ -97,6 +98,7 @@ namespace Avalonia.Controls.Presenters
         /// <inheritdoc/>
         public override Size MeasureOverride(Size availableSize)
         {
+            var scrollable = (ILogicalScrollable)Owner;
             var visualRoot = Owner.GetVisualRoot();
             var maxAvailableSize = (visualRoot as WindowBase)?.PlatformImpl?.MaxClientSize
                  ?? (visualRoot as TopLevel)?.ClientSize;
@@ -115,7 +117,10 @@ namespace Avalonia.Controls.Presenters
                     }
                 }
 
-                availableSize = availableSize.WithWidth(double.PositiveInfinity);
+                if (scrollable.CanHorizontallyScroll)
+                {
+                    availableSize = availableSize.WithWidth(double.PositiveInfinity);
+                }
             }
             else
             {
@@ -127,7 +132,10 @@ namespace Avalonia.Controls.Presenters
                     }
                 }
 
-                availableSize = availableSize.WithHeight(double.PositiveInfinity);
+                if (scrollable.CanVerticallyScroll)
+                {
+                    availableSize = availableSize.WithHeight(double.PositiveInfinity);
+                }
             }
 
             Owner.Panel.Measure(availableSize);
diff --git a/src/Avalonia.Controls/Presenters/ItemsPresenter.cs b/src/Avalonia.Controls/Presenters/ItemsPresenter.cs
index 185193f889..590bfa25ac 100644
--- a/src/Avalonia.Controls/Presenters/ItemsPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ItemsPresenter.cs
@@ -23,6 +23,8 @@ namespace Avalonia.Controls.Presenters
                 defaultValue: ItemVirtualizationMode.None);
 
         private ItemVirtualizer _virtualizer;
+        private bool _canHorizontallyScroll;
+        private bool _canVerticallyScroll;
 
         /// <summary>
         /// Initializes static members of the <see cref="ItemsPresenter"/> class.
@@ -46,6 +48,31 @@ namespace Avalonia.Controls.Presenters
             set { SetValue(VirtualizationModeProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether the content can be scrolled horizontally.
+        /// </summary>
+        bool ILogicalScrollable.CanHorizontallyScroll
+        {
+            get { return _canHorizontallyScroll; }
+            set
+            {
+                _canHorizontallyScroll = value;
+                InvalidateMeasure();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the content can be scrolled horizontally.
+        /// </summary>
+        bool ILogicalScrollable.CanVerticallyScroll
+        {
+            get { return _canVerticallyScroll; }
+            set
+            {
+                _canVerticallyScroll = value;
+                InvalidateMeasure();
+            }
+        }
         /// <inheritdoc/>
         bool ILogicalScrollable.IsLogicalScrollEnabled
         {
diff --git a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
index e41c4e1e28..6c61375054 100644
--- a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
@@ -17,6 +17,24 @@ namespace Avalonia.Controls.Presenters
     /// </summary>
     public class ScrollContentPresenter : ContentPresenter, IPresenter, IScrollable
     {
+        /// <summary>
+        /// Defines the <see cref="CanHorizontallyScroll"/> property.
+        /// </summary>
+        public static readonly DirectProperty<ScrollContentPresenter, bool> CanHorizontallyScrollProperty =
+            AvaloniaProperty.RegisterDirect<ScrollContentPresenter, bool>(
+                nameof(CanHorizontallyScroll),
+                o => o.CanHorizontallyScroll,
+                (o, v) => o.CanHorizontallyScroll = v);
+
+        /// <summary>
+        /// Defines the <see cref="CanVerticallyScroll"/> property.
+        /// </summary>
+        public static readonly DirectProperty<ScrollContentPresenter, bool> CanVerticallyScrollProperty =
+            AvaloniaProperty.RegisterDirect<ScrollContentPresenter, bool>(
+                nameof(CanVerticallyScroll),
+                o => o.CanVerticallyScroll,
+                (o, v) => o.CanVerticallyScroll = v);
+
         /// <summary>
         /// Defines the <see cref="Extent"/> property.
         /// </summary>
@@ -41,12 +59,8 @@ namespace Avalonia.Controls.Presenters
                 o => o.Viewport,
                 (o, v) => o.Viewport = v);
 
-        /// <summary>
-        /// Defines the <see cref="CanScrollHorizontally"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> CanScrollHorizontallyProperty =
-            ScrollViewer.CanScrollHorizontallyProperty.AddOwner<ScrollContentPresenter>();
-
+        private bool _canHorizontallyScroll;
+        private bool _canVerticallyScroll;
         private Size _extent;
         private Size _measuredExtent;
         private Vector _offset;
@@ -73,6 +87,24 @@ namespace Avalonia.Controls.Presenters
             this.GetObservable(ChildProperty).Subscribe(UpdateScrollableSubscription);
         }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether the content can be scrolled horizontally.
+        /// </summary>
+        public bool CanHorizontallyScroll
+        {
+            get { return _canHorizontallyScroll; }
+            set { SetAndRaise(CanHorizontallyScrollProperty, ref _canHorizontallyScroll, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the content can be scrolled horizontally.
+        /// </summary>
+        public bool CanVerticallyScroll
+        {
+            get { return _canVerticallyScroll; }
+            set { SetAndRaise(CanVerticallyScrollProperty, ref _canVerticallyScroll, value); }
+        }
+
         /// <summary>
         /// Gets the extent of the scrollable content.
         /// </summary>
@@ -100,11 +132,6 @@ namespace Avalonia.Controls.Presenters
             private set { SetAndRaise(ViewportProperty, ref _viewport, value); }
         }
 
-        /// <summary>
-        /// Gets a value indicating whether the content can be scrolled horizontally.
-        /// </summary>
-        public bool CanScrollHorizontally => GetValue(CanScrollHorizontallyProperty);
-
         /// <summary>
         /// Attempts to bring a portion of the target visual into view by scrolling the content.
         /// </summary>
@@ -182,10 +209,15 @@ namespace Avalonia.Controls.Presenters
                 {
                     measureSize = new Size(double.PositiveInfinity, double.PositiveInfinity);
 
-                    if (!CanScrollHorizontally)
+                    if (!CanHorizontallyScroll)
                     {
                         measureSize = measureSize.WithWidth(availableSize.Width);
                     }
+
+                    if (!CanVerticallyScroll)
+                    {
+                        measureSize = measureSize.WithHeight(availableSize.Height);
+                    }
                 }
 
                 child.Measure(measureSize);
@@ -289,7 +321,12 @@ namespace Avalonia.Controls.Presenters
                 if (scrollable.IsLogicalScrollEnabled == true)
                 {
                     _logicalScrollSubscription = new CompositeDisposable(
-                        this.GetObservable(OffsetProperty).Skip(1).Subscribe(x => scrollable.Offset = x),
+                        this.GetObservable(CanHorizontallyScrollProperty)
+                            .Subscribe(x => scrollable.CanHorizontallyScroll = x),
+                        this.GetObservable(CanVerticallyScrollProperty)
+                            .Subscribe(x => scrollable.CanVerticallyScroll = x),
+                        this.GetObservable(OffsetProperty)
+                            .Skip(1).Subscribe(x => scrollable.Offset = x),
                         Disposable.Create(() => scrollable.InvalidateScroll = null));
                     UpdateFromScrollable(scrollable);
                 }
diff --git a/src/Avalonia.Controls/Primitives/ILogicalScrollable.cs b/src/Avalonia.Controls/Primitives/ILogicalScrollable.cs
index 6c8f463a96..490beb12b3 100644
--- a/src/Avalonia.Controls/Primitives/ILogicalScrollable.cs
+++ b/src/Avalonia.Controls/Primitives/ILogicalScrollable.cs
@@ -19,6 +19,16 @@ namespace Avalonia.Controls.Primitives
     /// </remarks>
     public interface ILogicalScrollable : IScrollable
     {
+        /// <summary>
+        /// Gets or sets a value indicating whether the content can be scrolled horizontally.
+        /// </summary>
+        bool CanHorizontallyScroll { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the content can be scrolled horizontally.
+        /// </summary>
+        bool CanVerticallyScroll { get; set; }
+
         /// <summary>
         /// Gets a value indicating whether logical scrolling is enabled on the control.
         /// </summary>
diff --git a/src/Avalonia.Controls/ScrollViewer.cs b/src/Avalonia.Controls/ScrollViewer.cs
index 0442652540..39854e0071 100644
--- a/src/Avalonia.Controls/ScrollViewer.cs
+++ b/src/Avalonia.Controls/ScrollViewer.cs
@@ -2,8 +2,6 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
-using System.Linq;
-using System.Reactive.Linq;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 
@@ -15,16 +13,34 @@ namespace Avalonia.Controls
     public class ScrollViewer : ContentControl, IScrollable
     {
         /// <summary>
-        /// Defines the <see cref="CanScrollHorizontally"/> property.
+        /// Defines the <see cref="CanHorizontallyScroll"/> property.
         /// </summary>
-        public static readonly StyledProperty<bool> CanScrollHorizontallyProperty =
-            AvaloniaProperty.Register<ScrollViewer, bool>(nameof(CanScrollHorizontally), true);
+        /// <remarks>
+        /// There is no public C# accessor for this property as it is intended to be bound to by a 
+        /// <see cref="ScrollContentPresenter"/> in the control's template.
+        /// </remarks>
+        public static readonly DirectProperty<ScrollViewer, bool> CanHorizontallyScrollProperty =
+            AvaloniaProperty.RegisterDirect<ScrollViewer, bool>(
+                nameof(CanHorizontallyScroll),
+                o => o.CanHorizontallyScroll);
+
+        /// <summary>
+        /// Defines the <see cref="CanVerticallyScroll"/> property.
+        /// </summary>
+        /// <remarks>
+        /// There is no public C# accessor for this property as it is intended to be bound to by a 
+        /// <see cref="ScrollContentPresenter"/> in the control's template.
+        /// </remarks>
+        public static readonly DirectProperty<ScrollViewer, bool> CanVerticallyScrollProperty =
+            AvaloniaProperty.RegisterDirect<ScrollViewer, bool>(
+                nameof(CanVerticallyScroll),
+                o => o.CanVerticallyScroll);
 
         /// <summary>
         /// Defines the <see cref="Extent"/> property.
         /// </summary>
         public static readonly DirectProperty<ScrollViewer, Size> ExtentProperty =
-            AvaloniaProperty.RegisterDirect<ScrollViewer, Size>(nameof(Extent), 
+            AvaloniaProperty.RegisterDirect<ScrollViewer, Size>(nameof(Extent),
                 o => o.Extent,
                 (o, v) => o.Extent = v);
 
@@ -41,7 +57,7 @@ namespace Avalonia.Controls
         /// Defines the <see cref="Viewport"/> property.
         /// </summary>
         public static readonly DirectProperty<ScrollViewer, Size> ViewportProperty =
-            AvaloniaProperty.RegisterDirect<ScrollViewer, Size>(nameof(Viewport), 
+            AvaloniaProperty.RegisterDirect<ScrollViewer, Size>(nameof(Viewport),
                 o => o.Viewport,
                 (o, v) => o.Viewport = v);
 
@@ -85,14 +101,10 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="HorizontalScrollBarVisibility"/> property.
         /// </summary>
-        /// <remarks>
-        /// There is no public C# accessor for this property as it is intended to be bound to by a 
-        /// <see cref="ScrollContentPresenter"/> in the control's template.
-        /// </remarks>
         public static readonly AttachedProperty<ScrollBarVisibility> HorizontalScrollBarVisibilityProperty =
             AvaloniaProperty.RegisterAttached<ScrollViewer, Control, ScrollBarVisibility>(
                 nameof(HorizontalScrollBarVisibility),
-                ScrollBarVisibility.Auto);
+                ScrollBarVisibility.Hidden);
 
         /// <summary>
         /// Defines the VerticalScrollBarMaximum property.
@@ -136,7 +148,7 @@ namespace Avalonia.Controls
         /// </summary>
         public static readonly AttachedProperty<ScrollBarVisibility> VerticalScrollBarVisibilityProperty =
             AvaloniaProperty.RegisterAttached<ScrollViewer, Control, ScrollBarVisibility>(
-                nameof(VerticalScrollBarVisibility), 
+                nameof(VerticalScrollBarVisibility),
                 ScrollBarVisibility.Auto);
 
         private Size _extent;
@@ -150,6 +162,8 @@ namespace Avalonia.Controls
         {
             AffectsValidation(ExtentProperty, OffsetProperty);
             AffectsValidation(ViewportProperty, OffsetProperty);
+            HorizontalScrollBarVisibilityProperty.Changed.AddClassHandler<ScrollViewer>(x => x.ScrollBarVisibilityChanged);
+            VerticalScrollBarVisibilityProperty.Changed.AddClassHandler<ScrollViewer>(x => x.ScrollBarVisibilityChanged);
         }
 
         /// <summary>
@@ -218,15 +232,6 @@ namespace Avalonia.Controls
             }
         }
 
-        /// <summary>
-        /// Gets a value indicating whether the content can be scrolled horizontally.
-        /// </summary>
-        public bool CanScrollHorizontally
-        {
-            get { return GetValue(CanScrollHorizontallyProperty); }
-            set { SetValue(CanScrollHorizontallyProperty, value); }
-        }
-
         /// <summary>
         /// Gets or sets the horizontal scrollbar visibility.
         /// </summary>
@@ -245,6 +250,22 @@ namespace Avalonia.Controls
             set { SetValue(VerticalScrollBarVisibilityProperty, value); }
         }
 
+        /// <summary>
+        /// Gets a value indicating whether the viewer can scroll horizontally.
+        /// </summary>
+        protected bool CanHorizontallyScroll
+        {
+            get { return HorizontalScrollBarVisibility != ScrollBarVisibility.Disabled; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the viewer can scroll vertically.
+        /// </summary>
+        protected bool CanVerticallyScroll
+        {
+            get { return VerticalScrollBarVisibility != ScrollBarVisibility.Disabled; }
+        }
+
         /// <summary>
         /// Gets the maximum horizontal scrollbar value.
         /// </summary>
@@ -316,7 +337,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="control">The control to read the value from.</param>
         /// <returns>The value of the property.</returns>
-        public ScrollBarVisibility GetHorizontalScrollBarVisibility(Control control)
+        public static ScrollBarVisibility GetHorizontalScrollBarVisibility(Control control)
         {
             return control.GetValue(HorizontalScrollBarVisibilityProperty);
         }
@@ -326,7 +347,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="control">The control to set the value on.</param>
         /// <param name="value">The value of the property.</param>
-        public void SetHorizontalScrollBarVisibility(Control control, ScrollBarVisibility value)
+        public static void SetHorizontalScrollBarVisibility(Control control, ScrollBarVisibility value)
         {
             control.SetValue(HorizontalScrollBarVisibilityProperty, value);
         }
@@ -336,7 +357,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="control">The control to read the value from.</param>
         /// <returns>The value of the property.</returns>
-        public ScrollBarVisibility GetVerticalScrollBarVisibility(Control control)
+        public static ScrollBarVisibility GetVerticalScrollBarVisibility(Control control)
         {
             return control.GetValue(VerticalScrollBarVisibilityProperty);
         }
@@ -346,7 +367,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="control">The control to set the value on.</param>
         /// <param name="value">The value of the property.</param>
-        public void SetVerticalScrollBarVisibility(Control control, ScrollBarVisibility value)
+        public static void SetVerticalScrollBarVisibility(Control control, ScrollBarVisibility value)
         {
             control.SetValue(VerticalScrollBarVisibilityProperty, value);
         }
@@ -385,6 +406,30 @@ namespace Avalonia.Controls
             }
         }
 
+        private void ScrollBarVisibilityChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var wasEnabled = !ScrollBarVisibility.Disabled.Equals(e.OldValue);
+            var isEnabled = !ScrollBarVisibility.Disabled.Equals(e.NewValue);
+
+            if (wasEnabled != isEnabled)
+            {
+                if (e.Property == HorizontalScrollBarVisibilityProperty)
+                {
+                    RaisePropertyChanged(
+                        CanHorizontallyScrollProperty,
+                        wasEnabled,
+                        isEnabled);
+                }
+                else if (e.Property == VerticalScrollBarVisibilityProperty)
+                {
+                    RaisePropertyChanged(
+                        CanVerticallyScrollProperty,
+                        wasEnabled,
+                        isEnabled);
+                }
+            }
+        }
+
         private void CalculatedPropertiesChanged()
         {
             // Pass old values of 0 here because we don't have the old values at this point,
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 1a663ed3b6..8f4606884e 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -8,7 +8,6 @@ using System.Linq;
 using System.Reactive.Linq;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
-using Avalonia.Controls.Templates;
 using Avalonia.Controls.Utils;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -26,9 +25,6 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<bool> AcceptsTabProperty =
             AvaloniaProperty.Register<TextBox, bool>(nameof(AcceptsTab));
 
-        public static readonly DirectProperty<TextBox, bool> CanScrollHorizontallyProperty =
-            AvaloniaProperty.RegisterDirect<TextBox, bool>(nameof(CanScrollHorizontally), o => o.CanScrollHorizontally);
-
         public static readonly DirectProperty<TextBox, int> CaretIndexProperty =
             AvaloniaProperty.RegisterDirect<TextBox, int>(
                 nameof(CaretIndex),
@@ -92,7 +88,6 @@ namespace Avalonia.Controls
         private int _caretIndex;
         private int _selectionStart;
         private int _selectionEnd;
-        private bool _canScrollHorizontally;
         private TextPresenter _presenter;
         private UndoRedoHelper<UndoRedoState> _undoRedoHelper;
         private bool _ignoreTextChanges;
@@ -106,12 +101,11 @@ namespace Avalonia.Controls
 
         public TextBox()
         {
-            this.GetObservable(TextWrappingProperty)
-                .Select(x => x == TextWrapping.NoWrap)
-                .Subscribe(x => CanScrollHorizontally = x);
-
-            var horizontalScrollBarVisibility = this.GetObservable(AcceptsReturnProperty)
-                .Select(x => x ? ScrollBarVisibility.Auto : ScrollBarVisibility.Hidden);
+            var horizontalScrollBarVisibility = Observable.CombineLatest(
+                this.GetObservable(AcceptsReturnProperty),
+                this.GetObservable(TextWrappingProperty),
+                (acceptsReturn, wrapping) => acceptsReturn && wrapping == TextWrapping.NoWrap ?
+                    ScrollBarVisibility.Auto : ScrollBarVisibility.Disabled);
 
             Bind(
                 ScrollViewer.HorizontalScrollBarVisibilityProperty,
@@ -132,12 +126,6 @@ namespace Avalonia.Controls
             set { SetValue(AcceptsTabProperty, value); }
         }
 
-        public bool CanScrollHorizontally
-        {
-            get { return _canScrollHorizontally; }
-            private set { SetAndRaise(CanScrollHorizontallyProperty, ref _canScrollHorizontally, value); }
-        }
-
         public int CaretIndex
         {
             get
diff --git a/src/Avalonia.Controls/VirtualizingStackPanel.cs b/src/Avalonia.Controls/VirtualizingStackPanel.cs
index 409dd231ad..dee537029c 100644
--- a/src/Avalonia.Controls/VirtualizingStackPanel.cs
+++ b/src/Avalonia.Controls/VirtualizingStackPanel.cs
@@ -3,11 +3,9 @@
 
 using System;
 using System.Collections.Specialized;
-using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Layout;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
 {
diff --git a/src/Avalonia.Themes.Default/ListBox.xaml b/src/Avalonia.Themes.Default/ListBox.xaml
index aa63a1b6c3..57b0c541b8 100644
--- a/src/Avalonia.Themes.Default/ListBox.xaml
+++ b/src/Avalonia.Themes.Default/ListBox.xaml
@@ -3,11 +3,16 @@
   <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
   <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
   <Setter Property="Padding" Value="4"/>
+  <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+  <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
   <Setter Property="Template">
     <ControlTemplate>
       <Border BorderBrush="{TemplateBinding BorderBrush}"
               BorderThickness="{TemplateBinding BorderThickness}">
-        <ScrollViewer Name="PART_ScrollViewer" Background="{TemplateBinding Background}">
+        <ScrollViewer Name="PART_ScrollViewer"
+                      Background="{TemplateBinding Background}"
+                      HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                      VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
           <ItemsPresenter Name="PART_ItemsPresenter"
                           Items="{TemplateBinding Items}"
                           ItemsPanel="{TemplateBinding ItemsPanel}"
diff --git a/src/Avalonia.Themes.Default/ScrollViewer.xaml b/src/Avalonia.Themes.Default/ScrollViewer.xaml
index c7f9ad31db..5355d5c7c3 100644
--- a/src/Avalonia.Themes.Default/ScrollViewer.xaml
+++ b/src/Avalonia.Themes.Default/ScrollViewer.xaml
@@ -6,12 +6,13 @@
       <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,Auto">
         <ScrollContentPresenter Name="PART_ContentPresenter"
                                 Background="{TemplateBinding Background}"
+                                CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
+                                CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
                                 Content="{TemplateBinding Content}"
                                 Extent="{TemplateBinding Path=Extent, Mode=TwoWay}"
                                 Margin="{TemplateBinding Padding}"
                                 Offset="{TemplateBinding Path=Offset, Mode=TwoWay}"
-                                Viewport="{TemplateBinding Path=Viewport, Mode=TwoWay}"
-                                CanScrollHorizontally="{TemplateBinding CanScrollHorizontally}"/>
+                                Viewport="{TemplateBinding Path=Viewport, Mode=TwoWay}"/>
         <ScrollBar Name="horizontalScrollBar"
                    Orientation="Horizontal"
                    Maximum="{TemplateBinding HorizontalScrollBarMaximum}"
diff --git a/src/Avalonia.Themes.Default/TextBox.xaml b/src/Avalonia.Themes.Default/TextBox.xaml
index 6b8f93e714..9d9f322150 100644
--- a/src/Avalonia.Themes.Default/TextBox.xaml
+++ b/src/Avalonia.Themes.Default/TextBox.xaml
@@ -36,8 +36,7 @@
                 <Path Data="M14,7 A7,7 0 0,0 0,7 M0,7 A7,7 0 1,0 14,7 M7,3l0,5 M7,9l0,2" Stroke="{DynamicResource ErrorBrush}" StrokeThickness="2"/>
               </Canvas>
               
-              <ScrollViewer CanScrollHorizontally="{TemplateBinding CanScrollHorizontally}"
-                            HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+              <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                             VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
                 
               <Panel>
diff --git a/src/Avalonia.Themes.Default/TreeView.xaml b/src/Avalonia.Themes.Default/TreeView.xaml
index 4ce677667b..42c0b2cdd9 100644
--- a/src/Avalonia.Themes.Default/TreeView.xaml
+++ b/src/Avalonia.Themes.Default/TreeView.xaml
@@ -7,7 +7,7 @@
     <ControlTemplate>
       <Border BorderBrush="{TemplateBinding BorderBrush}"
               BorderThickness="{TemplateBinding BorderThickness}">
-        <ScrollViewer CanScrollHorizontally="True" Background="{TemplateBinding Background}">
+        <ScrollViewer Background="{TemplateBinding Background}">
           <ItemsPresenter Name="PART_ItemsPresenter"
                           Items="{TemplateBinding Items}"
                           ItemsPanel="{TemplateBinding ItemsPanel}"
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs
index 58f4127cdc..f1529b5090 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs
@@ -281,6 +281,8 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
             var scroller = new TestScroller
             {
+                CanHorizontallyScroll = false,
+                CanVerticallyScroll = true,
                 Content = result = new TestItemsPresenter(useContainers)
                 {
                     Items = items,
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
index 80cc13ab78..fbd98c1a04 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
@@ -998,6 +998,8 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
             var scroller = new TestScroller
             {
+                CanHorizontallyScroll = true,
+                CanVerticallyScroll = true,
                 Content = result = new TestItemsPresenter(useContainers)
                 {
                     Items = items,
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs
index ab16552e12..ebed83e99a 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
 using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives;
 using Avalonia.Layout;
 using Xunit;
 
@@ -118,6 +119,8 @@ namespace Avalonia.Controls.UnitTests.Presenters
             TestControl content;
             var target = new ScrollContentPresenter
             {
+                CanHorizontallyScroll = true,
+                CanVerticallyScroll = true,
                 Content = content = new TestControl(),
             };
 
@@ -134,6 +137,8 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Border content;
             var target = new ScrollContentPresenter
             {
+                CanHorizontallyScroll = true,
+                CanVerticallyScroll = true,
                 Content = content = new Border
                 {
                     Width = 150,
@@ -155,8 +160,8 @@ namespace Avalonia.Controls.UnitTests.Presenters
             var child = new TestControl();
             var target = new ScrollContentPresenter
             {
+                CanVerticallyScroll = true,
                 Content = child,
-                [ScrollContentPresenter.CanScrollHorizontallyProperty] = false,
             };
 
             target.UpdateChild();
@@ -171,6 +176,8 @@ namespace Avalonia.Controls.UnitTests.Presenters
             var child = new TestControl();
             var target = new ScrollContentPresenter
             {
+                CanHorizontallyScroll = true,
+                CanVerticallyScroll = true,
                 Content = child,
             };
 
@@ -246,6 +253,8 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Border border;
             var target = new ScrollContentPresenter
             {
+                CanHorizontallyScroll = true,
+                CanVerticallyScroll = true,
                 Width = 100,
                 Height = 100,
                 Content = new Decorator
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests_ILogicalScrollable.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests_ILogicalScrollable.cs
index 1258a26d6a..11d5bd408b 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests_ILogicalScrollable.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests_ILogicalScrollable.cs
@@ -13,7 +13,7 @@ namespace Avalonia.Controls.UnitTests
     public class ScrollContentPresenterTests_ILogicalScrollable
     {
         [Fact]
-        public void Measure_Should_Pass_Unchanged_Bounds_To_IScrollable()
+        public void Measure_Should_Pass_Unchanged_Bounds_To_ILogicalScrollable()
         {
             var scrollable = new TestScrollable();
             var target = new ScrollContentPresenter
@@ -28,7 +28,7 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void Arrange_Should_Not_Offset_IScrollable_Bounds()
+        public void Arrange_Should_Not_Offset_ILogicalScrollable_Bounds()
         {
             var scrollable = new TestScrollable
             {
@@ -50,7 +50,7 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void Arrange_Should_Offset_IScrollable_Bounds_When_Logical_Scroll_Disabled()
+        public void Arrange_Should_Offset_ILogicalScrollable_Bounds_When_Logical_Scroll_Disabled()
         {
             var scrollable = new TestScrollable
             {
@@ -59,6 +59,8 @@ namespace Avalonia.Controls.UnitTests
 
             var target = new ScrollContentPresenter
             {
+                CanHorizontallyScroll = true,
+                CanVerticallyScroll = true,
                 Content = scrollable,
                 Offset = new Vector(25, 25),
             };
@@ -71,7 +73,7 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void Arrange_Should_Not_Set_Viewport_And_Extent_With_IScrollable()
+        public void Arrange_Should_Not_Set_Viewport_And_Extent_With_ILogicalScrollable()
         {
             var target = new ScrollContentPresenter
             {
@@ -122,7 +124,7 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void Extent_Offset_And_Viewport_Should_Be_Read_From_IScrollable()
+        public void Extent_Offset_And_Viewport_Should_Be_Read_From_ILogicalScrollable()
         {
             var scrollable = new TestScrollable
             {
@@ -152,7 +154,7 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void Offset_Should_Be_Written_To_IScrollable()
+        public void Offset_Should_Be_Written_To_ILogicalScrollable()
         {
             var scrollable = new TestScrollable
             {
@@ -172,7 +174,7 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void Offset_Should_Not_Be_Written_To_IScrollable_After_Removal()
+        public void Offset_Should_Not_Be_Written_To_ILogicalScrollable_After_Removal()
         {
             var scrollable = new TestScrollable
             {
@@ -203,6 +205,8 @@ namespace Avalonia.Controls.UnitTests
 
             var target = new ScrollContentPresenter
             {
+                CanHorizontallyScroll = true,
+                CanVerticallyScroll = true,
                 Content = scrollable,
             };
 
@@ -253,6 +257,8 @@ namespace Avalonia.Controls.UnitTests
 
             var target = new ScrollContentPresenter
             {
+                CanHorizontallyScroll = true,
+                CanVerticallyScroll = true,
                 Content = logicalScrollable,
             };
 
@@ -286,12 +292,38 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(new Rect(0, 0, 100, 100), logicalScrollable.Bounds);
         }
 
+        [Fact]
+        public void Should_Set_ILogicalScrolable_CanHorizontallyScroll()
+        {
+            var logicalScrollable = new TestScrollable();
+            var target = new ScrollContentPresenter { Content = logicalScrollable };
+
+            target.UpdateChild();
+            Assert.False(logicalScrollable.CanHorizontallyScroll);
+            target.CanHorizontallyScroll = true;
+            Assert.True(logicalScrollable.CanHorizontallyScroll);
+        }
+
+        [Fact]
+        public void Should_Set_ILogicalScrolable_CanVerticallyScroll()
+        {
+            var logicalScrollable = new TestScrollable();
+            var target = new ScrollContentPresenter { Content = logicalScrollable };
+
+            target.UpdateChild();
+            Assert.False(logicalScrollable.CanVerticallyScroll);
+            target.CanVerticallyScroll = true;
+            Assert.True(logicalScrollable.CanVerticallyScroll);
+        }
+
         private class TestScrollable : Control, ILogicalScrollable
         {
             private Size _extent;
             private Vector _offset;
             private Size _viewport;
 
+            public bool CanHorizontallyScroll { get; set; }
+            public bool CanVerticallyScroll { get; set; }
             public bool IsLogicalScrollEnabled { get; set; } = true;
             public Size AvailableSize { get; private set; }
             public Action InvalidateScroll { get; set; }
diff --git a/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs b/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs
index 68dcfcb770..d1385176c5 100644
--- a/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs
@@ -1,6 +1,8 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using System;
+using System.Collections.Generic;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
@@ -25,6 +27,32 @@ namespace Avalonia.Controls.UnitTests
             Assert.IsType<TextBlock>(target.Presenter.Child);
         }
 
+        [Fact]
+        public void CanHorizontallyScroll_Should_Track_HorizontalScrollBarVisibility()
+        {
+            var target = new ScrollViewer();
+            var values = new List<bool>();
+
+            target.GetObservable(ScrollViewer.CanHorizontallyScrollProperty).Subscribe(x => values.Add(x));
+            target.HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled;
+            target.HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
+
+            Assert.Equal(new[] { true, false, true }, values);
+        }
+
+        [Fact]
+        public void CanVerticallyScroll_Should_Track_VerticalScrollBarVisibility()
+        {
+            var target = new ScrollViewer();
+            var values = new List<bool>();
+
+            target.GetObservable(ScrollViewer.CanVerticallyScrollProperty).Subscribe(x => values.Add(x));
+            target.VerticalScrollBarVisibility = ScrollBarVisibility.Disabled;
+            target.VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
+
+            Assert.Equal(new[] { true, false, true }, values);
+        }
+
         [Fact]
         public void Offset_Should_Be_Coerced_To_Viewport()
         {
@@ -59,7 +87,7 @@ namespace Avalonia.Controls.UnitTests
                         [~~ScrollContentPresenter.ExtentProperty] = control[~~ScrollViewer.ExtentProperty],
                         [~~ScrollContentPresenter.OffsetProperty] = control[~~ScrollViewer.OffsetProperty],
                         [~~ScrollContentPresenter.ViewportProperty] = control[~~ScrollViewer.ViewportProperty],
-                        [~ScrollContentPresenter.CanScrollHorizontallyProperty] = control[~ScrollViewer.CanScrollHorizontallyProperty],
+                        [~ScrollContentPresenter.CanHorizontallyScrollProperty] = control[~ScrollViewer.CanHorizontallyScrollProperty],
                     },
                     new ScrollBar
                     {
diff --git a/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs b/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
index 1a07bdc7d1..d4df32a4b3 100644
--- a/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
+++ b/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
@@ -85,7 +85,7 @@ namespace Avalonia.Layout.UnitTests
                     {
                         Width = 200,
                         Height = 200,
-                        CanScrollHorizontally = true,
+                        HorizontalScrollBarVisibility = ScrollBarVisibility.Auto,
                         HorizontalAlignment = HorizontalAlignment.Center,
                         VerticalAlignment = VerticalAlignment.Center,
                         Content = textBlock = new TextBlock
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
index 3a9e45a02b..a53809a029 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
@@ -372,6 +372,8 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                                 Margin = new Thickness(0, 100, 0, 0),
                                 Child = scroll = new ScrollContentPresenter()
                                 {
+                                    CanHorizontallyScroll = true,
+                                    CanVerticallyScroll = true,
                                     Content = new StackPanel()
                                     {
                                         Children =
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
index 9a1d8cb59c..1de6d02a35 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
@@ -357,6 +357,8 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                                 Margin = new Thickness(0, 100, 0, 0),
                                 Child = scroll = new ScrollContentPresenter()
                                 {
+                                    CanHorizontallyScroll = true,
+                                    CanVerticallyScroll = true,
                                     Content = new StackPanel()
                                     {
                                         Children =

From f102ef9c1ff359f8490cbb28612e12714190916d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 21 Jan 2018 15:59:25 +0100
Subject: [PATCH 278/482] Updated cake to latest version.

---
 tools/packages.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/packages.config b/tools/packages.config
index e0dd39bd2b..e52a2c7e98 100644
--- a/tools/packages.config
+++ b/tools/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-    <package id="Cake" version="0.22.2" />
+    <package id="Cake" version="0.25.0" />
 </packages>

From 6133837600153d459511995e258f533163897bba Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 21 Jan 2018 20:12:13 +0100
Subject: [PATCH 279/482] Locate tests directory in code.

Rather than using a hard-coded path.
---
 tests/Avalonia.RenderTests/TestBase.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/tests/Avalonia.RenderTests/TestBase.cs b/tests/Avalonia.RenderTests/TestBase.cs
index ae359c5c5f..321dbc4fbe 100644
--- a/tests/Avalonia.RenderTests/TestBase.cs
+++ b/tests/Avalonia.RenderTests/TestBase.cs
@@ -46,7 +46,8 @@ namespace Avalonia.Direct2D1.RenderTests
 
         public TestBase(string outputPath)
         {
-            var testFiles = Path.GetFullPath(@"..\..\..\..\TestFiles\");
+            var testPath = GetTestsDirectory();
+            var testFiles = Path.Combine(testPath, "TestFiles");
 #if AVALONIA_SKIA
             var platform = "Skia";
 #else
@@ -142,6 +143,18 @@ namespace Avalonia.Direct2D1.RenderTests
             }
         }
 
+        private string GetTestsDirectory()
+        {
+            var path = Directory.GetCurrentDirectory();
+
+            while (path.Length > 0 && Path.GetFileName(path) != "tests")
+            {
+                path = Path.GetDirectoryName(path);
+            }
+
+            return path;
+        }
+
         private class TestThreadingInterface : IPlatformThreadingInterface
         {
             public bool CurrentThreadIsLoopThread => MainThread.ManagedThreadId == Thread.CurrentThread.ManagedThreadId;

From 8901f1d78108e4fc33a9e47b41fa17bc9b6f28d1 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 21 Jan 2018 22:45:54 +0100
Subject: [PATCH 280/482] Don't make IGeometryImpl implement IDisposable.

---
 src/Avalonia.Visuals/Platform/IGeometryImpl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Visuals/Platform/IGeometryImpl.cs b/src/Avalonia.Visuals/Platform/IGeometryImpl.cs
index fb813a5981..d93bdc0c20 100644
--- a/src/Avalonia.Visuals/Platform/IGeometryImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IGeometryImpl.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Platform
     /// <summary>
     /// Defines the platform-specific interface for a <see cref="Geometry"/>.
     /// </summary>
-    public interface IGeometryImpl : IDisposable
+    public interface IGeometryImpl
     {
         /// <summary>
         /// Gets the geometry's bounding rectangle.

From 91a0811c18317dfb37551ab05bd66525e8ddc298 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 21 Jan 2018 23:13:31 +0100
Subject: [PATCH 281/482] Removed unused variable.

---
 src/Avalonia.Visuals/Media/RectangleGeometry.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Avalonia.Visuals/Media/RectangleGeometry.cs b/src/Avalonia.Visuals/Media/RectangleGeometry.cs
index fd1e8ac859..3ccfd80f93 100644
--- a/src/Avalonia.Visuals/Media/RectangleGeometry.cs
+++ b/src/Avalonia.Visuals/Media/RectangleGeometry.cs
@@ -16,8 +16,6 @@ namespace Avalonia.Media
         public static readonly StyledProperty<Rect> RectProperty =
             AvaloniaProperty.Register<RectangleGeometry, Rect>(nameof(Rect));
 
-        bool _isDirty = true;
-
         public Rect Rect
         {
             get => GetValue(RectProperty);

From 262d49fb910bb6532f32926a313bbce612f666a6 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 21 Jan 2018 23:27:51 +0100
Subject: [PATCH 282/482] Don't build/restore when running .net core tests.

Everything has already been built.
---
 build.cake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.cake b/build.cake
index 01aefff093..5b7834fa83 100644
--- a/build.cake
+++ b/build.cake
@@ -167,7 +167,9 @@ void RunCoreTest(string project, Parameters parameters, bool coreOnly = false)
         DotNetCoreTest(project,
             new DotNetCoreTestSettings {
                 Configuration = parameters.Configuration,
-                Framework = fw
+                Framework = fw,
+                NoBuild = true,
+                NoRestore = true
             });
     }
 }

From 7458f28ca9a2e31378ce1f92f6c9f1fe8a53dbeb Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 21 Jan 2018 23:39:53 +0100
Subject: [PATCH 283/482] Fix intermittently failing test.

Fixed in https://ci.appveyor.com/project/AvaloniaUI/Avalonia/build/0.1.4466: this should prevent that by keeping both of the data objects alive.
---
 .../Data/ExpressionObserverTests_Observable.cs       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Observable.cs b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Observable.cs
index 62d5c28f49..aa78c100c1 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Observable.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Observable.cs
@@ -103,20 +103,22 @@ namespace Avalonia.Markup.UnitTests.Data
         {
             using (var sync = UnitTestSynchronizationContext.Begin())
             {
-                var data = new Class1();
-                var target = new ExpressionObserver(data, "Next^.Foo", true);
+                var data1 = new Class1();
+                var data2 = new Class2("foo");
+                var target = new ExpressionObserver(data1, "Next^.Foo", true);
                 var result = new List<object>();
 
                 var sub = target.Subscribe(x => result.Add(x));
-                data.Next.OnNext(new Class2("foo"));
+                data1.Next.OnNext(data2);
                 sync.ExecutePostedCallbacks();
 
                 Assert.Equal(new[] { new BindingNotification("foo") }, result);
 
                 sub.Dispose();
-                Assert.Equal(0, data.PropertyChangedSubscriptionCount);
+                Assert.Equal(0, data1.PropertyChangedSubscriptionCount);
 
-                GC.KeepAlive(data);
+                GC.KeepAlive(data1);
+                GC.KeepAlive(data2);
             }
         }
 

From 5cdaf0a32fd5237c3d082837bbae484af68afbc5 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 21 Jan 2018 23:59:37 +0100
Subject: [PATCH 284/482] Removed platform from appveyor.yaml.

As suggested in https://help.appveyor.com/discussions/problems/10117-dotnet-test-with-xunit-fails-because-of-the-wrongly-resolved-path
---
 appveyor.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 76d1ae3e1c..07e3d7db45 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,4 @@
 os: Visual Studio 2017
-platform:
-- Any CPU
 skip_branch_with_pr: true
 configuration:
 - Release

From 51a47b3a946d693d54abbec0e9dd3b184aba1969 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 22 Jan 2018 00:07:19 +0100
Subject: [PATCH 285/482] Instance can be null here.

Was causing intermittently failing test: https://ci.appveyor.com/project/AvaloniaUI/Avalonia/build/0.1.4468
---
 .../Data/Plugins/AvaloniaPropertyAccessorPlugin.cs              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/AvaloniaPropertyAccessorPlugin.cs b/src/Markup/Avalonia.Markup/Data/Plugins/AvaloniaPropertyAccessorPlugin.cs
index 3f6f15ed5b..90eabc69fb 100644
--- a/src/Markup/Avalonia.Markup/Data/Plugins/AvaloniaPropertyAccessorPlugin.cs
+++ b/src/Markup/Avalonia.Markup/Data/Plugins/AvaloniaPropertyAccessorPlugin.cs
@@ -104,7 +104,7 @@ namespace Avalonia.Markup.Data.Plugins
 
             protected override void SubscribeCore(IObserver<object> observer)
             {
-                _subscription = Instance.GetWeakObservable(_property).Subscribe(observer);
+                _subscription = Instance?.GetWeakObservable(_property).Subscribe(observer);
             }
         }
     }

From 1d9e4fdbe5f62ef0993370dd910e09a52dbd70d0 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 22 Jan 2018 00:22:04 +0100
Subject: [PATCH 286/482] Don't pass platform to build.ps1.

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 07e3d7db45..55e703d0d5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,7 +20,7 @@ install:
 before_build:
 - git submodule update --init
 build_script:
-- ps: .\build.ps1 -Target "AppVeyor" -Platform "$env:platform" -Configuration "$env:configuration"
+- ps: .\build.ps1 -Target "AppVeyor" -Configuration "$env:configuration"
 
 test: off
 artifacts:

From 9b099de4a4d3f8c9120e100ae624d47d10c5c744 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 22 Jan 2018 23:14:12 +0100
Subject: [PATCH 287/482] Addressed PR feedback.

---
 src/Avalonia.Visuals/Media/EllipseGeometry.cs | 2 --
 src/Avalonia.Visuals/Media/Geometry.cs        | 4 ++--
 src/Avalonia.Visuals/Media/PathGeometry.cs    | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Visuals/Media/EllipseGeometry.cs b/src/Avalonia.Visuals/Media/EllipseGeometry.cs
index e233eab496..ca84d4cc7b 100644
--- a/src/Avalonia.Visuals/Media/EllipseGeometry.cs
+++ b/src/Avalonia.Visuals/Media/EllipseGeometry.cs
@@ -88,7 +88,5 @@ namespace Avalonia.Media
 
             return geometry;
         }
-
-        private void RectChanged(AvaloniaPropertyChangedEventArgs e) => InvalidateGeometry();
     }
 }
diff --git a/src/Avalonia.Visuals/Media/Geometry.cs b/src/Avalonia.Visuals/Media/Geometry.cs
index 6aff70624d..17c0d2ab74 100644
--- a/src/Avalonia.Visuals/Media/Geometry.cs
+++ b/src/Avalonia.Visuals/Media/Geometry.cs
@@ -89,7 +89,7 @@ namespace Avalonia.Media
         /// <returns><c>true</c> if the geometry contains the point; otherwise, <c>false</c>.</returns>
         public bool FillContains(Point point)
         {
-            return PlatformImpl?.FillContains(point) ?? false;
+            return PlatformImpl?.FillContains(point) == true;
         }
 
         /// <summary>
@@ -100,7 +100,7 @@ namespace Avalonia.Media
         /// <returns><c>true</c> if the geometry contains the point; otherwise, <c>false</c>.</returns>
         public bool StrokeContains(Pen pen, Point point)
         {
-            return PlatformImpl?.StrokeContains(pen, point) ?? false;
+            return PlatformImpl?.StrokeContains(pen, point) == true;
         }
 
         /// <summary>
diff --git a/src/Avalonia.Visuals/Media/PathGeometry.cs b/src/Avalonia.Visuals/Media/PathGeometry.cs
index 3e27d8a461..ecda07ada1 100644
--- a/src/Avalonia.Visuals/Media/PathGeometry.cs
+++ b/src/Avalonia.Visuals/Media/PathGeometry.cs
@@ -23,8 +23,8 @@ namespace Avalonia.Media
                                  AvaloniaProperty.Register<PathGeometry, FillRule>(nameof(FillRule));
 
         private PathFigures _figures;
-        private IDisposable _figuresObserver = null;
-        private IDisposable _figuresPropertiesObserver = null;
+        private IDisposable _figuresObserver;
+        private IDisposable _figuresPropertiesObserver;
 
         static PathGeometry()
         {

From 8bacf38524aee630e8db7eb5e7769a414af297c2 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 23 Jan 2018 00:18:39 +0100
Subject: [PATCH 288/482] Do a proper .NET core build.

---
 Avalonia.sln | 14 ++------------
 build.cake   | 11 ++++++++++-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Avalonia.sln b/Avalonia.sln
index 679ef1579e..6c99892172 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -45,7 +45,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Layout.UnitTests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Interactivity.UnitTests", "tests\Avalonia.Interactivity.UnitTests\Avalonia.Interactivity.UnitTests.csproj", "{08478EF5-44E8-42E9-92D6-15E00EC038D8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Direct2D1.RenderTests", "tests\Avalonia.Direct2D1.RenderTests\Avalonia.Direct2D1.RenderTests.csproj", "{DABFD304-D6A4-4752-8123-C2CCF7AC7831}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Direct2D1.RenderTests", "tests\Avalonia.Direct2D1.RenderTests\Avalonia.Direct2D1.RenderTests.csproj", "{DABFD304-D6A4-4752-8123-C2CCF7AC7831}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Input.UnitTests", "tests\Avalonia.Input.UnitTests\Avalonia.Input.UnitTests.csproj", "{AC18926A-E784-40FE-B09D-BB0FE2B599F0}"
 EndProject
@@ -1315,7 +1315,6 @@ Global
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|Mono.ActiveCfg = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|Mono.Build.0 = Release|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|x86.ActiveCfg = Release|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|x86.Build.0 = Release|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1541,7 +1540,6 @@ Global
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|Mono.ActiveCfg = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|Mono.Build.0 = Release|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|x86.ActiveCfg = Release|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|x86.Build.0 = Release|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1693,7 +1691,6 @@ Global
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|Mono.ActiveCfg = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|Mono.Build.0 = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|x86.ActiveCfg = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|x86.Build.0 = Release|Any CPU
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
@@ -1831,7 +1828,6 @@ Global
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|Mono.ActiveCfg = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|Mono.Build.0 = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|x86.ActiveCfg = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|x86.Build.0 = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1907,7 +1903,6 @@ Global
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Release|Mono.ActiveCfg = Release|Any CPU
-		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Release|Mono.Build.0 = Release|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Release|x86.ActiveCfg = Release|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Release|x86.Build.0 = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -2042,6 +2037,7 @@ Global
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|Mono.ActiveCfg = Release|Any CPU
+		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|Mono.Build.0 = Release|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|x86.ActiveCfg = Release|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|x86.Build.0 = Release|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -2281,7 +2277,6 @@ Global
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|Mono.ActiveCfg = Release|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|Mono.Build.0 = Release|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|x86.ActiveCfg = Release|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|x86.Build.0 = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -2321,7 +2316,6 @@ Global
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|Mono.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|Mono.Build.0 = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|x86.ActiveCfg = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|x86.Build.0 = Release|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2441,7 +2435,6 @@ Global
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|Mono.ActiveCfg = Release|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|Mono.Build.0 = Release|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|x86.ActiveCfg = Release|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|x86.Build.0 = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -2481,7 +2474,6 @@ Global
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Mono.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Mono.Build.0 = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|x86.ActiveCfg = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|x86.Build.0 = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -2521,7 +2513,6 @@ Global
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Mono.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Mono.Build.0 = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|x86.ActiveCfg = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|x86.Build.0 = Release|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2601,7 +2592,6 @@ Global
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|Mono.ActiveCfg = Release|Any CPU
-		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|Mono.Build.0 = Release|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|x86.ActiveCfg = Release|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
diff --git a/build.cake b/build.cake
index 5b7834fa83..58fa636798 100644
--- a/build.cake
+++ b/build.cake
@@ -124,7 +124,16 @@ Task("Restore-NuGet-Packages")
 
 void DotNetCoreBuild()
 {
-    DotNetCoreBuild("samples\\ControlCatalog.NetCore");
+    var settings = new DotNetCoreBuildSettings 
+    {
+        Configuration = parameters.Configuration,
+        MSBuildSettings = new DotNetCoreMSBuildSettings(),
+    };
+
+    settings.MSBuildSettings.SetConfiguration(parameters.Configuration);
+    settings.MSBuildSettings.WithProperty("Platform", "\"" + parameters.Platform + "\"");
+
+    DotNetCoreBuild(parameters.MSBuildSolution, settings);
 }
 
 Task("Build")

From 6b9e93d26723454ddb616c49f12975d774d89f77 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 25 Jan 2018 00:16:49 +0100
Subject: [PATCH 289/482] Fix window child constraint.

Instead of measuring the child and then clipping the child's desired size based on `SizeToContent`, instead pass a constraint based on `SizeToContent` to the child.
---
 src/Avalonia.Controls/Window.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 64912f20df..7fed712e07 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -373,28 +373,28 @@ namespace Avalonia.Controls
         protected override Size MeasureOverride(Size availableSize)
         {
             var sizeToContent = SizeToContent;
-            var size = ClientSize;
-            var desired = base.MeasureOverride(availableSize.Constrain(_maxPlatformClientSize));
+            var clientSize = ClientSize;
+            Size constraint;
 
             switch (sizeToContent)
             {
                 case SizeToContent.Width:
-                    size = new Size(desired.Width, ClientSize.Height);
+                    constraint = new Size(double.PositiveInfinity, ClientSize.Height);
                     break;
                 case SizeToContent.Height:
-                    size = new Size(ClientSize.Width, desired.Height);
+                    constraint = new Size(ClientSize.Width, double.PositiveInfinity);
                     break;
                 case SizeToContent.WidthAndHeight:
-                    size = new Size(desired.Width, desired.Height);
+                    constraint = Size.Infinity;
                     break;
                 case SizeToContent.Manual:
-                    size = ClientSize;
+                    constraint = ClientSize;
                     break;
                 default:
                     throw new InvalidOperationException("Invalid value for SizeToContent.");
             }
 
-            return size;
+            return base.MeasureOverride(constraint);
         }
 
         protected override void HandleClosed()

From b9ebff3fb20fa139b650bbe7a3d71b596cd83f6c Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 25 Jan 2018 00:22:16 +0100
Subject: [PATCH 290/482] Fixed malformed doc comment.

---
 src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
index edbecd95a4..a68979cfa1 100644
--- a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
@@ -131,6 +131,7 @@ namespace Avalonia.Controls.Presenters
             private set { SetAndRaise(ViewportProperty, ref _viewport, value); }
         }
 
+        /// <summary>
         /// Attempts to bring a portion of the target visual into view by scrolling the content.
         /// </summary>
         /// <param name="target">The target visual.</param>

From 30e78dc5b63d6254d8b1198af2f7dc0f5a232cd4 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 25 Jan 2018 01:37:05 +0100
Subject: [PATCH 291/482] Only run unit tests on .net core.

This allows us to run them on linux.
---
 build/JetBrains.dotMemoryUnit.props           |   2 +-
 .../Avalonia.Base.UnitTests.csproj            |   2 +-
 .../Avalonia.Benchmarks.csproj                | 112 ++-------------
 .../Properties/AssemblyInfo.cs                |  36 -----
 .../Avalonia.Controls.UnitTests.csproj        |   2 +-
 .../Avalonia.Direct2D1.UnitTests.csproj       |   2 +-
 .../Avalonia.Input.UnitTests.csproj           |   2 +-
 .../Avalonia.Interactivity.UnitTests.csproj   |   2 +-
 .../Avalonia.Layout.UnitTests.csproj          |   2 +-
 .../Avalonia.LeakTests.csproj                 | 136 +++---------------
 .../Properties/AssemblyInfo.cs                |  40 ------
 .../Avalonia.Markup.UnitTests.csproj          |   2 +-
 .../Avalonia.Markup.Xaml.UnitTests.csproj     |   2 +-
 .../Avalonia.Styling.UnitTests.csproj         |   2 +-
 .../Avalonia.UnitTests.csproj                 |  19 +--
 .../Avalonia.Visuals.UnitTests.csproj         |   2 +-
 16 files changed, 47 insertions(+), 318 deletions(-)
 delete mode 100644 tests/Avalonia.Benchmarks/Properties/AssemblyInfo.cs
 delete mode 100644 tests/Avalonia.LeakTests/Properties/AssemblyInfo.cs

diff --git a/build/JetBrains.dotMemoryUnit.props b/build/JetBrains.dotMemoryUnit.props
index b4cf4def5b..1713dead68 100644
--- a/build/JetBrains.dotMemoryUnit.props
+++ b/build/JetBrains.dotMemoryUnit.props
@@ -1,5 +1,5 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="JetBrains.dotMemoryUnit" Version="2.1.20150828.125449" />
+    <PackageReference Include="JetBrains.dotMemoryUnit" Version="3.0.20171219.105559" />
   </ItemGroup>
 </Project>
diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
index f8ec52a6c7..373b3f7196 100644
--- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
+++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
diff --git a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
index d40dc596a5..9e92baf0ff 100644
--- a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
+++ b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
@@ -1,107 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Avalonia.Benchmarks</RootNamespace>
-    <AssemblyName>Avalonia.Benchmarks</AssemblyName>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Build" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
   <ItemGroup>
-    <Compile Include="Base\Properties.cs" />
-    <Compile Include="Layout\Measure.cs" />
-    <Compile Include="Styling\ApplyStyling.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj">
-      <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
-      <Name>Avalonia.Animation</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj">
-      <Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
-      <Name>Avalonia.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj">
-      <Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
-      <Name>Avalonia.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj">
-      <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
-      <Name>Avalonia.Input</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj">
-      <Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
-      <Name>Avalonia.Interactivity</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj">
-      <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
-      <Name>Avalonia.Layout</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj">
-      <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
-      <Name>Avalonia.Visuals</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj">
-      <Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
-      <Name>Avalonia.Styling</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj">
-      <Project>{3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f}</Project>
-      <Name>Avalonia.Themes.Default</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj">
-      <Project>{88060192-33d5-4932-b0f9-8bd2763e857d}</Project>
-      <Name>Avalonia.UnitTests</Name>
-    </ProjectReference>
+    <PackageReference Include="BenchmarkDotNet" Version="0.10.8" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.10.8" />
+    <Folder Include="Properties\" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/Avalonia.Benchmarks/Properties/AssemblyInfo.cs b/tests/Avalonia.Benchmarks/Properties/AssemblyInfo.cs
deleted file mode 100644
index 0854d25f73..0000000000
--- a/tests/Avalonia.Benchmarks/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Avalonia.Benchmarks")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Avalonia.Benchmarks")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("410ac439-81a1-4eb5-b5e9-6a7fc6b77f4b")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
index a63898486b..fe7e48e085 100644
--- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
+++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
diff --git a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
index f6b5d11af1..b09902332b 100644
--- a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
+++ b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
   <Import Project="..\..\build\Moq.props" />
diff --git a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
index 1f66290dd9..1b2ba3c7de 100644
--- a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
+++ b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
diff --git a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj
index 3fb2439af8..bc883d0251 100644
--- a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj
+++ b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
diff --git a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
index ae6f4d463a..ec8f1e6e8d 100644
--- a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
+++ b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
diff --git a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
index 7ecc3797ed..c945db8085 100644
--- a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
+++ b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
@@ -1,125 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E1AA3DBF-9056-4530-9376-18119A7A3FFE}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Avalonia.LeakTests</RootNamespace>
-    <AssemblyName>Avalonia.LeakTests</AssemblyName>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <TargetFrameworkProfile />
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AvaloniaObjectTests.cs" />
-    <Compile Include="ControlTests.cs" />
-    <Compile Include="ExpressionObserverTests.cs" />
-    <Compile Include="MemberSelectorTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
+  <Import Project="..\..\build\JetBrains.dotMemoryUnit.props" />
+  <Import Project="..\..\build\Moq.props" />
+  <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\XUnit.props" />
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.DotNetFrameworkRuntime\Avalonia.DotNetFrameworkRuntime.csproj">
-      <Project>{4a1abb09-9047-4bd5-a4ad-a055e52c5ee0}</Project>
-      <Name>Avalonia.DotNetFrameworkRuntime</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj">
-      <Project>{3e53a01a-b331-47f3-b828-4a5717e77a24}</Project>
-      <Name>Avalonia.Markup.Xaml</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj">
-      <Project>{6417e941-21bc-467b-a771-0de389353ce6}</Project>
-      <Name>Avalonia.Markup</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj">
-      <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
-      <Name>Avalonia.Animation</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj">
-      <Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
-      <Name>Avalonia.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj">
-      <Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
-      <Name>Avalonia.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj">
-      <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
-      <Name>Avalonia.Input</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj">
-      <Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
-      <Name>Avalonia.Interactivity</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj">
-      <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
-      <Name>Avalonia.Layout</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj">
-      <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
-      <Name>Avalonia.Visuals</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj">
-      <Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
-      <Name>Avalonia.Styling</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj">
-      <Project>{3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f}</Project>
-      <Name>Avalonia.Themes.Default</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Avalonia.Controls.UnitTests\Avalonia.Controls.UnitTests.csproj">
-      <Project>{5ccb5571-7c30-4e7d-967d-0e2158ebd91f}</Project>
-      <Name>Avalonia.Controls.UnitTests</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj">
-      <Project>{88060192-33d5-4932-b0f9-8bd2763e857d}</Project>
-      <Name>Avalonia.UnitTests</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\Avalonia.DotNetCoreRuntime\Avalonia.DotNetCoreRuntime.csproj" />
+    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
+    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\Avalonia.Controls.UnitTests\Avalonia.Controls.UnitTests.csproj" />
+    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Readme.txt" />
+    <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\build\JetBrains.dotMemoryUnit.props" />
-  <Import Project="..\..\build\Moq.props" />
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\XUnit.props" />
 </Project>
\ No newline at end of file
diff --git a/tests/Avalonia.LeakTests/Properties/AssemblyInfo.cs b/tests/Avalonia.LeakTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 4b66452274..0000000000
--- a/tests/Avalonia.LeakTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Xunit;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Avalonia.LeakTests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Avalonia.LeakTests")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("e1aa3dbf-9056-4530-9376-18119a7a3ffe")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-
-// Don't run tests in parallel.
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj
index 4db9bc45ad..3307b807ea 100644
--- a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj
+++ b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
index 02fbf23687..0915684cf1 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
diff --git a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj
index 87d6e4504c..e65dd848dd 100644
--- a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj
+++ b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <NoWarn>CS0067</NoWarn>
   </PropertyGroup>
diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
index c2580ec004..6fe61b17f7 100644
--- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
+++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
@@ -1,26 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputType>Library</OutputType>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj b/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj
index 74a48f9ce7..2b559c9c56 100644
--- a/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj
+++ b/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
   <Import Project="..\..\build\Moq.props" />

From 9cb871e901b6838a9c499c37f315ffcd3594ee10 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 25 Jan 2018 20:55:15 +0100
Subject: [PATCH 292/482] Don't run tests on net47 in build.cake.

---
 build.cake | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build.cake b/build.cake
index 58fa636798..20d77e25d3 100644
--- a/build.cake
+++ b/build.cake
@@ -165,8 +165,6 @@ void RunCoreTest(string project, Parameters parameters, bool coreOnly = false)
         project = System.IO.Path.Combine(project, System.IO.Path.GetFileName(project)+".csproj");
     Information("Running tests from " + project);
     var frameworks = new List<string>(){"netcoreapp2.0"};
-    if(parameters.IsRunningOnWindows)
-        frameworks.Add("net47");
     foreach(var fw in frameworks)
     {
         if(!fw.StartsWith("netcoreapp") && coreOnly)

From c4a5d3722b0387d22b1ad3cfea8f163f9d868e73 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 26 Jan 2018 08:29:41 +0100
Subject: [PATCH 293/482] Don't build RenderTest in mono config.

---
 Avalonia.sln | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/Avalonia.sln b/Avalonia.sln
index 6c99892172..3562047284 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -94,11 +94,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.iOS", "src\iOS\Ava
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.iOSTestApplication", "src\iOS\Avalonia.iOSTestApplication\Avalonia.iOSTestApplication.csproj", "{8C923867-8A8F-4F6B-8B80-47D9E8436166}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.LeakTests", "tests\Avalonia.LeakTests\Avalonia.LeakTests.csproj", "{E1AA3DBF-9056-4530-9376-18119A7A3FFE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.LeakTests", "tests\Avalonia.LeakTests\Avalonia.LeakTests.csproj", "{E1AA3DBF-9056-4530-9376-18119A7A3FFE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.UnitTests", "tests\Avalonia.UnitTests\Avalonia.UnitTests.csproj", "{88060192-33D5-4932-B0F9-8BD2763E857D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Benchmarks", "tests\Avalonia.Benchmarks\Avalonia.Benchmarks.csproj", "{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Benchmarks", "tests\Avalonia.Benchmarks\Avalonia.Benchmarks.csproj", "{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Logging.Serilog", "src\Avalonia.Logging.Serilog\Avalonia.Logging.Serilog.csproj", "{B61B66A3-B82D-4875-8001-89D3394FE0C9}"
 EndProject
@@ -1305,7 +1305,6 @@ Global
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|Mono.Build.0 = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|x86.Build.0 = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1530,7 +1529,6 @@ Global
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|Mono.Build.0 = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|x86.Build.0 = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1681,7 +1679,6 @@ Global
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|Mono.Build.0 = Debug|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|x86.Build.0 = Debug|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1818,7 +1815,6 @@ Global
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|Mono.Build.0 = Debug|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|x86.Build.0 = Debug|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1893,7 +1889,6 @@ Global
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Debug|Mono.Build.0 = Debug|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Debug|x86.Build.0 = Debug|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1932,7 +1927,6 @@ Global
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|Mono.Build.0 = Debug|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|x86.Build.0 = Debug|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1942,7 +1936,6 @@ Global
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|Mono.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|Mono.Build.0 = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|x86.ActiveCfg = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|x86.Build.0 = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -2028,6 +2021,7 @@ Global
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|Mono.Build.0 = Debug|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|x86.Build.0 = Debug|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2267,7 +2261,6 @@ Global
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|Mono.Build.0 = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|x86.Build.0 = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2306,7 +2299,6 @@ Global
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|Mono.Build.0 = Debug|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|x86.Build.0 = Debug|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2425,7 +2417,6 @@ Global
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|Mono.Build.0 = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|x86.Build.0 = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2464,7 +2455,6 @@ Global
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Mono.Build.0 = Debug|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|x86.Build.0 = Debug|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2503,7 +2493,6 @@ Global
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Mono.Build.0 = Debug|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|x86.Build.0 = Debug|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2582,7 +2571,6 @@ Global
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|Mono.Build.0 = Debug|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|x86.Build.0 = Debug|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|Any CPU.ActiveCfg = Release|Any CPU

From 2c14b70d0a8300b6a71c1b0535076364c5dbee61 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 27 Jan 2018 01:56:55 +0100
Subject: [PATCH 294/482] Renamed Mono sln Config to NetCoreOnly.

---
 .travis.yml  |   2 +-
 Avalonia.sln | 732 +++++++++++++++++++++++++--------------------------
 build.ps1    |   2 +-
 3 files changed, 368 insertions(+), 368 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9fb48a024e..fdffaba477 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ mono:
   - 5.2.0
 dotnet: 2.0.0
 script:
-  - ./build.sh --target "Travis" --platform "Mono" --configuration "Release"
+  - ./build.sh --target "Travis" --platform "NetCoreOnly" --configuration "Release"
 notifications:
   email: false
   webhooks:
diff --git a/Avalonia.sln b/Avalonia.sln
index 3562047284..7cf2cf3b8a 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -211,22 +211,22 @@ Global
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
 		Ad-Hoc|iPhone = Ad-Hoc|iPhone
 		Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator
-		Ad-Hoc|Mono = Ad-Hoc|Mono
+		Ad-Hoc|NetCoreOnly = Ad-Hoc|NetCoreOnly
 		Ad-Hoc|x86 = Ad-Hoc|x86
 		AppStore|Any CPU = AppStore|Any CPU
 		AppStore|iPhone = AppStore|iPhone
 		AppStore|iPhoneSimulator = AppStore|iPhoneSimulator
-		AppStore|Mono = AppStore|Mono
+		AppStore|NetCoreOnly = AppStore|NetCoreOnly
 		AppStore|x86 = AppStore|x86
 		Debug|Any CPU = Debug|Any CPU
 		Debug|iPhone = Debug|iPhone
 		Debug|iPhoneSimulator = Debug|iPhoneSimulator
-		Debug|Mono = Debug|Mono
+		Debug|NetCoreOnly = Debug|NetCoreOnly
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
 		Release|iPhone = Release|iPhone
 		Release|iPhoneSimulator = Release|iPhoneSimulator
-		Release|Mono = Release|Mono
+		Release|NetCoreOnly = Release|NetCoreOnly
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
@@ -236,7 +236,7 @@ Global
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -245,7 +245,7 @@ Global
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.AppStore|x86.Build.0 = Debug|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -254,8 +254,8 @@ Global
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|Mono.Build.0 = Debug|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Debug|x86.Build.0 = Debug|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -264,8 +264,8 @@ Global
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|iPhone.Build.0 = Release|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|Mono.ActiveCfg = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|Mono.Build.0 = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|x86.ActiveCfg = Release|Any CPU
 		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|x86.Build.0 = Release|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -274,7 +274,7 @@ Global
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -283,7 +283,7 @@ Global
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.AppStore|x86.Build.0 = Debug|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -292,8 +292,8 @@ Global
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|Mono.Build.0 = Debug|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Debug|x86.Build.0 = Debug|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -302,8 +302,8 @@ Global
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|iPhone.Build.0 = Release|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|Mono.ActiveCfg = Release|Any CPU
-		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|Mono.Build.0 = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|x86.ActiveCfg = Release|Any CPU
 		{EB582467-6ABB-43A1-B052-E981BA910E3A}.Release|x86.Build.0 = Release|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -312,7 +312,7 @@ Global
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -321,7 +321,7 @@ Global
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.AppStore|x86.Build.0 = Debug|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -330,8 +330,8 @@ Global
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|Mono.Build.0 = Debug|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.Debug|x86.Build.0 = Debug|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -340,8 +340,8 @@ Global
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|iPhone.Build.0 = Release|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|Mono.ActiveCfg = Release|Any CPU
-		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|Mono.Build.0 = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|x86.ActiveCfg = Release|Any CPU
 		{42472427-4774-4C81-8AFF-9F27B8E31721}.Release|x86.Build.0 = Release|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -350,7 +350,7 @@ Global
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -359,7 +359,7 @@ Global
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.AppStore|x86.Build.0 = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -368,7 +368,7 @@ Global
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|x86.Build.0 = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -377,7 +377,7 @@ Global
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|iPhone.Build.0 = Release|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|Mono.ActiveCfg = Release|Any CPU
+		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|x86.ActiveCfg = Release|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|x86.Build.0 = Release|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -386,7 +386,7 @@ Global
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -395,7 +395,7 @@ Global
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.AppStore|x86.Build.0 = Debug|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -404,7 +404,7 @@ Global
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|x86.Build.0 = Debug|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -413,7 +413,7 @@ Global
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|iPhone.Build.0 = Release|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|Mono.ActiveCfg = Release|Any CPU
+		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|x86.ActiveCfg = Release|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|x86.Build.0 = Release|Any CPU
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -422,7 +422,7 @@ Global
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EC42600F-049B-43FF-AED1-8314D61B2749}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{EC42600F-049B-43FF-AED1-8314D61B2749}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.AppStore|Any CPU.Build.0 = Release|Any CPU
@@ -430,7 +430,7 @@ Global
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EC42600F-049B-43FF-AED1-8314D61B2749}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{EC42600F-049B-43FF-AED1-8314D61B2749}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -438,7 +438,7 @@ Global
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{EC42600F-049B-43FF-AED1-8314D61B2749}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{EC42600F-049B-43FF-AED1-8314D61B2749}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.Release|Any CPU.Build.0 = Release|Any CPU
@@ -446,7 +446,7 @@ Global
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.Release|iPhone.Build.0 = Release|Any CPU
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EC42600F-049B-43FF-AED1-8314D61B2749}.Release|Mono.ActiveCfg = Release|Any CPU
+		{EC42600F-049B-43FF-AED1-8314D61B2749}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{EC42600F-049B-43FF-AED1-8314D61B2749}.Release|x86.ActiveCfg = Release|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
@@ -454,7 +454,7 @@ Global
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -463,7 +463,7 @@ Global
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.AppStore|x86.Build.0 = Debug|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -472,8 +472,8 @@ Global
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|Mono.Build.0 = Debug|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Debug|x86.Build.0 = Debug|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -482,8 +482,8 @@ Global
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|iPhone.Build.0 = Release|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|Mono.ActiveCfg = Release|Any CPU
-		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|Mono.Build.0 = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|x86.ActiveCfg = Release|Any CPU
 		{62024B2D-53EB-4638-B26B-85EEAA54866E}.Release|x86.Build.0 = Release|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -492,7 +492,7 @@ Global
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -501,7 +501,7 @@ Global
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.AppStore|x86.Build.0 = Debug|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -510,8 +510,8 @@ Global
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|Mono.Build.0 = Debug|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Debug|x86.Build.0 = Debug|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -520,8 +520,8 @@ Global
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|iPhone.Build.0 = Release|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|Mono.ActiveCfg = Release|Any CPU
-		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|Mono.Build.0 = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|x86.ActiveCfg = Release|Any CPU
 		{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}.Release|x86.Build.0 = Release|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -530,7 +530,7 @@ Global
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -539,7 +539,7 @@ Global
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.AppStore|x86.Build.0 = Debug|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -548,8 +548,8 @@ Global
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|Mono.Build.0 = Debug|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Debug|x86.Build.0 = Debug|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -558,8 +558,8 @@ Global
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|iPhone.Build.0 = Release|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|Mono.ActiveCfg = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|Mono.Build.0 = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|x86.ActiveCfg = Release|Any CPU
 		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|x86.Build.0 = Release|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -568,7 +568,7 @@ Global
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -577,7 +577,7 @@ Global
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.AppStore|x86.Build.0 = Debug|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -586,8 +586,8 @@ Global
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|Mono.Build.0 = Debug|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Debug|x86.Build.0 = Debug|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -596,8 +596,8 @@ Global
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|iPhone.Build.0 = Release|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|Mono.ActiveCfg = Release|Any CPU
-		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|Mono.Build.0 = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|x86.ActiveCfg = Release|Any CPU
 		{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}.Release|x86.Build.0 = Release|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -606,7 +606,7 @@ Global
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -615,7 +615,7 @@ Global
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.AppStore|x86.Build.0 = Debug|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -624,8 +624,8 @@ Global
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|Mono.Build.0 = Debug|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Debug|x86.Build.0 = Debug|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -634,8 +634,8 @@ Global
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|iPhone.Build.0 = Release|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|Mono.ActiveCfg = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|Mono.Build.0 = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|x86.ActiveCfg = Release|Any CPU
 		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|x86.Build.0 = Release|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -644,7 +644,7 @@ Global
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -653,7 +653,7 @@ Global
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.AppStore|x86.Build.0 = Debug|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -662,8 +662,8 @@ Global
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|Mono.Build.0 = Debug|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Debug|x86.Build.0 = Debug|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -672,8 +672,8 @@ Global
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|iPhone.Build.0 = Release|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|Mono.ActiveCfg = Release|Any CPU
-		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|Mono.Build.0 = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|x86.ActiveCfg = Release|Any CPU
 		{7062AE20-5DCC-4442-9645-8195BDECE63E}.Release|x86.Build.0 = Release|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -682,7 +682,7 @@ Global
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -691,7 +691,7 @@ Global
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.AppStore|x86.Build.0 = Debug|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -700,8 +700,8 @@ Global
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|Mono.Build.0 = Debug|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Debug|x86.Build.0 = Debug|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -710,8 +710,8 @@ Global
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|iPhone.Build.0 = Release|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|Mono.ActiveCfg = Release|Any CPU
-		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|Mono.Build.0 = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|x86.ActiveCfg = Release|Any CPU
 		{D211E587-D8BC-45B9-95A4-F297C8FA5200}.Release|x86.Build.0 = Release|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -720,7 +720,7 @@ Global
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -729,7 +729,7 @@ Global
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.AppStore|x86.Build.0 = Debug|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -738,8 +738,8 @@ Global
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|Mono.Build.0 = Debug|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Debug|x86.Build.0 = Debug|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -748,8 +748,8 @@ Global
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|iPhone.Build.0 = Release|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|Mono.ActiveCfg = Release|Any CPU
-		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|Mono.Build.0 = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|x86.ActiveCfg = Release|Any CPU
 		{47ECDF59-DEF8-4C53-87B1-2098A3429059}.Release|x86.Build.0 = Release|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -758,7 +758,7 @@ Global
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -767,7 +767,7 @@ Global
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.AppStore|x86.Build.0 = Debug|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -776,8 +776,8 @@ Global
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|Mono.Build.0 = Debug|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Debug|x86.Build.0 = Debug|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -786,8 +786,8 @@ Global
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|iPhone.Build.0 = Release|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|Mono.ActiveCfg = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|Mono.Build.0 = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|x86.ActiveCfg = Release|Any CPU
 		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|x86.Build.0 = Release|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -796,7 +796,7 @@ Global
 		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -805,7 +805,7 @@ Global
 		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.AppStore|x86.Build.0 = Debug|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -814,8 +814,8 @@ Global
 		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|Mono.Build.0 = Debug|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.Debug|x86.Build.0 = Debug|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -824,8 +824,8 @@ Global
 		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|iPhone.Build.0 = Release|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|Mono.ActiveCfg = Release|Any CPU
-		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|Mono.Build.0 = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|x86.ActiveCfg = Release|Any CPU
 		{76716382-3159-460E-BDA6-C5715CF606D7}.Release|x86.Build.0 = Release|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -834,7 +834,7 @@ Global
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -843,7 +843,7 @@ Global
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.AppStore|x86.Build.0 = Debug|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -852,8 +852,8 @@ Global
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|Mono.Build.0 = Debug|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|x86.Build.0 = Debug|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -862,8 +862,8 @@ Global
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|iPhone.Build.0 = Release|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|Mono.ActiveCfg = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|Mono.Build.0 = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|x86.ActiveCfg = Release|Any CPU
 		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|x86.Build.0 = Release|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -872,7 +872,7 @@ Global
 		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -881,7 +881,7 @@ Global
 		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.AppStore|x86.Build.0 = Debug|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -890,8 +890,8 @@ Global
 		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|Mono.Build.0 = Debug|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.Debug|x86.Build.0 = Debug|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -900,8 +900,8 @@ Global
 		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|iPhone.Build.0 = Release|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|Mono.ActiveCfg = Release|Any CPU
-		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|Mono.Build.0 = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|x86.ActiveCfg = Release|Any CPU
 		{DB070A10-BF39-4752-8456-86E9D5928478}.Release|x86.Build.0 = Release|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -910,7 +910,7 @@ Global
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -919,7 +919,7 @@ Global
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.AppStore|x86.Build.0 = Debug|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -928,8 +928,8 @@ Global
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|Mono.Build.0 = Debug|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Debug|x86.Build.0 = Debug|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -938,8 +938,8 @@ Global
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|iPhone.Build.0 = Release|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|Mono.ActiveCfg = Release|Any CPU
-		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|Mono.Build.0 = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|x86.ActiveCfg = Release|Any CPU
 		{08478EF5-44E8-42E9-92D6-15E00EC038D8}.Release|x86.Build.0 = Release|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -948,7 +948,7 @@ Global
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -957,7 +957,7 @@ Global
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.AppStore|x86.Build.0 = Debug|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -966,7 +966,7 @@ Global
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Debug|x86.Build.0 = Debug|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -975,7 +975,7 @@ Global
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|iPhone.Build.0 = Release|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|Mono.ActiveCfg = Release|Any CPU
+		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|x86.ActiveCfg = Release|Any CPU
 		{DABFD304-D6A4-4752-8123-C2CCF7AC7831}.Release|x86.Build.0 = Release|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -984,7 +984,7 @@ Global
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -993,7 +993,7 @@ Global
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.AppStore|x86.Build.0 = Debug|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1002,8 +1002,8 @@ Global
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|Mono.Build.0 = Debug|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Debug|x86.Build.0 = Debug|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1012,8 +1012,8 @@ Global
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|iPhone.Build.0 = Release|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|Mono.ActiveCfg = Release|Any CPU
-		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|Mono.Build.0 = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|x86.ActiveCfg = Release|Any CPU
 		{AC18926A-E784-40FE-B09D-BB0FE2B599F0}.Release|x86.Build.0 = Release|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1022,7 +1022,7 @@ Global
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1031,7 +1031,7 @@ Global
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.AppStore|x86.Build.0 = Debug|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1040,7 +1040,7 @@ Global
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Debug|x86.Build.0 = Debug|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1049,7 +1049,7 @@ Global
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|iPhone.Build.0 = Release|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|Mono.ActiveCfg = Release|Any CPU
+		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|x86.ActiveCfg = Release|Any CPU
 		{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}.Release|x86.Build.0 = Release|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1058,7 +1058,7 @@ Global
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1067,7 +1067,7 @@ Global
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.AppStore|x86.Build.0 = Debug|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1076,8 +1076,8 @@ Global
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|Mono.Build.0 = Debug|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|x86.Build.0 = Debug|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1086,8 +1086,8 @@ Global
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|iPhone.Build.0 = Release|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|Mono.ActiveCfg = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|Mono.Build.0 = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|x86.ActiveCfg = Release|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|x86.Build.0 = Release|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1096,7 +1096,7 @@ Global
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1105,7 +1105,7 @@ Global
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.AppStore|x86.Build.0 = Debug|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1114,8 +1114,8 @@ Global
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|Mono.Build.0 = Debug|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|x86.Build.0 = Debug|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1124,8 +1124,8 @@ Global
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|iPhone.Build.0 = Release|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|Mono.ActiveCfg = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|Mono.Build.0 = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|x86.ActiveCfg = Release|Any CPU
 		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|x86.Build.0 = Release|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1134,7 +1134,7 @@ Global
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1143,7 +1143,7 @@ Global
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.AppStore|x86.Build.0 = Debug|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1152,8 +1152,8 @@ Global
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|Mono.Build.0 = Debug|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Debug|x86.Build.0 = Debug|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1162,8 +1162,8 @@ Global
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|iPhone.Build.0 = Release|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|Mono.ActiveCfg = Release|Any CPU
-		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|Mono.Build.0 = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|x86.ActiveCfg = Release|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|x86.Build.0 = Release|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1172,7 +1172,7 @@ Global
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1181,7 +1181,7 @@ Global
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|x86.Build.0 = Debug|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1190,8 +1190,8 @@ Global
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|Mono.Build.0 = Debug|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|x86.Build.0 = Debug|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1200,8 +1200,8 @@ Global
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|iPhone.Build.0 = Release|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|Mono.ActiveCfg = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|Mono.Build.0 = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|x86.ActiveCfg = Release|Any CPU
 		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|x86.Build.0 = Release|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1210,7 +1210,7 @@ Global
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1219,7 +1219,7 @@ Global
 		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.AppStore|x86.Build.0 = Debug|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1228,8 +1228,8 @@ Global
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|Mono.Build.0 = Debug|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Debug|x86.Build.0 = Debug|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1238,8 +1238,8 @@ Global
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|iPhone.Build.0 = Release|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|Mono.ActiveCfg = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|Mono.Build.0 = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|x86.ActiveCfg = Release|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|x86.Build.0 = Release|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1248,7 +1248,7 @@ Global
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1257,7 +1257,7 @@ Global
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.AppStore|x86.Build.0 = Debug|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1266,8 +1266,8 @@ Global
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|Mono.Build.0 = Debug|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Debug|x86.Build.0 = Debug|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1276,8 +1276,8 @@ Global
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|iPhone.Build.0 = Release|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|Mono.ActiveCfg = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|Mono.Build.0 = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|x86.ActiveCfg = Release|Any CPU
 		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|x86.Build.0 = Release|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1286,7 +1286,7 @@ Global
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1295,7 +1295,7 @@ Global
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.AppStore|x86.Build.0 = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1304,7 +1304,7 @@ Global
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Debug|x86.Build.0 = Debug|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1313,58 +1313,58 @@ Global
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|iPhone.Build.0 = Release|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|Mono.ActiveCfg = Release|Any CPU
+		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|x86.ActiveCfg = Release|Any CPU
 		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|x86.Build.0 = Release|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.AppStore|iPhone.ActiveCfg = Release|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.AppStore|x86.Build.0 = Debug|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Debug|x86.Build.0 = Debug|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Release|iPhone.ActiveCfg = Release|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Release|Mono.ActiveCfg = Release|Any CPU
+		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Release|x86.ActiveCfg = Release|Any CPU
 		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Release|x86.Build.0 = Release|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.AppStore|iPhone.ActiveCfg = Release|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{FF69B927-C545-49AE-8E16-3D14D621AA12}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|Any CPU.Deploy.0 = Release|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|iPhone.ActiveCfg = Release|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|Mono.ActiveCfg = Release|Any CPU
+		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|x86.ActiveCfg = Release|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
@@ -1372,7 +1372,7 @@ Global
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1381,7 +1381,7 @@ Global
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|x86.Build.0 = Debug|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1390,7 +1390,7 @@ Global
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|x86.Build.0 = Debug|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1399,7 +1399,7 @@ Global
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|iPhone.Build.0 = Release|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|Mono.ActiveCfg = Release|Any CPU
+		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|x86.ActiveCfg = Release|Any CPU
 		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|x86.Build.0 = Release|Any CPU
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
@@ -1407,28 +1407,28 @@ Global
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Ad-Hoc|Mono.ActiveCfg = Ad-Hoc|iPhoneSimulator
+		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Ad-Hoc|NetCoreOnly.ActiveCfg = Ad-Hoc|iPhoneSimulator
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhoneSimulator
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.AppStore|iPhone.Build.0 = AppStore|iPhone
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.AppStore|Mono.ActiveCfg = AppStore|iPhoneSimulator
+		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.AppStore|NetCoreOnly.ActiveCfg = AppStore|iPhoneSimulator
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.AppStore|x86.ActiveCfg = AppStore|iPhoneSimulator
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Debug|Any CPU.ActiveCfg = Debug|iPhone
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Debug|iPhone.ActiveCfg = Debug|iPhone
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Debug|iPhone.Build.0 = Debug|iPhone
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Debug|Mono.ActiveCfg = Debug|iPhoneSimulator
+		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Debug|NetCoreOnly.ActiveCfg = Debug|iPhoneSimulator
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Release|Any CPU.ActiveCfg = Release|iPhone
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Release|iPhone.ActiveCfg = Release|iPhone
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Release|iPhone.Build.0 = Release|iPhone
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Release|Mono.ActiveCfg = Release|iPhoneSimulator
+		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Release|NetCoreOnly.ActiveCfg = Release|iPhoneSimulator
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Release|x86.ActiveCfg = Release|iPhoneSimulator
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
@@ -1436,7 +1436,7 @@ Global
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1445,7 +1445,7 @@ Global
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|x86.Build.0 = Debug|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1454,7 +1454,7 @@ Global
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|x86.Build.0 = Debug|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1463,7 +1463,7 @@ Global
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|iPhone.Build.0 = Release|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|Mono.ActiveCfg = Release|Any CPU
+		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|x86.ActiveCfg = Release|Any CPU
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|x86.Build.0 = Release|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1472,7 +1472,7 @@ Global
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1481,7 +1481,7 @@ Global
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.AppStore|x86.Build.0 = Debug|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1490,8 +1490,8 @@ Global
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|Mono.Build.0 = Debug|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Debug|x86.Build.0 = Debug|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1500,8 +1500,8 @@ Global
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|iPhone.Build.0 = Release|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|Mono.ActiveCfg = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|Mono.Build.0 = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|x86.ActiveCfg = Release|Any CPU
 		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|x86.Build.0 = Release|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1510,7 +1510,7 @@ Global
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1519,7 +1519,7 @@ Global
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.AppStore|x86.Build.0 = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1528,7 +1528,7 @@ Global
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Debug|x86.Build.0 = Debug|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1537,7 +1537,7 @@ Global
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhone.Build.0 = Release|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|Mono.ActiveCfg = Release|Any CPU
+		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|x86.ActiveCfg = Release|Any CPU
 		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|x86.Build.0 = Release|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1546,7 +1546,7 @@ Global
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1555,7 +1555,7 @@ Global
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|x86.Build.0 = Debug|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1564,8 +1564,8 @@ Global
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|Mono.Build.0 = Debug|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|x86.Build.0 = Debug|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1574,8 +1574,8 @@ Global
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|iPhone.Build.0 = Release|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|Mono.ActiveCfg = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|Mono.Build.0 = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|x86.ActiveCfg = Release|Any CPU
 		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|x86.Build.0 = Release|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1584,7 +1584,7 @@ Global
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1593,7 +1593,7 @@ Global
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|x86.Build.0 = Debug|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1602,8 +1602,8 @@ Global
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|Mono.Build.0 = Debug|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|x86.Build.0 = Debug|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1612,8 +1612,8 @@ Global
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhone.Build.0 = Release|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|Mono.ActiveCfg = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|Mono.Build.0 = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|x86.ActiveCfg = Release|Any CPU
 		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|x86.Build.0 = Release|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1622,7 +1622,7 @@ Global
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Ad-Hoc|x86.Build.0 = Release|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1631,7 +1631,7 @@ Global
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|x86.ActiveCfg = Release|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.AppStore|x86.Build.0 = Release|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1640,8 +1640,8 @@ Global
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|Mono.Build.0 = Debug|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Debug|x86.Build.0 = Debug|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1650,8 +1650,8 @@ Global
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|iPhone.Build.0 = Release|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|Mono.ActiveCfg = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|Mono.Build.0 = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|x86.ActiveCfg = Release|Any CPU
 		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|x86.Build.0 = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1660,7 +1660,7 @@ Global
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Ad-Hoc|x86.Build.0 = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1669,7 +1669,7 @@ Global
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|x86.ActiveCfg = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.AppStore|x86.Build.0 = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1678,7 +1678,7 @@ Global
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Debug|x86.Build.0 = Debug|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1687,7 +1687,7 @@ Global
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|iPhone.Build.0 = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|Mono.ActiveCfg = Release|Any CPU
+		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|x86.ActiveCfg = Release|Any CPU
 		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|x86.Build.0 = Release|Any CPU
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
@@ -1695,28 +1695,28 @@ Global
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Ad-Hoc|Mono.ActiveCfg = Ad-Hoc|iPhoneSimulator
+		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Ad-Hoc|NetCoreOnly.ActiveCfg = Ad-Hoc|iPhoneSimulator
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.AppStore|iPhone.Build.0 = AppStore|iPhone
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.AppStore|Mono.ActiveCfg = AppStore|iPhoneSimulator
+		{57E0455D-D565-44BB-B069-EE1AA20F8337}.AppStore|NetCoreOnly.ActiveCfg = AppStore|iPhoneSimulator
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.AppStore|x86.ActiveCfg = AppStore|iPhone
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Debug|Any CPU.ActiveCfg = Debug|iPhone
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Debug|iPhone.ActiveCfg = Debug|iPhone
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Debug|iPhone.Build.0 = Debug|iPhone
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Debug|Mono.ActiveCfg = Debug|iPhoneSimulator
+		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Debug|NetCoreOnly.ActiveCfg = Debug|iPhoneSimulator
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Debug|x86.ActiveCfg = Debug|iPhone
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Release|Any CPU.ActiveCfg = Release|iPhone
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Release|iPhone.ActiveCfg = Release|iPhone
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Release|iPhone.Build.0 = Release|iPhone
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Release|Mono.ActiveCfg = Release|iPhoneSimulator
+		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Release|NetCoreOnly.ActiveCfg = Release|iPhoneSimulator
 		{57E0455D-D565-44BB-B069-EE1AA20F8337}.Release|x86.ActiveCfg = Release|iPhone
 		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
@@ -1724,7 +1724,7 @@ Global
 		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.Ad-Hoc|x86.Build.0 = Release|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1733,7 +1733,7 @@ Global
 		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|x86.ActiveCfg = Release|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.AppStore|x86.Build.0 = Release|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1742,7 +1742,7 @@ Global
 		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.Debug|x86.Build.0 = Debug|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1751,7 +1751,7 @@ Global
 		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|iPhone.Build.0 = Release|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|Mono.ActiveCfg = Release|Any CPU
+		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|x86.ActiveCfg = Release|Any CPU
 		{52F55355-D120-42AC-8116-8410A7D602FA}.Release|x86.Build.0 = Release|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1760,7 +1760,7 @@ Global
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Ad-Hoc|x86.Build.0 = Release|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1769,7 +1769,7 @@ Global
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|x86.ActiveCfg = Release|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.AppStore|x86.Build.0 = Release|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1778,7 +1778,7 @@ Global
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Debug|x86.Build.0 = Debug|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1787,7 +1787,7 @@ Global
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|iPhone.Build.0 = Release|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|Mono.ActiveCfg = Release|Any CPU
+		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|x86.ActiveCfg = Release|Any CPU
 		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|x86.Build.0 = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1796,7 +1796,7 @@ Global
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Ad-Hoc|x86.Build.0 = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1805,7 +1805,7 @@ Global
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|Mono.ActiveCfg = Debug|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|x86.ActiveCfg = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.AppStore|x86.Build.0 = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1814,7 +1814,7 @@ Global
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Debug|x86.Build.0 = Debug|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1823,7 +1823,7 @@ Global
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|iPhone.Build.0 = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|Mono.ActiveCfg = Release|Any CPU
+		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|x86.ActiveCfg = Release|Any CPU
 		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|x86.Build.0 = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1832,7 +1832,7 @@ Global
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{C7A69145-60B6-4882-97D6-A3921DD43978}.Ad-Hoc|Mono.ActiveCfg = Release|Any CPU
+		{C7A69145-60B6-4882-97D6-A3921DD43978}.Ad-Hoc|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Ad-Hoc|x86.Build.0 = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1841,7 +1841,7 @@ Global
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{C7A69145-60B6-4882-97D6-A3921DD43978}.AppStore|Mono.ActiveCfg = Release|Any CPU
+		{C7A69145-60B6-4882-97D6-A3921DD43978}.AppStore|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.AppStore|x86.ActiveCfg = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.AppStore|x86.Build.0 = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1850,7 +1850,7 @@ Global
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{C7A69145-60B6-4882-97D6-A3921DD43978}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{C7A69145-60B6-4882-97D6-A3921DD43978}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Debug|x86.Build.0 = Debug|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1859,7 +1859,7 @@ Global
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Release|iPhone.Build.0 = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{C7A69145-60B6-4882-97D6-A3921DD43978}.Release|Mono.ActiveCfg = Release|Any CPU
+		{C7A69145-60B6-4882-97D6-A3921DD43978}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Release|x86.ActiveCfg = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Release|x86.Build.0 = Release|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1868,8 +1868,8 @@ Global
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Ad-Hoc|Mono.ActiveCfg = Release|Any CPU
-		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Ad-Hoc|Mono.Build.0 = Release|Any CPU
+		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Ad-Hoc|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Ad-Hoc|NetCoreOnly.Build.0 = Release|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Ad-Hoc|x86.Build.0 = Release|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1878,8 +1878,8 @@ Global
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.AppStore|Mono.ActiveCfg = Release|Any CPU
-		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.AppStore|Mono.Build.0 = Release|Any CPU
+		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.AppStore|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.AppStore|NetCoreOnly.Build.0 = Release|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.AppStore|x86.ActiveCfg = Release|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.AppStore|x86.Build.0 = Release|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1888,7 +1888,7 @@ Global
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Debug|x86.Build.0 = Debug|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1897,7 +1897,7 @@ Global
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Release|iPhone.Build.0 = Release|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Release|Mono.ActiveCfg = Release|Any CPU
+		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Release|x86.ActiveCfg = Release|Any CPU
 		{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}.Release|x86.Build.0 = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1906,8 +1906,8 @@ Global
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|Mono.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|Mono.Build.0 = Release|Any CPU
+		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|NetCoreOnly.Build.0 = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Ad-Hoc|x86.Build.0 = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -1916,8 +1916,8 @@ Global
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|Mono.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|Mono.Build.0 = Release|Any CPU
+		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|NetCoreOnly.Build.0 = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|x86.ActiveCfg = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.AppStore|x86.Build.0 = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1926,7 +1926,7 @@ Global
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Debug|x86.Build.0 = Debug|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1935,7 +1935,7 @@ Global
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|iPhone.Build.0 = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|Mono.ActiveCfg = Release|Any CPU
+		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|x86.ActiveCfg = Release|Any CPU
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|x86.Build.0 = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -1947,9 +1947,9 @@ Global
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|Mono.ActiveCfg = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|Mono.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|Mono.Deploy.0 = Release|Any CPU
+		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|NetCoreOnly.Build.0 = Release|Any CPU
+		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|NetCoreOnly.Deploy.0 = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|x86.Build.0 = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Ad-Hoc|x86.Deploy.0 = Release|Any CPU
@@ -1962,9 +1962,9 @@ Global
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|Mono.ActiveCfg = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|Mono.Build.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|Mono.Deploy.0 = Release|Any CPU
+		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|NetCoreOnly.Build.0 = Release|Any CPU
+		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|NetCoreOnly.Deploy.0 = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|x86.ActiveCfg = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|x86.Build.0 = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.AppStore|x86.Deploy.0 = Release|Any CPU
@@ -1977,7 +1977,7 @@ Global
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|x86.Build.0 = Debug|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Debug|x86.Deploy.0 = Debug|Any CPU
@@ -1990,7 +1990,7 @@ Global
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|Mono.ActiveCfg = Release|Any CPU
+		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|x86.ActiveCfg = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|x86.Build.0 = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|x86.Deploy.0 = Release|Any CPU
@@ -2000,8 +2000,8 @@ Global
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Ad-Hoc|Mono.ActiveCfg = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Ad-Hoc|Mono.Build.0 = Release|Any CPU
+		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Ad-Hoc|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Ad-Hoc|NetCoreOnly.Build.0 = Release|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Ad-Hoc|x86.Build.0 = Release|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -2010,8 +2010,8 @@ Global
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|Mono.ActiveCfg = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|Mono.Build.0 = Release|Any CPU
+		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|NetCoreOnly.Build.0 = Release|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|x86.ActiveCfg = Release|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|x86.Build.0 = Release|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2020,8 +2020,8 @@ Global
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|Mono.Build.0 = Debug|Any CPU
+		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|x86.Build.0 = Debug|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2030,8 +2030,8 @@ Global
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|iPhone.Build.0 = Release|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|Mono.ActiveCfg = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|Mono.Build.0 = Release|Any CPU
+		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|x86.ActiveCfg = Release|Any CPU
 		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|x86.Build.0 = Release|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -2040,8 +2040,8 @@ Global
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Ad-Hoc|Mono.ActiveCfg = Release|Any CPU
-		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Ad-Hoc|Mono.Build.0 = Release|Any CPU
+		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Ad-Hoc|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Ad-Hoc|NetCoreOnly.Build.0 = Release|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Ad-Hoc|x86.Build.0 = Release|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -2050,8 +2050,8 @@ Global
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.AppStore|Mono.ActiveCfg = Release|Any CPU
-		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.AppStore|Mono.Build.0 = Release|Any CPU
+		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.AppStore|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.AppStore|NetCoreOnly.Build.0 = Release|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.AppStore|x86.ActiveCfg = Release|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.AppStore|x86.Build.0 = Release|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2060,8 +2060,8 @@ Global
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Debug|Mono.Build.0 = Debug|Any CPU
+		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Debug|x86.Build.0 = Debug|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2070,8 +2070,8 @@ Global
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Release|iPhone.Build.0 = Release|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Release|Mono.ActiveCfg = Release|Any CPU
-		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Release|Mono.Build.0 = Release|Any CPU
+		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Release|x86.ActiveCfg = Release|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Release|x86.Build.0 = Release|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -2080,8 +2080,8 @@ Global
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|Mono.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|Mono.Build.0 = Release|Any CPU
+		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|NetCoreOnly.Build.0 = Release|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Ad-Hoc|x86.Build.0 = Release|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -2090,8 +2090,8 @@ Global
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|Mono.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|Mono.Build.0 = Release|Any CPU
+		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|NetCoreOnly.Build.0 = Release|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|x86.ActiveCfg = Release|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.AppStore|x86.Build.0 = Release|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2100,8 +2100,8 @@ Global
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|Mono.Build.0 = Debug|Any CPU
+		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Debug|x86.Build.0 = Debug|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2110,8 +2110,8 @@ Global
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|iPhone.Build.0 = Release|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|Mono.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|Mono.Build.0 = Release|Any CPU
+		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|x86.ActiveCfg = Release|Any CPU
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|x86.Build.0 = Release|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -2120,8 +2120,8 @@ Global
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Ad-Hoc|Mono.ActiveCfg = Release|Any CPU
-		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Ad-Hoc|Mono.Build.0 = Release|Any CPU
+		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Ad-Hoc|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Ad-Hoc|NetCoreOnly.Build.0 = Release|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Ad-Hoc|x86.Build.0 = Release|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -2130,8 +2130,8 @@ Global
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.AppStore|Mono.ActiveCfg = Release|Any CPU
-		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.AppStore|Mono.Build.0 = Release|Any CPU
+		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.AppStore|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.AppStore|NetCoreOnly.Build.0 = Release|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.AppStore|x86.ActiveCfg = Release|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.AppStore|x86.Build.0 = Release|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2140,8 +2140,8 @@ Global
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Debug|Mono.Build.0 = Debug|Any CPU
+		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Debug|x86.Build.0 = Debug|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2150,8 +2150,8 @@ Global
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Release|iPhone.Build.0 = Release|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Release|Mono.ActiveCfg = Release|Any CPU
-		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Release|Mono.Build.0 = Release|Any CPU
+		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Release|x86.ActiveCfg = Release|Any CPU
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Release|x86.Build.0 = Release|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2160,8 +2160,8 @@ Global
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|Mono.Build.0 = Debug|Any CPU
+		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|NetCoreOnly.Build.0 = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2170,8 +2170,8 @@ Global
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|iPhone.Build.0 = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|Mono.ActiveCfg = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|Mono.Build.0 = Debug|Any CPU
+		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|NetCoreOnly.Build.0 = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|x86.Build.0 = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2180,8 +2180,8 @@ Global
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|Mono.Build.0 = Debug|Any CPU
+		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|x86.Build.0 = Debug|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2190,8 +2190,8 @@ Global
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|iPhone.Build.0 = Release|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|Mono.ActiveCfg = Release|Any CPU
-		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|Mono.Build.0 = Release|Any CPU
+		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|x86.ActiveCfg = Release|Any CPU
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|x86.Build.0 = Release|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2200,8 +2200,8 @@ Global
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|Mono.Build.0 = Debug|Any CPU
+		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|NetCoreOnly.Build.0 = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2210,8 +2210,8 @@ Global
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|iPhone.Build.0 = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|Mono.ActiveCfg = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|Mono.Build.0 = Debug|Any CPU
+		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|NetCoreOnly.Build.0 = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.AppStore|x86.Build.0 = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2220,8 +2220,8 @@ Global
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|Mono.Build.0 = Debug|Any CPU
+		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|x86.Build.0 = Debug|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2230,8 +2230,8 @@ Global
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|iPhone.Build.0 = Release|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|Mono.ActiveCfg = Release|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|Mono.Build.0 = Release|Any CPU
+		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|x86.ActiveCfg = Release|Any CPU
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|x86.Build.0 = Release|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2240,8 +2240,8 @@ Global
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|Mono.Build.0 = Debug|Any CPU
+		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|NetCoreOnly.Build.0 = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2250,8 +2250,8 @@ Global
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|iPhone.Build.0 = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|Mono.ActiveCfg = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|Mono.Build.0 = Debug|Any CPU
+		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|NetCoreOnly.Build.0 = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.AppStore|x86.Build.0 = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2260,7 +2260,7 @@ Global
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|x86.Build.0 = Debug|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2269,7 +2269,7 @@ Global
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|iPhone.Build.0 = Release|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|Mono.ActiveCfg = Release|Any CPU
+		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|x86.ActiveCfg = Release|Any CPU
 		{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|x86.Build.0 = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -2278,8 +2278,8 @@ Global
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|Mono.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|Mono.Build.0 = Release|Any CPU
+		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|NetCoreOnly.Build.0 = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Ad-Hoc|x86.Build.0 = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -2288,8 +2288,8 @@ Global
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|Mono.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|Mono.Build.0 = Release|Any CPU
+		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|NetCoreOnly.Build.0 = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|x86.ActiveCfg = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.AppStore|x86.Build.0 = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2298,7 +2298,7 @@ Global
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|x86.Build.0 = Debug|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2307,7 +2307,7 @@ Global
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|iPhone.Build.0 = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|Mono.ActiveCfg = Release|Any CPU
+		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|x86.ActiveCfg = Release|Any CPU
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|x86.Build.0 = Release|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2316,8 +2316,8 @@ Global
 		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|Mono.Build.0 = Debug|Any CPU
+		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|NetCoreOnly.Build.0 = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2326,8 +2326,8 @@ Global
 		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|iPhone.Build.0 = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|Mono.ActiveCfg = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|Mono.Build.0 = Debug|Any CPU
+		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|NetCoreOnly.Build.0 = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.AppStore|x86.Build.0 = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2336,8 +2336,8 @@ Global
 		{E1582370-37B3-403C-917F-8209551B1634}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Debug|Mono.Build.0 = Debug|Any CPU
+		{E1582370-37B3-403C-917F-8209551B1634}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{E1582370-37B3-403C-917F-8209551B1634}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Debug|x86.Build.0 = Debug|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2346,8 +2346,8 @@ Global
 		{E1582370-37B3-403C-917F-8209551B1634}.Release|iPhone.Build.0 = Release|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Release|Mono.ActiveCfg = Release|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Release|Mono.Build.0 = Release|Any CPU
+		{E1582370-37B3-403C-917F-8209551B1634}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{E1582370-37B3-403C-917F-8209551B1634}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Release|x86.ActiveCfg = Release|Any CPU
 		{E1582370-37B3-403C-917F-8209551B1634}.Release|x86.Build.0 = Release|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2356,8 +2356,8 @@ Global
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|Mono.Build.0 = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|NetCoreOnly.Build.0 = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2366,8 +2366,8 @@ Global
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|iPhone.Build.0 = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|Mono.ActiveCfg = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|Mono.Build.0 = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|NetCoreOnly.Build.0 = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.AppStore|x86.Build.0 = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2376,8 +2376,8 @@ Global
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|Mono.Build.0 = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|x86.Build.0 = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2386,8 +2386,8 @@ Global
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|iPhone.Build.0 = Release|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|Mono.ActiveCfg = Release|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|Mono.Build.0 = Release|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|x86.ActiveCfg = Release|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|x86.Build.0 = Release|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2396,8 +2396,8 @@ Global
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|Mono.Build.0 = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|NetCoreOnly.Build.0 = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2406,8 +2406,8 @@ Global
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|iPhone.Build.0 = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|Mono.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|Mono.Build.0 = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|NetCoreOnly.Build.0 = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.AppStore|x86.Build.0 = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2416,7 +2416,7 @@ Global
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|x86.Build.0 = Debug|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2425,7 +2425,7 @@ Global
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|iPhone.Build.0 = Release|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|Mono.ActiveCfg = Release|Any CPU
+		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|x86.ActiveCfg = Release|Any CPU
 		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|x86.Build.0 = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -2434,8 +2434,8 @@ Global
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Mono.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|Mono.Build.0 = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|NetCoreOnly.Build.0 = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Ad-Hoc|x86.Build.0 = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -2444,8 +2444,8 @@ Global
 		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|Mono.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|Mono.Build.0 = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|NetCoreOnly.Build.0 = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|x86.ActiveCfg = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.AppStore|x86.Build.0 = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2454,7 +2454,7 @@ Global
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|x86.Build.0 = Debug|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2463,7 +2463,7 @@ Global
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhone.Build.0 = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Mono.ActiveCfg = Release|Any CPU
+		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|x86.ActiveCfg = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|x86.Build.0 = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -2472,8 +2472,8 @@ Global
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Mono.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|Mono.Build.0 = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|NetCoreOnly.Build.0 = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Ad-Hoc|x86.Build.0 = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -2482,8 +2482,8 @@ Global
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|Mono.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|Mono.Build.0 = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|NetCoreOnly.Build.0 = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|x86.ActiveCfg = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.AppStore|x86.Build.0 = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2492,7 +2492,7 @@ Global
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|x86.Build.0 = Debug|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2501,7 +2501,7 @@ Global
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhone.Build.0 = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Mono.ActiveCfg = Release|Any CPU
+		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|x86.ActiveCfg = Release|Any CPU
 		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|x86.Build.0 = Release|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2510,8 +2510,8 @@ Global
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU
-		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Ad-Hoc|Mono.Build.0 = Debug|Any CPU
+		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Ad-Hoc|NetCoreOnly.Build.0 = Debug|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2520,8 +2520,8 @@ Global
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.AppStore|iPhone.Build.0 = Debug|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{CBFD5788-567D-401B-9DFA-74E4224025A0}.AppStore|Mono.ActiveCfg = Debug|Any CPU
-		{CBFD5788-567D-401B-9DFA-74E4224025A0}.AppStore|Mono.Build.0 = Debug|Any CPU
+		{CBFD5788-567D-401B-9DFA-74E4224025A0}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{CBFD5788-567D-401B-9DFA-74E4224025A0}.AppStore|NetCoreOnly.Build.0 = Debug|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.AppStore|x86.ActiveCfg = Debug|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.AppStore|x86.Build.0 = Debug|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2530,8 +2530,8 @@ Global
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Debug|Mono.Build.0 = Debug|Any CPU
+		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Debug|x86.Build.0 = Debug|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2540,8 +2540,8 @@ Global
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Release|iPhone.Build.0 = Release|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Release|Mono.ActiveCfg = Release|Any CPU
-		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Release|Mono.Build.0 = Release|Any CPU
+		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Release|x86.ActiveCfg = Release|Any CPU
 		{CBFD5788-567D-401B-9DFA-74E4224025A0}.Release|x86.Build.0 = Release|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
@@ -2550,8 +2550,8 @@ Global
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|Mono.ActiveCfg = Release|Any CPU
-		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|Mono.Build.0 = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|NetCoreOnly.Build.0 = Release|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Ad-Hoc|x86.Build.0 = Release|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -2560,8 +2560,8 @@ Global
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|Mono.ActiveCfg = Release|Any CPU
-		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|Mono.Build.0 = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|NetCoreOnly.Build.0 = Release|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|x86.ActiveCfg = Release|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.AppStore|x86.Build.0 = Release|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2570,7 +2570,7 @@ Global
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|Mono.ActiveCfg = Debug|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Debug|x86.Build.0 = Debug|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2579,7 +2579,7 @@ Global
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|iPhone.Build.0 = Release|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|Mono.ActiveCfg = Release|Any CPU
+		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|x86.ActiveCfg = Release|Any CPU
 		{4ADA61C8-D191-428D-9066-EF4F0D86520F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
diff --git a/build.ps1 b/build.ps1
index 0c5ab81334..46696db2b2 100644
--- a/build.ps1
+++ b/build.ps1
@@ -46,7 +46,7 @@ http://cakebuild.net
 Param(
     [string]$Script = "build.cake",
     [string]$Target = "Default",
-    [ValidateSet("Any CPU", "x86", "x64", "Mono", "iPhone")]
+    [ValidateSet("Any CPU", "x86", "x64", "NetCoreOnly", "iPhone")]
     [string]$Platform = "Any CPU",
     [ValidateSet("Release", "Debug")]
     [string]$Configuration = "Release",

From eb0e6650ca6fee8479e4f833c3fac1467c8abdb3 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 27 Jan 2018 14:57:15 +0100
Subject: [PATCH 295/482] Remove debug code.

---
 src/Avalonia.Themes.Default/FocusAdorner.xaml      | 2 +-
 src/Avalonia.Visuals/Rendering/DeferredRenderer.cs | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Avalonia.Themes.Default/FocusAdorner.xaml b/src/Avalonia.Themes.Default/FocusAdorner.xaml
index 3037f5763b..573c43dc8d 100644
--- a/src/Avalonia.Themes.Default/FocusAdorner.xaml
+++ b/src/Avalonia.Themes.Default/FocusAdorner.xaml
@@ -1,7 +1,7 @@
 <Style xmlns="https://github.com/avaloniaui" Selector=":is(Control)">
   <Setter Property="FocusAdorner">
     <FocusAdornerTemplate>
-      <Rectangle Stroke="Black" Name="abcd"
+      <Rectangle Stroke="Black"
                  StrokeThickness="1"
                  StrokeDashArray="1,2"/>
     </FocusAdornerTemplate>
diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index 40b1ec3549..82cc0a260d 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -243,15 +243,6 @@ namespace Avalonia.Rendering
             {
                 clipBounds = node.ClipBounds.Intersect(clipBounds);
 
-                var np = node.Visual.GetType().GetProperty("Name");
-                var name = (string)np.GetValue(node.Visual);
-
-                if (name == "abcd")
-                {
-                    var clip = (IStreamGeometryImpl)node.GeometryClip;
-                    System.Diagnostics.Debug.WriteLine(clip?.GetRenderBounds(new Pen(Brushes.Black, 1)).ToString() ?? "(null)");
-                }
-
                 if (!clipBounds.IsEmpty && node.Opacity > 0)
                 {
                     var isLayerRoot = node.Visual == layer;

From e55ec59ec31ca1015cebe9c40f747f7327c96251 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 27 Jan 2018 17:18:39 +0100
Subject: [PATCH 296/482] WIP

---
 Avalonia.sln                                  |  49 --------
 .../Avalonia.DotNetCoreRuntime.csproj         |   2 +-
 .../Avalonia.Win32.Interop.csproj             |   4 +
 .../WinForms}/WinFormsAvaloniaControlHost.cs  |   1 -
 .../Avalonia.Win32/Avalonia.Win32.csproj      | 106 +++---------------
 .../Embedding/EmbeddedWindowImpl.cs           |  50 ++++-----
 .../Avalonia.Win32/Properties/AssemblyInfo.cs |   2 -
 src/Windows/Avalonia.Win32/Win32Platform.cs   |   4 -
 src/Windows/Avalonia.Win32/WindowImpl.cs      |  13 +--
 9 files changed, 47 insertions(+), 184 deletions(-)
 rename src/Windows/{Avalonia.Win32/Embedding => Avalonia.Win32.Interop/WinForms}/WinFormsAvaloniaControlHost.cs (99%)

diff --git a/Avalonia.sln b/Avalonia.sln
index 7cf2cf3b8a..6215ff61a1 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -126,10 +126,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RenderTest", "samples\Rende
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.Android", "samples\ControlCatalog.Android\ControlCatalog.Android.csproj", "{29132311-1848-4FD6-AE0C-4FF841151BD3}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Avalonia.Win32.Shared", "src\Windows\Avalonia.Win32\Avalonia.Win32.Shared.shproj", "{9DEFC6B7-845B-4D8F-AFC0-D32BF0032B8C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Win32.NetStandard", "src\Windows\Avalonia.Win32.NetStandard\Avalonia.Win32.NetStandard.csproj", "{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DotNetCoreRuntime", "src\Avalonia.DotNetCoreRuntime\Avalonia.DotNetCoreRuntime.csproj", "{7863EA94-F0FB-4386-BF8C-E5BFA761560A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Skia", "src\Skia\Avalonia.Skia\Avalonia.Skia.csproj", "{7D2D3083-71DD-4CC9-8907-39A0D86FB322}"
@@ -196,14 +192,11 @@ Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{3c4c0cb4-0c0f-4450-a37b-148c84ff905f}*SharedItemsImports = 13
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{3e908f67-5543-4879-a1dc-08eace79b3cd}*SharedItemsImports = 4
-		src\Windows\Avalonia.Win32\Avalonia.Win32.Shared.projitems*{40759a76-d0f2-464e-8000-6ff0f5c4bd7c}*SharedItemsImports = 4
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{4488ad85-1495-4809-9aa4-ddfe0a48527e}*SharedItemsImports = 4
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{4a1abb09-9047-4bd5-a4ad-a055e52c5ee0}*SharedItemsImports = 4
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{7863ea94-f0fb-4386-bf8c-e5bfa761560a}*SharedItemsImports = 4
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{7b92af71-6287-4693-9dcb-bd5b6e927e23}*SharedItemsImports = 4
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{7d2d3083-71dd-4cc9-8907-39a0d86fb322}*SharedItemsImports = 4
-		src\Windows\Avalonia.Win32\Avalonia.Win32.Shared.projitems*{811a76cf-1cf6-440f-963b-bbe31bd72a82}*SharedItemsImports = 4
-		src\Windows\Avalonia.Win32\Avalonia.Win32.Shared.projitems*{9defc6b7-845b-4d8f-afc0-d32bf0032b8c}*SharedItemsImports = 13
 		tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{dabfd304-d6a4-4752-8123-c2ccf7ac7831}*SharedItemsImports = 4
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{e4d9629c-f168-4224-3f51-a5e482ffbc42}*SharedItemsImports = 13
 	EndGlobalSection
@@ -1994,46 +1987,6 @@ Global
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|x86.ActiveCfg = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|x86.Build.0 = Release|Any CPU
 		{29132311-1848-4FD6-AE0C-4FF841151BD3}.Release|x86.Deploy.0 = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Ad-Hoc|NetCoreOnly.ActiveCfg = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Ad-Hoc|NetCoreOnly.Build.0 = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|NetCoreOnly.ActiveCfg = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|NetCoreOnly.Build.0 = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.AppStore|x86.Build.0 = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Debug|x86.Build.0 = Debug|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|iPhone.Build.0 = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|NetCoreOnly.Build.0 = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|x86.ActiveCfg = Release|Any CPU
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}.Release|x86.Build.0 = Release|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
 		{7863EA94-F0FB-4386-BF8C-E5BFA761560A}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
@@ -2623,8 +2576,6 @@ Global
 		{C7A69145-60B6-4882-97D6-A3921DD43978} = {A0CC0258-D18C-4AB3-854F-7101680FC3F9}
 		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{29132311-1848-4FD6-AE0C-4FF841151BD3} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{9DEFC6B7-845B-4D8F-AFC0-D32BF0032B8C} = {B39A8919-9F95-48FE-AD7B-76E08B509888}
-		{40759A76-D0F2-464E-8000-6FF0F5C4BD7C} = {B39A8919-9F95-48FE-AD7B-76E08B509888}
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322} = {3743B0F2-CC41-4F14-A8C8-267F579BF91E}
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658} = {B9894058-278A-46B5-B6ED-AD613FCC03B3}
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3} = {9B9E3891-2366-4253-A952-D08BCEB71098}
diff --git a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj
index 8630e7b228..a7586ac7ac 100644
--- a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj
+++ b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj
@@ -19,7 +19,7 @@
     <ProjectReference Include="..\Gtk\Avalonia.Gtk3\Avalonia.Gtk3.csproj" />
     <ProjectReference Include="..\OSX\Avalonia.MonoMac\Avalonia.MonoMac.csproj" />
     <ProjectReference Include="..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
-    <ProjectReference Include="..\Windows\Avalonia.Win32.NetStandard\Avalonia.Win32.NetStandard.csproj" />
+    <ProjectReference Include="..\Windows\Avalonia.Win32\Avalonia.Win32.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\NetCore.props" />
   <Import Project="..\Shared\PlatformSupport\PlatformSupport.projitems" />
diff --git a/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj b/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
index 368e5986b2..7b480ef328 100644
--- a/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
+++ b/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
@@ -34,6 +34,7 @@
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -48,6 +49,9 @@
       <Link>UnmanagedMethods.cs</Link>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="WinForms\WinFormsAvaloniaControlHost.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="Wpf\CursorShim.cs" />
     <Compile Include="Wpf\Direct2DImageSurface.cs" />
     <Compile Include="Wpf\IntSize.cs" />
diff --git a/src/Windows/Avalonia.Win32/Embedding/WinFormsAvaloniaControlHost.cs b/src/Windows/Avalonia.Win32.Interop/WinForms/WinFormsAvaloniaControlHost.cs
similarity index 99%
rename from src/Windows/Avalonia.Win32/Embedding/WinFormsAvaloniaControlHost.cs
rename to src/Windows/Avalonia.Win32.Interop/WinForms/WinFormsAvaloniaControlHost.cs
index a484d6c0d2..fe626f4d38 100644
--- a/src/Windows/Avalonia.Win32/Embedding/WinFormsAvaloniaControlHost.cs
+++ b/src/Windows/Avalonia.Win32.Interop/WinForms/WinFormsAvaloniaControlHost.cs
@@ -1,7 +1,6 @@
 using System;
 using System.ComponentModel;
 using System.Windows.Forms;
-using Avalonia.Controls;
 using Avalonia.Controls.Embedding;
 using Avalonia.Input;
 using Avalonia.VisualTree;
diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
index 92d973238e..eee6156274 100644
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@@ -1,104 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{811A76CF-1CF6-440F-963B-BBE31BD72A82}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Avalonia.Win32</RootNamespace>
-    <AssemblyName>Avalonia.Win32</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Avalonia.Win32.xml</DocumentationFile>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Avalonia.Win32.xml</DocumentationFile>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NoWarn>CS1591</NoWarn>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="WindowsFormsIntegration" />
+    <ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Embedding\EmbeddedWindowImpl.cs" />
-    <Compile Include="Embedding\WinFormsAvaloniaControlHost.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="IconImpl.cs" />
-    <Compile Include="WinFormsWin32Platform.cs" />
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj">
-      <Project>{D211E587-D8BC-45B9-95A4-F297C8FA5200}</Project>
-      <Name>Avalonia.Animation</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj">
-      <Project>{B09B78D8-9B26-48B0-9149-D64A2F120F3F}</Project>
-      <Name>Avalonia.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj">
-      <Project>{D2221C82-4A25-4583-9B43-D791E3F6820C}</Project>
-      <Name>Avalonia.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj">
-      <Project>{7062AE20-5DCC-4442-9645-8195BDECE63E}</Project>
-      <Name>Avalonia.Diagnostics</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj">
-      <Project>{62024B2D-53EB-4638-B26B-85EEAA54866E}</Project>
-      <Name>Avalonia.Input</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj">
-      <Project>{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}</Project>
-      <Name>Avalonia.Interactivity</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj">
-      <Project>{42472427-4774-4C81-8AFF-9F27B8E31721}</Project>
-      <Name>Avalonia.Layout</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj">
-      <Project>{EB582467-6ABB-43A1-B052-E981BA910E3A}</Project>
-      <Name>Avalonia.Visuals</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj">
-      <Project>{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}</Project>
-      <Name>Avalonia.Styling</Name>
-    </ProjectReference>
+    <PackageReference Include="System.Drawing.Common" Version="4.5.0-preview1-25914-04" />
   </ItemGroup>
-  <Import Project="Avalonia.Win32.Shared.projitems" Label="Shared" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\..\build\Rx.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Windows/Avalonia.Win32/Embedding/EmbeddedWindowImpl.cs b/src/Windows/Avalonia.Win32/Embedding/EmbeddedWindowImpl.cs
index d27c28cb67..5e91ede4a5 100644
--- a/src/Windows/Avalonia.Win32/Embedding/EmbeddedWindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/Embedding/EmbeddedWindowImpl.cs
@@ -9,34 +9,34 @@ namespace Avalonia.Win32
 {
     class EmbeddedWindowImpl : WindowImpl, IEmbeddableWindowImpl
     {
-        private static readonly System.Windows.Forms.UserControl WinFormsControl = new System.Windows.Forms.UserControl();
+        //private static readonly System.Windows.Forms.UserControl WinFormsControl = new System.Windows.Forms.UserControl();
 
-        public static IntPtr DefaultParentWindow = WinFormsControl.Handle;
+        //public static IntPtr DefaultParentWindow = WinFormsControl.Handle;
 
-        protected override IntPtr CreateWindowOverride(ushort atom)
-        {
-            var hWnd = UnmanagedMethods.CreateWindowEx(
-                0,
-                atom,
-                null,
-                (int)UnmanagedMethods.WindowStyles.WS_CHILD,
-                0,
-                0,
-                640,
-                480,
-                DefaultParentWindow,
-                IntPtr.Zero,
-                IntPtr.Zero,
-                IntPtr.Zero);
-            return hWnd;
-        }
+        //protected override IntPtr CreateWindowOverride(ushort atom)
+        //{
+        //    var hWnd = UnmanagedMethods.CreateWindowEx(
+        //        0,
+        //        atom,
+        //        null,
+        //        (int)UnmanagedMethods.WindowStyles.WS_CHILD,
+        //        0,
+        //        0,
+        //        640,
+        //        480,
+        //        DefaultParentWindow,
+        //        IntPtr.Zero,
+        //        IntPtr.Zero,
+        //        IntPtr.Zero);
+        //    return hWnd;
+        //}
 
-        protected override IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
-        {
-            if(msg == (uint)UnmanagedMethods.WindowsMessage.WM_KILLFOCUS)
-                LostFocus?.Invoke();
-            return base.WndProc(hWnd, msg, wParam, lParam);
-        }
+        //protected override IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
+        //{
+        //    if(msg == (uint)UnmanagedMethods.WindowsMessage.WM_KILLFOCUS)
+        //        LostFocus?.Invoke();
+        //    return base.WndProc(hWnd, msg, wParam, lParam);
+        //}
 
         public event Action LostFocus;
     }
diff --git a/src/Windows/Avalonia.Win32/Properties/AssemblyInfo.cs b/src/Windows/Avalonia.Win32/Properties/AssemblyInfo.cs
index 5b4d2cef23..38ec891f76 100644
--- a/src/Windows/Avalonia.Win32/Properties/AssemblyInfo.cs
+++ b/src/Windows/Avalonia.Win32/Properties/AssemblyInfo.cs
@@ -3,7 +3,5 @@
 
 using Avalonia.Platform;
 using Avalonia.Win32;
-using System.Reflection;
 
-[assembly: AssemblyTitle("Avalonia.Win32")]
 [assembly: ExportWindowingSubsystem(OperatingSystemType.WinNT, 1, "Win32", typeof(Win32Platform), nameof(Win32Platform.Initialize))]
diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
index e265749249..a490e59cb7 100644
--- a/src/Windows/Avalonia.Win32/Win32Platform.cs
+++ b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -196,13 +196,9 @@ namespace Avalonia.Win32
 
         public IEmbeddableWindowImpl CreateEmbeddableWindow()
         {
-#if NETSTANDARD
-            throw new NotSupportedException();
-#else
             var embedded = new EmbeddedWindowImpl();
             embedded.Show();
             return embedded;
-#endif
         }
 
         public IPopupImpl CreatePopup()
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 348468e0e7..d9b5e25c63 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -1,29 +1,24 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using Avalonia.Input;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
+using System.Reactive.Disposables;
 using System.Runtime.InteropServices;
 using Avalonia.Controls;
-using System.Reactive.Disposables;
+using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Platform;
+using Avalonia.Rendering;
 using Avalonia.Win32.Input;
 using Avalonia.Win32.Interop;
 using static Avalonia.Win32.Interop.UnmanagedMethods;
-using Avalonia.Rendering;
-using Avalonia.Threading;
-#if NETSTANDARD
-using Win32Exception = Avalonia.Win32.NetStandard.AvaloniaWin32Exception;
-#endif
 
 namespace Avalonia.Win32
 {
-    class WindowImpl : IWindowImpl
+    public class WindowImpl : IWindowImpl
     {
         private static readonly List<WindowImpl> s_instances = new List<WindowImpl>();
 

From 617f35ce53ad0d0ded0d23d831c129828c707a4b Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 28 Jan 2018 02:12:14 -0600
Subject: [PATCH 297/482] Add ref-counting checks throughout the SceneGraph
 nodes. Because IDrawOperations can be shared between IVisualNodes, they are
 now also ref-counted.

---
 src/Avalonia.Base/Utilities/Ref.cs            | 14 ++--
 .../Media/Imaging/RenderTargetBitmap.cs       |  9 ---
 .../Rendering/DeferredRenderer.cs             |  8 +--
 .../Rendering/SceneGraph/ClipNode.cs          |  4 ++
 .../SceneGraph/DeferredDrawingContextImpl.cs  | 66 +++++++++----------
 .../Rendering/SceneGraph/DrawOperation.cs     |  4 ++
 .../Rendering/SceneGraph/GeometryClipNode.cs  |  3 +
 .../Rendering/SceneGraph/IDrawOperation.cs    |  2 +-
 .../Rendering/SceneGraph/IVisualNode.cs       |  5 +-
 .../Rendering/SceneGraph/ImageNode.cs         |  4 +-
 .../Rendering/SceneGraph/OpacityNode.cs       |  4 ++
 .../Rendering/SceneGraph/VisualNode.cs        | 55 ++++++++++++----
 .../Media/DrawingContextImpl.cs               |  2 +-
 13 files changed, 113 insertions(+), 67 deletions(-)

diff --git a/src/Avalonia.Base/Utilities/Ref.cs b/src/Avalonia.Base/Utilities/Ref.cs
index 98077cd4fd..f9e8b29b95 100644
--- a/src/Avalonia.Base/Utilities/Ref.cs
+++ b/src/Avalonia.Base/Utilities/Ref.cs
@@ -50,6 +50,7 @@ namespace Avalonia.Utilities
             public RefCounter(IDisposable item)
             {
                 _item = item;
+                _refs = 1;
             }
 
             public void AddRef()
@@ -101,8 +102,6 @@ namespace Avalonia.Utilities
             {
                 _item = item;
                 _counter = counter;
-                Interlocked.MemoryBarrier();
-                _counter.AddRef();
             }
 
             public void Dispose()
@@ -139,7 +138,11 @@ namespace Avalonia.Utilities
                 lock (_lock)
                 {
                     if (_item != null)
-                        return new Ref<T>(_item, _counter);
+                    {
+                        var newRef = new Ref<T>(_item, _counter);
+                        _counter.AddRef();
+                        return newRef;
+                    }
                     throw new ObjectDisposedException("Ref<" + typeof(T) + ">");
                 }
             }
@@ -150,7 +153,10 @@ namespace Avalonia.Utilities
                 {
                     if (_item != null)
                     {
-                        return new Ref<TResult>((TResult)(object)_item, _counter);
+                        var castRef = new Ref<TResult>((TResult)(object)_item, _counter);
+                        Interlocked.MemoryBarrier();
+                        _counter.AddRef();
+                        return castRef;
                     }
                     throw new ObjectDisposedException("Ref<" + typeof(T) + ">");
                 }
diff --git a/src/Avalonia.Visuals/Media/Imaging/RenderTargetBitmap.cs b/src/Avalonia.Visuals/Media/Imaging/RenderTargetBitmap.cs
index 3968c05efb..52bd8a3c04 100644
--- a/src/Avalonia.Visuals/Media/Imaging/RenderTargetBitmap.cs
+++ b/src/Avalonia.Visuals/Media/Imaging/RenderTargetBitmap.cs
@@ -37,15 +37,6 @@ namespace Avalonia.Media.Imaging
         /// </summary>
         public new IRef<IRenderTargetBitmapImpl> PlatformImpl { get; }
 
-        /// <summary>
-        /// Disposes of the bitmap.
-        /// </summary>
-        public void Dispose()
-        {
-            PlatformImpl.Dispose();
-            base.Dispose();
-        }
-
         /// <summary>
         /// Renders a visual to the <see cref="RenderTargetBitmap"/>.
         /// </summary>
diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index 850c0a607f..989e2eacdf 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -35,7 +35,7 @@ namespace Avalonia.Rendering
         private object _rendering = new object();
         private int _lastSceneId = -1;
         private DisplayDirtyRects _dirtyRectsDisplay = new DisplayDirtyRects();
-        private IDrawOperation _currentDraw;
+        private IRef<IDrawOperation> _currentDraw;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DeferredRenderer"/> class.
@@ -159,13 +159,13 @@ namespace Avalonia.Rendering
         /// <inheritdoc/>
         Size IVisualBrushRenderer.GetRenderTargetSize(IVisualBrush brush)
         {
-            return (_currentDraw as BrushDrawOperation)?.ChildScenes?[brush.Visual]?.Size ?? Size.Empty;
+            return (_currentDraw as IRef<BrushDrawOperation>)?.Item.ChildScenes?[brush.Visual]?.Size ?? Size.Empty;
         }
 
         /// <inheritdoc/>
         void IVisualBrushRenderer.RenderVisualBrush(IDrawingContextImpl context, IVisualBrush brush)
         {
-            var childScene = (_currentDraw as BrushDrawOperation)?.ChildScenes?[brush.Visual];
+            var childScene = (_currentDraw as IRef<BrushDrawOperation>)?.Item.ChildScenes?[brush.Visual];
 
             if (childScene != null)
             {
@@ -253,7 +253,7 @@ namespace Avalonia.Rendering
                     foreach (var operation in node.DrawOperations)
                     {
                         _currentDraw = operation;
-                        operation.Render(context);
+                        operation.Item.Render(context);
                         _currentDraw = null;
                     }
 
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/ClipNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/ClipNode.cs
index 1cda1d5461..14e6b4ab63 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/ClipNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/ClipNode.cs
@@ -60,5 +60,9 @@ namespace Avalonia.Rendering.SceneGraph
                 context.PopClip();
             }
         }
+
+        public void Dispose()
+        {
+        }
     }
 }
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
index 38a10a7b7f..d6ab4bd5cb 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
@@ -81,7 +81,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// <inheritdoc/>
         public void Dispose()
         {
-            // Nothing to do here as we allocate no unmanaged resources.
+            _node?.Dispose();
         }
 
         /// <summary>
@@ -103,9 +103,9 @@ namespace Avalonia.Rendering.SceneGraph
         {
             var next = NextDrawAs<GeometryNode>();
 
-            if (next == null || !next.Equals(Transform, brush, pen, geometry))
+            if (next == null || !next.Item.Equals(Transform, brush, pen, geometry))
             {
-                Add(new GeometryNode(Transform, brush, pen, geometry, CreateChildScene(brush)));
+                Add(RefCountable.Create(new GeometryNode(Transform, brush, pen, geometry, CreateChildScene(brush))));
             }
             else
             {
@@ -118,9 +118,9 @@ namespace Avalonia.Rendering.SceneGraph
         {
             var next = NextDrawAs<ImageNode>();
 
-            if (next == null || !next.Equals(Transform, source, opacity, sourceRect, destRect))
+            if (next == null || !next.Item.Equals(Transform, source, opacity, sourceRect, destRect))
             {
-                Add(new ImageNode(Transform, source, opacity, sourceRect, destRect));
+                Add(RefCountable.Create(new ImageNode(Transform, source, opacity, sourceRect, destRect)));
             }
             else
             {
@@ -140,9 +140,9 @@ namespace Avalonia.Rendering.SceneGraph
         {
             var next = NextDrawAs<LineNode>();
 
-            if (next == null || !next.Equals(Transform, pen, p1, p2))
+            if (next == null || !next.Item.Equals(Transform, pen, p1, p2))
             {
-                Add(new LineNode(Transform, pen, p1, p2, CreateChildScene(pen.Brush)));
+                Add(RefCountable.Create(new LineNode(Transform, pen, p1, p2, CreateChildScene(pen.Brush))));
             }
             else
             {
@@ -155,9 +155,9 @@ namespace Avalonia.Rendering.SceneGraph
         {
             var next = NextDrawAs<RectangleNode>();
 
-            if (next == null || !next.Equals(Transform, null, pen, rect, cornerRadius))
+            if (next == null || !next.Item.Equals(Transform, null, pen, rect, cornerRadius))
             {
-                Add(new RectangleNode(Transform, null, pen, rect, cornerRadius, CreateChildScene(pen.Brush)));
+                Add(RefCountable.Create(new RectangleNode(Transform, null, pen, rect, cornerRadius, CreateChildScene(pen.Brush))));
             }
             else
             {
@@ -170,9 +170,9 @@ namespace Avalonia.Rendering.SceneGraph
         {
             var next = NextDrawAs<TextNode>();
 
-            if (next == null || !next.Equals(Transform, foreground, origin, text))
+            if (next == null || !next.Item.Equals(Transform, foreground, origin, text))
             {
-                Add(new TextNode(Transform, foreground, origin, text, CreateChildScene(foreground)));
+                Add(RefCountable.Create(new TextNode(Transform, foreground, origin, text, CreateChildScene(foreground))));
             }
             else
             {
@@ -185,9 +185,9 @@ namespace Avalonia.Rendering.SceneGraph
         {
             var next = NextDrawAs<RectangleNode>();
 
-            if (next == null || !next.Equals(Transform, brush, null, rect, cornerRadius))
+            if (next == null || !next.Item.Equals(Transform, brush, null, rect, cornerRadius))
             {
-                Add(new RectangleNode(Transform, brush, null, rect, cornerRadius, CreateChildScene(brush)));
+                Add(RefCountable.Create(new RectangleNode(Transform, brush, null, rect, cornerRadius, CreateChildScene(brush))));
             }
             else
             {
@@ -205,9 +205,9 @@ namespace Avalonia.Rendering.SceneGraph
         {
             var next = NextDrawAs<ClipNode>();
 
-            if (next == null || !next.Equals(null))
+            if (next == null || !next.Item.Equals(null))
             {
-                Add(new ClipNode());
+                Add(RefCountable.Create(new ClipNode()));
             }
             else
             {
@@ -220,9 +220,9 @@ namespace Avalonia.Rendering.SceneGraph
         {
             var next = NextDrawAs<GeometryClipNode>();
 
-            if (next == null || !next.Equals(null))
+            if (next == null || !next.Item.Equals(null))
             {
-                Add(new GeometryClipNode());
+                Add(RefCountable.Create((new GeometryClipNode())));
             }
             else
             {
@@ -235,9 +235,9 @@ namespace Avalonia.Rendering.SceneGraph
         {
             var next = NextDrawAs<OpacityNode>();
 
-            if (next == null || !next.Equals(null))
+            if (next == null || !next.Item.Equals(null))
             {
-                Add(new OpacityNode());
+                Add(RefCountable.Create(new OpacityNode()));
             }
             else
             {
@@ -250,9 +250,9 @@ namespace Avalonia.Rendering.SceneGraph
         {
             var next = NextDrawAs<OpacityMaskNode>();
 
-            if (next == null || !next.Equals(null, null))
+            if (next == null || !next.Item.Equals(null, null))
             {
-                Add(new OpacityMaskNode());
+                Add(RefCountable.Create(new OpacityMaskNode()));
             }
             else
             {
@@ -265,9 +265,9 @@ namespace Avalonia.Rendering.SceneGraph
         {
             var next = NextDrawAs<ClipNode>();
 
-            if (next == null || !next.Equals(clip))
+            if (next == null || !next.Item.Equals(clip))
             {
-                Add(new ClipNode(clip));
+                Add(RefCountable.Create(new ClipNode(clip)));
             }
             else
             {
@@ -280,9 +280,9 @@ namespace Avalonia.Rendering.SceneGraph
         {
             var next = NextDrawAs<GeometryClipNode>();
 
-            if (next == null || !next.Equals(clip))
+            if (next == null || !next.Item.Equals(clip))
             {
-                Add(new GeometryClipNode(clip));
+                Add(RefCountable.Create(new GeometryClipNode(clip)));
             }
             else
             {
@@ -295,9 +295,9 @@ namespace Avalonia.Rendering.SceneGraph
         {
             var next = NextDrawAs<OpacityNode>();
 
-            if (next == null || !next.Equals(opacity))
+            if (next == null || !next.Item.Equals(opacity))
             {
-                Add(new OpacityNode(opacity));
+                Add(RefCountable.Create(new OpacityNode(opacity)));
             }
             else
             {
@@ -310,9 +310,9 @@ namespace Avalonia.Rendering.SceneGraph
         {
             var next = NextDrawAs<OpacityMaskNode>();
 
-            if (next == null || !next.Equals(mask, bounds))
+            if (next == null || !next.Item.Equals(mask, bounds))
             {
-                Add(new OpacityMaskNode(mask, bounds, CreateChildScene(mask)));
+                Add(RefCountable.Create(new OpacityMaskNode(mask, bounds, CreateChildScene(mask))));
             }
             else
             {
@@ -342,7 +342,7 @@ namespace Avalonia.Rendering.SceneGraph
 
                 foreach (var operation in Owner._node.DrawOperations)
                 {
-                    dirty.Add(operation.Bounds);
+                    dirty.Add(operation.Item.Bounds);
                 }
 
                 Owner._node = Node;
@@ -356,7 +356,7 @@ namespace Avalonia.Rendering.SceneGraph
             public int DrawOperationIndex { get; }
         }
 
-        private void Add(IDrawOperation  node)
+        private void Add(IRef<IDrawOperation> node)
         {
             if (_drawOperationindex < _node.DrawOperations.Count)
             {
@@ -370,9 +370,9 @@ namespace Avalonia.Rendering.SceneGraph
             ++_drawOperationindex;
         }
 
-        private T NextDrawAs<T>() where T : class, IDrawOperation
+        private IRef<T> NextDrawAs<T>() where T : class, IDrawOperation
         {
-            return _drawOperationindex < _node.DrawOperations.Count ? _node.DrawOperations[_drawOperationindex] as T : null;
+            return _drawOperationindex < _node.DrawOperations.Count ? _node.DrawOperations[_drawOperationindex] as IRef<T> : null;
         }
 
         private IDictionary<IVisual, Scene> CreateChildScene(IBrush brush)
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DrawOperation.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/DrawOperation.cs
index 4c6ed189ff..1a5a6fad3f 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/DrawOperation.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/DrawOperation.cs
@@ -22,5 +22,9 @@ namespace Avalonia.Rendering.SceneGraph
         public abstract bool HitTest(Point p);
 
         public abstract void Render(IDrawingContextImpl context);
+
+        public virtual void Dispose()
+        {
+        }
     }
 }
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryClipNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryClipNode.cs
index a11d641151..2c1decf5dc 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryClipNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryClipNode.cs
@@ -60,5 +60,8 @@ namespace Avalonia.Rendering.SceneGraph
                 context.PopGeometryClip();
             }
         }
+        public void Dispose()
+        {
+        }
     }
 }
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/IDrawOperation.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/IDrawOperation.cs
index 839fd9b0e5..f8d5bf5b7a 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/IDrawOperation.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/IDrawOperation.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Rendering.SceneGraph
     /// <summary>
     /// Represents a node in the low-level scene graph that represents geometry.
     /// </summary>
-    public interface IDrawOperation
+    public interface IDrawOperation : IDisposable
     {
         /// <summary>
         /// Gets the bounds of the visible content in the node in global coordinates.
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs
index 234cadbf31..681f00799b 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using Avalonia.Media;
 using Avalonia.Platform;
+using Avalonia.Utilities;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Rendering.SceneGraph
@@ -12,7 +13,7 @@ namespace Avalonia.Rendering.SceneGraph
     /// <summary>
     /// Represents a node in the low-level scene graph representing an <see cref="IVisual"/>.
     /// </summary>
-    public interface IVisualNode
+    public interface IVisualNode : IDisposable
     {
         /// <summary>
         /// Gets the visual to which the node relates.
@@ -66,7 +67,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// <summary>
         /// Gets the drawing operations for the visual.
         /// </summary>
-        IReadOnlyList<IDrawOperation> DrawOperations { get; }
+        IReadOnlyList<IRef<IDrawOperation>> DrawOperations { get; }
 
         /// <summary>
         /// Sets up the drawing context for rendering the node's geometry.
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs
index 8a1a5cb481..06fdb3f86c 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs
@@ -10,7 +10,7 @@ namespace Avalonia.Rendering.SceneGraph
     /// <summary>
     /// A node in the scene graph which represents an image draw.
     /// </summary>
-    internal class ImageNode : DrawOperation, IDisposable
+    internal class ImageNode : DrawOperation
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageNode"/> class.
@@ -89,7 +89,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// <inheritdoc/>
         public override bool HitTest(Point p) => Bounds.Contains(p);
 
-        public void Dispose()
+        public override void Dispose()
         {
             Source?.Dispose();
         }
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/OpacityNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/OpacityNode.cs
index 097bf15828..ef49ac8879 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/OpacityNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/OpacityNode.cs
@@ -60,5 +60,9 @@ namespace Avalonia.Rendering.SceneGraph
                 context.PopOpacity();
             }
         }
+
+        public void Dispose()
+        {
+        }
     }
 }
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
index 6bea4d9bd6..ed8a2960dc 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
@@ -3,8 +3,10 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Avalonia.Media;
 using Avalonia.Platform;
+using Avalonia.Utilities;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Rendering.SceneGraph
@@ -15,12 +17,12 @@ namespace Avalonia.Rendering.SceneGraph
     internal class VisualNode : IVisualNode
     {
         private static readonly IReadOnlyList<IVisualNode> EmptyChildren = new IVisualNode[0];
-        private static readonly IReadOnlyList<IDrawOperation> EmptyDrawOperations = new IDrawOperation[0];
+        private static readonly IReadOnlyList<IRef<IDrawOperation>> EmptyDrawOperations = new IRef<IDrawOperation>[0];
 
         private Rect? _bounds;
         private double _opacity;
         private List<IVisualNode> _children;
-        private List<IDrawOperation> _drawOperations;
+        private List<IRef<IDrawOperation>> _drawOperations;
         private bool _drawOperationsCloned;
         private Matrix transformRestore;
 
@@ -101,7 +103,7 @@ namespace Avalonia.Rendering.SceneGraph
         public IReadOnlyList<IVisualNode> Children => _children ?? EmptyChildren;
 
         /// <inheritdoc/>
-        public IReadOnlyList<IDrawOperation> DrawOperations => _drawOperations ?? EmptyDrawOperations;
+        public IReadOnlyList<IRef<IDrawOperation>> DrawOperations => _drawOperations ?? EmptyDrawOperations;
 
         /// <summary>
         /// Adds a child to the <see cref="Children"/> collection.
@@ -117,10 +119,10 @@ namespace Avalonia.Rendering.SceneGraph
         /// Adds an operation to the <see cref="DrawOperations"/> collection.
         /// </summary>
         /// <param name="operation">The operation to add.</param>
-        public void AddDrawOperation(IDrawOperation operation)
+        public void AddDrawOperation(IRef<IDrawOperation> operation)
         {
             EnsureDrawOperationsCreated();
-            _drawOperations.Add(operation);
+            _drawOperations.Add(operation.Clone());
         }
 
         /// <summary>
@@ -131,6 +133,7 @@ namespace Avalonia.Rendering.SceneGraph
         {
             EnsureChildrenCreated();
             _children.Remove(child);
+            child.Dispose();
         }
 
         /// <summary>
@@ -141,7 +144,9 @@ namespace Avalonia.Rendering.SceneGraph
         public void ReplaceChild(int index, IVisualNode node)
         {
             EnsureChildrenCreated();
+            var old = _children[index];
             _children[index] = node;
+            old.Dispose();
         }
 
         /// <summary>
@@ -149,10 +154,15 @@ namespace Avalonia.Rendering.SceneGraph
         /// </summary>
         /// <param name="index">The opeation to be replaced.</param>
         /// <param name="operation">The operation to add.</param>
-        public void ReplaceDrawOperation(int index, IDrawOperation operation)
+        public void ReplaceDrawOperation(int index, IRef<IDrawOperation> operation)
         {
             EnsureDrawOperationsCreated();
-            _drawOperations[index] = operation;
+            var old = _drawOperations[index];
+            _drawOperations[index] = operation.Clone();
+            if (old is IDisposable disposable)
+            {
+                disposable.Dispose();
+            }
         }
 
         /// <summary>
@@ -165,6 +175,10 @@ namespace Avalonia.Rendering.SceneGraph
             if (first < _children?.Count)
             {
                 EnsureChildrenCreated();
+                for (int i = first; i < _children.Count - first; i++)
+                {
+                    _children[i].Dispose();
+                }
                 _children.RemoveRange(first, _children.Count - first);
             }
         }
@@ -179,6 +193,10 @@ namespace Avalonia.Rendering.SceneGraph
             if (first < _drawOperations?.Count)
             {
                 EnsureDrawOperationsCreated();
+                for (int i = first; i < _drawOperations.Count - first; i++)
+                {
+                    _drawOperations[i].Dispose();
+                }
                 _drawOperations.RemoveRange(first, _drawOperations.Count - first);
             }
         }
@@ -209,7 +227,7 @@ namespace Avalonia.Rendering.SceneGraph
         {
             foreach (var operation in DrawOperations)
             {
-                if (operation.HitTest(p) == true)
+                if (operation.Item.HitTest(p) == true)
                 {
                     return true;
                 }
@@ -280,7 +298,7 @@ namespace Avalonia.Rendering.SceneGraph
 
             foreach (var operation in DrawOperations)
             {
-                result = result.Union(operation.Bounds);
+                result = result.Union(operation.Item.Bounds);
             }
 
             _bounds = result;
@@ -299,13 +317,28 @@ namespace Avalonia.Rendering.SceneGraph
         {
             if (_drawOperations == null)
             {
-                _drawOperations = new List<IDrawOperation>();
+                _drawOperations = new List<IRef<IDrawOperation>>();
             }
             else if (_drawOperationsCloned)
             {
-                _drawOperations = new List<IDrawOperation>(_drawOperations);
+                _drawOperations = new List<IRef<IDrawOperation>>(_drawOperations.Select(op => op.Clone()));
                 _drawOperationsCloned = false;
             }
         }
+
+        public void Dispose()
+        {
+            foreach (var child in Children)
+            {
+                child.Dispose();
+            }
+            if (!_drawOperationsCloned)
+            {
+                foreach (var operation in DrawOperations)
+                {
+                    operation.Dispose();
+                } 
+            }
+        }
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
index a6c3e97a85..ec21741100 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
@@ -399,7 +399,7 @@ namespace Avalonia.Direct2D1.Media
                 return new ImageBrushImpl(
                     imageBrush,
                     _renderTarget,
-                    (BitmapImpl)imageBrush.Source.PlatformImpl,
+                    (BitmapImpl)imageBrush.Source.PlatformImpl.Item,
                     destinationSize);
             }
             else if (visualBrush != null)

From 728c19eb8639e7d5cd438344d9d48e730d3971a4 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 28 Jan 2018 17:17:29 +0100
Subject: [PATCH 298/482] Removed unused files.

---
 .../Avalonia.Win32.Shared.projitems           |  34 ----
 src/Windows/Avalonia.Win32/Settings.StyleCop  | 184 ------------------
 2 files changed, 218 deletions(-)
 delete mode 100644 src/Windows/Avalonia.Win32/Avalonia.Win32.Shared.projitems
 delete mode 100644 src/Windows/Avalonia.Win32/Settings.StyleCop

diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.Shared.projitems b/src/Windows/Avalonia.Win32/Avalonia.Win32.Shared.projitems
deleted file mode 100644
index 6f13747cb6..0000000000
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.Shared.projitems
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>9defc6b7-845b-4d8f-afc0-d32bf0032b8c</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>Avalonia.Win32.Shared</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)ClipboardImpl.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)CursorFactory.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)FramebufferManager.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Input\KeyInterop.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Input\WindowsKeyboardDevice.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Input\WindowsMouseDevice.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop\UnmanagedMethods.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)PlatformConstants.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)PopupImpl.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Properties\AssemblyInfo.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RenderLoop.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ScreenImpl.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)SystemDialogImpl.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Win32Platform.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)WindowFramebuffer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)WindowImpl.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)WinScreen.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\WindowResizeDragHelper.cs" />
-    <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Windows/Avalonia.Win32/Settings.StyleCop b/src/Windows/Avalonia.Win32/Settings.StyleCop
deleted file mode 100644
index 5bd6cda777..0000000000
--- a/src/Windows/Avalonia.Win32/Settings.StyleCop
+++ /dev/null
@@ -1,184 +0,0 @@
-<StyleCopSettings Version="105">
-  <Analyzers>
-    <Analyzer AnalyzerId="StyleCop.CSharp.DocumentationRules">
-      <Rules>
-        <Rule Name="ElementsMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="PartialElementsMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="EnumerationItemsMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationMustContainValidXml">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementDocumentationMustHaveSummary">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="PartialElementDocumentationMustHaveSummary">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementDocumentationMustHaveSummaryText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="PartialElementDocumentationMustHaveSummaryText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementDocumentationMustNotHaveDefaultSummary">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementParametersMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementParameterDocumentationMustMatchElementParameters">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementParameterDocumentationMustDeclareParameterName">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementParameterDocumentationMustHaveText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementReturnValueMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementReturnValueDocumentationMustHaveText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="VoidReturnValueMustNotBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="GenericTypeParametersMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="GenericTypeParametersMustBeDocumentedPartialClass">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="GenericTypeParameterDocumentationMustMatchTypeParameters">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="GenericTypeParameterDocumentationMustDeclareParameterName">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="GenericTypeParameterDocumentationMustHaveText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="PropertySummaryDocumentationMustMatchAccessors">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="PropertySummaryDocumentationMustOmitSetAccessorWithRestrictedAccess">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementDocumentationMustNotBeCopiedAndPasted">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="SingleLineCommentsMustNotUseDocumentationStyleSlashes">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationTextMustNotBeEmpty">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationTextMustContainWhitespace">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationMustMeetCharacterPercentage">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ConstructorSummaryDocumentationMustBeginWithStandardText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DestructorSummaryDocumentationMustBeginWithStandardText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationHeadersMustNotContainBlankLines">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="IncludedDocumentationXPathDoesNotExist">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="IncludeNodeDoesNotContainValidFileAndPath">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="InheritDocMustBeUsedWithInheritingClass">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementDocumentationMustBeSpelledCorrectly">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-  </Analyzers>
-</StyleCopSettings>
\ No newline at end of file

From 0e126d2b0638014646dc11590ec27f8dcf31e12b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 28 Jan 2018 19:09:27 +0100
Subject: [PATCH 299/482] Reimplement EmbeddedWindowImpl.

Without System.Windows.Forms.
---
 .../Embedding/EmbeddedWindowImpl.cs           | 104 +++++++++++++-----
 1 file changed, 76 insertions(+), 28 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/Embedding/EmbeddedWindowImpl.cs b/src/Windows/Avalonia.Win32/Embedding/EmbeddedWindowImpl.cs
index 5e91ede4a5..3871936605 100644
--- a/src/Windows/Avalonia.Win32/Embedding/EmbeddedWindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/Embedding/EmbeddedWindowImpl.cs
@@ -2,6 +2,9 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
 using Avalonia.Platform;
 using Avalonia.Win32.Interop;
 
@@ -9,35 +12,80 @@ namespace Avalonia.Win32
 {
     class EmbeddedWindowImpl : WindowImpl, IEmbeddableWindowImpl
     {
-        //private static readonly System.Windows.Forms.UserControl WinFormsControl = new System.Windows.Forms.UserControl();
-
-        //public static IntPtr DefaultParentWindow = WinFormsControl.Handle;
-
-        //protected override IntPtr CreateWindowOverride(ushort atom)
-        //{
-        //    var hWnd = UnmanagedMethods.CreateWindowEx(
-        //        0,
-        //        atom,
-        //        null,
-        //        (int)UnmanagedMethods.WindowStyles.WS_CHILD,
-        //        0,
-        //        0,
-        //        640,
-        //        480,
-        //        DefaultParentWindow,
-        //        IntPtr.Zero,
-        //        IntPtr.Zero,
-        //        IntPtr.Zero);
-        //    return hWnd;
-        //}
-
-        //protected override IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
-        //{
-        //    if(msg == (uint)UnmanagedMethods.WindowsMessage.WM_KILLFOCUS)
-        //        LostFocus?.Invoke();
-        //    return base.WndProc(hWnd, msg, wParam, lParam);
-        //}
+        private static IntPtr DefaultParentWindow = CreateParentWindow();
+        private static UnmanagedMethods.WndProc _wndProcDelegate;
+
+        protected override IntPtr CreateWindowOverride(ushort atom)
+        {
+            var hWnd = UnmanagedMethods.CreateWindowEx(
+                0,
+                atom,
+                null,
+                (int)UnmanagedMethods.WindowStyles.WS_CHILD,
+                0,
+                0,
+                640,
+                480,
+                DefaultParentWindow,
+                IntPtr.Zero,
+                IntPtr.Zero,
+                IntPtr.Zero);
+            return hWnd;
+        }
+
+        protected override IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
+        {
+            if (msg == (uint)UnmanagedMethods.WindowsMessage.WM_KILLFOCUS)
+                LostFocus?.Invoke();
+            return base.WndProc(hWnd, msg, wParam, lParam);
+        }
 
         public event Action LostFocus;
+
+        private static IntPtr CreateParentWindow()
+        {
+            _wndProcDelegate = new UnmanagedMethods.WndProc(ParentWndProc);
+
+            var wndClassEx = new UnmanagedMethods.WNDCLASSEX
+            {
+                cbSize = Marshal.SizeOf<UnmanagedMethods.WNDCLASSEX>(),
+                hInstance = UnmanagedMethods.GetModuleHandle(null),
+                lpfnWndProc = _wndProcDelegate,
+                lpszClassName = "AvaloniaEmbeddedWindow-" + Guid.NewGuid(),
+            };
+
+            var atom = UnmanagedMethods.RegisterClassEx(ref wndClassEx);
+
+            if (atom == 0)
+            {
+                throw new Win32Exception();
+            }
+
+            var hwnd = UnmanagedMethods.CreateWindowEx(
+                0,
+                atom,
+                null,
+                (int)UnmanagedMethods.WindowStyles.WS_OVERLAPPEDWINDOW,
+                UnmanagedMethods.CW_USEDEFAULT,
+                UnmanagedMethods.CW_USEDEFAULT,
+                UnmanagedMethods.CW_USEDEFAULT,
+                UnmanagedMethods.CW_USEDEFAULT,
+                IntPtr.Zero,
+                IntPtr.Zero,
+                IntPtr.Zero,
+                IntPtr.Zero);
+
+            if (hwnd == IntPtr.Zero)
+            {
+                throw new Win32Exception();
+            }
+
+            return hwnd;
+        }
+
+        private static IntPtr ParentWndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
+        {
+            return UnmanagedMethods.DefWindowProc(hWnd, msg, wParam, lParam);
+        }
     }
 }

From 79f35161be956bdd7baa896d55effd8de05a268d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 28 Jan 2018 19:13:33 +0100
Subject: [PATCH 300/482] Use correct CharSet for WNDCLASSEX

And prepend `Avalonia-` to window class. Looking in Spy++ I noticed that our window class name was garbage because the `CharSet` on `WNDCLASSEX` was wrong. Fix that and include "Avalonia" in our window classes.
---
 src/Windows/Avalonia.Win32/Embedding/EmbeddedWindowImpl.cs | 1 -
 src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs     | 2 +-
 src/Windows/Avalonia.Win32/WindowImpl.cs                   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/Embedding/EmbeddedWindowImpl.cs b/src/Windows/Avalonia.Win32/Embedding/EmbeddedWindowImpl.cs
index 3871936605..cb9c753f4d 100644
--- a/src/Windows/Avalonia.Win32/Embedding/EmbeddedWindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/Embedding/EmbeddedWindowImpl.cs
@@ -4,7 +4,6 @@
 using System;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
-using System.Windows.Forms;
 using Avalonia.Platform;
 using Avalonia.Win32.Interop;
 
diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
index a0518cf92e..f13dd3272c 100644
--- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
+++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -1098,7 +1098,7 @@ namespace Avalonia.Win32.Interop
             }
         }
 
-        [StructLayout(LayoutKind.Sequential)]
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
         public struct WNDCLASSEX
         {
             public int cbSize;
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index d9b5e25c63..3ba926b42a 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -641,7 +641,7 @@ namespace Avalonia.Win32
             // Ensure that the delegate doesn't get garbage collected by storing it as a field.
             _wndProcDelegate = new UnmanagedMethods.WndProc(WndProc);
 
-            _className = Guid.NewGuid().ToString();
+            _className = "Avalonia-" + Guid.NewGuid();
 
             UnmanagedMethods.WNDCLASSEX wndClassEx = new UnmanagedMethods.WNDCLASSEX
             {

From 952f89883d07b60fb76018ce67d2aa81cd8b7fe4 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 28 Jan 2018 13:36:34 -0600
Subject: [PATCH 301/482] Fix build errors in SceneGraph and DeferredRenderer
 tests.

---
 .../Rendering/SceneGraph/VisualNode.cs        |  5 +---
 .../Rendering/DeferredRendererTests.cs        |  2 +-
 .../DeferredDrawingContextImplTests.cs        | 13 +++++----
 .../Rendering/SceneGraph/VisualNodeTests.cs   | 28 +++++++++++++++----
 4 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
index ed8a2960dc..0208511c4c 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
@@ -159,10 +159,7 @@ namespace Avalonia.Rendering.SceneGraph
             EnsureDrawOperationsCreated();
             var old = _drawOperations[index];
             _drawOperations[index] = operation.Clone();
-            if (old is IDisposable disposable)
-            {
-                disposable.Dispose();
-            }
+            old.Dispose();
         }
 
         /// <summary>
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
index 8fcb54775b..7821f60a51 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
@@ -359,7 +359,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
 
         private Mock<IDrawingContextImpl> GetLayerContext(DeferredRenderer renderer, IControl layerRoot)
         {
-            return Mock.Get(renderer.Layers[layerRoot].Bitmap.CreateDrawingContext(null));
+            return Mock.Get(renderer.Layers[layerRoot].Bitmap.Item.CreateDrawingContext(null));
         }
 
         private void IgnoreFirstFrame(Mock<IRenderLoop> loop, Mock<ISceneBuilder> sceneBuilder)
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
index 1906775783..b0c9e28c98 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using Avalonia.Media;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.UnitTests;
+using Avalonia.Utilities;
 using Avalonia.VisualTree;
 using Moq;
 using Xunit;
@@ -111,7 +112,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
         public void Should_Not_Replace_Identical_DrawOperation()
         {
             var node = new VisualNode(new TestRoot(), null);
-            var operation = new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), 0);
+            var operation = RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), 0));
             var layers = new SceneLayers(node.Visual);
             var target = new DeferredDrawingContextImpl(null, layers);
 
@@ -133,7 +134,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
         public void Should_Replace_Different_DrawOperation()
         {
             var node = new VisualNode(new TestRoot(), null);
-            var operation = new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), 0);
+            var operation = RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), 0));
             var layers = new SceneLayers(node.Visual);
             var target = new DeferredDrawingContextImpl(null, layers);
 
@@ -175,10 +176,10 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             var node = new VisualNode(new TestRoot(), null);
 
             node.LayerRoot = node.Visual;
-            node.AddDrawOperation(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 10, 100), 0));
-            node.AddDrawOperation(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 20, 100), 0));
-            node.AddDrawOperation(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 30, 100), 0));
-            node.AddDrawOperation(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 40, 100), 0));
+            node.AddDrawOperation(RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 10, 100), 0)));
+            node.AddDrawOperation(RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 20, 100), 0)));
+            node.AddDrawOperation(RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 30, 100), 0)));
+            node.AddDrawOperation(RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 40, 100), 0)));
 
             var layers = new SceneLayers(node.Visual);
             var target = new DeferredDrawingContextImpl(null, layers);
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs
index 3d2e780e0b..1101ccacba 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs
@@ -1,5 +1,6 @@
 using System;
 using Avalonia.Rendering.SceneGraph;
+using Avalonia.Utilities;
 using Avalonia.VisualTree;
 using Moq;
 using Xunit;
@@ -43,7 +44,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             var node = new VisualNode(Mock.Of<IVisual>(), null);
             var collection = node.DrawOperations;
 
-            node.AddDrawOperation(Mock.Of<IDrawOperation>());
+            node.AddDrawOperation(RefCountable.Create(Mock.Of<IDrawOperation>()));
 
             Assert.NotSame(collection, node.DrawOperations);
         }
@@ -52,7 +53,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
         public void Cloned_Nodes_Should_Share_DrawOperations_Collection()
         {
             var node1 = new VisualNode(Mock.Of<IVisual>(), null);
-            node1.AddDrawOperation(Mock.Of<IDrawOperation>());
+            node1.AddDrawOperation(RefCountable.Create(Mock.Of<IDrawOperation>()));
 
             var node2 = node1.Clone(null);
 
@@ -63,18 +64,33 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
         public void Adding_DrawOperation_To_Cloned_Node_Should_Create_New_Collection()
         {
             var node1 = new VisualNode(Mock.Of<IVisual>(), null);
-            var operation1 = Mock.Of<IDrawOperation>();
+            var operation1 = RefCountable.Create(Mock.Of<IDrawOperation>());
             node1.AddDrawOperation(operation1);
 
             var node2 = node1.Clone(null);
-            var operation2 = Mock.Of<IDrawOperation>();
+            var operation2 = RefCountable.Create(Mock.Of<IDrawOperation>());
             node2.ReplaceDrawOperation(0, operation2);
 
             Assert.NotSame(node1.DrawOperations, node2.DrawOperations);
             Assert.Equal(1, node1.DrawOperations.Count);
             Assert.Equal(1, node2.DrawOperations.Count);
-            Assert.Same(operation1, node1.DrawOperations[0]);
-            Assert.Same(operation2, node2.DrawOperations[0]);
+            Assert.Same(operation1.Item, node1.DrawOperations[0].Item);
+            Assert.Same(operation2.Item, node2.DrawOperations[0].Item);
+        }
+
+        [Fact]
+        public void DrawOperations_In_Cloned_Node_Are_Cloned()
+        {
+            var node1 = new VisualNode(Mock.Of<IVisual>(), null);
+            var operation1 = RefCountable.Create(Mock.Of<IDrawOperation>());
+            node1.AddDrawOperation(operation1);
+
+            var node2 = node1.Clone(null);
+            var operation2 = RefCountable.Create(Mock.Of<IDrawOperation>());
+            node2.AddDrawOperation(operation2);
+            
+            Assert.Same(node1.DrawOperations[0].Item, node2.DrawOperations[0].Item);
+            Assert.NotSame(node1.DrawOperations[0], node2.DrawOperations[0]);
         }
     }
 }

From 8b97174735bdf0231ca899daaebbafcbdfc6d07a Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 28 Jan 2018 14:11:10 -0600
Subject: [PATCH 302/482] Fix tests to correctly access the item of the
 ref-counted instance.

---
 .../SceneGraph/DeferredDrawingContextImplTests.cs    | 10 +++++-----
 .../Rendering/SceneGraph/SceneBuilderTests.cs        | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
index b0c9e28c98..0fa70315fd 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
@@ -104,8 +104,8 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             }
 
             Assert.Equal(2, node.DrawOperations.Count);
-            Assert.IsType<RectangleNode>(node.DrawOperations[0]);
-            Assert.IsType<RectangleNode>(node.DrawOperations[1]);
+            Assert.IsType<RectangleNode>(node.DrawOperations[0].Item);
+            Assert.IsType<RectangleNode>(node.DrawOperations[1].Item);
         }
 
         [Fact]
@@ -125,9 +125,9 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             }
 
             Assert.Equal(1, node.DrawOperations.Count);
-            Assert.Same(operation, node.DrawOperations.Single());
+            Assert.Same(operation.Item, node.DrawOperations.Single().Item);
 
-            Assert.IsType<RectangleNode>(node.DrawOperations[0]);
+            Assert.IsType<RectangleNode>(node.DrawOperations[0].Item);
         }
 
         [Fact]
@@ -149,7 +149,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             Assert.Equal(1, node.DrawOperations.Count);
             Assert.NotSame(operation, node.DrawOperations.Single());
 
-            Assert.IsType<RectangleNode>(node.DrawOperations[0]);
+            Assert.IsType<RectangleNode>(node.DrawOperations[0].Item);
         }
 
         [Fact]
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
index 44b9ebe8ce..2eb3dfb15c 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
@@ -53,15 +53,15 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 Assert.Equal(1, borderNode.Children.Count);
                 Assert.Equal(1, borderNode.DrawOperations.Count);
 
-                var backgroundNode = (RectangleNode)borderNode.DrawOperations[0];
+                var backgroundNode = (RectangleNode)borderNode.DrawOperations[0].Item;
                 Assert.Equal(Brushes.Red, backgroundNode.Brush);
 
-                var textBlockNode = (VisualNode)borderNode.Children[0];
+                var textBlockNode = borderNode.Children[0];
                 Assert.Same(textBlockNode, result.FindNode(textBlock));
                 Assert.Same(textBlock, textBlockNode.Visual);
                 Assert.Equal(1, textBlockNode.DrawOperations.Count);
 
-                var textNode = (TextNode)textBlockNode.DrawOperations[0];
+                var textNode = (TextNode)textBlockNode.DrawOperations[0].Item;
                 Assert.NotNull(textNode.Text);
             }
         }
@@ -358,15 +358,15 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 var borderNode = (VisualNode)result.Root.Children[0];
                 Assert.Same(border, borderNode.Visual);
 
-                var backgroundNode = (RectangleNode)borderNode.DrawOperations[0];
+                var backgroundNode = (RectangleNode)borderNode.DrawOperations[0].Item;
                 Assert.NotSame(initialBackgroundNode, backgroundNode);
                 Assert.Equal(Brushes.Green, backgroundNode.Brush);
 
                 var textBlockNode = (VisualNode)borderNode.Children[0];
                 Assert.Same(textBlock, textBlockNode.Visual);
 
-                var textNode = (TextNode)textBlockNode.DrawOperations[0];
-                Assert.Same(initialTextNode, textNode);
+                var textNode = (TextNode)textBlockNode.DrawOperations[0].Item;
+                Assert.Same(initialTextNode.Item, textNode);
             }
         }
 

From a6cfbdac9338e55a33ea24ab9f7ff72eae077dac Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 29 Jan 2018 20:45:49 +0100
Subject: [PATCH 303/482] Remove Avalonia.Win32.NetStandard dir.

---
 .../Avalonia.Win32.NetStandard.csproj         |  49 -----
 .../ComStreamWrapper.cs                       | 197 ------------------
 .../Avalonia.Win32.NetStandard/Gdip.cs        | 128 ------------
 .../Avalonia.Win32.NetStandard/IconImpl.cs    |  45 ----
 .../NativeWin32Platform.cs                    |  30 ---
 .../Win32Exception.cs                         |  12 --
 6 files changed, 461 deletions(-)
 delete mode 100644 src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj
 delete mode 100644 src/Windows/Avalonia.Win32.NetStandard/ComStreamWrapper.cs
 delete mode 100644 src/Windows/Avalonia.Win32.NetStandard/Gdip.cs
 delete mode 100644 src/Windows/Avalonia.Win32.NetStandard/IconImpl.cs
 delete mode 100644 src/Windows/Avalonia.Win32.NetStandard/NativeWin32Platform.cs
 delete mode 100644 src/Windows/Avalonia.Win32.NetStandard/Win32Exception.cs

diff --git a/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj b/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj
deleted file mode 100644
index bae634b030..0000000000
--- a/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj
+++ /dev/null
@@ -1,49 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <RootNamespace>Avalonia.Win32</RootNamespace>
-    <AssemblyName>Avalonia.Win32</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NETSTANDARD</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ComStreamWrapper.cs" />
-    <Compile Include="Gdip.cs" />
-    <Compile Include="IconImpl.cs" />
-    <Compile Include="NativeWin32Platform.cs" />
-    <Compile Include="Win32Exception.cs" />
-  </ItemGroup>
-  <Import Project="..\Avalonia.Win32\Avalonia.Win32.Shared.projitems" Label="Shared" />
-</Project>
\ No newline at end of file
diff --git a/src/Windows/Avalonia.Win32.NetStandard/ComStreamWrapper.cs b/src/Windows/Avalonia.Win32.NetStandard/ComStreamWrapper.cs
deleted file mode 100644
index 083021f58d..0000000000
--- a/src/Windows/Avalonia.Win32.NetStandard/ComStreamWrapper.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-//
-// System.Drawing.ComIStreamWrapper.cs
-//
-// Author:
-//   Kornél Pál <http://www.kornelpal.hu/>
-//
-// Copyright (C) 2005-2008 Kornél Pál
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.ComTypes;
-using STATSTG = System.Runtime.InteropServices.ComTypes.STATSTG;
-
-namespace Avalonia.Win32
-{
-    // Stream to IStream wrapper for COM interop
-    internal sealed class ComIStreamWrapper : IStream
-    {
-        private const int STG_E_INVALIDFUNCTION = unchecked((int)0x80030001);
-
-        private readonly Stream baseStream;
-        private long position = -1;
-
-        internal ComIStreamWrapper(Stream stream)
-        {
-            baseStream = stream;
-        }
-
-        private void SetSizeToPosition()
-        {
-            if (position != -1)
-            {
-                if (position > baseStream.Length)
-                    baseStream.SetLength(position);
-                baseStream.Position = position;
-                position = -1;
-            }
-        }
-
-        public void Read(byte[] pv, int cb, IntPtr pcbRead)
-        {
-            int read = 0;
-
-            if (cb != 0)
-            {
-                SetSizeToPosition();
-                read = baseStream.Read(pv, 0, cb);
-            }
-
-            if (pcbRead != IntPtr.Zero)
-                Marshal.WriteInt32(pcbRead, read);
-        }
-
-        public void Write(byte[] pv, int cb, IntPtr pcbWritten)
-        {
-            if (cb != 0)
-            {
-                SetSizeToPosition();
-                baseStream.Write(pv, 0, cb);
-            }
-
-            if (pcbWritten != IntPtr.Zero)
-                Marshal.WriteInt32(pcbWritten, cb);
-        }
-
-        public void Seek(long dlibMove, int dwOrigin, IntPtr plibNewPosition)
-        {
-            long length = baseStream.Length;
-            long newPosition;
-
-            switch ((SeekOrigin)dwOrigin)
-            {
-                case SeekOrigin.Begin:
-                    newPosition = dlibMove;
-                    break;
-                case SeekOrigin.Current:
-                    if (position == -1)
-                        newPosition = baseStream.Position + dlibMove;
-                    else
-                        newPosition = position + dlibMove;
-                    break;
-                case SeekOrigin.End:
-                    newPosition = length + dlibMove;
-                    break;
-                default:
-                    throw new COMException(null, STG_E_INVALIDFUNCTION);
-            }
-
-            if (newPosition > length)
-                position = newPosition;
-            else
-            {
-                baseStream.Position = newPosition;
-                position = -1;
-            }
-
-            if (plibNewPosition != IntPtr.Zero)
-                Marshal.WriteInt64(plibNewPosition, newPosition);
-        }
-
-        public void SetSize(long libNewSize)
-        {
-            baseStream.SetLength(libNewSize);
-        }
-
-        public void CopyTo(IStream pstm, long cb, IntPtr pcbRead, IntPtr pcbWritten)
-        {
-            byte[] buffer;
-            long written = 0;
-            int read;
-            int count;
-
-            if (cb != 0)
-            {
-                if (cb < 4096)
-                    count = (int)cb;
-                else
-                    count = 4096;
-                buffer = new byte[count];
-                SetSizeToPosition();
-                while (true)
-                {
-                    if ((read = baseStream.Read(buffer, 0, count)) == 0)
-                        break;
-                    pstm.Write(buffer, read, IntPtr.Zero);
-                    written += read;
-                    if (written >= cb)
-                        break;
-                    if (cb - written < 4096)
-                        count = (int)(cb - written);
-                }
-            }
-
-            if (pcbRead != IntPtr.Zero)
-                Marshal.WriteInt64(pcbRead, written);
-            if (pcbWritten != IntPtr.Zero)
-                Marshal.WriteInt64(pcbWritten, written);
-        }
-
-        public void Commit(int grfCommitFlags)
-        {
-            baseStream.Flush();
-            SetSizeToPosition();
-        }
-
-        public void Revert()
-        {
-            throw new COMException(null, STG_E_INVALIDFUNCTION);
-        }
-
-        public void LockRegion(long libOffset, long cb, int dwLockType)
-        {
-            throw new COMException(null, STG_E_INVALIDFUNCTION);
-        }
-
-        public void UnlockRegion(long libOffset, long cb, int dwLockType)
-        {
-            throw new COMException(null, STG_E_INVALIDFUNCTION);
-        }
-
-        public void Stat(out STATSTG pstatstg, int grfStatFlag)
-        {
-            pstatstg = new STATSTG();
-            pstatstg.cbSize = baseStream.Length;
-        }
-
-        public void Clone(out IStream ppstm)
-        {
-            ppstm = null;
-            throw new COMException(null, STG_E_INVALIDFUNCTION);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Windows/Avalonia.Win32.NetStandard/Gdip.cs b/src/Windows/Avalonia.Win32.NetStandard/Gdip.cs
deleted file mode 100644
index b3d1c28689..0000000000
--- a/src/Windows/Avalonia.Win32.NetStandard/Gdip.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// Code copy-pasted from from Mono / System.Drawing.*.cs
-// Original license below:
-//
-// Authors: 
-//  Alexandre Pigolkine (pigolkine@gmx.de)
-//  Jordi Mas (jordi@ximian.com)
-//	Sanjay Gupta (gsanjay@novell.com)
-//	Ravindra (rkumar@novell.com)
-//	Peter Dennis Bartok (pbartok@novell.com)
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-//
-// Copyright (C) 2004, 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.ComTypes;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Avalonia.Win32
-{
-    static class Gdip
-    {
-        public enum Status
-        {
-            Ok = 0,
-            GenericError = 1,
-            InvalidParameter = 2,
-            OutOfMemory = 3,
-            ObjectBusy = 4,
-            InsufficientBuffer = 5,
-            NotImplemented = 6,
-            Win32Error = 7,
-            WrongState = 8,
-            Aborted = 9,
-            FileNotFound = 10,
-            ValueOverflow = 11,
-            AccessDenied = 12,
-            UnknownImageFormat = 13,
-            FontFamilyNotFound = 14,
-            FontStyleNotFound = 15,
-            NotTrueTypeFont = 16,
-            UnsupportedGdiplusVersion = 17,
-            GdiplusNotInitialized = 18,
-            PropertyNotFound = 19,
-            PropertyNotSupported = 20,
-            ProfileNotFound = 21
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct GdiplusStartupInput
-        {
-            // internalted to silent compiler
-            internal uint GdiplusVersion;
-            internal IntPtr DebugEventCallback;
-            internal int SuppressBackgroundThread;
-            internal int SuppressExternalCodecs;
-
-            internal static GdiplusStartupInput MakeGdiplusStartupInput()
-            {
-                GdiplusStartupInput result = new GdiplusStartupInput();
-                result.GdiplusVersion = 1;
-                result.DebugEventCallback = IntPtr.Zero;
-                result.SuppressBackgroundThread = 0;
-                result.SuppressExternalCodecs = 0;
-                return result;
-            }
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct GdiplusStartupOutput
-        {
-            internal IntPtr NotificationHook;
-            internal IntPtr NotificationUnhook;
-
-            internal static GdiplusStartupOutput MakeGdiplusStartupOutput()
-            {
-                GdiplusStartupOutput result = new GdiplusStartupOutput();
-                result.NotificationHook = result.NotificationUnhook = IntPtr.Zero;
-                return result;
-            }
-        }
-
-
-        [DllImport("gdiplus.dll")]
-        public static extern Status GdiplusStartup(ref ulong token, ref GdiplusStartupInput input, ref GdiplusStartupOutput output);
-
-        [DllImport("gdiplus.dll", ExactSpelling = true, CharSet = CharSet.Unicode)]
-        public static extern Status GdipLoadImageFromStream([MarshalAs(UnmanagedType.Interface, MarshalTypeRef = typeof(IStream))] IStream stream, out IntPtr image);
-        [DllImport("gdiplus.dll")]
-        public static extern Status GdipCreateHICONFromBitmap(IntPtr bmp, out IntPtr HandleIcon);
-
-        [DllImport("gdiplus.dll")]
-        internal static extern Status GdipDisposeImage(IntPtr image);
-
-        static Gdip()
-        {
-            ulong token = 0;
-            var input = GdiplusStartupInput.MakeGdiplusStartupInput();
-            var output = GdiplusStartupOutput.MakeGdiplusStartupOutput();
-            GdiplusStartup(ref token, ref input, ref output);
-        }
-    }
-}
diff --git a/src/Windows/Avalonia.Win32.NetStandard/IconImpl.cs b/src/Windows/Avalonia.Win32.NetStandard/IconImpl.cs
deleted file mode 100644
index 49d039e655..0000000000
--- a/src/Windows/Avalonia.Win32.NetStandard/IconImpl.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.ComTypes;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia.Platform;
-
-namespace Avalonia.Win32
-{
-    public class IconImpl : IWindowIconImpl
-    {
-        private readonly MemoryStream _ms;
-
-        public IconImpl(Stream data)
-        {
-            _ms =  new MemoryStream();
-            data.CopyTo(_ms);
-            _ms.Seek(0, SeekOrigin.Begin);
-            IntPtr bitmap;
-            var status = Gdip.GdipLoadImageFromStream(new ComIStreamWrapper(_ms), out bitmap);
-            if (status != Gdip.Status.Ok)
-                throw new Exception("Unable to load icon, gdip status: " + (int) status);
-            IntPtr icon;
-            status = Gdip.GdipCreateHICONFromBitmap(bitmap, out icon);
-            if (status != Gdip.Status.Ok)
-                throw new Exception("Unable to create HICON, gdip status: " + (int)status);
-            Gdip.GdipDisposeImage(bitmap);
-            HIcon = icon;
-        }
-
-        public  IntPtr HIcon { get;}
-        public void Save(Stream outputStream)
-        {
-            lock (_ms)
-            {
-                _ms.Seek(0, SeekOrigin.Begin);
-                _ms.CopyTo(outputStream);
-            }
-        }
-        
-    }
-}
diff --git a/src/Windows/Avalonia.Win32.NetStandard/NativeWin32Platform.cs b/src/Windows/Avalonia.Win32.NetStandard/NativeWin32Platform.cs
deleted file mode 100644
index 2695a5b8b6..0000000000
--- a/src/Windows/Avalonia.Win32.NetStandard/NativeWin32Platform.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia.Platform;
-
-namespace Avalonia.Win32
-{
-    partial class Win32Platform
-    {
-        //TODO: An actual implementation
-        public IWindowIconImpl LoadIcon(string fileName)
-        {
-            //No file IO for netstandard, still waiting for proper net core tooling
-            throw new NotSupportedException();
-        }
-
-        public IWindowIconImpl LoadIcon(Stream stream) => new IconImpl(stream);
-
-        public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
-        {
-            var ms = new MemoryStream();
-            bitmap.Save(ms);
-            ms.Seek(0, SeekOrigin.Begin);
-            return new IconImpl(ms);
-        }
-    }
-}
diff --git a/src/Windows/Avalonia.Win32.NetStandard/Win32Exception.cs b/src/Windows/Avalonia.Win32.NetStandard/Win32Exception.cs
deleted file mode 100644
index 45926a881d..0000000000
--- a/src/Windows/Avalonia.Win32.NetStandard/Win32Exception.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Avalonia.Win32.NetStandard
-{
-    class AvaloniaWin32Exception : Exception
-    {
-    }
-}

From 7e174a79e0458a052d25c14729bc60eca3c1d9d9 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Tue, 30 Jan 2018 18:02:05 -0600
Subject: [PATCH 304/482] Refactored refcounting and added tests for refcount
 tracking in the DeferredRenderer and friends.

---
 src/Avalonia.Base/Utilities/Ref.cs            | 44 +++++++++++-
 src/Avalonia.Visuals/Media/Imaging/Bitmap.cs  |  2 +-
 .../Rendering/DeferredRenderer.cs             | 13 +++-
 .../SceneGraph/DeferredDrawingContextImpl.cs  | 37 ++++++----
 .../Rendering/SceneGraph/Scene.cs             |  7 +-
 .../Rendering/SceneGraph/SceneBuilder.cs      | 17 +++--
 .../DeferredDrawingContextImplTests.cs        | 23 +++++++
 .../SceneGraph/DrawOperationTests.cs          | 15 ++++
 .../Rendering/SceneGraph/SceneBuilderTests.cs | 68 +++++++++++++++++++
 9 files changed, 196 insertions(+), 30 deletions(-)

diff --git a/src/Avalonia.Base/Utilities/Ref.cs b/src/Avalonia.Base/Utilities/Ref.cs
index f9e8b29b95..c9ebeefebc 100644
--- a/src/Avalonia.Base/Utilities/Ref.cs
+++ b/src/Avalonia.Base/Utilities/Ref.cs
@@ -4,22 +4,58 @@ using System.Threading;
 
 namespace Avalonia.Utilities
 {
+    /// <summary>
+    /// A ref-counted wrapper for a disposable object.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
     public interface IRef<out T> : IDisposable where T : class
     {
+        /// <summary>
+        /// The item that is being ref-counted.
+        /// </summary>
         T Item { get; }
+
+        /// <summary>
+        /// Create another reference to this object and increment the refcount.
+        /// </summary>
+        /// <returns>A new reference to this object.</returns>
         IRef<T> Clone();
+
+        /// <summary>
+        /// Create another reference to the same object, but cast the object to a different type.
+        /// </summary>
+        /// <typeparam name="TResult">The type of the new reference.</typeparam>
+        /// <returns>A reference to the value as the new type but sharing the refcount.</returns>
         IRef<TResult> CloneAs<TResult>() where TResult : class;
+
+
+        /// <summary>
+        /// The current refcount of the object tracked in this reference. For debugging/unit test use only.
+        /// </summary>
+        int RefCount { get; }
     }
 
     
 
     public static class RefCountable
     {
+        /// <summary>
+        /// Create a reference counted object wrapping the given item.
+        /// </summary>
+        /// <typeparam name="T">The type of item.</typeparam>
+        /// <param name="item">The item to refcount.</param>
+        /// <returns>The refcounted reference to the item.</returns>
         public static IRef<T> Create<T>(T item) where T : class, IDisposable
         {
             return new Ref<T>(item, new RefCounter(item));
         }
-
+        
+        /// <summary>
+        /// Create an non-owning non-clonable reference to an item.
+        /// </summary>
+        /// <typeparam name="T">The type of item.</typeparam>
+        /// <param name="item">The item.</param>
+        /// <returns>A temporary reference that cannot be cloned that doesn't own the element.</returns>
         public static IRef<T> CreateUnownedNotClonable<T>(T item) where T : class
             => new TempRef<T>(item);
 
@@ -40,6 +76,8 @@ namespace Avalonia.Utilities
 
             public IRef<TResult> CloneAs<TResult>() where TResult : class
                 => throw new NotSupportedException();
+
+            public int RefCount => 1;
         }
         
         class RefCounter
@@ -90,6 +128,8 @@ namespace Avalonia.Utilities
                     old = current;
                 }
             }
+
+            internal int RefCount => _refs;
         }
 
         class Ref<T> : CriticalFinalizerObject, IRef<T> where T : class
@@ -161,6 +201,8 @@ namespace Avalonia.Utilities
                     throw new ObjectDisposedException("Ref<" + typeof(T) + ">");
                 }
             }
+
+            public int RefCount => _counter.RefCount;
         }
     }
 
diff --git a/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs b/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs
index 892cd935cf..cb98ed9a9c 100644
--- a/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs
+++ b/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs
@@ -37,7 +37,7 @@ namespace Avalonia.Media.Imaging
         /// Initializes a new instance of the <see cref="Bitmap"/> class.
         /// </summary>
         /// <param name="impl">A platform-specific bitmap implementation.</param>
-        protected Bitmap(IRef<IBitmapImpl> impl)
+        public Bitmap(IRef<IBitmapImpl> impl)
         {
             PlatformImpl = impl.Clone();
         }
diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index 989e2eacdf..709ec670ac 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -112,7 +112,12 @@ namespace Avalonia.Rendering
         /// <summary>
         /// Disposes of the renderer and detaches from the render loop.
         /// </summary>
-        public void Dispose() => Stop();
+        public void Dispose()
+        {
+            var scene = Interlocked.Exchange(ref _scene, null);
+            scene.Dispose();
+            Stop();
+        }
 
         /// <inheritdoc/>
         public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool> filter)
@@ -391,14 +396,16 @@ namespace Avalonia.Rendering
                         }
                     }
 
-                    Interlocked.Exchange(ref _scene, scene);
+                    var oldScene = Interlocked.Exchange(ref _scene, scene);
+                    oldScene.Dispose();
 
                     _dirty.Clear();
                     (_root as IRenderRoot)?.Invalidate(new Rect(scene.Size));
                 }
                 else
                 {
-                    Interlocked.Exchange(ref _scene, null);
+                    var oldScene = Interlocked.Exchange(ref _scene, null);
+                    oldScene.Dispose();
                 }
             }
             finally
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
index d6ab4bd5cb..fa57d07e23 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
@@ -81,7 +81,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// <inheritdoc/>
         public void Dispose()
         {
-            _node?.Dispose();
+            // Nothing to do here since we allocate no unmanaged resources.
         }
 
         /// <summary>
@@ -105,7 +105,7 @@ namespace Avalonia.Rendering.SceneGraph
 
             if (next == null || !next.Item.Equals(Transform, brush, pen, geometry))
             {
-                Add(RefCountable.Create(new GeometryNode(Transform, brush, pen, geometry, CreateChildScene(brush))));
+                Add(new GeometryNode(Transform, brush, pen, geometry, CreateChildScene(brush)));
             }
             else
             {
@@ -120,7 +120,7 @@ namespace Avalonia.Rendering.SceneGraph
 
             if (next == null || !next.Item.Equals(Transform, source, opacity, sourceRect, destRect))
             {
-                Add(RefCountable.Create(new ImageNode(Transform, source, opacity, sourceRect, destRect)));
+                Add(new ImageNode(Transform, source, opacity, sourceRect, destRect));
             }
             else
             {
@@ -142,7 +142,7 @@ namespace Avalonia.Rendering.SceneGraph
 
             if (next == null || !next.Item.Equals(Transform, pen, p1, p2))
             {
-                Add(RefCountable.Create(new LineNode(Transform, pen, p1, p2, CreateChildScene(pen.Brush))));
+                Add(new LineNode(Transform, pen, p1, p2, CreateChildScene(pen.Brush)));
             }
             else
             {
@@ -157,7 +157,7 @@ namespace Avalonia.Rendering.SceneGraph
 
             if (next == null || !next.Item.Equals(Transform, null, pen, rect, cornerRadius))
             {
-                Add(RefCountable.Create(new RectangleNode(Transform, null, pen, rect, cornerRadius, CreateChildScene(pen.Brush))));
+                Add(new RectangleNode(Transform, null, pen, rect, cornerRadius, CreateChildScene(pen.Brush)));
             }
             else
             {
@@ -172,7 +172,7 @@ namespace Avalonia.Rendering.SceneGraph
 
             if (next == null || !next.Item.Equals(Transform, foreground, origin, text))
             {
-                Add(RefCountable.Create(new TextNode(Transform, foreground, origin, text, CreateChildScene(foreground))));
+                Add(new TextNode(Transform, foreground, origin, text, CreateChildScene(foreground)));
             }
             else
             {
@@ -187,7 +187,7 @@ namespace Avalonia.Rendering.SceneGraph
 
             if (next == null || !next.Item.Equals(Transform, brush, null, rect, cornerRadius))
             {
-                Add(RefCountable.Create(new RectangleNode(Transform, brush, null, rect, cornerRadius, CreateChildScene(brush))));
+                Add(new RectangleNode(Transform, brush, null, rect, cornerRadius, CreateChildScene(brush)));
             }
             else
             {
@@ -207,7 +207,7 @@ namespace Avalonia.Rendering.SceneGraph
 
             if (next == null || !next.Item.Equals(null))
             {
-                Add(RefCountable.Create(new ClipNode()));
+                Add(new ClipNode());
             }
             else
             {
@@ -222,7 +222,7 @@ namespace Avalonia.Rendering.SceneGraph
 
             if (next == null || !next.Item.Equals(null))
             {
-                Add(RefCountable.Create((new GeometryClipNode())));
+                Add((new GeometryClipNode()));
             }
             else
             {
@@ -237,7 +237,7 @@ namespace Avalonia.Rendering.SceneGraph
 
             if (next == null || !next.Item.Equals(null))
             {
-                Add(RefCountable.Create(new OpacityNode()));
+                Add(new OpacityNode());
             }
             else
             {
@@ -252,7 +252,7 @@ namespace Avalonia.Rendering.SceneGraph
 
             if (next == null || !next.Item.Equals(null, null))
             {
-                Add(RefCountable.Create(new OpacityMaskNode()));
+                Add(new OpacityMaskNode());
             }
             else
             {
@@ -267,7 +267,7 @@ namespace Avalonia.Rendering.SceneGraph
 
             if (next == null || !next.Item.Equals(clip))
             {
-                Add(RefCountable.Create(new ClipNode(clip)));
+                Add(new ClipNode(clip));
             }
             else
             {
@@ -282,7 +282,7 @@ namespace Avalonia.Rendering.SceneGraph
 
             if (next == null || !next.Item.Equals(clip))
             {
-                Add(RefCountable.Create(new GeometryClipNode(clip)));
+                Add(new GeometryClipNode(clip));
             }
             else
             {
@@ -297,7 +297,7 @@ namespace Avalonia.Rendering.SceneGraph
 
             if (next == null || !next.Item.Equals(opacity))
             {
-                Add(RefCountable.Create(new OpacityNode(opacity)));
+                Add(new OpacityNode(opacity));
             }
             else
             {
@@ -312,7 +312,7 @@ namespace Avalonia.Rendering.SceneGraph
 
             if (next == null || !next.Item.Equals(mask, bounds))
             {
-                Add(RefCountable.Create(new OpacityMaskNode(mask, bounds, CreateChildScene(mask))));
+                Add(new OpacityMaskNode(mask, bounds, CreateChildScene(mask)));
             }
             else
             {
@@ -356,6 +356,13 @@ namespace Avalonia.Rendering.SceneGraph
             public int DrawOperationIndex { get; }
         }
 
+        private void Add(IDrawOperation node)
+        {
+            var refCounted = RefCountable.Create(node);
+            Add(refCounted);
+            refCounted.Dispose(); // Dispose our reference
+        }
+
         private void Add(IRef<IDrawOperation> node)
         {
             if (_drawOperationindex < _node.DrawOperations.Count)
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
index 9216bae8ad..f2e4f5fdbd 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
@@ -11,7 +11,7 @@ namespace Avalonia.Rendering.SceneGraph
     /// <summary>
     /// Represents a scene graph used by the <see cref="DeferredRenderer"/>.
     /// </summary>
-    public class Scene
+    public class Scene : IDisposable
     {
         private Dictionary<IVisual, IVisualNode> _index;
 
@@ -96,6 +96,11 @@ namespace Avalonia.Rendering.SceneGraph
             return result;
         }
 
+        public void Dispose()
+        {
+            Root.Dispose();
+        }
+
         /// <summary>
         /// Tries to find a node in the scene graph representing the specified visual.
         /// </summary>
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
index 41ff802164..b219a74119 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
@@ -271,22 +271,21 @@ namespace Avalonia.Rendering.SceneGraph
 
         private static void Deindex(Scene scene, VisualNode node)
         {
-            scene.Remove(node);
-            node.SubTreeUpdated = true;
-
-            scene.Layers[node.LayerRoot].Dirty.Add(node.Bounds);
-
-            node.Visual.TransformedBounds = null;
-
             foreach (VisualNode child in node.Children)
             {
-                var geometry = child as IDrawOperation;
-
                 if (child is VisualNode visual)
                 {
                     Deindex(scene, visual);
                 }
             }
+            scene.Remove(node);
+
+            node.SubTreeUpdated = true;
+
+            scene.Layers[node.LayerRoot].Dirty.Add(node.Bounds);
+
+            node.Visual.TransformedBounds = null;
+
 
             if (node.LayerRoot == node.Visual && node.Visual != scene.Root.Visual)
             {
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
index 0fa70315fd..6faba372d5 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using Avalonia.Media;
+using Avalonia.Platform;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.UnitTests;
 using Avalonia.Utilities;
@@ -192,5 +193,27 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
 
             Assert.Equal(2, node.DrawOperations.Count);
         }
+
+        [Fact]
+        public void Trimmed_DrawOperations_Releases_Reference()
+        {
+            var node = new VisualNode(new TestRoot(), null);
+            var operation = RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 100, 100), 0));
+            var layers = new SceneLayers(node.Visual);
+            var target = new DeferredDrawingContextImpl(null, layers);
+
+            node.LayerRoot = node.Visual;
+            node.AddDrawOperation(operation);
+            Assert.Equal(2, operation.RefCount);
+
+            using (target.BeginUpdate(node))
+            {
+                target.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100));
+            }
+
+            Assert.Equal(1, node.DrawOperations.Count);
+            Assert.NotSame(operation, node.DrawOperations.Single());
+            Assert.Equal(1, operation.RefCount);
+        }
     }
 }
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
index 76fe103c1b..8c905dab2f 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
@@ -2,6 +2,8 @@
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Rendering.SceneGraph;
+using Avalonia.Utilities;
+using Moq;
 using Xunit;
 
 namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
@@ -40,6 +42,19 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             Assert.Equal(new Rect(expectedX, expectedY, expectedWidth, expectedHeight), target.Bounds);
         }
 
+        [Fact]
+        public void Image_Node_Releases_Reference_To_Bitmap_On_Dispose()
+        {
+            var bitmap = RefCountable.Create(Mock.Of<IBitmapImpl>());
+            var imageNode = new ImageNode(Matrix.Identity, bitmap, 1, new Rect(1,1,1,1), new Rect(1,1,1,1));
+
+            Assert.Equal(2, bitmap.RefCount);
+
+            imageNode.Dispose();
+
+            Assert.Equal(1, bitmap.RefCount);
+        }
+
         private class TestDrawOperation : DrawOperation
         {
             public TestDrawOperation(Rect bounds, Matrix transform, Pen pen)
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
index 2eb3dfb15c..f44be3f82e 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
@@ -11,6 +11,8 @@ using Moq;
 using Avalonia.Platform;
 using System.Reactive.Subjects;
 using Avalonia.Data;
+using Avalonia.Utilities;
+using Avalonia.Media.Imaging;
 
 namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
 {
@@ -678,6 +680,72 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             }
         }
 
+        [Fact]
+        public void Disposing_Scene_Releases_DrawOperation_References()
+        {
+            using (TestApplication())
+            {
+                var bitmap = RefCountable.Create(Mock.Of<IBitmapImpl>());
+                Image img;
+                var tree = new TestRoot
+                {
+                    Child = img = new Image
+                    {
+                        Source = new Bitmap(bitmap)
+                    }
+                };
+
+                Assert.Equal(2, bitmap.RefCount);
+                IRef<IDrawOperation> operation;
+
+                using (var scene = new Scene(tree))
+                {
+                    var sceneBuilder = new SceneBuilder();
+                    sceneBuilder.UpdateAll(scene);
+                    operation = scene.FindNode(img).DrawOperations[0];
+                    Assert.Equal(1, operation.RefCount);
+
+                    Assert.Equal(3, bitmap.RefCount);
+                }
+                Assert.Equal(0, operation.RefCount);
+                Assert.Equal(2, bitmap.RefCount);
+            }
+        }
+
+        [Fact]
+        public void Replacing_Control_Releases_DrawOperation_Reference()
+        {
+            using (TestApplication())
+            {
+                var bitmap = RefCountable.Create(Mock.Of<IBitmapImpl>());
+                Image img;
+                var tree = new TestRoot
+                {
+                    Child = img = new Image
+                    {
+                        Source = new Bitmap(bitmap)
+                    }
+                };
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var operation = scene.FindNode(img).DrawOperations[0];
+
+                tree.Child = new Decorator();
+
+                using (var result = scene.Clone())
+                {
+                    sceneBuilder.Update(result, img);
+                    scene.Dispose();
+
+                    Assert.Equal(0, operation.RefCount);
+                    Assert.Equal(2, bitmap.RefCount);
+                }
+            }
+        }
+
         private IDisposable TestApplication()
         {
             return UnitTestApplication.Start(

From ebfa79ef64d3f927c9931405fb6148f2247370ed Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Tue, 30 Jan 2018 18:20:54 -0600
Subject: [PATCH 305/482] Add null check for scene in DeferredRenderer
 disposal.

---
 src/Avalonia.Visuals/Rendering/DeferredRenderer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index 709ec670ac..3d5f6d5a57 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -115,7 +115,7 @@ namespace Avalonia.Rendering
         public void Dispose()
         {
             var scene = Interlocked.Exchange(ref _scene, null);
-            scene.Dispose();
+            scene?.Dispose();
             Stop();
         }
 

From d905721c468e1b94f437375cd33121bb22a347de Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Tue, 30 Jan 2018 18:27:54 -0600
Subject: [PATCH 306/482] Add more null short-circuiting checks in
 DeferredRenderer related to scene disposal.

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

diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index 3d5f6d5a57..3611085ff3 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -397,7 +397,7 @@ namespace Avalonia.Rendering
                     }
 
                     var oldScene = Interlocked.Exchange(ref _scene, scene);
-                    oldScene.Dispose();
+                    oldScene?.Dispose();
 
                     _dirty.Clear();
                     (_root as IRenderRoot)?.Invalidate(new Rect(scene.Size));
@@ -405,7 +405,7 @@ namespace Avalonia.Rendering
                 else
                 {
                     var oldScene = Interlocked.Exchange(ref _scene, null);
-                    oldScene.Dispose();
+                    oldScene?.Dispose();
                 }
             }
             finally

From ae7e7829d43064508cc11183164d0ec576bbbde9 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Tue, 30 Jan 2018 18:48:10 -0600
Subject: [PATCH 307/482] Fixed incorrect cast in DeferredRenderer's
 IVisualBrushRenderer implementation.

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

diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index 3611085ff3..344f3f8f2b 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -164,13 +164,13 @@ namespace Avalonia.Rendering
         /// <inheritdoc/>
         Size IVisualBrushRenderer.GetRenderTargetSize(IVisualBrush brush)
         {
-            return (_currentDraw as IRef<BrushDrawOperation>)?.Item.ChildScenes?[brush.Visual]?.Size ?? Size.Empty;
+            return (_currentDraw.Item as BrushDrawOperation)?.ChildScenes?[brush.Visual]?.Size ?? Size.Empty;
         }
 
         /// <inheritdoc/>
         void IVisualBrushRenderer.RenderVisualBrush(IDrawingContextImpl context, IVisualBrush brush)
         {
-            var childScene = (_currentDraw as IRef<BrushDrawOperation>)?.Item.ChildScenes?[brush.Visual];
+            var childScene = (_currentDraw.Item as BrushDrawOperation)?.ChildScenes?[brush.Visual];
 
             if (childScene != null)
             {

From 85966d3ecf926325ac2af44b883c760f4d4c6ac5 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Tue, 30 Jan 2018 19:30:59 -0600
Subject: [PATCH 308/482] Ref-count the draw operations collection in
 VisualNode so it correctly keeps the elements alive when only the collection
 is cloned (aka no changes are made by a cloned VisualNode) and the original
 VisualNode is disposed.

---
 .../Rendering/SceneGraph/VisualNode.cs        | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
index 0208511c4c..c651fee67f 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive.Disposables;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Utilities;
@@ -23,6 +24,7 @@ namespace Avalonia.Rendering.SceneGraph
         private double _opacity;
         private List<IVisualNode> _children;
         private List<IRef<IDrawOperation>> _drawOperations;
+        private IRef<IDisposable> _drawOperationsRefCounter;
         private bool _drawOperationsCloned;
         private Matrix transformRestore;
 
@@ -214,6 +216,7 @@ namespace Avalonia.Rendering.SceneGraph
                 _opacity = Opacity,
                 OpacityMask = OpacityMask,
                 _drawOperations = _drawOperations,
+                _drawOperationsRefCounter = _drawOperationsRefCounter?.Clone(),
                 _drawOperationsCloned = true,
                 LayerRoot= LayerRoot,
             };
@@ -315,10 +318,14 @@ namespace Avalonia.Rendering.SceneGraph
             if (_drawOperations == null)
             {
                 _drawOperations = new List<IRef<IDrawOperation>>();
+                _drawOperationsRefCounter = RefCountable.Create(Disposable.Create(DisposeDrawOperations));
+                _drawOperationsCloned = false;
             }
             else if (_drawOperationsCloned)
             {
                 _drawOperations = new List<IRef<IDrawOperation>>(_drawOperations.Select(op => op.Clone()));
+                _drawOperationsRefCounter.Dispose();
+                _drawOperationsRefCounter = RefCountable.Create(Disposable.Create(DisposeDrawOperations));
                 _drawOperationsCloned = false;
             }
         }
@@ -329,12 +336,14 @@ namespace Avalonia.Rendering.SceneGraph
             {
                 child.Dispose();
             }
-            if (!_drawOperationsCloned)
+            _drawOperationsRefCounter?.Dispose();
+        }
+
+        private void DisposeDrawOperations()
+        {
+            foreach (var operation in DrawOperations)
             {
-                foreach (var operation in DrawOperations)
-                {
-                    operation.Dispose();
-                } 
+                operation.Dispose();
             }
         }
     }

From 0a6da2cbfa1bcf75e67daa7de8ac933431e0e144 Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Wed, 31 Jan 2018 16:01:48 -0500
Subject: [PATCH 309/482] Altered OnKeyDown to accurately set handled

---
 src/Avalonia.Controls/TextBox.cs | 37 +++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 1a663ed3b6..e825342661 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -337,7 +337,7 @@ namespace Avalonia.Controls
             string text = Text ?? string.Empty;
             int caretIndex = CaretIndex;
             bool movement = false;
-            bool handled = true;
+            bool handled = false;
             var modifiers = e.Modifiers;
 
             switch (e.Key)
@@ -346,13 +346,14 @@ namespace Avalonia.Controls
                     if (modifiers == InputModifiers.Control)
                     {
                         SelectAll();
+                        handled = true;
                     }
-
                     break;
                 case Key.C:
                     if (modifiers == InputModifiers.Control)
                     {
                         Copy();
+                        handled = true;
                     }
                     break;
 
@@ -361,6 +362,7 @@ namespace Avalonia.Controls
                     {
                         Copy();
                         DeleteSelection();
+                        handled = true;
                     }
                     break;
 
@@ -368,19 +370,24 @@ namespace Avalonia.Controls
                     if (modifiers == InputModifiers.Control)
                     {
                         Paste();
+                        handled = true;
                     }
 
                     break;
 
                 case Key.Z:
                     if (modifiers == InputModifiers.Control)
+                    {
                         _undoRedoHelper.Undo();
-
+                        handled = true;
+                    }
                     break;
                 case Key.Y:
                     if (modifiers == InputModifiers.Control)
+                    {
                         _undoRedoHelper.Redo();
-
+                        handled = true;
+                    }
                     break;
                 case Key.Left:
                     MoveHorizontal(-1, modifiers);
@@ -393,13 +400,11 @@ namespace Avalonia.Controls
                     break;
 
                 case Key.Up:
-                    MoveVertical(-1, modifiers);
-                    movement = true;
+                    movement = MoveVertical(-1, modifiers);
                     break;
 
                 case Key.Down:
-                    MoveVertical(1, modifiers);
-                    movement = true;
+                    movement = MoveVertical(1, modifiers);
                     break;
 
                 case Key.Home:
@@ -435,7 +440,7 @@ namespace Avalonia.Controls
                         CaretIndex -= removedCharacters;
                         SelectionStart = SelectionEnd = CaretIndex;
                     }
-
+                    handled = true;
                     break;
 
                 case Key.Delete:
@@ -459,13 +464,14 @@ namespace Avalonia.Controls
 
                         SetTextInternal(text.Substring(0, caretIndex) + text.Substring(caretIndex + removedCharacters));
                     }
-
+                    handled = true;
                     break;
 
                 case Key.Enter:
                     if (AcceptsReturn)
                     {
                         HandleTextInput("\r\n");
+                        handled = true;
                     }
 
                     break;
@@ -474,11 +480,11 @@ namespace Avalonia.Controls
                     if (AcceptsTab)
                     {
                         HandleTextInput("\t");
+                        handled = true;
                     }
                     else
                     {
                         base.OnKeyDown(e);
-                        handled = false;
                     }
 
                     break;
@@ -497,7 +503,7 @@ namespace Avalonia.Controls
                 SelectionStart = SelectionEnd = CaretIndex;
             }
 
-            if (handled)
+            if (handled || movement)
             {
                 e.Handled = true;
             }
@@ -674,7 +680,7 @@ namespace Avalonia.Controls
             }
         }
 
-        private void MoveVertical(int count, InputModifiers modifiers)
+        private bool MoveVertical(int count, InputModifiers modifiers)
         {
             var formattedText = _presenter.FormattedText;
             var lines = formattedText.GetLines().ToList();
@@ -689,6 +695,11 @@ namespace Avalonia.Controls
                 var point = new Point(rect.X, y + (count * (line.Height / 2)));
                 var hit = formattedText.HitTestPoint(point);
                 CaretIndex = hit.TextPosition + (hit.IsTrailing ? 1 : 0);
+                return true;
+            }
+            else
+            {
+                return false;
             }
         }
 

From 267aab12efed17b5e993827d1b63c64659a98061 Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Wed, 31 Jan 2018 16:01:48 -0500
Subject: [PATCH 310/482] Altered OnKeyDown to accurately set handled

---
 src/Avalonia.Controls/TextBox.cs | 37 +++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 8f4606884e..8b37689591 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -325,7 +325,7 @@ namespace Avalonia.Controls
             string text = Text ?? string.Empty;
             int caretIndex = CaretIndex;
             bool movement = false;
-            bool handled = true;
+            bool handled = false;
             var modifiers = e.Modifiers;
 
             switch (e.Key)
@@ -334,13 +334,14 @@ namespace Avalonia.Controls
                     if (modifiers == InputModifiers.Control)
                     {
                         SelectAll();
+                        handled = true;
                     }
-
                     break;
                 case Key.C:
                     if (modifiers == InputModifiers.Control)
                     {
                         Copy();
+                        handled = true;
                     }
                     break;
 
@@ -349,6 +350,7 @@ namespace Avalonia.Controls
                     {
                         Copy();
                         DeleteSelection();
+                        handled = true;
                     }
                     break;
 
@@ -356,19 +358,24 @@ namespace Avalonia.Controls
                     if (modifiers == InputModifiers.Control)
                     {
                         Paste();
+                        handled = true;
                     }
 
                     break;
 
                 case Key.Z:
                     if (modifiers == InputModifiers.Control)
+                    {
                         _undoRedoHelper.Undo();
-
+                        handled = true;
+                    }
                     break;
                 case Key.Y:
                     if (modifiers == InputModifiers.Control)
+                    {
                         _undoRedoHelper.Redo();
-
+                        handled = true;
+                    }
                     break;
                 case Key.Left:
                     MoveHorizontal(-1, modifiers);
@@ -381,13 +388,11 @@ namespace Avalonia.Controls
                     break;
 
                 case Key.Up:
-                    MoveVertical(-1, modifiers);
-                    movement = true;
+                    movement = MoveVertical(-1, modifiers);
                     break;
 
                 case Key.Down:
-                    MoveVertical(1, modifiers);
-                    movement = true;
+                    movement = MoveVertical(1, modifiers);
                     break;
 
                 case Key.Home:
@@ -423,7 +428,7 @@ namespace Avalonia.Controls
                         CaretIndex -= removedCharacters;
                         SelectionStart = SelectionEnd = CaretIndex;
                     }
-
+                    handled = true;
                     break;
 
                 case Key.Delete:
@@ -447,13 +452,14 @@ namespace Avalonia.Controls
 
                         SetTextInternal(text.Substring(0, caretIndex) + text.Substring(caretIndex + removedCharacters));
                     }
-
+                    handled = true;
                     break;
 
                 case Key.Enter:
                     if (AcceptsReturn)
                     {
                         HandleTextInput("\r\n");
+                        handled = true;
                     }
 
                     break;
@@ -462,11 +468,11 @@ namespace Avalonia.Controls
                     if (AcceptsTab)
                     {
                         HandleTextInput("\t");
+                        handled = true;
                     }
                     else
                     {
                         base.OnKeyDown(e);
-                        handled = false;
                     }
 
                     break;
@@ -485,7 +491,7 @@ namespace Avalonia.Controls
                 SelectionStart = SelectionEnd = CaretIndex;
             }
 
-            if (handled)
+            if (handled || movement)
             {
                 e.Handled = true;
             }
@@ -662,7 +668,7 @@ namespace Avalonia.Controls
             }
         }
 
-        private void MoveVertical(int count, InputModifiers modifiers)
+        private bool MoveVertical(int count, InputModifiers modifiers)
         {
             var formattedText = _presenter.FormattedText;
             var lines = formattedText.GetLines().ToList();
@@ -677,6 +683,11 @@ namespace Avalonia.Controls
                 var point = new Point(rect.X, y + (count * (line.Height / 2)));
                 var hit = formattedText.HitTestPoint(point);
                 CaretIndex = hit.TextPosition + (hit.IsTrailing ? 1 : 0);
+                return true;
+            }
+            else
+            {
+                return false;
             }
         }
 

From 5dce65f7b6576a66e204e6909f11e845a984e46c Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Thu, 1 Feb 2018 06:30:36 -0500
Subject: [PATCH 311/482] Created a shared DataValidationErrors framework

Moved Validation Error tracking to attached an attached property
Created an shared error indicator that can be simply added to control
templates and re-styled across all controls
This should reduce the need for code and markup duplication while
allowing for a consistent visual interface
---
 src/Avalonia.Controls/DataValidationErrors.cs | 135 ++++++++++++++++++
 src/Avalonia.Controls/TextBox.cs              |  41 +-----
 .../DataValidationErrors.xaml                 |  38 +++++
 src/Avalonia.Themes.Default/DefaultTheme.xaml |   1 +
 src/Avalonia.Themes.Default/TextBox.xaml      |  50 +++----
 .../TextBoxTests_DataValidation.cs            |  34 ++++-
 6 files changed, 223 insertions(+), 76 deletions(-)
 create mode 100644 src/Avalonia.Controls/DataValidationErrors.cs
 create mode 100644 src/Avalonia.Themes.Default/DataValidationErrors.xaml

diff --git a/src/Avalonia.Controls/DataValidationErrors.cs b/src/Avalonia.Controls/DataValidationErrors.cs
new file mode 100644
index 0000000000..a55bd63aa8
--- /dev/null
+++ b/src/Avalonia.Controls/DataValidationErrors.cs
@@ -0,0 +1,135 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Linq;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// A control which displays an error notifier when there is a DataValidationError. 
+    /// Provides attached properties to track errors on a control
+    /// </summary>
+    /// <remarks>
+    /// You will probably only want to create instances inside of control templates.
+    /// </remarks>
+    public class DataValidationErrors : ContentControl
+    {
+        /// <summary>
+        /// Defines the DataValidationErrors.Errors attached property.
+        /// </summary>
+        public static readonly AttachedProperty<IEnumerable<Exception>> ErrorsProperty =
+            AvaloniaProperty.RegisterAttached<DataValidationErrors, Control, IEnumerable<Exception>>("Errors");
+
+        /// <summary>
+        /// Defines the DataValidationErrors.HasErrors attached property.
+        /// </summary>
+        public static readonly AttachedProperty<bool> HasErrorsProperty =
+            AvaloniaProperty.RegisterAttached<DataValidationErrors, Control, bool>("HasErrors");
+
+        public static readonly StyledProperty<IDataTemplate> ErrorTemplateProperty =
+            AvaloniaProperty.Register<DataValidationErrors, IDataTemplate>(nameof(ErrorTemplate));
+
+
+        private Control _owner;
+
+        public static readonly DirectProperty<DataValidationErrors, Control> OwnerProperty =
+            AvaloniaProperty.RegisterDirect<DataValidationErrors, Control>(
+                nameof(Owner),
+                o => o.Owner,
+                (o, v) => o.Owner = v);
+
+        public Control Owner
+        {
+            get { return _owner; }
+            set { SetAndRaise(OwnerProperty, ref _owner, value); }
+        }
+
+        /// <summary>
+        /// Initializes static members of the <see cref="DataValidationErrors"/> class.
+        /// </summary>
+        static DataValidationErrors()
+        {
+            ErrorsProperty.Changed.Subscribe(ErrorsChanged);
+            HasErrorsProperty.Changed.Subscribe(HasErrorsChanged);
+            TemplatedParentProperty.Changed.AddClassHandler<DataValidationErrors>(x => x.OnTemplatedParentChange);
+        }
+
+        private void OnTemplatedParentChange(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (Owner == null)
+            {
+                Owner = (e.NewValue as Control);
+            }
+        }
+
+        public IDataTemplate ErrorTemplate
+        {
+            get { return GetValue(ErrorTemplateProperty); }
+            set { SetValue(ErrorTemplateProperty, value); }
+        }
+
+        private static void ErrorsChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var control = (Control)e.Sender;
+            var errors = (IEnumerable<Exception>)e.NewValue;
+
+            var hasErrors = false;
+            if (errors != null && errors.Any())
+                hasErrors = true;
+
+            control.SetValue(HasErrorsProperty, hasErrors);
+        }
+        private static void HasErrorsChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var control = (Control)e.Sender;
+            var classes = (IPseudoClasses)control.Classes;
+            classes.Set(":error", (bool)e.NewValue);
+        }
+
+        public static IEnumerable<Exception> GetErrors(Control control)
+        {
+            return control.GetValue(ErrorsProperty);
+        }
+        public static void SetErrors(Control control, IEnumerable<Exception> errors)
+        {
+            control.SetValue(ErrorsProperty, errors);
+        }
+        public static void SetError(Control control, Exception error)
+        {
+            SetErrors(control, UnpackException(error));
+        }
+        public static void ClearErrors(Control control)
+        {
+            SetErrors(control, null);
+        }
+        public static bool GetHasErrors(Control control)
+        {
+            return control.GetValue(HasErrorsProperty);
+        }
+
+        private static IEnumerable<Exception> UnpackException(Exception exception)
+        {
+            if (exception != null)
+            {
+                var aggregate = exception as AggregateException;
+                var exceptions = aggregate == null ?
+                    (IEnumerable<Exception>)new[] { exception } :
+                    aggregate.InnerExceptions;
+                var filtered = exceptions.Where(x => !(x is BindingChainException)).ToList();
+
+                if (filtered.Count > 0)
+                {
+                    return filtered;
+                }
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 8b37689591..7366ff3f91 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -30,12 +30,7 @@ namespace Avalonia.Controls
                 nameof(CaretIndex),
                 o => o.CaretIndex,
                 (o, v) => o.CaretIndex = v);
-
-        public static readonly DirectProperty<TextBox, IEnumerable<Exception>> DataValidationErrorsProperty =
-            AvaloniaProperty.RegisterDirect<TextBox, IEnumerable<Exception>>(
-                nameof(DataValidationErrors),
-                o => o.DataValidationErrors);
-
+        
         public static readonly StyledProperty<bool> IsReadOnlyProperty =
             AvaloniaProperty.Register<TextBox, bool>(nameof(IsReadOnly));
 
@@ -91,7 +86,6 @@ namespace Avalonia.Controls
         private TextPresenter _presenter;
         private UndoRedoHelper<UndoRedoState> _undoRedoHelper;
         private bool _ignoreTextChanges;
-        private IEnumerable<Exception> _dataValidationErrors;
         private static readonly string[] invalidCharacters = new String[1]{"\u007f"};
 
         static TextBox()
@@ -142,13 +136,7 @@ namespace Avalonia.Controls
                     _undoRedoHelper.UpdateLastState();
             }
         }
-
-        public IEnumerable<Exception> DataValidationErrors
-        {
-            get { return _dataValidationErrors; }
-            private set { SetAndRaise(DataValidationErrorsProperty, ref _dataValidationErrors, value); }
-        }
-
+        
         public bool IsReadOnly
         {
             get { return GetValue(IsReadOnlyProperty); }
@@ -553,31 +541,10 @@ namespace Avalonia.Controls
         {
             if (property == TextProperty)
             {
-                var classes = (IPseudoClasses)Classes;
-                DataValidationErrors = UnpackException(status.Error);
-                classes.Set(":error", DataValidationErrors != null);
-            }
-        }
-
-        private static IEnumerable<Exception> UnpackException(Exception exception)
-        {
-            if (exception != null)
-            {
-                var aggregate = exception as AggregateException;
-                var exceptions = aggregate == null ?
-                    (IEnumerable<Exception>)new[] { exception } :
-                    aggregate.InnerExceptions;
-                var filtered = exceptions.Where(x => !(x is BindingChainException)).ToList();
-
-                if (filtered.Count > 0)
-                {
-                    return filtered;
-                }
+                DataValidationErrors.SetError(this, status.Error);
             }
-
-            return null;
         }
-
+        
         private int CoerceCaretIndex(int value) => CoerceCaretIndex(value, Text?.Length ?? 0);
 
         private int CoerceCaretIndex(int value, int length)
diff --git a/src/Avalonia.Themes.Default/DataValidationErrors.xaml b/src/Avalonia.Themes.Default/DataValidationErrors.xaml
new file mode 100644
index 0000000000..f7f28d90d0
--- /dev/null
+++ b/src/Avalonia.Themes.Default/DataValidationErrors.xaml
@@ -0,0 +1,38 @@
+<Style xmlns="https://github.com/avaloniaui" 
+       Selector="DataValidationErrors">
+  <Setter Property="Template">
+    <ControlTemplate>
+      <DockPanel LastChildFill="True">
+        <ContentControl DockPanel.Dock="Right"
+                        ContentTemplate="{TemplateBinding ErrorTemplate}"
+                        DataContext="{TemplateBinding Owner}"
+                        Content="{Binding (DataValidationErrors.Errors)}"
+                        IsVisible="{Binding (DataValidationErrors.HasErrors)}"/>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
+                          Padding="{TemplateBinding Padding}"/>
+      </DockPanel>
+    </ControlTemplate>
+  </Setter>
+  <Setter Property="ErrorTemplate">
+    <DataTemplate>
+      <Canvas Width="14" Height="14" Margin="4 0 1 0" 
+              Background="#00FFFFFF">
+        <Canvas.Styles>
+          <Style Selector="ToolTip">
+            <Setter Property="Background" Value="{DynamicResource ErrorBrushLight}"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}"/>
+          </Style>
+        </Canvas.Styles>
+        <ToolTip.Tip>
+          <ItemsControl Items="{Binding}" MemberSelector="Message"/>
+        </ToolTip.Tip>
+        <Path Data="M14,7 A7,7 0 0,0 0,7 M0,7 A7,7 0 1,0 14,7 M7,3l0,5 M7,9l0,2" Stroke="{DynamicResource ErrorBrush}" StrokeThickness="2"/>
+      </Canvas>
+    </DataTemplate>
+  </Setter>
+</Style>
\ No newline at end of file
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
index ae00f0757a..6250282c2a 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml
@@ -1,6 +1,7 @@
 <Styles xmlns="https://github.com/avaloniaui">
   <!-- Define ToolTip first so its styles can be overriden by other controls (e.g. TextBox) -->
   <StyleInclude Source="resm:Avalonia.Themes.Default.ToolTip.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.DataValidationErrors.xaml?assembly=Avalonia.Themes.Default"/>
 
   <StyleInclude Source="resm:Avalonia.Themes.Default.FocusAdorner.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.Button.xaml?assembly=Avalonia.Themes.Default"/>
diff --git a/src/Avalonia.Themes.Default/TextBox.xaml b/src/Avalonia.Themes.Default/TextBox.xaml
index 9d9f322150..e228aebf58 100644
--- a/src/Avalonia.Themes.Default/TextBox.xaml
+++ b/src/Avalonia.Themes.Default/TextBox.xaml
@@ -28,34 +28,26 @@
               </TextBlock.IsVisible>
             </TextBlock>
 
-            <DockPanel LastChildFill="True">
-              <Canvas Name="error" DockPanel.Dock="Right" Width="14" Height="14" Margin="4 0 1 0">
-                <ToolTip.Tip>
-                  <ItemsControl Items="{TemplateBinding DataValidationErrors}" MemberSelector="Message"/>
-                </ToolTip.Tip>
-                <Path Data="M14,7 A7,7 0 0,0 0,7 M0,7 A7,7 0 1,0 14,7 M7,3l0,5 M7,9l0,2" Stroke="{DynamicResource ErrorBrush}" StrokeThickness="2"/>
-              </Canvas>
-              
+            <DataValidationErrors>
               <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                             VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
                 
-              <Panel>
-                <TextBlock Name="watermark"
-                           Opacity="0.5"
-                           Text="{TemplateBinding Watermark}"
-                           IsVisible="{TemplateBinding Path=Text, Converter={x:Static StringConverters.NullOrEmpty}}"/>
-                <TextPresenter Name="PART_TextPresenter"
-                               Text="{TemplateBinding Text, Mode=TwoWay}"
-                               CaretIndex="{TemplateBinding CaretIndex}"
-                               SelectionStart="{TemplateBinding SelectionStart}"
-                               SelectionEnd="{TemplateBinding SelectionEnd}"
-                               TextAlignment="{TemplateBinding TextAlignment}"
-                               TextWrapping="{TemplateBinding TextWrapping}"/>
-              </Panel>
-            </ScrollViewer>
+                <Panel>
+                  <TextBlock Name="watermark"
+                             Opacity="0.5"
+                             Text="{TemplateBinding Watermark}"
+                             IsVisible="{TemplateBinding Path=Text, Converter={x:Static StringConverters.NullOrEmpty}}"/>
+                  <TextPresenter Name="PART_TextPresenter"
+                                 Text="{TemplateBinding Text, Mode=TwoWay}"
+                                 CaretIndex="{TemplateBinding CaretIndex}"
+                                 SelectionStart="{TemplateBinding SelectionStart}"
+                                 SelectionEnd="{TemplateBinding SelectionEnd}"
+                                 TextAlignment="{TemplateBinding TextAlignment}"
+                                 TextWrapping="{TemplateBinding TextWrapping}"/>
+                </Panel>
+              </ScrollViewer>
+            </DataValidationErrors>
           </DockPanel>
-
-        </DockPanel>
         </Border>
       </ControlTemplate>
     </Setter>
@@ -69,14 +61,4 @@
   <Style Selector="TextBox:error /template/ Border#border">
     <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}"/>
   </Style>
-  <Style Selector="TextBox /template/ Canvas#error">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="TextBox:error /template/ Canvas#error">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-  <Style Selector="TextBox /template/ ToolTip">
-    <Setter Property="Background" Value="{DynamicResource ErrorBrushLight}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}"/>
-  </Style>
 </Styles>
\ No newline at end of file
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs
index daf2715d84..851d741eae 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs
@@ -42,7 +42,7 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void Setter_Exceptions_Should_Set_DataValidationErrors()
+        public void Setter_Exceptions_Should_Set_DataValidationErrors_Errors()
         {
             using (UnitTestApplication.Start(Services))
             {
@@ -55,12 +55,36 @@ namespace Avalonia.Controls.UnitTests
 
                 target.ApplyTemplate();
 
-                Assert.Null(target.DataValidationErrors);
+                Assert.Null(DataValidationErrors.GetErrors(target));
                 target.Text = "20";
-                Assert.Single(target.DataValidationErrors);
-                Assert.IsType<InvalidOperationException>(target.DataValidationErrors.Single());
+
+                IEnumerable<Exception> errors = DataValidationErrors.GetErrors(target);
+                Assert.Single(errors);
+                Assert.IsType<InvalidOperationException>(errors.Single());
+                target.Text = "1";
+                Assert.Null(DataValidationErrors.GetErrors(target));
+            }
+        }
+
+        [Fact]
+        public void Setter_Exceptions_Should_Set_DataValidationErrors_HasErrors()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    DataContext = new ExceptionTest(),
+                    [!TextBox.TextProperty] = new Binding(nameof(ExceptionTest.LessThan10), BindingMode.TwoWay),
+                    Template = CreateTemplate(),
+                };
+
+                target.ApplyTemplate();
+
+                Assert.False(DataValidationErrors.GetHasErrors(target));
+                target.Text = "20";
+                Assert.True(DataValidationErrors.GetHasErrors(target));
                 target.Text = "1";
-                Assert.Null(target.DataValidationErrors);
+                Assert.False(DataValidationErrors.GetHasErrors(target));
             }
         }
 

From 74f893027725613e2e538717f7d600bab79f9716 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 4 Feb 2018 14:11:09 -0600
Subject: [PATCH 312/482] Fixed bug in TrimDrawOperations that wasn't disposing
 draw operations correctly.

---
 .../SceneGraph/DeferredDrawingContextImpl.cs  |  7 ++++---
 .../Rendering/SceneGraph/VisualNode.cs        |  2 +-
 .../DeferredDrawingContextImplTests.cs        | 20 ++++++++++++++-----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
index fa57d07e23..dfd45fba9c 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
@@ -358,9 +358,10 @@ namespace Avalonia.Rendering.SceneGraph
 
         private void Add(IDrawOperation node)
         {
-            var refCounted = RefCountable.Create(node);
-            Add(refCounted);
-            refCounted.Dispose(); // Dispose our reference
+            using (var refCounted = RefCountable.Create(node))
+            {
+                Add(refCounted); 
+            }
         }
 
         private void Add(IRef<IDrawOperation> node)
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
index c651fee67f..3cb7e53d21 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
@@ -192,7 +192,7 @@ namespace Avalonia.Rendering.SceneGraph
             if (first < _drawOperations?.Count)
             {
                 EnsureDrawOperationsCreated();
-                for (int i = first; i < _drawOperations.Count - first; i++)
+                for (int i = first; i < _drawOperations.Count; i++)
                 {
                     _drawOperations[i].Dispose();
                 }
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
index 6faba372d5..4d23c57eed 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
@@ -175,13 +175,18 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
         public void Should_Trim_DrawOperations()
         {
             var node = new VisualNode(new TestRoot(), null);
-
             node.LayerRoot = node.Visual;
-            node.AddDrawOperation(RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 10, 100), 0)));
-            node.AddDrawOperation(RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 20, 100), 0)));
-            node.AddDrawOperation(RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 30, 100), 0)));
-            node.AddDrawOperation(RefCountable.Create(new RectangleNode(Matrix.Identity, Brushes.Red, null, new Rect(0, 0, 40, 100), 0)));
 
+            for (var i = 0; i < 4; ++i)
+            {
+                var drawOperation = new Mock<IDrawOperation>();
+                using (var r = RefCountable.Create(drawOperation.Object))
+                {
+                    node.AddDrawOperation(r);
+                }
+            }
+
+            var drawOperations = node.DrawOperations.Select(op => op.Item).ToList();
             var layers = new SceneLayers(node.Visual);
             var target = new DeferredDrawingContextImpl(null, layers);
 
@@ -192,6 +197,11 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             }
 
             Assert.Equal(2, node.DrawOperations.Count);
+
+            foreach (var i in drawOperations)
+            {
+                Mock.Get(i).Verify(x => x.Dispose());
+            }
         }
 
         [Fact]

From 75d7341fa114da0a260085e272871cb218199f23 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 12 Feb 2018 21:45:50 +0300
Subject: [PATCH 313/482] "Cherry-picked" EmbeddedWindowImpl.cs from single
 win32 assembly PR

---
 .../Avalonia.Win32.Shared.projitems           |  1 +
 .../Avalonia.Win32/Avalonia.Win32.csproj      |  1 -
 .../Avalonia.Win32/EmbeddedWindowImpl.cs      | 90 +++++++++++++++++++
 .../Embedding/EmbeddedWindowImpl.cs           | 43 ---------
 src/Windows/Avalonia.Win32/Win32Platform.cs   |  4 -
 5 files changed, 91 insertions(+), 48 deletions(-)
 create mode 100644 src/Windows/Avalonia.Win32/EmbeddedWindowImpl.cs
 delete mode 100644 src/Windows/Avalonia.Win32/Embedding/EmbeddedWindowImpl.cs

diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.Shared.projitems b/src/Windows/Avalonia.Win32/Avalonia.Win32.Shared.projitems
index 6f13747cb6..cca6f5acf1 100644
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.Shared.projitems
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.Shared.projitems
@@ -11,6 +11,7 @@
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)ClipboardImpl.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)CursorFactory.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)EmbeddedWindowImpl.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)FramebufferManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Input\KeyInterop.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Input\WindowsKeyboardDevice.cs" />
diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
index 92d973238e..14f6211d68 100644
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@@ -53,7 +53,6 @@
     <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Embedding\EmbeddedWindowImpl.cs" />
     <Compile Include="Embedding\WinFormsAvaloniaControlHost.cs">
       <SubType>Component</SubType>
     </Compile>
diff --git a/src/Windows/Avalonia.Win32/EmbeddedWindowImpl.cs b/src/Windows/Avalonia.Win32/EmbeddedWindowImpl.cs
new file mode 100644
index 0000000000..538a51c01e
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/EmbeddedWindowImpl.cs
@@ -0,0 +1,90 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using Avalonia.Platform;
+using Avalonia.Win32.Interop;
+
+namespace Avalonia.Win32
+{
+    class EmbeddedWindowImpl : WindowImpl, IEmbeddableWindowImpl
+    {
+        private static IntPtr DefaultParentWindow = CreateParentWindow();
+        private static UnmanagedMethods.WndProc _wndProcDelegate;
+
+        protected override IntPtr CreateWindowOverride(ushort atom)
+        {
+            var hWnd = UnmanagedMethods.CreateWindowEx(
+                0,
+                atom,
+                null,
+                (int)UnmanagedMethods.WindowStyles.WS_CHILD,
+                0,
+                0,
+                640,
+                480,
+                DefaultParentWindow,
+                IntPtr.Zero,
+                IntPtr.Zero,
+                IntPtr.Zero);
+            return hWnd;
+        }
+
+        protected override IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
+        {
+            if (msg == (uint)UnmanagedMethods.WindowsMessage.WM_KILLFOCUS)
+                LostFocus?.Invoke();
+            return base.WndProc(hWnd, msg, wParam, lParam);
+        }
+
+        public event Action LostFocus;
+
+        private static IntPtr CreateParentWindow()
+        {
+            _wndProcDelegate = new UnmanagedMethods.WndProc(ParentWndProc);
+
+            var wndClassEx = new UnmanagedMethods.WNDCLASSEX
+            {
+                cbSize = Marshal.SizeOf<UnmanagedMethods.WNDCLASSEX>(),
+                hInstance = UnmanagedMethods.GetModuleHandle(null),
+                lpfnWndProc = _wndProcDelegate,
+                lpszClassName = "AvaloniaEmbeddedWindow-" + Guid.NewGuid(),
+            };
+
+            var atom = UnmanagedMethods.RegisterClassEx(ref wndClassEx);
+
+            if (atom == 0)
+            {
+                throw new Win32Exception();
+            }
+
+            var hwnd = UnmanagedMethods.CreateWindowEx(
+                0,
+                atom,
+                null,
+                (int)UnmanagedMethods.WindowStyles.WS_OVERLAPPEDWINDOW,
+                UnmanagedMethods.CW_USEDEFAULT,
+                UnmanagedMethods.CW_USEDEFAULT,
+                UnmanagedMethods.CW_USEDEFAULT,
+                UnmanagedMethods.CW_USEDEFAULT,
+                IntPtr.Zero,
+                IntPtr.Zero,
+                IntPtr.Zero,
+                IntPtr.Zero);
+
+            if (hwnd == IntPtr.Zero)
+            {
+                throw new Win32Exception();
+            }
+
+            return hwnd;
+        }
+
+        private static IntPtr ParentWndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
+        {
+            return UnmanagedMethods.DefWindowProc(hWnd, msg, wParam, lParam);
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Embedding/EmbeddedWindowImpl.cs b/src/Windows/Avalonia.Win32/Embedding/EmbeddedWindowImpl.cs
deleted file mode 100644
index d27c28cb67..0000000000
--- a/src/Windows/Avalonia.Win32/Embedding/EmbeddedWindowImpl.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using Avalonia.Platform;
-using Avalonia.Win32.Interop;
-
-namespace Avalonia.Win32
-{
-    class EmbeddedWindowImpl : WindowImpl, IEmbeddableWindowImpl
-    {
-        private static readonly System.Windows.Forms.UserControl WinFormsControl = new System.Windows.Forms.UserControl();
-
-        public static IntPtr DefaultParentWindow = WinFormsControl.Handle;
-
-        protected override IntPtr CreateWindowOverride(ushort atom)
-        {
-            var hWnd = UnmanagedMethods.CreateWindowEx(
-                0,
-                atom,
-                null,
-                (int)UnmanagedMethods.WindowStyles.WS_CHILD,
-                0,
-                0,
-                640,
-                480,
-                DefaultParentWindow,
-                IntPtr.Zero,
-                IntPtr.Zero,
-                IntPtr.Zero);
-            return hWnd;
-        }
-
-        protected override IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
-        {
-            if(msg == (uint)UnmanagedMethods.WindowsMessage.WM_KILLFOCUS)
-                LostFocus?.Invoke();
-            return base.WndProc(hWnd, msg, wParam, lParam);
-        }
-
-        public event Action LostFocus;
-    }
-}
diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
index e265749249..a490e59cb7 100644
--- a/src/Windows/Avalonia.Win32/Win32Platform.cs
+++ b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -196,13 +196,9 @@ namespace Avalonia.Win32
 
         public IEmbeddableWindowImpl CreateEmbeddableWindow()
         {
-#if NETSTANDARD
-            throw new NotSupportedException();
-#else
             var embedded = new EmbeddedWindowImpl();
             embedded.Show();
             return embedded;
-#endif
         }
 
         public IPopupImpl CreatePopup()

From 13171c4be3856d467fd997ad0b3b9a1a930ebe6f Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 12 Feb 2018 21:46:30 +0300
Subject: [PATCH 314/482] Implemented `--session-id` and `--method win32` for
 previewer

---
 .../ControlCatalog.NetCore.csproj             |  1 +
 .../Remote/RemoteDesignerEntryPoint.cs        | 55 +++++++++++++++----
 .../DesignMessages.cs                         | 12 +++-
 .../TcpTransportBase.cs                       |  2 +-
 .../Program.cs                                | 35 +++++++++++-
 5 files changed, 90 insertions(+), 15 deletions(-)

diff --git a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
index b308c59789..ec841db5b2 100644
--- a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
+++ b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
@@ -6,6 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.DotNetCoreRuntime\Avalonia.DotNetCoreRuntime.csproj" />
     <ProjectReference Include="..\..\src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj" />
     <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
diff --git a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
index 51cf1d4dde..c4febff434 100644
--- a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
+++ b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Net;
 using System.Reflection;
 using Avalonia.Controls;
@@ -22,6 +23,15 @@ namespace Avalonia.DesignerSupport.Remote
         {
             public string AppPath { get; set; }
             public Uri Transport { get; set; }
+            public string Method { get; set; } = Methods.AvaloniaRemote;
+            public string SessionId { get; set; } = Guid.NewGuid().ToString();
+        }
+
+        static class Methods
+        {
+            public const string AvaloniaRemote = "avalonia-remote";
+            public const string Win32 = "win32";
+
         }
 
         static Exception Die(string error)
@@ -35,11 +45,13 @@ namespace Avalonia.DesignerSupport.Remote
             return new Exception("APPEXIT");
         }
 
+        static void Log(string message) => Console.WriteLine(message);
+
         static Exception PrintUsage()
         {
-            Console.Error.WriteLine("Usage: --transport transport_spec app");
+            Console.Error.WriteLine("Usage: --transport transport_spec --session-id sid --method method app");
             Console.Error.WriteLine();
-            Console.Error.WriteLine("Example: --transport tcp-bson://127.0.0.1:30243/ MyApp.exe");
+            Console.Error.WriteLine("Example: --transport tcp-bson://127.0.0.1:30243/ --session-id 123 --method avalonia-remote MyApp.exe");
             Console.Error.Flush();
             return Die(null);
         }
@@ -59,6 +71,10 @@ namespace Avalonia.DesignerSupport.Remote
                     }
                     else if (arg == "--transport")
                         next = a => rv.Transport = new Uri(a, UriKind.Absolute);
+                    else if (arg == "--method")
+                        next = a => rv.Method = a;
+                    else if (arg == "--session-id")
+                        next = a => rv.SessionId = a;
                     else if (rv.AppPath == null)
                         rv.AppPath = arg;
                     else
@@ -84,18 +100,22 @@ namespace Avalonia.DesignerSupport.Remote
             PrintUsage();
             return null;
         }
-
+        
         interface IAppInitializer
         {
-            Application GetConfiguredApp(IAvaloniaRemoteTransportConnection transport, object obj);
+            Application GetConfiguredApp(IAvaloniaRemoteTransportConnection transport, CommandLineArgs args, object obj);
         }
         
         class AppInitializer<T> : IAppInitializer where T : AppBuilderBase<T>, new()
         {
-            public Application GetConfiguredApp(IAvaloniaRemoteTransportConnection transport, object obj)
+            public Application GetConfiguredApp(IAvaloniaRemoteTransportConnection transport,
+                CommandLineArgs args, object obj)
             {
                 var builder = (AppBuilderBase<T>) obj;
-                builder.UseWindowingSubsystem(() => PreviewerWindowingPlatform.Initialize(transport));
+                if (args.Method == Methods.AvaloniaRemote)
+                    builder.UseWindowingSubsystem(() => PreviewerWindowingPlatform.Initialize(transport));
+                if (args.Method == Methods.Win32)
+                    builder.UseWindowingSubsystem("Avalonia.Win32");
                 builder.SetupWithoutStarting();
                 return builder.Instance;
             }
@@ -120,13 +140,16 @@ namespace Avalonia.DesignerSupport.Remote
                 BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic);
             if (builderMethod == null)
                 throw Die($"{entryPoint.DeclaringType.FullName} doesn't have a method named {BuilderMethodName}");
-
+            Log($"Obtaining AppBuilder instance from {builderMethod.DeclaringType.FullName}.{builderMethod.Name}");
             var appBuilder = builderMethod.Invoke(null, null);
+            Log($"Initializing application in design mode");
             var initializer =(IAppInitializer)Activator.CreateInstance(typeof(AppInitializer<>).MakeGenericType(appBuilder.GetType()));
-            var app = initializer.GetConfiguredApp(transport, appBuilder);
+            var app = initializer.GetConfiguredApp(transport, args, appBuilder);
             s_transport = transport;
             transport.OnMessage += OnTransportMessage;
             transport.OnException += (t, e) => Die(e.ToString());
+            Log("Sending StartDesignerSessionMessage");
+            transport.Send(new StartDesignerSessionMessage {SessionId = args.SessionId});
             app.Run(new NeverClose());
         }
 
@@ -139,7 +162,8 @@ namespace Avalonia.DesignerSupport.Remote
                 s_viewportAllocatedMessage
             };
         }
-        
+
+        private static Window s_currentWindow;
         private static void OnTransportMessage(IAvaloniaRemoteTransportConnection transport, object obj) => Dispatcher.UIThread.Post(() =>
         {
             if (obj is ClientSupportedPixelFormatsMessage formats)
@@ -156,8 +180,17 @@ namespace Avalonia.DesignerSupport.Remote
             {
                 try
                 {
-                    DesignWindowLoader.LoadDesignerWindow(xaml.Xaml, xaml.AssemblyPath);
-                    s_transport.Send(new UpdateXamlResultMessage());
+                    s_currentWindow?.Close();
+                }
+                catch
+                {
+                    //Ignore
+                }
+                s_currentWindow = null;
+                try
+                {
+                    s_currentWindow = DesignWindowLoader.LoadDesignerWindow(xaml.Xaml, xaml.AssemblyPath);
+                    s_transport.Send(new UpdateXamlResultMessage(){Handle = s_currentWindow.PlatformImpl?.Handle?.Handle.ToString()});
                 }
                 catch (Exception e)
                 {
diff --git a/src/Avalonia.Remote.Protocol/DesignMessages.cs b/src/Avalonia.Remote.Protocol/DesignMessages.cs
index d6e898f320..f3683da21c 100644
--- a/src/Avalonia.Remote.Protocol/DesignMessages.cs
+++ b/src/Avalonia.Remote.Protocol/DesignMessages.cs
@@ -1,4 +1,6 @@
-namespace Avalonia.Remote.Protocol.Designer
+using System;
+
+namespace Avalonia.Remote.Protocol.Designer
 {
     [AvaloniaRemoteMessageGuid("9AEC9A2E-6315-4066-B4BA-E9A9EFD0F8CC")]
     public class UpdateXamlMessage
@@ -11,7 +13,13 @@
     public class UpdateXamlResultMessage
     {
         public string Error { get; set; }
+        public string Handle { get; set; }
+    }
+
+    [AvaloniaRemoteMessageGuid("854887CF-2694-4EB6-B499-7461B6FB96C7")]
+    public class StartDesignerSessionMessage
+    {
+        public string SessionId { get; set; }
     }
-    
     
 }
\ No newline at end of file
diff --git a/src/Avalonia.Remote.Protocol/TcpTransportBase.cs b/src/Avalonia.Remote.Protocol/TcpTransportBase.cs
index af62f2da59..3d2bd09485 100644
--- a/src/Avalonia.Remote.Protocol/TcpTransportBase.cs
+++ b/src/Avalonia.Remote.Protocol/TcpTransportBase.cs
@@ -72,7 +72,7 @@ namespace Avalonia.Remote.Protocol
         {
             var c = new TcpClient();
             await c.ConnectAsync(address, port);
-            return CreateTransport(_resolver, c.GetStream(), c.Dispose);
+            return CreateTransport(_resolver, c.GetStream(), ((IDisposable)c).Dispose);
         }
     }
 }
\ No newline at end of file
diff --git a/src/tools/Avalonia.Designer.HostApp.NetFX/Program.cs b/src/tools/Avalonia.Designer.HostApp.NetFX/Program.cs
index d3f80dd621..bef53bb685 100644
--- a/src/tools/Avalonia.Designer.HostApp.NetFX/Program.cs
+++ b/src/tools/Avalonia.Designer.HostApp.NetFX/Program.cs
@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -8,7 +11,37 @@ namespace Avalonia.Designer.HostApp.NetFX
 {
     class Program
     {
+        private static string s_appDir;
         public static void Main(string[] args)
-            => Avalonia.DesignerSupport.Remote.RemoteDesignerEntryPoint.Main(args);
+        {
+            s_appDir = Directory.GetCurrentDirectory();
+            AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
+            foreach (var dll in Directory.GetFiles(s_appDir, "*.dll"))
+            {
+                try
+                {
+                    Console.WriteLine("Loading " + dll);
+                    Assembly.LoadFile(dll);
+                }
+                catch
+                {
+                    
+                }
+            }
+            Exec(args);
+        }
+
+        static void Exec(string[] args)
+        {
+            Avalonia.DesignerSupport.Remote.RemoteDesignerEntryPoint.Main(args);
+        }
+
+        private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
+        {
+            string assemblyPath = Path.Combine(s_appDir, new AssemblyName(args.Name).Name + ".dll");
+            if (File.Exists(assemblyPath) == false) return null;
+            Assembly assembly = Assembly.LoadFrom(assemblyPath);
+            return assembly;
+        }
     }
 }

From 70d75c0eb5db776fa59fffaaf69c1b9c8ba6d9f1 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 12 Feb 2018 23:55:36 +0100
Subject: [PATCH 315/482] Fix Window auto-sizing.

`Window` was acting like `SizeToContent="WidthAndHeight"` was set even when it wasn't. This fixes that.
---
 src/Avalonia.Controls/Window.cs | 38 ++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 7fed712e07..f3ad4dbbd9 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -374,27 +374,31 @@ namespace Avalonia.Controls
         {
             var sizeToContent = SizeToContent;
             var clientSize = ClientSize;
-            Size constraint;
+            Size constraint = clientSize;
 
-            switch (sizeToContent)
+            if ((sizeToContent & SizeToContent.Width) != 0)
             {
-                case SizeToContent.Width:
-                    constraint = new Size(double.PositiveInfinity, ClientSize.Height);
-                    break;
-                case SizeToContent.Height:
-                    constraint = new Size(ClientSize.Width, double.PositiveInfinity);
-                    break;
-                case SizeToContent.WidthAndHeight:
-                    constraint = Size.Infinity;
-                    break;
-                case SizeToContent.Manual:
-                    constraint = ClientSize;
-                    break;
-                default:
-                    throw new InvalidOperationException("Invalid value for SizeToContent.");
+                constraint = constraint.WithWidth(double.PositiveInfinity);
             }
 
-            return base.MeasureOverride(constraint);
+            if ((sizeToContent & SizeToContent.Height) != 0)
+            {
+                constraint = constraint.WithHeight(double.PositiveInfinity);
+            }
+
+            var result = base.MeasureOverride(constraint);
+
+            if ((sizeToContent & SizeToContent.Width) == 0)
+            {
+                result = result.WithWidth(clientSize.Width);
+            }
+
+            if ((sizeToContent & SizeToContent.Height) == 0)
+            {
+                result = result.WithHeight(clientSize.Height);
+            }
+
+            return result;
         }
 
         protected override void HandleClosed()

From 88179105499705dccfd77b277e2a079b5cf4718d Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 12 Feb 2018 17:00:43 -0600
Subject: [PATCH 316/482] Add ref-counting for the scene instance in
 DeferredRenderer to ensure that we don't dispose a scene while it is being
 rendered.

Also rename Scene.Clone to Scene.CloneScene to prevent confusion between IRef<Scene>.Clone and Scene.Clone.
---
 .../Rendering/DeferredRenderer.cs             | 26 +++++++++++++------
 .../Rendering/SceneGraph/Scene.cs             |  2 +-
 .../Rendering/SceneGraph/SceneBuilderTests.cs | 22 ++++++++--------
 .../SceneGraph/SceneBuilderTests_Layers.cs    |  6 ++---
 .../Rendering/SceneGraph/SceneTests.cs        |  2 +-
 5 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index 344f3f8f2b..dbf032b037 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -28,7 +28,7 @@ namespace Avalonia.Rendering
         private readonly ISceneBuilder _sceneBuilder;
 
         private bool _running;
-        private Scene _scene;
+        private volatile IRef<Scene> _scene;
         private DirtyVisuals _dirty;
         private IRef<IRenderTargetBitmapImpl> _overlay;
         private bool _updateQueued;
@@ -128,7 +128,7 @@ namespace Avalonia.Rendering
                 UpdateScene();
             }
 
-            return _scene?.HitTest(p, root, filter) ?? Enumerable.Empty<IVisual>();
+            return _scene?.Item.HitTest(p, root, filter) ?? Enumerable.Empty<IVisual>();
         }
 
         /// <inheritdoc/>
@@ -180,7 +180,7 @@ namespace Avalonia.Rendering
 
         internal void UnitTestUpdateScene() => UpdateScene();
 
-        internal void UnitTestRender() => Render(_scene);
+        internal void UnitTestRender() => Render(_scene.Item);
 
         private void Render(Scene scene)
         {
@@ -381,7 +381,8 @@ namespace Avalonia.Rendering
             {
                 if (_root.IsVisible)
                 {
-                    var scene = _scene?.Clone() ?? new Scene(_root);
+                    var sceneRef = RefCountable.Create(_scene?.Item.CloneScene() ?? new Scene(_root));
+                    var scene = sceneRef.Item;
 
                     if (_dirty == null)
                     {
@@ -396,7 +397,7 @@ namespace Avalonia.Rendering
                         }
                     }
 
-                    var oldScene = Interlocked.Exchange(ref _scene, scene);
+                    var oldScene = Interlocked.Exchange(ref _scene, sceneRef);
                     oldScene?.Dispose();
 
                     _dirty.Clear();
@@ -426,9 +427,18 @@ namespace Avalonia.Rendering
                         _dispatcher.Post(UpdateScene, DispatcherPriority.Render);
                     }
 
-                    Scene scene = null;
-                    Interlocked.Exchange(ref scene, _scene);
-                    Render(scene);
+                    var scene = _scene?.Clone();
+                    if (scene == null)
+                    {
+                        Render(null);
+                    }
+                    else
+                    {
+                        using (scene)
+                        {
+                            Render(scene.Item);
+                        } 
+                    }
                 }
                 catch { }
                 finally
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
index f2e4f5fdbd..352d41d024 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
@@ -82,7 +82,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// Clones the scene.
         /// </summary>
         /// <returns>The cloned scene.</returns>
-        public Scene Clone()
+        public Scene CloneScene()
         {
             var index = new Dictionary<IVisual, IVisualNode>();
             var root = Clone((VisualNode)Root, null, index);
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
index f44be3f82e..dda1d73649 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
@@ -99,7 +99,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 Assert.Equal(new Rect(10, 20, 160, 240), canvasNode.ClipBounds);
 
                 // Initial ClipBounds are correct, make sure they're still correct after updating canvas.
-                result = result.Clone();
+                result = result.CloneScene();
                 Assert.True(sceneBuilder.Update(result, canvas));
 
                 canvasNode = result.FindNode(canvas);
@@ -197,7 +197,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 canvas.Arrange(new Rect(tree.DesiredSize));
 
                 // Initial ClipBounds are correct, make sure they're still correct after updating canvas.
-                scene = scene.Clone();
+                scene = scene.CloneScene();
                 Assert.True(sceneBuilder.Update(scene, canvas));
 
                 borderNode = scene.FindNode(border);
@@ -309,7 +309,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 var borderNode = scene.FindNode(border);
                 Assert.Equal(expectedTransform, borderNode.Transform);
 
-                scene = scene.Clone();
+                scene = scene.CloneScene();
                 Assert.True(sceneBuilder.Update(scene, border));
 
                 borderNode = scene.FindNode(border);
@@ -354,7 +354,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
 
                 border.Background = Brushes.Green;
 
-                var result = initial.Clone();
+                var result = initial.CloneScene();
                 sceneBuilder.Update(result, border);
                 
                 var borderNode = (VisualNode)result.Root.Children[0];
@@ -402,7 +402,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 sceneBuilder.UpdateAll(initial);
 
                 border.Child = decorator;
-                var result = initial.Clone();
+                var result = initial.CloneScene();
 
                 Assert.True(sceneBuilder.Update(result, decorator));
 
@@ -457,7 +457,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 sceneBuilder.UpdateAll(initial);
 
                 border.Child = null;
-                var result = initial.Clone();
+                var result = initial.CloneScene();
 
                 Assert.True(sceneBuilder.Update(result, decorator));
                 Assert.False(sceneBuilder.Update(result, canvas));
@@ -501,7 +501,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 sceneBuilder.UpdateAll(initial);
 
                 border.IsVisible = false;
-                var result = initial.Clone();
+                var result = initial.CloneScene();
 
                 Assert.True(sceneBuilder.Update(result, border));
                 Assert.False(sceneBuilder.Update(result, canvas));
@@ -552,7 +552,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 decorator.Margin = new Thickness(0, 20, 0, 0);
                 layout.ExecuteLayoutPass();
 
-                scene = scene.Clone();
+                scene = scene.CloneScene();
                 sceneBuilder.Update(scene, decorator);
 
                 borderNode = scene.FindNode(border);
@@ -600,7 +600,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 decorator.Margin = new Thickness(0, 20, 0, 0);
                 layout.ExecuteLayoutPass();
 
-                scene = scene.Clone();
+                scene = scene.CloneScene();
 
                 sceneBuilder.Update(scene, decorator);
 
@@ -640,7 +640,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 Assert.Equal(new Size(100, 100), scene.Size);
 
                 tree.ClientSize = new Size(110, 120);
-                scene = scene.Clone();
+                scene = scene.CloneScene();
                 sceneBuilder.Update(scene, tree);
 
                 Assert.Equal(new Size(110, 120), scene.Size);
@@ -735,7 +735,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
 
                 tree.Child = new Decorator();
 
-                using (var result = scene.Clone())
+                using (var result = scene.CloneScene())
                 {
                     sceneBuilder.Update(result, img);
                     scene.Dispose();
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
index f2d137249a..ac00b8ccfc 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
@@ -62,7 +62,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 Assert.Empty(scene.Layers.Select(x => x.LayerRoot).Except(new IVisual[] { tree, border }));
 
                 animation.OnCompleted();
-                scene = scene.Clone();
+                scene = scene.CloneScene();
 
                 sceneBuilder.Update(scene, border);
 
@@ -160,7 +160,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 Assert.Equal(3, scene.Layers.Count);
 
                 decorator.Child = null;
-                scene = scene.Clone();
+                scene = scene.CloneScene();
 
                 sceneBuilder.Update(scene, border);
 
@@ -210,7 +210,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 Assert.Equal(3, scene.Layers.Count);
 
                 border.IsVisible = false;
-                scene = scene.Clone();
+                scene = scene.CloneScene();
 
                 sceneBuilder.Update(scene, border);
 
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneTests.cs
index 9c0adc432d..bba0c8b8f3 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneTests.cs
@@ -25,7 +25,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             scene.Layers[tree].Dirty.Add(new Rect(0, 0, 100, 100));
             scene.Layers[decorator].Dirty.Add(new Rect(0, 0, 50, 100));
 
-            scene = scene.Clone();
+            scene = scene.CloneScene();
             Assert.Equal(2, scene.Layers.Count());
             Assert.Empty(scene.Layers[0].Dirty);
             Assert.Empty(scene.Layers[1].Dirty);

From f50223cb0dcf988601c60fb0a9088c761b35f7bf Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Mon, 12 Feb 2018 18:10:00 -0500
Subject: [PATCH 317/482] Fixed a bug in tab navigation

TabNavigation.GetFirstInNextContainer would only check one sibling
and would move up to the parent if the first sibling was not focuable
---
 src/Avalonia.Input/Navigation/TabNavigation.cs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Input/Navigation/TabNavigation.cs b/src/Avalonia.Input/Navigation/TabNavigation.cs
index 6e077e887f..a9d5b83073 100644
--- a/src/Avalonia.Input/Navigation/TabNavigation.cs
+++ b/src/Avalonia.Input/Navigation/TabNavigation.cs
@@ -221,17 +221,16 @@ namespace Avalonia.Input.Navigation
                     return parent;
                 }
 
-                var siblings = parent.GetVisualChildren()
+                var allSiblings = parent.GetVisualChildren()
                     .OfType<IInputElement>()
                     .Where(FocusExtensions.CanFocusDescendants);
-                var sibling = direction == NavigationDirection.Next ? 
-                    siblings.SkipWhile(x => x != container).Skip(1).FirstOrDefault() : 
-                    siblings.TakeWhile(x => x != container).LastOrDefault();
+                var siblings = direction == NavigationDirection.Next ?
+                    allSiblings.SkipWhile(x => x != container).Skip(1) :
+                    allSiblings.TakeWhile(x => x != container).Reverse();
 
-                if (sibling != null)
+                foreach (var sibling in siblings)
                 {
                     var customNext = GetCustomNext(sibling, direction);
-
                     if (customNext.handled)
                     {
                         return customNext.next;
@@ -239,13 +238,17 @@ namespace Avalonia.Input.Navigation
 
                     if (sibling.CanFocus())
                     {
-                        next = sibling;
+                        return sibling;
                     }
                     else
                     {
                         next = direction == NavigationDirection.Next ?
                             GetFocusableDescendants(sibling, direction).FirstOrDefault() :
                             GetFocusableDescendants(sibling, direction).LastOrDefault();
+                        if(next != null)
+                        {
+                            return next;
+                        }
                     }
                 }
 

From 2af1f20108a1d3ce1c854e30899f7a67327cbe89 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 13 Feb 2018 00:12:12 +0100
Subject: [PATCH 318/482] Mark SizeToContent with [Flags].

And explicitly assign values.
---
 src/Avalonia.Controls/Window.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index f3ad4dbbd9..893859b915 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -19,27 +19,28 @@ namespace Avalonia.Controls
     /// <summary>
     /// Determines how a <see cref="Window"/> will size itself to fit its content.
     /// </summary>
+    [Flags]
     public enum SizeToContent
     {
         /// <summary>
         /// The window will not automatically size itself to fit its content.
         /// </summary>
-        Manual,
+        Manual = 0,
 
         /// <summary>
         /// The window will size itself horizontally to fit its content.
         /// </summary>
-        Width,
+        Width = 1,
 
         /// <summary>
         /// The window will size itself vertically to fit its content.
         /// </summary>
-        Height,
+        Height = 2,
 
         /// <summary>
         /// The window will size itself horizontally and vertically to fit its content.
         /// </summary>
-        WidthAndHeight,
+        WidthAndHeight = 3,
     }
 
     /// <summary>

From 53bf2431edb9c9021ab8931bcc450b7568095815 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 12 Feb 2018 17:50:28 -0600
Subject: [PATCH 319/482] Clean up OnRenderLoopTick code.

---
 src/Avalonia.Visuals/Rendering/DeferredRenderer.cs | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index dbf032b037..fd6b149837 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -426,18 +426,10 @@ namespace Avalonia.Rendering
                         _updateQueued = true;
                         _dispatcher.Post(UpdateScene, DispatcherPriority.Render);
                     }
-
-                    var scene = _scene?.Clone();
-                    if (scene == null)
-                    {
-                        Render(null);
-                    }
-                    else
+                    
+                    using (var scene = _scene?.Clone())
                     {
-                        using (scene)
-                        {
-                            Render(scene.Item);
-                        } 
+                        Render(scene?.Item);
                     }
                 }
                 catch { }

From 7969749cd1ca55d3e9e81c685c9e16408657e61b Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Mon, 12 Feb 2018 20:06:55 -0500
Subject: [PATCH 320/482] Added a unit test

---
 .../KeyboardNavigationTests_Tab.cs            | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
index ad70dcd470..60d31145cf 100644
--- a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
+++ b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
@@ -80,6 +80,43 @@ namespace Avalonia.Input.UnitTests
             Assert.Equal(next, result);
         }
 
+        [Fact]
+        public void Next_Skips_Unfocasable_Siblings()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                Children =
+                {
+                    new StackPanel
+                    {
+                        Children =
+                        {
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            new StackPanel
+                            {
+                                Children =
+                                {
+                                    (current = new Button { Name = "Button3" }),
+                                }
+                            },
+                            new TextBlock { Name = "TextBlock" },
+                            (next = new Button { Name = "Button4" }),
+                        }
+                    },
+                    new Button { Name = "Button5" },
+                    new Button { Name = "Button6" },
+                }
+            };
+
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
+
+            Assert.Equal(next, result);
+        }
+
         [Fact]
         public void Next_Continue_Doesnt_Enter_Panel_With_TabNavigation_None()
         {

From 6e774349f8164e9dc0b514fa10fdb8a4dc8d16b0 Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Wed, 31 Jan 2018 20:20:56 -0500
Subject: [PATCH 321/482] Added a DatePicker control ported from Silverlight

---
 samples/ControlCatalog/ControlCatalog.csproj  |    6 +
 samples/ControlCatalog/MainView.xaml          |    3 +-
 .../ControlCatalog/Pages/DatePickerPage.xaml  |   46 +
 .../Pages/DatePickerPage.xaml.cs              |   36 +
 src/Avalonia.Controls/Calendar/DatePicker.cs  | 1188 +++++++++++++++++
 src/Avalonia.Themes.Default/DatePicker.xaml   |  126 ++
 src/Avalonia.Themes.Default/DefaultTheme.xaml |    1 +
 7 files changed, 1405 insertions(+), 1 deletion(-)
 create mode 100644 samples/ControlCatalog/Pages/DatePickerPage.xaml
 create mode 100644 samples/ControlCatalog/Pages/DatePickerPage.xaml.cs
 create mode 100644 src/Avalonia.Controls/Calendar/DatePicker.cs
 create mode 100644 src/Avalonia.Themes.Default/DatePicker.xaml

diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 0b4463ddb7..37f9da0c43 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -60,6 +60,9 @@
     <EmbeddedResource Include="Pages\DropDownPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Pages\DatePickerPage.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Pages\ExpanderPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -128,6 +131,9 @@
     <Compile Include="Pages\DropDownPage.xaml.cs">
       <DependentUpon>DropDownPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\DatePickerPage.xaml.cs">
+      <DependentUpon>DatePickerPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\ExpanderPage.xaml.cs">
       <DependentUpon>ExpanderPage.xaml</DependentUpon>
     </Compile>
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 311a61a6dc..060369e404 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -7,11 +7,12 @@
     </TabControl.Transition>
     <TabItem Header="Border"><pages:BorderPage/></TabItem>
     <TabItem Header="Button"><pages:ButtonPage/></TabItem>
-    <TabItem Header="Calendar"><pages:CalendarPage/></TabItem>
+    <TabItem Header="Calendar"><pages:CalendarPage/></TabItem> 
     <TabItem Header="Canvas"><pages:CanvasPage/></TabItem>
     <TabItem Header="Carousel"><pages:CarouselPage/></TabItem>
     <TabItem Header="CheckBox"><pages:CheckBoxPage/></TabItem>
     <TabItem Header="ContextMenu"><pages:ContextMenuPage/></TabItem>
+    <TabItem Header="DatePicker"><pages:DatePickerPage/></TabItem>
     <TabItem Header="DropDown"><pages:DropDownPage/></TabItem>
     <TabItem Header="Expander"><pages:ExpanderPage/></TabItem>
     <TabItem Header="Image"><pages:ImagePage/></TabItem>
diff --git a/samples/ControlCatalog/Pages/DatePickerPage.xaml b/samples/ControlCatalog/Pages/DatePickerPage.xaml
new file mode 100644
index 0000000000..92cfa7e178
--- /dev/null
+++ b/samples/ControlCatalog/Pages/DatePickerPage.xaml
@@ -0,0 +1,46 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <StackPanel Orientation="Vertical" Gap="4">
+    <TextBlock Classes="h1">DatePicker</TextBlock>
+    <TextBlock Classes="h2">A control for selecting dates with a calendar drop-down</TextBlock>
+        
+    <StackPanel Orientation="Horizontal"
+                Margin="0,16,0,0"
+                HorizontalAlignment="Center"
+                Gap="16">
+      <StackPanel Orientation="Vertical"
+                  Width="200">
+        <TextBlock Text="SelectedDateFormat: Short"/>
+        <DatePicker Name="DatePicker1"
+                    SelectedDateFormat="Short"
+                    Margin="0,0,0,8"/>
+
+        <TextBlock Text="SelectedDateFormat: Long"/>
+        <DatePicker Name="DatePicker2"
+                    SelectedDateFormat="Long"
+                    Margin="0,0,0,8"/>
+
+        <TextBlock Text="SelectedDateFormat: Custom"/>
+        <DatePicker Name="DatePicker3"
+                    SelectedDateFormat="Custom"
+                    CustomDateFormatString="ddd, MMM d"
+                    Margin="0,0,0,8"/>
+
+        <TextBlock Text="Blackout Dates"/>
+        <DatePicker Name="DatePicker4"
+                    Margin="0,0,0,8"/>
+
+        <DatePicker Margin="0,0,0,8"
+                    Watermark="Watermark"/>
+        <DatePicker Margin="0,0,0,8"
+                    Name="DatePicker5"
+                    Watermark="Floating Watermark"
+                    UseFloatingWatermark="True"/>
+                
+        <TextBlock Text="Disabled"/>
+        <DatePicker IsEnabled="False"/>
+      </StackPanel>
+
+    </StackPanel> 
+  </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/DatePickerPage.xaml.cs b/samples/ControlCatalog/Pages/DatePickerPage.xaml.cs
new file mode 100644
index 0000000000..ef01887c9e
--- /dev/null
+++ b/samples/ControlCatalog/Pages/DatePickerPage.xaml.cs
@@ -0,0 +1,36 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using System;
+
+namespace ControlCatalog.Pages
+{
+    public class DatePickerPage : UserControl
+    {
+        public DatePickerPage()
+        {
+            InitializeComponent();
+            
+            var dp1 = this.FindControl<DatePicker>("DatePicker1");
+            var dp2 = this.FindControl<DatePicker>("DatePicker2");
+            var dp3 = this.FindControl<DatePicker>("DatePicker3");
+            var dp4 = this.FindControl<DatePicker>("DatePicker4");
+            var dp5 = this.FindControl<DatePicker>("DatePicker5");
+
+            dp1.SelectedDate = DateTime.Today;
+            dp2.SelectedDate = DateTime.Today.AddDays(10);
+            dp3.SelectedDate = DateTime.Today.AddDays(20);
+            dp5.SelectedDate = DateTime.Today;
+
+            dp4.TemplateApplied += (s, e) =>
+            {
+                dp4.BlackoutDates.AddDatesInPast();
+            };
+            
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Calendar/DatePicker.cs b/src/Avalonia.Controls/Calendar/DatePicker.cs
new file mode 100644
index 0000000000..418ef50b2c
--- /dev/null
+++ b/src/Avalonia.Controls/Calendar/DatePicker.cs
@@ -0,0 +1,1188 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using System;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Globalization;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Provides data for the
+    /// <see cref="E:Avalonia.Controls.DatePicker.DateValidationError" />
+    /// event.
+    /// </summary>
+    public class DatePickerDateValidationErrorEventArgs : EventArgs
+    {
+        private bool _throwException;
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.DatePickerDateValidationErrorEventArgs" />
+        /// class.
+        /// </summary>
+        /// <param name="exception">
+        /// The initial exception from the
+        /// <see cref="E:Avalonia.Controls.DatePicker.DateValidationError" />
+        /// event.
+        /// </param>
+        /// <param name="text">
+        /// The text that caused the
+        /// <see cref="E:Avalonia.Controls.DatePicker.DateValidationError" />
+        /// event.
+        /// </param>
+        public DatePickerDateValidationErrorEventArgs(Exception exception, string text)
+        {
+            this.Text = text;
+            this.Exception = exception;
+        }
+
+        /// <summary>
+        /// Gets the initial exception associated with the
+        /// <see cref="E:Avalonia.Controls.DatePicker.DateValidationError" />
+        /// event.
+        /// </summary>
+        /// <value>
+        /// The exception associated with the validation failure.
+        /// </value>
+        public Exception Exception { get; private set; }
+
+        /// <summary>
+        /// Gets the text that caused the
+        /// <see cref="E:Avalonia.Controls.DatePicker.DateValidationError" />
+        /// event.
+        /// </summary>
+        /// <value>
+        /// The text that caused the validation failure.
+        /// </value>
+        public string Text { get; private set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether
+        /// <see cref="P:Avalonia.Controls.DatePickerDateValidationErrorEventArgs.Exception" />
+        /// should be thrown.
+        /// </summary>
+        /// <value>
+        /// True if the exception should be thrown; otherwise, false.
+        /// </value>
+        /// <exception cref="T:System.ArgumentException">
+        /// If set to true and
+        /// <see cref="P:Avalonia.Controls.DatePickerDateValidationErrorEventArgs.Exception" />
+        /// is null.
+        /// </exception>
+        public bool ThrowException
+        {
+            get { return this._throwException; }
+            set
+            {
+                if (value && this.Exception == null)
+                {
+                    throw new ArgumentException("Cannot Throw Null Exception");
+                }
+                this._throwException = value;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Specifies date formats for a
+    /// <see cref="T:Avalonia.Controls.DatePicker" />.
+    /// </summary>
+    public enum DatePickerFormat
+    {
+        /// <summary>
+        /// Specifies that the date should be displayed using unabbreviated days
+        /// of the week and month names.
+        /// </summary>
+        Long = 0,
+
+        /// <summary>
+        /// Specifies that the date should be displayed using abbreviated days
+        /// of the week and month names.
+        /// </summary>
+        Short = 1,
+
+        /// <summary>
+        /// Specifies that the date should be displayed using a custom format string.
+        /// </summary>
+        Custom = 2
+    }
+
+    public class DatePicker : TemplatedControl
+    {
+        private const string ElementTextBox = "PART_TextBox";
+        private const string ElementButton = "PART_Button";
+        private const string ElementPopup = "PART_Popup";
+        private const string ElementCalendar = "PART_Calendar";
+
+        private Calendar _calendar;
+        private string _defaultText;
+        private Button _dropDownButton;
+        //private Canvas _outsideCanvas;
+        //private Canvas _outsidePopupCanvas;
+        private Popup _popUp;
+        private TextBox _textBox;
+        private IDisposable _textBoxTextChangedSubscription;
+        private IDisposable _buttonPointerPressedSubscription;
+
+        private DateTime? _onOpenSelectedDate;
+        private bool _settingSelectedDate;
+
+        private DateTime _displayDate;
+        private DateTime? _displayDateStart;
+        private DateTime? _displayDateEnd;
+        private bool _isDropDownOpen;
+        private DateTime? _selectedDate;
+        private string _text;
+        private bool _suspendTextChangeHandler = false;
+        private bool _isPopupClosing = false;
+        private bool _ignoreButtonClick = false;
+
+        /// <summary>
+        /// Gets a collection of dates that are marked as not selectable.
+        /// </summary>
+        /// <value>
+        /// A collection of dates that cannot be selected. The default value is
+        /// an empty collection.
+        /// </value>
+        public CalendarBlackoutDatesCollection BlackoutDates { get; private set; }
+
+        public static readonly DirectProperty<DatePicker, DateTime> DisplayDateProperty =
+            AvaloniaProperty.RegisterDirect<DatePicker, DateTime>(
+                nameof(DisplayDate),
+                o => o.DisplayDate,
+                (o, v) => o.DisplayDate = v);
+        public static readonly DirectProperty<DatePicker, DateTime?> DisplayDateStartProperty =
+            AvaloniaProperty.RegisterDirect<DatePicker, DateTime?>(
+                nameof(DisplayDateStart),
+                o => o.DisplayDateStart,
+                (o, v) => o.DisplayDateStart = v);
+        public static readonly DirectProperty<DatePicker, DateTime?> DisplayDateEndProperty =
+            AvaloniaProperty.RegisterDirect<DatePicker, DateTime?>(
+                nameof(DisplayDateEnd),
+                o => o.DisplayDateEnd,
+                (o, v) => o.DisplayDateEnd = v);
+        public static readonly StyledProperty<DayOfWeek> FirstDayOfWeekProperty =
+            AvaloniaProperty.Register<DatePicker, DayOfWeek>(nameof(FirstDayOfWeek));
+
+        public static readonly DirectProperty<DatePicker, bool> IsDropDownOpenProperty =
+            AvaloniaProperty.RegisterDirect<DatePicker, bool>(
+                nameof(IsDropDownOpen),
+                o => o.IsDropDownOpen,
+                (o, v) => o.IsDropDownOpen = v);
+
+        public static readonly StyledProperty<bool> IsTodayHighlightedProperty =
+            AvaloniaProperty.Register<DatePicker, bool>(nameof(IsTodayHighlighted));
+        public static readonly DirectProperty<DatePicker, DateTime?> SelectedDateProperty =
+            AvaloniaProperty.RegisterDirect<DatePicker, DateTime?>(
+                nameof(SelectedDate),
+                o => o.SelectedDate,
+                (o, v) => o.SelectedDate = v);
+
+        public static readonly StyledProperty<DatePickerFormat> SelectedDateFormatProperty =
+            AvaloniaProperty.Register<DatePicker, DatePickerFormat>(
+                nameof(SelectedDateFormat),
+                defaultValue: DatePickerFormat.Short,
+                validate: ValidateSelectedDateFormat);
+
+        public static readonly StyledProperty<string> CustomDateFormatStringProperty =
+            AvaloniaProperty.Register<DatePicker, string>(
+                nameof(CustomDateFormatString),
+                defaultValue: "d",
+                validate: ValidateDateFormatString);
+
+        public static readonly DirectProperty<DatePicker, string> TextProperty =
+            AvaloniaProperty.RegisterDirect<DatePicker, string>(
+                nameof(Text),
+                o => o.Text,
+                (o, v) => o.Text = v);
+        public static readonly StyledProperty<string> WatermarkProperty =
+            TextBox.WatermarkProperty.AddOwner<DatePicker>();
+        public static readonly StyledProperty<bool> UseFloatingWatermarkProperty =
+            TextBox.UseFloatingWatermarkProperty.AddOwner<DatePicker>();
+
+
+        /// <summary>
+        /// Gets or sets the date to display.
+        /// </summary>
+        /// <value>
+        /// The date to display. The default 
+        /// <see cref="P:System.DateTime.Today" />.
+        /// </value>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">
+        /// The specified date is not in the range defined by
+        /// <see cref="P:Avalonia.Controls.DatePicker.DisplayDateStart" />
+        /// and
+        /// <see cref="P:Avalonia.Controls.DatePicker.DisplayDateEnd" />.
+        /// </exception>
+        public DateTime DisplayDate
+        {
+            get { return _displayDate; }
+            set { SetAndRaise(DisplayDateProperty, ref _displayDate, value); }
+        }
+        
+        /// <summary>
+        /// Gets or sets the first date to be displayed.
+        /// </summary>
+        /// <value>The first date to display.</value>
+        public DateTime? DisplayDateStart
+        {
+            get { return _displayDateStart; }
+            set { SetAndRaise(DisplayDateStartProperty, ref _displayDateStart, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the last date to be displayed.
+        /// </summary>
+        /// <value>The last date to display.</value>
+        public DateTime? DisplayDateEnd
+        {
+            get { return _displayDateEnd; }
+            set { SetAndRaise(DisplayDateEndProperty, ref _displayDateEnd, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the day that is considered the beginning of the week.
+        /// </summary>
+        /// <value>
+        /// A <see cref="T:System.DayOfWeek" /> representing the beginning of
+        /// the week. The default is <see cref="F:System.DayOfWeek.Sunday" />.
+        /// </value>
+        public DayOfWeek FirstDayOfWeek
+        {
+            get { return GetValue(FirstDayOfWeekProperty); }
+            set { SetValue(FirstDayOfWeekProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the drop-down
+        /// <see cref="T:Avalonia.Controls.Calendar" /> is open or closed.
+        /// </summary>
+        /// <value>
+        /// True if the <see cref="T:Avalonia.Controls.Calendar" /> is
+        /// open; otherwise, false. The default is false.
+        /// </value>
+        public bool IsDropDownOpen
+        {
+            get { return _isDropDownOpen; }
+            set { SetAndRaise(IsDropDownOpenProperty, ref _isDropDownOpen, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the current date will be
+        /// highlighted.
+        /// </summary>
+        /// <value>
+        /// True if the current date is highlighted; otherwise, false. The
+        /// default is true.
+        /// </value>
+        public bool IsTodayHighlighted
+        {
+            get { return GetValue(IsTodayHighlightedProperty); }
+            set { SetValue(IsTodayHighlightedProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the currently selected date.
+        /// </summary>
+        /// <value>
+        /// The date currently selected. The default is null.
+        /// </value>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">
+        /// The specified date is not in the range defined by
+        /// <see cref="P:Avalonia.Controls.DatePicker.DisplayDateStart" />
+        /// and
+        /// <see cref="P:Avalonia.Controls.DatePicker.DisplayDateEnd" />,
+        /// or the specified date is in the
+        /// <see cref="P:Avalonia.Controls.DatePicker.BlackoutDates" />
+        /// collection.
+        /// </exception>
+        public DateTime? SelectedDate
+        {
+            get { return _selectedDate; }
+            set { SetAndRaise(SelectedDateProperty, ref _selectedDate, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the format that is used to display the selected date.
+        /// </summary>
+        /// <value>
+        /// The format that is used to display the selected date. The default is
+        /// <see cref="F:Avalonia.Controls.DatePickerFormat.Short" />.
+        /// </value>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">
+        /// An specified format is not valid.
+        /// </exception>
+        public DatePickerFormat SelectedDateFormat
+        {
+            get { return GetValue(SelectedDateFormatProperty); }
+            set { SetValue(SelectedDateFormatProperty, value); }
+        }
+
+        public string CustomDateFormatString
+        {
+            get { return GetValue(CustomDateFormatStringProperty); }
+            set { SetValue(CustomDateFormatStringProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the text that is displayed by the
+        /// <see cref="T:Avalonia.Controls.DatePicker" />.
+        /// </summary>
+        /// <value>
+        /// The text displayed by the
+        /// <see cref="T:Avalonia.Controls.DatePicker" />.
+        /// </value>
+        /// <exception cref="T:System.FormatException">
+        /// The text entered cannot be parsed to a valid date, and the exception
+        /// is not suppressed.
+        /// </exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">
+        /// The text entered parses to a date that is not selectable.
+        /// </exception>
+        public string Text
+        {
+            get { return _text; }
+            set { SetAndRaise(TextProperty, ref _text, value); }
+        }
+
+        public string Watermark
+        {
+            get { return GetValue(WatermarkProperty); }
+            set { SetValue(WatermarkProperty, value); }
+        }
+        public bool UseFloatingWatermark
+        {
+            get { return GetValue(UseFloatingWatermarkProperty); }
+            set { SetValue(UseFloatingWatermarkProperty, value); }
+        }
+
+        /// <summary>
+        /// Occurs when the drop-down
+        /// <see cref="T:Avalonia.Controls.Calendar" /> is closed.
+        /// </summary>
+        public event EventHandler CalendarClosed;
+
+        /// <summary>
+        /// Occurs when the drop-down
+        /// <see cref="T:Avalonia.Controls.Calendar" /> is opened.
+        /// </summary>
+        public event EventHandler CalendarOpened;
+
+        /// <summary>
+        /// Occurs when <see cref="P:Avalonia.Controls.DatePicker.Text" />
+        /// is assigned a value that cannot be interpreted as a date.
+        /// </summary>
+        public event EventHandler<DatePickerDateValidationErrorEventArgs> DateValidationError;
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="P:Avalonia.Controls.DatePicker.SelectedDate" />
+        /// property is changed.
+        /// </summary>
+        public event EventHandler<SelectionChangedEventArgs> SelectedDateChanged;
+
+        static DatePicker()
+        {
+            FocusableProperty.OverrideDefaultValue<DatePicker>(true);
+
+            DisplayDateProperty.Changed.AddClassHandler<DatePicker>(x => x.OnDisplayDateChanged);
+            DisplayDateStartProperty.Changed.AddClassHandler<DatePicker>(x => x.OnDisplayDateStartChanged);
+            DisplayDateEndProperty.Changed.AddClassHandler<DatePicker>(x => x.OnDisplayDateEndChanged);
+            IsDropDownOpenProperty.Changed.AddClassHandler<DatePicker>(x => x.OnIsDropDownOpenChanged);
+            SelectedDateProperty.Changed.AddClassHandler<DatePicker>(x => x.OnSelectedDateChanged);
+            SelectedDateFormatProperty.Changed.AddClassHandler<DatePicker>(x => x.OnSelectedDateFormatChanged);
+            CustomDateFormatStringProperty.Changed.AddClassHandler<DatePicker>(x => x.OnCustomDateFormatStringChanged);
+            TextProperty.Changed.AddClassHandler<DatePicker>(x => x.OnTextChanged);
+        }
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.DatePicker" /> class.
+        /// </summary>
+        public DatePicker()
+        {
+            FirstDayOfWeek = DateTimeHelper.GetCurrentDateFormat().FirstDayOfWeek;
+            _defaultText = string.Empty;
+            DisplayDate = DateTime.Today;
+        }
+
+        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        {
+            if (_calendar != null)
+            {
+                _calendar.DayButtonMouseUp -= Calendar_DayButtonMouseUp;
+                _calendar.DisplayDateChanged -= Calendar_DisplayDateChanged;
+                _calendar.SelectedDatesChanged -= Calendar_SelectedDatesChanged;
+                _calendar.PointerPressed -= Calendar_PointerPressed;
+                _calendar.KeyDown -= Calendar_KeyDown;
+            }
+            _calendar = e.NameScope.Find<Calendar>(ElementCalendar);
+            if (_calendar != null)
+            {
+                _calendar.SelectionMode = CalendarSelectionMode.SingleDate;
+                _calendar.SelectedDate = SelectedDate;
+                SetCalendarDisplayDate(DisplayDate);
+                SetCalendarDisplayDateStart(DisplayDateStart);
+                SetCalendarDisplayDateEnd(DisplayDateEnd);
+
+                _calendar.DayButtonMouseUp += Calendar_DayButtonMouseUp;
+                _calendar.DisplayDateChanged += Calendar_DisplayDateChanged;
+                _calendar.SelectedDatesChanged += Calendar_SelectedDatesChanged;
+                _calendar.PointerPressed += Calendar_PointerPressed;
+                _calendar.KeyDown += Calendar_KeyDown;
+                //_calendar.SizeChanged += new SizeChangedEventHandler(Calendar_SizeChanged);
+                //_calendar.IsTabStop = true;
+
+                var currentBlackoutDays = BlackoutDates;
+                BlackoutDates = _calendar.BlackoutDates;
+                if(currentBlackoutDays != null)
+                {
+                    foreach (var range in currentBlackoutDays)
+                    {
+                        BlackoutDates.Add(range);
+                    }
+                }
+            }
+
+            if (_popUp != null)
+            {
+                _popUp.Child = null;
+                _popUp.Closed -= PopUp_Closed;
+            }
+            _popUp = e.NameScope.Find<Popup>(ElementPopup);
+            if(_popUp != null)
+            {
+                _popUp.Closed += PopUp_Closed;
+                if (IsDropDownOpen)
+                {
+                    OpenDropDown();
+                }
+            }
+
+            if(_dropDownButton != null)
+            {
+                _dropDownButton.Click -= DropDownButton_Click;
+                _buttonPointerPressedSubscription?.Dispose();
+            }
+            _dropDownButton = e.NameScope.Find<Button>(ElementButton);
+            if(_dropDownButton != null)
+            {
+                _dropDownButton.Click += DropDownButton_Click;
+                _buttonPointerPressedSubscription =
+                    _dropDownButton.AddHandler(PointerPressedEvent, DropDownButton_PointerPressed, handledEventsToo: true);
+            }
+
+            if (_textBox != null)
+            {
+                _textBox.KeyDown -= TextBox_KeyDown;
+                _textBox.GotFocus -= TextBox_GotFocus;
+                _textBoxTextChangedSubscription?.Dispose();
+            }
+            _textBox = e.NameScope.Find<TextBox>(ElementTextBox);
+
+            if(!SelectedDate.HasValue)
+            {
+                SetWaterMarkText();
+            }
+
+            if(_textBox != null)
+            {
+                _textBox.KeyDown += TextBox_KeyDown;
+                _textBox.GotFocus += TextBox_GotFocus;
+                _textBoxTextChangedSubscription = _textBox.GetObservable(TextBox.TextProperty).Subscribe(txt => TextBox_TextChanged());
+
+                if(SelectedDate.HasValue)
+                {
+                    _textBox.Text = DateTimeToString(SelectedDate.Value);
+                }
+                else if(!String.IsNullOrEmpty(_defaultText))
+                {
+                    _textBox.Text = _defaultText;
+                    SetSelectedDate();
+                }
+            }
+
+            base.OnTemplateApplied(e);
+        }
+
+        protected override void UpdateDataValidation(AvaloniaProperty property, BindingNotification status)
+        {
+            if (property == SelectedDateProperty)
+            {
+                DataValidationErrors.SetError(this, status.Error);
+            }
+        }
+
+        protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
+        {
+            base.OnPointerWheelChanged(e);
+            if (!e.Handled && SelectedDate.HasValue && _calendar != null)
+            {
+                DateTime selectedDate = this.SelectedDate.Value;
+                DateTime? newDate = DateTimeHelper.AddDays(selectedDate, e.Delta.Y > 0 ? -1 : 1);
+                if (newDate.HasValue && Calendar.IsValidDateSelection(_calendar, newDate.Value))
+                {
+                    SelectedDate = newDate;
+                    e.Handled = true;
+                }
+            }
+        }
+        protected override void OnGotFocus(GotFocusEventArgs e)
+        {
+            base.OnGotFocus(e);
+            if(IsEnabled && _textBox != null && e.NavigationMethod == NavigationMethod.Tab)
+            {
+                _textBox.Focus();
+                var text = _textBox.Text;
+                if(!string.IsNullOrEmpty(text))
+                {
+                    _textBox.SelectionStart = 0;
+                    _textBox.SelectionEnd = text.Length;
+                }
+            }
+        }
+        protected override void OnLostFocus(RoutedEventArgs e)
+        {
+            base.OnLostFocus(e);
+
+            SetSelectedDate();
+        }
+        
+        private void SetCalendarDisplayDate(DateTime value)
+        {
+            if (DateTimeHelper.CompareYearMonth(_calendar.DisplayDate, value) != 0)
+            {
+                _calendar.DisplayDate = DisplayDate;
+                if (DateTime.Compare(_calendar.DisplayDate, DisplayDate) != 0)
+                {
+                    DisplayDate = _calendar.DisplayDate;
+                }
+            }
+        }
+        private void OnDisplayDateChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (_calendar != null)
+            {
+                var value = (DateTime)e.NewValue;
+                SetCalendarDisplayDate(value);
+            }
+        }
+        private void SetCalendarDisplayDateStart(DateTime? value)
+        {
+            _calendar.DisplayDateStart = value;
+            if (_calendar.DisplayDateStart.HasValue && DisplayDateStart.HasValue && DateTime.Compare(_calendar.DisplayDateStart.Value, DisplayDateStart.Value) != 0)
+            {
+                DisplayDateStart = _calendar.DisplayDateStart;
+            }
+        }
+        private void OnDisplayDateStartChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (_calendar != null)
+            {
+                var value = (DateTime?)e.NewValue;
+                SetCalendarDisplayDateStart(value);
+            }
+        }
+        private void SetCalendarDisplayDateEnd(DateTime? value)
+        {
+            _calendar.DisplayDateEnd = value;
+            if (_calendar.DisplayDateEnd.HasValue && DisplayDateEnd.HasValue && DateTime.Compare(_calendar.DisplayDateEnd.Value, DisplayDateEnd.Value) != 0)
+            {
+                DisplayDateEnd = _calendar.DisplayDateEnd;
+            }
+
+        }
+        private void OnDisplayDateEndChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (_calendar != null)
+            {
+                var value = (DateTime?)e.NewValue;
+                SetCalendarDisplayDateEnd(value);
+            }
+        }
+        private void OnIsDropDownOpenChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var oldValue = (bool)e.OldValue;
+            var value = (bool)e.NewValue;
+
+            if (_popUp != null && _popUp.Child != null)
+            {
+                if (value != oldValue)
+                {
+                    if (_calendar.DisplayMode != CalendarMode.Month)
+                    {
+                        _calendar.DisplayMode = CalendarMode.Month;
+                    }
+
+                    if (value)
+                    {
+                        OpenDropDown();
+                    }
+                    else
+                    {
+                        _popUp.IsOpen = false;
+                        OnCalendarClosed(new RoutedEventArgs());
+                    }
+                }
+            }
+        }
+        private void OnSelectedDateChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var addedDate = (DateTime?)e.NewValue;
+            var removedDate = (DateTime?)e.OldValue;
+
+            if (_calendar != null && addedDate != _calendar.SelectedDate)
+            {
+                _calendar.SelectedDate = addedDate;
+            }
+
+            if (SelectedDate != null)
+            {
+                DateTime day = SelectedDate.Value;
+
+                // When the SelectedDateProperty change is done from
+                // OnTextPropertyChanged method, two-way binding breaks if
+                // BeginInvoke is not used:
+                Threading.Dispatcher.UIThread.InvokeAsync(() =>
+                {
+                    _settingSelectedDate = true;
+                    Text = DateTimeToString(day);
+                    _settingSelectedDate = false;
+                    OnDateSelected(addedDate, removedDate);
+                });
+
+                // When DatePickerDisplayDateFlag is TRUE, the SelectedDate
+                // change is coming from the Calendar UI itself, so, we
+                // shouldn't change the DisplayDate since it will automatically
+                // be changed by the Calendar
+                if ((day.Month != DisplayDate.Month || day.Year != DisplayDate.Year) && (_calendar == null || !_calendar.DatePickerDisplayDateFlag))
+                {
+                    DisplayDate = day;
+                }
+                if(_calendar != null)
+                    _calendar.DatePickerDisplayDateFlag = false;
+            }
+            else
+            {
+                _settingSelectedDate = true;
+                SetWaterMarkText();
+                _settingSelectedDate = false;
+                OnDateSelected(addedDate, removedDate);
+            }
+        }
+        private void OnDateFormatChanged()
+        {
+            if (_textBox != null)
+            {
+                if (SelectedDate.HasValue)
+                {
+                    Text = DateTimeToString(SelectedDate.Value);
+                }
+                else if (string.IsNullOrEmpty(_textBox.Text))
+                {
+                    SetWaterMarkText();
+                }
+                else
+                {
+                    DateTime? date = ParseText(_textBox.Text);
+
+                    if (date != null)
+                    {
+                        string s = DateTimeToString((DateTime)date);
+                        Text = s;
+                    }
+                }
+            }
+        }
+        private void OnSelectedDateFormatChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            OnDateFormatChanged();
+        }
+        private void OnCustomDateFormatStringChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if(SelectedDateFormat == DatePickerFormat.Custom)
+            {
+                OnDateFormatChanged();
+            }
+        }
+        private void OnTextChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var oldValue = (string)e.OldValue;
+            var value = (string)e.NewValue;
+
+            if (!_suspendTextChangeHandler)
+            {
+                if (value != null)
+                {
+                    if (_textBox != null)
+                    {
+                        _textBox.Text = value;
+                    }
+                    else
+                    {
+                        _defaultText = value;
+                    }
+                    if (!_settingSelectedDate)
+                    {
+                        SetSelectedDate();
+                    }
+                }
+                else
+                {
+                    if (!_settingSelectedDate)
+                    {
+                        _settingSelectedDate = true;
+                        SelectedDate = null;
+                        _settingSelectedDate = false;
+                    }
+                }
+            }
+            else
+            {
+                SetWaterMarkText();
+            }
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.DatePicker.DateValidationError" />
+        /// event.
+        /// </summary>
+        /// <param name="e">
+        /// A
+        /// <see cref="T:Avalonia.Controls.DatePickerDateValidationErrorEventArgs" />
+        /// that contains the event data.
+        /// </param>
+        protected virtual void OnDateValidationError(DatePickerDateValidationErrorEventArgs e)
+        {
+            DateValidationError?.Invoke(this, e);
+        }
+        private void OnDateSelected(DateTime? addedDate, DateTime? removedDate)
+        {
+            EventHandler<SelectionChangedEventArgs> handler = this.SelectedDateChanged;
+            if (null != handler)
+            {
+                Collection<DateTime> addedItems = new Collection<DateTime>();
+                Collection<DateTime> removedItems = new Collection<DateTime>();
+
+                if (addedDate.HasValue)
+                {
+                    addedItems.Add(addedDate.Value);
+                }
+
+                if (removedDate.HasValue)
+                {
+                    removedItems.Add(removedDate.Value);
+                }
+
+                handler(this, new SelectionChangedEventArgs(SelectingItemsControl.SelectionChangedEvent, addedItems, removedItems));
+            }
+        }
+        private void OnCalendarClosed(EventArgs e)
+        {
+            CalendarClosed?.Invoke(this, e);
+        }
+        private void OnCalendarOpened(EventArgs e)
+        {
+            CalendarOpened?.Invoke(this, e);
+        }
+
+        private void Calendar_DayButtonMouseUp(object sender, PointerReleasedEventArgs e)
+        {
+            Focus();
+            IsDropDownOpen = false;
+        }      
+        private void Calendar_DisplayDateChanged(object sender, CalendarDateChangedEventArgs e)
+        {
+            if (e.AddedDate != this.DisplayDate)
+            {
+                SetValue(DisplayDateProperty, (DateTime) e.AddedDate);
+            }
+        }
+        private void Calendar_SelectedDatesChanged(object sender, SelectionChangedEventArgs e)
+        {
+            Debug.Assert(e.AddedItems.Count < 2, "There should be less than 2 AddedItems!");
+
+            if (e.AddedItems.Count > 0 && SelectedDate.HasValue && DateTime.Compare((DateTime)e.AddedItems[0], SelectedDate.Value) != 0)
+            {
+                SelectedDate = (DateTime?)e.AddedItems[0];
+            }
+            else
+            {
+                if (e.AddedItems.Count == 0)
+                {
+                    SelectedDate = null;
+                    return;
+                }
+
+                if (!SelectedDate.HasValue)
+                {
+                    if (e.AddedItems.Count > 0)
+                    {
+                        SelectedDate = (DateTime?)e.AddedItems[0];
+                    }
+                }
+            }
+        }
+        private void Calendar_PointerPressed(object sender, PointerPressedEventArgs e)
+        {
+            if (e.MouseButton == MouseButton.Left)
+            {
+                e.Handled = true;
+            }
+        }
+        private void Calendar_KeyDown(object sender, KeyEventArgs e)
+        {
+            Calendar c = sender as Calendar;
+            Debug.Assert(c != null, "The Calendar should not be null!");
+
+            if (!e.Handled && (e.Key == Key.Enter || e.Key == Key.Space || e.Key == Key.Escape) && c.DisplayMode == CalendarMode.Month)
+            {
+                Focus();
+                IsDropDownOpen = false;
+
+                if (e.Key == Key.Escape)
+                {
+                    SelectedDate = _onOpenSelectedDate;
+                }
+            }
+        }
+        private void TextBox_GotFocus(object sender, RoutedEventArgs e)
+        {
+            IsDropDownOpen = false;
+        }
+        private void TextBox_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (!e.Handled)
+            {
+                e.Handled = ProcessDatePickerKey(e);
+            }
+        }
+        private void TextBox_TextChanged()
+        {
+            if (_textBox != null)
+            {
+                _suspendTextChangeHandler = true;
+                Text = _textBox.Text;
+                _suspendTextChangeHandler = false;
+            }
+        }
+        private void DropDownButton_PointerPressed(object sender, PointerPressedEventArgs e)
+        {
+            _ignoreButtonClick = _isPopupClosing;
+        }
+        private void DropDownButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (!_ignoreButtonClick)
+            {
+                HandlePopUp();
+            }
+            else
+            {
+                _ignoreButtonClick = false;
+            }
+        }
+        private void PopUp_Closed(object sender, EventArgs e)
+        {
+            IsDropDownOpen = false;
+
+            if(!_isPopupClosing)
+            {
+                _isPopupClosing = true;
+                Threading.Dispatcher.UIThread.InvokeAsync(() => _isPopupClosing = false);
+            }
+        }
+
+        private void HandlePopUp()
+        {
+            if (IsDropDownOpen)
+            {
+                Focus();
+                IsDropDownOpen = false;
+            }
+            else
+            {
+                ProcessTextBox();
+            }
+        }
+        private void OpenDropDown()
+        {
+            if (_calendar != null)
+            {
+                _calendar.Focus();
+                OpenPopUp();
+                _calendar.ResetStates();
+                OnCalendarOpened(new RoutedEventArgs());
+            }
+        }
+        private void OpenPopUp()
+        {
+            _onOpenSelectedDate = SelectedDate;
+            _popUp.IsOpen = true;
+        }
+
+        /// <summary>
+        /// Input text is parsed in the correct format and changed into a
+        /// DateTime object.  If the text can not be parsed TextParseError Event
+        /// is thrown.
+        /// </summary>
+        /// <param name="text">Inherited code: Requires comment.</param>
+        /// <returns>
+        /// IT SHOULD RETURN NULL IF THE STRING IS NOT VALID, RETURN THE
+        /// DATETIME VALUE IF IT IS VALID.
+        /// </returns>
+        private DateTime? ParseText(string text)
+        {
+            DateTime newSelectedDate;
+
+            // TryParse is not used in order to be able to pass the exception to
+            // the TextParseError event
+            try
+            {
+                newSelectedDate = DateTime.Parse(text, DateTimeHelper.GetCurrentDateFormat());
+
+                if (Calendar.IsValidDateSelection(this._calendar, newSelectedDate))
+                {
+                    return newSelectedDate;
+                }
+                else
+                {
+                    var dateValidationError = new DatePickerDateValidationErrorEventArgs(new ArgumentOutOfRangeException("text", "SelectedDate value is not valid."), text);
+                    OnDateValidationError(dateValidationError);
+
+                    if (dateValidationError.ThrowException)
+                    {
+                        throw dateValidationError.Exception;
+                    }
+                }
+            }
+            catch (FormatException ex)
+            {
+                DatePickerDateValidationErrorEventArgs textParseError = new DatePickerDateValidationErrorEventArgs(ex, text);
+                OnDateValidationError(textParseError);
+
+                if (textParseError.ThrowException)
+                {
+                    throw textParseError.Exception;
+                }
+            }
+            return null;
+        }
+        private string DateTimeToString(DateTime d)
+        {
+            DateTimeFormatInfo dtfi = DateTimeHelper.GetCurrentDateFormat();
+
+            switch (SelectedDateFormat)
+            {
+                case DatePickerFormat.Short:
+                    return string.Format(CultureInfo.CurrentCulture, d.ToString(dtfi.ShortDatePattern, dtfi));
+                case DatePickerFormat.Long:
+                    return string.Format(CultureInfo.CurrentCulture, d.ToString(dtfi.LongDatePattern, dtfi));
+                case DatePickerFormat.Custom:
+                    return string.Format(CultureInfo.CurrentCulture, d.ToString(CustomDateFormatString, dtfi));
+            }
+            return null;
+        }
+        private bool ProcessDatePickerKey(KeyEventArgs e)
+        {
+            
+            switch (e.Key)
+            {
+                case Key.Enter:
+                    {
+                        SetSelectedDate();
+                        return true;
+                    }
+                case Key.Down:
+                    { 
+                        if ((e.Modifiers & InputModifiers.Control) == InputModifiers.Control)
+                        {
+                            HandlePopUp();
+                            return true;
+                        }
+                        break;
+                    }
+            }
+            return false;
+        }
+        private void ProcessTextBox()
+        {
+            SetSelectedDate();
+            IsDropDownOpen = true;
+            _calendar.Focus();
+        }
+        private void SetSelectedDate()
+        {
+            if (_textBox != null)
+            {
+                if (!string.IsNullOrEmpty(_textBox.Text))
+                {
+                    string s = _textBox.Text;
+
+                    if (SelectedDate != null)
+                    {
+                        // If the string value of the SelectedDate and the
+                        // TextBox string value are equal, we do not parse the
+                        // string again if we do an extra parse, we lose data in
+                        // M/d/yy format.
+                        // ex: SelectedDate = DateTime(1008,12,19) but when
+                        // "12/19/08" is parsed it is interpreted as
+                        // DateTime(2008,12,19)
+                        string selectedDate = DateTimeToString(SelectedDate.Value);
+                        if (selectedDate == s)
+                        {
+                            return;
+                        }
+                    }
+                    DateTime? d = SetTextBoxValue(s);
+                    if (!SelectedDate.Equals(d))
+                    {
+                        SelectedDate = d;
+                    }
+                }
+                else
+                {
+                    if (SelectedDate != null)
+                    {
+                        SelectedDate = null;
+                    }
+                }
+            }
+            else
+            {
+                DateTime? d = SetTextBoxValue(_defaultText);
+                if (!SelectedDate.Equals(d))
+                {
+                    SelectedDate = d;
+                }
+            }
+        }
+        private DateTime? SetTextBoxValue(string s)
+        {
+            if (string.IsNullOrEmpty(s))
+            {
+                SetValue(TextProperty, s);
+                return SelectedDate;
+            }
+            else
+            {
+                DateTime? d = ParseText(s);
+                if (d != null)
+                {
+                    SetValue(TextProperty, s);
+                    return d;
+                }
+                else
+                {
+                    // If parse error: TextBox should have the latest valid
+                    // selecteddate value:
+                    if (SelectedDate != null)
+                    {
+                        string newtext = this.DateTimeToString(SelectedDate.Value);
+                        SetValue(TextProperty, newtext);
+                        return SelectedDate;
+                    }
+                    else
+                    {
+                        SetWaterMarkText();
+                        return null;
+                    }
+                }
+            }
+        }
+        private void SetWaterMarkText()
+        {
+            if (_textBox != null)
+            {
+                if (string.IsNullOrEmpty(Watermark) && !UseFloatingWatermark)
+                {
+                    DateTimeFormatInfo dtfi = DateTimeHelper.GetCurrentDateFormat();
+                    Text = string.Empty;
+                    _defaultText = string.Empty;
+                    var watermarkFormat = "<{0}>";
+                    string watermarkText;
+
+                    switch (SelectedDateFormat)
+                    {
+                        case DatePickerFormat.Long:
+                            {
+                                watermarkText = string.Format(CultureInfo.CurrentCulture, watermarkFormat, dtfi.LongDatePattern.ToString());
+                                break;
+                            }
+                        case DatePickerFormat.Short:
+                        default:
+                            {
+                                watermarkText = string.Format(CultureInfo.CurrentCulture, watermarkFormat, dtfi.ShortDatePattern.ToString());
+                                break;
+                            }
+                    }
+                    _textBox.Watermark = watermarkText;
+                }
+                else
+                {
+                    _textBox.ClearValue(TextBox.WatermarkProperty);
+                }
+            }
+        }
+
+        private static bool IsValidSelectedDateFormat(DatePickerFormat value)
+        {
+            return value == DatePickerFormat.Long
+                || value == DatePickerFormat.Short
+                || value == DatePickerFormat.Custom;
+        }
+        private static DatePickerFormat ValidateSelectedDateFormat(DatePicker dp, DatePickerFormat format)
+        {
+            if(IsValidSelectedDateFormat(format))
+            {
+                return format;
+            }
+            else
+            {
+                throw new ArgumentOutOfRangeException(nameof(format), "DatePickerFormat value is not valid.");
+            }
+        }
+        private static string ValidateDateFormatString(DatePicker dp, string formatString)
+        {
+            if(string.IsNullOrWhiteSpace(formatString))
+            {
+                throw new ArgumentException("DateFormatString value is not valid.", nameof(formatString));
+            }
+            else
+            {
+                return formatString;
+            }
+        }
+        private static DateTime DiscardDayTime(DateTime d)
+        {
+            int year = d.Year;
+            int month = d.Month;
+            DateTime newD = new DateTime(year, month, 1, 0, 0, 0);
+            return newD;
+        }
+        private static DateTime? DiscardTime(DateTime? d)
+        {
+            if (d == null)
+            {
+                return null;
+            }
+            else
+            {
+                DateTime discarded = (DateTime) d;
+                int year = discarded.Year;
+                int month = discarded.Month;
+                int day = discarded.Day;
+                DateTime newD = new DateTime(year, month, day, 0, 0, 0);
+                return newD;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Themes.Default/DatePicker.xaml b/src/Avalonia.Themes.Default/DatePicker.xaml
new file mode 100644
index 0000000000..b706b5b4e5
--- /dev/null
+++ b/src/Avalonia.Themes.Default/DatePicker.xaml
@@ -0,0 +1,126 @@
+<!--
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+-->
+
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Style Selector="DatePicker">
+
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
+    <Setter Property="Padding" Value="4"/>
+    
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid ColumnDefinitions="*,Auto">
+
+          <Grid.Styles>
+
+            <Style Selector="Button.CalendarDropDown">
+              <Setter Property="Template">
+                <ControlTemplate>
+                  <Grid Height="18"
+                        Width="19"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Margin="0"
+                        Background="#FFFFFFFF"
+                        ColumnDefinitions="*,*,*,*"
+                        RowDefinitions="23*,19*,19*,19*"
+                        ClipToBounds="False">
+
+                    <Border Name="Highlight"
+                            Margin="-1"
+                            Grid.ColumnSpan="4"
+                            Grid.Row="0"
+                            Grid.RowSpan="4"
+                            BorderThickness="1"
+                            BorderBrush="{DynamicResource HighlightBrush}" />
+                    <Border Name="Background"
+                            Margin="0,-1,0,0"
+                            Grid.ColumnSpan="4"
+                            Grid.Row="1"
+                            Grid.RowSpan="3"
+                            BorderThickness="1"
+                            BorderBrush="{DynamicResource ThemeBorderDarkBrush}"
+                            CornerRadius=".5" />
+                    <Rectangle Grid.ColumnSpan="4"
+                               Grid.RowSpan="1"
+                               StrokeThickness="1"
+                               Stroke="{DynamicResource ThemeBorderDarkBrush}"
+                               Fill="{DynamicResource ThemeAccentBrush}">
+                    </Rectangle>
+                    <Path HorizontalAlignment="Center"
+                          Margin="4,3,4,3"
+                          VerticalAlignment="Center"
+                          RenderTransformOrigin="0.5,0.5"
+                          Grid.Column="0"
+                          Grid.Row="1"
+                          Grid.ColumnSpan="4"
+                          Grid.RowSpan="3"
+                          Fill="{DynamicResource ThemeBorderDarkBrush}"
+                          Stretch="Fill"
+                          Data="M11.426758,8.4305077 L11.749023,8.4305077 L11.749023,16.331387 L10.674805,16.331387 L10.674805,10.299648 L9.0742188,11.298672 L9.0742188,10.294277 C9.4788408,10.090176 9.9094238,9.8090878 10.365967,9.4510155 C10.82251,9.0929432 11.176106,8.7527733 11.426758,8.4305077 z M14.65086,8.4305077 L18.566387,8.4305077 L18.566387,9.3435936 L15.671368,9.3435936 L15.671368,11.255703 C15.936341,11.058764 16.27293,10.960293 16.681133,10.960293 C17.411602,10.960293 17.969301,11.178717 18.354229,11.615566 C18.739157,12.052416 18.931622,12.673672 18.931622,13.479336 C18.931622,15.452317 18.052553,16.438808 16.294415,16.438808 C15.560365,16.438808 14.951641,16.234707 14.468243,15.826504 L14.881817,14.929531 C15.368796,15.326992 15.837872,15.525723 16.289043,15.525723 C17.298809,15.525723 17.803692,14.895514 17.803692,13.635098 C17.803692,12.460618 17.305971,11.873379 16.310528,11.873379 C15.83071,11.873379 15.399232,12.079271 15.016094,12.491055 L14.65086,12.238613 z" />
+
+                    <Ellipse HorizontalAlignment="Center" VerticalAlignment="Center" Fill="#FFFFFFFF" StrokeThickness="0" Grid.ColumnSpan="4" Width="3" Height="3"/>
+                  </Grid>
+                </ControlTemplate>
+              </Setter>
+            </Style>
+
+            <Style Selector="Button.CalendarDropDown /template/ Border#Highlight">
+              <Setter Property="IsVisible" Value="False"/>
+            </Style>
+            <Style Selector="Button.CalendarDropDown:pressed /template/ Border#Highlight">
+              <Setter Property="IsVisible" Value="True"/>
+            </Style>
+
+            <Style Selector="Button.CalendarDropDown:pointerover /template/ Border#Background">
+              <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
+            </Style>
+            
+          </Grid.Styles>
+          
+          <TextBox Name="PART_TextBox"
+                   Background="{TemplateBinding Background}" 
+                   BorderBrush="{TemplateBinding BorderBrush}" 
+                   BorderThickness="{TemplateBinding BorderThickness}" 
+                   Padding="{TemplateBinding Padding}"
+                   Watermark="{TemplateBinding Watermark}"
+                   UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
+                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
+                   Grid.Column="0"/>
+
+          <Button Name="PART_Button"
+                  Grid.Column="1"
+                  Width="20"
+                  Classes="CalendarDropDown"
+                  Foreground="{TemplateBinding Foreground}"
+                  Background="#00FFFFFF"
+                  BorderThickness="0"
+                  Margin="2,0,2,0"
+                  Padding="0"
+                  ClipToBounds="False"
+                  Focusable="False"/>
+
+          <Popup Name="PART_Popup"
+                 PlacementTarget="{TemplateBinding}"
+                 StaysOpen="False">
+            <Calendar Name="PART_Calendar"
+                      FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
+                      IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"/>
+          </Popup>
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="DatePicker:focus /template/ TextBox#PART_TextBox">
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderDarkBrush}"/>
+  </Style>
+  
+</Styles>
\ No newline at end of file
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
index 6250282c2a..5b6f4b78fd 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml
@@ -41,4 +41,5 @@
   <StyleInclude Source="resm:Avalonia.Themes.Default.CalendarDayButton.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.CalendarItem.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.Calendar.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.DatePicker.xaml?assembly=Avalonia.Themes.Default"/>
 </Styles>

From 89b018135ed5ac7916800a274296e00a9c2bf31b Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Mon, 5 Feb 2018 17:29:03 -0500
Subject: [PATCH 322/482] Added Unit Tests

---
 .../DatePickerTests.cs                        | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 tests/Avalonia.Controls.UnitTests/DatePickerTests.cs

diff --git a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
new file mode 100644
index 0000000000..fe4f1ea06e
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
@@ -0,0 +1,130 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+using Avalonia.Markup.Xaml.Data;
+using Avalonia.Platform;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests
+{
+    public class DatePickerTests
+    {
+        private static bool CompareDates(DateTime first, DateTime second)
+        {
+            return first.Year == second.Year &&
+                first.Month == second.Month &&
+                first.Day == second.Day;
+        }
+
+        [Fact]
+        public void SelectedDateChanged_Should_Fire_When_SelectedDate_Set()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                bool handled = false;
+                DatePicker datePicker = CreateControl();
+                datePicker.SelectedDateChanged += (s,e) =>
+                {
+                    handled = true;
+                };
+                DateTime value = new DateTime(2000, 10, 10);
+                datePicker.SelectedDate = value;
+                Threading.Dispatcher.UIThread.RunJobs();
+                Assert.True(handled);
+            }
+        }
+
+        [Fact]
+        public void Setting_Selected_Date_To_Blackout_Date_Should_Throw()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                DatePicker datePicker = CreateControl();
+                datePicker.BlackoutDates.AddDatesInPast();
+
+                DateTime goodValue = DateTime.Today.AddDays(1);
+                datePicker.SelectedDate = goodValue;
+                Assert.True(CompareDates(datePicker.SelectedDate.Value, goodValue));
+
+                DateTime badValue = DateTime.Today.AddDays(-1);
+                Assert.ThrowsAny<ArgumentOutOfRangeException>(
+                    () => datePicker.SelectedDate = badValue);
+            }
+        }
+
+        [Fact]
+        public void Adding_Blackout_Dates_Containing_Selected_Date_Should_Throw()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                DatePicker datePicker = CreateControl();
+                datePicker.SelectedDate = DateTime.Today.AddDays(5);
+
+                Assert.ThrowsAny<ArgumentOutOfRangeException>(
+                    () => datePicker.BlackoutDates.Add(new CalendarDateRange(DateTime.Today, DateTime.Today.AddDays(10))));
+            }
+        }
+
+        private static TestServices Services => TestServices.MockThreadingInterface.With(
+            standardCursorFactory: Mock.Of<IStandardCursorFactory>());
+
+        private DatePicker CreateControl()
+        {
+            var datePicker =
+                new DatePicker
+                {
+                    Template = CreateTemplate()
+                };
+
+            datePicker.ApplyTemplate();
+            return datePicker;
+        }
+
+        private IControlTemplate CreateTemplate()
+        {
+            return new FuncControlTemplate<DatePicker>(control =>
+            {
+                var textBox = 
+                    new TextBox
+                    {
+                        Name = "PART_TextBox"
+                    };
+                var button =
+                    new Button
+                    {
+                        Name = "PART_Button"
+                    };
+                var calendar =
+                    new Calendar
+                    {
+                        Name = "PART_Calendar"
+                    };
+                var popup =
+                    new Popup
+                    {
+                        Name = "PART_Popup"
+                    };
+
+                var panel = new Panel();
+                panel.Children.Add(textBox);
+                panel.Children.Add(button);
+                panel.Children.Add(popup);
+                panel.Children.Add(calendar);
+
+                return panel;
+            });
+
+        }
+    }
+}

From 3a42ef34633a52e899c56ee8878013a0ca413a99 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Tue, 13 Feb 2018 09:19:58 +0300
Subject: [PATCH 323/482] Fixed designer focus issue

---
 src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
index c4febff434..f5893ae69a 100644
--- a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
+++ b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
@@ -140,6 +140,7 @@ namespace Avalonia.DesignerSupport.Remote
                 BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic);
             if (builderMethod == null)
                 throw Die($"{entryPoint.DeclaringType.FullName} doesn't have a method named {BuilderMethodName}");
+            Design.IsDesignMode = true;
             Log($"Obtaining AppBuilder instance from {builderMethod.DeclaringType.FullName}.{builderMethod.Name}");
             var appBuilder = builderMethod.Invoke(null, null);
             Log($"Initializing application in design mode");

From fafcecf0f38d0c2cb30457fe0e951f2ba4ad7d7e Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 13 Feb 2018 15:15:16 +0000
Subject: [PATCH 324/482] system dialog combines the initialDirectory and
 InitialFileName on Gtk.

---
 src/Gtk/Avalonia.Gtk3/SystemDialogs.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Gtk/Avalonia.Gtk3/SystemDialogs.cs b/src/Gtk/Avalonia.Gtk3/SystemDialogs.cs
index fb8af02d5d..cff376ad1f 100644
--- a/src/Gtk/Avalonia.Gtk3/SystemDialogs.cs
+++ b/src/Gtk/Avalonia.Gtk3/SystemDialogs.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -79,9 +80,11 @@ namespace Avalonia.Gtk3
 
         public Task<string[]> ShowFileDialogAsync(FileDialog dialog, IWindowImpl parent)
         {
-            return ShowDialog(dialog.Title, ((WindowBaseImpl) parent)?.GtkWidget,
+            return ShowDialog(dialog.Title, ((WindowBaseImpl)parent)?.GtkWidget,
                 dialog is OpenFileDialog ? GtkFileChooserAction.Open : GtkFileChooserAction.Save,
-                (dialog as OpenFileDialog)?.AllowMultiple ?? false, dialog.InitialFileName);
+                (dialog as OpenFileDialog)?.AllowMultiple ?? false,
+                Path.Combine(string.IsNullOrEmpty(dialog.InitialDirectory) ? "" : dialog.InitialDirectory,
+                string.IsNullOrEmpty(dialog.InitialFileName) ? "" : dialog.InitialFileName));
         }
 
         public async Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, IWindowImpl parent)

From b7de65f1aaebde38087150674cb0a80b46836ed8 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 13 Feb 2018 20:39:08 +0100
Subject: [PATCH 325/482] Fix TextBox text truncation.

Correctly set the value of the `TextBox`'s `HorizontalScrollBarVisibility` so that the text is not truncated.

Fixes #1354
---
 src/Avalonia.Controls/TextBox.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 7366ff3f91..158157766e 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -98,9 +98,19 @@ namespace Avalonia.Controls
             var horizontalScrollBarVisibility = Observable.CombineLatest(
                 this.GetObservable(AcceptsReturnProperty),
                 this.GetObservable(TextWrappingProperty),
-                (acceptsReturn, wrapping) => acceptsReturn && wrapping == TextWrapping.NoWrap ?
-                    ScrollBarVisibility.Auto : ScrollBarVisibility.Disabled);
-
+                (acceptsReturn, wrapping) =>
+                {
+                    if (acceptsReturn)
+                    {
+                        return wrapping == TextWrapping.NoWrap ?
+                            ScrollBarVisibility.Visible :
+                            ScrollBarVisibility.Disabled;
+                    }
+                    else
+                    {
+                        return ScrollBarVisibility.Hidden;
+                    }
+                });
             Bind(
                 ScrollViewer.HorizontalScrollBarVisibilityProperty,
                 horizontalScrollBarVisibility,

From e5800c17f1405bdfdcba082c573420ee5d248776 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 13 Feb 2018 20:44:16 +0100
Subject: [PATCH 326/482] Fix TextBlock click positioning.

When the click was outside the `TextPresenter`, it was not registering with the `TextBox` so the caret was being moved to the beginning.
---
 src/Avalonia.Controls/TextBox.cs | 49 +++++++++++++++-----------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 158157766e..e939ace66d 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -497,37 +497,34 @@ namespace Avalonia.Controls
 
         protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
-            if (e.Source == _presenter)
-            {
-                var point = e.GetPosition(_presenter);
-                var index = CaretIndex = _presenter.GetCaretIndex(point);
-                var text = Text;
+            var point = e.GetPosition(_presenter);
+            var index = CaretIndex = _presenter.GetCaretIndex(point);
+            var text = Text;
 
-                if (text != null)
+            if (text != null)
+            {
+                switch (e.ClickCount)
                 {
-                    switch (e.ClickCount)
-                    {
-                        case 1:
-                            SelectionStart = SelectionEnd = index;
-                            break;
-                        case 2:
-                            if (!StringUtils.IsStartOfWord(text, index))
-                            {
-                                SelectionStart = StringUtils.PreviousWord(text, index);
-                            }
+                    case 1:
+                        SelectionStart = SelectionEnd = index;
+                        break;
+                    case 2:
+                        if (!StringUtils.IsStartOfWord(text, index))
+                        {
+                            SelectionStart = StringUtils.PreviousWord(text, index);
+                        }
 
-                            SelectionEnd = StringUtils.NextWord(text, index);
-                            break;
-                        case 3:
-                            SelectionStart = 0;
-                            SelectionEnd = text.Length;
-                            break;
-                    }
+                        SelectionEnd = StringUtils.NextWord(text, index);
+                        break;
+                    case 3:
+                        SelectionStart = 0;
+                        SelectionEnd = text.Length;
+                        break;
                 }
-
-                e.Device.Capture(_presenter);
-                e.Handled = true;
             }
+
+            e.Device.Capture(_presenter);
+            e.Handled = true;
         }
 
         protected override void OnPointerMoved(PointerEventArgs e)

From 458d8bf76031a95b1f46cabee185aabf1153963c Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 14 Feb 2018 15:55:31 -0600
Subject: [PATCH 327/482] Don't dispose replaced visual nodes if they're
 replaced with themselves.

---
 src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
index 3cb7e53d21..427f819200 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
@@ -148,7 +148,10 @@ namespace Avalonia.Rendering.SceneGraph
             EnsureChildrenCreated();
             var old = _children[index];
             _children[index] = node;
-            old.Dispose();
+            if (node != old)
+            {
+                old.Dispose(); 
+            }
         }
 
         /// <summary>
@@ -329,7 +332,7 @@ namespace Avalonia.Rendering.SceneGraph
                 _drawOperationsCloned = false;
             }
         }
-
+        
         public void Dispose()
         {
             foreach (var child in Children)

From 92094473e3e08953475e5223364f27dac6bf3cfc Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 15 Feb 2018 22:00:10 +0100
Subject: [PATCH 328/482] Handle pointer down/up events in Thumb.

Fixes #1372.
---
 src/Avalonia.Controls/Primitives/Thumb.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Avalonia.Controls/Primitives/Thumb.cs b/src/Avalonia.Controls/Primitives/Thumb.cs
index da4dc63d1e..b0f9ab1f85 100644
--- a/src/Avalonia.Controls/Primitives/Thumb.cs
+++ b/src/Avalonia.Controls/Primitives/Thumb.cs
@@ -75,6 +75,7 @@ namespace Avalonia.Controls.Primitives
         protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
             e.Device.Capture(this);
+            e.Handled = true;
             _lastPoint = e.GetPosition(this);
 
             var ev = new VectorEventArgs
@@ -91,6 +92,7 @@ namespace Avalonia.Controls.Primitives
             if (_lastPoint.HasValue)
             {
                 e.Device.Capture(null);
+                e.Handled = true;
                 _lastPoint = null;
 
                 var ev = new VectorEventArgs

From 695c48382bda8aefb1e2871a3264ed44f823efc3 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 17 Feb 2018 15:26:59 +0100
Subject: [PATCH 329/482] Fix AllowUnsafeBlocks.

Was only enabled in debug build.
---
 src/Windows/Avalonia.Win32/Avalonia.Win32.csproj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
index 691f635f2c..e055f3c20f 100644
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>

From 41570cbe9c4f96f1c53ac568d824d3248004d76c Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 17 Feb 2018 15:47:28 +0100
Subject: [PATCH 330/482] Updated cake package spec.

---
 packages.cake | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages.cake b/packages.cake
index bc290fce22..134340f459 100644
--- a/packages.cake
+++ b/packages.cake
@@ -376,8 +376,7 @@ public class Packages
                 },
                 Files = new []
                 {
-                    new NuSpecContent { Source = "Avalonia.Win32/bin/" + parameters.DirSuffix + "/Avalonia.Win32.dll", Target = "lib/net45" },
-                    new NuSpecContent { Source = "Avalonia.Win32.NetStandard/bin/" + parameters.DirSuffix + "/netstandard2.0/Avalonia.Win32.dll", Target = "lib/netstandard2.0" }
+                    new NuSpecContent { Source = "Avalonia.Win32/bin/" + parameters.DirSuffix + "/netstandard2.0/Avalonia.Win32.dll", Target = "lib/netstandard2.0" }
                 },
                 BasePath = context.Directory("./src/Windows"),
                 OutputDirectory = parameters.NugetRoot

From 53a73df9fc6c5f7199f4c8659155f0fd896a4854 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 18 Feb 2018 00:55:41 +0100
Subject: [PATCH 331/482] Updated version.

---
 src/Shared/SharedAssemblyInfo.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Shared/SharedAssemblyInfo.cs b/src/Shared/SharedAssemblyInfo.cs
index 548a46dde4..98047b4cc8 100644
--- a/src/Shared/SharedAssemblyInfo.cs
+++ b/src/Shared/SharedAssemblyInfo.cs
@@ -14,6 +14,6 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyTrademark("")]
 [assembly: NeutralResourcesLanguage("en")]
 
-[assembly: AssemblyVersion("0.5.2")]
-[assembly: AssemblyFileVersion("0.5.2")]
-[assembly: AssemblyInformationalVersion("0.5.2")]
+[assembly: AssemblyVersion("0.6.0")]
+[assembly: AssemblyFileVersion("0.6.0")]
+[assembly: AssemblyInformationalVersion("0.6.0")]

From c93335e6c88760d2055f9254d349bfb866b673f3 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sun, 18 Feb 2018 09:06:47 +0300
Subject: [PATCH 332/482] Removed NUGET_API_KEY from appveyor.yml

---
 appveyor.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 55e703d0d5..5fe05598af 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,8 +5,6 @@ configuration:
 environment:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
-  NUGET_API_KEY:
-    secure: Xv89dlP2MSBZKhl1nrWSxqcDgCXB0HRhOd4SWQ+jRJ7QoLxQel5mLTipXM++J3G5
   NUGET_API_URL: https://www.nuget.org/api/v2/package
   MYGET_API_KEY:
     secure: OtVfyN3ErqQrDTnWH2HDfJDlCiu/i4/X4wFmK3ZXXP7HmCiXYPSbTjMPwwdOxRaK

From 53ff0e178c169c4bf074803f96fa6431b2f5b8b3 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 18 Feb 2018 18:17:33 +0100
Subject: [PATCH 333/482] Added failing test for #1376

---
 .../TextBoxTests.cs                           | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
index b091f6826e..5ddc8e71e7 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
@@ -4,10 +4,12 @@
 using System;
 using System.Reactive.Linq;
 using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml.Data;
+using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.UnitTests;
 using Moq;
@@ -245,6 +247,28 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Theory]
+        [InlineData(new object[] { false, TextWrapping.NoWrap, ScrollBarVisibility.Hidden })]
+        [InlineData(new object[] { false, TextWrapping.Wrap, ScrollBarVisibility.Hidden })]
+        [InlineData(new object[] { true, TextWrapping.NoWrap, ScrollBarVisibility.Auto })]
+        [InlineData(new object[] { true, TextWrapping.Wrap, ScrollBarVisibility.Disabled })]
+        public void Has_Correct_Horizontal_ScrollBar_Visibility(
+            bool acceptsReturn,
+            TextWrapping wrapping,
+            ScrollBarVisibility expected)
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    AcceptsReturn = acceptsReturn,
+                    TextWrapping = wrapping,
+                };
+
+                Assert.Equal(expected, ScrollViewer.GetHorizontalScrollBarVisibility(target));
+            }
+        }
+
         private static TestServices Services => TestServices.MockThreadingInterface.With(
             standardCursorFactory: Mock.Of<IStandardCursorFactory>());
 

From 83f795480ba8b10431b925acd58854a1430eadec Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 18 Feb 2018 18:17:41 +0100
Subject: [PATCH 334/482] Fixed #1376

---
 src/Avalonia.Controls/TextBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index e939ace66d..3ec3d6ed5b 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -103,7 +103,7 @@ namespace Avalonia.Controls
                     if (acceptsReturn)
                     {
                         return wrapping == TextWrapping.NoWrap ?
-                            ScrollBarVisibility.Visible :
+                            ScrollBarVisibility.Auto :
                             ScrollBarVisibility.Disabled;
                     }
                     else

From 92d171f154b4537213ce2e073039cde1188de629 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 18 Feb 2018 12:51:49 -0600
Subject: [PATCH 335/482] VisualNodes are now owned by Scene objects, not by
 their parents. Add a Disposed member to make it easier to diagnose ownership
 bugs.

---
 .../Rendering/SceneGraph/IVisualNode.cs       |  2 ++
 .../Rendering/SceneGraph/Scene.cs             |  7 +++++-
 .../Rendering/SceneGraph/VisualNode.cs        | 22 ++++++++++---------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs
index 681f00799b..1668f592ec 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs
@@ -93,5 +93,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// to hit test children they must be hit tested manually.
         /// </remarks>
         bool HitTest(Point p);
+
+        bool Disposed { get; }
     }
 }
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
index 352d41d024..ffa0b0bcc5 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
@@ -98,7 +98,10 @@ namespace Avalonia.Rendering.SceneGraph
 
         public void Dispose()
         {
-            Root.Dispose();
+            foreach (var node in _index.Values)
+            {
+                node.Dispose();
+            }
         }
 
         /// <summary>
@@ -137,6 +140,8 @@ namespace Avalonia.Rendering.SceneGraph
             Contract.Requires<ArgumentNullException>(node != null);
 
             _index.Remove(node.Visual);
+
+            node.Dispose();
         }
 
         private VisualNode Clone(VisualNode source, IVisualNode parent, Dictionary<IVisual, IVisualNode> index)
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
index 427f819200..3ee689b6d2 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
@@ -113,6 +113,11 @@ namespace Avalonia.Rendering.SceneGraph
         /// <param name="child">The child to add.</param>
         public void AddChild(IVisualNode child)
         {
+            if (child.Disposed)
+            {
+                throw new ObjectDisposedException("Visual node for {node.Visual}");
+            }
+
             EnsureChildrenCreated();
             _children.Add(child);
         }
@@ -135,7 +140,6 @@ namespace Avalonia.Rendering.SceneGraph
         {
             EnsureChildrenCreated();
             _children.Remove(child);
-            child.Dispose();
         }
 
         /// <summary>
@@ -145,13 +149,13 @@ namespace Avalonia.Rendering.SceneGraph
         /// <param name="node">The child to add.</param>
         public void ReplaceChild(int index, IVisualNode node)
         {
-            EnsureChildrenCreated();
-            var old = _children[index];
-            _children[index] = node;
-            if (node != old)
+            if (node.Disposed)
             {
-                old.Dispose(); 
+                throw new ObjectDisposedException("Visual node for {node.Visual}");
             }
+
+            EnsureChildrenCreated();
+            _children[index] = node;
         }
 
         /// <summary>
@@ -332,13 +336,11 @@ namespace Avalonia.Rendering.SceneGraph
                 _drawOperationsCloned = false;
             }
         }
+
+        public bool Disposed { get; }
         
         public void Dispose()
         {
-            foreach (var child in Children)
-            {
-                child.Dispose();
-            }
             _drawOperationsRefCounter?.Dispose();
         }
 

From 915c4bba9dde573eb6b3870f2f2dfb67026a31ce Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 18 Feb 2018 20:48:53 +0100
Subject: [PATCH 336/482] Include Avalonia.Win32 in NetCoreOnly build.

---
 Avalonia.sln | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Avalonia.sln b/Avalonia.sln
index 6215ff61a1..5855edba5a 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.2024
+VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Base", "src\Avalonia.Base\Avalonia.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
 EndProject
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Layout", "src\Aval
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Windows", "Windows", "{B39A8919-9F95-48FE-AD7B-76E08B509888}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Win32", "src\Windows\Avalonia.Win32\Avalonia.Win32.csproj", "{811A76CF-1CF6-440F-963B-BBE31BD72A82}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Win32", "src\Windows\Avalonia.Win32\Avalonia.Win32.csproj", "{811A76CF-1CF6-440F-963B-BBE31BD72A82}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Direct2D1", "src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj", "{3E908F67-5543-4879-A1DC-08EACE79B3CD}"
 EndProject
@@ -362,6 +362,7 @@ Global
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
+		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Debug|x86.Build.0 = Debug|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|Any CPU.ActiveCfg = Release|Any CPU

From 320265139eccd16759f5cded2c99e91f6b4eb161 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 18 Feb 2018 21:11:45 +0100
Subject: [PATCH 337/482] Include Avalonia.Win32 in NetCoreOnly release build.

---
 Avalonia.sln | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Avalonia.sln b/Avalonia.sln
index 5855edba5a..88914fe188 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -372,6 +372,7 @@ Global
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
+		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|x86.ActiveCfg = Release|Any CPU
 		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|x86.Build.0 = Release|Any CPU
 		{3E908F67-5543-4879-A1DC-08EACE79B3CD}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU

From 559d389547eab8ab0548c915c22ad5105410dbe0 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 19 Feb 2018 16:09:20 +0300
Subject: [PATCH 338/482] Update readme.md

---
 readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index 906c3a4b5c..6f2d7e41c6 100644
--- a/readme.md
+++ b/readme.md
@@ -35,9 +35,9 @@ https://ci.appveyor.com/project/AvaloniaUI/Avalonia/branch/master/artifacts
 
 ## Documentation
 
-As mentioned above, Avalonia is still in alpha and as such there's not much documentation yet. You can take a look at the [getting started page](http://avaloniaui.net/tutorial/gettingstarted) for an overview of how to get started but probably the best thing to do for now is to already know a little bit about WPF/Silverlight/UWP/XAML and ask questions in our [Gitter room](https://gitter.im/AvaloniaUI/Avalonia).
+As mentioned above, Avalonia is still in alpha and as such there's not much documentation yet. You can take a look at the [getting started page](http://avaloniaui.net/guides/quickstart) for an overview of how to get started but probably the best thing to do for now is to already know a little bit about WPF/Silverlight/UWP/XAML and ask questions in our [Gitter room](https://gitter.im/AvaloniaUI/Avalonia).
 
-There's also a high-level [architecture document](http://avaloniaui.net/spec/architecture) that is currently a little bit out of date, and I've also started writing blog posts on Avalonia at http://grokys.github.io/.
+There's also a high-level [architecture document](http://avaloniaui.net/architecture/project-structure) that is currently a little bit out of date, and I've also started writing blog posts on Avalonia at http://grokys.github.io/.
 
 Contributions are always welcome!
 

From 91998ff678e8636f1810065c768c55e8c2f73f11 Mon Sep 17 00:00:00 2001
From: Andrey Kudashkin <neyromant@mail.ru>
Date: Mon, 19 Feb 2018 21:43:09 +0300
Subject: [PATCH 339/482] Update readme.md

Fidex broken links
---
 readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index 6f2d7e41c6..3253ce7138 100644
--- a/readme.md
+++ b/readme.md
@@ -43,8 +43,8 @@ Contributions are always welcome!
 
 ## Building and Using
 
-See the [build instructions here](http://avaloniaui.net/guidelines/build).
+See the [build instructions here](http://avaloniaui.net/contributing/build).
 
 ## Contributing
 
-Please read the [contribution guidelines](http://avaloniaui.net/guidelines/contributing) before submitting a pull request.
+Please read the [contribution guidelines](http://avaloniaui.net/contributing/contributing) before submitting a pull request.

From d716fa5e8e57d32503a1e2ad92db8981282e745a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Fri, 23 Feb 2018 11:06:46 +0100
Subject: [PATCH 340/482] We're in beta now.

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 3253ce7138..f074faa2c4 100644
--- a/readme.md
+++ b/readme.md
@@ -10,7 +10,7 @@
 
 Avalonia is a WPF-inspired cross-platform XAML-based UI framework providing a flexible styling system and supporting a wide range of OSs: Windows (.NET Framework, .NET Core), Linux (GTK), MacOS, Android and iOS.
 
-<b>Avalonia is now in alpha.</b> This means that framework is now at a stage where you can have a play and hopefully create simple applications. There's still a lot missing, and you *will* find bugs, and the API *will* change, but this represents the first time where we've made it somewhat easy to have a play and experiment with the framework.
+**Avalonia is currently in beta** which means that the framework is generally usable for writing applications, but there may be some bugs and breaking changes as we continue development.
 
 | Control catalog | Desktop platforms | Mobile platforms |
 |---|---|---|

From 3891cbf06da28f1df68ec160e86c82db2973f606 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 24 Feb 2018 00:55:39 +0100
Subject: [PATCH 341/482] Fixed spelling.

---
 tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
index 60d31145cf..e779652322 100644
--- a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
+++ b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
@@ -81,7 +81,7 @@ namespace Avalonia.Input.UnitTests
         }
 
         [Fact]
-        public void Next_Skips_Unfocasable_Siblings()
+        public void Next_Skips_Unfocusable_Siblings()
         {
             Button current;
             Button next;

From f8e2be8681f9fd6093d9dbcc56c146e4c0887789 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 24 Feb 2018 17:48:38 +0100
Subject: [PATCH 342/482] Use ItemTemplate in DropDown's ContentControl

Fixes #1386
---
 src/Avalonia.Themes.Default/DropDown.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Avalonia.Themes.Default/DropDown.xaml b/src/Avalonia.Themes.Default/DropDown.xaml
index 0e8b409cfd..139b2b3687 100644
--- a/src/Avalonia.Themes.Default/DropDown.xaml
+++ b/src/Avalonia.Themes.Default/DropDown.xaml
@@ -11,6 +11,7 @@
                 BorderThickness="{TemplateBinding BorderThickness}">
           <Grid ColumnDefinitions="*,Auto">
             <ContentControl Content="{TemplateBinding SelectionBoxItem}"
+                            ContentTemplate="{TemplateBinding ItemTemplate}"
                             Margin="{TemplateBinding Padding}"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"/>

From e7a552de86a5d55c532ab72de0dd4b94901842f2 Mon Sep 17 00:00:00 2001
From: ligfx <ligfx@users.noreply.github.com>
Date: Sat, 24 Feb 2018 11:57:40 -0800
Subject: [PATCH 343/482] MonoMac: don't write "NSEVENT" to console on every
 event

---
 src/OSX/Avalonia.MonoMac/PlatformThreadingInterface.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/OSX/Avalonia.MonoMac/PlatformThreadingInterface.cs b/src/OSX/Avalonia.MonoMac/PlatformThreadingInterface.cs
index 88189ba12c..b02a3192de 100644
--- a/src/OSX/Avalonia.MonoMac/PlatformThreadingInterface.cs
+++ b/src/OSX/Avalonia.MonoMac/PlatformThreadingInterface.cs
@@ -66,11 +66,10 @@ namespace Avalonia.MonoMac
                 var ev = app.NextEvent(NSEventMask.AnyEvent, NSDate.DistantFuture, NSRunLoop.NSDefaultRunLoopMode, true);
                 if (ev != null)
                 {
-                    Console.WriteLine("NSEVENT");
                     app.SendEvent(ev);
                     ev.Dispose();
                 }
             }
         }
     }
-}
\ No newline at end of file
+}

From 4f3ad17a0dad16ec212744ba82cae31edbeb4e4d Mon Sep 17 00:00:00 2001
From: Jess <jessachandler@gmail.com>
Date: Sun, 25 Feb 2018 15:51:06 +0900
Subject: [PATCH 344/482] updated README.md with Open Collective badges and
 icons

---
 readme.md | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/readme.md b/readme.md
index f074faa2c4..5a5d40c984 100644
--- a/readme.md
+++ b/readme.md
@@ -2,9 +2,9 @@
 
 # Avalonia
 
-| Gitter Chat | Windows Build Status | Linux/Mac Build Status |
-|---|---|---|
-| [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/AvaloniaUI/Avalonia?utm_campaign=pr-badge&utm_content=badge&utm_medium=badge&utm_source=badge) | [![Build status](https://ci.appveyor.com/api/projects/status/hubk3k0w9idyibfg/branch/master?svg=true)](https://ci.appveyor.com/project/AvaloniaUI/Avalonia/branch/master) | [![Build Status](https://travis-ci.org/AvaloniaUI/Avalonia.svg?branch=master)](https://travis-ci.org/AvaloniaUI/Avalonia) |
+| Gitter Chat | Windows Build Status | Linux/Mac Build Status | Open Collective |
+|---|---|---|---|
+|  [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/AvaloniaUI/Avalonia?utm_campaign=pr-badge&utm_content=badge&utm_medium=badge&utm_source=badge) | [![Build status](https://ci.appveyor.com/api/projects/status/hubk3k0w9idyibfg/branch/master?svg=true)](https://ci.appveyor.com/project/AvaloniaUI/Avalonia/branch/master) | [![Build Status](https://travis-ci.org/AvaloniaUI/Avalonia.svg?branch=master)](https://travis-ci.org/AvaloniaUI/Avalonia) | [![Backers on Open Collective](https://opencollective.com/Avalonia/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/Avalonia/sponsors/badge.svg)](#sponsors) |
 
 ## About
 
@@ -48,3 +48,33 @@ See the [build instructions here](http://avaloniaui.net/contributing/build).
 ## Contributing
 
 Please read the [contribution guidelines](http://avaloniaui.net/contributing/contributing) before submitting a pull request.
+
+### Contributors
+
+This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
+<a href="graphs/contributors"><img src="https://opencollective.com/Avalonia/contributors.svg?width=890&button=false" /></a>
+
+
+### Backers
+
+Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/Avalonia#backer)]
+
+<a href="https://opencollective.com/Avalonia#backers" target="_blank"><img src="https://opencollective.com/Avalonia/backers.svg?width=890"></a>
+
+
+### Sponsors
+
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/Avalonia#sponsor)]
+
+<a href="https://opencollective.com/Avalonia/sponsor/0/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/Avalonia/sponsor/1/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/Avalonia/sponsor/2/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/Avalonia/sponsor/3/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/Avalonia/sponsor/4/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/Avalonia/sponsor/5/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/Avalonia/sponsor/6/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/Avalonia/sponsor/7/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/Avalonia/sponsor/8/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/Avalonia/sponsor/9/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/9/avatar.svg"></a>
+
+

From a912f03167aec9b04f6197b684efc7c3ee5ceb65 Mon Sep 17 00:00:00 2001
From: lindexi <lindexi_gd@163.com>
Date: Wed, 27 Dec 2017 16:32:02 +0800
Subject: [PATCH 345/482] add UserControl comment

---
 src/Avalonia.Controls/UserControl.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Avalonia.Controls/UserControl.cs b/src/Avalonia.Controls/UserControl.cs
index 7c9e591e31..e063a65e09 100644
--- a/src/Avalonia.Controls/UserControl.cs
+++ b/src/Avalonia.Controls/UserControl.cs
@@ -6,6 +6,9 @@ using Avalonia.Styling;
 
 namespace Avalonia.Controls
 {
+    /// <summary>
+    /// Provides the base class for defining a new control that encapsulates related existing controls and provides its own logic.
+    /// </summary>
     public class UserControl : ContentControl, IStyleable, INameScope
     {
         private readonly NameScope _nameScope = new NameScope();
@@ -24,6 +27,7 @@ namespace Avalonia.Controls
             remove { _nameScope.Unregistered -= value; }
         }
 
+        /// <inheritdoc/>
         Type IStyleable.StyleKey => typeof(ContentControl);
 
         /// <inheritdoc/>

From 78fa1dc17a424da1a5cb5a43432130a92bda6627 Mon Sep 17 00:00:00 2001
From: lindexi <lindexi_gd@163.com>
Date: Wed, 27 Dec 2017 16:59:02 +0800
Subject: [PATCH 346/482] add LayoutTransformControl comment

---
 src/Avalonia.Controls/LayoutTransformControl.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Avalonia.Controls/LayoutTransformControl.cs b/src/Avalonia.Controls/LayoutTransformControl.cs
index ed7a50d9b0..87e3853643 100644
--- a/src/Avalonia.Controls/LayoutTransformControl.cs
+++ b/src/Avalonia.Controls/LayoutTransformControl.cs
@@ -15,6 +15,9 @@ using System.Reactive.Linq;
 
 namespace Avalonia.Controls
 {
+    /// <summary>
+    /// Control that implements support for transformations as if applied by LayoutTransform.
+    /// </summary>
     public class LayoutTransformControl : ContentControl
     {
         public static readonly AvaloniaProperty<Transform> LayoutTransformProperty =
@@ -26,6 +29,9 @@ namespace Avalonia.Controls
                 .AddClassHandler<LayoutTransformControl>(x => x.OnLayoutTransformChanged);
         }
 
+        /// <summary>
+        /// Gets or sets a graphics transformation that should apply to this element when layout is performed.
+        /// </summary>
         public Transform LayoutTransform
         {
             get { return GetValue(LayoutTransformProperty); }

From 487f3eb10ec6130c031581a53773f5c4211c2f37 Mon Sep 17 00:00:00 2001
From: lindexi <lindexi_gd@163.com>
Date: Sun, 25 Feb 2018 20:21:41 +0800
Subject: [PATCH 347/482] check action is null

If the user give the null to InvokeAsync, what is his intention
---
 src/Avalonia.Base/Threading/Dispatcher.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Avalonia.Base/Threading/Dispatcher.cs b/src/Avalonia.Base/Threading/Dispatcher.cs
index 7d29a4f969..cf7acb3e8a 100644
--- a/src/Avalonia.Base/Threading/Dispatcher.cs
+++ b/src/Avalonia.Base/Threading/Dispatcher.cs
@@ -81,12 +81,14 @@ namespace Avalonia.Threading
         /// <inheritdoc/>
         public Task InvokeAsync(Action action, DispatcherPriority priority = DispatcherPriority.Normal)
         {
+            Contract.Requires<ArgumentNullException>(action != null);
             return _jobRunner?.InvokeAsync(action, priority);
         }
 
         /// <inheritdoc/>
         public void Post(Action action, DispatcherPriority priority = DispatcherPriority.Normal)
         {
+            Contract.Requires<ArgumentNullException>(action != null);
             _jobRunner?.Post(action, priority);
         }
 

From f559f0b24057c8e75b2f5fffe029c2c674e7562a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 25 Feb 2018 22:11:56 +0100
Subject: [PATCH 348/482] Merge WinFormsWin32Platform in Win32Platform.

---
 src/Windows/Avalonia.Win32/Win32Platform.cs   | 38 ++++++++++++++-
 .../Avalonia.Win32/WinFormsWin32Platform.cs   | 47 -------------------
 2 files changed, 37 insertions(+), 48 deletions(-)
 delete mode 100644 src/Windows/Avalonia.Win32/WinFormsWin32Platform.cs

diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
index a490e59cb7..4e1ba618a8 100644
--- a/src/Windows/Avalonia.Win32/Win32Platform.cs
+++ b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -16,6 +16,7 @@ using Avalonia.Win32.Interop;
 using Avalonia.Controls;
 using Avalonia.Rendering;
 using Avalonia.Threading;
+using System.IO;
 #if NETSTANDARD
 using Win32Exception = Avalonia.Win32.NetStandard.AvaloniaWin32Exception;
 #else
@@ -40,7 +41,7 @@ namespace Avalonia
 
 namespace Avalonia.Win32
 {
-    partial class Win32Platform : IPlatformThreadingInterface, IPlatformSettings, IWindowingPlatform, IPlatformIconLoader
+    class Win32Platform : IPlatformThreadingInterface, IPlatformSettings, IWindowingPlatform, IPlatformIconLoader
     {
         private static readonly Win32Platform s_instance = new Win32Platform();
         private static uint _uiThread;
@@ -205,5 +206,40 @@ namespace Avalonia.Win32
         {
             return new PopupImpl();
         }
+
+        public IWindowIconImpl LoadIcon(string fileName)
+        {
+            using (var stream = File.OpenRead(fileName))
+            {
+                return CreateIconImpl(stream);
+            }
+        }
+
+        public IWindowIconImpl LoadIcon(Stream stream)
+        {
+            return CreateIconImpl(stream);
+        }
+
+        public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
+        {
+            using (var memoryStream = new MemoryStream())
+            {
+                bitmap.Save(memoryStream);
+                return new IconImpl(new System.Drawing.Bitmap(memoryStream));
+            }
+        }
+
+        private static IconImpl CreateIconImpl(Stream stream)
+        {
+            try
+            {
+                return new IconImpl(new System.Drawing.Icon(stream));
+            }
+            catch (ArgumentException)
+            {
+                return new IconImpl(new System.Drawing.Bitmap(stream));
+            }
+        }
+
     }
 }
diff --git a/src/Windows/Avalonia.Win32/WinFormsWin32Platform.cs b/src/Windows/Avalonia.Win32/WinFormsWin32Platform.cs
deleted file mode 100644
index ec666e1f37..0000000000
--- a/src/Windows/Avalonia.Win32/WinFormsWin32Platform.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia.Platform;
-
-namespace Avalonia.Win32
-{
-    partial class Win32Platform
-    {
-        public IWindowIconImpl LoadIcon(string fileName)
-        {
-            using (var stream = File.OpenRead(fileName))
-            {
-                return CreateImpl(stream);
-            }
-        }
-
-        public IWindowIconImpl LoadIcon(Stream stream)
-        {
-            return CreateImpl(stream);
-        }
-
-        public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
-        {
-            using (var memoryStream = new MemoryStream())
-            {
-                bitmap.Save(memoryStream);
-                return new IconImpl(new System.Drawing.Bitmap(memoryStream));
-            }
-        }
-
-        private static IconImpl CreateImpl(Stream stream)
-        {
-            try
-            {
-                return new IconImpl(new System.Drawing.Icon(stream));
-            }
-            catch (ArgumentException)
-            {
-                return new IconImpl(new System.Drawing.Bitmap(stream));
-            }
-        }
-    }
-}

From 604700e9e795130354d13b3af7dc421c58a9702e Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 26 Feb 2018 20:01:39 +0300
Subject: [PATCH 349/482] Fixed iOS

---
 build/Rx.props                                       | 1 -
 samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj | 5 ++---
 src/iOS/Avalonia.iOS/EmulatedFramebuffer.cs          | 9 +++++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/build/Rx.props b/build/Rx.props
index 323026f5e2..7078e31195 100644
--- a/build/Rx.props
+++ b/build/Rx.props
@@ -5,6 +5,5 @@
     <PackageReference Include="System.Reactive.Interfaces" Version="3.1.1" />
     <PackageReference Include="System.Reactive.Linq" Version="3.1.1" />
     <PackageReference Include="System.Reactive.PlatformServices" Version="3.1.1" />
-    <PackageReference Condition="$(TargetFramework.StartsWith('net4'))" Include="System.Reactive.Windows.Threading" Version="3.1.1" />
   </ItemGroup>
 </Project>
diff --git a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
index 77f38d3bd7..c1c5cdcaf7 100644
--- a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
+++ b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
@@ -170,15 +170,14 @@
       <Name>Avalonia.Themes.Default</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj">
-      <Project>{D2D3083-71DD-4CC9-8907-39A0D86FB322}</Project>
+      <Project>{7d2d3083-71dd-4cc9-8907-39a0d86fb322}</Project>
       <Name>Avalonia.Skia</Name>
-      <IsAppExtension>false</IsAppExtension>
-      <IsWatchApp>false</IsWatchApp>
     </ProjectReference>
     <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj">
       <Project>{d0a739b9-3c68-4ba6-a328-41606954b6bd}</Project>
       <Name>ControlCatalog</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="..\..\build\Sprache.props" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/EmulatedFramebuffer.cs b/src/iOS/Avalonia.iOS/EmulatedFramebuffer.cs
index 58cf6edd78..517b372ba4 100644
--- a/src/iOS/Avalonia.iOS/EmulatedFramebuffer.cs
+++ b/src/iOS/Avalonia.iOS/EmulatedFramebuffer.cs
@@ -16,11 +16,15 @@ namespace Avalonia.iOS
     /// </summary>
     class EmulatedFramebuffer : ILockedFramebuffer
     {
+        private nfloat _viewWidth;
+        private nfloat _viewHeight;
 
         public EmulatedFramebuffer(UIView view)
         {
             var factor = (int) UIScreen.MainScreen.Scale;
             var frame = view.Frame;
+            _viewWidth = frame.Width;
+            _viewHeight = frame.Height;
             Width = (int) frame.Width * factor;
             Height = (int) frame.Height * factor;
             RowBytes = Width * 4;
@@ -41,9 +45,9 @@ namespace Avalonia.iOS
             using (var context = UIGraphics.GetCurrentContext())
             {
                 // flip the image for CGContext.DrawImage
-                context.TranslateCTM(0, Height);
+                context.TranslateCTM(0, _viewHeight);
                 context.ScaleCTM(1, -1);
-                context.DrawImage(new CGRect(0, 0, Width, Height), image);
+                context.DrawImage(new CGRect(0, 0, _viewWidth, _viewHeight), image);
             }
             Marshal.FreeHGlobal(Address);
             Address = IntPtr.Zero;
@@ -57,3 +61,4 @@ namespace Avalonia.iOS
         public PixelFormat Format { get; }
     }
 }
+

From e5a3370acd47f4570d2ba0a2b472de1aa923938f Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Tue, 27 Feb 2018 00:01:50 +0300
Subject: [PATCH 350/482] Fixes #1405

---
 src/OSX/Avalonia.MonoMac/ClipboardImpl.cs   | 31 +++++++++++++++++++++
 src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 src/OSX/Avalonia.MonoMac/ClipboardImpl.cs

diff --git a/src/OSX/Avalonia.MonoMac/ClipboardImpl.cs b/src/OSX/Avalonia.MonoMac/ClipboardImpl.cs
new file mode 100644
index 0000000000..f7b98c0c1f
--- /dev/null
+++ b/src/OSX/Avalonia.MonoMac/ClipboardImpl.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Input.Platform;
+using MonoMac.AppKit;
+
+namespace Avalonia.MonoMac
+{
+    class ClipboardImpl : IClipboard
+    {
+        public Task<string> GetTextAsync()
+        {
+            return Task.FromResult(NSPasteboard.GeneralPasteboard.GetStringForType(NSPasteboard.NSStringType));
+        }
+
+        public Task SetTextAsync(string text)
+        {
+            NSPasteboard.GeneralPasteboard.ClearContents();
+            if (text != null)
+                NSPasteboard.GeneralPasteboard.SetStringForType(text, NSPasteboard.NSStringType);
+            return Task.CompletedTask;
+        }
+
+        public async Task ClearAsync()
+        {
+            NSPasteboard.GeneralPasteboard.ClearContents();
+        }
+    }
+}
+
diff --git a/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs b/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs
index a6b1f1d5b4..5907459459 100644
--- a/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs
+++ b/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs
@@ -3,6 +3,7 @@ using System.Threading;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using MonoMac.AppKit;
@@ -32,6 +33,7 @@ namespace Avalonia.MonoMac
                 .Bind<IPlatformSettings>().ToConstant(this)
                 .Bind<IWindowingPlatform>().ToConstant(this)
                 .Bind<ISystemDialogImpl>().ToSingleton<SystemDialogsImpl>()
+                .Bind<IClipboard>().ToSingleton<ClipboardImpl>()
                 .Bind<IRenderLoop>().ToConstant(s_renderLoop)
                 .Bind<IPlatformThreadingInterface>().ToConstant(PlatformThreadingInterface.Instance);
         }

From 20e7db8587460f20b3096db165e6555ccb91b58d Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Tue, 27 Feb 2018 00:08:23 +0300
Subject: [PATCH 351/482] Bump version so nightly builds will be treated as
 newer ones

---
 parameters.cake                  | 2 +-
 src/Shared/SharedAssemblyInfo.cs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/parameters.cake b/parameters.cake
index c727b3107f..e224cce151 100644
--- a/parameters.cake
+++ b/parameters.cake
@@ -97,7 +97,7 @@ public class Parameters
             else
             {
                 // Use AssemblyVersion with Build as version
-                Version += "-build" + context.EnvironmentVariable("APPVEYOR_BUILD_NUMBER") + "-alpha";
+                Version += "-build" + context.EnvironmentVariable("APPVEYOR_BUILD_NUMBER") + "-beta";
             }
         }
 
diff --git a/src/Shared/SharedAssemblyInfo.cs b/src/Shared/SharedAssemblyInfo.cs
index 98047b4cc8..44ebef4cd2 100644
--- a/src/Shared/SharedAssemblyInfo.cs
+++ b/src/Shared/SharedAssemblyInfo.cs
@@ -14,6 +14,6 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyTrademark("")]
 [assembly: NeutralResourcesLanguage("en")]
 
-[assembly: AssemblyVersion("0.6.0")]
-[assembly: AssemblyFileVersion("0.6.0")]
-[assembly: AssemblyInformationalVersion("0.6.0")]
+[assembly: AssemblyVersion("0.6.2")]
+[assembly: AssemblyFileVersion("0.6.2")]
+[assembly: AssemblyInformationalVersion("0.6.2")]

From 6e1c7e37a84270fed27ebf86c2ba38620969175e Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Tue, 27 Feb 2018 19:59:40 +0300
Subject: [PATCH 352/482] Fixed Styles preview substitute

---
 src/Avalonia.DesignerSupport/DesignWindowLoader.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.DesignerSupport/DesignWindowLoader.cs b/src/Avalonia.DesignerSupport/DesignWindowLoader.cs
index 9ad2a216b4..5235beee0f 100644
--- a/src/Avalonia.DesignerSupport/DesignWindowLoader.cs
+++ b/src/Avalonia.DesignerSupport/DesignWindowLoader.cs
@@ -54,7 +54,7 @@ namespace Avalonia.DesignerSupport
                             }
                         };
                 }
-                if (loaded is Application)
+                else if (loaded is Application)
                     control = new TextBlock {Text = "Application can't be previewed in design view"};
                 else
                     control = (Control) loaded;
@@ -73,4 +73,4 @@ namespace Avalonia.DesignerSupport
             return window;
         }
     }
-}
\ No newline at end of file
+}

From f94381acac60e9c00695175f623fcbab51096b23 Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Wed, 28 Feb 2018 15:41:13 -0500
Subject: [PATCH 353/482] Adds Methods Weakly Subscribe to CollectionChange

---
 .../Collections/AvaloniaListExtensions.cs     |  26 +++-
 .../NotifyCollectionChangedExtensions.cs      | 127 ++++++++++++++++++
 2 files changed, 148 insertions(+), 5 deletions(-)
 create mode 100644 src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs

diff --git a/src/Avalonia.Base/Collections/AvaloniaListExtensions.cs b/src/Avalonia.Base/Collections/AvaloniaListExtensions.cs
index 54cd132b95..b27b06a277 100644
--- a/src/Avalonia.Base/Collections/AvaloniaListExtensions.cs
+++ b/src/Avalonia.Base/Collections/AvaloniaListExtensions.cs
@@ -34,14 +34,18 @@ namespace Avalonia.Collections
         /// <param name="reset">
         /// An action called when the collection is reset.
         /// </param>
+        /// <param name="weakSubscription">
+        /// Indicates if a weak subscription should be used to track changes to the collection.
+        /// </param>
         /// <returns>A disposable used to terminate the subscription.</returns>
         public static IDisposable ForEachItem<T>(
             this IAvaloniaReadOnlyList<T> collection,
             Action<T> added,
             Action<T> removed,
-            Action reset)
+            Action reset,
+            bool weakSubscription = false)
         {
-            return collection.ForEachItem((_, i) => added(i), (_, i) => removed(i), reset);
+            return collection.ForEachItem((_, i) => added(i), (_, i) => removed(i), reset, weakSubscription);
         }
 
         /// <summary>
@@ -63,12 +67,16 @@ namespace Avalonia.Collections
         /// An action called when the collection is reset. This will be followed by calls to 
         /// <paramref name="added"/> for each item present in the collection after the reset.
         /// </param>
+        /// <param name="weakSubscription">
+        /// Indicates if a weak subscription should be used to track changes to the collection.
+        /// </param>
         /// <returns>A disposable used to terminate the subscription.</returns>
         public static IDisposable ForEachItem<T>(
             this IAvaloniaReadOnlyList<T> collection,
             Action<int, T> added,
             Action<int, T> removed,
-            Action reset)
+            Action reset,
+            bool weakSubscription = false)
         {
             void Add(int index, IList items)
             {
@@ -118,9 +126,17 @@ namespace Avalonia.Collections
             };
 
             Add(0, (IList)collection);
-            collection.CollectionChanged += handler;
 
-            return Disposable.Create(() => collection.CollectionChanged -= handler);
+            if (weakSubscription)
+            {
+                return collection.WeakSubscribe(handler);
+            }
+            else
+            {
+                collection.CollectionChanged += handler;
+
+                return Disposable.Create(() => collection.CollectionChanged -= handler);
+            }
         }
 
         public static IAvaloniaReadOnlyList<TDerived> CreateDerivedList<TSource, TDerived>(
diff --git a/src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs b/src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs
new file mode 100644
index 0000000000..d295cb91ce
--- /dev/null
+++ b/src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs
@@ -0,0 +1,127 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Reactive;
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
+using System.Reactive.Subjects;
+using Avalonia.Utilities;
+
+namespace Avalonia.Collections
+{
+    public static class NotifyCollectionChangedExtensions
+    {
+        /// <summary>
+        /// Gets a weak observable for the CollectionChanged event.
+        /// </summary>
+        /// <param name="collection">The collection.</param>
+        /// <returns>An observable.</returns>
+        public static IObservable<NotifyCollectionChangedEventArgs> GetWeakCollectionChangedObservable(
+            this INotifyCollectionChanged collection)
+        {
+            Contract.Requires<ArgumentNullException>(collection != null);
+
+            return new WeakCollectionChangedObservable(new WeakReference<INotifyCollectionChanged>(collection));
+        }
+
+        /// <summary>
+        /// Subcribes to the CollectionChanged event using a weak subscription.
+        /// </summary>
+        /// <param name="collection">The collection.</param>
+        /// <param name="handler">
+        /// An action called when the collection event is raised.
+        /// </param>
+        /// <returns>A disposable used to terminate the subscription.</returns>
+        public static IDisposable WeakSubscribe(
+            this INotifyCollectionChanged collection, 
+            NotifyCollectionChangedEventHandler handler)
+        {
+            Contract.Requires<ArgumentNullException>(collection != null);
+            Contract.Requires<ArgumentNullException>(handler != null);
+
+            return
+                collection.GetWeakCollectionChangedObservable()
+                          .Subscribe(e => handler.Invoke(collection, e));
+        }
+
+        /// <summary>
+        /// Subcribes to the CollectionChanged event using a weak subscription.
+        /// </summary>
+        /// <param name="collection">The collection.</param>
+        /// <param name="handler">
+        /// An action called when the collection event is raised.
+        /// </param>
+        /// <returns>A disposable used to terminate the subscription.</returns>
+        public static IDisposable WeakSubscribe(
+            this INotifyCollectionChanged collection,
+            Action<NotifyCollectionChangedEventArgs> handler)
+        {
+            Contract.Requires<ArgumentNullException>(collection != null);
+            Contract.Requires<ArgumentNullException>(handler != null);
+
+            return
+                collection.GetWeakCollectionChangedObservable()
+                          .Subscribe(handler);
+        }
+
+        private class WeakCollectionChangedObservable : ObservableBase<NotifyCollectionChangedEventArgs>,
+            IWeakSubscriber<NotifyCollectionChangedEventArgs>
+        {
+            private WeakReference<INotifyCollectionChanged> _sourceReference;
+            private readonly Subject<NotifyCollectionChangedEventArgs> _changed = new Subject<NotifyCollectionChangedEventArgs>();
+
+            private int _count;
+
+            public WeakCollectionChangedObservable(WeakReference<INotifyCollectionChanged> source)
+            {
+                _sourceReference = source;
+            }
+
+            public void OnEvent(object sender, NotifyCollectionChangedEventArgs e)
+            {
+                _changed.OnNext(e);
+            }
+
+            protected override IDisposable SubscribeCore(IObserver<NotifyCollectionChangedEventArgs> observer)
+            {
+                if (_sourceReference.TryGetTarget(out INotifyCollectionChanged instance))
+                {
+                    if (_count++ == 0)
+                    {
+                        WeakSubscriptionManager.Subscribe(
+                            instance,
+                            nameof(instance.CollectionChanged),
+                            this);
+                    }
+
+                    return Observable.Using(() => Disposable.Create(DecrementCount), _ => _changed)
+                        .Subscribe(observer);
+                }
+                else
+                {
+                    _changed.OnCompleted();
+                    observer.OnCompleted();
+                    return Disposable.Empty;
+                }
+            }
+
+            private void DecrementCount()
+            {
+                if (--_count == 0)
+                {
+                    if (_sourceReference.TryGetTarget(out INotifyCollectionChanged instance))
+                    {
+                        WeakSubscriptionManager.Unsubscribe(
+                            instance,
+                            nameof(instance.CollectionChanged),
+                            this);
+                    }
+                }
+            }
+        }
+    }
+}

From 6103bab8606a04588d4ff232250076e9a4f344d4 Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Wed, 28 Feb 2018 15:41:56 -0500
Subject: [PATCH 354/482] Altered ItemsControl to use Weak CollectionChange
 Subscription

---
 src/Avalonia.Controls/ItemsControl.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index 4366de1cd6..6a26e29187 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -1,6 +1,7 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -54,6 +55,7 @@ namespace Avalonia.Controls
 
         private IEnumerable _items = new AvaloniaList<object>();
         private IItemContainerGenerator _itemContainerGenerator;
+        private IDisposable _itemsCollectionChangedSubscription;
 
         /// <summary>
         /// Initializes static members of the <see cref="ItemsControl"/> class.
@@ -326,12 +328,8 @@ namespace Avalonia.Controls
         /// <param name="e">The event args.</param>
         protected virtual void ItemsChanged(AvaloniaPropertyChangedEventArgs e)
         {
-            var incc = e.OldValue as INotifyCollectionChanged;
-
-            if (incc != null)
-            {
-                incc.CollectionChanged -= ItemsCollectionChanged;
-            }
+            _itemsCollectionChangedSubscription?.Dispose();
+            _itemsCollectionChangedSubscription = null;
 
             var oldValue = e.OldValue as IEnumerable;
             var newValue = e.NewValue as IEnumerable;
@@ -428,7 +426,7 @@ namespace Avalonia.Controls
 
             if (incc != null)
             {
-                incc.CollectionChanged += ItemsCollectionChanged;
+                _itemsCollectionChangedSubscription = incc.WeakSubscribe(ItemsCollectionChanged);
             }
         }
 

From 5fecddef513878c8e335a3e61317b456ef076d36 Mon Sep 17 00:00:00 2001
From: Vinicius de Melo Rocha <vmrocha@gmail.com>
Date: Thu, 1 Mar 2018 08:18:16 -0300
Subject: [PATCH 355/482] Update README.md with new contributing link

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 5a5d40c984..eeee39dabe 100644
--- a/readme.md
+++ b/readme.md
@@ -51,7 +51,7 @@ Please read the [contribution guidelines](http://avaloniaui.net/contributing/con
 
 ### Contributors
 
-This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
+This project exists thanks to all the people who contribute. [[Contribute](http://avaloniaui.net/contributing/contributing)].
 <a href="graphs/contributors"><img src="https://opencollective.com/Avalonia/contributors.svg?width=890&button=false" /></a>
 
 

From f136eeccb115891b50676360b2c16850facf8d90 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 1 Mar 2018 23:15:00 +0100
Subject: [PATCH 356/482] Added failing test for #1408.

---
 .../Presenters/ScrollContentPresenterTests.cs | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs
index 3c8a692bfb..4501315c94 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs
@@ -223,6 +223,26 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.Equal(100, child.Bounds.Width);
         }
 
+        [Fact]
+        public void Extent_Should_Include_Content_Margin()
+        {
+            var target = new ScrollContentPresenter
+            {
+                Content = new Border
+                {
+                    Width = 100,
+                    Height = 100,
+                    Margin = new Thickness(5),
+                }
+            };
+
+            target.UpdateChild();
+            target.Measure(new Size(50, 50));
+            target.Arrange(new Rect(0, 0, 50, 50));
+
+            Assert.Equal(new Size(110, 110), target.Extent);
+        }
+
         [Fact]
         public void Extent_Width_Should_Be_Arrange_Width_When_CanScrollHorizontally_False()
         {

From 970363571b5080f3f78e576a8dcac104acebe7d5 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 1 Mar 2018 23:15:23 +0100
Subject: [PATCH 357/482] Include margin in Extent size.

Fixes #1408.
---
 src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
index a68979cfa1..8d0c6f16cb 100644
--- a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
@@ -224,7 +224,7 @@ namespace Avalonia.Controls.Presenters
                 CanVerticallyScroll ? Math.Max(Child.DesiredSize.Height, finalSize.Height) : finalSize.Height);
             ArrangeOverrideImpl(size, -Offset);
             Viewport = finalSize;
-            Extent = Child.Bounds.Size;
+            Extent = Child.Bounds.Size.Inflate(Child.Margin);
             return finalSize;
         }
 

From 7ba9d33b0e687e91960780fca45190747b7935ac Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 1 Mar 2018 23:16:11 +0100
Subject: [PATCH 358/482] Added extra test for Bounds/Margin.

And removed empty test.
---
 .../Presenters/ContentPresenterTests_Layout.cs   |  5 -----
 tests/Avalonia.Layout.UnitTests/ArrangeTests.cs  | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
index 450b85696e..2ab02a0418 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
@@ -185,10 +185,5 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
             Assert.Equal(new Rect(84, 0, 16, 16), content.Bounds);
         }
-
-        [Fact]
-        public void Padding_Is_Applied_To_TopLeft_Aligned_Content()
-        {
-        }
     }
 }
\ No newline at end of file
diff --git a/tests/Avalonia.Layout.UnitTests/ArrangeTests.cs b/tests/Avalonia.Layout.UnitTests/ArrangeTests.cs
index df4bb17522..7562b7eff3 100644
--- a/tests/Avalonia.Layout.UnitTests/ArrangeTests.cs
+++ b/tests/Avalonia.Layout.UnitTests/ArrangeTests.cs
@@ -8,6 +8,22 @@ namespace Avalonia.Layout.UnitTests
 {
     public class ArrangeTests
     {
+        [Fact]
+        public void Bounds_Should_Not_Include_Margin()
+        {
+            var target = new Decorator
+            {
+                Width = 100,
+                Height = 100,
+                Margin = new Thickness(5),
+            };
+
+            Assert.False(target.IsMeasureValid);
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(target.DesiredSize));
+            Assert.Equal(new Rect(5, 5, 100, 100), target.Bounds);
+        }
+
         [Fact]
         public void Margin_Should_Be_Subtracted_From_Arrange_FinalSize()
         {

From 27ab312be5b7e76efbba0d5245f29d4ee77bb5d7 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Thu, 1 Mar 2018 19:59:15 +0300
Subject: [PATCH 359/482] Fixed nuget deps

---
 build/System.Drawing.Common.props                | 5 +++++
 packages.cake                                    | 4 ++--
 src/OSX/Avalonia.MonoMac/Avalonia.MonoMac.csproj | 3 ---
 src/Windows/Avalonia.Win32/Avalonia.Win32.csproj | 6 ++----
 4 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 build/System.Drawing.Common.props

diff --git a/build/System.Drawing.Common.props b/build/System.Drawing.Common.props
new file mode 100644
index 0000000000..a568152bbd
--- /dev/null
+++ b/build/System.Drawing.Common.props
@@ -0,0 +1,5 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="System.Drawing.Common" Version="4.5.0-preview1-25914-04" />
+  </ItemGroup>
+</Project>
diff --git a/packages.cake b/packages.cake
index 134340f459..17411aef4c 100644
--- a/packages.cake
+++ b/packages.cake
@@ -370,10 +370,10 @@ public class Packages
             new NuGetPackSettings()
             {
                 Id = "Avalonia.Win32",
-                Dependencies = new []
+                Dependencies = new DependencyBuilder(this)
                 {
                     new NuSpecDependency() { Id = "Avalonia", Version = parameters.Version }
-                },
+                }.Deps(new string[]{null}, "System.Drawing.Common"),
                 Files = new []
                 {
                     new NuSpecContent { Source = "Avalonia.Win32/bin/" + parameters.DirSuffix + "/netstandard2.0/Avalonia.Win32.dll", Target = "lib/netstandard2.0" }
diff --git a/src/OSX/Avalonia.MonoMac/Avalonia.MonoMac.csproj b/src/OSX/Avalonia.MonoMac/Avalonia.MonoMac.csproj
index 3a279c05fb..5f6be91571 100644
--- a/src/OSX/Avalonia.MonoMac/Avalonia.MonoMac.csproj
+++ b/src/OSX/Avalonia.MonoMac/Avalonia.MonoMac.csproj
@@ -8,9 +8,6 @@
     <Compile Include="..\..\Shared\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />
     <Compile Include="..\..\Shared\WindowResizeDragHelper.cs" Link="WindowResizeDragHelper.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="MonoMac.NetStandard" Version="0.0.3" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
index e055f3c20f..5f26e4ad3e 100644
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@@ -13,7 +13,5 @@
     <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="4.5.0-preview1-25914-04" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\System.Drawing.Common.props" />
+</Project>

From edf6b12c4d7c9ba6844201f6c29f83b9ac9d4b1d Mon Sep 17 00:00:00 2001
From: Florian Sundermann <boombuler@Florians-MacBook-Pro.fritz.box>
Date: Sat, 3 Mar 2018 11:28:21 +0100
Subject: [PATCH 360/482] first bits of drag+drop support for osx

---
 src/Avalonia.Controls/DragDrop/DataFormats.cs | 15 ++++
 .../DragDrop/DragOperation.cs                 | 13 ++++
 src/Avalonia.Controls/DragDrop/IDragData.cs   | 15 ++++
 .../DragDrop/IDragDispatcher.cs               | 12 +++
 .../Avalonia.MonoMac/Avalonia.MonoMac.csproj  |  4 +-
 src/OSX/Avalonia.MonoMac/DraggingInfo.cs      | 63 +++++++++++++++
 src/OSX/Avalonia.MonoMac/TopLevelImpl.cs      | 76 +++++++++++++++++++
 7 files changed, 196 insertions(+), 2 deletions(-)
 create mode 100644 src/Avalonia.Controls/DragDrop/DataFormats.cs
 create mode 100644 src/Avalonia.Controls/DragDrop/DragOperation.cs
 create mode 100644 src/Avalonia.Controls/DragDrop/IDragData.cs
 create mode 100644 src/Avalonia.Controls/DragDrop/IDragDispatcher.cs
 create mode 100644 src/OSX/Avalonia.MonoMac/DraggingInfo.cs

diff --git a/src/Avalonia.Controls/DragDrop/DataFormats.cs b/src/Avalonia.Controls/DragDrop/DataFormats.cs
new file mode 100644
index 0000000000..f46651ed3b
--- /dev/null
+++ b/src/Avalonia.Controls/DragDrop/DataFormats.cs
@@ -0,0 +1,15 @@
+namespace Avalonia.Controls.DragDrop
+{
+    public static class DataFormats
+    {
+        /// <summary>
+        /// Dataformat for plaintext
+        /// </summary>
+        public static string Text = nameof(Text);
+
+        /// <summary>
+        /// Dataformat for one or more filenames
+        /// </summary>
+        public static string FileNames = nameof(FileNames);
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/DragDrop/DragOperation.cs b/src/Avalonia.Controls/DragDrop/DragOperation.cs
new file mode 100644
index 0000000000..ffc6f666f7
--- /dev/null
+++ b/src/Avalonia.Controls/DragDrop/DragOperation.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace Avalonia.Controls.DragDrop
+{
+    [Flags]
+    public enum DragOperation
+    {
+        None = 0,
+        Copy = 1,
+        Move = 2,
+        Link = 4,
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/DragDrop/IDragData.cs b/src/Avalonia.Controls/DragDrop/IDragData.cs
new file mode 100644
index 0000000000..b6dc53d32d
--- /dev/null
+++ b/src/Avalonia.Controls/DragDrop/IDragData.cs
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Controls.DragDrop
+{
+    public interface IDragData
+    {
+        IEnumerable<string> GetDataFormats();
+
+        bool Contains(string dataFormat);
+
+        string GetText();
+
+        IEnumerable<string> GetFileNames();
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/DragDrop/IDragDispatcher.cs b/src/Avalonia.Controls/DragDrop/IDragDispatcher.cs
new file mode 100644
index 0000000000..5c39635dd0
--- /dev/null
+++ b/src/Avalonia.Controls/DragDrop/IDragDispatcher.cs
@@ -0,0 +1,12 @@
+using Avalonia.Input;
+
+namespace Avalonia.Controls.DragDrop
+{
+    public interface IDragDispatcher
+    {
+        DragOperation DragEnter(IInputRoot inputRoot, Point point, IDragData data, DragOperation operation);
+        DragOperation DragOver(IInputRoot inputRoot, Point point, IDragData data, DragOperation operation);
+        void DragLeave(IInputRoot inputRoot);
+        DragOperation Drop(IInputRoot inputRoot, Point point, IDragData data, DragOperation operation);
+    }
+}
\ No newline at end of file
diff --git a/src/OSX/Avalonia.MonoMac/Avalonia.MonoMac.csproj b/src/OSX/Avalonia.MonoMac/Avalonia.MonoMac.csproj
index 5f6be91571..c31c131ea9 100644
--- a/src/OSX/Avalonia.MonoMac/Avalonia.MonoMac.csproj
+++ b/src/OSX/Avalonia.MonoMac/Avalonia.MonoMac.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
@@ -19,4 +19,4 @@
     <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
   </ItemGroup>
   <Import Project="..\..\..\build\MonoMac.props" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/OSX/Avalonia.MonoMac/DraggingInfo.cs b/src/OSX/Avalonia.MonoMac/DraggingInfo.cs
new file mode 100644
index 0000000000..3abcb8c68c
--- /dev/null
+++ b/src/OSX/Avalonia.MonoMac/DraggingInfo.cs
@@ -0,0 +1,63 @@
+using System.Collections.Generic;
+using Avalonia.Controls.DragDrop;
+using MonoMac.AppKit;
+
+namespace Avalonia.MonoMac
+{
+    class DraggingInfo : IDragData
+    {
+        private readonly NSDraggingInfo _info;
+
+        public DraggingInfo(NSDraggingInfo info)
+        {
+            _info = info;
+        }
+
+
+        internal static NSDragOperation ConvertDragOperation(DragOperation d)
+        {
+            NSDragOperation result = NSDragOperation.None;
+            if (d.HasFlag(DragOperation.Copy))
+                result |= NSDragOperation.Copy;
+            if (d.HasFlag(DragOperation.Link))
+                result |= NSDragOperation.Link;
+            if (d.HasFlag(DragOperation.Move))
+                result |= NSDragOperation.Move;
+            return result;
+        }
+        
+        internal static DragOperation ConvertDragOperation(NSDragOperation d)
+        {
+            DragOperation result = DragOperation.None;
+            if (d.HasFlag(NSDragOperation.Copy))
+                result |= DragOperation.Copy;
+            if (d.HasFlag(NSDragOperation.Link))
+                result |= DragOperation.Link;
+            if (d.HasFlag(NSDragOperation.Move))
+                result |= DragOperation.Move;
+            return result;
+        }
+
+        public Point Location => new Point(_info.DraggingLocation.X, _info.DraggingLocation.Y);
+        
+        public IEnumerable<string> GetDataFormats()
+        {
+            yield break;
+        }
+
+        public string GetText()
+        {
+            return null;
+        }
+
+        public IEnumerable<string> GetFileNames()
+        {
+            yield break;
+        }
+
+        public bool Contains(string dataFormat)
+        {
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
index 667ee12fa0..91e822f802 100644
--- a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
+++ b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Avalonia.Controls.DragDrop;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Platform;
@@ -36,6 +37,7 @@ namespace Avalonia.MonoMac
             bool _isLeftPressed, _isRightPressed, _isMiddlePressed;
             private readonly IMouseDevice _mouse;
             private readonly IKeyboardDevice _keyboard;
+            private readonly IDragDispatcher _dragDispatcher;
             private NSTrackingArea _area;
             private NSCursor _cursor;
             private bool _nonUiRedrawQueued;
@@ -52,6 +54,11 @@ namespace Avalonia.MonoMac
                 _tl = tl;
                 _mouse = AvaloniaLocator.Current.GetService<IMouseDevice>();
                 _keyboard = AvaloniaLocator.Current.GetService<IKeyboardDevice>();
+                _dragDispatcher = AvaloniaLocator.Current.GetService<IDragDispatcher>();
+                
+                RegisterForDraggedTypes(new string[] {
+                    "public.data" // register for any kind of data.
+                });
             }
 
             protected override void Dispose(bool disposing)
@@ -144,6 +151,75 @@ namespace Avalonia.MonoMac
                 UpdateCursor();
             }
 
+            public override NSDragOperation DraggingEntered(NSDraggingInfo sender)
+            {
+                IInputRoot root = _tl?.InputRoot;
+                if (root == null || _dragDispatcher == null)
+                    return NSDragOperation.None;
+
+                var dragOp = DraggingInfo.ConvertDragOperation(sender.DraggingSourceOperationMask);
+                DraggingInfo info = new DraggingInfo(sender);
+                var pt = TranslateLocalPoint(info.Location);
+                
+                dragOp = _dragDispatcher.DragEnter(root, pt, info, dragOp);
+                
+                return DraggingInfo.ConvertDragOperation(dragOp);
+            }
+
+            public override NSDragOperation DraggingUpdated(NSDraggingInfo sender)
+            {
+                IInputRoot root = _tl?.InputRoot;
+                if (root == null || _dragDispatcher == null)
+                    return NSDragOperation.None;
+
+                var dragOp = DraggingInfo.ConvertDragOperation(sender.DraggingSourceOperationMask);
+                DraggingInfo info = new DraggingInfo(sender);
+                var pt = TranslateLocalPoint(info.Location);
+                
+                dragOp = _dragDispatcher.DragOver(root, pt, info, dragOp);
+                
+                return DraggingInfo.ConvertDragOperation(dragOp);
+            }
+
+            public override void DraggingExited(NSDraggingInfo sender)
+            {
+                IInputRoot root = _tl?.InputRoot;
+                if (root == null || _dragDispatcher == null)
+                    return;
+                _dragDispatcher.DragLeave(root);
+            }
+
+            public override bool PrepareForDragOperation(NSDraggingInfo sender)
+            {
+                IInputRoot root = _tl?.InputRoot;
+                if (root == null || _dragDispatcher == null)
+                    return false;
+
+                var dragOp = DraggingInfo.ConvertDragOperation(sender.DraggingSourceOperationMask);
+                DraggingInfo info = new DraggingInfo(sender);
+                var pt = TranslateLocalPoint(info.Location);
+                
+                dragOp = _dragDispatcher.DragOver(root, pt, info, dragOp);
+                
+                return DraggingInfo.ConvertDragOperation(dragOp) != DragOperation.None;
+            }
+
+            public override bool PerformDragOperation(NSDraggingInfo sender)
+            {
+                IInputRoot root = _tl?.InputRoot;
+                if (root == null || _dragDispatcher == null)
+                    return false;
+
+                var dragOp = DraggingInfo.ConvertDragOperation(sender.DraggingSourceOperationMask);
+                DraggingInfo info = new DraggingInfo(sender);
+                var pt = TranslateLocalPoint(info.Location);
+                
+                dragOp = _dragDispatcher.Drop(root, pt, info, dragOp);
+                
+                return DraggingInfo.ConvertDragOperation(dragOp) != DragOperation.None;
+            }
+            
+
             public override void SetFrameSize(CGSize newSize)
             {
                 lock (SyncRoot)

From 9ae9f6d2218de3bbde789fb044f22b773b31177d Mon Sep 17 00:00:00 2001
From: Florian Sundermann <boombuler@Florians-MacBook-Pro.fritz.box>
Date: Sat, 3 Mar 2018 12:40:06 +0100
Subject: [PATCH 361/482] raise routed events on drag and drop

---
 src/Avalonia.Controls/Application.cs          |  4 +-
 .../DragDrop/DefaultDragDispatcher.cs         | 90 +++++++++++++++++++
 src/Avalonia.Controls/DragDrop/DragDrop.cs    | 24 +++++
 .../DragDrop/DragEventArgs.cs                 | 18 ++++
 .../DragDrop/IDragDispatcher.cs               | 11 ++-
 .../Properties/AssemblyInfo.cs                |  1 +
 src/OSX/Avalonia.MonoMac/TopLevelImpl.cs      |  4 +-
 7 files changed, 145 insertions(+), 7 deletions(-)
 create mode 100644 src/Avalonia.Controls/DragDrop/DefaultDragDispatcher.cs
 create mode 100644 src/Avalonia.Controls/DragDrop/DragDrop.cs
 create mode 100644 src/Avalonia.Controls/DragDrop/DragEventArgs.cs

diff --git a/src/Avalonia.Controls/Application.cs b/src/Avalonia.Controls/Application.cs
index 06c1a8b4cc..63b17530ff 100644
--- a/src/Avalonia.Controls/Application.cs
+++ b/src/Avalonia.Controls/Application.cs
@@ -12,6 +12,7 @@ using Avalonia.Rendering;
 using Avalonia.Styling;
 using Avalonia.Threading;
 using System.Reactive.Concurrency;
+using Avalonia.Controls.DragDrop;
 
 namespace Avalonia
 {
@@ -234,7 +235,8 @@ namespace Avalonia
                 .Bind<IStyler>().ToConstant(_styler)
                 .Bind<ILayoutManager>().ToSingleton<LayoutManager>()
                 .Bind<IApplicationLifecycle>().ToConstant(this)
-                .Bind<IScheduler>().ToConstant(AvaloniaScheduler.Instance);
+                .Bind<IScheduler>().ToConstant(AvaloniaScheduler.Instance)
+                .Bind<IDragDispatcher>().ToConstant(DefaultDragDispatcher.Instance);
         }
     }
 }
diff --git a/src/Avalonia.Controls/DragDrop/DefaultDragDispatcher.cs b/src/Avalonia.Controls/DragDrop/DefaultDragDispatcher.cs
new file mode 100644
index 0000000000..2ce5a32dc5
--- /dev/null
+++ b/src/Avalonia.Controls/DragDrop/DefaultDragDispatcher.cs
@@ -0,0 +1,90 @@
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+using System.Linq;
+
+namespace Avalonia.Controls.DragDrop
+{
+    class DefaultDragDispatcher : IDragDispatcher
+    {
+        public static readonly DefaultDragDispatcher Instance = new DefaultDragDispatcher();
+
+        private Interactive _lastTarget = null;
+        
+        private DefaultDragDispatcher()
+        {   
+        }
+
+        private Interactive GetTarget(IInputElement root, Point local)
+        {
+            var target = root.InputHitTest(local)?.GetSelfAndVisualAncestors()?.OfType<Interactive>()?.FirstOrDefault();
+            if (target != null && DragDrop.GetAcceptDrag(target))
+                return target;
+            return null;
+        }
+        
+        private DragOperation RaiseDragEvent(Interactive target, RoutedEvent<DragEventArgs> routedEvent, DragOperation operation, IDragData data)
+        {
+            if (target == null)
+                return DragOperation.None;
+            var args = new DragEventArgs(routedEvent, data)
+            {
+                RoutedEvent = routedEvent,
+                DragOperation = operation
+            };
+            target.RaiseEvent(args);
+            return args.DragOperation;
+        }
+        
+        public DragOperation DragEnter(IInputElement inputRoot, Point point, IDragData data, DragOperation operation)
+        {
+            _lastTarget = GetTarget(inputRoot, point);
+            return RaiseDragEvent(_lastTarget, DragDrop.DragEnterEvent, operation, data);
+        }
+
+        public DragOperation DragOver(IInputElement inputRoot, Point point, IDragData data, DragOperation operation)
+        {
+            var target = GetTarget(inputRoot, point);
+
+            if (target == _lastTarget)
+                return RaiseDragEvent(target, DragDrop.DragOverEvent, operation, data);
+            
+            try
+            {
+                if (_lastTarget != null)
+                    _lastTarget.RaiseEvent(new RoutedEventArgs(DragDrop.DragLeaveEvent));
+                return RaiseDragEvent(target, DragDrop.DragEnterEvent, operation, data);
+            }
+            finally
+            {
+                _lastTarget = target;
+            }            
+        }
+
+        public void DragLeave(IInputElement inputRoot)
+        {
+            if (_lastTarget == null)
+                return;
+            try
+            {
+                _lastTarget.RaiseEvent(new RoutedEventArgs(DragDrop.DragLeaveEvent));
+            }
+            finally 
+            {
+                _lastTarget = null;
+            }
+        }
+
+        public DragOperation Drop(IInputElement inputRoot, Point point, IDragData data, DragOperation operation)
+        {
+            try
+            {
+                return RaiseDragEvent(_lastTarget, DragDrop.DropEvent, operation, data);
+            }
+            finally 
+            {
+                _lastTarget = null;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/DragDrop/DragDrop.cs b/src/Avalonia.Controls/DragDrop/DragDrop.cs
new file mode 100644
index 0000000000..3645409a5a
--- /dev/null
+++ b/src/Avalonia.Controls/DragDrop/DragDrop.cs
@@ -0,0 +1,24 @@
+using Avalonia.Interactivity;
+
+namespace Avalonia.Controls.DragDrop
+{
+    public sealed class DragDrop : AvaloniaObject
+    {
+        public static RoutedEvent<DragEventArgs> DragEnterEvent = RoutedEvent.Register<DragEventArgs>("DragEnter", RoutingStrategies.Bubble, typeof(DragDrop));
+        public static RoutedEvent<RoutedEventArgs> DragLeaveEvent = RoutedEvent.Register<RoutedEventArgs>("DragLeave", RoutingStrategies.Bubble, typeof(DragDrop));
+        public static RoutedEvent<DragEventArgs> DragOverEvent = RoutedEvent.Register<DragEventArgs>("DragOver", RoutingStrategies.Bubble, typeof(DragDrop));
+        public static RoutedEvent<DragEventArgs> DropEvent = RoutedEvent.Register<DragEventArgs>("Drop", RoutingStrategies.Bubble, typeof(DragDrop));
+
+        public static AvaloniaProperty<bool> AcceptDragProperty = AvaloniaProperty.RegisterAttached<Interactive, bool>("AcceptDrag", typeof(DragDrop), inherits: true);
+
+        public static bool GetAcceptDrag(Interactive interactive)
+        {
+            return interactive.GetValue(AcceptDragProperty);
+        }
+        
+        public static void SetAcceptDrag(Interactive interactive, bool value)
+        {
+            interactive.SetValue(AcceptDragProperty, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/DragDrop/DragEventArgs.cs b/src/Avalonia.Controls/DragDrop/DragEventArgs.cs
new file mode 100644
index 0000000000..e8bd2528c7
--- /dev/null
+++ b/src/Avalonia.Controls/DragDrop/DragEventArgs.cs
@@ -0,0 +1,18 @@
+using Avalonia.Interactivity;
+
+namespace Avalonia.Controls.DragDrop
+{
+    public class DragEventArgs : RoutedEventArgs
+    {
+        public DragOperation DragOperation { get; set; }
+
+        public IDragData Data { get; private set; }
+
+        public DragEventArgs(RoutedEvent<DragEventArgs> routedEvent, IDragData data)
+            : base(routedEvent)
+        {
+            this.Data = data;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/DragDrop/IDragDispatcher.cs b/src/Avalonia.Controls/DragDrop/IDragDispatcher.cs
index 5c39635dd0..05a211ff76 100644
--- a/src/Avalonia.Controls/DragDrop/IDragDispatcher.cs
+++ b/src/Avalonia.Controls/DragDrop/IDragDispatcher.cs
@@ -2,11 +2,14 @@
 
 namespace Avalonia.Controls.DragDrop
 {
+    /// <summary>
+    /// Dispatches Drag+Drop events to the correct visual targets, based on the input root and the drag location.
+    /// </summary>
     public interface IDragDispatcher
     {
-        DragOperation DragEnter(IInputRoot inputRoot, Point point, IDragData data, DragOperation operation);
-        DragOperation DragOver(IInputRoot inputRoot, Point point, IDragData data, DragOperation operation);
-        void DragLeave(IInputRoot inputRoot);
-        DragOperation Drop(IInputRoot inputRoot, Point point, IDragData data, DragOperation operation);
+        DragOperation DragEnter(IInputElement inputRoot, Point point, IDragData data, DragOperation operation);
+        DragOperation DragOver(IInputElement inputRoot, Point point, IDragData data, DragOperation operation);
+        void DragLeave(IInputElement inputRoot);
+        DragOperation Drop(IInputElement inputRoot, Point point, IDragData data, DragOperation operation);
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Controls/Properties/AssemblyInfo.cs b/src/Avalonia.Controls/Properties/AssemblyInfo.cs
index ae8c88f7e8..b0877e0fb7 100644
--- a/src/Avalonia.Controls/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Controls/Properties/AssemblyInfo.cs
@@ -11,6 +11,7 @@ using Avalonia.Metadata;
 
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.DragDrop")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Embedding")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Presenters")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Primitives")]
diff --git a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
index 91e822f802..711f6d2787 100644
--- a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
+++ b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
@@ -201,7 +201,7 @@ namespace Avalonia.MonoMac
                 
                 dragOp = _dragDispatcher.DragOver(root, pt, info, dragOp);
                 
-                return DraggingInfo.ConvertDragOperation(dragOp) != DragOperation.None;
+                return dragOp != DragOperation.None;
             }
 
             public override bool PerformDragOperation(NSDraggingInfo sender)
@@ -216,7 +216,7 @@ namespace Avalonia.MonoMac
                 
                 dragOp = _dragDispatcher.Drop(root, pt, info, dragOp);
                 
-                return DraggingInfo.ConvertDragOperation(dragOp) != DragOperation.None;
+                return dragOp != DragOperation.None;
             }
             
 

From a6e8dc0ffc79d00cb635109d6c3d70b6d105fa49 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@googlemail.com>
Date: Sat, 3 Mar 2018 13:48:24 +0100
Subject: [PATCH 362/482] implemented IDragData for OSX

---
 src/OSX/Avalonia.MonoMac/DraggingInfo.cs | 30 +++++++++++++++++++-----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/OSX/Avalonia.MonoMac/DraggingInfo.cs b/src/OSX/Avalonia.MonoMac/DraggingInfo.cs
index 3abcb8c68c..8164470548 100644
--- a/src/OSX/Avalonia.MonoMac/DraggingInfo.cs
+++ b/src/OSX/Avalonia.MonoMac/DraggingInfo.cs
@@ -1,11 +1,14 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using Avalonia.Controls.DragDrop;
 using MonoMac.AppKit;
+using MonoMac.Foundation;
 
 namespace Avalonia.MonoMac
 {
     class DraggingInfo : IDragData
-    {
+    { 
         private readonly NSDraggingInfo _info;
 
         public DraggingInfo(NSDraggingInfo info)
@@ -42,22 +45,37 @@ namespace Avalonia.MonoMac
         
         public IEnumerable<string> GetDataFormats()
         {
-            yield break;
+            return _info.DraggingPasteboard.Types.Select(NSTypeToWellknownType);
+        }
+
+        private string NSTypeToWellknownType(string type)
+        {
+            if (type == NSPasteboard.NSStringType)
+                return DataFormats.Text;
+            if (type == NSPasteboard.NSFilenamesType)
+                return DataFormats.FileNames;
+            return type;
         }
 
         public string GetText()
         {
-            return null;
+            return _info.DraggingPasteboard.GetStringForType(NSPasteboard.NSStringType);
         }
 
         public IEnumerable<string> GetFileNames()
         {
-            yield break;
+            using(var fileNames = (NSArray)_info.DraggingPasteboard.GetPropertyListForType(NSPasteboard.NSFilenamesType))
+            {
+                if (fileNames != null)
+                    return NSArray.StringArrayFromHandle(fileNames.Handle);
+            }
+
+            return Enumerable.Empty<string>();
         }
 
         public bool Contains(string dataFormat)
         {
-            return false;
+            return GetDataFormats().Any(f => f == dataFormat);
         }
     }
 }
\ No newline at end of file

From 1647d95aa6a192dc6978fe264d0b6422a83ba632 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@googlemail.com>
Date: Sat, 3 Mar 2018 16:17:45 +0100
Subject: [PATCH 363/482] Initial Drag+Drop support for windows

---
 .../Avalonia.Win32/ClipboardFormats.cs        |  80 ++++++++++
 .../Interop/UnmanagedMethods.cs               |  71 ++++++++-
 src/Windows/Avalonia.Win32/OleContext.cs      |  47 ++++++
 src/Windows/Avalonia.Win32/OleDataObject.cs   | 141 ++++++++++++++++++
 src/Windows/Avalonia.Win32/OleDropTarget.cs   | 131 ++++++++++++++++
 src/Windows/Avalonia.Win32/WindowImpl.cs      |  10 ++
 6 files changed, 479 insertions(+), 1 deletion(-)
 create mode 100644 src/Windows/Avalonia.Win32/ClipboardFormats.cs
 create mode 100644 src/Windows/Avalonia.Win32/OleContext.cs
 create mode 100644 src/Windows/Avalonia.Win32/OleDataObject.cs
 create mode 100644 src/Windows/Avalonia.Win32/OleDropTarget.cs

diff --git a/src/Windows/Avalonia.Win32/ClipboardFormats.cs b/src/Windows/Avalonia.Win32/ClipboardFormats.cs
new file mode 100644
index 0000000000..254facf81a
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/ClipboardFormats.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using Avalonia.Controls.DragDrop;
+using Avalonia.Win32.Interop;
+
+namespace Avalonia.Win32
+{   
+    static class ClipboardFormats
+    {
+        class ClipboardFormat
+        {
+            public short Format { get; private set; }
+            public string Name { get; private set; }
+
+            public ClipboardFormat(string name, short format)
+            {
+                Format = format;
+                Name = name;
+            }
+        }
+
+        private static readonly List<ClipboardFormat> FormatList = new List<ClipboardFormat>()
+        {
+            new ClipboardFormat(DataFormats.Text, (short)UnmanagedMethods.ClipboardFormat.CF_UNICODETEXT),
+            new ClipboardFormat(DataFormats.FileNames, (short)UnmanagedMethods.ClipboardFormat.CF_HDROP),
+        };
+
+
+        private static string QueryFormatName(short format)
+        {
+            int len = UnmanagedMethods.GetClipboardFormatName(format, null, 0);
+            if (len > 0)
+            {
+                StringBuilder sb = new StringBuilder(len);
+                if (UnmanagedMethods.GetClipboardFormatName(format, sb, len) <= len)
+                    return sb.ToString();
+            }
+            return null;
+        }
+
+        public static string GetFormat(short format)
+        {
+            lock (FormatList)
+            {
+                var pd = FormatList.FirstOrDefault(f => f.Format == format);
+                if (pd == null)
+                {
+                    string name = QueryFormatName(format);
+                    if (string.IsNullOrEmpty(name))
+                        name = string.Format("Unknown_Format_{0}", format);
+                    pd = new ClipboardFormat(name, format);
+                    FormatList.Add(pd);
+                }
+                return pd.Name;
+            }
+        }
+
+        public static short GetFormat(string format)
+        {
+            lock (FormatList)
+            {
+                var pd = FormatList.FirstOrDefault(f => StringComparer.OrdinalIgnoreCase.Equals(f.Name, format));
+                if (pd == null)
+                {
+                    int id = UnmanagedMethods.RegisterClipboardFormat(format);
+                    if (id == 0)
+                        throw new Win32Exception();
+                    pd = new ClipboardFormat(format, (short)id);
+                    FormatList.Add(pd);
+                }
+                return pd.Format;
+            }
+        }
+        
+
+    }
+}
\ No newline at end of file
diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
index f13dd3272c..dada2eb7e6 100644
--- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
+++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -5,6 +5,7 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.ComTypes;
 using System.Text;
 
 // ReSharper disable InconsistentNaming
@@ -951,6 +952,28 @@ namespace Avalonia.Win32.Interop
         [DllImport("msvcrt.dll", EntryPoint="memcpy", SetLastError = false, CallingConvention=CallingConvention.Cdecl)]
         public static extern IntPtr CopyMemory(IntPtr dest, IntPtr src, UIntPtr count); 
         
+        [DllImport("ole32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+        public static extern HRESULT RegisterDragDrop(IntPtr hwnd, IDropTarget target);
+        
+        [DllImport("ole32.dll", EntryPoint = "OleInitialize")]
+        public static extern HRESULT OleInitialize(IntPtr val);
+
+        [DllImport("ole32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+        internal static extern void ReleaseStgMedium(ref STGMEDIUM medium);
+
+        [DllImport("user32.dll", BestFitMapping = false, CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern int GetClipboardFormatName(int format, StringBuilder lpString, int cchMax);
+
+        [DllImport("user32.dll", BestFitMapping = false, CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern int RegisterClipboardFormat(string format);
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Auto, ExactSpelling = true, SetLastError = true)]
+        public static extern IntPtr GlobalSize(IntPtr hGlobal);
+
+        [DllImport("shell32.dll", BestFitMapping = false, CharSet = CharSet.Auto)]
+        public static extern int DragQueryFile(IntPtr hDrop, int iFile, StringBuilder lpszFile, int cch);
+
+        
         public enum MONITOR
         {
             MONITOR_DEFAULTTONULL = 0x00000000,
@@ -993,7 +1016,8 @@ namespace Avalonia.Win32.Interop
         public enum ClipboardFormat
         {
             CF_TEXT = 1,
-            CF_UNICODETEXT = 13
+            CF_UNICODETEXT = 13,
+            CF_HDROP = 15
         }
 
         public struct MSG
@@ -1300,4 +1324,49 @@ namespace Avalonia.Win32.Interop
         uint Compare([In, MarshalAs(UnmanagedType.Interface)] IShellItem psi, [In] uint hint, out int piOrder);
         
     }
+    
+    [Flags]
+    internal enum DropEffect : int
+    {
+        None = 0,
+        Copy = 1,
+        Move = 2,
+        Link = 4,
+        Scroll = -2147483648,
+    }
+    
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    [Guid("0000010E-0000-0000-C000-000000000046")]
+    [ComImport]
+    internal interface IOleDataObject
+    {
+        void GetData([In] ref FORMATETC format, out STGMEDIUM medium);
+        void GetDataHere([In] ref FORMATETC format, ref STGMEDIUM medium);
+        [PreserveSig]
+        int QueryGetData([In] ref FORMATETC format);
+        [PreserveSig]
+        int GetCanonicalFormatEtc([In] ref FORMATETC formatIn, out FORMATETC formatOut);
+        void SetData([In] ref FORMATETC formatIn, [In] ref STGMEDIUM medium, [MarshalAs(UnmanagedType.Bool)] bool release);
+        IEnumFORMATETC EnumFormatEtc(DATADIR direction);
+        [PreserveSig]
+        int DAdvise([In] ref FORMATETC pFormatetc, ADVF advf, IAdviseSink adviseSink, out int connection);
+        void DUnadvise(int connection);
+        [PreserveSig]
+        int EnumDAdvise(out IEnumSTATDATA enumAdvise);
+    }
+    
+    [ComImport]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    [Guid("00000122-0000-0000-C000-000000000046")]
+    internal interface IDropTarget
+    {
+        [PreserveSig]
+        UnmanagedMethods.HRESULT DragEnter([MarshalAs(UnmanagedType.Interface)] [In] IOleDataObject pDataObj, [MarshalAs(UnmanagedType.U4)] [In] int grfKeyState, [MarshalAs(UnmanagedType.U8)] [In] long pt, [In] [Out] ref DropEffect pdwEffect);
+        [PreserveSig]
+        UnmanagedMethods.HRESULT DragOver([MarshalAs(UnmanagedType.U4)] [In] int grfKeyState, [MarshalAs(UnmanagedType.U8)] [In] long pt, [In] [Out] ref DropEffect pdwEffect);
+        [PreserveSig]
+        UnmanagedMethods.HRESULT DragLeave();
+        [PreserveSig]
+        UnmanagedMethods.HRESULT Drop([MarshalAs(UnmanagedType.Interface)] [In] IOleDataObject pDataObj, [MarshalAs(UnmanagedType.U4)] [In] int grfKeyState, [MarshalAs(UnmanagedType.U8)] [In] long pt, [In] [Out] ref DropEffect pdwEffect);
+    }
 }
diff --git a/src/Windows/Avalonia.Win32/OleContext.cs b/src/Windows/Avalonia.Win32/OleContext.cs
new file mode 100644
index 0000000000..0c597e3d17
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/OleContext.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Threading;
+using Avalonia.Platform;
+using Avalonia.Threading;
+using Avalonia.Win32.Interop;
+
+namespace Zippr.UIServices.Avalonia.Windows
+{
+    class OleContext
+    {
+        private static OleContext fCurrent;
+
+        internal static OleContext Current
+        {
+            get
+            {
+                if (!IsValidOleThread())
+                    return null;
+
+                if (fCurrent == null)
+                    fCurrent = new OleContext();
+                return fCurrent;
+            }
+        }
+
+
+        private OleContext()
+        {
+            if (UnmanagedMethods.OleInitialize(IntPtr.Zero) != UnmanagedMethods.HRESULT.S_OK)
+                throw new SystemException("Failed to initialize OLE");
+        }
+
+        private static bool IsValidOleThread()
+        {
+            return Dispatcher.UIThread.CheckAccess() &&
+                   Thread.CurrentThread.GetApartmentState() == ApartmentState.STA;
+        }
+
+        internal bool RegisterDragDrop(IPlatformHandle hwnd, IDropTarget target)
+        {
+            if (hwnd?.HandleDescriptor != "HWND" || target == null)
+                return false;
+
+            return UnmanagedMethods.RegisterDragDrop(hwnd.Handle, target) == UnmanagedMethods.HRESULT.S_OK;
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/OleDataObject.cs b/src/Windows/Avalonia.Win32/OleDataObject.cs
new file mode 100644
index 0000000000..6c86cd03e0
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/OleDataObject.cs
@@ -0,0 +1,141 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.ComTypes;
+using System.Text;
+using Avalonia.Controls.DragDrop;
+using Avalonia.Win32.Interop;
+
+namespace Avalonia.Win32
+{
+    class OleDataObject : IDragData
+    {
+        private IOleDataObject _wrapped;
+
+        public OleDataObject(IOleDataObject wrapped)
+        {
+            _wrapped = wrapped;
+        }
+
+        public bool Contains(string dataFormat)
+        {
+            return GetDataFormatsCore().Any(df => StringComparer.OrdinalIgnoreCase.Equals(df, dataFormat));
+        }
+
+        public IEnumerable<string> GetDataFormats()
+        {
+            return GetDataFormatsCore().Distinct();
+        }
+
+        public string GetText()
+        {
+            return GetDataFromOleHGLOBAL(DataFormats.Text, DVASPECT.DVASPECT_CONTENT) as string;
+        }
+
+        public IEnumerable<string> GetFileNames()
+        {
+            return GetDataFromOleHGLOBAL(DataFormats.FileNames, DVASPECT.DVASPECT_CONTENT) as IEnumerable<string>;
+        }
+
+        private object GetDataFromOleHGLOBAL(string format, DVASPECT aspect)
+        {
+            FORMATETC formatEtc = new FORMATETC();
+            formatEtc.cfFormat = ClipboardFormats.GetFormat(format);
+            formatEtc.dwAspect = aspect;
+            formatEtc.lindex = -1;
+            formatEtc.tymed = TYMED.TYMED_HGLOBAL;
+            if (_wrapped.QueryGetData(ref formatEtc) == 0)
+            {
+                _wrapped.GetData(ref formatEtc, out STGMEDIUM medium);
+                try
+                {
+                    if (medium.unionmember != IntPtr.Zero && medium.tymed == TYMED.TYMED_HGLOBAL)
+                    {
+                        if (format == DataFormats.Text)
+                            return ReadStringFromHGlobal(medium.unionmember);
+                        if (format == DataFormats.FileNames)
+                            return ReadFileNamesFromHGlobal(medium.unionmember);
+                        return ReadBytesFromHGlobal(medium.unionmember);
+                    }
+                }
+                finally
+                {
+                    UnmanagedMethods.ReleaseStgMedium(ref medium);
+                }
+            }
+            return null;
+        }
+
+        private static IEnumerable<string> ReadFileNamesFromHGlobal(IntPtr hGlobal)
+        {
+            List<string> files = new List<string>();
+            int fileCount = UnmanagedMethods.DragQueryFile(hGlobal, -1, null, 0);
+            if (fileCount > 0)
+            {
+                for (int i = 0; i < fileCount; i++)
+                {
+                    int pathLen = UnmanagedMethods.DragQueryFile(hGlobal, i, null, 0);
+                    StringBuilder sb = new StringBuilder(pathLen+1);
+
+                    if (UnmanagedMethods.DragQueryFile(hGlobal, i, sb, sb.Capacity) == pathLen)
+                    {
+                        files.Add(sb.ToString());
+                    }
+                }
+            }
+            return files;
+        }
+
+        private static string ReadStringFromHGlobal(IntPtr hGlobal)
+        {
+            IntPtr ptr = UnmanagedMethods.GlobalLock(hGlobal);
+            try
+            {
+                return Marshal.PtrToStringAuto(ptr);
+            }
+            finally
+            {
+                UnmanagedMethods.GlobalUnlock(hGlobal);
+            }
+        }
+
+        private static byte[] ReadBytesFromHGlobal(IntPtr hGlobal)
+        {
+            IntPtr source = UnmanagedMethods.GlobalLock(hGlobal);
+            try
+            {
+                int size = (int)UnmanagedMethods.GlobalSize(hGlobal).ToInt64();
+                byte[] data = new byte[size];
+                Marshal.Copy(source, data, 0, size);
+                return data;
+            }
+            finally
+            {
+                UnmanagedMethods.GlobalUnlock(hGlobal);
+            }
+        }
+
+        private IEnumerable<string> GetDataFormatsCore()
+        {
+            var enumFormat = _wrapped.EnumFormatEtc(DATADIR.DATADIR_GET);
+            if (enumFormat != null)
+            {
+                enumFormat.Reset();
+                FORMATETC[] formats = new FORMATETC[1];
+                int[] fetched = { 1 };
+                while (fetched[0] > 0)
+                {
+                    fetched[0] = 0;
+                    if (enumFormat.Next(1, formats, fetched) == 0 && fetched[0] > 0)
+                    {
+                        if (formats[0].ptd != IntPtr.Zero)
+                            Marshal.FreeCoTaskMem(formats[0].ptd);
+                        
+                        yield return ClipboardFormats.GetFormat(formats[0].cfFormat);
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Windows/Avalonia.Win32/OleDropTarget.cs b/src/Windows/Avalonia.Win32/OleDropTarget.cs
new file mode 100644
index 0000000000..b0f592403b
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/OleDropTarget.cs
@@ -0,0 +1,131 @@
+using System;
+using System.Runtime.InteropServices.ComTypes;
+using Avalonia.Controls;
+using Avalonia.Controls.DragDrop;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+using Avalonia.Win32.Interop;
+
+namespace Avalonia.Win32
+{
+    class OleDropTarget : IDropTarget
+    {
+        private readonly IDragDispatcher _dragDispatcher;
+        private readonly IInputElement _target;
+        
+        private IDragData _currentDrag = null;
+
+        public OleDropTarget(IInputElement target)
+        {
+            _dragDispatcher = AvaloniaLocator.Current.GetService<IDragDispatcher>();
+            _target = target;
+        }
+
+        static DropEffect ConvertDropEffect(DragOperation operation)
+        {
+            DropEffect result = DropEffect.None;
+            if (operation.HasFlag(DragOperation.Copy))
+                result |= DropEffect.Copy;
+            if (operation.HasFlag(DragOperation.Move))
+                result |= DropEffect.Move;
+            if (operation.HasFlag(DragOperation.Link))
+                result |= DropEffect.Link;
+            return result;
+        }
+
+        static DragOperation ConvertDropEffect(DropEffect effect)
+        {
+            DragOperation result = DragOperation.None;
+            if (effect.HasFlag(DropEffect.Copy))
+                result |= DragOperation.Copy;
+            if (effect.HasFlag(DropEffect.Move))
+                result |= DragOperation.Move;
+            if (effect.HasFlag(DropEffect.Link))
+                result |= DragOperation.Link;
+            return result;
+        }
+
+        UnmanagedMethods.HRESULT IDropTarget.DragEnter(IOleDataObject pDataObj, int grfKeyState, long pt, ref DropEffect pdwEffect)
+        {
+            if (_dragDispatcher == null)
+            {
+                pdwEffect = DropEffect.None;
+                return UnmanagedMethods.HRESULT.S_OK;
+            }
+            
+            _currentDrag = new OleDataObject(pDataObj);
+            var dragLocation = GetDragLocation(pt);
+
+            var operation = ConvertDropEffect(pdwEffect);
+            operation = _dragDispatcher.DragEnter(_target, dragLocation, _currentDrag, operation);
+            pdwEffect = ConvertDropEffect(operation);
+            
+            return UnmanagedMethods.HRESULT.S_OK;
+        }
+
+        UnmanagedMethods.HRESULT IDropTarget.DragOver(int grfKeyState, long pt, ref DropEffect pdwEffect)
+        {
+            if (_dragDispatcher == null)
+            {
+                pdwEffect = DropEffect.None;
+                return UnmanagedMethods.HRESULT.S_OK;
+            }
+            
+            var dragLocation = GetDragLocation(pt);
+
+            var operation = ConvertDropEffect(pdwEffect);
+            operation = _dragDispatcher.DragOver(_target, dragLocation, _currentDrag, operation);
+            pdwEffect = ConvertDropEffect(operation);
+            
+            return UnmanagedMethods.HRESULT.S_OK;  
+        }
+
+        UnmanagedMethods.HRESULT IDropTarget.DragLeave()
+        {
+            try
+            {
+                _dragDispatcher?.DragLeave(_target);
+                return UnmanagedMethods.HRESULT.S_OK;
+            }
+            finally
+            {
+                _currentDrag = null;
+            }
+        }
+
+        UnmanagedMethods.HRESULT IDropTarget.Drop(IOleDataObject pDataObj, int grfKeyState, long pt, ref DropEffect pdwEffect)
+        {
+            try
+            {
+                if (_dragDispatcher == null)
+                {
+                    pdwEffect = DropEffect.None;
+                    return UnmanagedMethods.HRESULT.S_OK;
+                }
+            
+                _currentDrag= new OleDataObject(pDataObj);
+                var dragLocation = GetDragLocation(pt);
+
+                var operation = ConvertDropEffect(pdwEffect);
+                operation = _dragDispatcher.Drop(_target, dragLocation, _currentDrag, operation);
+                pdwEffect = ConvertDropEffect(operation);
+            
+                return UnmanagedMethods.HRESULT.S_OK;  
+            }
+            finally
+            {
+                _currentDrag = null;
+            }
+        }
+
+        private Point GetDragLocation(long dragPoint)
+        {
+            int x = (int)dragPoint;
+            int y = (int)(dragPoint >> 32);
+
+            Point screenPt = new Point(x, y);
+            return _target.PointToClient(screenPt);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 3ba926b42a..2fca0baac7 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -14,6 +14,7 @@ using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Win32.Input;
 using Avalonia.Win32.Interop;
+using Zippr.UIServices.Avalonia.Windows;
 using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32
@@ -34,6 +35,7 @@ namespace Avalonia.Win32
         private double _scaling = 1;
         private WindowState _showWindowState;
         private FramebufferManager _framebuffer;
+        private OleDropTarget _dropTarget;
 #if USE_MANAGED_DRAG
         private readonly ManagedWindowResizeDragHelper _managedDrag;
 #endif
@@ -308,6 +310,7 @@ namespace Avalonia.Win32
         public void SetInputRoot(IInputRoot inputRoot)
         {
             _owner = inputRoot;
+            CreateDropTarget();
         }
 
         public void SetTitle(string title)
@@ -689,6 +692,13 @@ namespace Avalonia.Win32
             }
         }
 
+        private void CreateDropTarget()
+        {
+            OleDropTarget odt = new OleDropTarget(_owner);
+            if (OleContext.Current?.RegisterDragDrop(Handle, odt) ?? false)
+                _dropTarget = odt;
+        }
+
         private Point DipFromLParam(IntPtr lParam)
         {
             return new Point((short)(ToInt32(lParam) & 0xffff), (short)(ToInt32(lParam) >> 16)) / Scaling;

From 50212da915cd32db81211a29840150d8eed6d1b2 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@googlemail.com>
Date: Sat, 3 Mar 2018 16:20:12 +0100
Subject: [PATCH 364/482] DragDrop is now a static class

---
 src/Avalonia.Controls/DragDrop/DragDrop.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/DragDrop/DragDrop.cs b/src/Avalonia.Controls/DragDrop/DragDrop.cs
index 3645409a5a..317a903d3c 100644
--- a/src/Avalonia.Controls/DragDrop/DragDrop.cs
+++ b/src/Avalonia.Controls/DragDrop/DragDrop.cs
@@ -2,7 +2,7 @@
 
 namespace Avalonia.Controls.DragDrop
 {
-    public sealed class DragDrop : AvaloniaObject
+    public static class DragDrop
     {
         public static RoutedEvent<DragEventArgs> DragEnterEvent = RoutedEvent.Register<DragEventArgs>("DragEnter", RoutingStrategies.Bubble, typeof(DragDrop));
         public static RoutedEvent<RoutedEventArgs> DragLeaveEvent = RoutedEvent.Register<RoutedEventArgs>("DragLeave", RoutingStrategies.Bubble, typeof(DragDrop));

From 4c362818779eec17a1c016faad5c22056055d160 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@googlemail.com>
Date: Sat, 3 Mar 2018 16:29:41 +0100
Subject: [PATCH 365/482] renamed DragOperation to DragDropEffects

---
 .../DragDrop/DefaultDragDispatcher.cs         | 22 +++++++++----------
 .../{DragOperation.cs => DragDropEffects.cs}  |  2 +-
 .../DragDrop/DragEventArgs.cs                 |  2 +-
 .../DragDrop/IDragDispatcher.cs               |  6 ++---
 src/OSX/Avalonia.MonoMac/DraggingInfo.cs      | 18 +++++++--------
 src/OSX/Avalonia.MonoMac/TopLevelImpl.cs      |  4 ++--
 src/Windows/Avalonia.Win32/OleDropTarget.cs   | 18 +++++++--------
 7 files changed, 36 insertions(+), 36 deletions(-)
 rename src/Avalonia.Controls/DragDrop/{DragOperation.cs => DragDropEffects.cs} (82%)

diff --git a/src/Avalonia.Controls/DragDrop/DefaultDragDispatcher.cs b/src/Avalonia.Controls/DragDrop/DefaultDragDispatcher.cs
index 2ce5a32dc5..68fa6cad75 100644
--- a/src/Avalonia.Controls/DragDrop/DefaultDragDispatcher.cs
+++ b/src/Avalonia.Controls/DragDrop/DefaultDragDispatcher.cs
@@ -23,37 +23,37 @@ namespace Avalonia.Controls.DragDrop
             return null;
         }
         
-        private DragOperation RaiseDragEvent(Interactive target, RoutedEvent<DragEventArgs> routedEvent, DragOperation operation, IDragData data)
+        private DragDropEffects RaiseDragEvent(Interactive target, RoutedEvent<DragEventArgs> routedEvent, DragDropEffects operation, IDragData data)
         {
             if (target == null)
-                return DragOperation.None;
+                return DragDropEffects.None;
             var args = new DragEventArgs(routedEvent, data)
             {
                 RoutedEvent = routedEvent,
-                DragOperation = operation
+                DragEffects = operation
             };
             target.RaiseEvent(args);
-            return args.DragOperation;
+            return args.DragEffects;
         }
         
-        public DragOperation DragEnter(IInputElement inputRoot, Point point, IDragData data, DragOperation operation)
+        public DragDropEffects DragEnter(IInputElement inputRoot, Point point, IDragData data, DragDropEffects effects)
         {
             _lastTarget = GetTarget(inputRoot, point);
-            return RaiseDragEvent(_lastTarget, DragDrop.DragEnterEvent, operation, data);
+            return RaiseDragEvent(_lastTarget, DragDrop.DragEnterEvent, effects, data);
         }
 
-        public DragOperation DragOver(IInputElement inputRoot, Point point, IDragData data, DragOperation operation)
+        public DragDropEffects DragOver(IInputElement inputRoot, Point point, IDragData data, DragDropEffects effects)
         {
             var target = GetTarget(inputRoot, point);
 
             if (target == _lastTarget)
-                return RaiseDragEvent(target, DragDrop.DragOverEvent, operation, data);
+                return RaiseDragEvent(target, DragDrop.DragOverEvent, effects, data);
             
             try
             {
                 if (_lastTarget != null)
                     _lastTarget.RaiseEvent(new RoutedEventArgs(DragDrop.DragLeaveEvent));
-                return RaiseDragEvent(target, DragDrop.DragEnterEvent, operation, data);
+                return RaiseDragEvent(target, DragDrop.DragEnterEvent, effects, data);
             }
             finally
             {
@@ -75,11 +75,11 @@ namespace Avalonia.Controls.DragDrop
             }
         }
 
-        public DragOperation Drop(IInputElement inputRoot, Point point, IDragData data, DragOperation operation)
+        public DragDropEffects Drop(IInputElement inputRoot, Point point, IDragData data, DragDropEffects effects)
         {
             try
             {
-                return RaiseDragEvent(_lastTarget, DragDrop.DropEvent, operation, data);
+                return RaiseDragEvent(_lastTarget, DragDrop.DropEvent, effects, data);
             }
             finally 
             {
diff --git a/src/Avalonia.Controls/DragDrop/DragOperation.cs b/src/Avalonia.Controls/DragDrop/DragDropEffects.cs
similarity index 82%
rename from src/Avalonia.Controls/DragDrop/DragOperation.cs
rename to src/Avalonia.Controls/DragDrop/DragDropEffects.cs
index ffc6f666f7..cec3dab89d 100644
--- a/src/Avalonia.Controls/DragDrop/DragOperation.cs
+++ b/src/Avalonia.Controls/DragDrop/DragDropEffects.cs
@@ -3,7 +3,7 @@
 namespace Avalonia.Controls.DragDrop
 {
     [Flags]
-    public enum DragOperation
+    public enum DragDropEffects
     {
         None = 0,
         Copy = 1,
diff --git a/src/Avalonia.Controls/DragDrop/DragEventArgs.cs b/src/Avalonia.Controls/DragDrop/DragEventArgs.cs
index e8bd2528c7..2b6658d395 100644
--- a/src/Avalonia.Controls/DragDrop/DragEventArgs.cs
+++ b/src/Avalonia.Controls/DragDrop/DragEventArgs.cs
@@ -4,7 +4,7 @@ namespace Avalonia.Controls.DragDrop
 {
     public class DragEventArgs : RoutedEventArgs
     {
-        public DragOperation DragOperation { get; set; }
+        public DragDropEffects DragEffects { get; set; }
 
         public IDragData Data { get; private set; }
 
diff --git a/src/Avalonia.Controls/DragDrop/IDragDispatcher.cs b/src/Avalonia.Controls/DragDrop/IDragDispatcher.cs
index 05a211ff76..84c023ddbc 100644
--- a/src/Avalonia.Controls/DragDrop/IDragDispatcher.cs
+++ b/src/Avalonia.Controls/DragDrop/IDragDispatcher.cs
@@ -7,9 +7,9 @@ namespace Avalonia.Controls.DragDrop
     /// </summary>
     public interface IDragDispatcher
     {
-        DragOperation DragEnter(IInputElement inputRoot, Point point, IDragData data, DragOperation operation);
-        DragOperation DragOver(IInputElement inputRoot, Point point, IDragData data, DragOperation operation);
+        DragDropEffects DragEnter(IInputElement inputRoot, Point point, IDragData data, DragDropEffects effects);
+        DragDropEffects DragOver(IInputElement inputRoot, Point point, IDragData data, DragDropEffects effects);
         void DragLeave(IInputElement inputRoot);
-        DragOperation Drop(IInputElement inputRoot, Point point, IDragData data, DragOperation operation);
+        DragDropEffects Drop(IInputElement inputRoot, Point point, IDragData data, DragDropEffects effects);
     }
 }
\ No newline at end of file
diff --git a/src/OSX/Avalonia.MonoMac/DraggingInfo.cs b/src/OSX/Avalonia.MonoMac/DraggingInfo.cs
index 8164470548..dccc39e861 100644
--- a/src/OSX/Avalonia.MonoMac/DraggingInfo.cs
+++ b/src/OSX/Avalonia.MonoMac/DraggingInfo.cs
@@ -17,27 +17,27 @@ namespace Avalonia.MonoMac
         }
 
 
-        internal static NSDragOperation ConvertDragOperation(DragOperation d)
+        internal static NSDragOperation ConvertDragOperation(DragDropEffects d)
         {
             NSDragOperation result = NSDragOperation.None;
-            if (d.HasFlag(DragOperation.Copy))
+            if (d.HasFlag(DragDropEffects.Copy))
                 result |= NSDragOperation.Copy;
-            if (d.HasFlag(DragOperation.Link))
+            if (d.HasFlag(DragDropEffects.Link))
                 result |= NSDragOperation.Link;
-            if (d.HasFlag(DragOperation.Move))
+            if (d.HasFlag(DragDropEffects.Move))
                 result |= NSDragOperation.Move;
             return result;
         }
         
-        internal static DragOperation ConvertDragOperation(NSDragOperation d)
+        internal static DragDropEffects ConvertDragOperation(NSDragOperation d)
         {
-            DragOperation result = DragOperation.None;
+            DragDropEffects result = DragDropEffects.None;
             if (d.HasFlag(NSDragOperation.Copy))
-                result |= DragOperation.Copy;
+                result |= DragDropEffects.Copy;
             if (d.HasFlag(NSDragOperation.Link))
-                result |= DragOperation.Link;
+                result |= DragDropEffects.Link;
             if (d.HasFlag(NSDragOperation.Move))
-                result |= DragOperation.Move;
+                result |= DragDropEffects.Move;
             return result;
         }
 
diff --git a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
index 711f6d2787..4398b6bddb 100644
--- a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
+++ b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
@@ -201,7 +201,7 @@ namespace Avalonia.MonoMac
                 
                 dragOp = _dragDispatcher.DragOver(root, pt, info, dragOp);
                 
-                return dragOp != DragOperation.None;
+                return dragOp != DragDropEffects.None;
             }
 
             public override bool PerformDragOperation(NSDraggingInfo sender)
@@ -216,7 +216,7 @@ namespace Avalonia.MonoMac
                 
                 dragOp = _dragDispatcher.Drop(root, pt, info, dragOp);
                 
-                return dragOp != DragOperation.None;
+                return dragOp != DragDropEffects.None;
             }
             
 
diff --git a/src/Windows/Avalonia.Win32/OleDropTarget.cs b/src/Windows/Avalonia.Win32/OleDropTarget.cs
index b0f592403b..e3725d3bbf 100644
--- a/src/Windows/Avalonia.Win32/OleDropTarget.cs
+++ b/src/Windows/Avalonia.Win32/OleDropTarget.cs
@@ -22,27 +22,27 @@ namespace Avalonia.Win32
             _target = target;
         }
 
-        static DropEffect ConvertDropEffect(DragOperation operation)
+        static DropEffect ConvertDropEffect(DragDropEffects operation)
         {
             DropEffect result = DropEffect.None;
-            if (operation.HasFlag(DragOperation.Copy))
+            if (operation.HasFlag(DragDropEffects.Copy))
                 result |= DropEffect.Copy;
-            if (operation.HasFlag(DragOperation.Move))
+            if (operation.HasFlag(DragDropEffects.Move))
                 result |= DropEffect.Move;
-            if (operation.HasFlag(DragOperation.Link))
+            if (operation.HasFlag(DragDropEffects.Link))
                 result |= DropEffect.Link;
             return result;
         }
 
-        static DragOperation ConvertDropEffect(DropEffect effect)
+        static DragDropEffects ConvertDropEffect(DropEffect effect)
         {
-            DragOperation result = DragOperation.None;
+            DragDropEffects result = DragDropEffects.None;
             if (effect.HasFlag(DropEffect.Copy))
-                result |= DragOperation.Copy;
+                result |= DragDropEffects.Copy;
             if (effect.HasFlag(DropEffect.Move))
-                result |= DragOperation.Move;
+                result |= DragDropEffects.Move;
             if (effect.HasFlag(DropEffect.Link))
-                result |= DragOperation.Link;
+                result |= DragDropEffects.Link;
             return result;
         }
 

From 83b18944d3ac81ed089902fea6dd7105e3664c55 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@googlemail.com>
Date: Sat, 3 Mar 2018 16:57:25 +0100
Subject: [PATCH 366/482] corrected namespace. (copy+paste error)

---
 src/Windows/Avalonia.Win32/OleContext.cs | 2 +-
 src/Windows/Avalonia.Win32/WindowImpl.cs | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/OleContext.cs b/src/Windows/Avalonia.Win32/OleContext.cs
index 0c597e3d17..085c0f8ea9 100644
--- a/src/Windows/Avalonia.Win32/OleContext.cs
+++ b/src/Windows/Avalonia.Win32/OleContext.cs
@@ -4,7 +4,7 @@ using Avalonia.Platform;
 using Avalonia.Threading;
 using Avalonia.Win32.Interop;
 
-namespace Zippr.UIServices.Avalonia.Windows
+namespace Avalonia.Win32
 {
     class OleContext
     {
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 2fca0baac7..ed224a6525 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -14,7 +14,6 @@ using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Win32.Input;
 using Avalonia.Win32.Interop;
-using Zippr.UIServices.Avalonia.Windows;
 using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32

From 0adc6e62de8a95129e4cc73b9772db838ec5b74e Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@googlemail.com>
Date: Sat, 3 Mar 2018 17:36:11 +0100
Subject: [PATCH 367/482] renamed IDragData to IDataObject

---
 .../DragDrop/DefaultDragDispatcher.cs         |  8 +++----
 .../DragDrop/DragEventArgs.cs                 |  4 ++--
 .../DragDrop/{IDragData.cs => IDataObject.cs} |  2 +-
 .../DragDrop/IDragDispatcher.cs               |  6 ++---
 src/OSX/Avalonia.MonoMac/DraggingInfo.cs      |  2 +-
 .../Interop/UnmanagedMethods.cs               | 24 +++----------------
 src/Windows/Avalonia.Win32/OleDataObject.cs   |  7 +++---
 src/Windows/Avalonia.Win32/OleDropTarget.cs   | 11 ++++-----
 8 files changed, 22 insertions(+), 42 deletions(-)
 rename src/Avalonia.Controls/DragDrop/{IDragData.cs => IDataObject.cs} (88%)

diff --git a/src/Avalonia.Controls/DragDrop/DefaultDragDispatcher.cs b/src/Avalonia.Controls/DragDrop/DefaultDragDispatcher.cs
index 68fa6cad75..2db227248b 100644
--- a/src/Avalonia.Controls/DragDrop/DefaultDragDispatcher.cs
+++ b/src/Avalonia.Controls/DragDrop/DefaultDragDispatcher.cs
@@ -23,7 +23,7 @@ namespace Avalonia.Controls.DragDrop
             return null;
         }
         
-        private DragDropEffects RaiseDragEvent(Interactive target, RoutedEvent<DragEventArgs> routedEvent, DragDropEffects operation, IDragData data)
+        private DragDropEffects RaiseDragEvent(Interactive target, RoutedEvent<DragEventArgs> routedEvent, DragDropEffects operation, IDataObject data)
         {
             if (target == null)
                 return DragDropEffects.None;
@@ -36,13 +36,13 @@ namespace Avalonia.Controls.DragDrop
             return args.DragEffects;
         }
         
-        public DragDropEffects DragEnter(IInputElement inputRoot, Point point, IDragData data, DragDropEffects effects)
+        public DragDropEffects DragEnter(IInputElement inputRoot, Point point, IDataObject data, DragDropEffects effects)
         {
             _lastTarget = GetTarget(inputRoot, point);
             return RaiseDragEvent(_lastTarget, DragDrop.DragEnterEvent, effects, data);
         }
 
-        public DragDropEffects DragOver(IInputElement inputRoot, Point point, IDragData data, DragDropEffects effects)
+        public DragDropEffects DragOver(IInputElement inputRoot, Point point, IDataObject data, DragDropEffects effects)
         {
             var target = GetTarget(inputRoot, point);
 
@@ -75,7 +75,7 @@ namespace Avalonia.Controls.DragDrop
             }
         }
 
-        public DragDropEffects Drop(IInputElement inputRoot, Point point, IDragData data, DragDropEffects effects)
+        public DragDropEffects Drop(IInputElement inputRoot, Point point, IDataObject data, DragDropEffects effects)
         {
             try
             {
diff --git a/src/Avalonia.Controls/DragDrop/DragEventArgs.cs b/src/Avalonia.Controls/DragDrop/DragEventArgs.cs
index 2b6658d395..f31bfd4820 100644
--- a/src/Avalonia.Controls/DragDrop/DragEventArgs.cs
+++ b/src/Avalonia.Controls/DragDrop/DragEventArgs.cs
@@ -6,9 +6,9 @@ namespace Avalonia.Controls.DragDrop
     {
         public DragDropEffects DragEffects { get; set; }
 
-        public IDragData Data { get; private set; }
+        public IDataObject Data { get; private set; }
 
-        public DragEventArgs(RoutedEvent<DragEventArgs> routedEvent, IDragData data)
+        public DragEventArgs(RoutedEvent<DragEventArgs> routedEvent, IDataObject data)
             : base(routedEvent)
         {
             this.Data = data;
diff --git a/src/Avalonia.Controls/DragDrop/IDragData.cs b/src/Avalonia.Controls/DragDrop/IDataObject.cs
similarity index 88%
rename from src/Avalonia.Controls/DragDrop/IDragData.cs
rename to src/Avalonia.Controls/DragDrop/IDataObject.cs
index b6dc53d32d..5ffecc13ed 100644
--- a/src/Avalonia.Controls/DragDrop/IDragData.cs
+++ b/src/Avalonia.Controls/DragDrop/IDataObject.cs
@@ -2,7 +2,7 @@
 
 namespace Avalonia.Controls.DragDrop
 {
-    public interface IDragData
+    public interface IDataObject
     {
         IEnumerable<string> GetDataFormats();
 
diff --git a/src/Avalonia.Controls/DragDrop/IDragDispatcher.cs b/src/Avalonia.Controls/DragDrop/IDragDispatcher.cs
index 84c023ddbc..538ffa171b 100644
--- a/src/Avalonia.Controls/DragDrop/IDragDispatcher.cs
+++ b/src/Avalonia.Controls/DragDrop/IDragDispatcher.cs
@@ -7,9 +7,9 @@ namespace Avalonia.Controls.DragDrop
     /// </summary>
     public interface IDragDispatcher
     {
-        DragDropEffects DragEnter(IInputElement inputRoot, Point point, IDragData data, DragDropEffects effects);
-        DragDropEffects DragOver(IInputElement inputRoot, Point point, IDragData data, DragDropEffects effects);
+        DragDropEffects DragEnter(IInputElement inputRoot, Point point, IDataObject data, DragDropEffects effects);
+        DragDropEffects DragOver(IInputElement inputRoot, Point point, IDataObject data, DragDropEffects effects);
         void DragLeave(IInputElement inputRoot);
-        DragDropEffects Drop(IInputElement inputRoot, Point point, IDragData data, DragDropEffects effects);
+        DragDropEffects Drop(IInputElement inputRoot, Point point, IDataObject data, DragDropEffects effects);
     }
 }
\ No newline at end of file
diff --git a/src/OSX/Avalonia.MonoMac/DraggingInfo.cs b/src/OSX/Avalonia.MonoMac/DraggingInfo.cs
index dccc39e861..ef4d9d99f6 100644
--- a/src/OSX/Avalonia.MonoMac/DraggingInfo.cs
+++ b/src/OSX/Avalonia.MonoMac/DraggingInfo.cs
@@ -7,7 +7,7 @@ using MonoMac.Foundation;
 
 namespace Avalonia.MonoMac
 {
-    class DraggingInfo : IDragData
+    class DraggingInfo : IDataObject
     { 
         private readonly NSDraggingInfo _info;
 
diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
index dada2eb7e6..f43cdb98cc 100644
--- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
+++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -1335,25 +1335,7 @@ namespace Avalonia.Win32.Interop
         Scroll = -2147483648,
     }
     
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [Guid("0000010E-0000-0000-C000-000000000046")]
-    [ComImport]
-    internal interface IOleDataObject
-    {
-        void GetData([In] ref FORMATETC format, out STGMEDIUM medium);
-        void GetDataHere([In] ref FORMATETC format, ref STGMEDIUM medium);
-        [PreserveSig]
-        int QueryGetData([In] ref FORMATETC format);
-        [PreserveSig]
-        int GetCanonicalFormatEtc([In] ref FORMATETC formatIn, out FORMATETC formatOut);
-        void SetData([In] ref FORMATETC formatIn, [In] ref STGMEDIUM medium, [MarshalAs(UnmanagedType.Bool)] bool release);
-        IEnumFORMATETC EnumFormatEtc(DATADIR direction);
-        [PreserveSig]
-        int DAdvise([In] ref FORMATETC pFormatetc, ADVF advf, IAdviseSink adviseSink, out int connection);
-        void DUnadvise(int connection);
-        [PreserveSig]
-        int EnumDAdvise(out IEnumSTATDATA enumAdvise);
-    }
+    
     
     [ComImport]
     [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
@@ -1361,12 +1343,12 @@ namespace Avalonia.Win32.Interop
     internal interface IDropTarget
     {
         [PreserveSig]
-        UnmanagedMethods.HRESULT DragEnter([MarshalAs(UnmanagedType.Interface)] [In] IOleDataObject pDataObj, [MarshalAs(UnmanagedType.U4)] [In] int grfKeyState, [MarshalAs(UnmanagedType.U8)] [In] long pt, [In] [Out] ref DropEffect pdwEffect);
+        UnmanagedMethods.HRESULT DragEnter([MarshalAs(UnmanagedType.Interface)] [In] IDataObject pDataObj, [MarshalAs(UnmanagedType.U4)] [In] int grfKeyState, [MarshalAs(UnmanagedType.U8)] [In] long pt, [In] [Out] ref DropEffect pdwEffect);
         [PreserveSig]
         UnmanagedMethods.HRESULT DragOver([MarshalAs(UnmanagedType.U4)] [In] int grfKeyState, [MarshalAs(UnmanagedType.U8)] [In] long pt, [In] [Out] ref DropEffect pdwEffect);
         [PreserveSig]
         UnmanagedMethods.HRESULT DragLeave();
         [PreserveSig]
-        UnmanagedMethods.HRESULT Drop([MarshalAs(UnmanagedType.Interface)] [In] IOleDataObject pDataObj, [MarshalAs(UnmanagedType.U4)] [In] int grfKeyState, [MarshalAs(UnmanagedType.U8)] [In] long pt, [In] [Out] ref DropEffect pdwEffect);
+        UnmanagedMethods.HRESULT Drop([MarshalAs(UnmanagedType.Interface)] [In] IDataObject pDataObj, [MarshalAs(UnmanagedType.U4)] [In] int grfKeyState, [MarshalAs(UnmanagedType.U8)] [In] long pt, [In] [Out] ref DropEffect pdwEffect);
     }
 }
diff --git a/src/Windows/Avalonia.Win32/OleDataObject.cs b/src/Windows/Avalonia.Win32/OleDataObject.cs
index 6c86cd03e0..bf6f3d98c3 100644
--- a/src/Windows/Avalonia.Win32/OleDataObject.cs
+++ b/src/Windows/Avalonia.Win32/OleDataObject.cs
@@ -6,14 +6,15 @@ using System.Runtime.InteropServices.ComTypes;
 using System.Text;
 using Avalonia.Controls.DragDrop;
 using Avalonia.Win32.Interop;
+using IDataObject = System.Runtime.InteropServices.ComTypes.IDataObject;
 
 namespace Avalonia.Win32
 {
-    class OleDataObject : IDragData
+    class OleDataObject : Avalonia.Controls.DragDrop.IDataObject
     {
-        private IOleDataObject _wrapped;
+        private IDataObject _wrapped;
 
-        public OleDataObject(IOleDataObject wrapped)
+        public OleDataObject(IDataObject wrapped)
         {
             _wrapped = wrapped;
         }
diff --git a/src/Windows/Avalonia.Win32/OleDropTarget.cs b/src/Windows/Avalonia.Win32/OleDropTarget.cs
index e3725d3bbf..925f9b7046 100644
--- a/src/Windows/Avalonia.Win32/OleDropTarget.cs
+++ b/src/Windows/Avalonia.Win32/OleDropTarget.cs
@@ -1,11 +1,8 @@
-using System;
-using System.Runtime.InteropServices.ComTypes;
-using Avalonia.Controls;
-using Avalonia.Controls.DragDrop;
+using Avalonia.Controls.DragDrop;
 using Avalonia.Input;
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
 using Avalonia.Win32.Interop;
+using IDataObject = Avalonia.Controls.DragDrop.IDataObject;
+using IOleDataObject = System.Runtime.InteropServices.ComTypes.IDataObject;
 
 namespace Avalonia.Win32
 {
@@ -14,7 +11,7 @@ namespace Avalonia.Win32
         private readonly IDragDispatcher _dragDispatcher;
         private readonly IInputElement _target;
         
-        private IDragData _currentDrag = null;
+        private IDataObject _currentDrag = null;
 
         public OleDropTarget(IInputElement target)
         {

From 4c6a341b73a5198d1539506c057c4e1b392e9f76 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@googlemail.com>
Date: Sun, 4 Mar 2018 21:13:02 +0100
Subject: [PATCH 368/482] reworked Drag event dispatching

---
 src/Avalonia.Controls/Application.cs          |  3 +-
 ...DefaultDragDispatcher.cs => DragDevice.cs} | 45 ++++++++---
 .../DragDrop/IDragDispatcher.cs               | 15 ----
 .../DragDrop/Raw/IDragDevice.cs               |  8 ++
 .../DragDrop/Raw/RawDragEvent.cs              | 31 ++++++++
 .../DragDrop/Raw/RawDragEventType.cs          | 10 +++
 src/OSX/Avalonia.MonoMac/TopLevelImpl.cs      | 65 +++++-----------
 src/Windows/Avalonia.Win32/OleDropTarget.cs   | 76 +++++++++++++------
 src/Windows/Avalonia.Win32/WindowImpl.cs      |  2 +-
 9 files changed, 158 insertions(+), 97 deletions(-)
 rename src/Avalonia.Controls/DragDrop/{DefaultDragDispatcher.cs => DragDevice.cs} (62%)
 delete mode 100644 src/Avalonia.Controls/DragDrop/IDragDispatcher.cs
 create mode 100644 src/Avalonia.Controls/DragDrop/Raw/IDragDevice.cs
 create mode 100644 src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs
 create mode 100644 src/Avalonia.Controls/DragDrop/Raw/RawDragEventType.cs

diff --git a/src/Avalonia.Controls/Application.cs b/src/Avalonia.Controls/Application.cs
index 63b17530ff..b751aeca60 100644
--- a/src/Avalonia.Controls/Application.cs
+++ b/src/Avalonia.Controls/Application.cs
@@ -13,6 +13,7 @@ using Avalonia.Styling;
 using Avalonia.Threading;
 using System.Reactive.Concurrency;
 using Avalonia.Controls.DragDrop;
+using Avalonia.Controls.DragDrop.Raw;
 
 namespace Avalonia
 {
@@ -236,7 +237,7 @@ namespace Avalonia
                 .Bind<ILayoutManager>().ToSingleton<LayoutManager>()
                 .Bind<IApplicationLifecycle>().ToConstant(this)
                 .Bind<IScheduler>().ToConstant(AvaloniaScheduler.Instance)
-                .Bind<IDragDispatcher>().ToConstant(DefaultDragDispatcher.Instance);
+                .Bind<IDragDevice>().ToConstant(DragDevice.Instance);
         }
     }
 }
diff --git a/src/Avalonia.Controls/DragDrop/DefaultDragDispatcher.cs b/src/Avalonia.Controls/DragDrop/DragDevice.cs
similarity index 62%
rename from src/Avalonia.Controls/DragDrop/DefaultDragDispatcher.cs
rename to src/Avalonia.Controls/DragDrop/DragDevice.cs
index 2db227248b..25f82ca3bc 100644
--- a/src/Avalonia.Controls/DragDrop/DefaultDragDispatcher.cs
+++ b/src/Avalonia.Controls/DragDrop/DragDevice.cs
@@ -2,19 +2,17 @@
 using Avalonia.Interactivity;
 using Avalonia.VisualTree;
 using System.Linq;
+using Avalonia.Controls.DragDrop.Raw;
+using Avalonia.Input.Raw;
 
 namespace Avalonia.Controls.DragDrop
 {
-    class DefaultDragDispatcher : IDragDispatcher
+    class DragDevice : IDragDevice
     {
-        public static readonly DefaultDragDispatcher Instance = new DefaultDragDispatcher();
-
+        public static readonly DragDevice Instance = new DragDevice();
+        
         private Interactive _lastTarget = null;
         
-        private DefaultDragDispatcher()
-        {   
-        }
-
         private Interactive GetTarget(IInputElement root, Point local)
         {
             var target = root.InputHitTest(local)?.GetSelfAndVisualAncestors()?.OfType<Interactive>()?.FirstOrDefault();
@@ -36,13 +34,13 @@ namespace Avalonia.Controls.DragDrop
             return args.DragEffects;
         }
         
-        public DragDropEffects DragEnter(IInputElement inputRoot, Point point, IDataObject data, DragDropEffects effects)
+        private DragDropEffects DragEnter(IInputElement inputRoot, Point point, IDataObject data, DragDropEffects effects)
         {
             _lastTarget = GetTarget(inputRoot, point);
             return RaiseDragEvent(_lastTarget, DragDrop.DragEnterEvent, effects, data);
         }
 
-        public DragDropEffects DragOver(IInputElement inputRoot, Point point, IDataObject data, DragDropEffects effects)
+        private DragDropEffects DragOver(IInputElement inputRoot, Point point, IDataObject data, DragDropEffects effects)
         {
             var target = GetTarget(inputRoot, point);
 
@@ -61,7 +59,7 @@ namespace Avalonia.Controls.DragDrop
             }            
         }
 
-        public void DragLeave(IInputElement inputRoot)
+        private void DragLeave(IInputElement inputRoot)
         {
             if (_lastTarget == null)
                 return;
@@ -75,7 +73,7 @@ namespace Avalonia.Controls.DragDrop
             }
         }
 
-        public DragDropEffects Drop(IInputElement inputRoot, Point point, IDataObject data, DragDropEffects effects)
+        private DragDropEffects Drop(IInputElement inputRoot, Point point, IDataObject data, DragDropEffects effects)
         {
             try
             {
@@ -86,5 +84,30 @@ namespace Avalonia.Controls.DragDrop
                 _lastTarget = null;
             }
         }
+
+        public void ProcessRawEvent(RawInputEventArgs e)
+        {
+            if (!e.Handled && e is RawDragEvent margs)
+                ProcessRawEvent(margs);
+        }
+
+        private void ProcessRawEvent(RawDragEvent e)
+        {
+            switch (e.Type)
+            {
+                case RawDragEventType.DragEnter:
+                    e.Effects = DragEnter(e.InputRoot, e.Location, e.Data, e.Effects);
+                    break;
+                case RawDragEventType.DragOver:
+                    e.Effects = DragOver(e.InputRoot, e.Location, e.Data, e.Effects);
+                    break;
+                case RawDragEventType.DragLeave:
+                    DragLeave(e.InputRoot);
+                    break;
+                case RawDragEventType.Drop:
+                    e.Effects = Drop(e.InputRoot, e.Location, e.Data, e.Effects);
+                    break;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Controls/DragDrop/IDragDispatcher.cs b/src/Avalonia.Controls/DragDrop/IDragDispatcher.cs
deleted file mode 100644
index 538ffa171b..0000000000
--- a/src/Avalonia.Controls/DragDrop/IDragDispatcher.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Avalonia.Input;
-
-namespace Avalonia.Controls.DragDrop
-{
-    /// <summary>
-    /// Dispatches Drag+Drop events to the correct visual targets, based on the input root and the drag location.
-    /// </summary>
-    public interface IDragDispatcher
-    {
-        DragDropEffects DragEnter(IInputElement inputRoot, Point point, IDataObject data, DragDropEffects effects);
-        DragDropEffects DragOver(IInputElement inputRoot, Point point, IDataObject data, DragDropEffects effects);
-        void DragLeave(IInputElement inputRoot);
-        DragDropEffects Drop(IInputElement inputRoot, Point point, IDataObject data, DragDropEffects effects);
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/DragDrop/Raw/IDragDevice.cs b/src/Avalonia.Controls/DragDrop/Raw/IDragDevice.cs
new file mode 100644
index 0000000000..d1c20fae55
--- /dev/null
+++ b/src/Avalonia.Controls/DragDrop/Raw/IDragDevice.cs
@@ -0,0 +1,8 @@
+using Avalonia.Input;
+
+namespace Avalonia.Controls.DragDrop.Raw
+{
+    public interface IDragDevice : IInputDevice
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs b/src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs
new file mode 100644
index 0000000000..76a2c16b3b
--- /dev/null
+++ b/src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs
@@ -0,0 +1,31 @@
+using System;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+
+namespace Avalonia.Controls.DragDrop.Raw
+{
+    public class RawDragEvent : RawInputEventArgs
+    {
+        public IInputElement InputRoot { get; }
+        public Point Location { get; }
+        public IDataObject Data { get; }
+        public DragDropEffects Effects { get; set; }
+        public RawDragEventType Type { get; }
+
+        public RawDragEvent(IDragDevice inputDevice, RawDragEventType type, 
+            IInputElement inputRoot, Point location, IDataObject data, DragDropEffects effects)
+            :base(inputDevice, GetTimeStamp())
+        {
+            Type = type;
+            InputRoot = inputRoot;
+            Location = location;
+            Data = data;
+            Effects = effects;
+        }
+
+        private static uint GetTimeStamp()
+        {
+            return (uint)0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/DragDrop/Raw/RawDragEventType.cs b/src/Avalonia.Controls/DragDrop/Raw/RawDragEventType.cs
new file mode 100644
index 0000000000..44c4bbd595
--- /dev/null
+++ b/src/Avalonia.Controls/DragDrop/Raw/RawDragEventType.cs
@@ -0,0 +1,10 @@
+namespace Avalonia.Controls.DragDrop.Raw
+{
+    public enum RawDragEventType
+    {
+        DragEnter,
+        DragOver,
+        DragLeave,
+        Drop
+    }
+}
\ No newline at end of file
diff --git a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
index 4398b6bddb..b767a86490 100644
--- a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
+++ b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Avalonia.Controls.DragDrop;
+using Avalonia.Controls.DragDrop.Raw;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Platform;
@@ -19,6 +20,7 @@ namespace Avalonia.MonoMac
     {
         public TopLevelView View { get; }
         private readonly IMouseDevice _mouse = AvaloniaLocator.Current.GetService<IMouseDevice>();
+        private readonly IDragDevice _dragDevice = AvaloniaLocator.Current.GetService<IDragDevice>();
         protected TopLevelImpl()
         {
             View = new TopLevelView(this);
@@ -37,7 +39,6 @@ namespace Avalonia.MonoMac
             bool _isLeftPressed, _isRightPressed, _isMiddlePressed;
             private readonly IMouseDevice _mouse;
             private readonly IKeyboardDevice _keyboard;
-            private readonly IDragDispatcher _dragDispatcher;
             private NSTrackingArea _area;
             private NSCursor _cursor;
             private bool _nonUiRedrawQueued;
@@ -54,7 +55,6 @@ namespace Avalonia.MonoMac
                 _tl = tl;
                 _mouse = AvaloniaLocator.Current.GetService<IMouseDevice>();
                 _keyboard = AvaloniaLocator.Current.GetService<IKeyboardDevice>();
-                _dragDispatcher = AvaloniaLocator.Current.GetService<IDragDispatcher>();
                 
                 RegisterForDraggedTypes(new string[] {
                     "public.data" // register for any kind of data.
@@ -151,72 +151,45 @@ namespace Avalonia.MonoMac
                 UpdateCursor();
             }
 
-            public override NSDragOperation DraggingEntered(NSDraggingInfo sender)
+            private NSDragOperation SendRawDragEvent(NSDraggingInfo sender, RawDragEventType type)
             {
+                Action<RawInputEventArgs> input = _tl.Input;
+                IDragDevice dragDevice = _tl._dragDevice;
                 IInputRoot root = _tl?.InputRoot;
-                if (root == null || _dragDispatcher == null)
+                if (root == null || dragDevice == null || input == null)
                     return NSDragOperation.None;
-
+                
                 var dragOp = DraggingInfo.ConvertDragOperation(sender.DraggingSourceOperationMask);
                 DraggingInfo info = new DraggingInfo(sender);
                 var pt = TranslateLocalPoint(info.Location);
-                
-                dragOp = _dragDispatcher.DragEnter(root, pt, info, dragOp);
-                
-                return DraggingInfo.ConvertDragOperation(dragOp);
+                var args = new RawDragEvent(dragDevice, type, root, pt, info, dragOp);
+                input(args);
+                return DraggingInfo.ConvertDragOperation(args.Effects);
             }
 
-            public override NSDragOperation DraggingUpdated(NSDraggingInfo sender)
+            public override NSDragOperation DraggingEntered(NSDraggingInfo sender)
             {
-                IInputRoot root = _tl?.InputRoot;
-                if (root == null || _dragDispatcher == null)
-                    return NSDragOperation.None;
+                return SendRawDragEvent(sender, RawDragEventType.DragEnter);
+            }
 
-                var dragOp = DraggingInfo.ConvertDragOperation(sender.DraggingSourceOperationMask);
-                DraggingInfo info = new DraggingInfo(sender);
-                var pt = TranslateLocalPoint(info.Location);
-                
-                dragOp = _dragDispatcher.DragOver(root, pt, info, dragOp);
-                
-                return DraggingInfo.ConvertDragOperation(dragOp);
+            public override NSDragOperation DraggingUpdated(NSDraggingInfo sender)
+            {
+                return SendRawDragEvent(sender, RawDragEventType.DragOver);
             }
 
             public override void DraggingExited(NSDraggingInfo sender)
             {
-                IInputRoot root = _tl?.InputRoot;
-                if (root == null || _dragDispatcher == null)
-                    return;
-                _dragDispatcher.DragLeave(root);
+                SendRawDragEvent(sender, RawDragEventType.DragLeave);
             }
 
             public override bool PrepareForDragOperation(NSDraggingInfo sender)
             {
-                IInputRoot root = _tl?.InputRoot;
-                if (root == null || _dragDispatcher == null)
-                    return false;
-
-                var dragOp = DraggingInfo.ConvertDragOperation(sender.DraggingSourceOperationMask);
-                DraggingInfo info = new DraggingInfo(sender);
-                var pt = TranslateLocalPoint(info.Location);
-                
-                dragOp = _dragDispatcher.DragOver(root, pt, info, dragOp);
-                
-                return dragOp != DragDropEffects.None;
+                return SendRawDragEvent(sender, RawDragEventType.DragOver) != NSDragOperation.None;
             }
 
             public override bool PerformDragOperation(NSDraggingInfo sender)
             {
-                IInputRoot root = _tl?.InputRoot;
-                if (root == null || _dragDispatcher == null)
-                    return false;
-
-                var dragOp = DraggingInfo.ConvertDragOperation(sender.DraggingSourceOperationMask);
-                DraggingInfo info = new DraggingInfo(sender);
-                var pt = TranslateLocalPoint(info.Location);
-                
-                dragOp = _dragDispatcher.Drop(root, pt, info, dragOp);
-                
-                return dragOp != DragDropEffects.None;
+                return SendRawDragEvent(sender, RawDragEventType.Drop) != NSDragOperation.None;
             }
             
 
diff --git a/src/Windows/Avalonia.Win32/OleDropTarget.cs b/src/Windows/Avalonia.Win32/OleDropTarget.cs
index 925f9b7046..c16c5058f3 100644
--- a/src/Windows/Avalonia.Win32/OleDropTarget.cs
+++ b/src/Windows/Avalonia.Win32/OleDropTarget.cs
@@ -1,5 +1,7 @@
 using Avalonia.Controls.DragDrop;
+using Avalonia.Controls.DragDrop.Raw;
 using Avalonia.Input;
+using Avalonia.Platform;
 using Avalonia.Win32.Interop;
 using IDataObject = Avalonia.Controls.DragDrop.IDataObject;
 using IOleDataObject = System.Runtime.InteropServices.ComTypes.IDataObject;
@@ -8,14 +10,16 @@ namespace Avalonia.Win32
 {
     class OleDropTarget : IDropTarget
     {
-        private readonly IDragDispatcher _dragDispatcher;
         private readonly IInputElement _target;
+        private readonly ITopLevelImpl _tl;
+        private readonly IDragDevice _dragDevice;
         
         private IDataObject _currentDrag = null;
 
-        public OleDropTarget(IInputElement target)
+        public OleDropTarget(ITopLevelImpl tl, IInputElement target)
         {
-            _dragDispatcher = AvaloniaLocator.Current.GetService<IDragDispatcher>();
+            _dragDevice = AvaloniaLocator.Current.GetService<IDragDevice>();
+            _tl = tl;
             _target = target;
         }
 
@@ -42,38 +46,50 @@ namespace Avalonia.Win32
                 result |= DragDropEffects.Link;
             return result;
         }
-
+        
         UnmanagedMethods.HRESULT IDropTarget.DragEnter(IOleDataObject pDataObj, int grfKeyState, long pt, ref DropEffect pdwEffect)
         {
-            if (_dragDispatcher == null)
+            var dispatch = _tl?.Input;
+            if (dispatch == null)
             {
                 pdwEffect = DropEffect.None;
                 return UnmanagedMethods.HRESULT.S_OK;
             }
             
             _currentDrag = new OleDataObject(pDataObj);
-            var dragLocation = GetDragLocation(pt);
-
-            var operation = ConvertDropEffect(pdwEffect);
-            operation = _dragDispatcher.DragEnter(_target, dragLocation, _currentDrag, operation);
-            pdwEffect = ConvertDropEffect(operation);
+            var args = new RawDragEvent(
+                _dragDevice,
+                RawDragEventType.DragEnter, 
+                _target, 
+                GetDragLocation(pt), 
+                _currentDrag, 
+                ConvertDropEffect(pdwEffect)
+            );
+            dispatch(args);
+            pdwEffect = ConvertDropEffect(args.Effects);
             
             return UnmanagedMethods.HRESULT.S_OK;
         }
 
         UnmanagedMethods.HRESULT IDropTarget.DragOver(int grfKeyState, long pt, ref DropEffect pdwEffect)
         {
-            if (_dragDispatcher == null)
+            var dispatch = _tl?.Input;
+            if (dispatch == null)
             {
                 pdwEffect = DropEffect.None;
                 return UnmanagedMethods.HRESULT.S_OK;
             }
             
-            var dragLocation = GetDragLocation(pt);
-
-            var operation = ConvertDropEffect(pdwEffect);
-            operation = _dragDispatcher.DragOver(_target, dragLocation, _currentDrag, operation);
-            pdwEffect = ConvertDropEffect(operation);
+            var args = new RawDragEvent(
+                _dragDevice,
+                RawDragEventType.DragOver, 
+                _target, 
+                GetDragLocation(pt), 
+                _currentDrag, 
+                ConvertDropEffect(pdwEffect)
+            );
+            dispatch(args);
+            pdwEffect = ConvertDropEffect(args.Effects);
             
             return UnmanagedMethods.HRESULT.S_OK;  
         }
@@ -82,7 +98,14 @@ namespace Avalonia.Win32
         {
             try
             {
-                _dragDispatcher?.DragLeave(_target);
+                _tl?.Input(new RawDragEvent(
+                    _dragDevice,  
+                    RawDragEventType.DragLeave, 
+                    _target, 
+                    default(Point), 
+                    null, 
+                    DragDropEffects.None
+                ));
                 return UnmanagedMethods.HRESULT.S_OK;
             }
             finally
@@ -95,18 +118,25 @@ namespace Avalonia.Win32
         {
             try
             {
-                if (_dragDispatcher == null)
+                var dispatch = _tl?.Input;
+                if (dispatch == null)
                 {
                     pdwEffect = DropEffect.None;
                     return UnmanagedMethods.HRESULT.S_OK;
                 }
             
                 _currentDrag= new OleDataObject(pDataObj);
-                var dragLocation = GetDragLocation(pt);
-
-                var operation = ConvertDropEffect(pdwEffect);
-                operation = _dragDispatcher.Drop(_target, dragLocation, _currentDrag, operation);
-                pdwEffect = ConvertDropEffect(operation);
+                
+                var args = new RawDragEvent(
+                    _dragDevice, 
+                    RawDragEventType.Drop, 
+                    _target, 
+                    GetDragLocation(pt), 
+                    _currentDrag, 
+                    ConvertDropEffect(pdwEffect)
+                );
+                dispatch(args);
+                pdwEffect = ConvertDropEffect(args.Effects);
             
                 return UnmanagedMethods.HRESULT.S_OK;  
             }
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index ed224a6525..85e5b5b4b9 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -693,7 +693,7 @@ namespace Avalonia.Win32
 
         private void CreateDropTarget()
         {
-            OleDropTarget odt = new OleDropTarget(_owner);
+            OleDropTarget odt = new OleDropTarget(this, _owner);
             if (OleContext.Current?.RegisterDragDrop(Handle, odt) ?? false)
                 _dropTarget = odt;
         }

From 87d7f65eb8bcf4b631170b349a660df77a4ae26d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 4 Mar 2018 21:34:19 +0100
Subject: [PATCH 369/482] Added failing test for #1420.

---
 .../Rendering/SceneGraph/IVisualNode.cs       |  5 +++
 .../Rendering/SceneGraph/VisualNode.cs        |  4 +-
 .../Rendering/SceneGraph/SceneBuilderTests.cs | 37 +++++++++++++++++++
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs
index 1668f592ec..75ef49f8e7 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs
@@ -69,6 +69,11 @@ namespace Avalonia.Rendering.SceneGraph
         /// </summary>
         IReadOnlyList<IRef<IDrawOperation>> DrawOperations { get; }
 
+        /// <summary>
+        /// Gets the opacity of the scene graph node.
+        /// </summary>
+        double Opacity { get; }
+
         /// <summary>
         /// Sets up the drawing context for rendering the node's geometry.
         /// </summary>
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
index 3ee689b6d2..306036ca2c 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
@@ -67,9 +67,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// <inheritdoc/>
         public bool HasAncestorGeometryClip { get; }
 
-        /// <summary>
-        /// Gets or sets the opacity of the scene graph node.
-        /// </summary>
+        /// <inheritdoc/>
         public double Opacity
         {
             get { return _opacity; }
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
index dda1d73649..2ada7bdbba 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
@@ -656,6 +656,43 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             }
         }
 
+        [Fact]
+        public void Setting_Opacity_Should_Add_Descendent_Bounds_To_DirtyRects()
+        {
+            using (TestApplication())
+            {
+                Decorator decorator;
+                Border border;
+                var tree = new TestRoot
+                {
+                    Child = decorator = new Decorator
+                    {
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            Width = 100,
+                            Height = 100,
+                        }
+                    }
+                };
+
+                tree.Measure(Size.Infinity);
+                tree.Arrange(new Rect(tree.DesiredSize));
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                decorator.Opacity = 0.5;
+                scene = scene.CloneScene();
+                sceneBuilder.Update(scene, decorator);
+
+                Assert.NotEmpty(scene.Layers.Single().Dirty);
+                var dirty = scene.Layers.Single().Dirty.Single();
+                Assert.Equal(new Rect(0, 0, 100, 100), dirty);
+            }
+        }
+
         [Fact]
         public void Should_Set_GeometryClip()
         {

From 7af3eb90586ebf1604226a9b384d0c4a2213cf91 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 4 Mar 2018 21:35:33 +0100
Subject: [PATCH 370/482] Force recurse when opacity changed.

Fixes #1420.
---
 src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
index b219a74119..6005ee8b8f 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
@@ -170,8 +170,9 @@ namespace Avalonia.Rendering.SceneGraph
                     var clipBounds = bounds.TransformToAABB(contextImpl.Transform).Intersect(clip);
 
                     forceRecurse = forceRecurse ||
-                        node.Transform != contextImpl.Transform ||
-                        node.ClipBounds != clipBounds;
+                        node.ClipBounds != clipBounds ||
+                        node.Opacity != opacity ||
+                        node.Transform != contextImpl.Transform;
 
                     node.Transform = contextImpl.Transform;
                     node.ClipBounds = clipBounds;

From b31f7385dc79debc8fe5d6111d18ea016cd83d5f Mon Sep 17 00:00:00 2001
From: ahopper <alan@samsararesearch.com>
Date: Mon, 5 Mar 2018 07:55:16 +0000
Subject: [PATCH 371/482] Allow progressbar width and height less than default

---
 src/Avalonia.Controls/ProgressBar.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Controls/ProgressBar.cs b/src/Avalonia.Controls/ProgressBar.cs
index 8cf6b149cb..19744d3038 100644
--- a/src/Avalonia.Controls/ProgressBar.cs
+++ b/src/Avalonia.Controls/ProgressBar.cs
@@ -90,16 +90,16 @@ namespace Avalonia.Controls
         {
             if (orientation == Orientation.Horizontal)
             {
-                MinHeight = 14;
-                MinWidth = 200;
+                MinHeight = Math.Min(14, double.IsNaN(Height) ? double.MaxValue : Height);
+                MinWidth = Math.Min(200, double.IsNaN(Width) ? double.MaxValue : Width);
 
                 _indicator.HorizontalAlignment = HorizontalAlignment.Left;
                 _indicator.VerticalAlignment = VerticalAlignment.Stretch;
             }
             else
             {
-                MinHeight = 200;
-                MinWidth = 14;
+                MinHeight = Math.Min(200, double.IsNaN(Height) ? double.MaxValue : Height);
+                MinWidth = Math.Min(14, double.IsNaN(Width) ? double.MaxValue : Width);
 
                 _indicator.HorizontalAlignment = HorizontalAlignment.Stretch;
                 _indicator.VerticalAlignment = VerticalAlignment.Bottom;

From 82acff0d57087b1fed5c8c0cc71a9b6a0ea5a983 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 5 Mar 2018 11:37:09 +0300
Subject: [PATCH 372/482] [GTK3] Unregister tick callback and properly close
 the window. Fixes #1424

---
 src/Gtk/Avalonia.Gtk3/Interop/Native.cs | 10 +++++++++-
 src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs | 22 ++++++++++++++++++----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/Gtk/Avalonia.Gtk3/Interop/Native.cs b/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
index 3e945798d4..2451d26126 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
+++ b/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
@@ -219,7 +219,10 @@ namespace Avalonia.Gtk3.Interop
             public delegate void gtk_widget_queue_draw_area(GtkWidget widget, int x, int y, int width, int height);
             
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Gtk)]
-            public delegate void gtk_widget_add_tick_callback(GtkWidget widget, TickCallback callback, IntPtr userData, IntPtr destroy);
+            public delegate uint gtk_widget_add_tick_callback(GtkWidget widget, TickCallback callback, IntPtr userData, IntPtr destroy);
+            
+            [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Gtk)]
+            public delegate uint gtk_widget_remove_tick_callback(GtkWidget widget, uint id);
 
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Gtk)]
             public delegate GtkImContext gtk_im_multicontext_new();
@@ -256,6 +259,9 @@ namespace Avalonia.Gtk3.Interop
 
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Gtk)]
             public delegate void gtk_window_unmaximize(GtkWindow window);
+            
+            [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Gtk)]
+            public delegate void gtk_window_close(GtkWindow window);
 
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Gdk)]
             public delegate void gtk_window_set_geometry_hints(GtkWindow window, IntPtr geometry_widget, ref GdkGeometry geometry, GdkWindowHints geom_mask);
@@ -434,6 +440,7 @@ namespace Avalonia.Gtk3.Interop
         public static D.gdk_window_invalidate_rect GdkWindowInvalidateRect;
         public static D.gtk_widget_queue_draw_area GtkWidgetQueueDrawArea;
         public static D.gtk_widget_add_tick_callback GtkWidgetAddTickCallback;
+        public static D.gtk_widget_remove_tick_callback GtkWidgetRemoveTickCallback;
         public static D.gtk_widget_activate GtkWidgetActivate;
         public static D.gtk_clipboard_get_for_display GtkClipboardGetForDisplay;
         public static D.gtk_clipboard_request_text GtkClipboardRequestText;
@@ -456,6 +463,7 @@ namespace Avalonia.Gtk3.Interop
         public static D.gtk_window_deiconify GtkWindowDeiconify;
         public static D.gtk_window_maximize GtkWindowMaximize;
         public static D.gtk_window_unmaximize GtkWindowUnmaximize;
+        public static D.gtk_window_close GtkWindowClose;
         public static D.gdk_window_begin_move_drag GdkWindowBeginMoveDrag;
         public static D.gdk_window_begin_resize_drag GdkWindowBeginResizeDrag;
         public static D.gdk_event_request_motions GdkEventRequestMotions;
diff --git a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
index c41a136bce..5aac4466b2 100644
--- a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
+++ b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
@@ -33,11 +33,11 @@ namespace Avalonia.Gtk3
         private readonly AutoResetEvent _canSetNextOperation = new AutoResetEvent(true);
         internal IntPtr? GdkWindowHandle;
         private bool _overrideRedirect;
+        private uint? _tickCallback;
         public WindowBaseImpl(GtkWindow gtkWidget)
         {
             
             GtkWidget = gtkWidget;
-            Disposables.Add(gtkWidget);
             _framebuffer = new FramebufferManager(this);
             _imContext = Native.GtkImMulticontextNew();
             Disposables.Add(_imContext);
@@ -62,7 +62,7 @@ namespace Avalonia.Gtk3
             {
                 Native.GtkWidgetSetDoubleBuffered(gtkWidget, false);
                 _gcHandle = GCHandle.Alloc(this);
-                Native.GtkWidgetAddTickCallback(GtkWidget, PinnedStaticCallback, GCHandle.ToIntPtr(_gcHandle), IntPtr.Zero);
+                _tickCallback = Native.GtkWidgetAddTickCallback(GtkWidget, PinnedStaticCallback, GCHandle.ToIntPtr(_gcHandle), IntPtr.Zero);
                 
             }
         }
@@ -103,7 +103,7 @@ namespace Avalonia.Gtk3
 
         private bool OnDestroy(IntPtr gtkwidget, IntPtr userdata)
         {
-            Dispose();
+            DoDispose(true);
             return false;
         }
 
@@ -297,14 +297,28 @@ namespace Avalonia.Gtk3
         }
 
 
-        public void Dispose()
+        public void Dispose() => DoDispose(false);
+        
+        void DoDispose(bool fromDestroy)
         {
+            if (_tickCallback.HasValue)
+            {
+                if (!GtkWidget.IsClosed)
+                    Native.GtkWidgetRemoveTickCallback(GtkWidget, _tickCallback.Value);
+                _tickCallback = null;
+            }
+            
             //We are calling it here, since signal handler will be detached
             if (!GtkWidget.IsClosed)
                 Closed?.Invoke();
             foreach(var d in Disposables.AsEnumerable().Reverse())
                 d.Dispose();
             Disposables.Clear();
+            
+            if (!fromDestroy && !GtkWidget.IsClosed)
+                Native.GtkWindowClose(GtkWidget);
+            GtkWidget.Dispose();
+            
             if (_gcHandle.IsAllocated)
             {
                 _gcHandle.Free();

From bc39fbe778ed544cc9ed84d45fa5b5883359d899 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 5 Mar 2018 11:40:06 +0300
Subject: [PATCH 373/482] Mirror G_IS_OBJECT check from g_object_unref to make
 sure that it's not caused by our Dispose

---
 src/Gtk/Avalonia.Gtk3/Interop/GObject.cs | 6 ++++++
 src/Gtk/Avalonia.Gtk3/Interop/Native.cs  | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/src/Gtk/Avalonia.Gtk3/Interop/GObject.cs b/src/Gtk/Avalonia.Gtk3/Interop/GObject.cs
index 8d14515d28..24bcfd71e9 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/GObject.cs
+++ b/src/Gtk/Avalonia.Gtk3/Interop/GObject.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -21,7 +22,12 @@ namespace Avalonia.Gtk3.Interop
         protected override bool ReleaseHandle()
         {
             if (handle != IntPtr.Zero)
+            {
+                Debug.Assert(Native.GTypeCheckInstanceIsFundamentallyA(handle, new IntPtr(Native.G_TYPE_OBJECT)),
+                    "Handle is not a GObject");
                 Native.GObjectUnref(handle);
+            }
+
             handle = IntPtr.Zero;
             return true;
         }
diff --git a/src/Gtk/Avalonia.Gtk3/Interop/Native.cs b/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
index 2451d26126..d4618e7bc1 100644
--- a/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
+++ b/src/Gtk/Avalonia.Gtk3/Interop/Native.cs
@@ -347,6 +347,9 @@ namespace Avalonia.Gtk3.Interop
 
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Glib)]
             public delegate ulong g_free(IntPtr data);
+
+            [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Gobject)]
+            public delegate bool g_type_check_instance_is_fundamentally_a(IntPtr instance, IntPtr type);
             
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Glib)]
             public unsafe delegate void g_slist_free(GSList* data);
@@ -433,6 +436,7 @@ namespace Avalonia.Gtk3.Interop
         public static D.g_timeout_add GTimeoutAdd;
         public static D.g_timeout_add_full GTimeoutAddFull;
         public static D.g_free GFree;
+        public static D.g_type_check_instance_is_fundamentally_a GTypeCheckInstanceIsFundamentallyA;
         public static D.g_slist_free GSlistFree;
         public static D.g_memory_input_stream_new_from_data GMemoryInputStreamNewFromData;
         public static D.gtk_widget_set_double_buffered GtkWidgetSetDoubleBuffered;
@@ -498,6 +502,7 @@ namespace Avalonia.Gtk3.Interop
         public static D.cairo_set_font_size CairoSetFontSize;
         public static D.cairo_move_to CairoMoveTo;
         public static D.cairo_destroy CairoDestroy;
+        public const int G_TYPE_OBJECT = 80;
     }
 
     public enum GtkWindowType

From 53397a2aab9fd98a0fac967e7540ea0e95601798 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 5 Mar 2018 09:54:25 +0100
Subject: [PATCH 374/482] Added failing test for #1423.

---
 .../WindowTests.cs                            | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
index 6168421919..a85c4df8af 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
@@ -6,6 +6,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.UnitTests;
@@ -231,11 +232,23 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        private void ClearOpenWindows()
+        [Fact]
+        public async Task ShowDialog_With_ValueType_Returns_Default_When_Closed()
         {
-            // HACK: We really need a decent way to have "statics" that can be scoped to
-            // AvaloniaLocator scopes.
-            ((IList<Window>)Window.OpenWindows).Clear();
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var windowImpl = new Mock<IWindowImpl>();
+                windowImpl.SetupProperty(x => x.Closed);
+                windowImpl.Setup(x => x.Scaling).Returns(1);
+
+                var target = new Window(windowImpl.Object);
+                var task = target.ShowDialog<bool>();
+
+                windowImpl.Object.Closed();
+
+                var result = await task;
+                Assert.False(result);
+            }
         }
 
         [Fact]
@@ -321,5 +334,12 @@ namespace Avalonia.Controls.UnitTests
                 x.Scaling == 1 &&
                 x.CreateRenderer(It.IsAny<IRenderRoot>()) == renderer.Object);
         }
+
+        private void ClearOpenWindows()
+        {
+            // HACK: We really need a decent way to have "statics" that can be scoped to
+            // AvaloniaLocator scopes.
+            ((IList<Window>)Window.OpenWindows).Clear();
+        }
     }
 }

From 0b828e1810f5f3d959149005ca41906ef43c89fa Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 5 Mar 2018 09:56:43 +0100
Subject: [PATCH 375/482] Don't try to cast null to value type.

The return type for `ShowDialog<T>` can be a value type. If so, use `default(T)` for the return value when the dialog is closed using the OS close button instead of trying to cast `null` to `T`.

Fixes #1423
---
 src/Avalonia.Controls/Window.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 141a9ac377..9db7db365d 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -358,7 +358,7 @@ namespace Avalonia.Controls
                         modal?.Dispose();
                         SetIsEnabled(affectedWindows, true);
                         activated?.Activate();
-                        result.SetResult((TResult)_dialogResult);
+                        result.SetResult((TResult)(_dialogResult ?? default(TResult)));
                     });
 
                 return result.Task;

From 77b74444bac5564371094e353d5856342e0ba237 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 5 Mar 2018 12:51:07 +0300
Subject: [PATCH 376/482] Improved unmanaged memory allocation diagnostics. ref
 #1411

---
 src/Gtk/Avalonia.Gtk3/FramebufferManager.cs   |  5 +--
 .../Avalonia.MonoMac/EmulatedFramebuffer.cs   | 10 +++---
 .../StandardRuntimePlatform.cs                | 31 ++++++++++++-------
 .../Avalonia.Win32/WindowFramebuffer.cs       | 22 ++++---------
 4 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/Gtk/Avalonia.Gtk3/FramebufferManager.cs b/src/Gtk/Avalonia.Gtk3/FramebufferManager.cs
index a673047e8c..82dbf53579 100644
--- a/src/Gtk/Avalonia.Gtk3/FramebufferManager.cs
+++ b/src/Gtk/Avalonia.Gtk3/FramebufferManager.cs
@@ -26,8 +26,9 @@ namespace Avalonia.Gtk3
         {
             // This method may be called from non-UI thread, don't touch anything that calls back to GTK/GDK
             var s = _window.ClientSize;
-            var width = (int) s.Width;
-            var height = (int) s.Height;
+            var width = Math.Max(1, (int) s.Width);
+            var height = Math.Max(1, (int) s.Height);
+            
             
             if (!Dispatcher.UIThread.CheckAccess() && Gtk3Platform.DisplayClassName.ToLower().Contains("x11"))
             {
diff --git a/src/OSX/Avalonia.MonoMac/EmulatedFramebuffer.cs b/src/OSX/Avalonia.MonoMac/EmulatedFramebuffer.cs
index 935ab53432..6cd2b16afa 100644
--- a/src/OSX/Avalonia.MonoMac/EmulatedFramebuffer.cs
+++ b/src/OSX/Avalonia.MonoMac/EmulatedFramebuffer.cs
@@ -12,6 +12,7 @@ namespace Avalonia.MonoMac
         private readonly TopLevelImpl.TopLevelView _view;
         private readonly CGSize _logicalSize;
         private readonly bool _isDeferred;
+        private readonly IUnmanagedBlob _blob;
 
         [DllImport("libc")]
         static extern void memset(IntPtr p, int c, IntPtr size);
@@ -29,13 +30,13 @@ namespace Avalonia.MonoMac
             Dpi = new Vector(96 * pixelSize.Width / _logicalSize.Width, 96 * pixelSize.Height / _logicalSize.Height);
             Format = PixelFormat.Rgba8888;
             var size = Height * RowBytes;
-            Address = Marshal.AllocHGlobal(size);
+            _blob = AvaloniaLocator.Current.GetService<IRuntimePlatform>().AllocBlob(size);
             memset(Address, 0, new IntPtr(size));
         }
         
         public void Dispose()
         {
-            if (Address == IntPtr.Zero)
+            if (_blob.IsDisposed)
                 return;
             var nfo = (int) CGBitmapFlags.ByteOrder32Big | (int) CGImageAlphaInfo.PremultipliedLast;
             CGImage image = null;
@@ -71,14 +72,13 @@ namespace Avalonia.MonoMac
                     else
                         _view.SetBackBufferImage(new SavedImage(image, _logicalSize));
                 }
-                Marshal.FreeHGlobal(Address);
-                Address = IntPtr.Zero;
+                _blob.Dispose();
             }
 
 
         }
 
-        public IntPtr Address { get; private set; }
+        public IntPtr Address => _blob.Address;
         public int Width { get; }
         public int Height { get; }
         public int RowBytes { get; }
diff --git a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
index b777736f06..d352a588e0 100644
--- a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
+++ b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
@@ -28,11 +28,13 @@ namespace Avalonia.Shared.PlatformSupport
         class UnmanagedBlob : IUnmanagedBlob
         {
             private readonly StandardRuntimePlatform _plat;
+            private IntPtr _address;
 #if DEBUG
             private static readonly List<string> Backtraces = new List<string>();
             private static Thread GCThread;
             private readonly string _backtrace;
-
+            private readonly object _lock = new object();
+            private static readonly object _btlock = new object();
 
             class GCThreadDetector
             {
@@ -55,28 +57,35 @@ namespace Avalonia.Shared.PlatformSupport
             
             public UnmanagedBlob(StandardRuntimePlatform plat, int size)
             {
+                if (size <= 0)
+                    throw new ArgumentException("Positive number required", nameof(size));
                 _plat = plat;
-                Address = plat.Alloc(size);
+                _address = plat.Alloc(size);
                 GC.AddMemoryPressure(size);
                 Size = size;
 #if DEBUG
                 _backtrace = Environment.StackTrace;
-                Backtraces.Add(_backtrace);
+                lock (_btlock)
+                    Backtraces.Add(_backtrace);
 #endif
             }
 
             void DoDispose()
             {
-                if (!IsDisposed)
+                lock (_lock)
                 {
+                    if (!IsDisposed)
+                    {
 #if DEBUG
-                    Backtraces.Remove(_backtrace);
+                        lock (_btlock)
+                            Backtraces.Remove(_backtrace);
 #endif
-                    _plat.Free(Address, Size);
-                    GC.RemoveMemoryPressure(Size);
-                    IsDisposed = true;
-                    Address = IntPtr.Zero;
-                    Size = 0;
+                        _plat.Free(_address, Size);
+                        GC.RemoveMemoryPressure(Size);
+                        IsDisposed = true;
+                        _address = IntPtr.Zero;
+                        Size = 0;
+                    }
                 }
             }
 
@@ -102,7 +111,7 @@ namespace Avalonia.Shared.PlatformSupport
                 DoDispose();
             }
 
-            public IntPtr Address { get; private set; }
+            public IntPtr Address => IsDisposed ? throw new ObjectDisposedException("UnmanagedBlob") : _address; 
             public int Size { get; private set; }
             public bool IsDisposed { get; private set; }
         }
diff --git a/src/Windows/Avalonia.Win32/WindowFramebuffer.cs b/src/Windows/Avalonia.Win32/WindowFramebuffer.cs
index df238c919e..83ab288c54 100644
--- a/src/Windows/Avalonia.Win32/WindowFramebuffer.cs
+++ b/src/Windows/Avalonia.Win32/WindowFramebuffer.cs
@@ -10,7 +10,7 @@ namespace Avalonia.Win32
     public class WindowFramebuffer : ILockedFramebuffer
     {
         private readonly IntPtr _handle;
-        private IntPtr _pBitmap;
+        private IUnmanagedBlob _bitmapBlob;
         private UnmanagedMethods.BITMAPINFOHEADER _bmpInfo;
 
         public WindowFramebuffer(IntPtr handle, int width, int height)
@@ -27,7 +27,7 @@ namespace Avalonia.Win32
             _bmpInfo.Init();
             _bmpInfo.biWidth = width;
             _bmpInfo.biHeight = -height;
-            _pBitmap = Marshal.AllocHGlobal(width * height * 4);
+            _bitmapBlob = AvaloniaLocator.Current.GetService<IRuntimePlatform>().AllocBlob(width * height * 4);
         }
 
         ~WindowFramebuffer()
@@ -35,7 +35,7 @@ namespace Avalonia.Win32
             Deallocate();
         }
 
-        public IntPtr Address => _pBitmap;
+        public IntPtr Address => _bitmapBlob.Address;
         public int RowBytes => Width * 4;
         public PixelFormat Format => PixelFormat.Bgra8888;
 
@@ -70,21 +70,18 @@ namespace Avalonia.Win32
         public void DrawToDevice(IntPtr hDC, int destX = 0, int destY = 0, int srcX = 0, int srcY = 0, int width = -1,
             int height = -1)
         {
-            if(_pBitmap == IntPtr.Zero)
-                throw new ObjectDisposedException("Framebuffer");
             if (width == -1)
                 width = Width;
             if (height == -1)
                 height = Height;
             UnmanagedMethods.SetDIBitsToDevice(hDC, destX, destY, (uint) width, (uint) height, srcX, srcY,
-                0, (uint)Height, _pBitmap, ref _bmpInfo, 0);
+                0, (uint)Height, _bitmapBlob.Address, ref _bmpInfo, 0);
         }
 
         public bool DrawToWindow(IntPtr hWnd, int destX = 0, int destY = 0, int srcX = 0, int srcY = 0, int width = -1,
             int height = -1)
         {
-
-            if (_pBitmap == IntPtr.Zero)
+            if (_bitmapBlob.IsDisposed)
                 throw new ObjectDisposedException("Framebuffer");
             if (hWnd == IntPtr.Zero)
                 return false;
@@ -102,13 +99,6 @@ namespace Avalonia.Win32
             DrawToWindow(_handle);
         }
 
-        public void Deallocate()
-        {
-            if (_pBitmap != IntPtr.Zero)
-            {
-                Marshal.FreeHGlobal(_pBitmap);
-                _pBitmap = IntPtr.Zero;
-            }
-        }
+        public void Deallocate() => _bitmapBlob.Dispose();
     }
 }
\ No newline at end of file

From 1784b5178124cee838de330c9cbbfd9875861629 Mon Sep 17 00:00:00 2001
From: ahopper <alan@samsararesearch.com>
Date: Mon, 5 Mar 2018 10:55:06 +0000
Subject: [PATCH 377/482] ProgressBar MinWidth & MinHeight set in template

---
 src/Avalonia.Controls/ProgressBar.cs         | 26 +--------
 src/Avalonia.Themes.Default/ProgressBar.xaml | 58 +++++++++++++-------
 2 files changed, 41 insertions(+), 43 deletions(-)

diff --git a/src/Avalonia.Controls/ProgressBar.cs b/src/Avalonia.Controls/ProgressBar.cs
index 19744d3038..34954dd0d5 100644
--- a/src/Avalonia.Controls/ProgressBar.cs
+++ b/src/Avalonia.Controls/ProgressBar.cs
@@ -26,12 +26,13 @@ namespace Avalonia.Controls
 
         static ProgressBar()
         {
+            PseudoClass(OrientationProperty, o => o == Avalonia.Controls.Orientation.Vertical, ":vertical");
+            PseudoClass(OrientationProperty, o => o == Avalonia.Controls.Orientation.Horizontal, ":horizontal");
+
             ValueProperty.Changed.AddClassHandler<ProgressBar>(x => x.ValueChanged);
 
             IsIndeterminateProperty.Changed.AddClassHandler<ProgressBar>(
                 (p, e) => { if (p._indicator != null) p.UpdateIsIndeterminate((bool)e.NewValue); });
-            OrientationProperty.Changed.AddClassHandler<ProgressBar>(
-                (p, e) => { if (p._indicator != null) p.UpdateOrientation((Orientation)e.NewValue); });
         }
 
         public bool IsIndeterminate
@@ -59,7 +60,6 @@ namespace Avalonia.Controls
             _indicator = e.NameScope.Get<Border>("PART_Indicator");
 
             UpdateIndicator(Bounds.Size);
-            UpdateOrientation(Orientation);
             UpdateIsIndeterminate(IsIndeterminate);
         }
 
@@ -86,26 +86,6 @@ namespace Avalonia.Controls
             }
         }
 
-        private void UpdateOrientation(Orientation orientation)
-        {
-            if (orientation == Orientation.Horizontal)
-            {
-                MinHeight = Math.Min(14, double.IsNaN(Height) ? double.MaxValue : Height);
-                MinWidth = Math.Min(200, double.IsNaN(Width) ? double.MaxValue : Width);
-
-                _indicator.HorizontalAlignment = HorizontalAlignment.Left;
-                _indicator.VerticalAlignment = VerticalAlignment.Stretch;
-            }
-            else
-            {
-                MinHeight = Math.Min(200, double.IsNaN(Height) ? double.MaxValue : Height);
-                MinWidth = Math.Min(14, double.IsNaN(Width) ? double.MaxValue : Width);
-
-                _indicator.HorizontalAlignment = HorizontalAlignment.Stretch;
-                _indicator.VerticalAlignment = VerticalAlignment.Bottom;
-            }
-        }
-
         private void UpdateIsIndeterminate(bool isIndeterminate)
         {
             if (isIndeterminate)
diff --git a/src/Avalonia.Themes.Default/ProgressBar.xaml b/src/Avalonia.Themes.Default/ProgressBar.xaml
index 82f385e16b..c9c898562c 100644
--- a/src/Avalonia.Themes.Default/ProgressBar.xaml
+++ b/src/Avalonia.Themes.Default/ProgressBar.xaml
@@ -1,20 +1,38 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="ProgressBar">
-  <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
-  <Setter Property="Foreground" Value="{DynamicResource ThemeAccentBrush}"/>
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}">
-        <Grid>
-          <Border Name="PART_Track"
-                  BorderThickness="1"
-                  BorderBrush="{TemplateBinding Background}"/>
-          <Border Name="PART_Indicator"
-                  BorderThickness="1"
-                  Background="{TemplateBinding Foreground}"/>
-        </Grid>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
\ No newline at end of file
+<Styles xmlns="https://github.com/avaloniaui">
+  <Style Selector="ProgressBar">
+    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
+    <Setter Property="Foreground" Value="{DynamicResource ThemeAccentBrush}"/> 
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}">
+          <Grid>
+            <Border Name="PART_Track"
+                    BorderThickness="1"
+                    BorderBrush="{TemplateBinding Background}"/>
+            <Border Name="PART_Indicator"
+                    BorderThickness="1"
+                    Background="{TemplateBinding Foreground}" />
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+  <Style Selector="ProgressBar:horizontal /template/ Border#PART_Indicator">
+    <Setter Property="HorizontalAlignment" Value="Left"/>
+    <Setter Property="VerticalAlignment" Value="Stretch"/>
+  </Style>
+  <Style Selector="ProgressBar:vertical /template/ Border#PART_Indicator">
+    <Setter Property="HorizontalAlignment" Value="Stretch"/>
+    <Setter Property="VerticalAlignment" Value="Bottom"/>
+  </Style>
+  <Style Selector="ProgressBar:horizontal">
+    <Setter Property="MinWidth" Value="200"/>
+    <Setter Property="MinHeight" Value="14"/>
+  </Style>
+  <Style Selector="ProgressBar:vertical">
+    <Setter Property="MinWidth" Value="14"/>
+    <Setter Property="MinHeight" Value="200"/>
+  </Style>
+</Styles>
\ No newline at end of file

From 8f92a1a8183955e27332fc98eaa8bfebf5f38a13 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 5 Mar 2018 15:25:48 +0300
Subject: [PATCH 378/482] Conditional compilation

---
 src/Shared/PlatformSupport/StandardRuntimePlatform.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
index d352a588e0..16977d5f97 100644
--- a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
+++ b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
@@ -29,11 +29,11 @@ namespace Avalonia.Shared.PlatformSupport
         {
             private readonly StandardRuntimePlatform _plat;
             private IntPtr _address;
+            private readonly object _lock = new object();
 #if DEBUG
             private static readonly List<string> Backtraces = new List<string>();
             private static Thread GCThread;
             private readonly string _backtrace;
-            private readonly object _lock = new object();
             private static readonly object _btlock = new object();
 
             class GCThreadDetector
@@ -164,4 +164,4 @@ namespace Avalonia.Shared.PlatformSupport
         void Free(IntPtr ptr, int len) => Marshal.FreeHGlobal(ptr);
 #endif
     }
-}
\ No newline at end of file
+}

From ee8ae91f72f99957e2dfb20ac623452b4cec8ca9 Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Mon, 12 Feb 2018 14:17:56 -0500
Subject: [PATCH 379/482] Ported the AutoCompleteBox control from Silverlight

---
 samples/ControlCatalog/ControlCatalog.csproj  |    6 +
 samples/ControlCatalog/MainView.xaml          |    5 +-
 .../Pages/AutoCompleteBoxPage.xaml            |   55 +
 .../Pages/AutoCompleteBoxPage.xaml.cs         |  125 +
 src/Avalonia.Controls/AutoCompleteBox.cs      | 2669 +++++++++++++++++
 .../Utils/ISelectionAdapter.cs                |   64 +
 .../SelectingItemsControlSelectionAdapter.cs  |  342 +++
 .../AutoCompleteBox.xaml                      |   43 +
 src/Avalonia.Themes.Default/DefaultTheme.xaml |    3 +-
 9 files changed, 3309 insertions(+), 3 deletions(-)
 create mode 100644 samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
 create mode 100644 samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
 create mode 100644 src/Avalonia.Controls/AutoCompleteBox.cs
 create mode 100644 src/Avalonia.Controls/Utils/ISelectionAdapter.cs
 create mode 100644 src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs
 create mode 100644 src/Avalonia.Themes.Default/AutoCompleteBox.xaml

diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 37f9da0c43..f6d5627555 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -38,6 +38,9 @@
     <EmbeddedResource Include="Pages\DialogsPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Pages\AutoCompleteBoxPage.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Pages\BorderPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -110,6 +113,9 @@
     <Compile Include="Pages\BorderPage.xaml.cs">
       <DependentUpon>BorderPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\AutoCompleteBoxPage.xaml.cs">
+      <DependentUpon>AutoCompleteBoxPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\ButtonPage.xaml.cs">
       <DependentUpon>ButtonPage.xaml</DependentUpon>
     </Compile>
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 060369e404..e8b87e99b0 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -5,9 +5,10 @@
     <TabControl.Transition>
       <CrossFade Duration="0.25"/>
     </TabControl.Transition>
+    <TabItem Header="AutoCompleteBox"><pages:AutoCompleteBoxPage/></TabItem>
     <TabItem Header="Border"><pages:BorderPage/></TabItem>
     <TabItem Header="Button"><pages:ButtonPage/></TabItem>
-    <TabItem Header="Calendar"><pages:CalendarPage/></TabItem> 
+    <TabItem Header="Calendar"><pages:CalendarPage/></TabItem>
     <TabItem Header="Canvas"><pages:CanvasPage/></TabItem>
     <TabItem Header="Carousel"><pages:CarouselPage/></TabItem>
     <TabItem Header="CheckBox"><pages:CheckBoxPage/></TabItem>
@@ -25,4 +26,4 @@
     <TabItem Header="ToolTip"><pages:ToolTipPage/></TabItem>
     <TabItem Header="TreeView"><pages:TreeViewPage/></TabItem>
   </TabControl>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
new file mode 100644
index 0000000000..491f41ecbf
--- /dev/null
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
@@ -0,0 +1,55 @@
+<UserControl xmlns="https://github.com/avaloniaui">
+  <StackPanel Orientation="Vertical" Gap="4">
+    <TextBlock Classes="h1">AutoCompleteBox</TextBlock>
+    <TextBlock Classes="h2">A control into which the user can input text</TextBlock>
+
+    <StackPanel Orientation="Horizontal"
+              Margin="0,16,0,0"
+              HorizontalAlignment="Center"
+              Gap="8">
+      <StackPanel Orientation="Vertical">
+        
+        <TextBlock Text="MinimumPrefixLength: 1"/>
+        <AutoCompleteBox Width="200"
+                         Margin="0,0,0,8"
+                         MinimumPrefixLength="1"/>
+        <TextBlock Text="MinimumPrefixLength: 3"/>
+        <AutoCompleteBox Width="200"
+                         Margin="0,0,0,8"
+                         MinimumPrefixLength="3"/>
+        <TextBlock Text="MinimumPopulateDelay: 1 Second"/>
+        <AutoCompleteBox Width="200"
+                         Margin="0,0,0,8"
+                         MinimumPopulateDelay="1"/>
+        <TextBlock Text="MaxDropDownHeight: 60"/>
+        <AutoCompleteBox Width="200"
+                         Margin="0,0,0,8"
+                         MaxDropDownHeight="60"/>
+        <AutoCompleteBox Width="200"
+                         Margin="0,0,0,8"
+                         Watermark="Watermark"/>
+        <TextBlock Text="Disabled"/>
+        <AutoCompleteBox Width="200"
+                         IsEnabled="False"/>
+      </StackPanel>
+      
+
+      <StackPanel Orientation="Vertical">
+        <TextBlock Text="ValueMemeberSelector"/>
+        <AutoCompleteBox Width="200"
+                         Margin="0,0,0,8"
+                         ValueMemberSelector="Capital"/>
+        <TextBlock Text="ValueMemberBinding"/>
+        <AutoCompleteBox Width="200"
+                         Margin="0,0,0,8"
+                         ValueMemberBinding="{Binding Capital}"/>
+        <TextBlock Text="Multi-Binding"/>
+        <AutoCompleteBox Name="MultiBindingBox"
+                         Width="200"
+                         Margin="0,0,0,8"
+                         ValueMemberBinding="{Binding Capital}"
+                         FilterMode="Contains"/>
+      </StackPanel>
+    </StackPanel>
+  </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
new file mode 100644
index 0000000000..9f181d44f2
--- /dev/null
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
@@ -0,0 +1,125 @@
+using Avalonia.Controls;
+using Avalonia.LogicalTree;
+using Avalonia.Markup;
+using Avalonia.Markup.Xaml;
+using Avalonia.Markup.Xaml.Data;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ControlCatalog.Pages
+{
+    public class AutoCompleteBoxPage : UserControl
+    {
+        public class StateData
+        {
+            public string Name { get; private set; }
+            public string Abbreviation { get; private set; }
+            public string Capital { get; private set; }
+
+            public StateData(string name, string abbreviatoin, string capital)
+            {
+                Name = name;
+                Abbreviation = abbreviatoin;
+                Capital = capital;
+            }
+
+            public override string ToString()
+            {
+                return Name;
+            }
+        }
+
+        private StateData[] BuildAllStates()
+        {
+            return new StateData[]
+            {
+                new StateData("Alabama","AL","Montgomery"),
+                new StateData("Alaska","AK","Juneau"),
+                new StateData("Arizona","AZ","Phoenix"),
+                new StateData("Arkansas","AR","Little Rock"),
+                new StateData("California","CA","Sacramento"),
+                new StateData("Colorado","CO","Denver"),
+                new StateData("Connecticut","CT","Hartford"),
+                new StateData("Delaware","DE","Dover"),
+                new StateData("Florida","FL","Tallahassee"),
+                new StateData("Georgia","GA","Atlanta"),
+                new StateData("Hawaii","HI","Honolulu"),
+                new StateData("Idaho","ID","Boise"),
+                new StateData("Illinois","IL","Springfield"),
+                new StateData("Indiana","IN","Indianapolis"),
+                new StateData("Iowa","IA","Des Moines"),
+                new StateData("Kansas","KS","Topeka"),
+                new StateData("Kentucky","KY","Frankfort"),
+                new StateData("Louisiana","LA","Baton Rouge"),
+                new StateData("Maine","ME","Augusta"),
+                new StateData("Maryland","MD","Annapolis"),
+                new StateData("Massachusetts","MA","Boston"),
+                new StateData("Michigan","MI","Lansing"),
+                new StateData("Minnesota","MN","St. Paul"),
+                new StateData("Mississippi","MS","Jackson"),
+                new StateData("Missouri","MO","Jefferson City"),
+                new StateData("Montana","MT","Helena"),
+                new StateData("Nebraska","NE","Lincoln"),
+                new StateData("Nevada","NV","Carson City"),
+                new StateData("New Hampshire","NH","Concord"),
+                new StateData("New Jersey","NJ","Trenton"),
+                new StateData("New Mexico","NM","Santa Fe"),
+                new StateData("New York","NY","Albany"),
+                new StateData("North Carolina","NC","Raleigh"),
+                new StateData("North Dakota","ND","Bismarck"),
+                new StateData("Ohio","OH","Columbus"),
+                new StateData("Oklahoma","OK","Oklahoma City"),
+                new StateData("Oregon","OR","Salem"),
+                new StateData("Pennsylvania","PA","Harrisburg"),
+                new StateData("Rhode Island","RI","Providence"),
+                new StateData("South Carolina","SC","Columbia"),
+                new StateData("South Dakota","SD","Pierre"),
+                new StateData("Tennessee","TN","Nashville"),
+                new StateData("Texas","TX","Austin"),
+                new StateData("Utah","UT","Salt Lake City"),
+                new StateData("Vermont","VT","Montpelier"),
+                new StateData("Virginia","VA","Richmond"),
+                new StateData("Washington","WA","Olympia"),
+                new StateData("West Virginia","WV","Charleston"),
+                new StateData("Wisconsin","WI","Madison"),
+                new StateData("Wyoming","WY","Cheyenne"),
+            };
+        }
+        public StateData[] States { get; private set; }
+        
+        public AutoCompleteBoxPage()
+        {
+            this.InitializeComponent();
+
+            States = BuildAllStates();
+
+            foreach (AutoCompleteBox box in GetAllAutoCompleteBox())
+            {
+                box.Items = States;
+            }
+
+            var converter = new FuncMultiValueConverter<string, string>(parts =>
+            {
+                return String.Format("{0} ({1})", parts.ToArray());
+            });
+            var binding = new MultiBinding { Converter = converter };
+            binding.Bindings.Add(new Binding("Name"));
+            binding.Bindings.Add(new Binding("Abbreviation"));
+
+            var multibindingBox = this.FindControl<AutoCompleteBox>("MultiBindingBox");
+            multibindingBox.ValueMemberBinding = binding;
+        }
+        private IEnumerable<AutoCompleteBox> GetAllAutoCompleteBox()
+        {
+            return
+                this.GetLogicalDescendants()
+                    .OfType<AutoCompleteBox>();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/AutoCompleteBox.cs b/src/Avalonia.Controls/AutoCompleteBox.cs
new file mode 100644
index 0000000000..0e8b93146c
--- /dev/null
+++ b/src/Avalonia.Controls/AutoCompleteBox.cs
@@ -0,0 +1,2669 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Utils;
+using Avalonia.Data;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using Avalonia.Collections;
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Collections;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using Avalonia.Threading;
+using Avalonia.Controls.Templates;
+using Avalonia.VisualTree;
+using Avalonia.Utilities;
+using System.Globalization;
+using System.Collections.Specialized;
+using System.Reactive.Disposables;
+
+namespace Avalonia.Controls
+{
+    public class CancelableEventArgs : EventArgs
+    {
+        public bool Cancel { get; set; }
+
+        public CancelableEventArgs()
+            : base()
+        { }
+    }
+    
+    /// <summary>
+    /// Provides data for the
+    /// <see cref="E:Avalonia.Controls.AutoCompleteBox.Populated" />
+    /// event.
+    /// </summary>
+    public class PopulatedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the list of possible matches added to the drop-down portion of
+        /// the <see cref="T:Avalonia.Controls.AutoCompleteBox" />
+        /// control.
+        /// </summary>
+        /// <value>The list of possible matches added to the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" />.</value>
+        public IEnumerable Data { get; private set; }
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.PopulatedEventArgs" />.
+        /// </summary>
+        /// <param name="data">The list of possible matches added to the
+        /// drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.</param>
+        public PopulatedEventArgs(IEnumerable data)
+        {
+            Data = data;
+        }
+    }
+
+    /// <summary>
+    /// Provides data for the
+    /// <see cref="E:Avalonia.Controls.AutoCompleteBox.Populating" />
+    /// event.
+    /// </summary>
+    /// <QualityBand>Stable</QualityBand>
+    public class PopulatingEventArgs : CancelableEventArgs
+    {
+        /// <summary>
+        /// Gets the text that is used to determine which items to display in
+        /// the <see cref="T:Avalonia.Controls.AutoCompleteBox" />
+        /// control.
+        /// </summary>
+        /// <value>The text that is used to determine which items to display in
+        /// the <see cref="T:Avalonia.Controls.AutoCompleteBox" />.</value>
+        public string Parameter { get; private set; }
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.PopulatingEventArgs" />.
+        /// </summary>
+        /// <param name="parameter">The value of the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.SearchText" />
+        /// property, which is used to filter items for the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.</param>
+        public PopulatingEventArgs(string parameter)
+        {
+            Parameter = parameter;
+        }
+    }
+
+    /// <summary>
+    /// Represents the filter used by the
+    /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control to
+    /// determine whether an item is a possible match for the specified text.
+    /// </summary>
+    /// <returns>true to indicate <paramref name="item" /> is a possible match
+    /// for <paramref name="search" />; otherwise false.</returns>
+    /// <param name="search">The string used as the basis for filtering.</param>
+    /// <param name="item">The item that is compared with the
+    /// <paramref name="search" /> parameter.</param>
+    /// <typeparam name="T">The type used for filtering the
+    /// <see cref="T:Avalonia.Controls.AutoCompleteBox" />. This type can
+    /// be either a string or an object.</typeparam>
+    /// <QualityBand>Stable</QualityBand>
+    public delegate bool AutoCompleteFilterPredicate<T>(string search, T item);
+
+    /// <summary>
+    /// Specifies how text in the text box portion of the
+    /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control is used
+    /// to filter items specified by the
+    /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+    /// property for display in the drop-down.
+    /// </summary>
+    /// <QualityBand>Stable</QualityBand>
+    public enum AutoCompleteFilterMode
+    {
+        /// <summary>
+        /// Specifies that no filter is used. All items are returned.
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// Specifies a culture-sensitive, case-insensitive filter where the
+        /// returned items start with the specified text. The filter uses the
+        /// <see cref="M:System.String.StartsWith(System.String,System.StringComparison)" />
+        /// method, specifying
+        /// <see cref="P:System.StringComparer.CurrentCultureIgnoreCase" /> as
+        /// the string comparison criteria.
+        /// </summary>
+        StartsWith = 1,
+
+        /// <summary>
+        /// Specifies a culture-sensitive, case-sensitive filter where the
+        /// returned items start with the specified text. The filter uses the
+        /// <see cref="M:System.String.StartsWith(System.String,System.StringComparison)" />
+        /// method, specifying
+        /// <see cref="P:System.StringComparer.CurrentCulture" /> as the string
+        /// comparison criteria.
+        /// </summary>
+        StartsWithCaseSensitive = 2,
+
+        /// <summary>
+        /// Specifies an ordinal, case-insensitive filter where the returned
+        /// items start with the specified text. The filter uses the
+        /// <see cref="M:System.String.StartsWith(System.String,System.StringComparison)" />
+        /// method, specifying
+        /// <see cref="P:System.StringComparer.OrdinalIgnoreCase" /> as the
+        /// string comparison criteria.
+        /// </summary>
+        StartsWithOrdinal = 3,
+
+        /// <summary>
+        /// Specifies an ordinal, case-sensitive filter where the returned items
+        /// start with the specified text. The filter uses the
+        /// <see cref="M:System.String.StartsWith(System.String,System.StringComparison)" />
+        /// method, specifying <see cref="P:System.StringComparer.Ordinal" /> as
+        /// the string comparison criteria.
+        /// </summary>
+        StartsWithOrdinalCaseSensitive = 4,
+
+        /// <summary>
+        /// Specifies a culture-sensitive, case-insensitive filter where the
+        /// returned items contain the specified text.
+        /// </summary>
+        Contains = 5,
+
+        /// <summary>
+        /// Specifies a culture-sensitive, case-sensitive filter where the
+        /// returned items contain the specified text.
+        /// </summary>
+        ContainsCaseSensitive = 6,
+
+        /// <summary>
+        /// Specifies an ordinal, case-insensitive filter where the returned
+        /// items contain the specified text.
+        /// </summary>
+        ContainsOrdinal = 7,
+
+        /// <summary>
+        /// Specifies an ordinal, case-sensitive filter where the returned items
+        /// contain the specified text.
+        /// </summary>
+        ContainsOrdinalCaseSensitive = 8,
+
+        /// <summary>
+        /// Specifies a culture-sensitive, case-insensitive filter where the
+        /// returned items equal the specified text. The filter uses the
+        /// <see cref="M:System.String.Equals(System.String,System.StringComparison)" />
+        /// method, specifying
+        /// <see cref="P:System.StringComparer.CurrentCultureIgnoreCase" /> as
+        /// the search comparison criteria.
+        /// </summary>
+        Equals = 9,
+
+        /// <summary>
+        /// Specifies a culture-sensitive, case-sensitive filter where the
+        /// returned items equal the specified text. The filter uses the
+        /// <see cref="M:System.String.Equals(System.String,System.StringComparison)" />
+        /// method, specifying
+        /// <see cref="P:System.StringComparer.CurrentCulture" /> as the string
+        /// comparison criteria.
+        /// </summary>
+        EqualsCaseSensitive = 10,
+
+        /// <summary>
+        /// Specifies an ordinal, case-insensitive filter where the returned
+        /// items equal the specified text. The filter uses the
+        /// <see cref="M:System.String.Equals(System.String,System.StringComparison)" />
+        /// method, specifying
+        /// <see cref="P:System.StringComparer.OrdinalIgnoreCase" /> as the
+        /// string comparison criteria.
+        /// </summary>
+        EqualsOrdinal = 11,
+
+        /// <summary>
+        /// Specifies an ordinal, case-sensitive filter where the returned items
+        /// equal the specified text. The filter uses the
+        /// <see cref="M:System.String.Equals(System.String,System.StringComparison)" />
+        /// method, specifying <see cref="P:System.StringComparer.Ordinal" /> as
+        /// the string comparison criteria.
+        /// </summary>
+        EqualsOrdinalCaseSensitive = 12,
+
+        /// <summary>
+        /// Specifies that a custom filter is used. This mode is used when the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.TextFilter" />
+        /// or
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemFilter" />
+        /// properties are set.
+        /// </summary>
+        Custom = 13,
+    }
+
+    /// <summary>
+    /// Represents a control that provides a text box for user input and a
+    /// drop-down that contains possible matches based on the input in the text
+    /// box.
+    /// </summary>
+    public class AutoCompleteBox : TemplatedControl
+    {
+        /// <summary>
+        /// Specifies the name of the selection adapter TemplatePart.
+        /// </summary>
+        private const string ElementSelectionAdapter = "PART_SelectionAdapter";
+
+        /// <summary>
+        /// Specifies the name of the Selector TemplatePart.
+        /// </summary>
+        private const string ElementSelector = "PART_SelectingItemsControl";
+
+        /// <summary>
+        /// Specifies the name of the Popup TemplatePart.
+        /// </summary>
+        private const string ElementPopup = "PART_Popup";
+        
+        /// <summary>
+        /// The name for the text box part.
+        /// </summary>
+        private const string ElementTextBox = "PART_TextBox";
+
+        private IEnumerable _itemsEnumerable;
+
+        /// <summary>
+        /// Gets or sets a local cached copy of the items data.
+        /// </summary>
+        private List<object> _items;
+
+        /// <summary>
+        /// Gets or sets the observable collection that contains references to 
+        /// all of the items in the generated view of data that is provided to 
+        /// the selection-style control adapter.
+        /// </summary>
+        private AvaloniaList<object> _view;
+
+        /// <summary>
+        /// Gets or sets a value to ignore a number of pending change handlers. 
+        /// The value is decremented after each use. This is used to reset the 
+        /// value of properties without performing any of the actions in their 
+        /// change handlers.
+        /// </summary>
+        /// <remarks>The int is important as a value because the TextBox 
+        /// TextChanged event does not immediately fire, and this will allow for
+        /// nested property changes to be ignored.</remarks>
+        private int _ignoreTextPropertyChange;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to ignore calling a pending 
+        /// change handlers. 
+        /// </summary>
+        private bool _ignorePropertyChange;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to ignore the selection 
+        /// changed event.
+        /// </summary>
+        private bool _ignoreTextSelectionChange;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to skip the text update 
+        /// processing when the selected item is updated.
+        /// </summary>
+        private bool _skipSelectedItemTextUpdate;
+
+        /// <summary>
+        /// Gets or sets the last observed text box selection start location.
+        /// </summary>
+        private int _textSelectionStart;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the user initiated the 
+        /// current populate call.
+        /// </summary>
+        private bool _userCalledPopulate;
+
+        /// <summary>
+        /// A value indicating whether the popup has been opened at least once.
+        /// </summary>
+        private bool _popupHasOpened;
+
+        /// <summary>
+        /// Gets or sets the DispatcherTimer used for the MinimumPopulateDelay 
+        /// condition for auto completion.
+        /// </summary>
+        private DispatcherTimer _delayTimer;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether a read-only dependency 
+        /// property change handler should allow the value to be set.  This is 
+        /// used to ensure that read-only properties cannot be changed via 
+        /// SetValue, etc.
+        /// </summary>
+        private bool _allowWrite;
+
+        /// <summary>
+        /// The TextBox template part.
+        /// </summary>
+        private TextBox _textBox;
+        private IDisposable _textBoxSubscriptions;
+
+        /// <summary>
+        /// The SelectionAdapter.
+        /// </summary>
+        private ISelectionAdapter _adapter;
+
+        /// <summary>
+        /// A control that can provide updated string values from a binding.
+        /// </summary>
+        private BindingEvaluator<string> _valueBindingEvaluator;
+
+        /// <summary>
+        /// A weak subscription for the collection changed event.
+        /// </summary>
+        private IDisposable _collectionChangeSubscription;
+
+        private IMemberSelector _valueMemberSelector;
+
+        private bool _itemTemplateIsFromValueMemeberBinding = true;
+        private bool _settingItemTemplateFromValueMemeberBinding;
+
+        private object _selectedItem;
+        private bool _isDropDownOpen;
+        private bool _isFocused = false;
+
+        private string _text = string.Empty;
+        private string _searchText = string.Empty;
+
+        private AutoCompleteFilterPredicate<object> _itemFilter;
+        private AutoCompleteFilterPredicate<string> _textFilter = AutoCompleteSearch.GetFilter(AutoCompleteFilterMode.StartsWith);
+
+        public static readonly RoutedEvent<SelectionChangedEventArgs> SelectionChangedEvent =
+            RoutedEvent.Register<SelectionChangedEventArgs>(nameof(SelectionChanged), RoutingStrategies.Bubble, typeof(AutoCompleteBox));
+
+        public static readonly StyledProperty<string> WatermarkProperty =
+            TextBox.WatermarkProperty.AddOwner<AutoCompleteBox>();
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.MinimumPrefixLength" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.MinimumPrefixLength" />
+        /// dependency property.</value>
+        public static readonly StyledProperty<int> MinimumPrefixLengthProperty =
+            AvaloniaProperty.Register<AutoCompleteBox, int>(
+                nameof(MinimumPrefixLength), 1,
+                validate: ValidateMinimumPrefixLength);
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.MinimumPopulateDelay" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.MinimumPopulateDelay" />
+        /// dependency property.</value>
+        public static readonly StyledProperty<TimeSpan> MinimumPopulateDelayProperty =
+            AvaloniaProperty.Register<AutoCompleteBox, TimeSpan>(
+                nameof(MinimumPopulateDelay), 
+                TimeSpan.Zero,
+                validate: ValidateMinimumPopulateDelay);
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.MaxDropDownHeight" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.MaxDropDownHeight" />
+        /// dependency property.</value>
+        public static readonly StyledProperty<double> MaxDropDownHeightProperty =
+            AvaloniaProperty.Register<AutoCompleteBox, double>(
+                nameof(MaxDropDownHeight), 
+                double.PositiveInfinity,
+                validate: ValidateMaxDropDownHeight);
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsTextCompletionEnabled" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsTextCompletionEnabled" />
+        /// dependency property.</value>
+        public static readonly StyledProperty<bool> IsTextCompletionEnabledProperty =
+            AvaloniaProperty.Register<AutoCompleteBox, bool>(nameof(IsTextCompletionEnabled));
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemTemplate" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemTemplate" />
+        /// dependency property.</value>
+        public static readonly StyledProperty<IDataTemplate> ItemTemplateProperty =
+            AvaloniaProperty.Register<AutoCompleteBox, IDataTemplate>(nameof(ItemTemplate));
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
+        /// dependency property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, bool> IsDropDownOpenProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, bool>(
+                nameof(IsDropDownOpen),
+                o => o.IsDropDownOpen,
+                (o, v) => o.IsDropDownOpen = v);
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.SelectedItem" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.SelectedItem" />
+        /// dependency property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, object> SelectedItemProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, object>(
+                nameof(SelectedItem),
+                o => o.SelectedItem,
+                (o, v) => o.SelectedItem = v);
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.Text" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.Text" />
+        /// dependency property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, string> TextProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, string>(
+                nameof(Text),
+                o => o.Text,
+                (o, v) => o.Text = v);
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.SearchText" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.SearchText" />
+        /// dependency property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, string> SearchTextProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, string>(
+                nameof(SearchText),
+                o => o.SearchText,
+                unsetValue: string.Empty);
+
+        /// <summary>
+        /// Gets the identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.FilterMode" />
+        /// dependency property.
+        /// </summary>
+        public static readonly StyledProperty<AutoCompleteFilterMode> FilterModeProperty =
+            AvaloniaProperty.Register<AutoCompleteBox, AutoCompleteFilterMode>(
+                nameof(FilterMode),
+                defaultValue: AutoCompleteFilterMode.StartsWith,
+                validate: ValidateFilterMode);
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemFilter" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemFilter" />
+        /// dependency property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, AutoCompleteFilterPredicate<object>> ItemFilterProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, AutoCompleteFilterPredicate<object>>(
+                nameof(ItemFilter),
+                o => o.ItemFilter,
+                (o, v) => o.ItemFilter = v);
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.TextFilter" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.TextFilter" />
+        /// dependency property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, AutoCompleteFilterPredicate<string>> TextFilterProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, AutoCompleteFilterPredicate<string>>(
+                nameof(TextFilter),
+                o => o.TextFilter,
+                (o, v) => o.TextFilter = v,
+                unsetValue: AutoCompleteSearch.GetFilter(AutoCompleteFilterMode.StartsWith));
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+        /// dependency property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, IEnumerable> ItemsProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, IEnumerable>(
+                nameof(Items),
+                o => o.Items,
+                (o, v) => o.Items = v);
+
+        public static readonly DirectProperty<AutoCompleteBox, IMemberSelector> ValueMemberSelectorProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, IMemberSelector>(
+                nameof(ValueMemberSelector),
+                o => o.ValueMemberSelector,
+                (o, v) => o.ValueMemberSelector = v);
+
+        private static int ValidateMinimumPrefixLength(AutoCompleteBox control, int value)
+        {
+            Contract.Requires<ArgumentOutOfRangeException>(value >= -1);
+
+            return value;
+        }
+
+        private static TimeSpan ValidateMinimumPopulateDelay(AutoCompleteBox control, TimeSpan value)
+        {
+            Contract.Requires<ArgumentOutOfRangeException>(value.TotalMilliseconds >= 0.0);
+
+            return value;
+        }
+
+        private static double ValidateMaxDropDownHeight(AutoCompleteBox control, double value)
+        {
+            Contract.Requires<ArgumentOutOfRangeException>(value >= 0.0);
+
+            return value;
+        }
+                
+        private static bool IsValidFilterMode(AutoCompleteFilterMode mode)
+        {
+            switch (mode)
+            {
+                case AutoCompleteFilterMode.None:
+                case AutoCompleteFilterMode.StartsWith:
+                case AutoCompleteFilterMode.StartsWithCaseSensitive:
+                case AutoCompleteFilterMode.StartsWithOrdinal:
+                case AutoCompleteFilterMode.StartsWithOrdinalCaseSensitive:
+                case AutoCompleteFilterMode.Contains:
+                case AutoCompleteFilterMode.ContainsCaseSensitive:
+                case AutoCompleteFilterMode.ContainsOrdinal:
+                case AutoCompleteFilterMode.ContainsOrdinalCaseSensitive:
+                case AutoCompleteFilterMode.Equals:
+                case AutoCompleteFilterMode.EqualsCaseSensitive:
+                case AutoCompleteFilterMode.EqualsOrdinal:
+                case AutoCompleteFilterMode.EqualsOrdinalCaseSensitive:
+                case AutoCompleteFilterMode.Custom:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        private static AutoCompleteFilterMode ValidateFilterMode(AutoCompleteBox control, AutoCompleteFilterMode value)
+        {
+            Contract.Requires<ArgumentException>(IsValidFilterMode(value));
+
+            return value;
+        }
+
+        /// <summary>
+        /// Handle the change of the IsEnabled property.
+        /// </summary>
+        /// <param name="e">The event data.</param>
+        private void OnControlIsEnabledChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            bool isEnabled = (bool)e.NewValue;
+            if (!isEnabled)
+            {
+                IsDropDownOpen = false;
+            }
+        }
+
+        /// <summary>
+        /// MinimumPopulateDelayProperty property changed handler. Any current 
+        /// dispatcher timer will be stopped. The timer will not be restarted 
+        /// until the next TextUpdate call by the user.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        private void OnMinimumPopulateDelayChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var newValue = (TimeSpan)e.NewValue;
+                        
+            // Stop any existing timer
+            if (_delayTimer != null)
+            {
+                _delayTimer.Stop();
+
+                if (newValue == TimeSpan.Zero)
+                {
+                    _delayTimer = null;
+                }
+            }
+
+            if (newValue > TimeSpan.Zero)
+            {
+                // Create or clear a dispatcher timer instance
+                if (_delayTimer == null)
+                {
+                    _delayTimer = new DispatcherTimer();
+                    _delayTimer.Tick += PopulateDropDown;
+                }
+
+                // Set the new tick interval
+                _delayTimer.Interval = newValue;
+            }
+        }
+
+        /// <summary>
+        /// IsDropDownOpenProperty property changed handler.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        private void OnIsDropDownOpenChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            // Ignore the change if requested
+            if (_ignorePropertyChange)
+            {
+                _ignorePropertyChange = false;
+                return;
+            }
+
+            bool oldValue = (bool)e.OldValue;
+            bool newValue = (bool)e.NewValue;
+
+            if (newValue)
+            {
+                TextUpdated(Text, true);
+            }
+            else
+            {
+                ClosingDropDown(oldValue);
+            }
+
+            UpdatePseudoClasses();
+        }
+
+        private void OnSelectedItemPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (_ignorePropertyChange)
+            {
+                _ignorePropertyChange = false;
+                return;
+            }
+
+            // Update the text display
+            if (_skipSelectedItemTextUpdate)
+            {
+                _skipSelectedItemTextUpdate = false;
+            }
+            else
+            {
+                OnSelectedItemChanged(e.NewValue);
+            }
+
+            // Fire the SelectionChanged event
+            List<object> removed = new List<object>();
+            if (e.OldValue != null)
+            {
+                removed.Add(e.OldValue);
+            }
+
+            List<object> added = new List<object>();
+            if (e.NewValue != null)
+            {
+                added.Add(e.NewValue);
+            }
+
+            OnSelectionChanged(new SelectionChangedEventArgs(SelectionChangedEvent, removed, added));
+        }
+
+        /// <summary>
+        /// TextProperty property changed handler.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        private void OnTextPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            TextUpdated((string)e.NewValue, false);
+        }
+
+        private void OnSearchTextPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (_ignorePropertyChange)
+            {
+                _ignorePropertyChange = false;
+                return;
+            }
+
+            // Ensure the property is only written when expected
+            if (!_allowWrite)
+            {
+                // Reset the old value before it was incorrectly written
+                _ignorePropertyChange = true;
+                SetValue(e.Property, e.OldValue);
+
+                throw new InvalidOperationException("Cannot set read-only property SearchText.");
+            }
+        }
+
+        /// <summary>
+        /// FilterModeProperty property changed handler.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        private void OnFilterModePropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            AutoCompleteFilterMode mode = (AutoCompleteFilterMode)e.NewValue;
+
+            // Sets the filter predicate for the new value
+            TextFilter = AutoCompleteSearch.GetFilter(mode);
+        }
+
+        /// <summary>
+        /// ItemFilterProperty property changed handler.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        private void OnItemFilterPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            AutoCompleteFilterPredicate<object> value = e.NewValue as AutoCompleteFilterPredicate<object>;
+
+            // If null, revert to the "None" predicate
+            if (value == null)
+            {
+                FilterMode = AutoCompleteFilterMode.None;
+            }
+            else
+            {
+                FilterMode = AutoCompleteFilterMode.Custom;
+                TextFilter = null;
+            }
+        }
+
+        /// <summary>
+        /// ItemsSourceProperty property changed handler.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        private void OnItemsPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            OnItemsChanged((IEnumerable)e.NewValue);
+        }
+
+        private void OnItemTemplatePropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (!_settingItemTemplateFromValueMemeberBinding)
+                _itemTemplateIsFromValueMemeberBinding = false;
+        }
+        private void OnValueMemberBindingChanged(IBinding value)
+        {
+            if(_itemTemplateIsFromValueMemeberBinding)
+            {
+                var template =
+                    new FuncDataTemplate(
+                        typeof(object),
+                        o =>
+                        {
+                            var control = new ContentControl();
+                            control.Bind(ContentControl.ContentProperty, value);
+                            return control;
+                        });
+
+                _settingItemTemplateFromValueMemeberBinding = true;
+                ItemTemplate = template;
+                _settingItemTemplateFromValueMemeberBinding = false;
+            }
+        }
+
+        static AutoCompleteBox()
+        {
+            FocusableProperty.OverrideDefaultValue<AutoCompleteBox>(true);
+
+            MinimumPopulateDelayProperty.Changed.AddClassHandler<AutoCompleteBox>(x => x.OnMinimumPopulateDelayChanged);
+            IsDropDownOpenProperty.Changed.AddClassHandler<AutoCompleteBox>(x => x.OnIsDropDownOpenChanged);
+            SelectedItemProperty.Changed.AddClassHandler<AutoCompleteBox>(x => x.OnSelectedItemPropertyChanged);
+            TextProperty.Changed.AddClassHandler<AutoCompleteBox>(x => x.OnTextPropertyChanged);
+            SearchTextProperty.Changed.AddClassHandler<AutoCompleteBox>(x => x.OnSearchTextPropertyChanged);
+            FilterModeProperty.Changed.AddClassHandler<AutoCompleteBox>(x => x.OnFilterModePropertyChanged);
+            ItemFilterProperty.Changed.AddClassHandler<AutoCompleteBox>(x => x.OnItemFilterPropertyChanged);
+            ItemsProperty.Changed.AddClassHandler<AutoCompleteBox>(x => x.OnItemsPropertyChanged);
+            IsEnabledProperty.Changed.AddClassHandler<AutoCompleteBox>(x => x.OnControlIsEnabledChanged);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> class.
+        /// </summary>
+        public AutoCompleteBox()
+        {
+            ClearView();
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum number of characters required to be entered
+        /// in the text box before the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> displays
+        /// possible matches.
+        /// matches.
+        /// </summary>
+        /// <value>
+        /// The minimum number of characters to be entered in the text box
+        /// before the <see cref="T:Avalonia.Controls.AutoCompleteBox" />
+        /// displays possible matches. The default is 1.
+        /// </value>
+        /// <remarks>
+        /// If you set MinimumPrefixLength to -1, the AutoCompleteBox will
+        /// not provide possible matches. There is no maximum value, but
+        /// setting MinimumPrefixLength to value that is too large will
+        /// prevent the AutoCompleteBox from providing possible matches as well.
+        /// </remarks>
+        public int MinimumPrefixLength
+        {
+            get { return GetValue(MinimumPrefixLengthProperty); }
+            set { SetValue(MinimumPrefixLengthProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the first possible match
+        /// found during the filtering process will be displayed automatically
+        /// in the text box.
+        /// </summary>
+        /// <value>
+        /// True if the first possible match found will be displayed
+        /// automatically in the text box; otherwise, false. The default is
+        /// false.
+        /// </value>
+        public bool IsTextCompletionEnabled
+        {
+            get { return GetValue(IsTextCompletionEnabledProperty); }
+            set { SetValue(IsTextCompletionEnabledProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="T:Avalonia.DataTemplate" /> used
+        /// to display each item in the drop-down portion of the control.
+        /// </summary>
+        /// <value>The <see cref="T:Avalonia.DataTemplate" /> used to
+        /// display each item in the drop-down. The default is null.</value>
+        /// <remarks>
+        /// You use the ItemTemplate property to specify the visualization 
+        /// of the data objects in the drop-down portion of the AutoCompleteBox 
+        /// control. If your AutoCompleteBox is bound to a collection and you 
+        /// do not provide specific display instructions by using a 
+        /// DataTemplate, the resulting UI of each item is a string 
+        /// representation of each object in the underlying collection. 
+        /// </remarks>
+        public IDataTemplate ItemTemplate
+        {
+            get { return GetValue(ItemTemplateProperty); }
+            set { SetValue(ItemTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum delay, after text is typed
+        /// in the text box before the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control
+        /// populates the list of possible matches in the drop-down.
+        /// </summary>
+        /// <value>The minimum delay, after text is typed in
+        /// the text box, but before the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> populates
+        /// the list of possible matches in the drop-down. The default is 0.</value>
+        public TimeSpan MinimumPopulateDelay
+        {
+            get { return GetValue(MinimumPopulateDelayProperty); }
+            set { SetValue(MinimumPopulateDelayProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum height of the drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.
+        /// </summary>
+        /// <value>The maximum height of the drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.
+        /// The default is <see cref="F:System.Double.PositiveInfinity" />.</value>
+        /// <exception cref="T:System.ArgumentException">The specified value is less than 0.</exception>
+        public double MaxDropDownHeight
+        {
+            get { return GetValue(MaxDropDownHeightProperty); }
+            set { SetValue(MaxDropDownHeightProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the drop-down portion of
+        /// the control is open.
+        /// </summary>
+        /// <value>
+        /// True if the drop-down is open; otherwise, false. The default is
+        /// false.
+        /// </value>
+        public bool IsDropDownOpen
+        {
+            get { return  _isDropDownOpen; }
+            set { SetAndRaise(IsDropDownOpenProperty, ref  _isDropDownOpen, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the  <see cref="T:Avalonia.Data.Binding" /> that
+        /// is used to get the values for display in the text portion of
+        /// the <see cref="T:Avalonia.Controls.AutoCompleteBox" />
+        /// control.
+        /// </summary>
+        /// <value>The <see cref="T:Avalonia.Data.IBinding" /> object used
+        /// when binding to a collection property.</value>
+        [AssignBinding]
+        public IBinding ValueMemberBinding
+        {
+            get { return _valueBindingEvaluator?.ValueBinding; }
+            set
+            {
+                if (ValueMemberBinding != value)
+                {
+                    _valueBindingEvaluator = new BindingEvaluator<string>(value);
+                    OnValueMemberBindingChanged(value);
+                }
+            }
+        }
+                
+        /// <summary>
+        /// Gets or sets the MemberSelector that is used to get values for
+        /// display in the text portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.
+        /// </summary>
+        /// <value>The MemberSelector that is used to get values for display in
+        /// the text portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.</value>
+        public IMemberSelector ValueMemberSelector
+        {
+            get { return _valueMemberSelector; }
+            set { SetAndRaise(ValueMemberSelectorProperty, ref _valueMemberSelector, value); }
+        }
+        
+        /// <summary>
+        /// Gets or sets the selected item in the drop-down.
+        /// </summary>
+        /// <value>The selected item in the drop-down.</value>
+        /// <remarks>
+        /// If the IsTextCompletionEnabled property is true and text typed by 
+        /// the user matches an item in the ItemsSource collection, which is 
+        /// then displayed in the text box, the SelectedItem property will be 
+        /// a null reference.
+        /// </remarks>
+        public object SelectedItem
+        {
+            get { return _selectedItem; }
+            set { SetAndRaise(SelectedItemProperty, ref _selectedItem, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the text in the text box portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.
+        /// </summary>
+        /// <value>The text in the text box portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.</value>
+        public string Text
+        {
+            get { return _text; }
+            set { SetAndRaise(TextProperty, ref _text, value); }
+        }
+
+        /// <summary>
+        /// Gets the text that is used to filter items in the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+        /// item collection.
+        /// </summary>
+        /// <value>The text that is used to filter items in the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+        /// item collection.</value>
+        /// <remarks>
+        /// The SearchText value is typically the same as the 
+        /// Text property, but is set after the TextChanged event occurs 
+        /// and before the Populating event.
+        /// </remarks>
+        public string SearchText
+        {
+            get { return _searchText; }
+            private set
+            {
+                try
+                {
+                    _allowWrite = true;
+                    SetAndRaise(SearchTextProperty, ref _searchText, value);
+                }
+                finally
+                {
+                    _allowWrite = false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets how the text in the text box is used to filter items
+        /// specified by the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+        /// property for display in the drop-down.
+        /// </summary>
+        /// <value>One of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteFilterMode" />
+        /// values The default is
+        /// <see cref="F:Avalonia.Controls.AutoCompleteFilterMode.StartsWith" />.</value>
+        /// <exception cref="T:System.ArgumentException">The specified value is
+        /// not a valid
+        /// <see cref="T:Avalonia.Controls.AutoCompleteFilterMode" />.</exception>
+        /// <remarks>
+        /// Use the FilterMode property to specify how possible matches are 
+        /// filtered. For example, possible matches can be filtered in a 
+        /// predefined or custom way. The search mode is automatically set to 
+        /// Custom if you set the ItemFilter property. 
+        /// </remarks>
+        public AutoCompleteFilterMode FilterMode
+        {
+            get { return GetValue(FilterModeProperty); }
+            set { SetValue(FilterModeProperty, value); }
+        }
+
+        public string Watermark
+        {
+            get { return GetValue(WatermarkProperty); }
+            set { SetValue(WatermarkProperty, value); }
+        }
+        
+        /// <summary>
+        /// Gets or sets the custom method that uses user-entered text to filter
+        /// the items specified by the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+        /// property for display in the drop-down.
+        /// </summary>
+        /// <value>The custom method that uses the user-entered text to filter
+        /// the items specified by the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+        /// property. The default is null.</value>
+        /// <remarks>
+        /// The filter mode is automatically set to Custom if you set the 
+        /// ItemFilter property. 
+        /// </remarks>
+        public AutoCompleteFilterPredicate<object> ItemFilter
+        {
+            get { return _itemFilter; }
+            set { SetAndRaise(ItemFilterProperty, ref _itemFilter, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the custom method that uses the user-entered text to
+        /// filter items specified by the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+        /// property in a text-based way for display in the drop-down.
+        /// </summary>
+        /// <value>The custom method that uses the user-entered text to filter
+        /// items specified by the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+        /// property in a text-based way for display in the drop-down.</value>
+        /// <remarks>
+        /// The search mode is automatically set to Custom if you set the 
+        /// TextFilter property. 
+        /// </remarks>
+        public AutoCompleteFilterPredicate<string> TextFilter
+        {
+            get { return _textFilter; }
+            set { SetAndRaise(TextFilterProperty, ref _textFilter, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a collection that is used to generate the items for the
+        /// drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.
+        /// </summary>
+        /// <value>The collection that is used to generate the items of the
+        /// drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.</value>
+        public IEnumerable Items
+        {
+            get { return _itemsEnumerable; }
+            set { SetAndRaise(ItemsProperty, ref _itemsEnumerable, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the drop down popup control.
+        /// </summary>
+        private Popup DropDownPopup { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Text template part.
+        /// </summary>
+        private TextBox TextBox
+        {
+            get { return _textBox; }
+            set
+            {
+                _textBoxSubscriptions?.Dispose();
+                _textBox = value;
+
+                // Attach handlers
+                if (_textBox != null)
+                {
+                    _textBoxSubscriptions =
+                        _textBox.GetObservable(TextBox.TextProperty)
+                                .Subscribe(_ => OnTextBoxTextChanged());
+                    
+                    if (Text != null)
+                    {
+                        UpdateTextValue(Text);
+                    }
+                }
+            }
+        }
+
+        private int TextBoxSelectionStart
+        {
+            get
+            {
+                if (TextBox != null)
+                {
+                    return Math.Min(TextBox.SelectionStart, TextBox.SelectionEnd);
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+        }
+        private int TextBoxSelectionLength
+        {
+            get
+            {
+                if (TextBox != null)
+                {
+                    return Math.Abs(TextBox.SelectionEnd - TextBox.SelectionStart);
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the selection adapter used to populate the drop-down
+        /// with a list of selectable items.
+        /// </summary>
+        /// <value>The selection adapter used to populate the drop-down with a
+        /// list of selectable items.</value>
+        /// <remarks>
+        /// You can use this property when you create an automation peer to 
+        /// use with AutoCompleteBox or deriving from AutoCompleteBox to 
+        /// create a custom control.
+        /// </remarks>
+        protected ISelectionAdapter SelectionAdapter
+        {
+            get { return _adapter; }
+            set
+            {
+                if (_adapter != null)
+                {
+                    _adapter.SelectionChanged -= OnAdapterSelectionChanged;
+                    _adapter.Commit -= OnAdapterSelectionComplete;
+                    _adapter.Cancel -= OnAdapterSelectionCanceled;
+                    _adapter.Cancel -= OnAdapterSelectionComplete;
+                    _adapter.Items = null;
+                }
+
+                _adapter = value;
+
+                if (_adapter != null)
+                {
+                    _adapter.SelectionChanged += OnAdapterSelectionChanged;
+                    _adapter.Commit += OnAdapterSelectionComplete;
+                    _adapter.Cancel += OnAdapterSelectionCanceled;
+                    _adapter.Cancel += OnAdapterSelectionComplete;
+                    _adapter.Items = _view;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the
+        /// <see cref="T:Avalonia.Controls.ISelectionAdapter" /> part, if
+        /// possible.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="T:Avalonia.Controls.ISelectionAdapter" /> object,
+        /// if possible. Otherwise, null.
+        /// </returns>
+        protected virtual ISelectionAdapter GetSelectionAdapterPart(INameScope nameScope)
+        {
+            ISelectionAdapter adapter = null;
+            SelectingItemsControl selector = nameScope.Find<SelectingItemsControl>(ElementSelector);
+            if (selector != null)
+            {
+                // Check if it is already an IItemsSelector
+                adapter = selector as ISelectionAdapter;
+                if (adapter == null)
+                {
+                    // Built in support for wrapping a Selector control
+                    adapter = new SelectingItemsControlSelectionAdapter(selector);
+                }
+            }
+            if (adapter == null)
+            {
+                adapter = nameScope.Find<ISelectionAdapter>(ElementSelectionAdapter);
+            }
+            return adapter;
+        }
+
+        /// <summary>
+        /// Builds the visual tree for the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control
+        /// when a new template is applied.
+        /// </summary>
+        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        {
+
+            if (DropDownPopup != null)
+            {
+                DropDownPopup.Closed -= DropDownPopup_Closed;
+                DropDownPopup = null;
+            }
+
+            // Set the template parts. Individual part setters remove and add 
+            // any event handlers.
+            Popup popup = e.NameScope.Find<Popup>(ElementPopup);
+            if (popup != null)
+            {
+                DropDownPopup = popup;
+                DropDownPopup.Closed += DropDownPopup_Closed;
+            }
+
+            SelectionAdapter = GetSelectionAdapterPart(e.NameScope);
+            TextBox = e.NameScope.Find<TextBox>(ElementTextBox);
+            
+            // If the drop down property indicates that the popup is open,
+            // flip its value to invoke the changed handler.
+            if (IsDropDownOpen && DropDownPopup != null && !DropDownPopup.IsOpen)
+            {
+                OpeningDropDown(false);
+            }
+
+            base.OnTemplateApplied(e);
+        }
+
+        /// <summary>
+        /// Provides handling for the
+        /// <see cref="E:Avalonia.InputElement.KeyDown" /> event.
+        /// </summary>
+        /// <param name="e">A <see cref="T:Avalonia.Input.KeyEventArgs" />
+        /// that contains the event data.</param>
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            Contract.Requires<ArgumentNullException>(e != null);
+
+            base.OnKeyDown(e);
+
+            if (e.Handled || !IsEnabled)
+            {
+                return;
+            }
+
+            // The drop down is open, pass along the key event arguments to the
+            // selection adapter. If it isn't handled by the adapter's logic,
+            // then we handle some simple navigation scenarios for controlling
+            // the drop down.
+            if (IsDropDownOpen)
+            {
+                if (SelectionAdapter != null)
+                {
+                    SelectionAdapter.HandleKeyDown(e);
+                    if (e.Handled)
+                    {
+                        return;
+                    }
+                }
+
+                if (e.Key == Key.Escape)
+                {
+                    OnAdapterSelectionCanceled(this, new RoutedEventArgs());
+                    e.Handled = true;
+                }
+            }
+            else
+            {
+                // The drop down is not open, the Down key will toggle it open.
+                if (e.Key == Key.Down)
+                {
+                    IsDropDownOpen = true;
+                    e.Handled = true;
+                }
+            }
+
+            // Standard drop down navigation
+            switch (e.Key)
+            {
+                case Key.F4:
+                    IsDropDownOpen = !IsDropDownOpen;
+                    e.Handled = true;
+                    break;
+
+                case Key.Enter:
+                    OnAdapterSelectionComplete(this, new RoutedEventArgs());
+                    e.Handled = true;
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Provides handling for the
+        /// <see cref="E:Avalonia.UIElement.GotFocus" /> event.
+        /// </summary>
+        /// <param name="e">A <see cref="T:Avalonia.RoutedEventArgs" />
+        /// that contains the event data.</param>
+        protected override void OnGotFocus(GotFocusEventArgs e)
+        {
+            base.OnGotFocus(e);
+            FocusChanged(HasFocus());
+        }
+
+        /// <summary>
+        /// Provides handling for the
+        /// <see cref="E:Avalonia.UIElement.LostFocus" /> event.
+        /// </summary>
+        /// <param name="e">A <see cref="T:Avalonia.RoutedEventArgs" />
+        /// that contains the event data.</param>
+        protected override void OnLostFocus(RoutedEventArgs e)
+        {
+            base.OnLostFocus(e);
+            FocusChanged(HasFocus());
+        }
+        
+        /// <summary>
+        /// Determines whether the text box or drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control has
+        /// focus.
+        /// </summary>
+        /// <returns>true to indicate the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> has focus;
+        /// otherwise, false.</returns>
+        protected bool HasFocus()
+        {
+            IVisual focused = FocusManager.Instance.Current;
+
+            while (focused != null)
+            {
+                if (object.ReferenceEquals(focused, this))
+                {
+                    return true;
+                }
+
+                // This helps deal with popups that may not be in the same 
+                // visual tree
+                IVisual parent = focused.GetVisualParent();
+                if (parent == null)
+                {
+                    // Try the logical parent.
+                    IControl element = focused as IControl;
+                    if (element != null)
+                    {
+                        parent = element.Parent;
+                    }
+                }
+                focused = parent;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Handles the FocusChanged event.
+        /// </summary>
+        /// <param name="hasFocus">A value indicating whether the control 
+        /// currently has the focus.</param>
+        private void FocusChanged(bool hasFocus)
+        {
+            // The OnGotFocus & OnLostFocus are asynchronously and cannot 
+            // reliably tell you that have the focus.  All they do is let you 
+            // know that the focus changed sometime in the past.  To determine 
+            // if you currently have the focus you need to do consult the 
+            // FocusManager (see HasFocus()).
+
+            bool wasFocused = _isFocused;
+            _isFocused = hasFocus;
+
+            if (hasFocus)
+            {
+                
+                if (!wasFocused && TextBox != null && TextBoxSelectionLength <= 0)
+                {
+                    TextBox.Focus();
+                    TextBox.SelectionStart = 0;
+                    TextBox.SelectionEnd = TextBox.Text?.Length ?? 0;
+                }
+            }
+            else
+            {
+                IsDropDownOpen = false;
+                _userCalledPopulate = false;
+                ClearTextBoxSelection();
+            }
+
+            _isFocused = hasFocus;
+        }
+
+        /// <summary>
+        /// Occurs when the text in the text box portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> changes.
+        /// </summary>
+        public event EventHandler TextChanged;
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> is
+        /// populating the drop-down with possible matches based on the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.Text" />
+        /// property.
+        /// </summary>
+        /// <remarks>
+        /// If the event is canceled, by setting the PopulatingEventArgs.Cancel 
+        /// property to true, the AutoCompleteBox will not automatically 
+        /// populate the selection adapter contained in the drop-down. 
+        /// In this case, if you want possible matches to appear, you must 
+        /// provide the logic for populating the selection adapter.
+        /// </remarks>
+        public event EventHandler<PopulatingEventArgs> Populating;
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> has
+        /// populated the drop-down with possible matches based on the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.Text" />
+        /// property.
+        /// </summary>
+        public event EventHandler<PopulatedEventArgs> Populated;
+
+        /// <summary>
+        /// Occurs when the value of the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
+        /// property is changing from false to true.
+        /// </summary>
+        public event EventHandler<CancelableEventArgs> DropDownOpening;
+
+        /// <summary>
+        /// Occurs when the value of the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
+        /// property has changed from false to true and the drop-down is open.
+        /// </summary>
+        public event EventHandler DropDownOpened;
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
+        /// property is changing from true to false.
+        /// </summary>
+        public event EventHandler<CancelableEventArgs> DropDownClosing;
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
+        /// property was changed from true to false and the drop-down is open.
+        /// </summary>
+        public event EventHandler DropDownClosed;
+
+        /// <summary>
+        /// Occurs when the selected item in the drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> has
+        /// changed.
+        /// </summary>
+        public event EventHandler<SelectionChangedEventArgs> SelectionChanged
+        {
+            add { AddHandler(SelectionChangedEvent, value); }
+            remove { RemoveHandler(SelectionChangedEvent, value); }
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.Populating" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:Avalonia.Controls.PopulatingEventArgs" /> that
+        /// contains the event data.</param>
+        protected virtual void OnPopulating(PopulatingEventArgs e)
+        {
+            Populating?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.Populated" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:Avalonia.Controls.PopulatedEventArgs" />
+        /// that contains the event data.</param>
+        protected virtual void OnPopulated(PopulatedEventArgs e)
+        {
+            Populated?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.SelectionChanged" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:Avalonia.Controls.SelectionChangedEventArgs" />
+        /// that contains the event data.</param>
+        protected virtual void OnSelectionChanged(SelectionChangedEventArgs e)
+        {
+            RaiseEvent(e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.DropDownOpening" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:Avalonia.Controls.CancelableEventArgs" />
+        /// that contains the event data.</param>
+        protected virtual void OnDropDownOpening(CancelableEventArgs e)
+        {
+            DropDownOpening?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.DropDownOpened" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:System.EventArgs" />
+        /// that contains the event data.</param>
+        protected virtual void OnDropDownOpened(EventArgs e)
+        {
+            DropDownOpened?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.DropDownClosing" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:Avalonia.Controls.CancelableEventArgs" />
+        /// that contains the event data.</param>
+        protected virtual void OnDropDownClosing(CancelableEventArgs e)
+        {
+            DropDownClosing?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.DropDownClosed" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:System.EventArgs" />
+        /// which contains the event data.</param>
+        protected virtual void OnDropDownClosed(EventArgs e)
+        {
+            DropDownClosed?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.TextChanged" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A <see cref="T:Avalonia.RoutedEventArgs" />
+        /// that contains the event data.</param>
+        protected virtual void OnTextChanged(RoutedEventArgs e)
+        {
+            TextChanged?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Begin closing the drop-down.
+        /// </summary>
+        /// <param name="oldValue">The original value.</param>
+        private void ClosingDropDown(bool oldValue)
+        {
+            var args = new CancelableEventArgs();
+            OnDropDownClosing(args);
+
+            if (args.Cancel)
+            {
+                _ignorePropertyChange = true;
+                SetValue(IsDropDownOpenProperty, oldValue);
+            }
+            else
+            {
+                CloseDropDown();
+            }
+
+            UpdatePseudoClasses();
+        }
+
+        /// <summary>
+        /// Begin opening the drop down by firing cancelable events, opening the
+        /// drop-down or reverting, depending on the event argument values.
+        /// </summary>
+        /// <param name="oldValue">The original value, if needed for a revert.</param>
+        private void OpeningDropDown(bool oldValue)
+        {
+            var args = new CancelableEventArgs();
+
+            // Opening
+            OnDropDownOpening(args);
+
+            if (args.Cancel)
+            {
+                _ignorePropertyChange = true;
+                SetValue(IsDropDownOpenProperty, oldValue);
+            }
+            else
+            {
+                OpenDropDown();
+            }
+
+            UpdatePseudoClasses();
+        }
+
+        /// <summary>
+        /// Connects to the DropDownPopup Closed event.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The event data.</param>
+        private void DropDownPopup_Closed(object sender, EventArgs e)
+        {
+            // Force the drop down dependency property to be false.
+            if (IsDropDownOpen)
+            {
+                IsDropDownOpen = false;
+            }
+
+            // Fire the DropDownClosed event
+            if (_popupHasOpened)
+            {
+                OnDropDownClosed(EventArgs.Empty);
+            }
+        }
+
+        /// <summary>
+        /// Handles the timer tick when using a populate delay.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The event arguments.</param>
+        private void PopulateDropDown(object sender, EventArgs e)
+        {
+            if (_delayTimer != null)
+            {
+                _delayTimer.Stop();
+            }
+
+            // Update the prefix/search text.
+            SearchText = Text;
+
+            // The Populated event enables advanced, custom filtering. The 
+            // client needs to directly update the ItemsSource collection or
+            // call the Populate method on the control to continue the 
+            // display process if Cancel is set to true.
+            PopulatingEventArgs populating = new PopulatingEventArgs(SearchText);
+            OnPopulating(populating);
+            if (!populating.Cancel)
+            {
+                PopulateComplete();
+            }
+        }
+
+        /// <summary>
+        /// Private method that directly opens the popup, checks the expander 
+        /// button, and then fires the Opened event.
+        /// </summary>
+        private void OpenDropDown()
+        {
+            if (DropDownPopup != null)
+            {
+                DropDownPopup.IsOpen = true;
+            }
+            _popupHasOpened = true;
+            OnDropDownOpened(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Private method that directly closes the popup, flips the Checked 
+        /// value, and then fires the Closed event.
+        /// </summary>
+        private void CloseDropDown()
+        {
+            if (_popupHasOpened)
+            {
+                if (SelectionAdapter != null)
+                {
+                    SelectionAdapter.SelectedItem = null;
+                }
+                if (DropDownPopup != null)
+                {
+                    DropDownPopup.IsOpen = false;
+                }
+                OnDropDownClosed(EventArgs.Empty);
+            }
+        }
+
+        /// <summary>
+        /// Formats an Item for text comparisons based on Converter 
+        /// and ConverterCulture properties.
+        /// </summary>
+        /// <param name="value">The object to format.</param>
+        /// <param name="clearDataContext">A value indicating whether to clear
+        /// the data context after the lookup is performed.</param>
+        /// <returns>Formatted Value.</returns>
+        private string FormatValue(object value, bool clearDataContext)
+        {
+            string result = FormatValue(value);
+            if(clearDataContext && _valueBindingEvaluator != null)
+            {
+                _valueBindingEvaluator.ClearDataContext();
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Converts the specified object to a string by using the
+        /// <see cref="P:Avalonia.Data.Binding.Converter" /> and
+        /// <see cref="P:Avalonia.Data.Binding.ConverterCulture" /> values
+        /// of the binding object specified by the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ValueMemberBinding" />
+        /// property.
+        /// </summary>
+        /// <param name="value">The object to format as a string.</param>
+        /// <returns>The string representation of the specified object.</returns>
+        /// <remarks>
+        /// Override this method to provide a custom string conversion.
+        /// </remarks>
+        protected virtual string FormatValue(object value)
+        {
+            if (_valueBindingEvaluator != null)
+            {
+                return _valueBindingEvaluator.GetDynamicValue(value) ?? String.Empty;
+            }
+
+            if (_valueMemberSelector != null)
+            {
+                value = _valueMemberSelector.Select(value);
+            }
+
+            return value == null ? String.Empty : value.ToString();
+        }
+
+        /// <summary>
+        /// Handle the TextChanged event that is directly attached to the 
+        /// TextBox part. This ensures that only user initiated actions will 
+        /// result in an AutoCompleteBox suggestion and operation.
+        /// </summary>
+        private void OnTextBoxTextChanged()
+        {
+            //Uses Dispatcher.Post to allow the TextBox selection to update before processing
+            Dispatcher.UIThread.Post(() =>
+            {
+                // Call the central updated text method as a user-initiated action
+                TextUpdated(_textBox.Text, true);
+            });
+        }
+
+        /// <summary>
+        /// Updates both the text box value and underlying text dependency 
+        /// property value if and when they change. Automatically fires the 
+        /// text changed events when there is a change.
+        /// </summary>
+        /// <param name="value">The new string value.</param>
+        private void UpdateTextValue(string value)
+        {
+            UpdateTextValue(value, null);
+        }
+
+        /// <summary>
+        /// Updates both the text box value and underlying text dependency 
+        /// property value if and when they change. Automatically fires the 
+        /// text changed events when there is a change.
+        /// </summary>
+        /// <param name="value">The new string value.</param>
+        /// <param name="userInitiated">A nullable bool value indicating whether
+        /// the action was user initiated. In a user initiated mode, the 
+        /// underlying text dependency property is updated. In a non-user 
+        /// interaction, the text box value is updated. When user initiated is 
+        /// null, all values are updated.</param>
+        private void UpdateTextValue(string value, bool? userInitiated)
+        {
+            bool callTextChanged = false;
+            // Update the Text dependency property
+            if ((userInitiated == null || userInitiated == true) && Text != value)
+            {
+                _ignoreTextPropertyChange++;
+                Text = value;
+                callTextChanged = true;
+            }
+
+            // Update the TextBox's Text dependency property
+            if ((userInitiated == null || userInitiated == false) && TextBox != null && TextBox.Text != value)
+            {
+                _ignoreTextPropertyChange++;
+                TextBox.Text = value ?? string.Empty;
+
+                // Text dependency property value was set, fire event
+                if (!callTextChanged && (Text == value || Text == null))
+                {
+                    callTextChanged = true;
+                }
+            }
+
+            if (callTextChanged)
+            {
+                OnTextChanged(new RoutedEventArgs());
+            }
+        }
+
+        /// <summary>
+        /// Handle the update of the text for the control from any source, 
+        /// including the TextBox part and the Text dependency property.
+        /// </summary>
+        /// <param name="newText">The new text.</param>
+        /// <param name="userInitiated">A value indicating whether the update 
+        /// is a user-initiated action. This should be a True value when the 
+        /// TextUpdated method is called from a TextBox event handler.</param>
+        private void TextUpdated(string newText, bool userInitiated)
+        {
+            // Only process this event if it is coming from someone outside 
+            // setting the Text dependency property directly.
+            if (_ignoreTextPropertyChange > 0)
+            {
+                _ignoreTextPropertyChange--;
+                return;
+            }
+
+            if (newText == null)
+            {
+                newText = string.Empty;
+            }
+
+            // The TextBox.TextChanged event was not firing immediately and 
+            // was causing an immediate update, even with wrapping. If there is 
+            // a selection currently, no update should happen.
+            if (IsTextCompletionEnabled && TextBox != null && TextBoxSelectionLength > 0 && TextBoxSelectionStart != TextBox.Text.Length)
+            {
+                return;
+            }
+
+            // Evaluate the conditions needed for completion.
+            // 1. Minimum prefix length
+            // 2. If a delay timer is in use, use it
+            bool populateReady = newText.Length >= MinimumPrefixLength && MinimumPrefixLength >= 0;
+            _userCalledPopulate = populateReady ? userInitiated : false;
+
+            // Update the interface and values only as necessary
+            UpdateTextValue(newText, userInitiated);
+
+            if (populateReady)
+            {
+                _ignoreTextSelectionChange = true;
+
+                if (_delayTimer != null)
+                {
+                    _delayTimer.Start();
+                }
+                else
+                {
+                    PopulateDropDown(this, EventArgs.Empty);
+                }
+            }
+            else
+            {
+                SearchText = string.Empty;
+                if (SelectedItem != null)
+                {
+                    _skipSelectedItemTextUpdate = true;
+                }
+                SelectedItem = null;
+                if (IsDropDownOpen)
+                {
+                    IsDropDownOpen = false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// A simple helper method to clear the view and ensure that a view 
+        /// object is always present and not null.
+        /// </summary>
+        private void ClearView()
+        {
+            if (_view == null)
+            {
+                _view = new AvaloniaList<object>();
+            }
+            else
+            {
+                _view.Clear();
+            }
+        }
+
+        /// <summary>
+        /// Walks through the items enumeration. Performance is not going to be 
+        /// perfect with the current implementation.
+        /// </summary>
+        private void RefreshView()
+        {
+            if (_items == null)
+            {
+                ClearView();
+                return;
+            }
+
+            // Cache the current text value
+            string text = Text ?? string.Empty;
+
+            // Determine if any filtering mode is on
+            bool stringFiltering = TextFilter != null;
+            bool objectFiltering = FilterMode == AutoCompleteFilterMode.Custom && TextFilter == null;
+
+            int view_index = 0;
+            int view_count = _view.Count;
+            List<object> items = _items;
+            foreach (object item in items)
+            {
+                bool inResults = !(stringFiltering || objectFiltering);
+                if (!inResults)
+                {
+                    inResults = stringFiltering ? TextFilter(text, FormatValue(item)) : ItemFilter(text, item);
+                }
+
+                if (view_count > view_index && inResults && _view[view_index] == item)
+                {
+                    // Item is still in the view
+                    view_index++;
+                }
+                else if (inResults)
+                {
+                    // Insert the item
+                    if (view_count > view_index && _view[view_index] != item)
+                    {
+                        // Replace item
+                        // Unfortunately replacing via index throws a fatal 
+                        // exception: View[view_index] = item;
+                        // Cost: O(n) vs O(1)
+                        _view.RemoveAt(view_index);
+                        _view.Insert(view_index, item);
+                        view_index++;
+                    }
+                    else
+                    {
+                        // Add the item
+                        if (view_index == view_count)
+                        {
+                            // Constant time is preferred (Add).
+                            _view.Add(item);
+                        }
+                        else
+                        {
+                            _view.Insert(view_index, item);
+                        }
+                        view_index++;
+                        view_count++;
+                    }
+                }
+                else if (view_count > view_index && _view[view_index] == item)
+                {
+                    // Remove the item
+                    _view.RemoveAt(view_index);
+                    view_count--;
+                }
+            }
+
+            // Clear the evaluator to discard a reference to the last item
+            if (_valueBindingEvaluator != null)
+            {
+                _valueBindingEvaluator.ClearDataContext();
+            }
+        }
+
+        /// <summary>
+        /// Handle any change to the ItemsSource dependency property, update 
+        /// the underlying ObservableCollection view, and set the selection 
+        /// adapter's ItemsSource to the view if appropriate.
+        /// </summary>
+        /// <param name="newValue">The new enumerable reference.</param>
+        private void OnItemsChanged(IEnumerable newValue)
+        {
+            // Remove handler for oldValue.CollectionChanged (if present)
+            _collectionChangeSubscription?.Dispose();
+            _collectionChangeSubscription = null;
+
+            // Add handler for newValue.CollectionChanged (if possible)
+            if (newValue is INotifyCollectionChanged newValueINotifyCollectionChanged)
+            {
+                _collectionChangeSubscription = newValueINotifyCollectionChanged.WeakSubscribe(ItemsCollectionChanged);
+            }
+
+            // Store a local cached copy of the data
+            _items = newValue == null ? null : new List<object>(newValue.Cast<object>().ToList());
+
+            // Clear and set the view on the selection adapter
+            ClearView();
+            if (SelectionAdapter != null && SelectionAdapter.Items != _view)
+            {
+                SelectionAdapter.Items = _view;
+            }
+            if (IsDropDownOpen)
+            {
+                RefreshView();
+            }
+        }
+
+        /// <summary>
+        /// Method that handles the ObservableCollection.CollectionChanged event for the ItemsSource property.
+        /// </summary>
+        /// <param name="sender">The object that raised the event.</param>
+        /// <param name="e">The event data.</param>
+        private void ItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            // Update the cache
+            if (e.Action == NotifyCollectionChangedAction.Remove && e.OldItems != null)
+            {
+                for (int index = 0; index < e.OldItems.Count; index++)
+                {
+                    _items.RemoveAt(e.OldStartingIndex);
+                }
+            }
+            if (e.Action == NotifyCollectionChangedAction.Add && e.NewItems != null && _items.Count >= e.NewStartingIndex)
+            {
+                for (int index = 0; index < e.NewItems.Count; index++)
+                {
+                    _items.Insert(e.NewStartingIndex + index, e.NewItems[index]);
+                }
+            }
+            if (e.Action == NotifyCollectionChangedAction.Replace && e.NewItems != null && e.OldItems != null)
+            {
+                for (int index = 0; index < e.NewItems.Count; index++)
+                {
+                    _items[e.NewStartingIndex] = e.NewItems[index];
+                }
+            }
+
+            // Update the view
+            if (e.Action == NotifyCollectionChangedAction.Remove || e.Action == NotifyCollectionChangedAction.Replace)
+            {
+                for (int index = 0; index < e.OldItems.Count; index++)
+                {
+                    _view.Remove(e.OldItems[index]);
+                }
+            }
+
+            if (e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                // Significant changes to the underlying data.
+                ClearView();
+                if (Items != null)
+                {
+                    _items = new List<object>(Items.Cast<object>().ToList());
+                }
+            }
+
+            // Refresh the observable collection used in the selection adapter.
+            RefreshView();
+        }
+
+        /// <summary>
+        /// Notifies the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> that the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.Items" />
+        /// property has been set and the data can be filtered to provide
+        /// possible matches in the drop-down.
+        /// </summary>
+        /// <remarks>
+        /// Call this method when you are providing custom population of 
+        /// the drop-down portion of the AutoCompleteBox, to signal the control 
+        /// that you are done with the population process. 
+        /// Typically, you use PopulateComplete when the population process 
+        /// is a long-running process and you want to cancel built-in filtering
+        ///  of the ItemsSource items. In this case, you can handle the 
+        /// Populated event and set PopulatingEventArgs.Cancel to true. 
+        /// When the long-running process has completed you call 
+        /// PopulateComplete to indicate the drop-down is populated.
+        /// </remarks>
+        public void PopulateComplete()
+        {
+            // Apply the search filter
+            RefreshView();
+
+            // Fire the Populated event containing the read-only view data.
+            PopulatedEventArgs populated = new PopulatedEventArgs(new ReadOnlyCollection<object>(_view));
+            OnPopulated(populated);
+
+            if (SelectionAdapter != null && SelectionAdapter.Items != _view)
+            {
+                SelectionAdapter.Items = _view;
+            }
+
+            bool isDropDownOpen = _userCalledPopulate && (_view.Count > 0);
+            if (isDropDownOpen != IsDropDownOpen)
+            {
+                _ignorePropertyChange = true;
+                IsDropDownOpen = isDropDownOpen;
+            }
+            if (IsDropDownOpen)
+            {
+                OpeningDropDown(false);
+            }
+            else
+            {
+                ClosingDropDown(true);
+            }
+
+            UpdateTextCompletion(_userCalledPopulate);
+        }
+
+        /// <summary>
+        /// Performs text completion, if enabled, and a lookup on the underlying
+        /// item values for an exact match. Will update the SelectedItem value.
+        /// </summary>
+        /// <param name="userInitiated">A value indicating whether the operation
+        /// was user initiated. Text completion will not be performed when not 
+        /// directly initiated by the user.</param>
+        private void UpdateTextCompletion(bool userInitiated)
+        {
+            // By default this method will clear the selected value
+            object newSelectedItem = null;
+            string text = Text;
+
+            // Text search is StartsWith explicit and only when enabled, in 
+            // line with WPF's ComboBox lookup. When in use it will associate 
+            // a Value with the Text if it is found in ItemsSource. This is 
+            // only valid when there is data and the user initiated the action.
+            if (_view.Count > 0)
+            {
+                if (IsTextCompletionEnabled && TextBox != null && userInitiated)
+                {
+                    int currentLength = TextBox.Text.Length;
+                    int selectionStart = TextBoxSelectionStart;
+                    if (selectionStart == text.Length && selectionStart > _textSelectionStart)
+                    {
+                        // When the FilterMode dependency property is set to 
+                        // either StartsWith or StartsWithCaseSensitive, the 
+                        // first item in the view is used. This will improve 
+                        // performance on the lookup. It assumes that the 
+                        // FilterMode the user has selected is an acceptable 
+                        // case sensitive matching function for their scenario.
+                        object top = FilterMode == AutoCompleteFilterMode.StartsWith || FilterMode == AutoCompleteFilterMode.StartsWithCaseSensitive
+                            ? _view[0]
+                            : TryGetMatch(text, _view, AutoCompleteSearch.GetFilter(AutoCompleteFilterMode.StartsWith));
+
+                        // If the search was successful, update SelectedItem
+                        if (top != null)
+                        {
+                            newSelectedItem = top;
+                            string topString = FormatValue(top, true);
+
+                            // Only replace partially when the two words being the same
+                            int minLength = Math.Min(topString.Length, Text.Length);
+                            if (AutoCompleteSearch.Equals(Text.Substring(0, minLength), topString.Substring(0, minLength)))
+                            {
+                                // Update the text
+                                UpdateTextValue(topString);
+
+                                // Select the text past the user's caret
+                                TextBox.SelectionStart = currentLength;
+                                TextBox.SelectionEnd = topString.Length;                                
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    // Perform an exact string lookup for the text. This is a 
+                    // design change from the original Toolkit release when the 
+                    // IsTextCompletionEnabled property behaved just like the 
+                    // WPF ComboBox's IsTextSearchEnabled property.
+                    //
+                    // This change provides the behavior that most people expect
+                    // to find: a lookup for the value is always performed.
+                    newSelectedItem = TryGetMatch(text, _view, AutoCompleteSearch.GetFilter(AutoCompleteFilterMode.EqualsCaseSensitive));
+                }
+            }
+
+            // Update the selected item property
+
+            if (SelectedItem != newSelectedItem)
+            {
+                _skipSelectedItemTextUpdate = true;
+            }
+            SelectedItem = newSelectedItem;
+
+            // Restore updates for TextSelection
+            if (_ignoreTextSelectionChange)
+            {
+                _ignoreTextSelectionChange = false;
+                if (TextBox != null)
+                {
+                    _textSelectionStart = TextBoxSelectionStart;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Attempts to look through the view and locate the specific exact 
+        /// text match.
+        /// </summary>
+        /// <param name="searchText">The search text.</param>
+        /// <param name="view">The view reference.</param>
+        /// <param name="predicate">The predicate to use for the partial or 
+        /// exact match.</param>
+        /// <returns>Returns the object or null.</returns>
+        private object TryGetMatch(string searchText, AvaloniaList<object> view, AutoCompleteFilterPredicate<string> predicate)
+        {
+            if (view != null && view.Count > 0)
+            {
+                foreach (object o in view)
+                {
+                    if (predicate(searchText, FormatValue(o)))
+                    {
+                        return o;
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private void UpdatePseudoClasses()
+        {
+            PseudoClasses.Set(":dropdownopen", IsDropDownOpen);
+        }
+
+        private void ClearTextBoxSelection()
+        {
+            if (TextBox != null)
+            {
+                int length = TextBox.Text?.Length ?? 0;
+                TextBox.SelectionStart = length;
+                TextBox.SelectionEnd = length;
+            }
+        }
+
+        /// <summary>
+        /// Called when the selected item is changed, updates the text value
+        /// that is displayed in the text box part.
+        /// </summary>
+        /// <param name="newItem">The new item.</param>
+        private void OnSelectedItemChanged(object newItem)
+        {
+            string text;
+
+            if (newItem == null)
+            {
+                text = SearchText;
+            }
+            else
+            {
+                text = FormatValue(newItem, true);
+            }
+
+            // Update the Text property and the TextBox values
+            UpdateTextValue(text);
+
+            // Move the caret to the end of the text box
+            ClearTextBoxSelection();
+        }
+
+        /// <summary>
+        /// Handles the SelectionChanged event of the selection adapter.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The selection changed event data.</param>
+        private void OnAdapterSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            SelectedItem = _adapter.SelectedItem;
+        }
+
+        //TODO Check UpdateTextCompletion
+        /// <summary>
+        /// Handles the Commit event on the selection adapter.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The event data.</param>
+        private void OnAdapterSelectionComplete(object sender, RoutedEventArgs e)
+        {
+            IsDropDownOpen = false;
+
+            // Completion will update the selected value
+            //UpdateTextCompletion(false);
+
+            // Text should not be selected
+            ClearTextBoxSelection();
+
+            TextBox.Focus();
+        }
+
+        /// <summary>
+        /// Handles the Cancel event on the selection adapter.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The event data.</param>
+        private void OnAdapterSelectionCanceled(object sender, RoutedEventArgs e)
+        {
+            UpdateTextValue(SearchText);
+
+            // Completion will update the selected value
+            UpdateTextCompletion(false);
+        }
+
+        /// <summary>
+        /// A predefined set of filter functions for the known, built-in 
+        /// AutoCompleteFilterMode enumeration values.
+        /// </summary>
+        private static class AutoCompleteSearch
+        {
+            /// <summary>
+            /// Index function that retrieves the filter for the provided 
+            /// AutoCompleteFilterMode.
+            /// </summary>
+            /// <param name="FilterMode">The built-in search mode.</param>
+            /// <returns>Returns the string-based comparison function.</returns>
+            public static AutoCompleteFilterPredicate<string> GetFilter(AutoCompleteFilterMode FilterMode)
+            {
+                switch (FilterMode)
+                {
+                    case AutoCompleteFilterMode.Contains:
+                        return Contains;
+
+                    case AutoCompleteFilterMode.ContainsCaseSensitive:
+                        return ContainsCaseSensitive;
+
+                    case AutoCompleteFilterMode.ContainsOrdinal:
+                        return ContainsOrdinal;
+
+                    case AutoCompleteFilterMode.ContainsOrdinalCaseSensitive:
+                        return ContainsOrdinalCaseSensitive;
+
+                    case AutoCompleteFilterMode.Equals:
+                        return Equals;
+
+                    case AutoCompleteFilterMode.EqualsCaseSensitive:
+                        return EqualsCaseSensitive;
+
+                    case AutoCompleteFilterMode.EqualsOrdinal:
+                        return EqualsOrdinal;
+
+                    case AutoCompleteFilterMode.EqualsOrdinalCaseSensitive:
+                        return EqualsOrdinalCaseSensitive;
+
+                    case AutoCompleteFilterMode.StartsWith:
+                        return StartsWith;
+
+                    case AutoCompleteFilterMode.StartsWithCaseSensitive:
+                        return StartsWithCaseSensitive;
+
+                    case AutoCompleteFilterMode.StartsWithOrdinal:
+                        return StartsWithOrdinal;
+
+                    case AutoCompleteFilterMode.StartsWithOrdinalCaseSensitive:
+                        return StartsWithOrdinalCaseSensitive;
+
+                    case AutoCompleteFilterMode.None:
+                    case AutoCompleteFilterMode.Custom:
+                    default:
+                        return null;
+                }
+            }
+
+            /// <summary>
+            /// An implementation of the Contains member of string that takes in a 
+            /// string comparison. The traditional .NET string Contains member uses 
+            /// StringComparison.Ordinal.
+            /// </summary>
+            /// <param name="s">The string.</param>
+            /// <param name="value">The string value to search for.</param>
+            /// <param name="comparison">The string comparison type.</param>
+            /// <returns>Returns true when the substring is found.</returns>
+            private static bool Contains(string s, string value, StringComparison comparison)
+            {
+                return s.IndexOf(value, comparison) >= 0;
+            }
+
+            /// <summary>
+            /// Check if the string value begins with the text.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool StartsWith(string text, string value)
+            {
+                return value.StartsWith(text, StringComparison.CurrentCultureIgnoreCase);
+            }
+
+            /// <summary>
+            /// Check if the string value begins with the text.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool StartsWithCaseSensitive(string text, string value)
+            {
+                return value.StartsWith(text, StringComparison.CurrentCulture);
+            }
+
+            /// <summary>
+            /// Check if the string value begins with the text.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool StartsWithOrdinal(string text, string value)
+            {
+                return value.StartsWith(text, StringComparison.OrdinalIgnoreCase);
+            }
+
+            /// <summary>
+            /// Check if the string value begins with the text.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool StartsWithOrdinalCaseSensitive(string text, string value)
+            {
+                return value.StartsWith(text, StringComparison.Ordinal);
+            }
+
+            /// <summary>
+            /// Check if the prefix is contained in the string value. The current 
+            /// culture's case insensitive string comparison operator is used.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool Contains(string text, string value)
+            {
+                return Contains(value, text, StringComparison.CurrentCultureIgnoreCase);
+            }
+
+            /// <summary>
+            /// Check if the prefix is contained in the string value.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool ContainsCaseSensitive(string text, string value)
+            {
+                return Contains(value, text, StringComparison.CurrentCulture);
+            }
+
+            /// <summary>
+            /// Check if the prefix is contained in the string value.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool ContainsOrdinal(string text, string value)
+            {
+                return Contains(value, text, StringComparison.OrdinalIgnoreCase);
+            }
+
+            /// <summary>
+            /// Check if the prefix is contained in the string value.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool ContainsOrdinalCaseSensitive(string text, string value)
+            {
+                return Contains(value, text, StringComparison.Ordinal);
+            }
+
+            /// <summary>
+            /// Check if the string values are equal.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool Equals(string text, string value)
+            {
+                return value.Equals(text, StringComparison.CurrentCultureIgnoreCase);
+            }
+
+            /// <summary>
+            /// Check if the string values are equal.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool EqualsCaseSensitive(string text, string value)
+            {
+                return value.Equals(text, StringComparison.CurrentCulture);
+            }
+
+            /// <summary>
+            /// Check if the string values are equal.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool EqualsOrdinal(string text, string value)
+            {
+                return value.Equals(text, StringComparison.OrdinalIgnoreCase);
+            }
+
+            /// <summary>
+            /// Check if the string values are equal.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool EqualsOrdinalCaseSensitive(string text, string value)
+            {
+                return value.Equals(text, StringComparison.Ordinal);
+            }
+        }
+
+        /// <summary>
+        /// A framework element that permits a binding to be evaluated in a new data
+        /// context leaf node.
+        /// </summary>
+        /// <typeparam name="T">The type of dynamic binding to return.</typeparam>
+        public class BindingEvaluator<T> : Control
+        {
+            /// <summary>
+            /// Gets or sets the string value binding used by the control.
+            /// </summary>
+            private IBinding _binding;
+
+            #region public T Value
+
+            /// <summary>
+            /// Identifies the Value dependency property.
+            /// </summary>
+            public static readonly StyledProperty<T> ValueProperty =
+                AvaloniaProperty.Register<BindingEvaluator<T>, T>(nameof(Value));
+
+            /// <summary>
+            /// Gets or sets the data item value.
+            /// </summary>
+            public T Value
+            {
+                get { return GetValue(ValueProperty); }
+                set { SetValue(ValueProperty, value); }
+            }
+            
+            #endregion public string Value
+
+            /// <summary>
+            /// Gets or sets the value binding.
+            /// </summary>
+            public IBinding ValueBinding
+            {
+                get { return _binding; }
+                set
+                {
+                    _binding = value;
+                    AvaloniaObjectExtensions.Bind(this, ValueProperty, value);
+                }
+            }
+
+            /// <summary>
+            /// Initializes a new instance of the BindingEvaluator class.
+            /// </summary>
+            public BindingEvaluator()
+            { }
+
+            /// <summary>
+            /// Initializes a new instance of the BindingEvaluator class,
+            /// setting the initial binding to the provided parameter.
+            /// </summary>
+            /// <param name="binding">The initial string value binding.</param>
+            public BindingEvaluator(IBinding binding)
+                : this()
+            {
+                ValueBinding = binding;
+            }
+
+            /// <summary>
+            /// Clears the data context so that the control does not keep a
+            /// reference to the last-looked up item.
+            /// </summary>
+            public void ClearDataContext()
+            {
+                DataContext = null;
+            }
+
+            /// <summary>
+            /// Updates the data context of the framework element and returns the 
+            /// updated binding value.
+            /// </summary>
+            /// <param name="o">The object to use as the data context.</param>
+            /// <param name="clearDataContext">If set to true, this parameter will
+            /// clear the data context immediately after retrieving the value.</param>
+            /// <returns>Returns the evaluated T value of the bound dependency
+            /// property.</returns>
+            public T GetDynamicValue(object o, bool clearDataContext)
+            {
+                DataContext = o;
+                T value = Value;
+                if (clearDataContext)
+                {
+                    DataContext = null;
+                }
+                return value;
+            }
+
+            /// <summary>
+            /// Updates the data context of the framework element and returns the 
+            /// updated binding value.
+            /// </summary>
+            /// <param name="o">The object to use as the data context.</param>
+            /// <returns>Returns the evaluated T value of the bound dependency
+            /// property.</returns>
+            public T GetDynamicValue(object o)
+            {
+                DataContext = o;
+                return Value;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Utils/ISelectionAdapter.cs b/src/Avalonia.Controls/Utils/ISelectionAdapter.cs
new file mode 100644
index 0000000000..3c1006a12e
--- /dev/null
+++ b/src/Avalonia.Controls/Utils/ISelectionAdapter.cs
@@ -0,0 +1,64 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using System;
+using System.Collections;
+using Avalonia.Interactivity;
+using Avalonia.Input;
+
+namespace Avalonia.Controls.Utils
+{
+    /// <summary>
+    /// Defines an item collection, selection members, and key handling for the
+    /// selection adapter contained in the drop-down portion of an
+    /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.
+    /// </summary>
+    public interface ISelectionAdapter
+    {
+        /// <summary>
+        /// Gets or sets the selected item.
+        /// </summary>
+        /// <value>The currently selected item.</value>
+        object SelectedItem { get; set; }
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="P:Avalonia.Controls.Utils.ISelectionAdapter.SelectedItem" />
+        /// property value changes.
+        /// </summary>
+        event EventHandler<SelectionChangedEventArgs> SelectionChanged;
+        
+        /// <summary>
+        /// Gets or sets a collection that is used to generate content for the
+        /// selection adapter.
+        /// </summary>
+        /// <value>The collection that is used to generate content for the
+        /// selection adapter.</value>
+        IEnumerable Items { get; set; }
+
+        /// <summary>
+        /// Occurs when a selected item is not cancelled and is committed as the
+        /// selected item.
+        /// </summary>
+        event EventHandler<RoutedEventArgs> Commit;
+
+        /// <summary>
+        /// Occurs when a selection has been canceled.
+        /// </summary>
+        event EventHandler<RoutedEventArgs> Cancel;
+
+        /// <summary>
+        /// Provides handling for the
+        /// <see cref="E:Avalonia.Input.InputElement.KeyDown" /> event that occurs
+        /// when a key is pressed while the drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> has focus.
+        /// </summary>
+        /// <param name="e">A <see cref="T:Avalonia.Input.KeyEventArgs" />
+        /// that contains data about the
+        /// <see cref="E:Avalonia.Input.InputElement.KeyDown" /> event.</param>
+        void HandleKeyDown(KeyEventArgs e);
+    }
+
+}
diff --git a/src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs b/src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs
new file mode 100644
index 0000000000..43c8a5aa6c
--- /dev/null
+++ b/src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs
@@ -0,0 +1,342 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+using Avalonia.Input;
+using Avalonia.LogicalTree;
+using System.Collections;
+using System.Diagnostics;
+
+namespace Avalonia.Controls.Utils
+{
+    /// <summary>
+    /// Represents the selection adapter contained in the drop-down portion of
+    /// an <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.
+    /// </summary>
+    public class SelectingItemsControlSelectionAdapter : ISelectionAdapter
+    {
+        /// <summary>
+        /// The SelectingItemsControl instance.
+        /// </summary>
+        private SelectingItemsControl _selector;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the selection change event 
+        /// should not be fired.
+        /// </summary>
+        private bool IgnoringSelectionChanged { get; set; }
+
+        /// <summary>
+        /// Gets or sets the underlying
+        /// <see cref="T:Avalonia.Controls.Primitives.SelectingItemsControl" />
+        /// control.
+        /// </summary>
+        /// <value>The underlying
+        /// <see cref="T:Avalonia.Controls.Primitives.SelectingItemsControl" />
+        /// control.</value>
+        public SelectingItemsControl SelectorControl
+        {
+            get { return _selector; }
+
+            set
+            {
+                if (_selector != null)
+                {
+                    _selector.SelectionChanged -= OnSelectionChanged;
+                    _selector.PointerReleased -= OnSelectorPointerReleased;
+                }
+
+                _selector = value;
+
+                if (_selector != null)
+                {
+                    _selector.SelectionChanged += OnSelectionChanged;
+                    _selector.PointerReleased += OnSelectorPointerReleased;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="P:Avalonia.Controls.Utils.SelectingItemsControlSelectionAdapter.SelectedItem" />
+        /// property value changes.
+        /// </summary>
+        public event EventHandler<SelectionChangedEventArgs> SelectionChanged;
+
+        /// <summary>
+        /// Occurs when an item is selected and is committed to the underlying
+        /// <see cref="T:Avalonia.Controls.Primitives.SelectingItemsControl" />
+        /// control.
+        /// </summary>
+        public event EventHandler<RoutedEventArgs> Commit;
+
+        /// <summary>
+        /// Occurs when a selection is canceled before it is committed.
+        /// </summary>
+        public event EventHandler<RoutedEventArgs> Cancel;
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.Utils.SelectingItemsControlSelectionAdapter" />
+        /// class.
+        /// </summary>
+        public SelectingItemsControlSelectionAdapter()
+        {
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.Utils.SelectingItemsControlSelectionAdapterr" />
+        /// class with the specified
+        /// <see cref="T:Avalonia.Controls.Primitives.SelectingItemsControl" />
+        /// control.
+        /// </summary>
+        /// <param name="selector">The
+        /// <see cref="T:Avalonia.Controls.Primitives.SelectingItemsControl" /> control
+        /// to wrap as a
+        /// <see cref="T:Avalonia.Controls.Utils.SelectingItemsControlSelectionAdapter" />.</param>
+        public SelectingItemsControlSelectionAdapter(SelectingItemsControl selector)
+        {
+            SelectorControl = selector;
+        }
+
+        /// <summary>
+        /// Gets or sets the selected item of the selection adapter.
+        /// </summary>
+        /// <value>The selected item of the underlying selection adapter.</value>
+        public object SelectedItem
+        {
+            get
+            {
+                return SelectorControl?.SelectedItem;
+            }
+
+            set
+            {
+                IgnoringSelectionChanged = true;
+                if (SelectorControl != null)
+                {
+                    SelectorControl.SelectedItem = value;
+                }
+
+                // Attempt to reset the scroll viewer's position
+                if (value == null)
+                {
+                    ResetScrollViewer();
+                }
+
+                IgnoringSelectionChanged = false;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a collection that is used to generate the content of
+        /// the selection adapter.
+        /// </summary>
+        /// <value>The collection used to generate content for the selection
+        /// adapter.</value>
+        public IEnumerable Items
+        {
+            get
+            {
+                return SelectorControl?.Items;
+            }
+            set
+            {
+                if (SelectorControl != null)
+                {
+                    SelectorControl.Items = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// If the control contains a ScrollViewer, this will reset the viewer 
+        /// to be scrolled to the top.
+        /// </summary>
+        private void ResetScrollViewer()
+        {
+            if (SelectorControl != null)
+            {
+                ScrollViewer sv = SelectorControl.GetLogicalDescendants().OfType<ScrollViewer>().FirstOrDefault();
+                if (sv != null)
+                {
+                    sv.Offset = new Vector(0, 0);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Handles the mouse left button up event on the selector control.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The event data.</param>
+        private void OnSelectorPointerReleased(object sender, PointerReleasedEventArgs e)
+        {
+            if (e.MouseButton == MouseButton.Left)
+            {
+                OnCommit();
+            }
+        }
+
+        /// <summary>
+        /// Handles the SelectionChanged event on the SelectingItemsControl control.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The selection changed event data.</param>
+        private void OnSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (IgnoringSelectionChanged)
+            {
+                return;
+            }
+
+            SelectionChanged?.Invoke(sender, e);
+        }
+
+        /// <summary>
+        /// Increments the
+        /// <see cref="P:Avalonia.Controls.Primitives.SelectingItemsControl.SelectedIndex" />
+        /// property of the underlying
+        /// <see cref="T:Avalonia.Controls.Primitives.SelectingItemsControl" />
+        /// control.
+        /// </summary>
+        protected void SelectedIndexIncrement()
+        {
+            if (SelectorControl != null)
+            {
+                SelectorControl.SelectedIndex = SelectorControl.SelectedIndex + 1 >= SelectorControl.ItemCount ? -1 : SelectorControl.SelectedIndex + 1;
+            }
+        }
+
+        /// <summary>
+        /// Decrements the
+        /// <see cref="P:Avalonia.Controls.Primitives.SelectingItemsControl.SelectedIndex" />
+        /// property of the underlying
+        /// <see cref="T:Avalonia.Controls.Primitives.SelectingItemsControl" />
+        /// control.
+        /// </summary>
+        protected void SelectedIndexDecrement()
+        {
+            if (SelectorControl != null)
+            {
+                int index = SelectorControl.SelectedIndex;
+                if (index >= 0)
+                {
+                    SelectorControl.SelectedIndex--;
+                }
+                else if (index == -1)
+                {
+                    SelectorControl.SelectedIndex = SelectorControl.ItemCount - 1;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Provides handling for the
+        /// <see cref="E:Avalonia.Input.InputElement.KeyDown" /> event that occurs
+        /// when a key is pressed while the drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> has focus.
+        /// </summary>
+        /// <param name="e">A <see cref="T:Avalonia.Input.KeyEventArgs" />
+        /// that contains data about the
+        /// <see cref="E:Avalonia.Input.InputElement.KeyDown" /> event.</param>
+        public void HandleKeyDown(KeyEventArgs e)
+        {
+            switch (e.Key)
+            {
+                case Key.Enter:
+                    OnCommit();
+                    e.Handled = true;
+                    break;
+
+                case Key.Up:
+                    SelectedIndexDecrement();
+                    e.Handled = true;
+                    break;
+
+                case Key.Down:
+                    if ((e.Modifiers & InputModifiers.Alt) == InputModifiers.None)
+                    {
+                        SelectedIndexIncrement();
+                        e.Handled = true;
+                    }
+                    break;
+
+                case Key.Escape:
+                    OnCancel();
+                    e.Handled = true;
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.Utils.SelectingItemsControlSelectionAdapter.Commit" />
+        /// event.
+        /// </summary>
+        protected virtual void OnCommit()
+        {
+            OnCommit(this, new RoutedEventArgs());
+        }
+
+        /// <summary>
+        /// Fires the Commit event.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The event data.</param>
+        private void OnCommit(object sender, RoutedEventArgs e)
+        {
+            Commit?.Invoke(sender, e);
+
+            AfterAdapterAction();
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.Utils.SelectingItemsControlSelectionAdapter.Cancel" />
+        /// event.
+        /// </summary>
+        protected virtual void OnCancel()
+        {
+            OnCancel(this, new RoutedEventArgs());
+        }
+
+        /// <summary>
+        /// Fires the Cancel event.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The event data.</param>
+        private void OnCancel(object sender, RoutedEventArgs e)
+        {
+            Cancel?.Invoke(sender, e);
+
+            AfterAdapterAction();
+        }
+
+        /// <summary>
+        /// Change the selection after the actions are complete.
+        /// </summary>
+        private void AfterAdapterAction()
+        {
+            IgnoringSelectionChanged = true;
+            if (SelectorControl != null)
+            {
+                SelectorControl.SelectedItem = null;
+                SelectorControl.SelectedIndex = -1;
+            }
+            IgnoringSelectionChanged = false;
+        }
+    }
+}
diff --git a/src/Avalonia.Themes.Default/AutoCompleteBox.xaml b/src/Avalonia.Themes.Default/AutoCompleteBox.xaml
new file mode 100644
index 0000000000..82dbf6064b
--- /dev/null
+++ b/src/Avalonia.Themes.Default/AutoCompleteBox.xaml
@@ -0,0 +1,43 @@
+<Styles xmlns="https://github.com/avaloniaui">
+  <Style Selector="AutoCompleteBox">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
+    <Setter Property="Padding" Value="4"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <TextBox Name="PART_TextBox"
+                   Background="{TemplateBinding Background}" 
+                   BorderBrush="{TemplateBinding BorderBrush}" 
+                   BorderThickness="{TemplateBinding BorderThickness}"
+                   Padding="{TemplateBinding Padding}"
+                   Watermark="{TemplateBinding Watermark}"
+                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}" />
+          
+          <Popup Name="PART_Popup"
+                 MinWidth="{TemplateBinding Bounds.Width}"
+                 MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                 PlacementTarget="{TemplateBinding}"
+                 StaysOpen="False">
+            <Border BorderBrush="{DynamicResource ThemeBorderMidBrush}"
+                    BorderThickness="1">
+              <ListBox Name="PART_SelectingItemsControl"
+                       BorderThickness="0"
+                       Background="{TemplateBinding Background}"
+                       Foreground="{TemplateBinding Foreground}"
+                       ItemTemplate="{TemplateBinding ItemTemplate}"
+                       MemberSelector="{TemplateBinding ValueMemberSelector}"
+                       ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                       ScrollViewer.VerticalScrollBarVisibility="Auto" />
+            </Border>
+          </Popup>
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+  
+  <Style Selector="AutoCompleteBox ListBoxItem:pointerover">
+    <Setter Property="Background" Value="#ffd0d0d0"/>
+  </Style>
+</Styles>
\ No newline at end of file
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
index 5b6f4b78fd..7d3090de66 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml
@@ -23,7 +23,7 @@
   <StyleInclude Source="resm:Avalonia.Themes.Default.RadioButton.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.RepeatButton.xaml?assembly=Avalonia.Themes.Default" />
   <StyleInclude Source="resm:Avalonia.Themes.Default.Separator.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.Slider.xaml?assembly=Avalonia.Themes.Default"/>  
+  <StyleInclude Source="resm:Avalonia.Themes.Default.Slider.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.ScrollBar.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.ScrollViewer.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.TabStrip.xaml?assembly=Avalonia.Themes.Default"/>
@@ -42,4 +42,5 @@
   <StyleInclude Source="resm:Avalonia.Themes.Default.CalendarItem.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.Calendar.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.DatePicker.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.AutoCompleteBox.xaml?assembly=Avalonia.Themes.Default"/>
 </Styles>

From e2ff0a02584303b7c7f2308a23f020b848ab7bb8 Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Wed, 28 Feb 2018 20:09:11 -0500
Subject: [PATCH 380/482] Fixed an off by one bug

---
 src/Avalonia.Controls/TextBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 3ec3d6ed5b..27410c5948 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -788,7 +788,7 @@ namespace Avalonia.Controls
             int pos = 0;
             int i;
 
-            for (i = 0; i < lines.Count; ++i)
+            for (i = 0; i < lines.Count - 1; ++i)
             {
                 var line = lines[i];
                 pos += line.Length;

From c5608bd386ddfed5ba1cc27b43326f53a846dc98 Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Wed, 28 Feb 2018 20:10:35 -0500
Subject: [PATCH 381/482] Moved the setting of FocusedElement

This allows the LostFocus event to check the newly focused element
---
 src/Avalonia.Input/KeyboardDevice.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Input/KeyboardDevice.cs b/src/Avalonia.Input/KeyboardDevice.cs
index d815f8082b..2a1cdec1c0 100644
--- a/src/Avalonia.Input/KeyboardDevice.cs
+++ b/src/Avalonia.Input/KeyboardDevice.cs
@@ -46,13 +46,13 @@ namespace Avalonia.Input
             if (element != FocusedElement)
             {
                 var interactive = FocusedElement as IInteractive;
+                FocusedElement = element;
 
                 interactive?.RaiseEvent(new RoutedEventArgs
                 {
                     RoutedEvent = InputElement.LostFocusEvent,
                 });
 
-                FocusedElement = element;
                 interactive = element as IInteractive;
 
                 interactive?.RaiseEvent(new GotFocusEventArgs

From 5927e7acfe17dc0e47e2a8fab5dbdbba50ffb7bb Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Mon, 5 Mar 2018 12:09:56 -0500
Subject: [PATCH 382/482] Added Unit Tests

---
 .../AutoCompleteBoxTests.cs                   | 1042 +++++++++++++++++
 1 file changed, 1042 insertions(+)
 create mode 100644 tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs

diff --git a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
new file mode 100644
index 0000000000..f9da2ab6f3
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
@@ -0,0 +1,1042 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+using Avalonia.Markup.Xaml.Data;
+using Avalonia.Platform;
+using Avalonia.Threading;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+using System.Collections.ObjectModel;
+
+namespace Avalonia.Controls.UnitTests
+{
+    public class AutoCompleteBoxTests
+    {
+        [Fact]
+        public void Search_Filters()
+        {
+            Assert.True(GetFilter(AutoCompleteFilterMode.Contains)("am", "name"));
+            Assert.True(GetFilter(AutoCompleteFilterMode.Contains)("AME", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.Contains)("hello", "name"));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.ContainsCaseSensitive)("na", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.ContainsCaseSensitive)("AME", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.ContainsCaseSensitive)("hello", "name"));
+
+            Assert.Null(GetFilter(AutoCompleteFilterMode.Custom));
+            Assert.Null(GetFilter(AutoCompleteFilterMode.None));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.Equals)("na", "na"));
+            Assert.True(GetFilter(AutoCompleteFilterMode.Equals)("na", "NA"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.Equals)("hello", "name"));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.EqualsCaseSensitive)("na", "na"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.EqualsCaseSensitive)("na", "NA"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.EqualsCaseSensitive)("hello", "name"));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.StartsWith)("na", "name"));
+            Assert.True(GetFilter(AutoCompleteFilterMode.StartsWith)("NAM", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.StartsWith)("hello", "name"));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.StartsWithCaseSensitive)("na", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.StartsWithCaseSensitive)("NAM", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.StartsWithCaseSensitive)("hello", "name"));
+        }
+
+        [Fact]
+        public void Ordinal_Search_Filters()
+        {
+            Assert.True(GetFilter(AutoCompleteFilterMode.ContainsOrdinal)("am", "name"));
+            Assert.True(GetFilter(AutoCompleteFilterMode.ContainsOrdinal)("AME", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.ContainsOrdinal)("hello", "name"));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.ContainsOrdinalCaseSensitive)("na", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.ContainsOrdinalCaseSensitive)("AME", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.ContainsOrdinalCaseSensitive)("hello", "name"));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.EqualsOrdinal)("na", "na"));
+            Assert.True(GetFilter(AutoCompleteFilterMode.EqualsOrdinal)("na", "NA"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.EqualsOrdinal)("hello", "name"));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.EqualsOrdinalCaseSensitive)("na", "na"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.EqualsOrdinalCaseSensitive)("na", "NA"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.EqualsOrdinalCaseSensitive)("hello", "name"));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.StartsWithOrdinal)("na", "name"));
+            Assert.True(GetFilter(AutoCompleteFilterMode.StartsWithOrdinal)("NAM", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.StartsWithOrdinal)("hello", "name"));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.StartsWithOrdinalCaseSensitive)("na", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.StartsWithOrdinalCaseSensitive)("NAM", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.StartsWithOrdinalCaseSensitive)("hello", "name"));
+        }
+
+        [Fact]
+        public void Fires_DropDown_Events()
+        {
+            RunTest((control, textbox) =>
+            {
+                bool openEvent = false;
+                bool closeEvent = false;
+                control.DropDownOpened += (s, e) => openEvent = true;
+                control.DropDownClosed += (s, e) => closeEvent = true;
+                control.Items = CreateSimpleStringArray();
+
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.True(control.SearchText == "a");
+                Assert.True(control.IsDropDownOpen);
+                Assert.True(openEvent);
+
+                textbox.Text = String.Empty;
+                Dispatcher.UIThread.RunJobs();
+                Assert.True(control.SearchText == String.Empty);
+                Assert.False(control.IsDropDownOpen);
+                Assert.True(closeEvent);
+            });
+        }
+
+        [Fact]
+        public void Text_Completion_Via_Text_Property()
+        {
+            RunTest((control, textbox) =>
+            {
+                control.IsTextCompletionEnabled = true;
+
+                Assert.Equal(String.Empty, control.Text);
+                control.Text = "close";
+                Assert.NotNull(control.SelectedItem);
+            });
+        }
+
+        [Fact]
+        public void Text_Completion_Selects_Text()
+        {
+            RunTest((control, textbox) =>
+            {
+                control.IsTextCompletionEnabled = true;
+
+                textbox.Text = "ac";
+                textbox.SelectionEnd = textbox.SelectionStart = 2;
+                Dispatcher.UIThread.RunJobs();
+
+                Assert.True(control.IsDropDownOpen);
+                Assert.True(Math.Abs(textbox.SelectionEnd - textbox.SelectionStart) > 2);
+            });
+        }
+
+        [Fact]
+        public void TextChanged_Event_Fires()
+        {
+            RunTest((control, textbox) =>
+            {
+                bool textChanged = false;
+                control.TextChanged += (s, e) => textChanged = true;
+
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.True(textChanged);
+
+                textChanged = false;
+                control.Text = "conversati";
+                Dispatcher.UIThread.RunJobs();
+                Assert.True(textChanged);
+
+                textChanged = false;
+                control.Text = null;
+                Dispatcher.UIThread.RunJobs();
+                Assert.True(textChanged);
+            });
+        }
+
+        [Fact]
+        public void MinimumPrefixLength_Works()
+        {
+            RunTest((control, textbox) =>
+            {
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.True(control.IsDropDownOpen);
+
+
+                textbox.Text = String.Empty;
+                Dispatcher.UIThread.RunJobs();
+                Assert.False(control.IsDropDownOpen);
+
+                control.MinimumPrefixLength = 3;
+
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.False(control.IsDropDownOpen);
+
+                textbox.Text = "acc";
+                Dispatcher.UIThread.RunJobs();
+                Assert.True(control.IsDropDownOpen);
+            });
+        }
+
+        [Fact]
+        public void Can_Cancel_DropDown_Opening()
+        {
+            RunTest((control, textbox) =>
+            {
+                control.DropDownOpening += (s, e) => e.Cancel = true;
+
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.False(control.IsDropDownOpen);
+            });
+        }
+
+        [Fact]
+        public void Can_Cancel_DropDown_Closing()
+        {
+            RunTest((control, textbox) =>
+            {
+                control.DropDownClosing += (s, e) => e.Cancel = true;
+
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.True(control.IsDropDownOpen);
+
+                control.IsDropDownOpen = false;
+                Assert.True(control.IsDropDownOpen);
+            });
+        }
+
+        [Fact]
+        public void Can_Cancel_Population()
+        {
+            RunTest((control, textbox) =>
+            {
+                bool populating = false;
+                bool populated = false;
+                control.FilterMode = AutoCompleteFilterMode.None;
+                control.Populating += (s, e) =>
+                {
+                    e.Cancel = true;
+                    populating = true;
+                };
+                control.Populated += (s, e) => populated = true;
+
+                textbox.Text = "accounti";
+                Dispatcher.UIThread.RunJobs();
+
+                Assert.True(populating);
+                Assert.False(populated);
+            });
+        }
+
+        [Fact]
+        public void Custom_Population_Supported()
+        {
+            RunTest((control, textbox) =>
+            {
+                string custom = "Custom!";
+                string search = "accounti";
+                bool populated = false;
+                bool populatedOk = false;
+                control.FilterMode = AutoCompleteFilterMode.None;
+                control.Populating += (s, e) =>
+                {
+                    control.Items = new string[] { custom };
+                    Assert.Equal(search, e.Parameter);
+                };
+                control.Populated += (s, e) =>
+                {
+                    populated = true;
+                    ReadOnlyCollection<object> collection = e.Data as ReadOnlyCollection<object>;
+                    populatedOk = collection != null && collection.Count == 1;
+                };
+
+                textbox.Text = search;
+                Dispatcher.UIThread.RunJobs();
+
+                Assert.True(populated);
+                Assert.True(populatedOk);
+            });
+        }
+
+        [Fact]
+        public void Text_Completion()
+        {
+            RunTest((control, textbox) =>
+            {
+                control.IsTextCompletionEnabled = true;
+                textbox.Text = "accounti";
+                textbox.SelectionStart = textbox.SelectionEnd = textbox.Text.Length;
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal("accounti", control.SearchText);
+                Assert.Equal("accounting", textbox.Text);
+            });
+        }
+
+        [Fact]
+        public void String_Search()
+        {
+            RunTest((control, textbox) =>
+            {
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "acc";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "cook";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "accept";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "cook";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+            });
+        }
+
+        [Fact]
+        public void Item_Search()
+        {
+            RunTest((control, textbox) =>
+            {
+                control.FilterMode = AutoCompleteFilterMode.Custom;
+                control.ItemFilter = (search, item) =>
+                {
+                    string s = item as string;
+                    return s == null ? false : true;
+                };
+
+                // Just set to null briefly to exercise that code path
+                AutoCompleteFilterPredicate<object> filter = control.ItemFilter;
+                Assert.NotNull(filter);
+                control.ItemFilter = null;
+                Assert.Null(control.ItemFilter);
+                control.ItemFilter = filter;
+                Assert.NotNull(control.ItemFilter);
+
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "acc";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "cook";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "accept";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "cook";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+            });
+        }
+        
+        /// <summary>
+        /// Retrieves a defined predicate filter through a new AutoCompleteBox 
+        /// control instance.
+        /// </summary>
+        /// <param name="mode">The FilterMode of interest.</param>
+        /// <returns>Returns the predicate instance.</returns>
+        private static AutoCompleteFilterPredicate<string> GetFilter(AutoCompleteFilterMode mode)
+        {
+            return new AutoCompleteBox { FilterMode = mode }
+                .TextFilter;
+        }
+
+        /// <summary>
+        /// Creates a large list of strings for AutoCompleteBox testing.
+        /// </summary>
+        /// <returns>Returns a new List of string values.</returns>
+        private IList<string> CreateSimpleStringArray()
+        {
+            return new List<string>
+            {
+            "a",
+            "abide",
+            "able",
+            "about",
+            "above",
+            "absence",
+            "absurd",
+            "accept",
+            "acceptance",
+            "accepted",
+            "accepting",
+            "access",
+            "accessed",
+            "accessible",
+            "accident",
+            "accidentally",
+            "accordance",
+            "account",
+            "accounting",
+            "accounts",
+            "accusation",
+            "accustomed",
+            "ache",
+            "across",
+            "act",
+            "active",
+            "actual",
+            "actually",
+            "ada",
+            "added",
+            "adding",
+            "addition",
+            "additional",
+            "additions",
+            "address",
+            "addressed",
+            "addresses",
+            "addressing",
+            "adjourn",
+            "adoption",
+            "advance",
+            "advantage",
+            "adventures",
+            "advice",
+            "advisable",
+            "advise",
+            "affair",
+            "affectionately",
+            "afford",
+            "afore",
+            "afraid",
+            "after",
+            "afterwards",
+            "again",
+            "against",
+            "age",
+            "aged",
+            "agent",
+            "ago",
+            "agony",
+            "agree",
+            "agreed",
+            "agreement",
+            "ah",
+            "ahem",
+            "air",
+            "airs",
+            "ak",
+            "alarm",
+            "alarmed",
+            "alas",
+            "alice",
+            "alive",
+            "all",
+            "allow",
+            "almost",
+            "alone",
+            "along",
+            "aloud",
+            "already",
+            "also",
+            "alteration",
+            "altered",
+            "alternate",
+            "alternately",
+            "altogether",
+            "always",
+            "am",
+            "ambition",
+            "among",
+            "an",
+            "ancient",
+            "and",
+            "anger",
+            "angrily",
+            "angry",
+            "animal",
+            "animals",
+            "ann",
+            "annoy",
+            "annoyed",
+            "another",
+            "answer",
+            "answered",
+            "answers",
+            "antipathies",
+            "anxious",
+            "anxiously",
+            "any",
+            "anyone",
+            "anything",
+            "anywhere",
+            "appealed",
+            "appear",
+            "appearance",
+            "appeared",
+            "appearing",
+            "appears",
+            "applause",
+            "apple",
+            "apples",
+            "applicable",
+            "apply",
+            "approach",
+            "arch",
+            "archbishop",
+            "arches",
+            "archive",
+            "are",
+            "argue",
+            "argued",
+            "argument",
+            "arguments",
+            "arise",
+            "arithmetic",
+            "arm",
+            "arms",
+            "around",
+            "arranged",
+            "array",
+            "arrived",
+            "arrow",
+            "arrum",
+            "as",
+            "ascii",
+            "ashamed",
+            "ask",
+            "askance",
+            "asked",
+            "asking",
+            "asleep",
+            "assembled",
+            "assistance",
+            "associated",
+            "at",
+            "ate",
+            "atheling",
+            "atom",
+            "attached",
+            "attempt",
+            "attempted",
+            "attempts",
+            "attended",
+            "attending",
+            "attends",
+            "audibly",
+            "australia",
+            "author",
+            "authority",
+            "available",
+            "avoid",
+            "away",
+            "awfully",
+            "axes",
+            "axis",
+            "b",
+            "baby",
+            "back",
+            "backs",
+            "bad",
+            "bag",
+            "baked",
+            "balanced",
+            "bank",
+            "banks",
+            "banquet",
+            "bark",
+            "barking",
+            "barley",
+            "barrowful",
+            "based",
+            "bat",
+            "bathing",
+            "bats",
+            "bawled",
+            "be",
+            "beak",
+            "bear",
+            "beast",
+            "beasts",
+            "beat",
+            "beating",
+            "beau",
+            "beauti",
+            "beautiful",
+            "beautifully",
+            "beautify",
+            "became",
+            "because",
+            "become",
+            "becoming",
+            "bed",
+            "beds",
+            "bee",
+            "been",
+            "before",
+            "beg",
+            "began",
+            "begged",
+            "begin",
+            "beginning",
+            "begins",
+            "begun",
+            "behead",
+            "beheaded",
+            "beheading",
+            "behind",
+            "being",
+            "believe",
+            "believed",
+            "bells",
+            "belong",
+            "belongs",
+            "beloved",
+            "below",
+            "belt",
+            "bend",
+            "bent",
+            "besides",
+            "best",
+            "better",
+            "between",
+            "bill",
+            "binary",
+            "bird",
+            "birds",
+            "birthday",
+            "bit",
+            "bite",
+            "bitter",
+            "blacking",
+            "blades",
+            "blame",
+            "blasts",
+            "bleeds",
+            "blew",
+            "blow",
+            "blown",
+            "blows",
+            "body",
+            "boldly",
+            "bone",
+            "bones",
+            "book",
+            "books",
+            "boon",
+            "boots",
+            "bore",
+            "both",
+            "bother",
+            "bottle",
+            "bottom",
+            "bough",
+            "bound",
+            "bowed",
+            "bowing",
+            "box",
+            "boxed",
+            "boy",
+            "brain",
+            "branch",
+            "branches",
+            "brandy",
+            "brass",
+            "brave",
+            "breach",
+            "bread",
+            "break",
+            "breath",
+            "breathe",
+            "breeze",
+            "bright",
+            "brightened",
+            "bring",
+            "bringing",
+            "bristling",
+            "broke",
+            "broken",
+            "brother",
+            "brought",
+            "brown",
+            "brush",
+            "brushing",
+            "burn",
+            "burning",
+            "burnt",
+            "burst",
+            "bursting",
+            "busily",
+            "business",
+            "business@pglaf",
+            "busy",
+            "but",
+            "butter",
+            "buttercup",
+            "buttered",
+            "butterfly",
+            "buttons",
+            "by",
+            "bye",
+            "c",
+            "cackled",
+            "cake",
+            "cakes",
+            "calculate",
+            "calculated",
+            "call",
+            "called",
+            "calling",
+            "calmly",
+            "came",
+            "camomile",
+            "can",
+            "canary",
+            "candle",
+            "cannot",
+            "canterbury",
+            "canvas",
+            "capering",
+            "capital",
+            "card",
+            "cardboard",
+            "cards",
+            "care",
+            "carefully",
+            "cares",
+            "carried",
+            "carrier",
+            "carroll",
+            "carry",
+            "carrying",
+            "cart",
+            "cartwheels",
+            "case",
+            "cat",
+            "catch",
+            "catching",
+            "caterpillar",
+            "cats",
+            "cattle",
+            "caucus",
+            "caught",
+            "cauldron",
+            "cause",
+            "caused",
+            "cautiously",
+            "cease",
+            "ceiling",
+            "centre",
+            "certain",
+            "certainly",
+            "chain",
+            "chains",
+            "chair",
+            "chance",
+            "chanced",
+            "change",
+            "changed",
+            "changes",
+            "changing",
+            "chapter",
+            "character",
+            "charge",
+            "charges",
+            "charitable",
+            "charities",
+            "chatte",
+            "cheap",
+            "cheated",
+            "check",
+            "checked",
+            "checks",
+            "cheeks",
+            "cheered",
+            "cheerfully",
+            "cherry",
+            "cheshire",
+            "chief",
+            "child",
+            "childhood",
+            "children",
+            "chimney",
+            "chimneys",
+            "chin",
+            "choice",
+            "choke",
+            "choked",
+            "choking",
+            "choose",
+            "choosing",
+            "chop",
+            "chorus",
+            "chose",
+            "christmas",
+            "chrysalis",
+            "chuckled",
+            "circle",
+            "circumstances",
+            "city",
+            "civil",
+            "claim",
+            "clamour",
+            "clapping",
+            "clasped",
+            "classics",
+            "claws",
+            "clean",
+            "clear",
+            "cleared",
+            "clearer",
+            "clearly",
+            "clever",
+            "climb",
+            "clinging",
+            "clock",
+            "close",
+            "closed",
+            "closely",
+            "closer",
+            "clubs",
+            "coast",
+            "coaxing",
+            "codes",
+            "coils",
+            "cold",
+            "collar",
+            "collected",
+            "collection",
+            "come",
+            "comes",
+            "comfits",
+            "comfort",
+            "comfortable",
+            "comfortably",
+            "coming",
+            "commercial",
+            "committed",
+            "common",
+            "commotion",
+            "company",
+            "compilation",
+            "complained",
+            "complaining",
+            "completely",
+            "compliance",
+            "comply",
+            "complying",
+            "compressed",
+            "computer",
+            "computers",
+            "concept",
+            "concerning",
+            "concert",
+            "concluded",
+            "conclusion",
+            "condemn",
+            "conduct",
+            "confirmation",
+            "confirmed",
+            "confused",
+            "confusing",
+            "confusion",
+            "conger",
+            "conqueror",
+            "conquest",
+            "consented",
+            "consequential",
+            "consider",
+            "considerable",
+            "considered",
+            "considering",
+            "constant",
+            "consultation",
+            "contact",
+            "contain",
+            "containing",
+            "contempt",
+            "contemptuous",
+            "contemptuously",
+            "content",
+            "continued",
+            "contract",
+            "contradicted",
+            "contributions",
+            "conversation",
+            "conversations",
+            "convert",
+            "cook",
+            "cool",
+            "copied",
+            "copies",
+            "copy",
+            "copying",
+            "copyright",
+            "corner",
+            "corners",
+            "corporation",
+            "corrupt",
+            "cost",
+            "costs",
+            "could",
+            "couldn",
+            "counting",
+            "countries",
+            "country",
+            "couple",
+            "couples",
+            "courage",
+            "course",
+            "court",
+            "courtiers",
+            "coward",
+            "crab",
+            "crash",
+            "crashed",
+            "crawled",
+            "crawling",
+            "crazy",
+            "created",
+            "creating",
+            "creation",
+            "creature",
+            "creatures",
+            "credit",
+            "creep",
+            "crept",
+            "cried",
+            "cries",
+            "crimson",
+            "critical",
+            "crocodile",
+            "croquet",
+            "croqueted",
+            "croqueting",
+            "cross",
+            "crossed",
+            "crossly",
+            "crouched",
+            "crowd",
+            "crowded",
+            "crown",
+            "crumbs",
+            "crust",
+            "cry",
+            "crying",
+            "cucumber",
+            "cunning",
+            "cup",
+            "cupboards",
+            "cur",
+            "curiosity",
+            "curious",
+            "curiouser",
+            "curled",
+            "curls",
+            "curly",
+            "currants",
+            "current",
+            "curtain",
+            "curtsey",
+            "curtseying",
+            "curving",
+            "cushion",
+            "custard",
+            "custody",
+            "cut",
+            "cutting",
+            };
+        }
+        private void RunTest(Action<AutoCompleteBox, TextBox> test)
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                AutoCompleteBox control = CreateControl();
+                control.Items = CreateSimpleStringArray();
+                TextBox textBox = GetTextBox(control);
+                Dispatcher.UIThread.RunJobs();
+                test.Invoke(control, textBox);
+            }
+        }
+
+        private static TestServices Services => TestServices.StyledWindow;
+
+        /*private static TestServices Services => TestServices.MockThreadingInterface.With(
+            standardCursorFactory: Mock.Of<IStandardCursorFactory>(),
+            windowingPlatform: new MockWindowingPlatform());*/
+
+        private AutoCompleteBox CreateControl()
+        {
+            var datePicker =
+                new AutoCompleteBox
+                {
+                    Template = CreateTemplate()
+                };
+
+            datePicker.ApplyTemplate();
+            return datePicker;
+        }
+        private TextBox GetTextBox(AutoCompleteBox control)
+        {
+            return control.GetTemplateChildren()
+                          .OfType<TextBox>()
+                          .First();
+        }
+        private IControlTemplate CreateTemplate()
+        {
+            return new FuncControlTemplate<AutoCompleteBox>(control =>
+            {
+                var textBox =
+                    new TextBox
+                    {
+                        Name = "PART_TextBox"
+                    };
+                var listbox =
+                    new ListBox
+                    {
+                        Name = "PART_SelectingItemsControl"
+                    };
+                var popup =
+                    new Popup
+                    {
+                        Name = "PART_Popup"
+                    };
+
+                var panel = new Panel();
+                panel.Children.Add(textBox);
+                panel.Children.Add(popup);
+                panel.Children.Add(listbox);
+
+                return panel;
+            });
+        }
+    }
+}

From be68b32440a4d96eb6268abee1c390dbca6863a8 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@gmail.com>
Date: Wed, 7 Mar 2018 07:25:46 +0100
Subject: [PATCH 383/482] reworked the dataobject for drag+drop

---
 src/Avalonia.Controls/DragDrop/IDataObject.cs |   2 +
 src/OSX/Avalonia.MonoMac/DraggingInfo.cs      |  13 +-
 .../Avalonia.Win32/ClipboardFormats.cs        |  20 +-
 src/Windows/Avalonia.Win32/DataObject.cs      | 312 ++++++++++++++++++
 .../Interop/UnmanagedMethods.cs               |  53 ++-
 src/Windows/Avalonia.Win32/OleDataObject.cs   |   5 +
 src/Windows/Avalonia.Win32/OleDragSource.cs   |  41 +++
 src/Windows/Avalonia.Win32/OleDropTarget.cs   |  11 +-
 8 files changed, 437 insertions(+), 20 deletions(-)
 create mode 100644 src/Windows/Avalonia.Win32/DataObject.cs
 create mode 100644 src/Windows/Avalonia.Win32/OleDragSource.cs

diff --git a/src/Avalonia.Controls/DragDrop/IDataObject.cs b/src/Avalonia.Controls/DragDrop/IDataObject.cs
index 5ffecc13ed..c8fd720c48 100644
--- a/src/Avalonia.Controls/DragDrop/IDataObject.cs
+++ b/src/Avalonia.Controls/DragDrop/IDataObject.cs
@@ -11,5 +11,7 @@ namespace Avalonia.Controls.DragDrop
         string GetText();
 
         IEnumerable<string> GetFileNames();
+        
+        object Get(string dataFormat);
     }
 }
\ No newline at end of file
diff --git a/src/OSX/Avalonia.MonoMac/DraggingInfo.cs b/src/OSX/Avalonia.MonoMac/DraggingInfo.cs
index ef4d9d99f6..2fb28a50f5 100644
--- a/src/OSX/Avalonia.MonoMac/DraggingInfo.cs
+++ b/src/OSX/Avalonia.MonoMac/DraggingInfo.cs
@@ -15,8 +15,7 @@ namespace Avalonia.MonoMac
         {
             _info = info;
         }
-
-
+        
         internal static NSDragOperation ConvertDragOperation(DragDropEffects d)
         {
             NSDragOperation result = NSDragOperation.None;
@@ -77,5 +76,15 @@ namespace Avalonia.MonoMac
         {
             return GetDataFormats().Any(f => f == dataFormat);
         }
+
+        public object Get(string dataFormat)
+        {
+            if (dataFormat == DataFormats.Text)
+                return GetText();
+            if (dataFormat == DataFormats.FileNames)
+                return GetFileNames();
+
+            return _info.DraggingPasteboard.GetDataForType(dataFormat).ToArray();
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Windows/Avalonia.Win32/ClipboardFormats.cs b/src/Windows/Avalonia.Win32/ClipboardFormats.cs
index 254facf81a..a59c6a1664 100644
--- a/src/Windows/Avalonia.Win32/ClipboardFormats.cs
+++ b/src/Windows/Avalonia.Win32/ClipboardFormats.cs
@@ -10,34 +10,34 @@ namespace Avalonia.Win32
 {   
     static class ClipboardFormats
     {
+        private const int MAX_FORMAT_NAME_LENGTH = 260;
+
         class ClipboardFormat
         {
             public short Format { get; private set; }
             public string Name { get; private set; }
+            public short[] Synthesized { get; private set; }
 
-            public ClipboardFormat(string name, short format)
+            public ClipboardFormat(string name, short format, params short[] synthesized)
             {
                 Format = format;
                 Name = name;
+                Synthesized = synthesized;
             }
         }
 
         private static readonly List<ClipboardFormat> FormatList = new List<ClipboardFormat>()
         {
-            new ClipboardFormat(DataFormats.Text, (short)UnmanagedMethods.ClipboardFormat.CF_UNICODETEXT),
+            new ClipboardFormat(DataFormats.Text, (short)UnmanagedMethods.ClipboardFormat.CF_UNICODETEXT, (short)UnmanagedMethods.ClipboardFormat.CF_TEXT),
             new ClipboardFormat(DataFormats.FileNames, (short)UnmanagedMethods.ClipboardFormat.CF_HDROP),
         };
 
 
         private static string QueryFormatName(short format)
         {
-            int len = UnmanagedMethods.GetClipboardFormatName(format, null, 0);
-            if (len > 0)
-            {
-                StringBuilder sb = new StringBuilder(len);
-                if (UnmanagedMethods.GetClipboardFormatName(format, sb, len) <= len)
-                    return sb.ToString();
-            }
+            StringBuilder sb = new StringBuilder(MAX_FORMAT_NAME_LENGTH);
+            if (UnmanagedMethods.GetClipboardFormatName(format, sb, sb.Capacity) > 0)
+                return sb.ToString();
             return null;
         }
 
@@ -45,7 +45,7 @@ namespace Avalonia.Win32
         {
             lock (FormatList)
             {
-                var pd = FormatList.FirstOrDefault(f => f.Format == format);
+                var pd = FormatList.FirstOrDefault(f => f.Format == format || Array.IndexOf(f.Synthesized, format) >= 0);
                 if (pd == null)
                 {
                     string name = QueryFormatName(format);
diff --git a/src/Windows/Avalonia.Win32/DataObject.cs b/src/Windows/Avalonia.Win32/DataObject.cs
new file mode 100644
index 0000000000..6248afd7bb
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/DataObject.cs
@@ -0,0 +1,312 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.ComTypes;
+using System.Text;
+using Avalonia.Controls.DragDrop;
+using Avalonia.Win32.Interop;
+using IDataObject = Avalonia.Controls.DragDrop.IDataObject;
+using IOleDataObject = System.Runtime.InteropServices.ComTypes.IDataObject;
+
+namespace Avalonia.Win32
+{
+    class DataObject : IDataObject, IOleDataObject
+    {
+        class FormatEnumerator : IEnumFORMATETC
+        {
+            private FORMATETC[] _formats;
+            private int _current;
+
+            private FormatEnumerator(FORMATETC[] formats, int current)
+            {
+                _formats = formats;
+                _current = current;
+            }
+
+            public FormatEnumerator(IDataObject dataobj)
+            {
+                _formats = dataobj.GetDataFormats().Select(ConvertToFormatEtc).ToArray();
+                _current = 0;
+            }
+
+            private FORMATETC ConvertToFormatEtc(string aFormatName)
+            {
+                FORMATETC result = default(FORMATETC);
+                result.cfFormat = ClipboardFormats.GetFormat(aFormatName);
+                result.dwAspect = DVASPECT.DVASPECT_CONTENT;
+                result.ptd = IntPtr.Zero;
+                result.lindex = -1;
+                result.tymed = TYMED.TYMED_HGLOBAL;
+                return result;
+            }
+
+            public void Clone(out IEnumFORMATETC newEnum)
+            {
+                newEnum = new FormatEnumerator(_formats, _current);
+            }
+
+            public int Next(int celt, FORMATETC[] rgelt, int[] pceltFetched)
+            {
+                if (rgelt == null)
+                    return unchecked((int)UnmanagedMethods.HRESULT.E_INVALIDARG);
+
+                int i = 0;
+                while (i < celt && _current < _formats.Length)
+                {
+                    rgelt[i] = _formats[_current];
+                    _current++;
+                    i++;
+                }
+                if (pceltFetched != null)
+                    pceltFetched[0] = i;
+
+                if (i != celt)
+                    return unchecked((int)UnmanagedMethods.HRESULT.S_FALSE);
+                return unchecked((int)UnmanagedMethods.HRESULT.S_OK);
+            }
+
+            public int Reset()
+            {
+                _current = 0;
+                return unchecked((int)UnmanagedMethods.HRESULT.S_OK);
+            }
+
+            public int Skip(int celt)
+            {
+                _current += Math.Min(celt, int.MaxValue - _current);
+                if (_current >= _formats.Length)
+                    return unchecked((int)UnmanagedMethods.HRESULT.S_FALSE);
+                return unchecked((int)UnmanagedMethods.HRESULT.S_OK);
+            }
+        }
+
+        private const int DV_E_TYMED = unchecked((int)0x80040069);
+        private const int DV_E_DVASPECT = unchecked((int)0x8004006B);
+        private const int DV_E_FORMATETC = unchecked((int)0x80040064);
+        private const int OLE_E_ADVISENOTSUPPORTED = unchecked((int)0x80040003);
+        private const int STG_E_MEDIUMFULL = unchecked((int)0x80030070);
+        private const int GMEM_ZEROINIT = 0x0040;
+        private const int GMEM_MOVEABLE = 0x0002;
+
+
+        IDataObject _wrapped;
+        
+        public DataObject(IDataObject wrapped)
+        {
+            _wrapped = wrapped;
+        }
+
+        #region IDataObject
+        bool IDataObject.Contains(string dataFormat)
+        {
+            return _wrapped.Contains(dataFormat);
+        }
+
+        IEnumerable<string> IDataObject.GetDataFormats()
+        {
+            return _wrapped.GetDataFormats();
+        }
+
+        IEnumerable<string> IDataObject.GetFileNames()
+        {
+            return _wrapped.GetFileNames();
+        }
+
+        string IDataObject.GetText()
+        {
+            return _wrapped.GetText();
+        }
+
+        object IDataObject.Get(string dataFormat)
+        {
+            return _wrapped.Get(dataFormat);
+        }
+        #endregion
+
+        #region IOleDataObject
+
+        int IOleDataObject.DAdvise(ref FORMATETC pFormatetc, ADVF advf, IAdviseSink adviseSink, out int connection)
+        {
+            if (_wrapped is IOleDataObject ole)
+                return ole.DAdvise(ref pFormatetc, advf, adviseSink, out connection);
+            connection = 0;
+            return OLE_E_ADVISENOTSUPPORTED;
+        }
+
+        void IOleDataObject.DUnadvise(int connection)
+        {
+            if (_wrapped is IOleDataObject ole)
+                ole.DUnadvise(connection);
+            Marshal.ThrowExceptionForHR(OLE_E_ADVISENOTSUPPORTED);
+        }
+
+        int IOleDataObject.EnumDAdvise(out IEnumSTATDATA enumAdvise)
+        {
+            if (_wrapped is IOleDataObject ole)
+                return ole.EnumDAdvise(out enumAdvise);
+
+            enumAdvise = null;
+            return OLE_E_ADVISENOTSUPPORTED;
+        }
+
+        IEnumFORMATETC IOleDataObject.EnumFormatEtc(DATADIR direction)
+        {
+            if (_wrapped is IOleDataObject ole)
+                return ole.EnumFormatEtc(direction);
+            if (direction == DATADIR.DATADIR_GET)
+                return new FormatEnumerator(_wrapped);
+            throw new NotSupportedException();
+        }
+
+        int IOleDataObject.GetCanonicalFormatEtc(ref FORMATETC formatIn, out FORMATETC formatOut)
+        {
+            if (_wrapped is IOleDataObject ole)
+                return ole.GetCanonicalFormatEtc(ref formatIn, out formatOut);
+
+            formatOut = new FORMATETC();
+            formatOut.ptd = IntPtr.Zero;
+            return unchecked((int)UnmanagedMethods.HRESULT.E_NOTIMPL);
+        }
+
+        void IOleDataObject.GetData(ref FORMATETC format, out STGMEDIUM medium)
+        {
+            if (_wrapped is IOleDataObject ole)
+            {
+                ole.GetData(ref format, out medium);
+                return;
+            }
+            if(!format.tymed.HasFlag(TYMED.TYMED_HGLOBAL))
+                Marshal.ThrowExceptionForHR(DV_E_TYMED);
+
+            if (format.dwAspect != DVASPECT.DVASPECT_CONTENT)
+                Marshal.ThrowExceptionForHR(DV_E_DVASPECT);
+
+            string fmt = ClipboardFormats.GetFormat(format.cfFormat);
+            if (string.IsNullOrEmpty(fmt) || !_wrapped.Contains(fmt))
+                Marshal.ThrowExceptionForHR(DV_E_FORMATETC);
+
+            medium = default(STGMEDIUM);
+            medium.tymed = TYMED.TYMED_HGLOBAL;
+            int result = WriteDataToHGlobal(fmt, ref medium.unionmember);
+            Marshal.ThrowExceptionForHR(result);
+        }
+
+        void IOleDataObject.GetDataHere(ref FORMATETC format, ref STGMEDIUM medium)
+        {
+            if (_wrapped is IOleDataObject ole)
+            {
+                ole.GetDataHere(ref format, ref medium);
+                return;
+            }
+
+            if (medium.tymed != TYMED.TYMED_HGLOBAL || !format.tymed.HasFlag(TYMED.TYMED_HGLOBAL))
+                Marshal.ThrowExceptionForHR(DV_E_TYMED);
+
+            if (format.dwAspect != DVASPECT.DVASPECT_CONTENT)
+                Marshal.ThrowExceptionForHR(DV_E_DVASPECT);
+
+            string fmt = ClipboardFormats.GetFormat(format.cfFormat);
+            if (string.IsNullOrEmpty(fmt) || !_wrapped.Contains(fmt))
+                Marshal.ThrowExceptionForHR(DV_E_FORMATETC);
+
+            if (medium.unionmember == IntPtr.Zero)
+                Marshal.ThrowExceptionForHR(STG_E_MEDIUMFULL);
+
+            int result = WriteDataToHGlobal(fmt, ref medium.unionmember);
+            Marshal.ThrowExceptionForHR(result);
+        }
+
+        int IOleDataObject.QueryGetData(ref FORMATETC format)
+        {
+            if (_wrapped is IOleDataObject ole)
+                return ole.QueryGetData(ref format);
+            if (format.dwAspect != DVASPECT.DVASPECT_CONTENT)
+                return DV_E_DVASPECT;
+            if (!format.tymed.HasFlag(TYMED.TYMED_HGLOBAL))
+                return DV_E_TYMED;
+
+            string dataFormat = ClipboardFormats.GetFormat(format.cfFormat);
+            if (!string.IsNullOrEmpty(dataFormat) && _wrapped.Contains(dataFormat))
+                return unchecked((int)UnmanagedMethods.HRESULT.S_OK);
+            return DV_E_FORMATETC;
+        }
+        
+        void IOleDataObject.SetData(ref FORMATETC formatIn, ref STGMEDIUM medium, bool release)
+        {
+            if (_wrapped is IOleDataObject ole)
+            {
+                ole.SetData(ref formatIn, ref medium, release);
+                return;
+            }
+            Marshal.ThrowExceptionForHR(unchecked((int)UnmanagedMethods.HRESULT.E_NOTIMPL));
+        }
+
+        private int WriteDataToHGlobal(string dataFormat, ref IntPtr hGlobal)
+        {
+            object data = _wrapped.Get(dataFormat);
+            if (dataFormat == DataFormats.Text || data is string)
+                return WriteStringToHGlobal(ref hGlobal, Convert.ToString(data));
+            if (dataFormat == DataFormats.FileNames && data is IEnumerable<string> files)
+                return WriteFileListToHGlobal(ref hGlobal, files);
+            return DV_E_TYMED;
+        }
+
+        private int WriteFileListToHGlobal(ref IntPtr hGlobal, IEnumerable<string> files)
+        {
+            if (!files?.Any() ?? false)
+                return unchecked((int)UnmanagedMethods.HRESULT.S_OK);
+
+            char[] filesStr = (string.Join("\0", files) + "\0\0").ToCharArray();
+            _DROPFILES df = new _DROPFILES();
+            df.pFiles = Marshal.SizeOf<_DROPFILES>();
+            df.fWide = true;
+            
+            int required = (filesStr.Length * sizeof(char)) + Marshal.SizeOf<_DROPFILES>();
+            if (hGlobal == IntPtr.Zero)
+                hGlobal = UnmanagedMethods.GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, required);
+
+            long available = UnmanagedMethods.GlobalSize(hGlobal).ToInt64();
+            if (required > available)
+                return STG_E_MEDIUMFULL;
+
+            IntPtr ptr = UnmanagedMethods.GlobalLock(hGlobal);
+            try
+            {
+                Marshal.StructureToPtr(df, ptr, false);
+
+                Marshal.Copy(filesStr, 0, ptr + Marshal.SizeOf<_DROPFILES>(), filesStr.Length);
+                return unchecked((int)UnmanagedMethods.HRESULT.S_OK);
+            }
+            finally
+            {
+                UnmanagedMethods.GlobalUnlock(hGlobal);
+            }
+        }
+
+        private int WriteStringToHGlobal(ref IntPtr hGlobal, string data)
+        {
+            int required = (data.Length + 1) * sizeof(char);
+            if (hGlobal == IntPtr.Zero)
+                hGlobal = UnmanagedMethods.GlobalAlloc(GMEM_MOVEABLE|GMEM_ZEROINIT, required);
+
+            long available = UnmanagedMethods.GlobalSize(hGlobal).ToInt64();
+            if (required > available)
+                return STG_E_MEDIUMFULL;
+            
+            IntPtr ptr = UnmanagedMethods.GlobalLock(hGlobal);
+            try
+            {
+                char[] chars = (data + '\0').ToCharArray();
+                Marshal.Copy(chars, 0, ptr, chars.Length);
+                return unchecked((int)UnmanagedMethods.HRESULT.S_OK);
+            }
+            finally
+            {
+                UnmanagedMethods.GlobalUnlock(hGlobal);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
index f43cdb98cc..aa86ab0f8d 100644
--- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
+++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -973,7 +973,11 @@ namespace Avalonia.Win32.Interop
         [DllImport("shell32.dll", BestFitMapping = false, CharSet = CharSet.Auto)]
         public static extern int DragQueryFile(IntPtr hDrop, int iFile, StringBuilder lpszFile, int cch);
 
-        
+        [DllImport("ole32.dll", CharSet = CharSet.Auto, ExactSpelling = true, PreserveSig = false)]
+        public static extern void DoDragDrop(IDataObject dataObject, IDropSource dropSource, int allowedEffects, int[] finalEffect);
+
+
+
         public enum MONITOR
         {
             MONITOR_DEFAULTTONULL = 0x00000000,
@@ -1013,11 +1017,28 @@ namespace Avalonia.Win32.Interop
             MDT_DEFAULT = MDT_EFFECTIVE_DPI
         } 
 
-        public enum ClipboardFormat
+        public enum ClipboardFormat 
         {
+            /// <summary>
+            /// Text format. Each line ends with a carriage return/linefeed (CR-LF) combination. A null character signals the end of the data. Use this format for ANSI text.
+            /// </summary>
             CF_TEXT = 1,
+            /// <summary>
+            /// A handle to a bitmap
+            /// </summary>
+            CF_BITMAP = 2,
+            /// <summary>
+            /// A memory object containing a BITMAPINFO structure followed by the bitmap bits.
+            /// </summary>
+            CF_DIB = 3,
+            /// <summary>
+            /// Unicode text format. Each line ends with a carriage return/linefeed (CR-LF) combination. A null character signals the end of the data.
+            /// </summary>
             CF_UNICODETEXT = 13,
-            CF_HDROP = 15
+            /// <summary>
+            /// A handle to type HDROP that identifies a list of files. 
+            /// </summary>
+            CF_HDROP = 15,
         }
 
         public struct MSG
@@ -1160,7 +1181,9 @@ namespace Avalonia.Win32.Interop
             S_FALSE = 0x0001,
             S_OK = 0x0000,
             E_INVALIDARG = 0x80070057,
-            E_OUTOFMEMORY = 0x8007000E
+            E_OUTOFMEMORY = 0x8007000E,
+            E_NOTIMPL = 0x80004001,
+            E_UNEXPECTED = 0x8000FFFF,
         }
 
         public enum Icons
@@ -1351,4 +1374,26 @@ namespace Avalonia.Win32.Interop
         [PreserveSig]
         UnmanagedMethods.HRESULT Drop([MarshalAs(UnmanagedType.Interface)] [In] IDataObject pDataObj, [MarshalAs(UnmanagedType.U4)] [In] int grfKeyState, [MarshalAs(UnmanagedType.U8)] [In] long pt, [In] [Out] ref DropEffect pdwEffect);
     }
+
+    [ComImport]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    [Guid("00000121-0000-0000-C000-000000000046")]
+    internal interface IDropSource
+    {
+        [PreserveSig]
+        int QueryContinueDrag(int fEscapePressed, [MarshalAs(UnmanagedType.U4)] [In] int grfKeyState);
+        [PreserveSig]
+        int GiveFeedback([MarshalAs(UnmanagedType.U4)] [In] int dwEffect);
+    }
+
+
+    [StructLayoutAttribute(LayoutKind.Sequential)]
+    internal struct _DROPFILES
+    {
+        public Int32 pFiles;
+        public Int32 X;
+        public Int32 Y;
+        public bool fNC;
+        public bool fWide;
+    }
 }
diff --git a/src/Windows/Avalonia.Win32/OleDataObject.cs b/src/Windows/Avalonia.Win32/OleDataObject.cs
index bf6f3d98c3..fe6faa162c 100644
--- a/src/Windows/Avalonia.Win32/OleDataObject.cs
+++ b/src/Windows/Avalonia.Win32/OleDataObject.cs
@@ -39,6 +39,11 @@ namespace Avalonia.Win32
             return GetDataFromOleHGLOBAL(DataFormats.FileNames, DVASPECT.DVASPECT_CONTENT) as IEnumerable<string>;
         }
 
+        public object Get(string dataFormat)
+        {
+            return GetDataFromOleHGLOBAL(dataFormat, DVASPECT.DVASPECT_CONTENT);
+        }
+
         private object GetDataFromOleHGLOBAL(string format, DVASPECT aspect)
         {
             FORMATETC formatEtc = new FORMATETC();
diff --git a/src/Windows/Avalonia.Win32/OleDragSource.cs b/src/Windows/Avalonia.Win32/OleDragSource.cs
new file mode 100644
index 0000000000..1bff984087
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/OleDragSource.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Win32.Interop;
+
+namespace Avalonia.Win32
+{
+    class OleDragSource : IDropSource
+    {
+        private const int DRAGDROP_S_USEDEFAULTCURSORS = 0x00040102;
+        private const int DRAGDROP_S_DROP = 0x00040100;
+        private const int DRAGDROP_S_CANCEL = 0x00040101;
+
+        private const int KEYSTATE_LEFTMB = 1;
+        private const int KEYSTATE_MIDDLEMB = 16;
+        private const int KEYSTATE_RIGHTMB = 2;
+        private static readonly int[] MOUSE_BUTTONS = new int[] { KEYSTATE_LEFTMB, KEYSTATE_MIDDLEMB, KEYSTATE_RIGHTMB };
+
+        public int QueryContinueDrag(int fEscapePressed, int grfKeyState)
+        {
+            if (fEscapePressed != 0)
+                return DRAGDROP_S_CANCEL;
+
+            int pressedMouseButtons = MOUSE_BUTTONS.Where(mb => (grfKeyState & mb) == mb).Count();
+
+            if (pressedMouseButtons >= 2)
+                return DRAGDROP_S_CANCEL;
+            if (pressedMouseButtons == 0)
+                return DRAGDROP_S_DROP;
+
+            return unchecked((int)UnmanagedMethods.HRESULT.S_OK);
+        }
+
+        public int GiveFeedback(int dwEffect)
+        {
+            if (dwEffect != 0)
+                return DRAGDROP_S_USEDEFAULTCURSORS;
+            return unchecked((int)UnmanagedMethods.HRESULT.S_OK);
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/OleDropTarget.cs b/src/Windows/Avalonia.Win32/OleDropTarget.cs
index c16c5058f3..6bc298951e 100644
--- a/src/Windows/Avalonia.Win32/OleDropTarget.cs
+++ b/src/Windows/Avalonia.Win32/OleDropTarget.cs
@@ -55,8 +55,9 @@ namespace Avalonia.Win32
                 pdwEffect = DropEffect.None;
                 return UnmanagedMethods.HRESULT.S_OK;
             }
-            
-            _currentDrag = new OleDataObject(pDataObj);
+            _currentDrag = pDataObj as IDataObject;
+            if (_currentDrag == null)
+                _currentDrag = new OleDataObject(pDataObj);
             var args = new RawDragEvent(
                 _dragDevice,
                 RawDragEventType.DragEnter, 
@@ -124,8 +125,10 @@ namespace Avalonia.Win32
                     pdwEffect = DropEffect.None;
                     return UnmanagedMethods.HRESULT.S_OK;
                 }
-            
-                _currentDrag= new OleDataObject(pDataObj);
+
+                _currentDrag = pDataObj as IDataObject;
+                if (_currentDrag == null)
+                    _currentDrag= new OleDataObject(pDataObj);
                 
                 var args = new RawDragEvent(
                     _dragDevice, 

From f57fbdc2da30ff6ab7b713e5fae2c7cb867b79bc Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@gmail.com>
Date: Wed, 7 Mar 2018 07:31:54 +0100
Subject: [PATCH 384/482] renamed DragDevice to DragDropDevice

---
 .../DragDrop/{DragDevice.cs => DragDropDevice.cs}             | 4 ++--
 .../DragDrop/Raw/{IDragDevice.cs => IDragDropDevice.cs}       | 2 +-
 src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs            | 2 +-
 src/OSX/Avalonia.MonoMac/TopLevelImpl.cs                      | 4 ++--
 src/Windows/Avalonia.Win32/OleDropTarget.cs                   | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename src/Avalonia.Controls/DragDrop/{DragDevice.cs => DragDropDevice.cs} (96%)
 rename src/Avalonia.Controls/DragDrop/Raw/{IDragDevice.cs => IDragDropDevice.cs} (60%)

diff --git a/src/Avalonia.Controls/DragDrop/DragDevice.cs b/src/Avalonia.Controls/DragDrop/DragDropDevice.cs
similarity index 96%
rename from src/Avalonia.Controls/DragDrop/DragDevice.cs
rename to src/Avalonia.Controls/DragDrop/DragDropDevice.cs
index 25f82ca3bc..0aadda79f4 100644
--- a/src/Avalonia.Controls/DragDrop/DragDevice.cs
+++ b/src/Avalonia.Controls/DragDrop/DragDropDevice.cs
@@ -7,9 +7,9 @@ using Avalonia.Input.Raw;
 
 namespace Avalonia.Controls.DragDrop
 {
-    class DragDevice : IDragDevice
+    class DragDropDevice : IDragDropDevice
     {
-        public static readonly DragDevice Instance = new DragDevice();
+        public static readonly DragDropDevice Instance = new DragDropDevice();
         
         private Interactive _lastTarget = null;
         
diff --git a/src/Avalonia.Controls/DragDrop/Raw/IDragDevice.cs b/src/Avalonia.Controls/DragDrop/Raw/IDragDropDevice.cs
similarity index 60%
rename from src/Avalonia.Controls/DragDrop/Raw/IDragDevice.cs
rename to src/Avalonia.Controls/DragDrop/Raw/IDragDropDevice.cs
index d1c20fae55..6e2db67ac3 100644
--- a/src/Avalonia.Controls/DragDrop/Raw/IDragDevice.cs
+++ b/src/Avalonia.Controls/DragDrop/Raw/IDragDropDevice.cs
@@ -2,7 +2,7 @@
 
 namespace Avalonia.Controls.DragDrop.Raw
 {
-    public interface IDragDevice : IInputDevice
+    public interface IDragDropDevice : IInputDevice
     {
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs b/src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs
index 76a2c16b3b..e9c1119e44 100644
--- a/src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs
+++ b/src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs
@@ -12,7 +12,7 @@ namespace Avalonia.Controls.DragDrop.Raw
         public DragDropEffects Effects { get; set; }
         public RawDragEventType Type { get; }
 
-        public RawDragEvent(IDragDevice inputDevice, RawDragEventType type, 
+        public RawDragEvent(IDragDropDevice inputDevice, RawDragEventType type, 
             IInputElement inputRoot, Point location, IDataObject data, DragDropEffects effects)
             :base(inputDevice, GetTimeStamp())
         {
diff --git a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
index b767a86490..20d255a608 100644
--- a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
+++ b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
@@ -20,7 +20,7 @@ namespace Avalonia.MonoMac
     {
         public TopLevelView View { get; }
         private readonly IMouseDevice _mouse = AvaloniaLocator.Current.GetService<IMouseDevice>();
-        private readonly IDragDevice _dragDevice = AvaloniaLocator.Current.GetService<IDragDevice>();
+        private readonly IDragDropDevice _dragDevice = AvaloniaLocator.Current.GetService<IDragDropDevice>();
         protected TopLevelImpl()
         {
             View = new TopLevelView(this);
@@ -154,7 +154,7 @@ namespace Avalonia.MonoMac
             private NSDragOperation SendRawDragEvent(NSDraggingInfo sender, RawDragEventType type)
             {
                 Action<RawInputEventArgs> input = _tl.Input;
-                IDragDevice dragDevice = _tl._dragDevice;
+                IDragDropDevice dragDevice = _tl._dragDevice;
                 IInputRoot root = _tl?.InputRoot;
                 if (root == null || dragDevice == null || input == null)
                     return NSDragOperation.None;
diff --git a/src/Windows/Avalonia.Win32/OleDropTarget.cs b/src/Windows/Avalonia.Win32/OleDropTarget.cs
index 6bc298951e..31db5f88a9 100644
--- a/src/Windows/Avalonia.Win32/OleDropTarget.cs
+++ b/src/Windows/Avalonia.Win32/OleDropTarget.cs
@@ -12,13 +12,13 @@ namespace Avalonia.Win32
     {
         private readonly IInputElement _target;
         private readonly ITopLevelImpl _tl;
-        private readonly IDragDevice _dragDevice;
+        private readonly IDragDropDevice _dragDevice;
         
         private IDataObject _currentDrag = null;
 
         public OleDropTarget(ITopLevelImpl tl, IInputElement target)
         {
-            _dragDevice = AvaloniaLocator.Current.GetService<IDragDevice>();
+            _dragDevice = AvaloniaLocator.Current.GetService<IDragDropDevice>();
             _tl = tl;
             _target = target;
         }

From 30b5a1fd4df156180b2151562d5689f9a3ab4185 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@gmail.com>
Date: Wed, 7 Mar 2018 07:43:51 +0100
Subject: [PATCH 385/482] fixed locator setup

---
 src/Avalonia.Controls/Application.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Application.cs b/src/Avalonia.Controls/Application.cs
index b751aeca60..0a9bf4eab2 100644
--- a/src/Avalonia.Controls/Application.cs
+++ b/src/Avalonia.Controls/Application.cs
@@ -237,7 +237,7 @@ namespace Avalonia
                 .Bind<ILayoutManager>().ToSingleton<LayoutManager>()
                 .Bind<IApplicationLifecycle>().ToConstant(this)
                 .Bind<IScheduler>().ToConstant(AvaloniaScheduler.Instance)
-                .Bind<IDragDevice>().ToConstant(DragDevice.Instance);
+                .Bind<IDragDropDevice>().ToConstant(DragDropDevice.Instance);
         }
     }
 }

From c1abc0535534e66697b08b0cd3e58530189ef297 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@gmail.com>
Date: Wed, 7 Mar 2018 07:45:55 +0100
Subject: [PATCH 386/482] Modified the ControlCatalog examples to run in STA
 ApartmentState

---
 samples/ControlCatalog.Desktop/Program.cs | 1 +
 samples/ControlCatalog.NetCore/Program.cs | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/samples/ControlCatalog.Desktop/Program.cs b/samples/ControlCatalog.Desktop/Program.cs
index b151cabf43..a2048005a4 100644
--- a/samples/ControlCatalog.Desktop/Program.cs
+++ b/samples/ControlCatalog.Desktop/Program.cs
@@ -10,6 +10,7 @@ namespace ControlCatalog
 {
     internal class Program
     {
+        [STAThread]
         static void Main(string[] args)
         {
             // TODO: Make this work with GTK/Skia/Cairo depending on command-line args
diff --git a/samples/ControlCatalog.NetCore/Program.cs b/samples/ControlCatalog.NetCore/Program.cs
index 346535d39d..b45a93455e 100644
--- a/samples/ControlCatalog.NetCore/Program.cs
+++ b/samples/ControlCatalog.NetCore/Program.cs
@@ -9,8 +9,10 @@ namespace ControlCatalog.NetCore
 {
     static class Program
     {
+        
         static void Main(string[] args)
         {
+            Thread.CurrentThread.TrySetApartmentState(ApartmentState.STA);
             if (args.Contains("--wait-for-attach"))
             {
                 Console.WriteLine("Attach debugger and use 'Set next statement'");

From 411e3c8860b1756ce8b01943a1091d5481493b02 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@gmail.com>
Date: Wed, 7 Mar 2018 07:46:28 +0100
Subject: [PATCH 387/482] started dragging API

---
 src/Avalonia.Controls/DragDrop/DataObject.cs | 43 ++++++++++++++++++++
 src/Avalonia.Controls/DragDrop/DragDrop.cs   | 10 +++++
 2 files changed, 53 insertions(+)
 create mode 100644 src/Avalonia.Controls/DragDrop/DataObject.cs

diff --git a/src/Avalonia.Controls/DragDrop/DataObject.cs b/src/Avalonia.Controls/DragDrop/DataObject.cs
new file mode 100644
index 0000000000..e0e7b6d069
--- /dev/null
+++ b/src/Avalonia.Controls/DragDrop/DataObject.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Avalonia.Controls.DragDrop
+{
+    public class DataObject : IDataObject
+    {
+        private readonly Dictionary<string, object> _items = new Dictionary<string, object>();
+
+        public bool Contains(string dataFormat)
+        {
+            return _items.ContainsKey(dataFormat);
+        }
+
+        public object Get(string dataFormat)
+        {
+            if (_items.ContainsKey(dataFormat))
+                return _items[dataFormat];
+            return null;
+        }
+
+        public IEnumerable<string> GetDataFormats()
+        {
+            return _items.Keys;
+        }
+
+        public IEnumerable<string> GetFileNames()
+        {
+            return Get(DataFormats.FileNames) as IEnumerable<string>;
+        }
+
+        public string GetText()
+        {
+            return Get(DataFormats.Text) as string;
+        }
+
+        public void Set(string dataFormat, object value)
+        {
+            _items[dataFormat] = value;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/DragDrop/DragDrop.cs b/src/Avalonia.Controls/DragDrop/DragDrop.cs
index 317a903d3c..af003516b1 100644
--- a/src/Avalonia.Controls/DragDrop/DragDrop.cs
+++ b/src/Avalonia.Controls/DragDrop/DragDrop.cs
@@ -20,5 +20,15 @@ namespace Avalonia.Controls.DragDrop
         {
             interactive.SetValue(AcceptDragProperty, value);
         }
+
+        /// <summary>
+        /// Starts a dragging operation with the given <see cref="IDataObject"/> and returns the applied drop effect from the target.
+        /// <seealso cref="DataObject"/>
+        /// </summary>
+        public static DragDropEffects DoDragDrop(this Interactive source, IDataObject data, DragDropEffects allowedEffects)
+        {
+
+            return DragDropEffects.None;
+        }
     }
 }
\ No newline at end of file

From b2461f4b1f3a99ad574132e63ba6f6cbcc5f57b0 Mon Sep 17 00:00:00 2001
From: Manuel Allenspach <m-allenspach@hotmail.com>
Date: Tue, 20 Feb 2018 17:16:58 +0100
Subject: [PATCH 388/482] Implement Closing event

---
 src/Avalonia.Controls/Platform/IWindowImpl.cs |  6 +++
 src/Avalonia.Controls/Window.cs               | 43 ++++++++++++++++---
 .../Remote/PreviewerWindowImpl.cs             |  1 +
 src/Avalonia.DesignerSupport/Remote/Stubs.cs  |  1 +
 src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs       |  8 ++++
 src/OSX/Avalonia.MonoMac/WindowBaseImpl.cs    |  8 ++++
 src/Windows/Avalonia.Win32/WindowImpl.cs      | 10 +++++
 7 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Controls/Platform/IWindowImpl.cs b/src/Avalonia.Controls/Platform/IWindowImpl.cs
index 37637b1624..1f84574318 100644
--- a/src/Avalonia.Controls/Platform/IWindowImpl.cs
+++ b/src/Avalonia.Controls/Platform/IWindowImpl.cs
@@ -44,5 +44,11 @@ namespace Avalonia.Platform
         /// Enables or disables the taskbar icon
         /// </summary>
         void ShowTaskbarIcon(bool value);
+
+        /// <summary>
+        /// Gets or sets a method called before the underlying implementation is destroyed.
+        /// Return true to prevent the underlying implementation from closing.
+        /// </summary>
+        Func<bool> Closing { get; set; }
     }
 }
diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 9db7db365d..c66209d3c6 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -13,6 +13,7 @@ using Avalonia.Styling;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
+using System.ComponentModel;
 
 namespace Avalonia.Controls
 {
@@ -129,6 +130,7 @@ namespace Avalonia.Controls
         public Window(IWindowImpl impl)
             : base(impl)
         {
+            impl.Closing = HandleClosing;
             _maxPlatformClientSize = PlatformImpl?.MaxClientSize ?? default(Size);
             Screens = new Screens(PlatformImpl?.Screen);
         }
@@ -230,20 +232,23 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         Type IStyleable.StyleKey => typeof(Window);
 
+        /// <summary>
+        /// Fired before a window is closed.
+        /// </summary>
+        public event EventHandler<CancelEventArgs> Closing;
+
         /// <summary>
         /// Closes the window.
         /// </summary>
         public void Close()
         {
-            s_windows.Remove(this);
-            PlatformImpl?.Dispose();
-            IsVisible = false;
+            Close(false);
         }
 
         protected override void HandleApplicationExiting()
         {
             base.HandleApplicationExiting();
-            Close();
+            Close(true);
         }
 
         /// <summary>
@@ -258,7 +263,35 @@ namespace Avalonia.Controls
         public void Close(object dialogResult)
         {
             _dialogResult = dialogResult;
-            Close();
+            Close(false);
+        }
+
+        internal void Close(bool ignoreCancel)
+        {
+            var cancelClosing = false;
+            try
+            {
+                cancelClosing = HandleClosing();
+            }
+            finally
+            {
+                if (ignoreCancel || !cancelClosing)
+                {
+                    s_windows.Remove(this);
+                    PlatformImpl?.Dispose();
+                    IsVisible = false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Handles a closing notification from <see cref="IWindowImpl.Closing"/>.
+        /// </summary>
+        protected virtual bool HandleClosing()
+        {
+            var args = new CancelEventArgs();
+            Closing?.Invoke(this, args);
+            return args.Cancel;
         }
 
         /// <summary>
diff --git a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
index 3c7ef86d5d..fc9541abb7 100644
--- a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
+++ b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
@@ -39,6 +39,7 @@ namespace Avalonia.DesignerSupport.Remote
         public Action<Point> PositionChanged { get; set; }
         public Action Deactivated { get; set; }
         public Action Activated { get; set; }
+        public Func<bool> Closing { get; set; }
         public IPlatformHandle Handle { get; }
         public WindowState WindowState { get; set; }
         public Size MaxClientSize { get; } = new Size(4096, 4096);
diff --git a/src/Avalonia.DesignerSupport/Remote/Stubs.cs b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
index 2ed434a2dc..560425286e 100644
--- a/src/Avalonia.DesignerSupport/Remote/Stubs.cs
+++ b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
@@ -26,6 +26,7 @@ namespace Avalonia.DesignerSupport.Remote
         public Action<Rect> Paint { get; set; }
         public Action<Size> Resized { get; set; }
         public Action<double> ScalingChanged { get; set; }
+        public Func<bool> Closing { get; set; }
         public Action Closed { get; set; }
         public IMouseDevice MouseDevice { get; } = new MouseDevice();
         public Point Position { get; set; }
diff --git a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
index 5aac4466b2..a42c8a19b9 100644
--- a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
+++ b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
@@ -54,6 +54,7 @@ namespace Avalonia.Gtk3
             ConnectEvent("key-press-event", OnKeyEvent);
             ConnectEvent("key-release-event", OnKeyEvent);
             ConnectEvent("leave-notify-event", OnLeaveNotifyEvent);
+            ConnectEvent("delete-event", OnClosingEvent);
             Connect<Native.D.signal_generic>("destroy", OnDestroy);
             Native.GtkWidgetRealize(gtkWidget);
             GdkWindowHandle = this.Handle.Handle;
@@ -125,6 +126,12 @@ namespace Avalonia.Gtk3
             return rv;
         }
 
+        private unsafe bool OnClosingEvent(IntPtr w, IntPtr ev, IntPtr userdata)
+        {
+            bool? preventClosing = Closing?.Invoke();
+            return preventClosing ?? false;
+        }
+
         private unsafe bool OnButton(IntPtr w, IntPtr ev, IntPtr userdata)
         {
             var evnt = (GdkEventButton*)ev;
@@ -343,6 +350,7 @@ namespace Avalonia.Gtk3
         string IPlatformHandle.HandleDescriptor => "HWND";
 
         public Action Activated { get; set; }
+        public Func<bool> Closing { get; set; }
         public Action Closed { get; set; }
         public Action Deactivated { get; set; }
         public Action<RawInputEventArgs> Input { get; set; }
diff --git a/src/OSX/Avalonia.MonoMac/WindowBaseImpl.cs b/src/OSX/Avalonia.MonoMac/WindowBaseImpl.cs
index 9ce1756aae..e5ba285f4f 100644
--- a/src/OSX/Avalonia.MonoMac/WindowBaseImpl.cs
+++ b/src/OSX/Avalonia.MonoMac/WindowBaseImpl.cs
@@ -4,6 +4,7 @@ using Avalonia.Input.Raw;
 using Avalonia.Platform;
 using MonoMac.AppKit;
 using MonoMac.CoreGraphics;
+using MonoMac.Foundation;
 using MonoMac.ObjCRuntime;
 
 namespace Avalonia.MonoMac
@@ -69,6 +70,12 @@ namespace Avalonia.MonoMac
                 _impl.PositionChanged?.Invoke(_impl.Position);
             }
 
+            public override bool WindowShouldClose(NSObject sender)
+            {
+                bool? preventClose = _impl.Closing?.Invoke();
+                return preventClose != true;
+            }
+
             public override void WillClose(global::MonoMac.Foundation.NSNotification notification)
             {
                 _impl.Window.Dispose();
@@ -107,6 +114,7 @@ namespace Avalonia.MonoMac
         public Action<Point> PositionChanged { get; set; }
         public Action Deactivated { get; set; }
         public Action Activated { get; set; }
+        public Func<bool> Closing { get; set; }
 
         public override Size ClientSize => Window.ContentRectFor(Window.Frame).Size.ToAvaloniaSize();
 
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 3ba926b42a..a67362d59f 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -56,6 +56,8 @@ namespace Avalonia.Win32
 
         public Action Activated { get; set; }
 
+        public Func<bool> Closing { get; set; }
+
         public Action Closed { get; set; }
 
         public Action Deactivated { get; set; }
@@ -431,6 +433,14 @@ namespace Avalonia.Win32
 
                     return IntPtr.Zero;
 
+                case UnmanagedMethods.WindowsMessage.WM_CLOSE:
+                    bool? preventClosing = Closing?.Invoke();
+                    if (preventClosing == true)
+                    {
+                        return IntPtr.Zero;
+                    }
+                    break;
+
                 case UnmanagedMethods.WindowsMessage.WM_DESTROY:
                     //Window doesn't exist anymore
                     _hwnd = IntPtr.Zero;

From 7b3942685e4495231a658afb22d204508d995a9d Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@gmail.com>
Date: Wed, 7 Mar 2018 14:02:06 +0100
Subject: [PATCH 389/482] Basic generic + Windows Drag support.

---
 src/Avalonia.Controls/Application.cs          |   4 +-
 src/Avalonia.Controls/DragDrop/DragDrop.cs    |  10 +-
 src/Avalonia.Controls/DragDrop/DragSource.cs  | 129 ++++++++++++++++++
 .../Platform/IPlatformDragSource.cs           |  14 ++
 src/Windows/Avalonia.Win32/DragSource.cs      |  28 ++++
 src/Windows/Avalonia.Win32/OleDragSource.cs   |   4 +-
 src/Windows/Avalonia.Win32/OleDropTarget.cs   |   4 +-
 src/Windows/Avalonia.Win32/Win32Platform.cs   |   3 +-
 8 files changed, 185 insertions(+), 11 deletions(-)
 create mode 100644 src/Avalonia.Controls/DragDrop/DragSource.cs
 create mode 100644 src/Avalonia.Controls/Platform/IPlatformDragSource.cs
 create mode 100644 src/Windows/Avalonia.Win32/DragSource.cs

diff --git a/src/Avalonia.Controls/Application.cs b/src/Avalonia.Controls/Application.cs
index 0a9bf4eab2..6ed797dc51 100644
--- a/src/Avalonia.Controls/Application.cs
+++ b/src/Avalonia.Controls/Application.cs
@@ -14,6 +14,7 @@ using Avalonia.Threading;
 using System.Reactive.Concurrency;
 using Avalonia.Controls.DragDrop;
 using Avalonia.Controls.DragDrop.Raw;
+using Avalonia.Controls.Platform;
 
 namespace Avalonia
 {
@@ -237,7 +238,8 @@ namespace Avalonia
                 .Bind<ILayoutManager>().ToSingleton<LayoutManager>()
                 .Bind<IApplicationLifecycle>().ToConstant(this)
                 .Bind<IScheduler>().ToConstant(AvaloniaScheduler.Instance)
-                .Bind<IDragDropDevice>().ToConstant(DragDropDevice.Instance);
+                .Bind<IDragDropDevice>().ToConstant(DragDropDevice.Instance)
+                .Bind<IPlatformDragSource>().ToTransient<DragSource>();
         }
     }
 }
diff --git a/src/Avalonia.Controls/DragDrop/DragDrop.cs b/src/Avalonia.Controls/DragDrop/DragDrop.cs
index af003516b1..bbac80e38f 100644
--- a/src/Avalonia.Controls/DragDrop/DragDrop.cs
+++ b/src/Avalonia.Controls/DragDrop/DragDrop.cs
@@ -1,4 +1,6 @@
-using Avalonia.Interactivity;
+using System.Threading.Tasks;
+using Avalonia.Controls.Platform;
+using Avalonia.Interactivity;
 
 namespace Avalonia.Controls.DragDrop
 {
@@ -25,10 +27,10 @@ namespace Avalonia.Controls.DragDrop
         /// Starts a dragging operation with the given <see cref="IDataObject"/> and returns the applied drop effect from the target.
         /// <seealso cref="DataObject"/>
         /// </summary>
-        public static DragDropEffects DoDragDrop(this Interactive source, IDataObject data, DragDropEffects allowedEffects)
+        public static Task<DragDropEffects> DoDragDrop(IDataObject data, DragDropEffects allowedEffects)
         {
-
-            return DragDropEffects.None;
+            var src = AvaloniaLocator.Current.GetService<IPlatformDragSource>();
+            return src?.DoDragDrop(data, allowedEffects) ?? Task.FromResult(DragDropEffects.None);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Controls/DragDrop/DragSource.cs b/src/Avalonia.Controls/DragDrop/DragSource.cs
new file mode 100644
index 0000000000..f899eabfbd
--- /dev/null
+++ b/src/Avalonia.Controls/DragDrop/DragSource.cs
@@ -0,0 +1,129 @@
+using System;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Reactive.Subjects;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Controls.DragDrop.Raw;
+using Avalonia.Controls.Platform;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Interactivity;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Controls.DragDrop
+{
+    class DragSource : IPlatformDragSource
+    {
+        private const InputModifiers MOUSE_INPUTMODIFIERS = InputModifiers.LeftMouseButton|InputModifiers.MiddleMouseButton|InputModifiers.RightMouseButton;
+        private readonly IDragDropDevice _dragDrop;
+        private readonly IInputManager _inputManager;
+        
+
+        private readonly Subject<DragDropEffects> _result = new Subject<DragDropEffects>();
+        private IDataObject _draggedData;
+        private IInputRoot _lastRoot;
+        private InputModifiers? _initialInputModifiers;
+
+        public DragSource()
+        {
+            _inputManager = AvaloniaLocator.Current.GetService<IInputManager>();
+            _dragDrop = AvaloniaLocator.Current.GetService<IDragDropDevice>();
+        }
+
+        public async Task<DragDropEffects> DoDragDrop(IDataObject data, DragDropEffects allowedEffects)
+        {
+            Dispatcher.UIThread.VerifyAccess();
+            if (_draggedData == null)
+            {
+                _draggedData = data;
+                _lastRoot = null;
+
+                using (_inputManager.PreProcess.OfType<RawMouseEventArgs>().Subscribe(e => ProcessMouseEvents(e, allowedEffects)))
+                {
+                    var effect = await _result.FirstAsync();
+                    return effect;
+                }
+            }
+            return DragDropEffects.None;
+        }
+
+        private DragDropEffects RaiseDragEvent(RawDragEventType type, IInputElement root, Point pt, DragDropEffects allowedEffects)
+        {
+            RawDragEvent rawEvent = new RawDragEvent(_dragDrop, type, root, pt, _draggedData, allowedEffects);
+            var tl = root.GetSelfAndVisualAncestors().OfType<TopLevel>().FirstOrDefault();
+            tl.PlatformImpl.Input(rawEvent);
+            return rawEvent.Effects;
+        }
+
+        private void ProcessMouseEvents(RawMouseEventArgs e, DragDropEffects allowedEffects)
+        {
+            if (!_initialInputModifiers.HasValue)
+                _initialInputModifiers = e.InputModifiers & MOUSE_INPUTMODIFIERS;
+
+            void CancelDragging()
+            {
+                if (_lastRoot != null)
+                    RaiseDragEvent(RawDragEventType.DragLeave, _lastRoot, _lastRoot.PointToClient(e.Root.PointToScreen(e.Position)), allowedEffects);
+                _result.OnNext(DragDropEffects.None);
+                e.Handled = true;
+            }
+            void AcceptDragging()
+            {
+                var result = RaiseDragEvent(RawDragEventType.Drop, e.Root, e.Position, allowedEffects) & allowedEffects;
+                _result.OnNext(result);
+                e.Handled = true;
+            }
+
+            switch (e.Type)
+            {
+                case RawMouseEventType.LeftButtonDown:
+                case RawMouseEventType.RightButtonDown:
+                case RawMouseEventType.MiddleButtonDown:
+                case RawMouseEventType.NonClientLeftButtonDown:
+                    CancelDragging();
+                    return;
+                case RawMouseEventType.LeaveWindow:
+                    RaiseDragEvent(RawDragEventType.DragLeave, e.Root, e.Position, allowedEffects);
+                    break;
+                case RawMouseEventType.LeftButtonUp:
+                    if (_initialInputModifiers.Value.HasFlag(InputModifiers.LeftMouseButton))
+                        AcceptDragging();
+                    else
+                        CancelDragging();
+                    return;
+                case RawMouseEventType.MiddleButtonUp:
+                    if (_initialInputModifiers.Value.HasFlag(InputModifiers.MiddleMouseButton))
+                        AcceptDragging();
+                    else
+                        CancelDragging();
+                    return;
+                case RawMouseEventType.RightButtonUp:
+                    if (_initialInputModifiers.Value.HasFlag(InputModifiers.RightMouseButton))
+                        AcceptDragging();
+                    else
+                        CancelDragging();
+                    return;
+                case RawMouseEventType.Move:
+                    var mods = e.InputModifiers & MOUSE_INPUTMODIFIERS;
+                    if (_initialInputModifiers.Value != mods)
+                    {
+                        CancelDragging();
+                        return;
+                    }
+
+                    if (e.Root != _lastRoot)
+                    {
+                        if (_lastRoot != null)
+                            RaiseDragEvent(RawDragEventType.DragLeave, _lastRoot, _lastRoot.PointToClient(e.Root.PointToScreen(e.Position)), allowedEffects);
+                        RaiseDragEvent(RawDragEventType.DragEnter, e.Root, e.Position, allowedEffects);
+                        _lastRoot = e.Root;
+                    }
+                    else
+                        RaiseDragEvent(RawDragEventType.DragOver, e.Root, e.Position, allowedEffects);
+                    return;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Platform/IPlatformDragSource.cs b/src/Avalonia.Controls/Platform/IPlatformDragSource.cs
new file mode 100644
index 0000000000..667e1f005c
--- /dev/null
+++ b/src/Avalonia.Controls/Platform/IPlatformDragSource.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Controls.DragDrop;
+using Avalonia.Interactivity;
+
+namespace Avalonia.Controls.Platform
+{
+    public interface IPlatformDragSource
+    {
+        Task<DragDropEffects> DoDragDrop(IDataObject data, DragDropEffects allowedEffects);
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/DragSource.cs b/src/Windows/Avalonia.Win32/DragSource.cs
new file mode 100644
index 0000000000..937471f9ad
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/DragSource.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Controls.DragDrop;
+using Avalonia.Controls.Platform;
+using Avalonia.Interactivity;
+using Avalonia.Threading;
+using Avalonia.Win32.Interop;
+
+namespace Avalonia.Win32
+{
+    class DragSource : IPlatformDragSource
+    {
+        public Task<DragDropEffects> DoDragDrop(IDataObject data, DragDropEffects allowedEffects)
+        {
+            Dispatcher.UIThread.VerifyAccess();
+
+            OleDragSource src = new OleDragSource();
+            DataObject dataObject = new DataObject(data);
+            int allowed = (int)OleDropTarget.ConvertDropEffect(allowedEffects);
+
+            int[] finalEffect = new int[1];
+            UnmanagedMethods.DoDragDrop(dataObject, src, allowed, finalEffect);
+
+            return Task.FromResult(OleDropTarget.ConvertDropEffect((DropEffect)finalEffect[0]));}
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/OleDragSource.cs b/src/Windows/Avalonia.Win32/OleDragSource.cs
index 1bff984087..522014abc0 100644
--- a/src/Windows/Avalonia.Win32/OleDragSource.cs
+++ b/src/Windows/Avalonia.Win32/OleDragSource.cs
@@ -33,9 +33,7 @@ namespace Avalonia.Win32
 
         public int GiveFeedback(int dwEffect)
         {
-            if (dwEffect != 0)
-                return DRAGDROP_S_USEDEFAULTCURSORS;
-            return unchecked((int)UnmanagedMethods.HRESULT.S_OK);
+            return DRAGDROP_S_USEDEFAULTCURSORS;
         }
     }
 }
diff --git a/src/Windows/Avalonia.Win32/OleDropTarget.cs b/src/Windows/Avalonia.Win32/OleDropTarget.cs
index 31db5f88a9..747006673a 100644
--- a/src/Windows/Avalonia.Win32/OleDropTarget.cs
+++ b/src/Windows/Avalonia.Win32/OleDropTarget.cs
@@ -23,7 +23,7 @@ namespace Avalonia.Win32
             _target = target;
         }
 
-        static DropEffect ConvertDropEffect(DragDropEffects operation)
+        public static DropEffect ConvertDropEffect(DragDropEffects operation)
         {
             DropEffect result = DropEffect.None;
             if (operation.HasFlag(DragDropEffects.Copy))
@@ -35,7 +35,7 @@ namespace Avalonia.Win32
             return result;
         }
 
-        static DragDropEffects ConvertDropEffect(DropEffect effect)
+        public static DragDropEffects ConvertDropEffect(DropEffect effect)
         {
             DragDropEffects result = DragDropEffects.None;
             if (effect.HasFlag(DropEffect.Copy))
diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
index 4e1ba618a8..ef1c4e987d 100644
--- a/src/Windows/Avalonia.Win32/Win32Platform.cs
+++ b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -84,7 +84,8 @@ namespace Avalonia.Win32
                 .Bind<IRenderLoop>().ToConstant(new RenderLoop(60))
                 .Bind<ISystemDialogImpl>().ToSingleton<SystemDialogImpl>()
                 .Bind<IWindowingPlatform>().ToConstant(s_instance)
-                .Bind<IPlatformIconLoader>().ToConstant(s_instance);
+                .Bind<IPlatformIconLoader>().ToConstant(s_instance)
+                .Bind<IPlatformDragSource>().ToSingleton<DragSource>();
 
             UseDeferredRendering = deferredRendering;
             _uiThread = UnmanagedMethods.GetCurrentThreadId();

From 81aaa0938309fab331725189c841b5b5bd35c247 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@googlemail.com>
Date: Wed, 7 Mar 2018 18:43:07 +0100
Subject: [PATCH 390/482] set the cursor for the drop-effects

---
 src/Avalonia.Controls/DragDrop/DragSource.cs | 47 ++++++++++++++++++--
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/DragDrop/DragSource.cs b/src/Avalonia.Controls/DragDrop/DragSource.cs
index f899eabfbd..2048a0c0da 100644
--- a/src/Avalonia.Controls/DragDrop/DragSource.cs
+++ b/src/Avalonia.Controls/DragDrop/DragSource.cs
@@ -23,8 +23,9 @@ namespace Avalonia.Controls.DragDrop
 
         private readonly Subject<DragDropEffects> _result = new Subject<DragDropEffects>();
         private IDataObject _draggedData;
-        private IInputRoot _lastRoot;
+        private IInputElement _lastRoot;
         private InputModifiers? _initialInputModifiers;
+        private object _lastCursor;
 
         public DragSource()
         {
@@ -54,9 +55,48 @@ namespace Avalonia.Controls.DragDrop
             RawDragEvent rawEvent = new RawDragEvent(_dragDrop, type, root, pt, _draggedData, allowedEffects);
             var tl = root.GetSelfAndVisualAncestors().OfType<TopLevel>().FirstOrDefault();
             tl.PlatformImpl.Input(rawEvent);
+            
+            SetCursor(root, rawEvent.Effects);
             return rawEvent.Effects;
         }
 
+        private Cursor GetCursorForDropEffect(DragDropEffects effects)
+        {
+            // Todo. Needs to choose cursor by effect.
+            if (effects == DragDropEffects.None)
+                return new Cursor(StandardCursorType.No);
+            return new Cursor(StandardCursorType.Hand);
+        }
+        
+        private void SetCursor(IInputElement root, DragDropEffects effect)
+        {
+            if (_lastRoot != root)
+            {
+                if (_lastRoot is InputElement ieLast)
+                {
+                    if (_lastCursor == AvaloniaProperty.UnsetValue)
+                        ieLast.ClearValue(InputElement.CursorProperty);
+                    else
+                        ieLast.Cursor = _lastCursor as Cursor;
+                }
+
+                if (root is InputElement ieNew)
+                {
+                    if (!ieNew.IsSet(InputElement.CursorProperty))
+                        _lastCursor = AvaloniaProperty.UnsetValue;
+                    else
+                        _lastCursor = root.Cursor;
+                }
+                else
+                    _lastCursor = null;
+
+                _lastRoot = root;
+            }
+
+            if (root is InputElement ie)
+                ie.Cursor = GetCursorForDropEffect(effect);
+        }
+        
         private void ProcessMouseEvents(RawMouseEventArgs e, DragDropEffects allowedEffects)
         {
             if (!_initialInputModifiers.HasValue)
@@ -66,16 +106,18 @@ namespace Avalonia.Controls.DragDrop
             {
                 if (_lastRoot != null)
                     RaiseDragEvent(RawDragEventType.DragLeave, _lastRoot, _lastRoot.PointToClient(e.Root.PointToScreen(e.Position)), allowedEffects);
+                SetCursor(null, DragDropEffects.None);
                 _result.OnNext(DragDropEffects.None);
                 e.Handled = true;
             }
             void AcceptDragging()
             {
                 var result = RaiseDragEvent(RawDragEventType.Drop, e.Root, e.Position, allowedEffects) & allowedEffects;
+                SetCursor(null, DragDropEffects.None);
                 _result.OnNext(result);
                 e.Handled = true;
             }
-
+            
             switch (e.Type)
             {
                 case RawMouseEventType.LeftButtonDown:
@@ -118,7 +160,6 @@ namespace Avalonia.Controls.DragDrop
                         if (_lastRoot != null)
                             RaiseDragEvent(RawDragEventType.DragLeave, _lastRoot, _lastRoot.PointToClient(e.Root.PointToScreen(e.Position)), allowedEffects);
                         RaiseDragEvent(RawDragEventType.DragEnter, e.Root, e.Position, allowedEffects);
-                        _lastRoot = e.Root;
                     }
                     else
                         RaiseDragEvent(RawDragEventType.DragOver, e.Root, e.Position, allowedEffects);

From 7f2f713ff0d549488ad8304547ec2680362af348 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@googlemail.com>
Date: Wed, 7 Mar 2018 22:21:19 +0100
Subject: [PATCH 391/482] fixed not updating cursor on osx

---
 src/OSX/Avalonia.MonoMac/TopLevelImpl.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
index 667ee12fa0..9dc6c45745 100644
--- a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
+++ b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
@@ -133,7 +133,10 @@ namespace Avalonia.MonoMac
             {
                 ResetCursorRects();
                 if (_cursor != null)
+                {
                     AddCursorRect(Frame, _cursor);
+                    _cursor.Set();
+                }
             }
 
             static readonly NSCursor ArrowCursor = NSCursor.ArrowCursor;

From a3dd74fafab6ef7b95acbe56fad8f32a7e198748 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@gmail.com>
Date: Thu, 8 Mar 2018 07:27:35 +0100
Subject: [PATCH 392/482] only set the cursor if the mouse is over the toplevel

---
 src/OSX/Avalonia.MonoMac/TopLevelImpl.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
index 9dc6c45745..a655bc1ec5 100644
--- a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
+++ b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
@@ -39,6 +39,7 @@ namespace Avalonia.MonoMac
             private NSTrackingArea _area;
             private NSCursor _cursor;
             private bool _nonUiRedrawQueued;
+            private bool _isMouseOver;
 
             public CGSize PixelSize { get; set; }
 
@@ -135,7 +136,8 @@ namespace Avalonia.MonoMac
                 if (_cursor != null)
                 {
                     AddCursorRect(Frame, _cursor);
-                    _cursor.Set();
+                    if (_isMouseOver)
+                        _cursor.Set();
                 }
             }
 
@@ -302,10 +304,17 @@ namespace Avalonia.MonoMac
 
             public override void MouseExited(NSEvent theEvent)
             {
+                _isMouseOver = false;
                 MouseEvent(theEvent, RawMouseEventType.LeaveWindow);
                 base.MouseExited(theEvent);
             }
 
+            public override void MouseEntered(NSEvent theEvent)
+            {
+                _isMouseOver = true;
+                base.MouseEntered(theEvent);
+            }
+
             void KeyboardEvent(RawKeyEventType type, NSEvent ev)
             {
                 var code = KeyTransform.TransformKeyCode(ev.KeyCode);

From e967a8eb7276542166080c2652fe4c6f5b3fa300 Mon Sep 17 00:00:00 2001
From: ahopper <alan@samsararesearch.com>
Date: Thu, 8 Mar 2018 12:34:47 +0000
Subject: [PATCH 393/482] rename WritableBitmap

---
 src/Avalonia.Controls/Remote/RemoteWidget.cs           |  4 ++--
 .../Imaging/{WritableBitmap.cs => WriteableBitmap.cs}  | 10 +++++-----
 .../Platform/IPlatformRenderInterface.cs               |  6 +++---
 ...{IWritableBitmapImpl.cs => IWriteableBitmapImpl.cs} |  4 ++--
 src/Skia/Avalonia.Skia/BitmapImpl.cs                   |  2 +-
 src/Skia/Avalonia.Skia/PlatformRenderInterface.cs      |  2 +-
 src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs    |  4 ++--
 ...tableWicBitmapImpl.cs => WriteableWicBitmapImpl.cs} |  4 ++--
 tests/Avalonia.RenderTests/Media/BitmapTests.cs        | 10 +++++-----
 .../Avalonia.UnitTests/MockPlatformRenderInterface.cs  |  2 +-
 .../VisualTree/MockRenderInterface.cs                  |  2 +-
 11 files changed, 25 insertions(+), 25 deletions(-)
 rename src/Avalonia.Visuals/Media/Imaging/{WritableBitmap.cs => WriteableBitmap.cs} (51%)
 rename src/Avalonia.Visuals/Platform/{IWritableBitmapImpl.cs => IWriteableBitmapImpl.cs} (75%)
 rename src/Windows/Avalonia.Direct2D1/Media/Imaging/{WritableWicBitmapImpl.cs => WriteableWicBitmapImpl.cs} (86%)

diff --git a/src/Avalonia.Controls/Remote/RemoteWidget.cs b/src/Avalonia.Controls/Remote/RemoteWidget.cs
index 83360a0010..ea8c3ebe52 100644
--- a/src/Avalonia.Controls/Remote/RemoteWidget.cs
+++ b/src/Avalonia.Controls/Remote/RemoteWidget.cs
@@ -14,7 +14,7 @@ namespace Avalonia.Controls.Remote
     {
         private readonly IAvaloniaRemoteTransportConnection _connection;
         private FrameMessage _lastFrame;
-        private WritableBitmap _bitmap;
+        private WriteableBitmap _bitmap;
         public RemoteWidget(IAvaloniaRemoteTransportConnection connection)
         {
             _connection = connection;
@@ -62,7 +62,7 @@ namespace Avalonia.Controls.Remote
                 var fmt = (PixelFormat) _lastFrame.Format;
                 if (_bitmap == null || _bitmap.PixelWidth != _lastFrame.Width ||
                     _bitmap.PixelHeight != _lastFrame.Height)
-                    _bitmap = new WritableBitmap(_lastFrame.Width, _lastFrame.Height, fmt);
+                    _bitmap = new WriteableBitmap(_lastFrame.Width, _lastFrame.Height, fmt);
                 using (var l = _bitmap.Lock())
                 {
                     var lineLen = (fmt == PixelFormat.Rgb565 ? 2 : 4) * _lastFrame.Width;
diff --git a/src/Avalonia.Visuals/Media/Imaging/WritableBitmap.cs b/src/Avalonia.Visuals/Media/Imaging/WriteableBitmap.cs
similarity index 51%
rename from src/Avalonia.Visuals/Media/Imaging/WritableBitmap.cs
rename to src/Avalonia.Visuals/Media/Imaging/WriteableBitmap.cs
index df3e71dc85..af6fde6876 100644
--- a/src/Avalonia.Visuals/Media/Imaging/WritableBitmap.cs
+++ b/src/Avalonia.Visuals/Media/Imaging/WriteableBitmap.cs
@@ -9,15 +9,15 @@ using Avalonia.Utilities;
 namespace Avalonia.Media.Imaging
 {
     /// <summary>
-    /// Holds a writable bitmap image.
+    /// Holds a writeable bitmap image.
     /// </summary>
-    public class WritableBitmap : Bitmap
+    public class WriteableBitmap : Bitmap
     {
-        public WritableBitmap(int width, int height, PixelFormat? format = null) 
-            : base(AvaloniaLocator.Current.GetService<IPlatformRenderInterface>().CreateWritableBitmap(width, height, format))
+        public WriteableBitmap(int width, int height, PixelFormat? format = null) 
+            : base(AvaloniaLocator.Current.GetService<IPlatformRenderInterface>().CreateWriteableBitmap(width, height, format))
         {
         }
         
-        public ILockedFramebuffer Lock() => ((IWritableBitmapImpl) PlatformImpl.Item).Lock();
+        public ILockedFramebuffer Lock() => ((IWriteableBitmapImpl) PlatformImpl.Item).Lock();
     }
 }
diff --git a/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs b/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs
index aab8521f6d..cc17efd2bb 100644
--- a/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs
+++ b/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs
@@ -61,13 +61,13 @@ namespace Avalonia.Platform
             double dpiY);
 
         /// <summary>
-        /// Creates a writable bitmap implementation.
+        /// Creates a writeable bitmap implementation.
         /// </summary>
         /// <param name="width">The width of the bitmap.</param>
         /// <param name="height">The height of the bitmap.</param>
         /// <param name="format">Pixel format (optional).</param>
-        /// <returns>An <see cref="IWritableBitmapImpl"/>.</returns>
-        IWritableBitmapImpl CreateWritableBitmap(int width, int height, PixelFormat? format = null);
+        /// <returns>An <see cref="IWriteableBitmapImpl"/>.</returns>
+        IWriteableBitmapImpl CreateWriteableBitmap(int width, int height, PixelFormat? format = null);
 
         /// <summary>
         /// Loads a bitmap implementation from a file..
diff --git a/src/Avalonia.Visuals/Platform/IWritableBitmapImpl.cs b/src/Avalonia.Visuals/Platform/IWriteableBitmapImpl.cs
similarity index 75%
rename from src/Avalonia.Visuals/Platform/IWritableBitmapImpl.cs
rename to src/Avalonia.Visuals/Platform/IWriteableBitmapImpl.cs
index b736c11dab..7ab5a7c100 100644
--- a/src/Avalonia.Visuals/Platform/IWritableBitmapImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IWriteableBitmapImpl.cs
@@ -7,9 +7,9 @@ using System.Threading.Tasks;
 namespace Avalonia.Platform
 {
     /// <summary>
-    /// Defines the platform-specific interface for a <see cref="Avalonia.Media.Imaging.WritableBitmap"/>.
+    /// Defines the platform-specific interface for a <see cref="Avalonia.Media.Imaging.WriteableBitmap"/>.
     /// </summary>
-    public interface IWritableBitmapImpl : IBitmapImpl
+    public interface IWriteableBitmapImpl : IBitmapImpl
     {
         ILockedFramebuffer Lock();
     }
diff --git a/src/Skia/Avalonia.Skia/BitmapImpl.cs b/src/Skia/Avalonia.Skia/BitmapImpl.cs
index 00ab770e01..ccc5a37105 100644
--- a/src/Skia/Avalonia.Skia/BitmapImpl.cs
+++ b/src/Skia/Avalonia.Skia/BitmapImpl.cs
@@ -6,7 +6,7 @@ using SkiaSharp;
 
 namespace Avalonia.Skia
 {
-    class BitmapImpl : IRenderTargetBitmapImpl, IWritableBitmapImpl
+    class BitmapImpl : IRenderTargetBitmapImpl, IWriteableBitmapImpl
     {
         private Vector _dpi;
 
diff --git a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
index bd3769e4a5..50e65f45dc 100644
--- a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
+++ b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
@@ -88,7 +88,7 @@ namespace Avalonia.Skia
             return new FramebufferRenderTarget(fb);
         }
 
-        public IWritableBitmapImpl CreateWritableBitmap(int width, int height, PixelFormat? format = null)
+        public IWriteableBitmapImpl CreateWriteableBitmap(int width, int height, PixelFormat? format = null)
         {
             return new BitmapImpl(width, height, new Vector(96, 96), format);
         }
diff --git a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
index a47c871f5a..296edcb2d9 100644
--- a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
+++ b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
@@ -168,9 +168,9 @@ namespace Avalonia.Direct2D1
                 dpiY);
         }
 
-        public IWritableBitmapImpl CreateWritableBitmap(int width, int height, PixelFormat? format = null)
+        public IWriteableBitmapImpl CreateWriteableBitmap(int width, int height, PixelFormat? format = null)
         {
-            return new WritableWicBitmapImpl(s_imagingFactory, width, height, format);
+            return new WriteableWicBitmapImpl(s_imagingFactory, width, height, format);
         }
 
         public IStreamGeometryImpl CreateStreamGeometry()
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WritableWicBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
similarity index 86%
rename from src/Windows/Avalonia.Direct2D1/Media/Imaging/WritableWicBitmapImpl.cs
rename to src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
index 5dc07e06c4..fc931c32db 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WritableWicBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
@@ -9,9 +9,9 @@ using PixelFormat = Avalonia.Platform.PixelFormat;
 
 namespace Avalonia.Direct2D1.Media.Imaging
 {
-    class WritableWicBitmapImpl : WicBitmapImpl, IWritableBitmapImpl
+    class WriteableWicBitmapImpl : WicBitmapImpl, IWriteableBitmapImpl
     {
-        public WritableWicBitmapImpl(ImagingFactory factory, int width, int height, PixelFormat? pixelFormat) 
+        public WriteableWicBitmapImpl(ImagingFactory factory, int width, int height, PixelFormat? pixelFormat) 
             : base(factory, width, height, pixelFormat)
         {
         }
diff --git a/tests/Avalonia.RenderTests/Media/BitmapTests.cs b/tests/Avalonia.RenderTests/Media/BitmapTests.cs
index a7cd06a894..089579a0a0 100644
--- a/tests/Avalonia.RenderTests/Media/BitmapTests.cs
+++ b/tests/Avalonia.RenderTests/Media/BitmapTests.cs
@@ -106,9 +106,9 @@ namespace Avalonia.Direct2D1.RenderTests.Media
 
         [Theory]
         [InlineData(PixelFormat.Bgra8888), InlineData(PixelFormat.Rgba8888)]
-        public void WritableBitmapShouldBeUsable(PixelFormat fmt)
+        public void WriteableBitmapShouldBeUsable(PixelFormat fmt)
         {
-            var writableBitmap = new WritableBitmap(256, 256, fmt);
+            var writeableBitmap = new WriteableBitmap(256, 256, fmt);
 
             var data = new int[256 * 256];
             for (int y = 0; y < 256; y++)
@@ -116,7 +116,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
                     data[y * 256 + x] =(int)((uint)(x + (y << 8)) | 0xFF000000u);
 
 
-            using (var l = writableBitmap.Lock())
+            using (var l = writeableBitmap.Lock())
             {
                 for(var r = 0; r<256; r++)
                 {
@@ -125,9 +125,9 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             }
 
 
-            var name = nameof(WritableBitmapShouldBeUsable) + "_" + fmt;
+            var name = nameof(WriteableBitmapShouldBeUsable) + "_" + fmt;
 
-            writableBitmap.Save(System.IO.Path.Combine(OutputPath, name + ".out.png"));
+            writeableBitmap.Save(System.IO.Path.Combine(OutputPath, name + ".out.png"));
             CompareImagesNoRenderer(name);
 
         }
diff --git a/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs b/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
index 8c6c949e07..de2b517956 100644
--- a/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
+++ b/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
@@ -39,7 +39,7 @@ namespace Avalonia.UnitTests
             return new MockStreamGeometryImpl();
         }
 
-        public IWritableBitmapImpl CreateWritableBitmap(int width, int height, PixelFormat? format = default(PixelFormat?))
+        public IWriteableBitmapImpl CreateWriteableBitmap(int width, int height, PixelFormat? format = default(PixelFormat?))
         {
             throw new NotImplementedException();
         }
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
index 54bb5d72d0..93b5a8a764 100644
--- a/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
+++ b/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
@@ -49,7 +49,7 @@ namespace Avalonia.Visuals.UnitTests.VisualTree
             throw new NotImplementedException();
         }
 
-        public IWritableBitmapImpl CreateWritableBitmap(int width, int height, PixelFormat? fmt)
+        public IWriteableBitmapImpl CreateWriteableBitmap(int width, int height, PixelFormat? fmt)
         {
             throw new NotImplementedException();
         }

From 74163ff668d744a1c3b06917cdeef63977df89fd Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@gmail.com>
Date: Thu, 8 Mar 2018 15:03:51 +0100
Subject: [PATCH 394/482] Added D+D StandardCursors

---
 src/Avalonia.Input/Cursors.cs               |  5 +++-
 src/Gtk/Avalonia.Gtk3/CursorFactory.cs      |  5 +++-
 src/OSX/Avalonia.MonoMac/Cursor.cs          |  4 +++
 src/Windows/Avalonia.Win32/CursorFactory.cs | 27 +++++++++++++++++++++
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Input/Cursors.cs b/src/Avalonia.Input/Cursors.cs
index e3860e58e5..02a026c998 100644
--- a/src/Avalonia.Input/Cursors.cs
+++ b/src/Avalonia.Input/Cursors.cs
@@ -38,7 +38,10 @@ namespace Avalonia.Input
         TopLeftCorner,
         TopRightCorner,
         BottomLeftCorner,
-        BottomRightCorner
+        BottomRightCorner,
+        DragMove,
+        DragCopy,
+        DragLink,
 
         // Not available in GTK directly, see http://www.pixelbeat.org/programming/x_cursors/ 
         // We might enable them later, preferably, by loading pixmax direclty from theme with fallback image
diff --git a/src/Gtk/Avalonia.Gtk3/CursorFactory.cs b/src/Gtk/Avalonia.Gtk3/CursorFactory.cs
index ac547b8bc2..d6a3c1f260 100644
--- a/src/Gtk/Avalonia.Gtk3/CursorFactory.cs
+++ b/src/Gtk/Avalonia.Gtk3/CursorFactory.cs
@@ -32,7 +32,10 @@ namespace Avalonia.Gtk3
             {StandardCursorType.TopLeftCorner, CursorType.TopLeftCorner},
             {StandardCursorType.TopRightCorner, CursorType.TopRightCorner},
             {StandardCursorType.BottomLeftCorner, CursorType.BottomLeftCorner},
-            {StandardCursorType.BottomRightCorner, CursorType.BottomRightCorner}
+            {StandardCursorType.BottomRightCorner, CursorType.BottomRightCorner},
+            {StandardCursorType.DragCopy, CursorType.CenterPtr},
+            {StandardCursorType.DragMove, CursorType.Fleur},
+            {StandardCursorType.DragLink, CursorType.Cross},
         };
 
         private static readonly Dictionary<StandardCursorType, IPlatformHandle> Cache =
diff --git a/src/OSX/Avalonia.MonoMac/Cursor.cs b/src/OSX/Avalonia.MonoMac/Cursor.cs
index 10445e62e2..d9370e527b 100644
--- a/src/OSX/Avalonia.MonoMac/Cursor.cs
+++ b/src/OSX/Avalonia.MonoMac/Cursor.cs
@@ -51,6 +51,10 @@ namespace Avalonia.MonoMac
                 [StandardCursorType.TopSide] = NSCursor.ResizeUpCursor,
                 [StandardCursorType.UpArrow] = NSCursor.ResizeUpCursor,
                 [StandardCursorType.Wait] = NSCursor.ArrowCursor, //TODO
+                [StandardCursorType.DragMove] = NSCursor.DragCopyCursor, // TODO
+                [StandardCursorType.DragCopy] = NSCursor.DragCopyCursor,
+                [StandardCursorType.DragLink] = NSCursor.DragLinkCursor,
+
             };
         }
 
diff --git a/src/Windows/Avalonia.Win32/CursorFactory.cs b/src/Windows/Avalonia.Win32/CursorFactory.cs
index 0d529d6b91..fa2fbe4810 100644
--- a/src/Windows/Avalonia.Win32/CursorFactory.cs
+++ b/src/Windows/Avalonia.Win32/CursorFactory.cs
@@ -9,6 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Avalonia.Input;
 using Avalonia.Platform;
+using System.Runtime.InteropServices;
 
 namespace Avalonia.Win32
 {
@@ -20,6 +21,27 @@ namespace Avalonia.Win32
         {
         }
 
+        static CursorFactory()
+        {
+            LoadModuleCursor(StandardCursorType.DragMove, "ole32.dll", 2);
+            LoadModuleCursor(StandardCursorType.DragCopy, "ole32.dll", 3);
+            LoadModuleCursor(StandardCursorType.DragLink, "ole32.dll", 4);
+        }
+
+        private static void LoadModuleCursor(StandardCursorType cursorType, string module, int id)
+        {
+            IntPtr mh = UnmanagedMethods.GetModuleHandle(module);
+            if (mh != IntPtr.Zero)
+            {
+                IntPtr cursor = UnmanagedMethods.LoadCursor(mh, new IntPtr(id));
+                if (cursor != IntPtr.Zero)
+                {
+                    PlatformHandle phCursor = new PlatformHandle(cursor, PlatformConstants.CursorHandleType);
+                    Cache.Add(cursorType, phCursor);
+                }
+            }
+        }
+
         private static readonly Dictionary<StandardCursorType, int> CursorTypeMapping = new Dictionary
             <StandardCursorType, int>
         {
@@ -47,6 +69,11 @@ namespace Avalonia.Win32
             //Using SizeNorthEastSouthWest
             {StandardCursorType.TopRightCorner, 32643},
             {StandardCursorType.BottomLeftCorner, 32643},
+
+            // Fallback, should have been loaded from ole32.dll
+            {StandardCursorType.DragMove, 32516},
+            {StandardCursorType.DragCopy, 32516},
+            {StandardCursorType.DragLink, 32516},
         };
 
         private static readonly Dictionary<StandardCursorType, IPlatformHandle> Cache =

From 97f581af496fc8172b8e1863bb6fae89e8f544dc Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@gmail.com>
Date: Thu, 8 Mar 2018 15:05:13 +0100
Subject: [PATCH 395/482] Improved DragSource

the drag source now gets the preferred drag effect and handles keyboard
inputs too
---
 src/Avalonia.Controls/DragDrop/DragSource.cs | 129 ++++++++++++-------
 1 file changed, 81 insertions(+), 48 deletions(-)

diff --git a/src/Avalonia.Controls/DragDrop/DragSource.cs b/src/Avalonia.Controls/DragDrop/DragSource.cs
index 2048a0c0da..fd3d8ef143 100644
--- a/src/Avalonia.Controls/DragDrop/DragSource.cs
+++ b/src/Avalonia.Controls/DragDrop/DragSource.cs
@@ -19,13 +19,14 @@ namespace Avalonia.Controls.DragDrop
         private const InputModifiers MOUSE_INPUTMODIFIERS = InputModifiers.LeftMouseButton|InputModifiers.MiddleMouseButton|InputModifiers.RightMouseButton;
         private readonly IDragDropDevice _dragDrop;
         private readonly IInputManager _inputManager;
-        
-
         private readonly Subject<DragDropEffects> _result = new Subject<DragDropEffects>();
+
+        private DragDropEffects _allowedEffects;
         private IDataObject _draggedData;
         private IInputElement _lastRoot;
-        private InputModifiers? _initialInputModifiers;
+        private Point _lastPosition;
         private object _lastCursor;
+        private InputModifiers? _initialInputModifiers;
 
         public DragSource()
         {
@@ -40,35 +41,58 @@ namespace Avalonia.Controls.DragDrop
             {
                 _draggedData = data;
                 _lastRoot = null;
+                _lastPosition = default(Point);
+                _allowedEffects = allowedEffects;
 
-                using (_inputManager.PreProcess.OfType<RawMouseEventArgs>().Subscribe(e => ProcessMouseEvents(e, allowedEffects)))
+                using (_inputManager.PreProcess.OfType<RawMouseEventArgs>().Subscribe(ProcessMouseEvents))
                 {
-                    var effect = await _result.FirstAsync();
-                    return effect;
+                    using (_inputManager.PreProcess.OfType<RawKeyEventArgs>().Subscribe(ProcessKeyEvents))
+                    {
+                        var effect = await _result.FirstAsync();
+                        return effect;
+                    }
                 }
             }
             return DragDropEffects.None;
         }
 
-        private DragDropEffects RaiseDragEvent(RawDragEventType type, IInputElement root, Point pt, DragDropEffects allowedEffects)
+
+        private DragDropEffects RaiseEventAndUpdateCursor(RawDragEventType type, IInputElement root, Point pt, InputModifiers modifiers)
         {
-            RawDragEvent rawEvent = new RawDragEvent(_dragDrop, type, root, pt, _draggedData, allowedEffects);
+            _lastPosition = pt;
+
+            RawDragEvent rawEvent = new RawDragEvent(_dragDrop, type, root, pt, _draggedData, _allowedEffects);
             var tl = root.GetSelfAndVisualAncestors().OfType<TopLevel>().FirstOrDefault();
             tl.PlatformImpl.Input(rawEvent);
-            
-            SetCursor(root, rawEvent.Effects);
-            return rawEvent.Effects;
+
+            var effect = GetPreferredEffect(rawEvent.Effects & _allowedEffects, modifiers);
+            UpdateCursor(root, effect);
+            return effect;
+        }
+
+        private DragDropEffects GetPreferredEffect(DragDropEffects effect, InputModifiers modifiers)
+        {
+            if (effect == DragDropEffects.Copy || effect == DragDropEffects.Move || effect == DragDropEffects.Link || effect == DragDropEffects.None)
+                return effect; // No need to check for the modifiers.
+            if (effect.HasFlag(DragDropEffects.Link) && modifiers.HasFlag(InputModifiers.Alt))
+                return DragDropEffects.Link;
+            if (effect.HasFlag(DragDropEffects.Copy) && modifiers.HasFlag(InputModifiers.Control))
+                return DragDropEffects.Copy;
+            return DragDropEffects.Move;
         }
 
         private Cursor GetCursorForDropEffect(DragDropEffects effects)
         {
-            // Todo. Needs to choose cursor by effect.
-            if (effects == DragDropEffects.None)
-                return new Cursor(StandardCursorType.No);
-            return new Cursor(StandardCursorType.Hand);
+            if (effects.HasFlag(DragDropEffects.Copy))
+                return new Cursor(StandardCursorType.DragCopy);
+            if (effects.HasFlag(DragDropEffects.Move))
+                return new Cursor(StandardCursorType.DragMove);
+            if (effects.HasFlag(DragDropEffects.Link))
+                return new Cursor(StandardCursorType.DragLink);
+            return new Cursor(StandardCursorType.No);
         }
         
-        private void SetCursor(IInputElement root, DragDropEffects effect)
+        private void UpdateCursor(IInputElement root, DragDropEffects effect)
         {
             if (_lastRoot != root)
             {
@@ -96,25 +120,45 @@ namespace Avalonia.Controls.DragDrop
             if (root is InputElement ie)
                 ie.Cursor = GetCursorForDropEffect(effect);
         }
-        
-        private void ProcessMouseEvents(RawMouseEventArgs e, DragDropEffects allowedEffects)
+
+        private void CancelDragging()
         {
-            if (!_initialInputModifiers.HasValue)
-                _initialInputModifiers = e.InputModifiers & MOUSE_INPUTMODIFIERS;
+            if (_lastRoot != null)
+                RaiseEventAndUpdateCursor(RawDragEventType.DragLeave, _lastRoot, _lastPosition, InputModifiers.None);
+            UpdateCursor(null, DragDropEffects.None);
+            _result.OnNext(DragDropEffects.None);
+        }
 
-            void CancelDragging()
+        private void ProcessKeyEvents(RawKeyEventArgs e)
+        {
+            if (e.Type == RawKeyEventType.KeyDown && e.Key == Key.Escape)
             {
                 if (_lastRoot != null)
-                    RaiseDragEvent(RawDragEventType.DragLeave, _lastRoot, _lastRoot.PointToClient(e.Root.PointToScreen(e.Position)), allowedEffects);
-                SetCursor(null, DragDropEffects.None);
+                    RaiseEventAndUpdateCursor(RawDragEventType.DragLeave, _lastRoot, _lastPosition, e.Modifiers);
+                UpdateCursor(null, DragDropEffects.None);
                 _result.OnNext(DragDropEffects.None);
                 e.Handled = true;
             }
-            void AcceptDragging()
+            else if (e.Key == Key.LeftCtrl || e.Key == Key.RightCtrl || e.Key == Key.LeftAlt || e.Key == Key.RightAlt)
+                RaiseEventAndUpdateCursor(RawDragEventType.DragOver, _lastRoot, _lastPosition, e.Modifiers);
+        }
+
+        private void ProcessMouseEvents(RawMouseEventArgs e)
+        {
+            if (!_initialInputModifiers.HasValue)
+                _initialInputModifiers = e.InputModifiers & MOUSE_INPUTMODIFIERS;
+
+            
+            void CheckDraggingAccepted(InputModifiers changedMouseButton)
             {
-                var result = RaiseDragEvent(RawDragEventType.Drop, e.Root, e.Position, allowedEffects) & allowedEffects;
-                SetCursor(null, DragDropEffects.None);
-                _result.OnNext(result);
+                if (_initialInputModifiers.Value.HasFlag(changedMouseButton))
+                {
+                    var result = RaiseEventAndUpdateCursor(RawDragEventType.Drop, e.Root, e.Position, e.InputModifiers);
+                    UpdateCursor(null, DragDropEffects.None);
+                    _result.OnNext(result);
+                }
+                else
+                    CancelDragging();
                 e.Handled = true;
             }
             
@@ -125,45 +169,34 @@ namespace Avalonia.Controls.DragDrop
                 case RawMouseEventType.MiddleButtonDown:
                 case RawMouseEventType.NonClientLeftButtonDown:
                     CancelDragging();
+                    e.Handled = true;
                     return;
                 case RawMouseEventType.LeaveWindow:
-                    RaiseDragEvent(RawDragEventType.DragLeave, e.Root, e.Position, allowedEffects);
-                    break;
+                    RaiseEventAndUpdateCursor(RawDragEventType.DragLeave, e.Root, e.Position,  e.InputModifiers); break;
                 case RawMouseEventType.LeftButtonUp:
-                    if (_initialInputModifiers.Value.HasFlag(InputModifiers.LeftMouseButton))
-                        AcceptDragging();
-                    else
-                        CancelDragging();
-                    return;
+                    CheckDraggingAccepted(InputModifiers.LeftMouseButton); break;
                 case RawMouseEventType.MiddleButtonUp:
-                    if (_initialInputModifiers.Value.HasFlag(InputModifiers.MiddleMouseButton))
-                        AcceptDragging();
-                    else
-                        CancelDragging();
-                    return;
+                    CheckDraggingAccepted(InputModifiers.MiddleMouseButton); break;
                 case RawMouseEventType.RightButtonUp:
-                    if (_initialInputModifiers.Value.HasFlag(InputModifiers.RightMouseButton))
-                        AcceptDragging();
-                    else
-                        CancelDragging();
-                    return;
+                    CheckDraggingAccepted(InputModifiers.RightMouseButton); break;
                 case RawMouseEventType.Move:
                     var mods = e.InputModifiers & MOUSE_INPUTMODIFIERS;
                     if (_initialInputModifiers.Value != mods)
                     {
                         CancelDragging();
+                        e.Handled = true;
                         return;
                     }
 
                     if (e.Root != _lastRoot)
                     {
                         if (_lastRoot != null)
-                            RaiseDragEvent(RawDragEventType.DragLeave, _lastRoot, _lastRoot.PointToClient(e.Root.PointToScreen(e.Position)), allowedEffects);
-                        RaiseDragEvent(RawDragEventType.DragEnter, e.Root, e.Position, allowedEffects);
+                            RaiseEventAndUpdateCursor(RawDragEventType.DragLeave, _lastRoot, _lastRoot.PointToClient(e.Root.PointToScreen(e.Position)), e.InputModifiers);
+                        RaiseEventAndUpdateCursor(RawDragEventType.DragEnter, e.Root, e.Position, e.InputModifiers);
                     }
                     else
-                        RaiseDragEvent(RawDragEventType.DragOver, e.Root, e.Position, allowedEffects);
-                    return;
+                        RaiseEventAndUpdateCursor(RawDragEventType.DragOver, e.Root, e.Position, e.InputModifiers);
+                    break;
             }
         }
     }

From c6a7611150f07a21aa52e3e8364502c93ca39393 Mon Sep 17 00:00:00 2001
From: ahopper <alan@samsararesearch.com>
Date: Thu, 8 Mar 2018 14:39:29 +0000
Subject: [PATCH 396/482] render test fixed

---
 ...eableBitmapShouldBeUsable_Bgra8888.expected.png} | Bin
 ...eableBitmapShouldBeUsable_Rgba8888.expected.png} | Bin
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/TestFiles/Skia/Media/Bitmap/{WritableBitmapShouldBeUsable_Bgra8888.expected.png => WriteableBitmapShouldBeUsable_Bgra8888.expected.png} (100%)
 rename tests/TestFiles/Skia/Media/Bitmap/{WritableBitmapShouldBeUsable_Rgba8888.expected.png => WriteableBitmapShouldBeUsable_Rgba8888.expected.png} (100%)

diff --git a/tests/TestFiles/Skia/Media/Bitmap/WritableBitmapShouldBeUsable_Bgra8888.expected.png b/tests/TestFiles/Skia/Media/Bitmap/WriteableBitmapShouldBeUsable_Bgra8888.expected.png
similarity index 100%
rename from tests/TestFiles/Skia/Media/Bitmap/WritableBitmapShouldBeUsable_Bgra8888.expected.png
rename to tests/TestFiles/Skia/Media/Bitmap/WriteableBitmapShouldBeUsable_Bgra8888.expected.png
diff --git a/tests/TestFiles/Skia/Media/Bitmap/WritableBitmapShouldBeUsable_Rgba8888.expected.png b/tests/TestFiles/Skia/Media/Bitmap/WriteableBitmapShouldBeUsable_Rgba8888.expected.png
similarity index 100%
rename from tests/TestFiles/Skia/Media/Bitmap/WritableBitmapShouldBeUsable_Rgba8888.expected.png
rename to tests/TestFiles/Skia/Media/Bitmap/WriteableBitmapShouldBeUsable_Rgba8888.expected.png

From c06ac12de709f7e337e78b29b0bced3478e4c4af Mon Sep 17 00:00:00 2001
From: ahopper <alan@samsararesearch.com>
Date: Thu, 8 Mar 2018 14:56:47 +0000
Subject: [PATCH 397/482] fix d2d render tests

---
 ...eableBitmapShouldBeUsable_Bgra8888.expected.png} | Bin
 ...eableBitmapShouldBeUsable_Rgba8888.expected.png} | Bin
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/TestFiles/Direct2D1/Media/Bitmap/{WritableBitmapShouldBeUsable_Bgra8888.expected.png => WriteableBitmapShouldBeUsable_Bgra8888.expected.png} (100%)
 rename tests/TestFiles/Direct2D1/Media/Bitmap/{WritableBitmapShouldBeUsable_Rgba8888.expected.png => WriteableBitmapShouldBeUsable_Rgba8888.expected.png} (100%)

diff --git a/tests/TestFiles/Direct2D1/Media/Bitmap/WritableBitmapShouldBeUsable_Bgra8888.expected.png b/tests/TestFiles/Direct2D1/Media/Bitmap/WriteableBitmapShouldBeUsable_Bgra8888.expected.png
similarity index 100%
rename from tests/TestFiles/Direct2D1/Media/Bitmap/WritableBitmapShouldBeUsable_Bgra8888.expected.png
rename to tests/TestFiles/Direct2D1/Media/Bitmap/WriteableBitmapShouldBeUsable_Bgra8888.expected.png
diff --git a/tests/TestFiles/Direct2D1/Media/Bitmap/WritableBitmapShouldBeUsable_Rgba8888.expected.png b/tests/TestFiles/Direct2D1/Media/Bitmap/WriteableBitmapShouldBeUsable_Rgba8888.expected.png
similarity index 100%
rename from tests/TestFiles/Direct2D1/Media/Bitmap/WritableBitmapShouldBeUsable_Rgba8888.expected.png
rename to tests/TestFiles/Direct2D1/Media/Bitmap/WriteableBitmapShouldBeUsable_Rgba8888.expected.png

From ed4a85fef992f16e5c84554c2a2c8caee8c8ffcf Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@gmail.com>
Date: Fri, 9 Mar 2018 16:41:41 +0100
Subject: [PATCH 398/482] Allow Winforms + WPF compatible object drag

---
 src/Windows/Avalonia.Win32/DataObject.cs    | 51 ++++++++++++++++++++-
 src/Windows/Avalonia.Win32/OleDataObject.cs | 26 ++++++++++-
 2 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/DataObject.cs b/src/Windows/Avalonia.Win32/DataObject.cs
index 6248afd7bb..aa3ee91ef9 100644
--- a/src/Windows/Avalonia.Win32/DataObject.cs
+++ b/src/Windows/Avalonia.Win32/DataObject.cs
@@ -8,11 +8,16 @@ using Avalonia.Controls.DragDrop;
 using Avalonia.Win32.Interop;
 using IDataObject = Avalonia.Controls.DragDrop.IDataObject;
 using IOleDataObject = System.Runtime.InteropServices.ComTypes.IDataObject;
+using System.IO;
+using System.Runtime.Serialization.Formatters.Binary;
 
 namespace Avalonia.Win32
 {
     class DataObject : IDataObject, IOleDataObject
     {
+        // Compatibility with WinForms + WPF...
+        internal static readonly byte[] SerializedObjectGUID = new Guid("FD9EA796-3B13-4370-A679-56106BB288FB").ToByteArray();
+
         class FormatEnumerator : IEnumFORMATETC
         {
             private FORMATETC[] _formats;
@@ -249,7 +254,51 @@ namespace Avalonia.Win32
                 return WriteStringToHGlobal(ref hGlobal, Convert.ToString(data));
             if (dataFormat == DataFormats.FileNames && data is IEnumerable<string> files)
                 return WriteFileListToHGlobal(ref hGlobal, files);
-            return DV_E_TYMED;
+            if (data is Stream stream)
+            {
+                byte[] buffer = new byte[stream.Length - stream.Position];
+                stream.Read(buffer, 0, buffer.Length);
+                return WriteBytesToHGlobal(ref hGlobal, buffer);
+            }
+            if (data is IEnumerable<byte> bytes)
+            {
+                var byteArr = bytes is byte[] ? (byte[])bytes : bytes.ToArray();
+                return WriteBytesToHGlobal(ref hGlobal, byteArr);
+            }
+            return WriteBytesToHGlobal(ref hGlobal, SerializeObject(data));
+        }
+
+        private byte[] SerializeObject(object data)
+        {
+            using (var ms = new MemoryStream())
+            {
+                ms.Write(SerializedObjectGUID, 0, SerializedObjectGUID.Length);
+                BinaryFormatter binaryFormatter = new BinaryFormatter();
+                binaryFormatter.Serialize(ms, data);
+                return ms.ToArray();
+            }
+        }
+
+        private int WriteBytesToHGlobal(ref IntPtr hGlobal, byte[] data)
+        {
+            int required = data.Length;
+            if (hGlobal == IntPtr.Zero)
+                hGlobal = UnmanagedMethods.GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, required);
+
+            long available = UnmanagedMethods.GlobalSize(hGlobal).ToInt64();
+            if (required > available)
+                return STG_E_MEDIUMFULL;
+
+            IntPtr ptr = UnmanagedMethods.GlobalLock(hGlobal);
+            try
+            {
+                Marshal.Copy(data, 0, ptr, data.Length);
+                return unchecked((int)UnmanagedMethods.HRESULT.S_OK);
+            }
+            finally
+            {
+                UnmanagedMethods.GlobalUnlock(hGlobal);
+            }
         }
 
         private int WriteFileListToHGlobal(ref IntPtr hGlobal, IEnumerable<string> files)
diff --git a/src/Windows/Avalonia.Win32/OleDataObject.cs b/src/Windows/Avalonia.Win32/OleDataObject.cs
index fe6faa162c..60527bb7d6 100644
--- a/src/Windows/Avalonia.Win32/OleDataObject.cs
+++ b/src/Windows/Avalonia.Win32/OleDataObject.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
+using System.Runtime.Serialization.Formatters.Binary;
 using System.Text;
 using Avalonia.Controls.DragDrop;
 using Avalonia.Win32.Interop;
@@ -62,7 +64,19 @@ namespace Avalonia.Win32
                             return ReadStringFromHGlobal(medium.unionmember);
                         if (format == DataFormats.FileNames)
                             return ReadFileNamesFromHGlobal(medium.unionmember);
-                        return ReadBytesFromHGlobal(medium.unionmember);
+
+                        byte[] data = ReadBytesFromHGlobal(medium.unionmember);
+
+                        if (IsSerializedObject(data))
+                        {
+                            using (var ms = new MemoryStream(data))
+                            {
+                                ms.Position = DataObject.SerializedObjectGUID.Length;
+                                BinaryFormatter binaryFormatter = new BinaryFormatter();
+                                return binaryFormatter.Deserialize(ms);
+                            }
+                        }
+                        return data;
                     }
                 }
                 finally
@@ -73,6 +87,16 @@ namespace Avalonia.Win32
             return null;
         }
 
+        private bool IsSerializedObject(byte[] data)
+        {
+            if (data.Length < DataObject.SerializedObjectGUID.Length)
+                return false;
+            for (int i = 0; i < DataObject.SerializedObjectGUID.Length; i++)
+                if (data[i] != DataObject.SerializedObjectGUID[i])
+                    return false;
+            return true;
+        }
+
         private static IEnumerable<string> ReadFileNamesFromHGlobal(IntPtr hGlobal)
         {
             List<string> files = new List<string>();

From cfb3924c0fa645c6256b32af93a8000a3a936b92 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@gmail.com>
Date: Fri, 9 Mar 2018 16:42:06 +0100
Subject: [PATCH 399/482] Prevent setting the cursor to often.

---
 src/Avalonia.Controls/DragDrop/DragSource.cs | 33 +++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/Avalonia.Controls/DragDrop/DragSource.cs b/src/Avalonia.Controls/DragDrop/DragSource.cs
index fd3d8ef143..ceb962ad98 100644
--- a/src/Avalonia.Controls/DragDrop/DragSource.cs
+++ b/src/Avalonia.Controls/DragDrop/DragSource.cs
@@ -25,7 +25,8 @@ namespace Avalonia.Controls.DragDrop
         private IDataObject _draggedData;
         private IInputElement _lastRoot;
         private Point _lastPosition;
-        private object _lastCursor;
+        private StandardCursorType _lastCursorType;
+        private object _originalCursor;
         private InputModifiers? _initialInputModifiers;
 
         public DragSource()
@@ -81,15 +82,15 @@ namespace Avalonia.Controls.DragDrop
             return DragDropEffects.Move;
         }
 
-        private Cursor GetCursorForDropEffect(DragDropEffects effects)
+        private StandardCursorType GetCursorForDropEffect(DragDropEffects effects)
         {
             if (effects.HasFlag(DragDropEffects.Copy))
-                return new Cursor(StandardCursorType.DragCopy);
+                return StandardCursorType.DragCopy;
             if (effects.HasFlag(DragDropEffects.Move))
-                return new Cursor(StandardCursorType.DragMove);
+                return StandardCursorType.DragMove;
             if (effects.HasFlag(DragDropEffects.Link))
-                return new Cursor(StandardCursorType.DragLink);
-            return new Cursor(StandardCursorType.No);
+                return StandardCursorType.DragLink;
+            return StandardCursorType.No;
         }
         
         private void UpdateCursor(IInputElement root, DragDropEffects effect)
@@ -98,27 +99,35 @@ namespace Avalonia.Controls.DragDrop
             {
                 if (_lastRoot is InputElement ieLast)
                 {
-                    if (_lastCursor == AvaloniaProperty.UnsetValue)
+                    if (_originalCursor == AvaloniaProperty.UnsetValue)
                         ieLast.ClearValue(InputElement.CursorProperty);
                     else
-                        ieLast.Cursor = _lastCursor as Cursor;
+                        ieLast.Cursor = _originalCursor as Cursor;
                 }
 
                 if (root is InputElement ieNew)
                 {
                     if (!ieNew.IsSet(InputElement.CursorProperty))
-                        _lastCursor = AvaloniaProperty.UnsetValue;
+                        _originalCursor = AvaloniaProperty.UnsetValue;
                     else
-                        _lastCursor = root.Cursor;
+                        _originalCursor = root.Cursor;
                 }
                 else
-                    _lastCursor = null;
+                    _originalCursor = null;
 
+                _lastCursorType = StandardCursorType.Arrow;
                 _lastRoot = root;
             }
 
             if (root is InputElement ie)
-                ie.Cursor = GetCursorForDropEffect(effect);
+            {
+                var ct = GetCursorForDropEffect(effect);
+                if (ct != _lastCursorType)
+                {
+                    _lastCursorType = ct;
+                    ie.Cursor = new Cursor(ct);
+                }
+            }  
         }
 
         private void CancelDragging()

From c2cecbb85a8436abd7a78f7a846178bb60ae258b Mon Sep 17 00:00:00 2001
From: dzhelnin <mitya_zh@mail.ru>
Date: Fri, 9 Mar 2018 19:28:46 +0300
Subject: [PATCH 400/482] ButtonSpinner control is ported from
 ExtendedWFPToolkit

---
 samples/ControlCatalog/ControlCatalog.csproj  |   6 +
 samples/ControlCatalog/MainView.xaml          |   1 +
 .../Pages/ButtonSpinnerPage.xaml              |  19 ++
 .../Pages/ButtonSpinnerPage.xaml.cs           |  54 ++++
 src/Avalonia.Controls/ButtonSpinner.cs        | 235 ++++++++++++++++++
 src/Avalonia.Controls/Spinner.cs              | 174 +++++++++++++
 .../ButtonSpinner.xaml                        |  54 ++++
 src/Avalonia.Themes.Default/DefaultTheme.xaml |   1 +
 8 files changed, 544 insertions(+)
 create mode 100644 samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml
 create mode 100644 samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml.cs
 create mode 100644 src/Avalonia.Controls/ButtonSpinner.cs
 create mode 100644 src/Avalonia.Controls/Spinner.cs
 create mode 100644 src/Avalonia.Themes.Default/ButtonSpinner.xaml

diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 37f9da0c43..a3d7a0cdce 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -35,6 +35,9 @@
     <EmbeddedResource Include="DecoratedWindow.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Pages\ButtonSpinnerPage.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Pages\DialogsPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -164,6 +167,9 @@
     <Compile Include="Pages\ToolTipPage.xaml.cs">
       <DependentUpon>ToolTipPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\ButtonSpinnerPage.xaml.cs">
+      <DependentUpon>ButtonSpinnerPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\ScreenPage.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 060369e404..142d0d42b1 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -7,6 +7,7 @@
     </TabControl.Transition>
     <TabItem Header="Border"><pages:BorderPage/></TabItem>
     <TabItem Header="Button"><pages:ButtonPage/></TabItem>
+    <TabItem Header="ButtonSpinner"><pages:ButtonSpinnerPage/></TabItem>
     <TabItem Header="Calendar"><pages:CalendarPage/></TabItem> 
     <TabItem Header="Canvas"><pages:CanvasPage/></TabItem>
     <TabItem Header="Carousel"><pages:CarouselPage/></TabItem>
diff --git a/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml
new file mode 100644
index 0000000000..760760e3f4
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml
@@ -0,0 +1,19 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+  <StackPanel Orientation="Vertical" Gap="4">
+    <TextBlock Classes="h1">ButtonSpinner</TextBlock>
+    <TextBlock Classes="h2">The ButtonSpinner control allows you to add button spinners to any element and then respond to the Spin event to manipulate that element.</TextBlock>
+
+    <StackPanel Orientation="Vertical" Gap="8" Width="200" Margin="0,20,0,0">
+      <CheckBox Name="allowSpinCheck" IsChecked="True">AllowSpin</CheckBox>
+      <CheckBox Name="showSpinCheck" IsChecked="True">ShowButtonSpinner</CheckBox>
+      <ButtonSpinner Name="spinner" Spin="OnSpin" Height="30"
+                     AllowSpin="{Binding #allowSpinCheck.IsChecked}"
+                     ShowButtonSpinner="{Binding #showSpinCheck.IsChecked}">
+        <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="Everest"/>
+      </ButtonSpinner>
+    </StackPanel>
+  </StackPanel>
+
+</UserControl>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml.cs b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml.cs
new file mode 100644
index 0000000000..1f753ab3ea
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml.cs
@@ -0,0 +1,54 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public class ButtonSpinnerPage : UserControl
+    {
+        public ButtonSpinnerPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        private void OnSpin(object sender, SpinEventArgs e)
+        {
+            var spinner = (ButtonSpinner)sender;
+            var txtBox = (TextBlock)spinner.Content;
+
+            int value = Array.IndexOf(_mountains, txtBox.Text);
+            if (e.Direction == SpinDirection.Increase)
+                value++;
+            else
+                value--;
+
+            if (value < 0)
+                value = _mountains.Length - 1;
+            else if (value >= _mountains.Length)
+                value = 0;
+
+            txtBox.Text = _mountains[value];
+        }
+
+        private readonly string[] _mountains = new[]
+        {
+            "Everest",
+            "K2 (Mount Godwin Austen)",
+            "Kangchenjunga",
+            "Lhotse",
+            "Makalu",
+            "Cho Oyu",
+            "Dhaulagiri",
+            "Manaslu",
+            "Nanga Parbat",
+            "Annapurna"
+        };
+    }
+}
diff --git a/src/Avalonia.Controls/ButtonSpinner.cs b/src/Avalonia.Controls/ButtonSpinner.cs
new file mode 100644
index 0000000000..c7b31a8c6c
--- /dev/null
+++ b/src/Avalonia.Controls/ButtonSpinner.cs
@@ -0,0 +1,235 @@
+using System;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Represents a spinner control that includes two Buttons.
+    /// </summary>
+    public class ButtonSpinner : Spinner
+    {
+        /// <summary>
+        /// Defines the <see cref="AllowSpin"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> AllowSpinProperty =
+            AvaloniaProperty.Register<ButtonSpinner, bool>(nameof(AllowSpin), true);
+
+        /// <summary>
+        /// Defines the <see cref="ShowButtonSpinner"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> ShowButtonSpinnerProperty =
+            AvaloniaProperty.Register<ButtonSpinner, bool>(nameof(ShowButtonSpinner), true);
+
+        private Button _decreaseButton;
+        /// <summary>
+        /// Gets or sets the DecreaseButton template part.
+        /// </summary>
+        private Button DecreaseButton
+        {
+            get { return _decreaseButton; }
+            set
+            {
+                if (_decreaseButton != null)
+                {
+                    _decreaseButton.Click  -= OnButtonClick;
+                }
+                _decreaseButton = value;
+                if (_decreaseButton != null)
+                {
+                    _decreaseButton.Click += OnButtonClick;
+                }
+            }
+        }
+
+        private Button _increaseButton;
+        /// <summary>
+        /// Gets or sets the IncreaseButton template part.
+        /// </summary>
+        private Button IncreaseButton
+        {
+            get
+            {
+                return _increaseButton;
+            }
+            set
+            {
+                if (_increaseButton != null)
+                {
+                    _increaseButton.Click -= OnButtonClick;
+                }
+                _increaseButton = value;
+                if (_increaseButton != null)
+                {
+                    _increaseButton.Click += OnButtonClick;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Initializes static members of the <see cref="ButtonSpinner"/> class.
+        /// </summary>
+        static ButtonSpinner()
+        {
+            AllowSpinProperty.Changed.Subscribe(AllowSpinChanged);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the <see cref="ButtonSpinner"/> should allow to spin.
+        /// </summary>
+        public bool AllowSpin
+        {
+            get { return GetValue(AllowSpinProperty); }
+            set { SetValue(AllowSpinProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the spin buttons should be shown.
+        /// </summary>
+        public bool ShowButtonSpinner
+        {
+            get { return GetValue(ShowButtonSpinnerProperty); }
+            set { SetValue(ShowButtonSpinnerProperty, value); }
+        }
+
+        /// <inheritdoc />
+        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        {
+            IncreaseButton = e.NameScope.Find<Button>("PART_IncreaseButton");
+            DecreaseButton = e.NameScope.Find<Button>("PART_DecreaseButton");
+            SetButtonUsage();
+        }
+
+        /// <inheritdoc />
+        protected override void OnPointerReleased(PointerReleasedEventArgs e)
+        {
+            base.OnPointerReleased(e);
+            Point mousePosition;
+            if (IncreaseButton != null && IncreaseButton.IsEnabled == false)
+            {
+                mousePosition = e.GetPosition(IncreaseButton);
+                if (mousePosition.X > 0 && mousePosition.X < IncreaseButton.Width &&
+                    mousePosition.Y > 0 && mousePosition.Y < IncreaseButton.Height)
+                {
+                    e.Handled = true;
+                }
+            }
+
+            if (DecreaseButton != null && DecreaseButton.IsEnabled == false)
+            {
+                mousePosition = e.GetPosition(DecreaseButton);
+                if (mousePosition.X > 0 && mousePosition.X < DecreaseButton.Width &&
+                    mousePosition.Y > 0 && mousePosition.Y < DecreaseButton.Height)
+                {
+                    e.Handled = true;
+                }
+            }
+        }
+
+        /// <inheritdoc />
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            switch (e.Key)
+            {
+                case Key.Up:
+                {
+                    if (AllowSpin)
+                    {
+                        OnSpin(new SpinEventArgs(SpinEvent, SpinDirection.Increase));
+                        e.Handled = true;
+                    }
+                    break;
+                }
+                case Key.Down:
+                {
+                    if (AllowSpin)
+                    {
+                        OnSpin(new SpinEventArgs(SpinEvent, SpinDirection.Decrease));
+                        e.Handled = true;
+                    }
+                    break;
+                }
+                case Key.Enter:
+                {
+                    //Do not Spin on enter Key when spinners have focus
+                    if (((IncreaseButton != null) && (IncreaseButton.IsFocused))
+                        || ((DecreaseButton != null) && DecreaseButton.IsFocused))
+                    {
+                        e.Handled = true;
+                    }
+                    break;
+                }
+            }
+        }
+
+        /// <inheritdoc />
+        protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
+        {
+            base.OnPointerWheelChanged(e);
+            if (!e.Handled && AllowSpin)
+            {
+                if (e.Delta.Y != 0)
+                {
+                    var spinnerEventArgs = new SpinEventArgs(SpinEvent, (e.Delta.Y < 0) ? SpinDirection.Decrease : SpinDirection.Increase, true);
+                    OnSpin(spinnerEventArgs);
+                    e.Handled = spinnerEventArgs.Handled;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="AllowSpin"/> property value changed.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnAllowSpinChanged(bool oldValue, bool newValue)
+        {
+            SetButtonUsage();
+        }
+
+        /// <summary>
+        /// Called when the <see cref="AllowSpin"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void AllowSpinChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is ButtonSpinner spinner)
+            {
+                var oldValue = (bool)e.OldValue;
+                var newValue = (bool)e.NewValue;
+                spinner.OnAllowSpinChanged(oldValue, newValue);
+            }
+        }
+        
+        /// <summary>
+        /// Disables or enables the buttons based on the valid spin direction.
+        /// </summary>
+        private void SetButtonUsage()
+        {
+            if (IncreaseButton != null)
+            {
+                IncreaseButton.IsEnabled = AllowSpin && ((ValidSpinDirection & ValidSpinDirections.Increase) == ValidSpinDirections.Increase);
+            }
+
+            if (DecreaseButton != null)
+            {
+                DecreaseButton.IsEnabled = AllowSpin && ((ValidSpinDirection & ValidSpinDirections.Decrease) == ValidSpinDirections.Decrease);
+            }
+        }
+
+        /// <summary>
+        /// Called when user clicks one of the spin buttons.
+        /// </summary>
+        /// <param name="sender">The event sender.</param>
+        /// <param name="e">The event args.</param>
+        private void OnButtonClick(object sender, RoutedEventArgs e)
+        {
+            if (AllowSpin)
+            {
+                var direction = sender == IncreaseButton ? SpinDirection.Increase : SpinDirection.Decrease;
+                OnSpin(new SpinEventArgs(SpinEvent, direction));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/Spinner.cs b/src/Avalonia.Controls/Spinner.cs
new file mode 100644
index 0000000000..e00ff3823c
--- /dev/null
+++ b/src/Avalonia.Controls/Spinner.cs
@@ -0,0 +1,174 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Interactivity;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Represents spin directions that are valid.
+    /// </summary>
+    [Flags]
+    public enum ValidSpinDirections
+    {
+        /// <summary>
+        /// Can not increase nor decrease.
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// Can increase.
+        /// </summary>
+        Increase = 1,
+
+        /// <summary>
+        /// Can decrease.
+        /// </summary>
+        Decrease = 2
+    }
+
+    /// <summary>
+    /// Represents spin directions that could be initiated by the end-user.
+    /// </summary>
+    public enum SpinDirection
+    {
+        /// <summary>
+        /// Represents a spin initiated by the end-user in order to Increase a value.
+        /// </summary>
+        Increase = 0,
+
+        /// <summary>
+        /// Represents a spin initiated by the end-user in order to Decrease a value.
+        /// </summary>
+        Decrease = 1
+    }
+
+    /// <summary>
+    /// Provides data for the Spinner.Spin event.
+    /// </summary>
+    public class SpinEventArgs : RoutedEventArgs
+    {
+        /// <summary>
+        /// Gets the SpinDirection for the spin that has been initiated by the end-user.
+        /// </summary>
+        public SpinDirection Direction { get; }
+
+        /// <summary>
+        /// Get or set whheter the spin event originated from a mouse wheel event.
+        /// </summary>
+        public bool UsingMouseWheel{ get; }
+
+        /// <summary>
+        /// Initializes a new instance of the SpinEventArgs class.
+        /// </summary>
+        /// <param name="direction">Spin direction.</param>
+        public SpinEventArgs(SpinDirection direction)
+        {
+            Direction = direction;
+        }
+
+        public SpinEventArgs(RoutedEvent routedEvent, SpinDirection direction)
+            : base(routedEvent)
+        {
+            Direction = direction;
+        }
+
+        public SpinEventArgs(SpinDirection direction, bool usingMouseWheel)
+        {
+            Direction = direction;
+            UsingMouseWheel = usingMouseWheel;
+        }
+
+        public SpinEventArgs(RoutedEvent routedEvent, SpinDirection direction, bool usingMouseWheel)
+            : base(routedEvent)
+        {
+            Direction = direction;
+            UsingMouseWheel = usingMouseWheel;
+        }
+    }
+
+    /// <summary>
+    /// Base class for controls that represents controls that can spin.
+    /// </summary>
+    public abstract class Spinner : ContentControl
+    {
+        /// <summary>
+        /// Defines the <see cref="ValidSpinDirection"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ValidSpinDirections> ValidSpinDirectionProperty =
+            AvaloniaProperty.Register<Spinner, ValidSpinDirections>(nameof(ValidSpinDirection),
+                ValidSpinDirections.Increase | ValidSpinDirections.Decrease);
+
+        /// <summary>
+        /// Defines the <see cref="Spin"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<SpinEventArgs> SpinEvent =
+            RoutedEvent.Register<Spinner, SpinEventArgs>(nameof(Spin), RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Initializes static members of the <see cref="Spinner"/> class.
+        /// </summary>
+        static Spinner()
+        {
+            ValidSpinDirectionProperty.Changed.Subscribe(OnValidSpinDirectionPropertyChanged);
+        }
+
+        /// <summary>
+        /// Occurs when spinning is initiated by the end-user.
+        /// </summary>
+        public event EventHandler<SpinEventArgs> Spin
+        {
+            add { AddHandler(SpinEvent, value); }
+            remove { RemoveHandler(SpinEvent, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets <see cref="ValidSpinDirections"/> allowed for this control.
+        /// </summary>
+        public ValidSpinDirections ValidSpinDirection
+        {
+            get { return GetValue(ValidSpinDirectionProperty); }
+            set { SetValue(ValidSpinDirectionProperty, value); }
+        }
+
+        /// <summary>
+        /// Called when valid spin direction changed.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnValidSpinDirectionChanged(ValidSpinDirections oldValue, ValidSpinDirections newValue)
+        {
+        }
+
+        /// <summary>
+        /// Raises the OnSpin event when spinning is initiated by the end-user.
+        /// </summary>
+        /// <param name="e">Spin event args.</param>
+        protected virtual void OnSpin(SpinEventArgs e)
+        {
+            var valid = e.Direction == SpinDirection.Increase
+                ? ValidSpinDirections.Increase
+                : ValidSpinDirections.Decrease;
+
+            //Only raise the event if spin is allowed.
+            if ((ValidSpinDirection & valid) == valid)
+            {
+                RaiseEvent(e);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="ValidSpinDirection"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void OnValidSpinDirectionPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is Spinner spinner)
+            {
+                var oldValue = (ValidSpinDirections)e.OldValue;
+                var newValue = (ValidSpinDirections)e.NewValue;
+                spinner.OnValidSpinDirectionChanged(oldValue, newValue);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Themes.Default/ButtonSpinner.xaml b/src/Avalonia.Themes.Default/ButtonSpinner.xaml
new file mode 100644
index 0000000000..2ed6ea49b1
--- /dev/null
+++ b/src/Avalonia.Themes.Default/ButtonSpinner.xaml
@@ -0,0 +1,54 @@
+<Styles xmlns="https://github.com/avaloniaui">
+  <Style Selector="ButtonSpinner">
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLightBrush}"/>
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
+    <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+    <Setter Property="VerticalContentAlignment" Value="Center"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                Margin="{TemplateBinding Padding}"
+                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+          <Grid ColumnDefinitions="*,Auto">
+            <ContentPresenter Name="PART_ContentPresenter" Grid.Column="0"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"/>
+            <Grid Grid.Column="1" RowDefinitions="*,*" IsVisible="{TemplateBinding ShowButtonSpinner}">
+              <Grid.Styles>
+                <Style Selector="RepeatButton">
+                  <Setter Property="RepeatButton.Background" Value="Transparent"/>
+                  <Setter Property="RepeatButton.BorderBrush" Value="Transparent"/>
+                </Style>
+                <Style Selector="RepeatButton:pointerover">
+                  <Setter Property="RepeatButton.Background" Value="{DynamicResource ThemeControlMidBrush}"/>
+                  <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
+                </Style>
+              </Grid.Styles>
+              <RepeatButton Grid.Row="0" Name="PART_IncreaseButton">
+                <Path Fill="{DynamicResource ThemeForegroundBrush}"
+                      Width="8"
+                      Height="4"
+                      Stretch="Uniform"
+                      HorizontalAlignment="Center"
+                      VerticalAlignment="Center"
+                      Data="M0,5 L4.5,.5 9,5 6,5 4.5,3.5 3,5 z"/>
+              </RepeatButton>
+              <RepeatButton Grid.Row="1" Name="PART_DecreaseButton">
+                <Path Fill="{DynamicResource ThemeForegroundBrush}"
+                      Width="8"
+                      Height="4"
+                      Stretch="Uniform"
+                      HorizontalAlignment="Center"
+                      VerticalAlignment="Center"
+                      Data="M0,0 L3,0 4.5,1.5 6,0 9,0 4.5,4.5 z"/>
+              </RepeatButton>
+            </Grid>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+</Styles>
\ No newline at end of file
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
index 5b6f4b78fd..7c567c1835 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml
@@ -42,4 +42,5 @@
   <StyleInclude Source="resm:Avalonia.Themes.Default.CalendarItem.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.Calendar.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.DatePicker.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.ButtonSpinner.xaml?assembly=Avalonia.Themes.Default"/>
 </Styles>

From 93cbec56af131ad2020b91e653a96abb7e144bcf Mon Sep 17 00:00:00 2001
From: dzhelnin <mitya_zh@mail.ru>
Date: Sat, 10 Mar 2018 21:13:47 +0300
Subject: [PATCH 401/482] Ability to place spinner buttons on the left side

---
 .../Pages/ButtonSpinnerPage.xaml              |  7 +-
 src/Avalonia.Controls/ButtonSpinner.cs        | 23 +++++
 .../ButtonSpinner.xaml                        | 88 +++++++++++++------
 3 files changed, 89 insertions(+), 29 deletions(-)

diff --git a/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml
index 760760e3f4..1797fb48bc 100644
--- a/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml
+++ b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml
@@ -8,7 +8,12 @@
     <StackPanel Orientation="Vertical" Gap="8" Width="200" Margin="0,20,0,0">
       <CheckBox Name="allowSpinCheck" IsChecked="True">AllowSpin</CheckBox>
       <CheckBox Name="showSpinCheck" IsChecked="True">ShowButtonSpinner</CheckBox>
-      <ButtonSpinner Name="spinner" Spin="OnSpin" Height="30"
+      <ButtonSpinner Spin="OnSpin" Height="30"
+                     AllowSpin="{Binding #allowSpinCheck.IsChecked}"
+                     ShowButtonSpinner="{Binding #showSpinCheck.IsChecked}">
+        <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="Everest"/>
+      </ButtonSpinner>
+      <ButtonSpinner Spin="OnSpin" Height="30" ButtonSpinnerLocation="Left"
                      AllowSpin="{Binding #allowSpinCheck.IsChecked}"
                      ShowButtonSpinner="{Binding #showSpinCheck.IsChecked}">
         <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="Everest"/>
diff --git a/src/Avalonia.Controls/ButtonSpinner.cs b/src/Avalonia.Controls/ButtonSpinner.cs
index c7b31a8c6c..3ce81e0b12 100644
--- a/src/Avalonia.Controls/ButtonSpinner.cs
+++ b/src/Avalonia.Controls/ButtonSpinner.cs
@@ -5,6 +5,12 @@ using Avalonia.Interactivity;
 
 namespace Avalonia.Controls
 {
+    public enum Location
+    {
+        Left,
+        Right
+    }
+
     /// <summary>
     /// Represents a spinner control that includes two Buttons.
     /// </summary>
@@ -22,6 +28,12 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<bool> ShowButtonSpinnerProperty =
             AvaloniaProperty.Register<ButtonSpinner, bool>(nameof(ShowButtonSpinner), true);
 
+        /// <summary>
+        /// Defines the <see cref="ButtonSpinnerLocation"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Location> ButtonSpinnerLocationProperty =
+            AvaloniaProperty.Register<ButtonSpinner, Location>(nameof(ButtonSpinnerLocation), Location.Right);
+
         private Button _decreaseButton;
         /// <summary>
         /// Gets or sets the DecreaseButton template part.
@@ -73,6 +85,8 @@ namespace Avalonia.Controls
         static ButtonSpinner()
         {
             AllowSpinProperty.Changed.Subscribe(AllowSpinChanged);
+            PseudoClass(ButtonSpinnerLocationProperty, location => location == Location.Left, ":left");
+            PseudoClass(ButtonSpinnerLocationProperty, location => location == Location.Right, ":right");
         }
 
         /// <summary>
@@ -93,6 +107,15 @@ namespace Avalonia.Controls
             set { SetValue(ShowButtonSpinnerProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets current location of the <see cref="ButtonSpinner"/>.
+        /// </summary>
+        public Location ButtonSpinnerLocation
+        {
+            get { return GetValue(ButtonSpinnerLocationProperty); }
+            set { SetValue(ButtonSpinnerLocationProperty, value); }
+        }
+
         /// <inheritdoc />
         protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
         {
diff --git a/src/Avalonia.Themes.Default/ButtonSpinner.xaml b/src/Avalonia.Themes.Default/ButtonSpinner.xaml
index 2ed6ea49b1..a08f5b5e9b 100644
--- a/src/Avalonia.Themes.Default/ButtonSpinner.xaml
+++ b/src/Avalonia.Themes.Default/ButtonSpinner.xaml
@@ -4,6 +4,42 @@
     <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
     <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
     <Setter Property="VerticalContentAlignment" Value="Center"/>
+  </Style>
+  <Style Selector="ButtonSpinner /template/ RepeatButton">
+    <Setter Property="RepeatButton.Background" Value="Transparent"/>
+    <Setter Property="RepeatButton.BorderBrush" Value="Transparent"/>
+  </Style>
+  <Style Selector="ButtonSpinner /template/ RepeatButton:pointerover">
+    <Setter Property="RepeatButton.Background" Value="{DynamicResource ThemeControlMidBrush}"/>
+    <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
+  </Style>
+  <Style Selector="ButtonSpinner /template/ RepeatButton#PART_IncreaseButton">
+    <Setter Property="Content">
+      <Template>
+        <Path Fill="{DynamicResource ThemeForegroundBrush}"
+              Width="8"
+              Height="4"
+              Stretch="Uniform"
+              HorizontalAlignment="Center"
+              VerticalAlignment="Center"
+              Data="M0,5 L4.5,.5 9,5 6,5 4.5,3.5 3,5 z"/>
+      </Template>
+    </Setter>
+  </Style>
+  <Style Selector="ButtonSpinner /template/ RepeatButton#PART_DecreaseButton">
+    <Setter Property="Content">
+      <Template>
+        <Path Fill="{DynamicResource ThemeForegroundBrush}"
+              Width="8"
+              Height="4"
+              Stretch="Uniform"
+              HorizontalAlignment="Center"
+              VerticalAlignment="Center"
+              Data="M0,0 L3,0 4.5,1.5 6,0 9,0 4.5,4.5 z"/>
+      </Template>
+    </Setter>
+  </Style>
+  <Style Selector="ButtonSpinner:right">
     <Setter Property="Template">
       <ControlTemplate>
         <Border Background="{TemplateBinding Background}"
@@ -17,38 +53,34 @@
                               ContentTemplate="{TemplateBinding ContentTemplate}"
                               Content="{TemplateBinding Content}"/>
             <Grid Grid.Column="1" RowDefinitions="*,*" IsVisible="{TemplateBinding ShowButtonSpinner}">
-              <Grid.Styles>
-                <Style Selector="RepeatButton">
-                  <Setter Property="RepeatButton.Background" Value="Transparent"/>
-                  <Setter Property="RepeatButton.BorderBrush" Value="Transparent"/>
-                </Style>
-                <Style Selector="RepeatButton:pointerover">
-                  <Setter Property="RepeatButton.Background" Value="{DynamicResource ThemeControlMidBrush}"/>
-                  <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-                </Style>
-              </Grid.Styles>
-              <RepeatButton Grid.Row="0" Name="PART_IncreaseButton">
-                <Path Fill="{DynamicResource ThemeForegroundBrush}"
-                      Width="8"
-                      Height="4"
-                      Stretch="Uniform"
-                      HorizontalAlignment="Center"
-                      VerticalAlignment="Center"
-                      Data="M0,5 L4.5,.5 9,5 6,5 4.5,3.5 3,5 z"/>
-              </RepeatButton>
-              <RepeatButton Grid.Row="1" Name="PART_DecreaseButton">
-                <Path Fill="{DynamicResource ThemeForegroundBrush}"
-                      Width="8"
-                      Height="4"
-                      Stretch="Uniform"
-                      HorizontalAlignment="Center"
-                      VerticalAlignment="Center"
-                      Data="M0,0 L3,0 4.5,1.5 6,0 9,0 4.5,4.5 z"/>
-              </RepeatButton>
+              <RepeatButton Grid.Row="0" Name="PART_IncreaseButton"/>
+              <RepeatButton Grid.Row="1" Name="PART_DecreaseButton"/>
             </Grid>
           </Grid>
         </Border>
       </ControlTemplate>
     </Setter>
   </Style>
+  <Style Selector="ButtonSpinner:left">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                Margin="{TemplateBinding Padding}"
+                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+          <Grid ColumnDefinitions="Auto,*">
+            <Grid Grid.Column="0" RowDefinitions="*,*" IsVisible="{TemplateBinding ShowButtonSpinner}">
+              <RepeatButton Grid.Row="0" Name="PART_IncreaseButton"/>
+              <RepeatButton Grid.Row="1" Name="PART_DecreaseButton"/>
+            </Grid>
+            <ContentPresenter Name="PART_ContentPresenter" Grid.Column="1"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"/>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
 </Styles>
\ No newline at end of file

From c7fd7183bd13ab9aca6533909273a4ae2ac85c5b Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@googlemail.com>
Date: Sun, 11 Mar 2018 09:56:52 +0100
Subject: [PATCH 402/482] basic dragging support for OSX

---
 src/OSX/Avalonia.MonoMac/DragSource.cs      | 81 +++++++++++++++++++++
 src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs |  3 +-
 2 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 src/OSX/Avalonia.MonoMac/DragSource.cs

diff --git a/src/OSX/Avalonia.MonoMac/DragSource.cs b/src/OSX/Avalonia.MonoMac/DragSource.cs
new file mode 100644
index 0000000000..ea1739e33a
--- /dev/null
+++ b/src/OSX/Avalonia.MonoMac/DragSource.cs
@@ -0,0 +1,81 @@
+using System.Data;
+using System.Linq.Expressions;
+using System.Reactive.Linq;
+using System.Reactive.Subjects;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.DragDrop;
+using Avalonia.Controls.Platform;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using MonoMac.AppKit;
+using MonoMac.CoreGraphics;
+using MonoMac.Foundation;
+using MonoMac.OpenGL;
+
+namespace Avalonia.MonoMac
+{
+    public class DragSource : NSDraggingSource, IPlatformDragSource
+    {
+        class DS : NSDraggingSource
+        {
+            private readonly DragDropEffects _allowedEffects;
+            public ReplaySubject<DragDropEffects> Result { get; } = new ReplaySubject<DragDropEffects>();
+
+            public DS(DragDropEffects allowedEffects)
+            {
+                _allowedEffects = allowedEffects;
+            }
+            
+            public override bool IgnoreModifierKeysWhileDragging => false;
+            
+            public override NSDragOperation DraggingSourceOperationMaskForLocal(bool flag)
+            {
+                return DraggingInfo.ConvertDragOperation(_allowedEffects);
+            }
+            
+            public override void DraggedImageEndedAtOperation(NSImage image, CGPoint screenPoint, NSDragOperation operation)
+            {
+                Result.OnNext(DraggingInfo.ConvertDragOperation(operation));
+                Result.OnCompleted();
+            }
+        }
+
+        
+        
+        private readonly IInputManager _inputManager;
+        
+
+        public DragSource()
+        {
+            _inputManager = AvaloniaLocator.Current.GetService<IInputManager>();
+        }
+
+        private NSDraggingItem[] ConvertDraggedItems(IDataObject data)
+        {
+            NSString s = new NSString("FOOBAR");
+            NSPasteboardWriting w = new NSPasteboardWriting(s.Handle);
+            var text = new NSDraggingItem(w);
+            return new[] {text};
+        }
+        
+        
+        public async Task<DragDropEffects> DoDragDrop(IDataObject data, DragDropEffects allowedEffects)
+        {
+            // We need the TopLevelImpl + a mouse location so we just wait for the next event.
+            var mouseEv = await _inputManager.PreProcess.OfType<RawMouseEventArgs>().FirstAsync();
+            var view = ((mouseEv.Root as TopLevel)?.PlatformImpl as TopLevelImpl)?.View;
+            if (view == null)
+                return DragDropEffects.None;
+
+            // Prepare the source event:
+            var pt = view.TranslateLocalPoint(mouseEv.Position).ToMonoMacPoint();    
+            var ev = NSEvent.MouseEvent(NSEventType.LeftMouseDown, pt, 0, 0, 0, null, 0, 0, 0);
+
+            var ds = new DS(allowedEffects);
+            view.BeginDraggingSession(ConvertDraggedItems(data) ,ev, ds);
+
+            return await ds.Result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs b/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs
index 5907459459..3db02de209 100644
--- a/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs
+++ b/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs
@@ -35,7 +35,8 @@ namespace Avalonia.MonoMac
                 .Bind<ISystemDialogImpl>().ToSingleton<SystemDialogsImpl>()
                 .Bind<IClipboard>().ToSingleton<ClipboardImpl>()
                 .Bind<IRenderLoop>().ToConstant(s_renderLoop)
-                .Bind<IPlatformThreadingInterface>().ToConstant(PlatformThreadingInterface.Instance);
+                .Bind<IPlatformThreadingInterface>().ToConstant(PlatformThreadingInterface.Instance)
+                .Bind<IPlatformDragSource>().ToTransient<DragSource>();
         }
 
         public static void Initialize()

From 1afb52b27d08ac10412f4945b09196f4a399c25a Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@googlemail.com>
Date: Sun, 11 Mar 2018 16:18:39 +0100
Subject: [PATCH 403/482] OSX drag cleanup

---
 src/OSX/Avalonia.MonoMac/DragSource.cs | 96 ++++++++++++++++----------
 1 file changed, 61 insertions(+), 35 deletions(-)

diff --git a/src/OSX/Avalonia.MonoMac/DragSource.cs b/src/OSX/Avalonia.MonoMac/DragSource.cs
index ea1739e33a..77bbee86f1 100644
--- a/src/OSX/Avalonia.MonoMac/DragSource.cs
+++ b/src/OSX/Avalonia.MonoMac/DragSource.cs
@@ -1,13 +1,19 @@
-using System.Data;
+using System;
+using System.Data;
+using System.IO;
+using System.Linq;
 using System.Linq.Expressions;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
+using System.Runtime.InteropServices;
+using System.Runtime.Serialization.Formatters.Binary;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.DragDrop;
 using Avalonia.Controls.Platform;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
+using MonoMac;
 using MonoMac.AppKit;
 using MonoMac.CoreGraphics;
 using MonoMac.Foundation;
@@ -17,46 +23,54 @@ namespace Avalonia.MonoMac
 {
     public class DragSource : NSDraggingSource, IPlatformDragSource
     {
-        class DS : NSDraggingSource
-        {
-            private readonly DragDropEffects _allowedEffects;
-            public ReplaySubject<DragDropEffects> Result { get; } = new ReplaySubject<DragDropEffects>();
-
-            public DS(DragDropEffects allowedEffects)
-            {
-                _allowedEffects = allowedEffects;
-            }
-            
-            public override bool IgnoreModifierKeysWhileDragging => false;
-            
-            public override NSDragOperation DraggingSourceOperationMaskForLocal(bool flag)
-            {
-                return DraggingInfo.ConvertDragOperation(_allowedEffects);
-            }
-            
-            public override void DraggedImageEndedAtOperation(NSImage image, CGPoint screenPoint, NSDragOperation operation)
-            {
-                Result.OnNext(DraggingInfo.ConvertDragOperation(operation));
-                Result.OnCompleted();
-            }
-        }
-
-        
+        private const string NSPasteboardTypeString = "public.utf8-plain-text";
         
+        private readonly Subject<DragDropEffects> _result = new Subject<DragDropEffects>();
         private readonly IInputManager _inputManager;
+        private DragDropEffects _allowedEffects;
         
-
+        public override bool IgnoreModifierKeysWhileDragging => false;
+      
         public DragSource()
         {
             _inputManager = AvaloniaLocator.Current.GetService<IInputManager>();
         }
 
-        private NSDraggingItem[] ConvertDraggedItems(IDataObject data)
+        private string DataFormatToUTI(string s)
+        {
+            if (s == DataFormats.FileNames)
+                throw new NotImplementedException();
+            if (s == DataFormats.Text)
+                return NSPasteboardTypeString;
+            return s;
+        }
+        
+        private NSDraggingItem CreateDraggingItem(string format, object data)
         {
-            NSString s = new NSString("FOOBAR");
-            NSPasteboardWriting w = new NSPasteboardWriting(s.Handle);
-            var text = new NSDraggingItem(w);
-            return new[] {text};
+            
+            var pasteboardItem = new NSPasteboardItem();
+            NSData nsData;
+            if(data is string s)
+                nsData = NSData.FromString(s);
+            else if (data is Stream strm)
+                nsData = NSData.FromStream(strm);
+            else if (data is byte[] bytes)
+                nsData = NSData.FromArray(bytes);
+            else
+            {
+                BinaryFormatter bf = new BinaryFormatter();
+                using (var ms = new MemoryStream())
+                {
+                    bf.Serialize(ms, data);
+                    ms.Position = 0;
+                    nsData = NSData.FromStream(ms);
+                }
+            }
+            pasteboardItem.SetDataForType(nsData, DataFormatToUTI(format));
+
+            NSPasteboardWriting writing = new NSPasteboardWriting(pasteboardItem.Handle);
+  
+            return new NSDraggingItem(writing);
         }
         
         
@@ -72,10 +86,22 @@ namespace Avalonia.MonoMac
             var pt = view.TranslateLocalPoint(mouseEv.Position).ToMonoMacPoint();    
             var ev = NSEvent.MouseEvent(NSEventType.LeftMouseDown, pt, 0, 0, 0, null, 0, 0, 0);
 
-            var ds = new DS(allowedEffects);
-            view.BeginDraggingSession(ConvertDraggedItems(data) ,ev, ds);
+            _allowedEffects = allowedEffects;
+            var items = data.GetDataFormats().Select(fmt => CreateDraggingItem(fmt, data.Get(fmt))).ToArray();
+            view.BeginDraggingSession(items ,ev, this);
 
-            return await ds.Result;
+            return await _result;
+        }
+        
+        public override NSDragOperation DraggingSourceOperationMaskForLocal(bool flag)
+        {
+            return DraggingInfo.ConvertDragOperation(_allowedEffects);
+        }
+            
+        public override void DraggedImageEndedAtOperation(NSImage image, CGPoint screenPoint, NSDragOperation operation)
+        {
+            _result.OnNext(DraggingInfo.ConvertDragOperation(operation));
+            _result.OnCompleted();
         }
     }
 }
\ No newline at end of file

From 772ce18ca487d4949ef9bd0e80c2e25b7dab47b3 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@googlemail.com>
Date: Sun, 11 Mar 2018 18:23:41 +0100
Subject: [PATCH 404/482] drag file urls to finder.

---
 src/OSX/Avalonia.MonoMac/DragSource.cs | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/OSX/Avalonia.MonoMac/DragSource.cs b/src/OSX/Avalonia.MonoMac/DragSource.cs
index 77bbee86f1..2275c7505f 100644
--- a/src/OSX/Avalonia.MonoMac/DragSource.cs
+++ b/src/OSX/Avalonia.MonoMac/DragSource.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Data;
 using System.IO;
 using System.Linq;
@@ -24,6 +25,7 @@ namespace Avalonia.MonoMac
     public class DragSource : NSDraggingSource, IPlatformDragSource
     {
         private const string NSPasteboardTypeString = "public.utf8-plain-text";
+        private const string NSPasteboardTypeFileUrl = "public.file-url";
         
         private readonly Subject<DragDropEffects> _result = new Subject<DragDropEffects>();
         private readonly IInputManager _inputManager;
@@ -39,7 +41,7 @@ namespace Avalonia.MonoMac
         private string DataFormatToUTI(string s)
         {
             if (s == DataFormats.FileNames)
-                throw new NotImplementedException();
+                return NSPasteboardTypeFileUrl;
             if (s == DataFormats.Text)
                 return NSPasteboardTypeString;
             return s;
@@ -47,7 +49,6 @@ namespace Avalonia.MonoMac
         
         private NSDraggingItem CreateDraggingItem(string format, object data)
         {
-            
             var pasteboardItem = new NSPasteboardItem();
             NSData nsData;
             if(data is string s)
@@ -72,6 +73,19 @@ namespace Avalonia.MonoMac
   
             return new NSDraggingItem(writing);
         }
+
+        public IEnumerable<NSDraggingItem> CreateDraggingItems(string format, object data)
+        {
+            if (format == DataFormats.FileNames && data is IEnumerable<string> files)
+            {
+                foreach (var file in files)
+                    yield return CreateDraggingItem(format, file);
+
+                yield break;
+            }
+
+            yield return CreateDraggingItem(format, data);
+        }
         
         
         public async Task<DragDropEffects> DoDragDrop(IDataObject data, DragDropEffects allowedEffects)
@@ -87,7 +101,7 @@ namespace Avalonia.MonoMac
             var ev = NSEvent.MouseEvent(NSEventType.LeftMouseDown, pt, 0, 0, 0, null, 0, 0, 0);
 
             _allowedEffects = allowedEffects;
-            var items = data.GetDataFormats().Select(fmt => CreateDraggingItem(fmt, data.Get(fmt))).ToArray();
+            var items = data.GetDataFormats().SelectMany(fmt => CreateDraggingItems(fmt, data.Get(fmt))).ToArray();
             view.BeginDraggingSession(items ,ev, this);
 
             return await _result;

From 52422afe8bce50558ff8a8a2d7397bfa44b9f5e2 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@googlemail.com>
Date: Sun, 11 Mar 2018 18:28:00 +0100
Subject: [PATCH 405/482] automatically ensure dragged filenames are uris

---
 src/OSX/Avalonia.MonoMac/DragSource.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/OSX/Avalonia.MonoMac/DragSource.cs b/src/OSX/Avalonia.MonoMac/DragSource.cs
index 2275c7505f..07f2e186aa 100644
--- a/src/OSX/Avalonia.MonoMac/DragSource.cs
+++ b/src/OSX/Avalonia.MonoMac/DragSource.cs
@@ -51,8 +51,12 @@ namespace Avalonia.MonoMac
         {
             var pasteboardItem = new NSPasteboardItem();
             NSData nsData;
-            if(data is string s)
+            if (data is string s)
+            {
+                if (format == DataFormats.FileNames)
+                    s = new Uri(s).AbsoluteUri; // Ensure file uris...
                 nsData = NSData.FromString(s);
+            }
             else if (data is Stream strm)
                 nsData = NSData.FromStream(strm);
             else if (data is byte[] bytes)

From 21e627873b4fa71215744db30cce99d160b16235 Mon Sep 17 00:00:00 2001
From: dzhelnin <mitya_zh@mail.ru>
Date: Tue, 13 Mar 2018 22:08:56 +0300
Subject: [PATCH 406/482] Added InitialDelay property for better user
 experience.

---
 src/Avalonia.Controls/RepeatButton.cs | 29 +++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/RepeatButton.cs b/src/Avalonia.Controls/RepeatButton.cs
index a9ccb79fe1..482c45c8c0 100644
--- a/src/Avalonia.Controls/RepeatButton.cs
+++ b/src/Avalonia.Controls/RepeatButton.cs
@@ -12,6 +12,12 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<int> DelayProperty =
             AvaloniaProperty.Register<Button, int>(nameof(Delay), 100);
 
+        /// <summary>
+        /// Defines the <see cref="InitialDelay"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> InitialDelayProperty =
+            AvaloniaProperty.Register<Button, int>(nameof(InitialDelay), 300);
+
         private DispatcherTimer _repeatTimer;
 
         /// <summary>
@@ -23,20 +29,39 @@ namespace Avalonia.Controls
             set { SetValue(DelayProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the amount of time, in milliseconds, to wait before repeating begins.
+        /// </summary>
+        public int InitialDelay
+        {
+            get { return GetValue(InitialDelayProperty); }
+            set { SetValue(InitialDelayProperty, value); }
+        }
+
         private void StartTimer()
         {
             if (_repeatTimer == null)
             {
                 _repeatTimer = new DispatcherTimer();
-                _repeatTimer.Tick += (o, e) => OnClick();
+                _repeatTimer.Tick += RepeatTimerOnTick;
             }
 
             if (_repeatTimer.IsEnabled) return;
 
-            _repeatTimer.Interval = TimeSpan.FromMilliseconds(Delay);
+            _repeatTimer.Interval = TimeSpan.FromMilliseconds(InitialDelay);
             _repeatTimer.Start();
         }
 
+        private void RepeatTimerOnTick(object sender, EventArgs e)
+        {
+            var interval = TimeSpan.FromMilliseconds(Delay);
+            if (_repeatTimer.Interval != interval)
+            {
+                _repeatTimer.Interval = interval;
+            }
+            OnClick();
+        }
+
         private void StopTimer()
         {
             _repeatTimer?.Stop();

From e468760c96d453a294ef82333014ab55ebf1af35 Mon Sep 17 00:00:00 2001
From: dzhelnin <mitya_zh@mail.ru>
Date: Tue, 13 Mar 2018 22:21:25 +0300
Subject: [PATCH 407/482] Delay renamed to Interval. InitialDelay renamed to
 Delay.

---
 src/Avalonia.Controls/RepeatButton.cs | 28 +++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Avalonia.Controls/RepeatButton.cs b/src/Avalonia.Controls/RepeatButton.cs
index 482c45c8c0..07a1e82638 100644
--- a/src/Avalonia.Controls/RepeatButton.cs
+++ b/src/Avalonia.Controls/RepeatButton.cs
@@ -7,35 +7,35 @@ namespace Avalonia.Controls
     public class RepeatButton : Button
     {
         /// <summary>
-        /// Defines the <see cref="Delay"/> property.
+        /// Defines the <see cref="Interval"/> property.
         /// </summary>
-        public static readonly StyledProperty<int> DelayProperty =
-            AvaloniaProperty.Register<Button, int>(nameof(Delay), 100);
+        public static readonly StyledProperty<int> IntervalProperty =
+            AvaloniaProperty.Register<Button, int>(nameof(Interval), 100);
 
         /// <summary>
-        /// Defines the <see cref="InitialDelay"/> property.
+        /// Defines the <see cref="Delay"/> property.
         /// </summary>
-        public static readonly StyledProperty<int> InitialDelayProperty =
-            AvaloniaProperty.Register<Button, int>(nameof(InitialDelay), 300);
+        public static readonly StyledProperty<int> DelayProperty =
+            AvaloniaProperty.Register<Button, int>(nameof(Delay), 300);
 
         private DispatcherTimer _repeatTimer;
 
         /// <summary>
         /// Gets or sets the amount of time, in milliseconds, of repeating clicks.
         /// </summary>
-        public int Delay
+        public int Interval
         {
-            get { return GetValue(DelayProperty); }
-            set { SetValue(DelayProperty, value); }
+            get { return GetValue(IntervalProperty); }
+            set { SetValue(IntervalProperty, value); }
         }
 
         /// <summary>
         /// Gets or sets the amount of time, in milliseconds, to wait before repeating begins.
         /// </summary>
-        public int InitialDelay
+        public int Delay
         {
-            get { return GetValue(InitialDelayProperty); }
-            set { SetValue(InitialDelayProperty, value); }
+            get { return GetValue(DelayProperty); }
+            set { SetValue(DelayProperty, value); }
         }
 
         private void StartTimer()
@@ -48,13 +48,13 @@ namespace Avalonia.Controls
 
             if (_repeatTimer.IsEnabled) return;
 
-            _repeatTimer.Interval = TimeSpan.FromMilliseconds(InitialDelay);
+            _repeatTimer.Interval = TimeSpan.FromMilliseconds(Delay);
             _repeatTimer.Start();
         }
 
         private void RepeatTimerOnTick(object sender, EventArgs e)
         {
-            var interval = TimeSpan.FromMilliseconds(Delay);
+            var interval = TimeSpan.FromMilliseconds(Interval);
             if (_repeatTimer.Interval != interval)
             {
                 _repeatTimer.Interval = interval;

From 8361c1fec12d4ad3a8f82007c56afc6ac7aff48d Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Tue, 13 Mar 2018 21:41:38 -0400
Subject: [PATCH 408/482] Fixed a property name mistake in GradientBrush

---
 src/Avalonia.Visuals/Media/GradientBrush.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Visuals/Media/GradientBrush.cs b/src/Avalonia.Visuals/Media/GradientBrush.cs
index 8c2c9a2c01..fb29f68373 100644
--- a/src/Avalonia.Visuals/Media/GradientBrush.cs
+++ b/src/Avalonia.Visuals/Media/GradientBrush.cs
@@ -22,7 +22,7 @@ namespace Avalonia.Media
         /// Defines the <see cref="GradientStops"/> property.
         /// </summary>
         public static readonly StyledProperty<IList<GradientStop>> GradientStopsProperty =
-            AvaloniaProperty.Register<GradientBrush, IList<GradientStop>>(nameof(Opacity));
+            AvaloniaProperty.Register<GradientBrush, IList<GradientStop>>(nameof(GradientStops));
 
         /// <summary>
         /// Initializes a new instance of the <see cref="GradientBrush"/> class.

From 427a634b2132493b18b71316748d736253e66642 Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Tue, 13 Mar 2018 21:42:27 -0400
Subject: [PATCH 409/482] Added async population feature

---
 .../Pages/AutoCompleteBoxPage.xaml            |  8 ++-
 .../Pages/AutoCompleteBoxPage.xaml.cs         | 18 +++++
 src/Avalonia.Controls/AutoCompleteBox.cs      | 70 +++++++++++++++++++
 3 files changed, 94 insertions(+), 2 deletions(-)

diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
index 491f41ecbf..943fadf100 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
@@ -8,7 +8,6 @@
               HorizontalAlignment="Center"
               Gap="8">
       <StackPanel Orientation="Vertical">
-        
         <TextBlock Text="MinimumPrefixLength: 1"/>
         <AutoCompleteBox Width="200"
                          Margin="0,0,0,8"
@@ -35,6 +34,7 @@
       
 
       <StackPanel Orientation="Vertical">
+        
         <TextBlock Text="ValueMemeberSelector"/>
         <AutoCompleteBox Width="200"
                          Margin="0,0,0,8"
@@ -47,8 +47,12 @@
         <AutoCompleteBox Name="MultiBindingBox"
                          Width="200"
                          Margin="0,0,0,8"
-                         ValueMemberBinding="{Binding Capital}"
                          FilterMode="Contains"/>
+        <TextBlock Text="Async Populate"/>
+        <AutoCompleteBox Name="AsyncBox"
+                         Width="200"
+                         Margin="0,0,0,8"
+                         FilterMode="None"/>
       </StackPanel>
     </StackPanel>
   </StackPanel>
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
index 9f181d44f2..6f3b8361cd 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
@@ -6,6 +6,8 @@ using Avalonia.Markup.Xaml.Data;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace ControlCatalog.Pages
 {
@@ -109,6 +111,9 @@ namespace ControlCatalog.Pages
 
             var multibindingBox = this.FindControl<AutoCompleteBox>("MultiBindingBox");
             multibindingBox.ValueMemberBinding = binding;
+
+            var asyncBox = this.FindControl<AutoCompleteBox>("AsyncBox");
+            asyncBox.AsyncPopulator = PopulateAsync;
         }
         private IEnumerable<AutoCompleteBox> GetAllAutoCompleteBox()
         {
@@ -117,6 +122,19 @@ namespace ControlCatalog.Pages
                     .OfType<AutoCompleteBox>();
         }
 
+        private bool StringContains(string str, string query)
+        {
+            return str.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0;
+        }
+        private async Task<IEnumerable<object>> PopulateAsync(string searchText, CancellationToken cancellationToken)
+        {
+            await Task.Delay(TimeSpan.FromSeconds(1.5), cancellationToken);
+
+            return
+                States.Where(data => StringContains(data.Name, searchText) || StringContains(data.Capital, searchText))
+                      .ToList();
+        }
+
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
diff --git a/src/Avalonia.Controls/AutoCompleteBox.cs b/src/Avalonia.Controls/AutoCompleteBox.cs
index 0e8b93146c..e4962dc069 100644
--- a/src/Avalonia.Controls/AutoCompleteBox.cs
+++ b/src/Avalonia.Controls/AutoCompleteBox.cs
@@ -23,6 +23,8 @@ using Avalonia.Utilities;
 using System.Globalization;
 using System.Collections.Specialized;
 using System.Reactive.Disposables;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace Avalonia.Controls
 {
@@ -360,6 +362,8 @@ namespace Avalonia.Controls
         private IDisposable _collectionChangeSubscription;
 
         private IMemberSelector _valueMemberSelector;
+        private Func<string, CancellationToken, Task<IEnumerable<object>>> _asyncPopulator;
+        private CancellationTokenSource _populationCancellationTokenSource;
 
         private bool _itemTemplateIsFromValueMemeberBinding = true;
         private bool _settingItemTemplateFromValueMemeberBinding;
@@ -559,6 +563,12 @@ namespace Avalonia.Controls
                 o => o.ValueMemberSelector,
                 (o, v) => o.ValueMemberSelector = v);
 
+        public static readonly DirectProperty<AutoCompleteBox, Func<string, CancellationToken, Task<IEnumerable<object>>>> AsyncPopulatorProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, Func<string, CancellationToken, Task<IEnumerable<object>>>>(
+                nameof(AsyncPopulator),
+                o => o.AsyncPopulator,
+                (o, v) => o.AsyncPopulator = v);
+
         private static int ValidateMinimumPrefixLength(AutoCompleteBox control, int value)
         {
             Contract.Requires<ArgumentOutOfRangeException>(value >= -1);
@@ -1107,6 +1117,12 @@ namespace Avalonia.Controls
             set { SetAndRaise(TextFilterProperty, ref _textFilter, value); }
         }
 
+        public Func<string, CancellationToken, Task<IEnumerable<object>>> AsyncPopulator
+        {
+            get { return _asyncPopulator; }
+            set { SetAndRaise(AsyncPopulatorProperty, ref _asyncPopulator, value); }
+        }
+
         /// <summary>
         /// Gets or sets a collection that is used to generate the items for the
         /// drop-down portion of the
@@ -1702,6 +1718,11 @@ namespace Avalonia.Controls
             // Update the prefix/search text.
             SearchText = Text;
 
+            if(TryPopulateAsync(SearchText))
+            {
+                return;
+            }
+
             // The Populated event enables advanced, custom filtering. The 
             // client needs to directly update the ItemsSource collection or
             // call the Populate method on the control to continue the 
@@ -1713,6 +1734,55 @@ namespace Avalonia.Controls
                 PopulateComplete();
             }
         }
+        private bool TryPopulateAsync(string searchText)
+        {
+            _populationCancellationTokenSource?.Cancel(false);
+            _populationCancellationTokenSource?.Dispose();
+            _populationCancellationTokenSource = null;
+
+            if(_asyncPopulator == null)
+            {
+                return false;
+            }
+
+            _populationCancellationTokenSource = new CancellationTokenSource();
+            var task = PopulateAsync(searchText, _populationCancellationTokenSource.Token);
+            if (task.Status == TaskStatus.Created)
+                task.Start();
+
+            return true;
+        }
+        private async Task PopulateAsync(string searchText, CancellationToken cancellationToken)
+        {
+
+            try
+            {
+                IEnumerable<object> result = await _asyncPopulator.Invoke(searchText, cancellationToken);
+                var resultList = result.ToList();
+
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
+
+                await Dispatcher.UIThread.InvokeAsync(() =>
+                {
+                    if (!cancellationToken.IsCancellationRequested)
+                    {
+                        Items = resultList;
+                        PopulateComplete();
+                    }
+                });
+            }
+            catch (TaskCanceledException)
+            { }
+            finally
+            {
+                _populationCancellationTokenSource?.Dispose();
+                _populationCancellationTokenSource = null;
+            }
+
+        }
 
         /// <summary>
         /// Private method that directly opens the popup, checks the expander 

From 7a1305f2d8e9921a415d85fee2acae1505a8160f Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Tue, 13 Mar 2018 21:47:13 -0400
Subject: [PATCH 410/482] Moved CancelableEventArgs to Avalonia.Interactivity

---
 src/Avalonia.Controls/AutoCompleteBox.cs         |  9 ---------
 .../CancelableEventArgs.cs                       | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 src/Avalonia.Interactivity/CancelableEventArgs.cs

diff --git a/src/Avalonia.Controls/AutoCompleteBox.cs b/src/Avalonia.Controls/AutoCompleteBox.cs
index e4962dc069..730c1e895e 100644
--- a/src/Avalonia.Controls/AutoCompleteBox.cs
+++ b/src/Avalonia.Controls/AutoCompleteBox.cs
@@ -28,15 +28,6 @@ using System.Threading.Tasks;
 
 namespace Avalonia.Controls
 {
-    public class CancelableEventArgs : EventArgs
-    {
-        public bool Cancel { get; set; }
-
-        public CancelableEventArgs()
-            : base()
-        { }
-    }
-    
     /// <summary>
     /// Provides data for the
     /// <see cref="E:Avalonia.Controls.AutoCompleteBox.Populated" />
diff --git a/src/Avalonia.Interactivity/CancelableEventArgs.cs b/src/Avalonia.Interactivity/CancelableEventArgs.cs
new file mode 100644
index 0000000000..13ff9239f1
--- /dev/null
+++ b/src/Avalonia.Interactivity/CancelableEventArgs.cs
@@ -0,0 +1,16 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+
+namespace Avalonia.Interactivity
+{
+    public class CancelableEventArgs : EventArgs
+    {
+        public bool Cancel { get; set; }
+
+        public CancelableEventArgs()
+            : base()
+        { }
+    }
+}

From e9c4c238f1cbb01217340a738a18584c7a2fa824 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Fri, 16 Mar 2018 23:53:32 +0800
Subject: [PATCH 411/482] Added SkewTransform and the corresponding skew
 function in Matrix class.

---
 src/Avalonia.Visuals/Matrix.cs              | 14 ++++-
 src/Avalonia.Visuals/Media/SkewTransform.cs | 69 +++++++++++++++++++++
 2 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 src/Avalonia.Visuals/Media/SkewTransform.cs

diff --git a/src/Avalonia.Visuals/Matrix.cs b/src/Avalonia.Visuals/Matrix.cs
index 10549b967d..89eb7b4928 100644
--- a/src/Avalonia.Visuals/Matrix.cs
+++ b/src/Avalonia.Visuals/Matrix.cs
@@ -150,6 +150,19 @@ namespace Avalonia
             return new Matrix(cos, sin, -sin, cos, 0, 0);
         }
 
+        /// <summary>
+        /// Creates a skew matrix from the given axis skew angles in radians.
+        /// </summary>
+        /// <param name="xAngle">The amount of skew along the X-axis, in radians.</param>
+        /// <param name="yAngle">The amount of skew along the Y-axis, in radians.</param>
+        /// <returns>A rotation matrix.</returns>
+        public static Matrix CreateSkew(double xAngle, double yAngle)
+        {
+            double tanX = Math.Tan(xAngle);
+            double tanY = Math.Tan(yAngle);
+            return new Matrix(1.0, tanX, tanY, 1.0, 0.0, 0.0);
+        }
+
         /// <summary>
         /// Creates a scale matrix from the given X and Y components.
         /// </summary>
@@ -215,7 +228,6 @@ namespace Avalonia
             return (_m11 * _m22) - (_m12 * _m21);
         }
 
-
         /// <summary>
         /// Returns a boolean indicating whether the matrix is equal to the other given matrix.
         /// </summary>
diff --git a/src/Avalonia.Visuals/Media/SkewTransform.cs b/src/Avalonia.Visuals/Media/SkewTransform.cs
new file mode 100644
index 0000000000..880b73750b
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/SkewTransform.cs
@@ -0,0 +1,69 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Skews an <see cref="IVisual"/>.
+    /// </summary>
+    public class SkewTransform : Transform
+    {
+        /// <summary>
+        /// Defines the <see cref="AngleX"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> AngleXProperty =
+                    AvaloniaProperty.Register<SkewTransform, double>(nameof(AngleX));
+
+        /// <summary>
+        /// Defines the <see cref="AngleY"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> AngleYProperty =
+                    AvaloniaProperty.Register<SkewTransform, double>(nameof(AngleY));
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SkewTransform"/> class.
+        /// </summary>
+        public SkewTransform()
+        {
+            this.GetObservable(AngleXProperty).Subscribe(_ => RaiseChanged());
+            this.GetObservable(AngleYProperty).Subscribe(_ => RaiseChanged());
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SkewTransform"/> class.
+        /// </summary>
+        /// <param name="angleX">The skew angle of X-axis, in degrees.</param>
+        /// <param name="angleY">The skew angle of Y-axis, in degrees.</param>
+        public SkewTransform(double angleX, double angleY) : this()
+        {
+            AngleX = angleX;
+            AngleY = angleY;
+        }
+
+        /// <summary>
+        /// Gets or sets the AngleX property.
+        /// </summary>
+        public double AngleX
+        {
+            get { return GetValue(AngleXProperty); }
+            set { SetValue(AngleXProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the AngleY property.
+        /// </summary>
+        public double AngleY
+        {
+            get { return GetValue(AngleYProperty); }
+            set { SetValue(AngleYProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets the tranform's <see cref="Matrix"/>.
+        /// </summary>
+        public override Matrix Value => Matrix.CreateSkew(Matrix.ToRadians(AngleX), Matrix.ToRadians(AngleY));
+    }
+}
\ No newline at end of file

From 0306d9475d9e55f264d5e192966f02333d116cd2 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Sat, 17 Mar 2018 01:05:52 +0800
Subject: [PATCH 412/482] Added LayoutTransformControl skew tests

---
 .../LayoutTransformControlTests.cs            | 97 ++++++++++++++++++-
 1 file changed, 94 insertions(+), 3 deletions(-)

diff --git a/tests/Avalonia.Controls.UnitTests/LayoutTransformControlTests.cs b/tests/Avalonia.Controls.UnitTests/LayoutTransformControlTests.cs
index b6ef550da6..45154b9dad 100644
--- a/tests/Avalonia.Controls.UnitTests/LayoutTransformControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/LayoutTransformControlTests.cs
@@ -30,6 +30,51 @@ namespace Avalonia.Controls.UnitTests
                 new Size(50, 25));
         }
 
+        [Fact]
+        public void Measure_On_Skew_X_axis_45_degrees_Is_Correct()
+        {
+            TransformMeasureSizeTest(
+                new Size(100, 100),
+                new SkewTransform() { AngleX = 45 },
+                new Size(100, 200));
+        }
+
+        [Fact]
+        public void Measure_On_Skew_Y_axis_45_degrees_Is_Correct()
+        {
+            TransformMeasureSizeTest(
+                new Size(100, 100),
+                new SkewTransform() { AngleY = 45 },
+                new Size(200, 100));
+        }
+
+        [Fact]
+        public void Measure_On_Skew_X_axis_minus_45_degrees_Is_Correct()
+        {
+            TransformMeasureSizeTest(
+                new Size(100, 100),
+                new SkewTransform() { AngleX = -45 },
+                new Size(100, 200));
+        }
+
+        [Fact]
+        public void Measure_On_Skew_Y_axis_minus_45_degrees_Is_Correct()
+        {
+            TransformMeasureSizeTest(
+                new Size(100, 100),
+                new SkewTransform() { AngleY = -45 },
+                new Size(200, 100));
+        }
+
+        [Fact]
+        public void Measure_On_Skew_0_degrees_Is_Correct()
+        {
+            TransformMeasureSizeTest(
+                new Size(100, 100),
+                new SkewTransform() { AngleX = 0, AngleY = 0 },
+                new Size(100, 100));
+        }
+
         [Fact]
         public void Measure_On_Rotate_90_degrees_Is_Correct()
         {
@@ -123,9 +168,9 @@ namespace Avalonia.Controls.UnitTests
                 new RotateTransform() { Angle = -90 },
                 new Rect(0, 100, 100, 25));
         }
-
+        
         [Fact]
-        public void Should_Generate_RenderTransform_90_degrees()
+        public void Should_Generate_RotateTransform_90_degrees()
         {
             LayoutTransformControl lt = CreateWithChildAndMeasureAndTransform(
                                         100,
@@ -147,7 +192,7 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void Should_Generate_RenderTransform_minus_90_degrees()
+        public void Should_Generate_RotateTransform_minus_90_degrees()
         {
             LayoutTransformControl lt = CreateWithChildAndMeasureAndTransform(
                                         100,
@@ -189,6 +234,52 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(m.M32, res.M32, 3);
         }
 
+        [Fact]
+        public void Should_Generate_SkewTransform_45_degrees()
+        {
+            LayoutTransformControl lt = CreateWithChildAndMeasureAndTransform(
+                                        100,
+                                        100,
+                                        new SkewTransform() { AngleX = 45, AngleY = 45 });
+
+            Assert.NotNull(lt.TransformRoot.RenderTransform);
+
+            Matrix m = lt.TransformRoot.RenderTransform.Value;
+
+            Matrix res = Matrix.CreateSkew(Matrix.ToRadians(45), Matrix.ToRadians(45));
+
+            Assert.Equal(m.M11, res.M11, 3);
+            Assert.Equal(m.M12, res.M12, 3);
+            Assert.Equal(m.M21, res.M21, 3);
+            Assert.Equal(m.M22, res.M22, 3);
+            Assert.Equal(m.M31, res.M31, 3);
+            Assert.Equal(m.M32, res.M32, 3);
+        }
+
+        [Fact]
+        public void Should_Generate_SkewTransform_minus_45_degrees()
+        {
+            LayoutTransformControl lt = CreateWithChildAndMeasureAndTransform(
+                                        100,
+                                        100,
+                                        new SkewTransform() { AngleX = -45, AngleY = -45 });
+
+            Assert.NotNull(lt.TransformRoot.RenderTransform);
+
+            Matrix m = lt.TransformRoot.RenderTransform.Value;
+
+            Matrix res = Matrix.CreateSkew(Matrix.ToRadians(-45), Matrix.ToRadians(-45));
+
+            Assert.Equal(m.M11, res.M11, 3);
+            Assert.Equal(m.M12, res.M12, 3);
+            Assert.Equal(m.M21, res.M21, 3);
+            Assert.Equal(m.M22, res.M22, 3);
+            Assert.Equal(m.M31, res.M31, 3);
+            Assert.Equal(m.M32, res.M32, 3);
+        }
+
+
+
         private static void TransformMeasureSizeTest(Size size, Transform transform, Size expectedSize)
         {
             LayoutTransformControl lt = CreateWithChildAndMeasureAndTransform(

From fc06fa1e35ed7ed1dea968692568e8bc203a4376 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Sun, 18 Mar 2018 00:27:03 +0800
Subject: [PATCH 413/482] Fix skew matrix function's flipped axes + update
 tests.

---
 src/Avalonia.Visuals/Matrix.cs                      |  2 +-
 .../LayoutTransformControlTests.cs                  | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Visuals/Matrix.cs b/src/Avalonia.Visuals/Matrix.cs
index 89eb7b4928..4e5cd61994 100644
--- a/src/Avalonia.Visuals/Matrix.cs
+++ b/src/Avalonia.Visuals/Matrix.cs
@@ -160,7 +160,7 @@ namespace Avalonia
         {
             double tanX = Math.Tan(xAngle);
             double tanY = Math.Tan(yAngle);
-            return new Matrix(1.0, tanX, tanY, 1.0, 0.0, 0.0);
+            return new Matrix(1.0, tanY, tanX, 1.0, 0.0, 0.0);
         }
 
         /// <summary>
diff --git a/tests/Avalonia.Controls.UnitTests/LayoutTransformControlTests.cs b/tests/Avalonia.Controls.UnitTests/LayoutTransformControlTests.cs
index 45154b9dad..d5f9818f89 100644
--- a/tests/Avalonia.Controls.UnitTests/LayoutTransformControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/LayoutTransformControlTests.cs
@@ -36,7 +36,8 @@ namespace Avalonia.Controls.UnitTests
             TransformMeasureSizeTest(
                 new Size(100, 100),
                 new SkewTransform() { AngleX = 45 },
-                new Size(100, 200));
+                new Size(200, 100));
+
         }
 
         [Fact]
@@ -45,7 +46,7 @@ namespace Avalonia.Controls.UnitTests
             TransformMeasureSizeTest(
                 new Size(100, 100),
                 new SkewTransform() { AngleY = 45 },
-                new Size(200, 100));
+                new Size(100, 200));
         }
 
         [Fact]
@@ -54,7 +55,7 @@ namespace Avalonia.Controls.UnitTests
             TransformMeasureSizeTest(
                 new Size(100, 100),
                 new SkewTransform() { AngleX = -45 },
-                new Size(100, 200));
+                new Size(200, 100));
         }
 
         [Fact]
@@ -63,7 +64,7 @@ namespace Avalonia.Controls.UnitTests
             TransformMeasureSizeTest(
                 new Size(100, 100),
                 new SkewTransform() { AngleY = -45 },
-                new Size(200, 100));
+                new Size(100, 200));
         }
 
         [Fact]
@@ -168,7 +169,7 @@ namespace Avalonia.Controls.UnitTests
                 new RotateTransform() { Angle = -90 },
                 new Rect(0, 100, 100, 25));
         }
-        
+
         [Fact]
         public void Should_Generate_RotateTransform_90_degrees()
         {
@@ -278,8 +279,6 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(m.M32, res.M32, 3);
         }
 
-
-
         private static void TransformMeasureSizeTest(Size size, Transform transform, Size expectedSize)
         {
             LayoutTransformControl lt = CreateWithChildAndMeasureAndTransform(

From e329140c04fd7a0a7d555b954f6e9522c15811c6 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 17 Mar 2018 23:22:01 +0100
Subject: [PATCH 414/482] Added failing test for #1447.

---
 .../ContentPresenterTests_Layout.cs           | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
index 2ab02a0418..b3c617c4ab 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
@@ -80,6 +80,31 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.Equal(new Rect(expectedX, expectedY, expectedWidth, expectedHeight), content.Bounds);
         }
 
+        [Fact]
+        public void Should_Correctly_Align_Child_With_Fixed_Size()
+        {
+            Border content;
+            var target = new ContentPresenter
+            {
+                HorizontalContentAlignment = HorizontalAlignment.Stretch,
+                VerticalContentAlignment = VerticalAlignment.Stretch,
+                Content = content = new Border
+                {
+                    HorizontalAlignment = HorizontalAlignment.Left,
+                    VerticalAlignment = VerticalAlignment.Bottom,
+                    Width = 16,
+                    Height = 16,
+                },
+            };
+
+            target.UpdateChild();
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            // Check correct result for Issue #1447.
+            Assert.Equal(new Rect(0, 84, 16, 16), content.Bounds);
+        }
+
         [Fact]
         public void Content_Can_Be_Stretched()
         {

From 0c94c82b42fd59fd105635eddea7e26d5a22d2d2 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 17 Mar 2018 23:23:11 +0100
Subject: [PATCH 415/482] Don't apply layout constraints to child.

The child itself will take care of applying its own layout constraints, applying them in the `ContentPresenter` arrange causes #1447.

Fixes #1447.
---
 src/Avalonia.Controls/Presenters/ContentPresenter.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index d0a438cc2b..54626e9e97 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -221,7 +221,7 @@ namespace Avalonia.Controls.Presenters
         {
             var content = Content;
             var oldChild = Child;
-            var newChild = CreateChild();            
+            var newChild = CreateChild();
 
             // Remove the old child if we're not recycling it.
             if (oldChild != null && newChild != oldChild)
@@ -397,8 +397,6 @@ namespace Avalonia.Controls.Presenters
                     size = size.WithHeight(Math.Min(size.Height, DesiredSize.Height - padding.Top - padding.Bottom));
                 }
 
-                size = LayoutHelper.ApplyLayoutConstraints(Child, size);
-
                 if (useLayoutRounding)
                 {
                     size = new Size(
@@ -412,7 +410,6 @@ namespace Avalonia.Controls.Presenters
                 switch (horizontalContentAlignment)
                 {
                     case HorizontalAlignment.Center:
-                    case HorizontalAlignment.Stretch:
                         originX += (availableSizeMinusMargins.Width - size.Width) / 2;
                         break;
                     case HorizontalAlignment.Right:
@@ -423,7 +420,6 @@ namespace Avalonia.Controls.Presenters
                 switch (verticalContentAlignment)
                 {
                     case VerticalAlignment.Center:
-                    case VerticalAlignment.Stretch:
                         originY += (availableSizeMinusMargins.Height - size.Height) / 2;
                         break;
                     case VerticalAlignment.Bottom:

From f0afca5eadb4421bf164dd7684a26f6fb1b639f0 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 18 Mar 2018 02:54:54 +0100
Subject: [PATCH 416/482] Clear TextBox undo stack on binding change.

This makes `TextBox` act like WPF's `TextBox` where the undo/redo stack is cleared when a change is made from non-user input such as from a binding.

Fixes #336
---
 src/Avalonia.Controls/TextBox.cs              |  6 +++-
 src/Avalonia.Controls/Utils/UndoRedoHelper.cs | 36 +++++++++++++++----
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 3ec3d6ed5b..a91b7b2a72 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -198,7 +198,11 @@ namespace Avalonia.Controls
                 if (!_ignoreTextChanges)
                 {
                     CaretIndex = CoerceCaretIndex(CaretIndex, value?.Length ?? 0);
-                    SetAndRaise(TextProperty, ref _text, value);
+
+                    if (SetAndRaise(TextProperty, ref _text, value))
+                    {
+                        _undoRedoHelper.Clear();
+                    }
                 }
             }
         }
diff --git a/src/Avalonia.Controls/Utils/UndoRedoHelper.cs b/src/Avalonia.Controls/Utils/UndoRedoHelper.cs
index be4c1aa6c4..fce002f0f1 100644
--- a/src/Avalonia.Controls/Utils/UndoRedoHelper.cs
+++ b/src/Avalonia.Controls/Utils/UndoRedoHelper.cs
@@ -10,6 +10,7 @@ namespace Avalonia.Controls.Utils
     class UndoRedoHelper<TState> : WeakTimer.IWeakTimerSubscriber where TState : struct, IEquatable<TState>
     {
         private readonly IUndoRedoHost _host;
+        bool _undoRedoing;
 
         public interface IUndoRedoHost
         {
@@ -32,10 +33,19 @@ namespace Avalonia.Controls.Utils
 
         public void Undo()
         {
-            if (_currentNode?.Previous != null)
+            _undoRedoing = true;
+
+            try
+            {
+                if (_currentNode?.Previous != null)
+                {
+                    _currentNode = _currentNode.Previous;
+                    _host.UndoRedoState = _currentNode.Value;
+                }
+            }
+            finally
             {
-                _currentNode = _currentNode.Previous;
-                _host.UndoRedoState = _currentNode.Value;
+                _undoRedoing = false;
             }
         }
 
@@ -70,10 +80,19 @@ namespace Avalonia.Controls.Utils
 
         public void Redo()
         {
-            if (_currentNode?.Next != null)
+            _undoRedoing = true;
+
+            try
+            {
+                if (_currentNode?.Next != null)
+                {
+                    _currentNode = _currentNode.Next;
+                    _host.UndoRedoState = _currentNode.Value;
+                }
+            }
+            finally
             {
-                _currentNode = _currentNode.Next;
-                _host.UndoRedoState = _currentNode.Value;
+                _undoRedoing = false;
             }
         }
 
@@ -91,6 +110,11 @@ namespace Avalonia.Controls.Utils
             }
         }
 
+        public void Clear()
+        {
+            if (!_undoRedoing) _states.Clear();
+        }
+
         bool WeakTimer.IWeakTimerSubscriber.Tick()
         {
             Snapshot();

From 6b8eb17a987100c033fe7ed0507e6f719343ee88 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 18 Mar 2018 15:41:17 +0000
Subject: [PATCH 417/482] set e.Handled in textbox OnGotFocus.

---
 src/Avalonia.Controls/TextBox.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 3ec3d6ed5b..3d3a0fe00e 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -256,6 +256,8 @@ namespace Avalonia.Controls
             {
                 _presenter?.ShowCaret();
             }
+
+            e.Handled = true;
         }
 
         protected override void OnLostFocus(RoutedEventArgs e)

From d1b0a9ef3050bcb4a4102e24085348d7e3dada8c Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 18 Mar 2018 15:51:09 +0000
Subject: [PATCH 418/482] handle textinput.

---
 src/Avalonia.Controls/TextBox.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 3d3a0fe00e..f73725f95a 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -271,6 +271,7 @@ namespace Avalonia.Controls
         protected override void OnTextInput(TextInputEventArgs e)
         {
             HandleTextInput(e.Text);
+            e.Handled = true;
         }
 
         private void HandleTextInput(string input)

From 8acc7c6f157a396d12e1ed477aac65070de58597 Mon Sep 17 00:00:00 2001
From: Artyom <worldbeater-dev@yandex.ru>
Date: Mon, 19 Mar 2018 23:05:12 +0300
Subject: [PATCH 419/482] Remove dollar!

Close https://github.com/AvaloniaUI/Avalonia/issues/1397
---
 src/Avalonia.Base/Collections/AvaloniaDictionary.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Base/Collections/AvaloniaDictionary.cs b/src/Avalonia.Base/Collections/AvaloniaDictionary.cs
index b90dccf74e..84ac85d3db 100644
--- a/src/Avalonia.Base/Collections/AvaloniaDictionary.cs
+++ b/src/Avalonia.Base/Collections/AvaloniaDictionary.cs
@@ -117,7 +117,7 @@ namespace Avalonia.Collections
             _inner = new Dictionary<TKey, TValue>();
 
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("Count"));
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs($"Item[]"));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("Item[]"));
             
 
             if (CollectionChanged != null)
@@ -222,4 +222,4 @@ namespace Avalonia.Collections
             }
         }
     }
-}
\ No newline at end of file
+}

From 9820087db62096510f8d6ecec88b15983e555c2a Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 19 Mar 2018 21:12:07 +0000
Subject: [PATCH 420/482] add some previously unknown keycodes.

---
 src/Gtk/Avalonia.Gtk3/KeyTransform.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Gtk/Avalonia.Gtk3/KeyTransform.cs b/src/Gtk/Avalonia.Gtk3/KeyTransform.cs
index de3a4766a1..5a34db2e04 100644
--- a/src/Gtk/Avalonia.Gtk3/KeyTransform.cs
+++ b/src/Gtk/Avalonia.Gtk3/KeyTransform.cs
@@ -151,8 +151,8 @@ namespace Avalonia.Gtk.Common
             { GdkKey.R2, Key.F22 },
             { GdkKey.F23, Key.F23 },
             { GdkKey.R4, Key.F24 },
-            //{ GdkKey.?, Key.NumLock }
-            //{ GdkKey.?, Key.Scroll }
+            { GdkKey.Num_Lock, Key.NumLock },
+            { GdkKey.Scroll_Lock, Key.Scroll },
             //{ GdkKey.?, Key.LeftShift }
             //{ GdkKey.?, Key.RightShift }
             //{ GdkKey.?, Key.LeftCtrl }
@@ -177,12 +177,12 @@ namespace Avalonia.Gtk.Common
             //{ GdkKey.?, Key.SelectMedia }
             //{ GdkKey.?, Key.LaunchApplication1 }
             //{ GdkKey.?, Key.LaunchApplication2 }
-            //{ GdkKey.?, Key.OemSemicolon }
-            //{ GdkKey.?, Key.OemPlus }
-            //{ GdkKey.?, Key.OemComma }
-            //{ GdkKey.?, Key.OemMinus }
-            //{ GdkKey.?, Key.OemPeriod }
-            //{ GdkKey.?, Key.Oem2 }
+            { GdkKey.semicolon, Key.OemSemicolon },
+            { GdkKey.plus, Key.OemPlus },
+            { GdkKey.comma, Key.OemComma },
+            { GdkKey.minus, Key.OemMinus },
+            { GdkKey.period, Key.OemPeriod },
+            { GdkKey.slash, Key.Oem2 }
             //{ GdkKey.?, Key.OemTilde }
             //{ GdkKey.?, Key.AbntC1 }
             //{ GdkKey.?, Key.AbntC2 }

From 3e73046098037ce4bc6bf316a87d2178057c7add Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Mon, 12 Feb 2018 14:17:56 -0500
Subject: [PATCH 421/482] Ported the AutoCompleteBox control from Silverlight

---
 samples/ControlCatalog/ControlCatalog.csproj  |    6 +
 samples/ControlCatalog/MainView.xaml          |    5 +-
 .../Pages/AutoCompleteBoxPage.xaml            |   55 +
 .../Pages/AutoCompleteBoxPage.xaml.cs         |  125 +
 src/Avalonia.Controls/AutoCompleteBox.cs      | 2669 +++++++++++++++++
 .../Utils/ISelectionAdapter.cs                |   64 +
 .../SelectingItemsControlSelectionAdapter.cs  |  342 +++
 .../AutoCompleteBox.xaml                      |   43 +
 src/Avalonia.Themes.Default/DefaultTheme.xaml |    3 +-
 9 files changed, 3309 insertions(+), 3 deletions(-)
 create mode 100644 samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
 create mode 100644 samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
 create mode 100644 src/Avalonia.Controls/AutoCompleteBox.cs
 create mode 100644 src/Avalonia.Controls/Utils/ISelectionAdapter.cs
 create mode 100644 src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs
 create mode 100644 src/Avalonia.Themes.Default/AutoCompleteBox.xaml

diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index a3d7a0cdce..acbf1e86e3 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -41,6 +41,9 @@
     <EmbeddedResource Include="Pages\DialogsPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Pages\AutoCompleteBoxPage.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Pages\BorderPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -113,6 +116,9 @@
     <Compile Include="Pages\BorderPage.xaml.cs">
       <DependentUpon>BorderPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\AutoCompleteBoxPage.xaml.cs">
+      <DependentUpon>AutoCompleteBoxPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\ButtonPage.xaml.cs">
       <DependentUpon>ButtonPage.xaml</DependentUpon>
     </Compile>
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 142d0d42b1..37e4396371 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -5,10 +5,11 @@
     <TabControl.Transition>
       <CrossFade Duration="0.25"/>
     </TabControl.Transition>
+    <TabItem Header="AutoCompleteBox"><pages:AutoCompleteBoxPage/></TabItem>
     <TabItem Header="Border"><pages:BorderPage/></TabItem>
     <TabItem Header="Button"><pages:ButtonPage/></TabItem>
     <TabItem Header="ButtonSpinner"><pages:ButtonSpinnerPage/></TabItem>
-    <TabItem Header="Calendar"><pages:CalendarPage/></TabItem> 
+    <TabItem Header="Calendar"><pages:CalendarPage/></TabItem>
     <TabItem Header="Canvas"><pages:CanvasPage/></TabItem>
     <TabItem Header="Carousel"><pages:CarouselPage/></TabItem>
     <TabItem Header="CheckBox"><pages:CheckBoxPage/></TabItem>
@@ -26,4 +27,4 @@
     <TabItem Header="ToolTip"><pages:ToolTipPage/></TabItem>
     <TabItem Header="TreeView"><pages:TreeViewPage/></TabItem>
   </TabControl>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
new file mode 100644
index 0000000000..491f41ecbf
--- /dev/null
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
@@ -0,0 +1,55 @@
+<UserControl xmlns="https://github.com/avaloniaui">
+  <StackPanel Orientation="Vertical" Gap="4">
+    <TextBlock Classes="h1">AutoCompleteBox</TextBlock>
+    <TextBlock Classes="h2">A control into which the user can input text</TextBlock>
+
+    <StackPanel Orientation="Horizontal"
+              Margin="0,16,0,0"
+              HorizontalAlignment="Center"
+              Gap="8">
+      <StackPanel Orientation="Vertical">
+        
+        <TextBlock Text="MinimumPrefixLength: 1"/>
+        <AutoCompleteBox Width="200"
+                         Margin="0,0,0,8"
+                         MinimumPrefixLength="1"/>
+        <TextBlock Text="MinimumPrefixLength: 3"/>
+        <AutoCompleteBox Width="200"
+                         Margin="0,0,0,8"
+                         MinimumPrefixLength="3"/>
+        <TextBlock Text="MinimumPopulateDelay: 1 Second"/>
+        <AutoCompleteBox Width="200"
+                         Margin="0,0,0,8"
+                         MinimumPopulateDelay="1"/>
+        <TextBlock Text="MaxDropDownHeight: 60"/>
+        <AutoCompleteBox Width="200"
+                         Margin="0,0,0,8"
+                         MaxDropDownHeight="60"/>
+        <AutoCompleteBox Width="200"
+                         Margin="0,0,0,8"
+                         Watermark="Watermark"/>
+        <TextBlock Text="Disabled"/>
+        <AutoCompleteBox Width="200"
+                         IsEnabled="False"/>
+      </StackPanel>
+      
+
+      <StackPanel Orientation="Vertical">
+        <TextBlock Text="ValueMemeberSelector"/>
+        <AutoCompleteBox Width="200"
+                         Margin="0,0,0,8"
+                         ValueMemberSelector="Capital"/>
+        <TextBlock Text="ValueMemberBinding"/>
+        <AutoCompleteBox Width="200"
+                         Margin="0,0,0,8"
+                         ValueMemberBinding="{Binding Capital}"/>
+        <TextBlock Text="Multi-Binding"/>
+        <AutoCompleteBox Name="MultiBindingBox"
+                         Width="200"
+                         Margin="0,0,0,8"
+                         ValueMemberBinding="{Binding Capital}"
+                         FilterMode="Contains"/>
+      </StackPanel>
+    </StackPanel>
+  </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
new file mode 100644
index 0000000000..9f181d44f2
--- /dev/null
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
@@ -0,0 +1,125 @@
+using Avalonia.Controls;
+using Avalonia.LogicalTree;
+using Avalonia.Markup;
+using Avalonia.Markup.Xaml;
+using Avalonia.Markup.Xaml.Data;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ControlCatalog.Pages
+{
+    public class AutoCompleteBoxPage : UserControl
+    {
+        public class StateData
+        {
+            public string Name { get; private set; }
+            public string Abbreviation { get; private set; }
+            public string Capital { get; private set; }
+
+            public StateData(string name, string abbreviatoin, string capital)
+            {
+                Name = name;
+                Abbreviation = abbreviatoin;
+                Capital = capital;
+            }
+
+            public override string ToString()
+            {
+                return Name;
+            }
+        }
+
+        private StateData[] BuildAllStates()
+        {
+            return new StateData[]
+            {
+                new StateData("Alabama","AL","Montgomery"),
+                new StateData("Alaska","AK","Juneau"),
+                new StateData("Arizona","AZ","Phoenix"),
+                new StateData("Arkansas","AR","Little Rock"),
+                new StateData("California","CA","Sacramento"),
+                new StateData("Colorado","CO","Denver"),
+                new StateData("Connecticut","CT","Hartford"),
+                new StateData("Delaware","DE","Dover"),
+                new StateData("Florida","FL","Tallahassee"),
+                new StateData("Georgia","GA","Atlanta"),
+                new StateData("Hawaii","HI","Honolulu"),
+                new StateData("Idaho","ID","Boise"),
+                new StateData("Illinois","IL","Springfield"),
+                new StateData("Indiana","IN","Indianapolis"),
+                new StateData("Iowa","IA","Des Moines"),
+                new StateData("Kansas","KS","Topeka"),
+                new StateData("Kentucky","KY","Frankfort"),
+                new StateData("Louisiana","LA","Baton Rouge"),
+                new StateData("Maine","ME","Augusta"),
+                new StateData("Maryland","MD","Annapolis"),
+                new StateData("Massachusetts","MA","Boston"),
+                new StateData("Michigan","MI","Lansing"),
+                new StateData("Minnesota","MN","St. Paul"),
+                new StateData("Mississippi","MS","Jackson"),
+                new StateData("Missouri","MO","Jefferson City"),
+                new StateData("Montana","MT","Helena"),
+                new StateData("Nebraska","NE","Lincoln"),
+                new StateData("Nevada","NV","Carson City"),
+                new StateData("New Hampshire","NH","Concord"),
+                new StateData("New Jersey","NJ","Trenton"),
+                new StateData("New Mexico","NM","Santa Fe"),
+                new StateData("New York","NY","Albany"),
+                new StateData("North Carolina","NC","Raleigh"),
+                new StateData("North Dakota","ND","Bismarck"),
+                new StateData("Ohio","OH","Columbus"),
+                new StateData("Oklahoma","OK","Oklahoma City"),
+                new StateData("Oregon","OR","Salem"),
+                new StateData("Pennsylvania","PA","Harrisburg"),
+                new StateData("Rhode Island","RI","Providence"),
+                new StateData("South Carolina","SC","Columbia"),
+                new StateData("South Dakota","SD","Pierre"),
+                new StateData("Tennessee","TN","Nashville"),
+                new StateData("Texas","TX","Austin"),
+                new StateData("Utah","UT","Salt Lake City"),
+                new StateData("Vermont","VT","Montpelier"),
+                new StateData("Virginia","VA","Richmond"),
+                new StateData("Washington","WA","Olympia"),
+                new StateData("West Virginia","WV","Charleston"),
+                new StateData("Wisconsin","WI","Madison"),
+                new StateData("Wyoming","WY","Cheyenne"),
+            };
+        }
+        public StateData[] States { get; private set; }
+        
+        public AutoCompleteBoxPage()
+        {
+            this.InitializeComponent();
+
+            States = BuildAllStates();
+
+            foreach (AutoCompleteBox box in GetAllAutoCompleteBox())
+            {
+                box.Items = States;
+            }
+
+            var converter = new FuncMultiValueConverter<string, string>(parts =>
+            {
+                return String.Format("{0} ({1})", parts.ToArray());
+            });
+            var binding = new MultiBinding { Converter = converter };
+            binding.Bindings.Add(new Binding("Name"));
+            binding.Bindings.Add(new Binding("Abbreviation"));
+
+            var multibindingBox = this.FindControl<AutoCompleteBox>("MultiBindingBox");
+            multibindingBox.ValueMemberBinding = binding;
+        }
+        private IEnumerable<AutoCompleteBox> GetAllAutoCompleteBox()
+        {
+            return
+                this.GetLogicalDescendants()
+                    .OfType<AutoCompleteBox>();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/AutoCompleteBox.cs b/src/Avalonia.Controls/AutoCompleteBox.cs
new file mode 100644
index 0000000000..0e8b93146c
--- /dev/null
+++ b/src/Avalonia.Controls/AutoCompleteBox.cs
@@ -0,0 +1,2669 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Utils;
+using Avalonia.Data;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using Avalonia.Collections;
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Collections;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using Avalonia.Threading;
+using Avalonia.Controls.Templates;
+using Avalonia.VisualTree;
+using Avalonia.Utilities;
+using System.Globalization;
+using System.Collections.Specialized;
+using System.Reactive.Disposables;
+
+namespace Avalonia.Controls
+{
+    public class CancelableEventArgs : EventArgs
+    {
+        public bool Cancel { get; set; }
+
+        public CancelableEventArgs()
+            : base()
+        { }
+    }
+    
+    /// <summary>
+    /// Provides data for the
+    /// <see cref="E:Avalonia.Controls.AutoCompleteBox.Populated" />
+    /// event.
+    /// </summary>
+    public class PopulatedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the list of possible matches added to the drop-down portion of
+        /// the <see cref="T:Avalonia.Controls.AutoCompleteBox" />
+        /// control.
+        /// </summary>
+        /// <value>The list of possible matches added to the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" />.</value>
+        public IEnumerable Data { get; private set; }
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.PopulatedEventArgs" />.
+        /// </summary>
+        /// <param name="data">The list of possible matches added to the
+        /// drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.</param>
+        public PopulatedEventArgs(IEnumerable data)
+        {
+            Data = data;
+        }
+    }
+
+    /// <summary>
+    /// Provides data for the
+    /// <see cref="E:Avalonia.Controls.AutoCompleteBox.Populating" />
+    /// event.
+    /// </summary>
+    /// <QualityBand>Stable</QualityBand>
+    public class PopulatingEventArgs : CancelableEventArgs
+    {
+        /// <summary>
+        /// Gets the text that is used to determine which items to display in
+        /// the <see cref="T:Avalonia.Controls.AutoCompleteBox" />
+        /// control.
+        /// </summary>
+        /// <value>The text that is used to determine which items to display in
+        /// the <see cref="T:Avalonia.Controls.AutoCompleteBox" />.</value>
+        public string Parameter { get; private set; }
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.PopulatingEventArgs" />.
+        /// </summary>
+        /// <param name="parameter">The value of the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.SearchText" />
+        /// property, which is used to filter items for the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.</param>
+        public PopulatingEventArgs(string parameter)
+        {
+            Parameter = parameter;
+        }
+    }
+
+    /// <summary>
+    /// Represents the filter used by the
+    /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control to
+    /// determine whether an item is a possible match for the specified text.
+    /// </summary>
+    /// <returns>true to indicate <paramref name="item" /> is a possible match
+    /// for <paramref name="search" />; otherwise false.</returns>
+    /// <param name="search">The string used as the basis for filtering.</param>
+    /// <param name="item">The item that is compared with the
+    /// <paramref name="search" /> parameter.</param>
+    /// <typeparam name="T">The type used for filtering the
+    /// <see cref="T:Avalonia.Controls.AutoCompleteBox" />. This type can
+    /// be either a string or an object.</typeparam>
+    /// <QualityBand>Stable</QualityBand>
+    public delegate bool AutoCompleteFilterPredicate<T>(string search, T item);
+
+    /// <summary>
+    /// Specifies how text in the text box portion of the
+    /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control is used
+    /// to filter items specified by the
+    /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+    /// property for display in the drop-down.
+    /// </summary>
+    /// <QualityBand>Stable</QualityBand>
+    public enum AutoCompleteFilterMode
+    {
+        /// <summary>
+        /// Specifies that no filter is used. All items are returned.
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// Specifies a culture-sensitive, case-insensitive filter where the
+        /// returned items start with the specified text. The filter uses the
+        /// <see cref="M:System.String.StartsWith(System.String,System.StringComparison)" />
+        /// method, specifying
+        /// <see cref="P:System.StringComparer.CurrentCultureIgnoreCase" /> as
+        /// the string comparison criteria.
+        /// </summary>
+        StartsWith = 1,
+
+        /// <summary>
+        /// Specifies a culture-sensitive, case-sensitive filter where the
+        /// returned items start with the specified text. The filter uses the
+        /// <see cref="M:System.String.StartsWith(System.String,System.StringComparison)" />
+        /// method, specifying
+        /// <see cref="P:System.StringComparer.CurrentCulture" /> as the string
+        /// comparison criteria.
+        /// </summary>
+        StartsWithCaseSensitive = 2,
+
+        /// <summary>
+        /// Specifies an ordinal, case-insensitive filter where the returned
+        /// items start with the specified text. The filter uses the
+        /// <see cref="M:System.String.StartsWith(System.String,System.StringComparison)" />
+        /// method, specifying
+        /// <see cref="P:System.StringComparer.OrdinalIgnoreCase" /> as the
+        /// string comparison criteria.
+        /// </summary>
+        StartsWithOrdinal = 3,
+
+        /// <summary>
+        /// Specifies an ordinal, case-sensitive filter where the returned items
+        /// start with the specified text. The filter uses the
+        /// <see cref="M:System.String.StartsWith(System.String,System.StringComparison)" />
+        /// method, specifying <see cref="P:System.StringComparer.Ordinal" /> as
+        /// the string comparison criteria.
+        /// </summary>
+        StartsWithOrdinalCaseSensitive = 4,
+
+        /// <summary>
+        /// Specifies a culture-sensitive, case-insensitive filter where the
+        /// returned items contain the specified text.
+        /// </summary>
+        Contains = 5,
+
+        /// <summary>
+        /// Specifies a culture-sensitive, case-sensitive filter where the
+        /// returned items contain the specified text.
+        /// </summary>
+        ContainsCaseSensitive = 6,
+
+        /// <summary>
+        /// Specifies an ordinal, case-insensitive filter where the returned
+        /// items contain the specified text.
+        /// </summary>
+        ContainsOrdinal = 7,
+
+        /// <summary>
+        /// Specifies an ordinal, case-sensitive filter where the returned items
+        /// contain the specified text.
+        /// </summary>
+        ContainsOrdinalCaseSensitive = 8,
+
+        /// <summary>
+        /// Specifies a culture-sensitive, case-insensitive filter where the
+        /// returned items equal the specified text. The filter uses the
+        /// <see cref="M:System.String.Equals(System.String,System.StringComparison)" />
+        /// method, specifying
+        /// <see cref="P:System.StringComparer.CurrentCultureIgnoreCase" /> as
+        /// the search comparison criteria.
+        /// </summary>
+        Equals = 9,
+
+        /// <summary>
+        /// Specifies a culture-sensitive, case-sensitive filter where the
+        /// returned items equal the specified text. The filter uses the
+        /// <see cref="M:System.String.Equals(System.String,System.StringComparison)" />
+        /// method, specifying
+        /// <see cref="P:System.StringComparer.CurrentCulture" /> as the string
+        /// comparison criteria.
+        /// </summary>
+        EqualsCaseSensitive = 10,
+
+        /// <summary>
+        /// Specifies an ordinal, case-insensitive filter where the returned
+        /// items equal the specified text. The filter uses the
+        /// <see cref="M:System.String.Equals(System.String,System.StringComparison)" />
+        /// method, specifying
+        /// <see cref="P:System.StringComparer.OrdinalIgnoreCase" /> as the
+        /// string comparison criteria.
+        /// </summary>
+        EqualsOrdinal = 11,
+
+        /// <summary>
+        /// Specifies an ordinal, case-sensitive filter where the returned items
+        /// equal the specified text. The filter uses the
+        /// <see cref="M:System.String.Equals(System.String,System.StringComparison)" />
+        /// method, specifying <see cref="P:System.StringComparer.Ordinal" /> as
+        /// the string comparison criteria.
+        /// </summary>
+        EqualsOrdinalCaseSensitive = 12,
+
+        /// <summary>
+        /// Specifies that a custom filter is used. This mode is used when the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.TextFilter" />
+        /// or
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemFilter" />
+        /// properties are set.
+        /// </summary>
+        Custom = 13,
+    }
+
+    /// <summary>
+    /// Represents a control that provides a text box for user input and a
+    /// drop-down that contains possible matches based on the input in the text
+    /// box.
+    /// </summary>
+    public class AutoCompleteBox : TemplatedControl
+    {
+        /// <summary>
+        /// Specifies the name of the selection adapter TemplatePart.
+        /// </summary>
+        private const string ElementSelectionAdapter = "PART_SelectionAdapter";
+
+        /// <summary>
+        /// Specifies the name of the Selector TemplatePart.
+        /// </summary>
+        private const string ElementSelector = "PART_SelectingItemsControl";
+
+        /// <summary>
+        /// Specifies the name of the Popup TemplatePart.
+        /// </summary>
+        private const string ElementPopup = "PART_Popup";
+        
+        /// <summary>
+        /// The name for the text box part.
+        /// </summary>
+        private const string ElementTextBox = "PART_TextBox";
+
+        private IEnumerable _itemsEnumerable;
+
+        /// <summary>
+        /// Gets or sets a local cached copy of the items data.
+        /// </summary>
+        private List<object> _items;
+
+        /// <summary>
+        /// Gets or sets the observable collection that contains references to 
+        /// all of the items in the generated view of data that is provided to 
+        /// the selection-style control adapter.
+        /// </summary>
+        private AvaloniaList<object> _view;
+
+        /// <summary>
+        /// Gets or sets a value to ignore a number of pending change handlers. 
+        /// The value is decremented after each use. This is used to reset the 
+        /// value of properties without performing any of the actions in their 
+        /// change handlers.
+        /// </summary>
+        /// <remarks>The int is important as a value because the TextBox 
+        /// TextChanged event does not immediately fire, and this will allow for
+        /// nested property changes to be ignored.</remarks>
+        private int _ignoreTextPropertyChange;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to ignore calling a pending 
+        /// change handlers. 
+        /// </summary>
+        private bool _ignorePropertyChange;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to ignore the selection 
+        /// changed event.
+        /// </summary>
+        private bool _ignoreTextSelectionChange;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to skip the text update 
+        /// processing when the selected item is updated.
+        /// </summary>
+        private bool _skipSelectedItemTextUpdate;
+
+        /// <summary>
+        /// Gets or sets the last observed text box selection start location.
+        /// </summary>
+        private int _textSelectionStart;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the user initiated the 
+        /// current populate call.
+        /// </summary>
+        private bool _userCalledPopulate;
+
+        /// <summary>
+        /// A value indicating whether the popup has been opened at least once.
+        /// </summary>
+        private bool _popupHasOpened;
+
+        /// <summary>
+        /// Gets or sets the DispatcherTimer used for the MinimumPopulateDelay 
+        /// condition for auto completion.
+        /// </summary>
+        private DispatcherTimer _delayTimer;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether a read-only dependency 
+        /// property change handler should allow the value to be set.  This is 
+        /// used to ensure that read-only properties cannot be changed via 
+        /// SetValue, etc.
+        /// </summary>
+        private bool _allowWrite;
+
+        /// <summary>
+        /// The TextBox template part.
+        /// </summary>
+        private TextBox _textBox;
+        private IDisposable _textBoxSubscriptions;
+
+        /// <summary>
+        /// The SelectionAdapter.
+        /// </summary>
+        private ISelectionAdapter _adapter;
+
+        /// <summary>
+        /// A control that can provide updated string values from a binding.
+        /// </summary>
+        private BindingEvaluator<string> _valueBindingEvaluator;
+
+        /// <summary>
+        /// A weak subscription for the collection changed event.
+        /// </summary>
+        private IDisposable _collectionChangeSubscription;
+
+        private IMemberSelector _valueMemberSelector;
+
+        private bool _itemTemplateIsFromValueMemeberBinding = true;
+        private bool _settingItemTemplateFromValueMemeberBinding;
+
+        private object _selectedItem;
+        private bool _isDropDownOpen;
+        private bool _isFocused = false;
+
+        private string _text = string.Empty;
+        private string _searchText = string.Empty;
+
+        private AutoCompleteFilterPredicate<object> _itemFilter;
+        private AutoCompleteFilterPredicate<string> _textFilter = AutoCompleteSearch.GetFilter(AutoCompleteFilterMode.StartsWith);
+
+        public static readonly RoutedEvent<SelectionChangedEventArgs> SelectionChangedEvent =
+            RoutedEvent.Register<SelectionChangedEventArgs>(nameof(SelectionChanged), RoutingStrategies.Bubble, typeof(AutoCompleteBox));
+
+        public static readonly StyledProperty<string> WatermarkProperty =
+            TextBox.WatermarkProperty.AddOwner<AutoCompleteBox>();
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.MinimumPrefixLength" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.MinimumPrefixLength" />
+        /// dependency property.</value>
+        public static readonly StyledProperty<int> MinimumPrefixLengthProperty =
+            AvaloniaProperty.Register<AutoCompleteBox, int>(
+                nameof(MinimumPrefixLength), 1,
+                validate: ValidateMinimumPrefixLength);
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.MinimumPopulateDelay" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.MinimumPopulateDelay" />
+        /// dependency property.</value>
+        public static readonly StyledProperty<TimeSpan> MinimumPopulateDelayProperty =
+            AvaloniaProperty.Register<AutoCompleteBox, TimeSpan>(
+                nameof(MinimumPopulateDelay), 
+                TimeSpan.Zero,
+                validate: ValidateMinimumPopulateDelay);
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.MaxDropDownHeight" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.MaxDropDownHeight" />
+        /// dependency property.</value>
+        public static readonly StyledProperty<double> MaxDropDownHeightProperty =
+            AvaloniaProperty.Register<AutoCompleteBox, double>(
+                nameof(MaxDropDownHeight), 
+                double.PositiveInfinity,
+                validate: ValidateMaxDropDownHeight);
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsTextCompletionEnabled" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsTextCompletionEnabled" />
+        /// dependency property.</value>
+        public static readonly StyledProperty<bool> IsTextCompletionEnabledProperty =
+            AvaloniaProperty.Register<AutoCompleteBox, bool>(nameof(IsTextCompletionEnabled));
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemTemplate" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemTemplate" />
+        /// dependency property.</value>
+        public static readonly StyledProperty<IDataTemplate> ItemTemplateProperty =
+            AvaloniaProperty.Register<AutoCompleteBox, IDataTemplate>(nameof(ItemTemplate));
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
+        /// dependency property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, bool> IsDropDownOpenProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, bool>(
+                nameof(IsDropDownOpen),
+                o => o.IsDropDownOpen,
+                (o, v) => o.IsDropDownOpen = v);
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.SelectedItem" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.SelectedItem" />
+        /// dependency property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, object> SelectedItemProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, object>(
+                nameof(SelectedItem),
+                o => o.SelectedItem,
+                (o, v) => o.SelectedItem = v);
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.Text" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.Text" />
+        /// dependency property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, string> TextProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, string>(
+                nameof(Text),
+                o => o.Text,
+                (o, v) => o.Text = v);
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.SearchText" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.SearchText" />
+        /// dependency property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, string> SearchTextProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, string>(
+                nameof(SearchText),
+                o => o.SearchText,
+                unsetValue: string.Empty);
+
+        /// <summary>
+        /// Gets the identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.FilterMode" />
+        /// dependency property.
+        /// </summary>
+        public static readonly StyledProperty<AutoCompleteFilterMode> FilterModeProperty =
+            AvaloniaProperty.Register<AutoCompleteBox, AutoCompleteFilterMode>(
+                nameof(FilterMode),
+                defaultValue: AutoCompleteFilterMode.StartsWith,
+                validate: ValidateFilterMode);
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemFilter" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemFilter" />
+        /// dependency property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, AutoCompleteFilterPredicate<object>> ItemFilterProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, AutoCompleteFilterPredicate<object>>(
+                nameof(ItemFilter),
+                o => o.ItemFilter,
+                (o, v) => o.ItemFilter = v);
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.TextFilter" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.TextFilter" />
+        /// dependency property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, AutoCompleteFilterPredicate<string>> TextFilterProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, AutoCompleteFilterPredicate<string>>(
+                nameof(TextFilter),
+                o => o.TextFilter,
+                (o, v) => o.TextFilter = v,
+                unsetValue: AutoCompleteSearch.GetFilter(AutoCompleteFilterMode.StartsWith));
+
+        /// <summary>
+        /// Identifies the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+        /// dependency property.
+        /// </summary>
+        /// <value>The identifier for the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+        /// dependency property.</value>
+        public static readonly DirectProperty<AutoCompleteBox, IEnumerable> ItemsProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, IEnumerable>(
+                nameof(Items),
+                o => o.Items,
+                (o, v) => o.Items = v);
+
+        public static readonly DirectProperty<AutoCompleteBox, IMemberSelector> ValueMemberSelectorProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, IMemberSelector>(
+                nameof(ValueMemberSelector),
+                o => o.ValueMemberSelector,
+                (o, v) => o.ValueMemberSelector = v);
+
+        private static int ValidateMinimumPrefixLength(AutoCompleteBox control, int value)
+        {
+            Contract.Requires<ArgumentOutOfRangeException>(value >= -1);
+
+            return value;
+        }
+
+        private static TimeSpan ValidateMinimumPopulateDelay(AutoCompleteBox control, TimeSpan value)
+        {
+            Contract.Requires<ArgumentOutOfRangeException>(value.TotalMilliseconds >= 0.0);
+
+            return value;
+        }
+
+        private static double ValidateMaxDropDownHeight(AutoCompleteBox control, double value)
+        {
+            Contract.Requires<ArgumentOutOfRangeException>(value >= 0.0);
+
+            return value;
+        }
+                
+        private static bool IsValidFilterMode(AutoCompleteFilterMode mode)
+        {
+            switch (mode)
+            {
+                case AutoCompleteFilterMode.None:
+                case AutoCompleteFilterMode.StartsWith:
+                case AutoCompleteFilterMode.StartsWithCaseSensitive:
+                case AutoCompleteFilterMode.StartsWithOrdinal:
+                case AutoCompleteFilterMode.StartsWithOrdinalCaseSensitive:
+                case AutoCompleteFilterMode.Contains:
+                case AutoCompleteFilterMode.ContainsCaseSensitive:
+                case AutoCompleteFilterMode.ContainsOrdinal:
+                case AutoCompleteFilterMode.ContainsOrdinalCaseSensitive:
+                case AutoCompleteFilterMode.Equals:
+                case AutoCompleteFilterMode.EqualsCaseSensitive:
+                case AutoCompleteFilterMode.EqualsOrdinal:
+                case AutoCompleteFilterMode.EqualsOrdinalCaseSensitive:
+                case AutoCompleteFilterMode.Custom:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        private static AutoCompleteFilterMode ValidateFilterMode(AutoCompleteBox control, AutoCompleteFilterMode value)
+        {
+            Contract.Requires<ArgumentException>(IsValidFilterMode(value));
+
+            return value;
+        }
+
+        /// <summary>
+        /// Handle the change of the IsEnabled property.
+        /// </summary>
+        /// <param name="e">The event data.</param>
+        private void OnControlIsEnabledChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            bool isEnabled = (bool)e.NewValue;
+            if (!isEnabled)
+            {
+                IsDropDownOpen = false;
+            }
+        }
+
+        /// <summary>
+        /// MinimumPopulateDelayProperty property changed handler. Any current 
+        /// dispatcher timer will be stopped. The timer will not be restarted 
+        /// until the next TextUpdate call by the user.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        private void OnMinimumPopulateDelayChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var newValue = (TimeSpan)e.NewValue;
+                        
+            // Stop any existing timer
+            if (_delayTimer != null)
+            {
+                _delayTimer.Stop();
+
+                if (newValue == TimeSpan.Zero)
+                {
+                    _delayTimer = null;
+                }
+            }
+
+            if (newValue > TimeSpan.Zero)
+            {
+                // Create or clear a dispatcher timer instance
+                if (_delayTimer == null)
+                {
+                    _delayTimer = new DispatcherTimer();
+                    _delayTimer.Tick += PopulateDropDown;
+                }
+
+                // Set the new tick interval
+                _delayTimer.Interval = newValue;
+            }
+        }
+
+        /// <summary>
+        /// IsDropDownOpenProperty property changed handler.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        private void OnIsDropDownOpenChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            // Ignore the change if requested
+            if (_ignorePropertyChange)
+            {
+                _ignorePropertyChange = false;
+                return;
+            }
+
+            bool oldValue = (bool)e.OldValue;
+            bool newValue = (bool)e.NewValue;
+
+            if (newValue)
+            {
+                TextUpdated(Text, true);
+            }
+            else
+            {
+                ClosingDropDown(oldValue);
+            }
+
+            UpdatePseudoClasses();
+        }
+
+        private void OnSelectedItemPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (_ignorePropertyChange)
+            {
+                _ignorePropertyChange = false;
+                return;
+            }
+
+            // Update the text display
+            if (_skipSelectedItemTextUpdate)
+            {
+                _skipSelectedItemTextUpdate = false;
+            }
+            else
+            {
+                OnSelectedItemChanged(e.NewValue);
+            }
+
+            // Fire the SelectionChanged event
+            List<object> removed = new List<object>();
+            if (e.OldValue != null)
+            {
+                removed.Add(e.OldValue);
+            }
+
+            List<object> added = new List<object>();
+            if (e.NewValue != null)
+            {
+                added.Add(e.NewValue);
+            }
+
+            OnSelectionChanged(new SelectionChangedEventArgs(SelectionChangedEvent, removed, added));
+        }
+
+        /// <summary>
+        /// TextProperty property changed handler.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        private void OnTextPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            TextUpdated((string)e.NewValue, false);
+        }
+
+        private void OnSearchTextPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (_ignorePropertyChange)
+            {
+                _ignorePropertyChange = false;
+                return;
+            }
+
+            // Ensure the property is only written when expected
+            if (!_allowWrite)
+            {
+                // Reset the old value before it was incorrectly written
+                _ignorePropertyChange = true;
+                SetValue(e.Property, e.OldValue);
+
+                throw new InvalidOperationException("Cannot set read-only property SearchText.");
+            }
+        }
+
+        /// <summary>
+        /// FilterModeProperty property changed handler.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        private void OnFilterModePropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            AutoCompleteFilterMode mode = (AutoCompleteFilterMode)e.NewValue;
+
+            // Sets the filter predicate for the new value
+            TextFilter = AutoCompleteSearch.GetFilter(mode);
+        }
+
+        /// <summary>
+        /// ItemFilterProperty property changed handler.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        private void OnItemFilterPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            AutoCompleteFilterPredicate<object> value = e.NewValue as AutoCompleteFilterPredicate<object>;
+
+            // If null, revert to the "None" predicate
+            if (value == null)
+            {
+                FilterMode = AutoCompleteFilterMode.None;
+            }
+            else
+            {
+                FilterMode = AutoCompleteFilterMode.Custom;
+                TextFilter = null;
+            }
+        }
+
+        /// <summary>
+        /// ItemsSourceProperty property changed handler.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        private void OnItemsPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            OnItemsChanged((IEnumerable)e.NewValue);
+        }
+
+        private void OnItemTemplatePropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (!_settingItemTemplateFromValueMemeberBinding)
+                _itemTemplateIsFromValueMemeberBinding = false;
+        }
+        private void OnValueMemberBindingChanged(IBinding value)
+        {
+            if(_itemTemplateIsFromValueMemeberBinding)
+            {
+                var template =
+                    new FuncDataTemplate(
+                        typeof(object),
+                        o =>
+                        {
+                            var control = new ContentControl();
+                            control.Bind(ContentControl.ContentProperty, value);
+                            return control;
+                        });
+
+                _settingItemTemplateFromValueMemeberBinding = true;
+                ItemTemplate = template;
+                _settingItemTemplateFromValueMemeberBinding = false;
+            }
+        }
+
+        static AutoCompleteBox()
+        {
+            FocusableProperty.OverrideDefaultValue<AutoCompleteBox>(true);
+
+            MinimumPopulateDelayProperty.Changed.AddClassHandler<AutoCompleteBox>(x => x.OnMinimumPopulateDelayChanged);
+            IsDropDownOpenProperty.Changed.AddClassHandler<AutoCompleteBox>(x => x.OnIsDropDownOpenChanged);
+            SelectedItemProperty.Changed.AddClassHandler<AutoCompleteBox>(x => x.OnSelectedItemPropertyChanged);
+            TextProperty.Changed.AddClassHandler<AutoCompleteBox>(x => x.OnTextPropertyChanged);
+            SearchTextProperty.Changed.AddClassHandler<AutoCompleteBox>(x => x.OnSearchTextPropertyChanged);
+            FilterModeProperty.Changed.AddClassHandler<AutoCompleteBox>(x => x.OnFilterModePropertyChanged);
+            ItemFilterProperty.Changed.AddClassHandler<AutoCompleteBox>(x => x.OnItemFilterPropertyChanged);
+            ItemsProperty.Changed.AddClassHandler<AutoCompleteBox>(x => x.OnItemsPropertyChanged);
+            IsEnabledProperty.Changed.AddClassHandler<AutoCompleteBox>(x => x.OnControlIsEnabledChanged);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> class.
+        /// </summary>
+        public AutoCompleteBox()
+        {
+            ClearView();
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum number of characters required to be entered
+        /// in the text box before the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> displays
+        /// possible matches.
+        /// matches.
+        /// </summary>
+        /// <value>
+        /// The minimum number of characters to be entered in the text box
+        /// before the <see cref="T:Avalonia.Controls.AutoCompleteBox" />
+        /// displays possible matches. The default is 1.
+        /// </value>
+        /// <remarks>
+        /// If you set MinimumPrefixLength to -1, the AutoCompleteBox will
+        /// not provide possible matches. There is no maximum value, but
+        /// setting MinimumPrefixLength to value that is too large will
+        /// prevent the AutoCompleteBox from providing possible matches as well.
+        /// </remarks>
+        public int MinimumPrefixLength
+        {
+            get { return GetValue(MinimumPrefixLengthProperty); }
+            set { SetValue(MinimumPrefixLengthProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the first possible match
+        /// found during the filtering process will be displayed automatically
+        /// in the text box.
+        /// </summary>
+        /// <value>
+        /// True if the first possible match found will be displayed
+        /// automatically in the text box; otherwise, false. The default is
+        /// false.
+        /// </value>
+        public bool IsTextCompletionEnabled
+        {
+            get { return GetValue(IsTextCompletionEnabledProperty); }
+            set { SetValue(IsTextCompletionEnabledProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="T:Avalonia.DataTemplate" /> used
+        /// to display each item in the drop-down portion of the control.
+        /// </summary>
+        /// <value>The <see cref="T:Avalonia.DataTemplate" /> used to
+        /// display each item in the drop-down. The default is null.</value>
+        /// <remarks>
+        /// You use the ItemTemplate property to specify the visualization 
+        /// of the data objects in the drop-down portion of the AutoCompleteBox 
+        /// control. If your AutoCompleteBox is bound to a collection and you 
+        /// do not provide specific display instructions by using a 
+        /// DataTemplate, the resulting UI of each item is a string 
+        /// representation of each object in the underlying collection. 
+        /// </remarks>
+        public IDataTemplate ItemTemplate
+        {
+            get { return GetValue(ItemTemplateProperty); }
+            set { SetValue(ItemTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum delay, after text is typed
+        /// in the text box before the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control
+        /// populates the list of possible matches in the drop-down.
+        /// </summary>
+        /// <value>The minimum delay, after text is typed in
+        /// the text box, but before the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> populates
+        /// the list of possible matches in the drop-down. The default is 0.</value>
+        public TimeSpan MinimumPopulateDelay
+        {
+            get { return GetValue(MinimumPopulateDelayProperty); }
+            set { SetValue(MinimumPopulateDelayProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum height of the drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.
+        /// </summary>
+        /// <value>The maximum height of the drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.
+        /// The default is <see cref="F:System.Double.PositiveInfinity" />.</value>
+        /// <exception cref="T:System.ArgumentException">The specified value is less than 0.</exception>
+        public double MaxDropDownHeight
+        {
+            get { return GetValue(MaxDropDownHeightProperty); }
+            set { SetValue(MaxDropDownHeightProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the drop-down portion of
+        /// the control is open.
+        /// </summary>
+        /// <value>
+        /// True if the drop-down is open; otherwise, false. The default is
+        /// false.
+        /// </value>
+        public bool IsDropDownOpen
+        {
+            get { return  _isDropDownOpen; }
+            set { SetAndRaise(IsDropDownOpenProperty, ref  _isDropDownOpen, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the  <see cref="T:Avalonia.Data.Binding" /> that
+        /// is used to get the values for display in the text portion of
+        /// the <see cref="T:Avalonia.Controls.AutoCompleteBox" />
+        /// control.
+        /// </summary>
+        /// <value>The <see cref="T:Avalonia.Data.IBinding" /> object used
+        /// when binding to a collection property.</value>
+        [AssignBinding]
+        public IBinding ValueMemberBinding
+        {
+            get { return _valueBindingEvaluator?.ValueBinding; }
+            set
+            {
+                if (ValueMemberBinding != value)
+                {
+                    _valueBindingEvaluator = new BindingEvaluator<string>(value);
+                    OnValueMemberBindingChanged(value);
+                }
+            }
+        }
+                
+        /// <summary>
+        /// Gets or sets the MemberSelector that is used to get values for
+        /// display in the text portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.
+        /// </summary>
+        /// <value>The MemberSelector that is used to get values for display in
+        /// the text portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.</value>
+        public IMemberSelector ValueMemberSelector
+        {
+            get { return _valueMemberSelector; }
+            set { SetAndRaise(ValueMemberSelectorProperty, ref _valueMemberSelector, value); }
+        }
+        
+        /// <summary>
+        /// Gets or sets the selected item in the drop-down.
+        /// </summary>
+        /// <value>The selected item in the drop-down.</value>
+        /// <remarks>
+        /// If the IsTextCompletionEnabled property is true and text typed by 
+        /// the user matches an item in the ItemsSource collection, which is 
+        /// then displayed in the text box, the SelectedItem property will be 
+        /// a null reference.
+        /// </remarks>
+        public object SelectedItem
+        {
+            get { return _selectedItem; }
+            set { SetAndRaise(SelectedItemProperty, ref _selectedItem, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the text in the text box portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.
+        /// </summary>
+        /// <value>The text in the text box portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.</value>
+        public string Text
+        {
+            get { return _text; }
+            set { SetAndRaise(TextProperty, ref _text, value); }
+        }
+
+        /// <summary>
+        /// Gets the text that is used to filter items in the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+        /// item collection.
+        /// </summary>
+        /// <value>The text that is used to filter items in the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+        /// item collection.</value>
+        /// <remarks>
+        /// The SearchText value is typically the same as the 
+        /// Text property, but is set after the TextChanged event occurs 
+        /// and before the Populating event.
+        /// </remarks>
+        public string SearchText
+        {
+            get { return _searchText; }
+            private set
+            {
+                try
+                {
+                    _allowWrite = true;
+                    SetAndRaise(SearchTextProperty, ref _searchText, value);
+                }
+                finally
+                {
+                    _allowWrite = false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets how the text in the text box is used to filter items
+        /// specified by the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+        /// property for display in the drop-down.
+        /// </summary>
+        /// <value>One of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteFilterMode" />
+        /// values The default is
+        /// <see cref="F:Avalonia.Controls.AutoCompleteFilterMode.StartsWith" />.</value>
+        /// <exception cref="T:System.ArgumentException">The specified value is
+        /// not a valid
+        /// <see cref="T:Avalonia.Controls.AutoCompleteFilterMode" />.</exception>
+        /// <remarks>
+        /// Use the FilterMode property to specify how possible matches are 
+        /// filtered. For example, possible matches can be filtered in a 
+        /// predefined or custom way. The search mode is automatically set to 
+        /// Custom if you set the ItemFilter property. 
+        /// </remarks>
+        public AutoCompleteFilterMode FilterMode
+        {
+            get { return GetValue(FilterModeProperty); }
+            set { SetValue(FilterModeProperty, value); }
+        }
+
+        public string Watermark
+        {
+            get { return GetValue(WatermarkProperty); }
+            set { SetValue(WatermarkProperty, value); }
+        }
+        
+        /// <summary>
+        /// Gets or sets the custom method that uses user-entered text to filter
+        /// the items specified by the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+        /// property for display in the drop-down.
+        /// </summary>
+        /// <value>The custom method that uses the user-entered text to filter
+        /// the items specified by the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+        /// property. The default is null.</value>
+        /// <remarks>
+        /// The filter mode is automatically set to Custom if you set the 
+        /// ItemFilter property. 
+        /// </remarks>
+        public AutoCompleteFilterPredicate<object> ItemFilter
+        {
+            get { return _itemFilter; }
+            set { SetAndRaise(ItemFilterProperty, ref _itemFilter, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the custom method that uses the user-entered text to
+        /// filter items specified by the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+        /// property in a text-based way for display in the drop-down.
+        /// </summary>
+        /// <value>The custom method that uses the user-entered text to filter
+        /// items specified by the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ItemsSource" />
+        /// property in a text-based way for display in the drop-down.</value>
+        /// <remarks>
+        /// The search mode is automatically set to Custom if you set the 
+        /// TextFilter property. 
+        /// </remarks>
+        public AutoCompleteFilterPredicate<string> TextFilter
+        {
+            get { return _textFilter; }
+            set { SetAndRaise(TextFilterProperty, ref _textFilter, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a collection that is used to generate the items for the
+        /// drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.
+        /// </summary>
+        /// <value>The collection that is used to generate the items of the
+        /// drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.</value>
+        public IEnumerable Items
+        {
+            get { return _itemsEnumerable; }
+            set { SetAndRaise(ItemsProperty, ref _itemsEnumerable, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the drop down popup control.
+        /// </summary>
+        private Popup DropDownPopup { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Text template part.
+        /// </summary>
+        private TextBox TextBox
+        {
+            get { return _textBox; }
+            set
+            {
+                _textBoxSubscriptions?.Dispose();
+                _textBox = value;
+
+                // Attach handlers
+                if (_textBox != null)
+                {
+                    _textBoxSubscriptions =
+                        _textBox.GetObservable(TextBox.TextProperty)
+                                .Subscribe(_ => OnTextBoxTextChanged());
+                    
+                    if (Text != null)
+                    {
+                        UpdateTextValue(Text);
+                    }
+                }
+            }
+        }
+
+        private int TextBoxSelectionStart
+        {
+            get
+            {
+                if (TextBox != null)
+                {
+                    return Math.Min(TextBox.SelectionStart, TextBox.SelectionEnd);
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+        }
+        private int TextBoxSelectionLength
+        {
+            get
+            {
+                if (TextBox != null)
+                {
+                    return Math.Abs(TextBox.SelectionEnd - TextBox.SelectionStart);
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the selection adapter used to populate the drop-down
+        /// with a list of selectable items.
+        /// </summary>
+        /// <value>The selection adapter used to populate the drop-down with a
+        /// list of selectable items.</value>
+        /// <remarks>
+        /// You can use this property when you create an automation peer to 
+        /// use with AutoCompleteBox or deriving from AutoCompleteBox to 
+        /// create a custom control.
+        /// </remarks>
+        protected ISelectionAdapter SelectionAdapter
+        {
+            get { return _adapter; }
+            set
+            {
+                if (_adapter != null)
+                {
+                    _adapter.SelectionChanged -= OnAdapterSelectionChanged;
+                    _adapter.Commit -= OnAdapterSelectionComplete;
+                    _adapter.Cancel -= OnAdapterSelectionCanceled;
+                    _adapter.Cancel -= OnAdapterSelectionComplete;
+                    _adapter.Items = null;
+                }
+
+                _adapter = value;
+
+                if (_adapter != null)
+                {
+                    _adapter.SelectionChanged += OnAdapterSelectionChanged;
+                    _adapter.Commit += OnAdapterSelectionComplete;
+                    _adapter.Cancel += OnAdapterSelectionCanceled;
+                    _adapter.Cancel += OnAdapterSelectionComplete;
+                    _adapter.Items = _view;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the
+        /// <see cref="T:Avalonia.Controls.ISelectionAdapter" /> part, if
+        /// possible.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="T:Avalonia.Controls.ISelectionAdapter" /> object,
+        /// if possible. Otherwise, null.
+        /// </returns>
+        protected virtual ISelectionAdapter GetSelectionAdapterPart(INameScope nameScope)
+        {
+            ISelectionAdapter adapter = null;
+            SelectingItemsControl selector = nameScope.Find<SelectingItemsControl>(ElementSelector);
+            if (selector != null)
+            {
+                // Check if it is already an IItemsSelector
+                adapter = selector as ISelectionAdapter;
+                if (adapter == null)
+                {
+                    // Built in support for wrapping a Selector control
+                    adapter = new SelectingItemsControlSelectionAdapter(selector);
+                }
+            }
+            if (adapter == null)
+            {
+                adapter = nameScope.Find<ISelectionAdapter>(ElementSelectionAdapter);
+            }
+            return adapter;
+        }
+
+        /// <summary>
+        /// Builds the visual tree for the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control
+        /// when a new template is applied.
+        /// </summary>
+        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        {
+
+            if (DropDownPopup != null)
+            {
+                DropDownPopup.Closed -= DropDownPopup_Closed;
+                DropDownPopup = null;
+            }
+
+            // Set the template parts. Individual part setters remove and add 
+            // any event handlers.
+            Popup popup = e.NameScope.Find<Popup>(ElementPopup);
+            if (popup != null)
+            {
+                DropDownPopup = popup;
+                DropDownPopup.Closed += DropDownPopup_Closed;
+            }
+
+            SelectionAdapter = GetSelectionAdapterPart(e.NameScope);
+            TextBox = e.NameScope.Find<TextBox>(ElementTextBox);
+            
+            // If the drop down property indicates that the popup is open,
+            // flip its value to invoke the changed handler.
+            if (IsDropDownOpen && DropDownPopup != null && !DropDownPopup.IsOpen)
+            {
+                OpeningDropDown(false);
+            }
+
+            base.OnTemplateApplied(e);
+        }
+
+        /// <summary>
+        /// Provides handling for the
+        /// <see cref="E:Avalonia.InputElement.KeyDown" /> event.
+        /// </summary>
+        /// <param name="e">A <see cref="T:Avalonia.Input.KeyEventArgs" />
+        /// that contains the event data.</param>
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            Contract.Requires<ArgumentNullException>(e != null);
+
+            base.OnKeyDown(e);
+
+            if (e.Handled || !IsEnabled)
+            {
+                return;
+            }
+
+            // The drop down is open, pass along the key event arguments to the
+            // selection adapter. If it isn't handled by the adapter's logic,
+            // then we handle some simple navigation scenarios for controlling
+            // the drop down.
+            if (IsDropDownOpen)
+            {
+                if (SelectionAdapter != null)
+                {
+                    SelectionAdapter.HandleKeyDown(e);
+                    if (e.Handled)
+                    {
+                        return;
+                    }
+                }
+
+                if (e.Key == Key.Escape)
+                {
+                    OnAdapterSelectionCanceled(this, new RoutedEventArgs());
+                    e.Handled = true;
+                }
+            }
+            else
+            {
+                // The drop down is not open, the Down key will toggle it open.
+                if (e.Key == Key.Down)
+                {
+                    IsDropDownOpen = true;
+                    e.Handled = true;
+                }
+            }
+
+            // Standard drop down navigation
+            switch (e.Key)
+            {
+                case Key.F4:
+                    IsDropDownOpen = !IsDropDownOpen;
+                    e.Handled = true;
+                    break;
+
+                case Key.Enter:
+                    OnAdapterSelectionComplete(this, new RoutedEventArgs());
+                    e.Handled = true;
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Provides handling for the
+        /// <see cref="E:Avalonia.UIElement.GotFocus" /> event.
+        /// </summary>
+        /// <param name="e">A <see cref="T:Avalonia.RoutedEventArgs" />
+        /// that contains the event data.</param>
+        protected override void OnGotFocus(GotFocusEventArgs e)
+        {
+            base.OnGotFocus(e);
+            FocusChanged(HasFocus());
+        }
+
+        /// <summary>
+        /// Provides handling for the
+        /// <see cref="E:Avalonia.UIElement.LostFocus" /> event.
+        /// </summary>
+        /// <param name="e">A <see cref="T:Avalonia.RoutedEventArgs" />
+        /// that contains the event data.</param>
+        protected override void OnLostFocus(RoutedEventArgs e)
+        {
+            base.OnLostFocus(e);
+            FocusChanged(HasFocus());
+        }
+        
+        /// <summary>
+        /// Determines whether the text box or drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control has
+        /// focus.
+        /// </summary>
+        /// <returns>true to indicate the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> has focus;
+        /// otherwise, false.</returns>
+        protected bool HasFocus()
+        {
+            IVisual focused = FocusManager.Instance.Current;
+
+            while (focused != null)
+            {
+                if (object.ReferenceEquals(focused, this))
+                {
+                    return true;
+                }
+
+                // This helps deal with popups that may not be in the same 
+                // visual tree
+                IVisual parent = focused.GetVisualParent();
+                if (parent == null)
+                {
+                    // Try the logical parent.
+                    IControl element = focused as IControl;
+                    if (element != null)
+                    {
+                        parent = element.Parent;
+                    }
+                }
+                focused = parent;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Handles the FocusChanged event.
+        /// </summary>
+        /// <param name="hasFocus">A value indicating whether the control 
+        /// currently has the focus.</param>
+        private void FocusChanged(bool hasFocus)
+        {
+            // The OnGotFocus & OnLostFocus are asynchronously and cannot 
+            // reliably tell you that have the focus.  All they do is let you 
+            // know that the focus changed sometime in the past.  To determine 
+            // if you currently have the focus you need to do consult the 
+            // FocusManager (see HasFocus()).
+
+            bool wasFocused = _isFocused;
+            _isFocused = hasFocus;
+
+            if (hasFocus)
+            {
+                
+                if (!wasFocused && TextBox != null && TextBoxSelectionLength <= 0)
+                {
+                    TextBox.Focus();
+                    TextBox.SelectionStart = 0;
+                    TextBox.SelectionEnd = TextBox.Text?.Length ?? 0;
+                }
+            }
+            else
+            {
+                IsDropDownOpen = false;
+                _userCalledPopulate = false;
+                ClearTextBoxSelection();
+            }
+
+            _isFocused = hasFocus;
+        }
+
+        /// <summary>
+        /// Occurs when the text in the text box portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> changes.
+        /// </summary>
+        public event EventHandler TextChanged;
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> is
+        /// populating the drop-down with possible matches based on the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.Text" />
+        /// property.
+        /// </summary>
+        /// <remarks>
+        /// If the event is canceled, by setting the PopulatingEventArgs.Cancel 
+        /// property to true, the AutoCompleteBox will not automatically 
+        /// populate the selection adapter contained in the drop-down. 
+        /// In this case, if you want possible matches to appear, you must 
+        /// provide the logic for populating the selection adapter.
+        /// </remarks>
+        public event EventHandler<PopulatingEventArgs> Populating;
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> has
+        /// populated the drop-down with possible matches based on the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.Text" />
+        /// property.
+        /// </summary>
+        public event EventHandler<PopulatedEventArgs> Populated;
+
+        /// <summary>
+        /// Occurs when the value of the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
+        /// property is changing from false to true.
+        /// </summary>
+        public event EventHandler<CancelableEventArgs> DropDownOpening;
+
+        /// <summary>
+        /// Occurs when the value of the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
+        /// property has changed from false to true and the drop-down is open.
+        /// </summary>
+        public event EventHandler DropDownOpened;
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
+        /// property is changing from true to false.
+        /// </summary>
+        public event EventHandler<CancelableEventArgs> DropDownClosing;
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
+        /// property was changed from true to false and the drop-down is open.
+        /// </summary>
+        public event EventHandler DropDownClosed;
+
+        /// <summary>
+        /// Occurs when the selected item in the drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> has
+        /// changed.
+        /// </summary>
+        public event EventHandler<SelectionChangedEventArgs> SelectionChanged
+        {
+            add { AddHandler(SelectionChangedEvent, value); }
+            remove { RemoveHandler(SelectionChangedEvent, value); }
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.Populating" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:Avalonia.Controls.PopulatingEventArgs" /> that
+        /// contains the event data.</param>
+        protected virtual void OnPopulating(PopulatingEventArgs e)
+        {
+            Populating?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.Populated" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:Avalonia.Controls.PopulatedEventArgs" />
+        /// that contains the event data.</param>
+        protected virtual void OnPopulated(PopulatedEventArgs e)
+        {
+            Populated?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.SelectionChanged" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:Avalonia.Controls.SelectionChangedEventArgs" />
+        /// that contains the event data.</param>
+        protected virtual void OnSelectionChanged(SelectionChangedEventArgs e)
+        {
+            RaiseEvent(e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.DropDownOpening" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:Avalonia.Controls.CancelableEventArgs" />
+        /// that contains the event data.</param>
+        protected virtual void OnDropDownOpening(CancelableEventArgs e)
+        {
+            DropDownOpening?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.DropDownOpened" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:System.EventArgs" />
+        /// that contains the event data.</param>
+        protected virtual void OnDropDownOpened(EventArgs e)
+        {
+            DropDownOpened?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.DropDownClosing" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:Avalonia.Controls.CancelableEventArgs" />
+        /// that contains the event data.</param>
+        protected virtual void OnDropDownClosing(CancelableEventArgs e)
+        {
+            DropDownClosing?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.DropDownClosed" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A
+        /// <see cref="T:System.EventArgs" />
+        /// which contains the event data.</param>
+        protected virtual void OnDropDownClosed(EventArgs e)
+        {
+            DropDownClosed?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.AutoCompleteBox.TextChanged" />
+        /// event.
+        /// </summary>
+        /// <param name="e">A <see cref="T:Avalonia.RoutedEventArgs" />
+        /// that contains the event data.</param>
+        protected virtual void OnTextChanged(RoutedEventArgs e)
+        {
+            TextChanged?.Invoke(this, e);
+        }
+
+        /// <summary>
+        /// Begin closing the drop-down.
+        /// </summary>
+        /// <param name="oldValue">The original value.</param>
+        private void ClosingDropDown(bool oldValue)
+        {
+            var args = new CancelableEventArgs();
+            OnDropDownClosing(args);
+
+            if (args.Cancel)
+            {
+                _ignorePropertyChange = true;
+                SetValue(IsDropDownOpenProperty, oldValue);
+            }
+            else
+            {
+                CloseDropDown();
+            }
+
+            UpdatePseudoClasses();
+        }
+
+        /// <summary>
+        /// Begin opening the drop down by firing cancelable events, opening the
+        /// drop-down or reverting, depending on the event argument values.
+        /// </summary>
+        /// <param name="oldValue">The original value, if needed for a revert.</param>
+        private void OpeningDropDown(bool oldValue)
+        {
+            var args = new CancelableEventArgs();
+
+            // Opening
+            OnDropDownOpening(args);
+
+            if (args.Cancel)
+            {
+                _ignorePropertyChange = true;
+                SetValue(IsDropDownOpenProperty, oldValue);
+            }
+            else
+            {
+                OpenDropDown();
+            }
+
+            UpdatePseudoClasses();
+        }
+
+        /// <summary>
+        /// Connects to the DropDownPopup Closed event.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The event data.</param>
+        private void DropDownPopup_Closed(object sender, EventArgs e)
+        {
+            // Force the drop down dependency property to be false.
+            if (IsDropDownOpen)
+            {
+                IsDropDownOpen = false;
+            }
+
+            // Fire the DropDownClosed event
+            if (_popupHasOpened)
+            {
+                OnDropDownClosed(EventArgs.Empty);
+            }
+        }
+
+        /// <summary>
+        /// Handles the timer tick when using a populate delay.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The event arguments.</param>
+        private void PopulateDropDown(object sender, EventArgs e)
+        {
+            if (_delayTimer != null)
+            {
+                _delayTimer.Stop();
+            }
+
+            // Update the prefix/search text.
+            SearchText = Text;
+
+            // The Populated event enables advanced, custom filtering. The 
+            // client needs to directly update the ItemsSource collection or
+            // call the Populate method on the control to continue the 
+            // display process if Cancel is set to true.
+            PopulatingEventArgs populating = new PopulatingEventArgs(SearchText);
+            OnPopulating(populating);
+            if (!populating.Cancel)
+            {
+                PopulateComplete();
+            }
+        }
+
+        /// <summary>
+        /// Private method that directly opens the popup, checks the expander 
+        /// button, and then fires the Opened event.
+        /// </summary>
+        private void OpenDropDown()
+        {
+            if (DropDownPopup != null)
+            {
+                DropDownPopup.IsOpen = true;
+            }
+            _popupHasOpened = true;
+            OnDropDownOpened(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Private method that directly closes the popup, flips the Checked 
+        /// value, and then fires the Closed event.
+        /// </summary>
+        private void CloseDropDown()
+        {
+            if (_popupHasOpened)
+            {
+                if (SelectionAdapter != null)
+                {
+                    SelectionAdapter.SelectedItem = null;
+                }
+                if (DropDownPopup != null)
+                {
+                    DropDownPopup.IsOpen = false;
+                }
+                OnDropDownClosed(EventArgs.Empty);
+            }
+        }
+
+        /// <summary>
+        /// Formats an Item for text comparisons based on Converter 
+        /// and ConverterCulture properties.
+        /// </summary>
+        /// <param name="value">The object to format.</param>
+        /// <param name="clearDataContext">A value indicating whether to clear
+        /// the data context after the lookup is performed.</param>
+        /// <returns>Formatted Value.</returns>
+        private string FormatValue(object value, bool clearDataContext)
+        {
+            string result = FormatValue(value);
+            if(clearDataContext && _valueBindingEvaluator != null)
+            {
+                _valueBindingEvaluator.ClearDataContext();
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Converts the specified object to a string by using the
+        /// <see cref="P:Avalonia.Data.Binding.Converter" /> and
+        /// <see cref="P:Avalonia.Data.Binding.ConverterCulture" /> values
+        /// of the binding object specified by the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.ValueMemberBinding" />
+        /// property.
+        /// </summary>
+        /// <param name="value">The object to format as a string.</param>
+        /// <returns>The string representation of the specified object.</returns>
+        /// <remarks>
+        /// Override this method to provide a custom string conversion.
+        /// </remarks>
+        protected virtual string FormatValue(object value)
+        {
+            if (_valueBindingEvaluator != null)
+            {
+                return _valueBindingEvaluator.GetDynamicValue(value) ?? String.Empty;
+            }
+
+            if (_valueMemberSelector != null)
+            {
+                value = _valueMemberSelector.Select(value);
+            }
+
+            return value == null ? String.Empty : value.ToString();
+        }
+
+        /// <summary>
+        /// Handle the TextChanged event that is directly attached to the 
+        /// TextBox part. This ensures that only user initiated actions will 
+        /// result in an AutoCompleteBox suggestion and operation.
+        /// </summary>
+        private void OnTextBoxTextChanged()
+        {
+            //Uses Dispatcher.Post to allow the TextBox selection to update before processing
+            Dispatcher.UIThread.Post(() =>
+            {
+                // Call the central updated text method as a user-initiated action
+                TextUpdated(_textBox.Text, true);
+            });
+        }
+
+        /// <summary>
+        /// Updates both the text box value and underlying text dependency 
+        /// property value if and when they change. Automatically fires the 
+        /// text changed events when there is a change.
+        /// </summary>
+        /// <param name="value">The new string value.</param>
+        private void UpdateTextValue(string value)
+        {
+            UpdateTextValue(value, null);
+        }
+
+        /// <summary>
+        /// Updates both the text box value and underlying text dependency 
+        /// property value if and when they change. Automatically fires the 
+        /// text changed events when there is a change.
+        /// </summary>
+        /// <param name="value">The new string value.</param>
+        /// <param name="userInitiated">A nullable bool value indicating whether
+        /// the action was user initiated. In a user initiated mode, the 
+        /// underlying text dependency property is updated. In a non-user 
+        /// interaction, the text box value is updated. When user initiated is 
+        /// null, all values are updated.</param>
+        private void UpdateTextValue(string value, bool? userInitiated)
+        {
+            bool callTextChanged = false;
+            // Update the Text dependency property
+            if ((userInitiated == null || userInitiated == true) && Text != value)
+            {
+                _ignoreTextPropertyChange++;
+                Text = value;
+                callTextChanged = true;
+            }
+
+            // Update the TextBox's Text dependency property
+            if ((userInitiated == null || userInitiated == false) && TextBox != null && TextBox.Text != value)
+            {
+                _ignoreTextPropertyChange++;
+                TextBox.Text = value ?? string.Empty;
+
+                // Text dependency property value was set, fire event
+                if (!callTextChanged && (Text == value || Text == null))
+                {
+                    callTextChanged = true;
+                }
+            }
+
+            if (callTextChanged)
+            {
+                OnTextChanged(new RoutedEventArgs());
+            }
+        }
+
+        /// <summary>
+        /// Handle the update of the text for the control from any source, 
+        /// including the TextBox part and the Text dependency property.
+        /// </summary>
+        /// <param name="newText">The new text.</param>
+        /// <param name="userInitiated">A value indicating whether the update 
+        /// is a user-initiated action. This should be a True value when the 
+        /// TextUpdated method is called from a TextBox event handler.</param>
+        private void TextUpdated(string newText, bool userInitiated)
+        {
+            // Only process this event if it is coming from someone outside 
+            // setting the Text dependency property directly.
+            if (_ignoreTextPropertyChange > 0)
+            {
+                _ignoreTextPropertyChange--;
+                return;
+            }
+
+            if (newText == null)
+            {
+                newText = string.Empty;
+            }
+
+            // The TextBox.TextChanged event was not firing immediately and 
+            // was causing an immediate update, even with wrapping. If there is 
+            // a selection currently, no update should happen.
+            if (IsTextCompletionEnabled && TextBox != null && TextBoxSelectionLength > 0 && TextBoxSelectionStart != TextBox.Text.Length)
+            {
+                return;
+            }
+
+            // Evaluate the conditions needed for completion.
+            // 1. Minimum prefix length
+            // 2. If a delay timer is in use, use it
+            bool populateReady = newText.Length >= MinimumPrefixLength && MinimumPrefixLength >= 0;
+            _userCalledPopulate = populateReady ? userInitiated : false;
+
+            // Update the interface and values only as necessary
+            UpdateTextValue(newText, userInitiated);
+
+            if (populateReady)
+            {
+                _ignoreTextSelectionChange = true;
+
+                if (_delayTimer != null)
+                {
+                    _delayTimer.Start();
+                }
+                else
+                {
+                    PopulateDropDown(this, EventArgs.Empty);
+                }
+            }
+            else
+            {
+                SearchText = string.Empty;
+                if (SelectedItem != null)
+                {
+                    _skipSelectedItemTextUpdate = true;
+                }
+                SelectedItem = null;
+                if (IsDropDownOpen)
+                {
+                    IsDropDownOpen = false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// A simple helper method to clear the view and ensure that a view 
+        /// object is always present and not null.
+        /// </summary>
+        private void ClearView()
+        {
+            if (_view == null)
+            {
+                _view = new AvaloniaList<object>();
+            }
+            else
+            {
+                _view.Clear();
+            }
+        }
+
+        /// <summary>
+        /// Walks through the items enumeration. Performance is not going to be 
+        /// perfect with the current implementation.
+        /// </summary>
+        private void RefreshView()
+        {
+            if (_items == null)
+            {
+                ClearView();
+                return;
+            }
+
+            // Cache the current text value
+            string text = Text ?? string.Empty;
+
+            // Determine if any filtering mode is on
+            bool stringFiltering = TextFilter != null;
+            bool objectFiltering = FilterMode == AutoCompleteFilterMode.Custom && TextFilter == null;
+
+            int view_index = 0;
+            int view_count = _view.Count;
+            List<object> items = _items;
+            foreach (object item in items)
+            {
+                bool inResults = !(stringFiltering || objectFiltering);
+                if (!inResults)
+                {
+                    inResults = stringFiltering ? TextFilter(text, FormatValue(item)) : ItemFilter(text, item);
+                }
+
+                if (view_count > view_index && inResults && _view[view_index] == item)
+                {
+                    // Item is still in the view
+                    view_index++;
+                }
+                else if (inResults)
+                {
+                    // Insert the item
+                    if (view_count > view_index && _view[view_index] != item)
+                    {
+                        // Replace item
+                        // Unfortunately replacing via index throws a fatal 
+                        // exception: View[view_index] = item;
+                        // Cost: O(n) vs O(1)
+                        _view.RemoveAt(view_index);
+                        _view.Insert(view_index, item);
+                        view_index++;
+                    }
+                    else
+                    {
+                        // Add the item
+                        if (view_index == view_count)
+                        {
+                            // Constant time is preferred (Add).
+                            _view.Add(item);
+                        }
+                        else
+                        {
+                            _view.Insert(view_index, item);
+                        }
+                        view_index++;
+                        view_count++;
+                    }
+                }
+                else if (view_count > view_index && _view[view_index] == item)
+                {
+                    // Remove the item
+                    _view.RemoveAt(view_index);
+                    view_count--;
+                }
+            }
+
+            // Clear the evaluator to discard a reference to the last item
+            if (_valueBindingEvaluator != null)
+            {
+                _valueBindingEvaluator.ClearDataContext();
+            }
+        }
+
+        /// <summary>
+        /// Handle any change to the ItemsSource dependency property, update 
+        /// the underlying ObservableCollection view, and set the selection 
+        /// adapter's ItemsSource to the view if appropriate.
+        /// </summary>
+        /// <param name="newValue">The new enumerable reference.</param>
+        private void OnItemsChanged(IEnumerable newValue)
+        {
+            // Remove handler for oldValue.CollectionChanged (if present)
+            _collectionChangeSubscription?.Dispose();
+            _collectionChangeSubscription = null;
+
+            // Add handler for newValue.CollectionChanged (if possible)
+            if (newValue is INotifyCollectionChanged newValueINotifyCollectionChanged)
+            {
+                _collectionChangeSubscription = newValueINotifyCollectionChanged.WeakSubscribe(ItemsCollectionChanged);
+            }
+
+            // Store a local cached copy of the data
+            _items = newValue == null ? null : new List<object>(newValue.Cast<object>().ToList());
+
+            // Clear and set the view on the selection adapter
+            ClearView();
+            if (SelectionAdapter != null && SelectionAdapter.Items != _view)
+            {
+                SelectionAdapter.Items = _view;
+            }
+            if (IsDropDownOpen)
+            {
+                RefreshView();
+            }
+        }
+
+        /// <summary>
+        /// Method that handles the ObservableCollection.CollectionChanged event for the ItemsSource property.
+        /// </summary>
+        /// <param name="sender">The object that raised the event.</param>
+        /// <param name="e">The event data.</param>
+        private void ItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            // Update the cache
+            if (e.Action == NotifyCollectionChangedAction.Remove && e.OldItems != null)
+            {
+                for (int index = 0; index < e.OldItems.Count; index++)
+                {
+                    _items.RemoveAt(e.OldStartingIndex);
+                }
+            }
+            if (e.Action == NotifyCollectionChangedAction.Add && e.NewItems != null && _items.Count >= e.NewStartingIndex)
+            {
+                for (int index = 0; index < e.NewItems.Count; index++)
+                {
+                    _items.Insert(e.NewStartingIndex + index, e.NewItems[index]);
+                }
+            }
+            if (e.Action == NotifyCollectionChangedAction.Replace && e.NewItems != null && e.OldItems != null)
+            {
+                for (int index = 0; index < e.NewItems.Count; index++)
+                {
+                    _items[e.NewStartingIndex] = e.NewItems[index];
+                }
+            }
+
+            // Update the view
+            if (e.Action == NotifyCollectionChangedAction.Remove || e.Action == NotifyCollectionChangedAction.Replace)
+            {
+                for (int index = 0; index < e.OldItems.Count; index++)
+                {
+                    _view.Remove(e.OldItems[index]);
+                }
+            }
+
+            if (e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                // Significant changes to the underlying data.
+                ClearView();
+                if (Items != null)
+                {
+                    _items = new List<object>(Items.Cast<object>().ToList());
+                }
+            }
+
+            // Refresh the observable collection used in the selection adapter.
+            RefreshView();
+        }
+
+        /// <summary>
+        /// Notifies the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> that the
+        /// <see cref="P:Avalonia.Controls.AutoCompleteBox.Items" />
+        /// property has been set and the data can be filtered to provide
+        /// possible matches in the drop-down.
+        /// </summary>
+        /// <remarks>
+        /// Call this method when you are providing custom population of 
+        /// the drop-down portion of the AutoCompleteBox, to signal the control 
+        /// that you are done with the population process. 
+        /// Typically, you use PopulateComplete when the population process 
+        /// is a long-running process and you want to cancel built-in filtering
+        ///  of the ItemsSource items. In this case, you can handle the 
+        /// Populated event and set PopulatingEventArgs.Cancel to true. 
+        /// When the long-running process has completed you call 
+        /// PopulateComplete to indicate the drop-down is populated.
+        /// </remarks>
+        public void PopulateComplete()
+        {
+            // Apply the search filter
+            RefreshView();
+
+            // Fire the Populated event containing the read-only view data.
+            PopulatedEventArgs populated = new PopulatedEventArgs(new ReadOnlyCollection<object>(_view));
+            OnPopulated(populated);
+
+            if (SelectionAdapter != null && SelectionAdapter.Items != _view)
+            {
+                SelectionAdapter.Items = _view;
+            }
+
+            bool isDropDownOpen = _userCalledPopulate && (_view.Count > 0);
+            if (isDropDownOpen != IsDropDownOpen)
+            {
+                _ignorePropertyChange = true;
+                IsDropDownOpen = isDropDownOpen;
+            }
+            if (IsDropDownOpen)
+            {
+                OpeningDropDown(false);
+            }
+            else
+            {
+                ClosingDropDown(true);
+            }
+
+            UpdateTextCompletion(_userCalledPopulate);
+        }
+
+        /// <summary>
+        /// Performs text completion, if enabled, and a lookup on the underlying
+        /// item values for an exact match. Will update the SelectedItem value.
+        /// </summary>
+        /// <param name="userInitiated">A value indicating whether the operation
+        /// was user initiated. Text completion will not be performed when not 
+        /// directly initiated by the user.</param>
+        private void UpdateTextCompletion(bool userInitiated)
+        {
+            // By default this method will clear the selected value
+            object newSelectedItem = null;
+            string text = Text;
+
+            // Text search is StartsWith explicit and only when enabled, in 
+            // line with WPF's ComboBox lookup. When in use it will associate 
+            // a Value with the Text if it is found in ItemsSource. This is 
+            // only valid when there is data and the user initiated the action.
+            if (_view.Count > 0)
+            {
+                if (IsTextCompletionEnabled && TextBox != null && userInitiated)
+                {
+                    int currentLength = TextBox.Text.Length;
+                    int selectionStart = TextBoxSelectionStart;
+                    if (selectionStart == text.Length && selectionStart > _textSelectionStart)
+                    {
+                        // When the FilterMode dependency property is set to 
+                        // either StartsWith or StartsWithCaseSensitive, the 
+                        // first item in the view is used. This will improve 
+                        // performance on the lookup. It assumes that the 
+                        // FilterMode the user has selected is an acceptable 
+                        // case sensitive matching function for their scenario.
+                        object top = FilterMode == AutoCompleteFilterMode.StartsWith || FilterMode == AutoCompleteFilterMode.StartsWithCaseSensitive
+                            ? _view[0]
+                            : TryGetMatch(text, _view, AutoCompleteSearch.GetFilter(AutoCompleteFilterMode.StartsWith));
+
+                        // If the search was successful, update SelectedItem
+                        if (top != null)
+                        {
+                            newSelectedItem = top;
+                            string topString = FormatValue(top, true);
+
+                            // Only replace partially when the two words being the same
+                            int minLength = Math.Min(topString.Length, Text.Length);
+                            if (AutoCompleteSearch.Equals(Text.Substring(0, minLength), topString.Substring(0, minLength)))
+                            {
+                                // Update the text
+                                UpdateTextValue(topString);
+
+                                // Select the text past the user's caret
+                                TextBox.SelectionStart = currentLength;
+                                TextBox.SelectionEnd = topString.Length;                                
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    // Perform an exact string lookup for the text. This is a 
+                    // design change from the original Toolkit release when the 
+                    // IsTextCompletionEnabled property behaved just like the 
+                    // WPF ComboBox's IsTextSearchEnabled property.
+                    //
+                    // This change provides the behavior that most people expect
+                    // to find: a lookup for the value is always performed.
+                    newSelectedItem = TryGetMatch(text, _view, AutoCompleteSearch.GetFilter(AutoCompleteFilterMode.EqualsCaseSensitive));
+                }
+            }
+
+            // Update the selected item property
+
+            if (SelectedItem != newSelectedItem)
+            {
+                _skipSelectedItemTextUpdate = true;
+            }
+            SelectedItem = newSelectedItem;
+
+            // Restore updates for TextSelection
+            if (_ignoreTextSelectionChange)
+            {
+                _ignoreTextSelectionChange = false;
+                if (TextBox != null)
+                {
+                    _textSelectionStart = TextBoxSelectionStart;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Attempts to look through the view and locate the specific exact 
+        /// text match.
+        /// </summary>
+        /// <param name="searchText">The search text.</param>
+        /// <param name="view">The view reference.</param>
+        /// <param name="predicate">The predicate to use for the partial or 
+        /// exact match.</param>
+        /// <returns>Returns the object or null.</returns>
+        private object TryGetMatch(string searchText, AvaloniaList<object> view, AutoCompleteFilterPredicate<string> predicate)
+        {
+            if (view != null && view.Count > 0)
+            {
+                foreach (object o in view)
+                {
+                    if (predicate(searchText, FormatValue(o)))
+                    {
+                        return o;
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private void UpdatePseudoClasses()
+        {
+            PseudoClasses.Set(":dropdownopen", IsDropDownOpen);
+        }
+
+        private void ClearTextBoxSelection()
+        {
+            if (TextBox != null)
+            {
+                int length = TextBox.Text?.Length ?? 0;
+                TextBox.SelectionStart = length;
+                TextBox.SelectionEnd = length;
+            }
+        }
+
+        /// <summary>
+        /// Called when the selected item is changed, updates the text value
+        /// that is displayed in the text box part.
+        /// </summary>
+        /// <param name="newItem">The new item.</param>
+        private void OnSelectedItemChanged(object newItem)
+        {
+            string text;
+
+            if (newItem == null)
+            {
+                text = SearchText;
+            }
+            else
+            {
+                text = FormatValue(newItem, true);
+            }
+
+            // Update the Text property and the TextBox values
+            UpdateTextValue(text);
+
+            // Move the caret to the end of the text box
+            ClearTextBoxSelection();
+        }
+
+        /// <summary>
+        /// Handles the SelectionChanged event of the selection adapter.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The selection changed event data.</param>
+        private void OnAdapterSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            SelectedItem = _adapter.SelectedItem;
+        }
+
+        //TODO Check UpdateTextCompletion
+        /// <summary>
+        /// Handles the Commit event on the selection adapter.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The event data.</param>
+        private void OnAdapterSelectionComplete(object sender, RoutedEventArgs e)
+        {
+            IsDropDownOpen = false;
+
+            // Completion will update the selected value
+            //UpdateTextCompletion(false);
+
+            // Text should not be selected
+            ClearTextBoxSelection();
+
+            TextBox.Focus();
+        }
+
+        /// <summary>
+        /// Handles the Cancel event on the selection adapter.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The event data.</param>
+        private void OnAdapterSelectionCanceled(object sender, RoutedEventArgs e)
+        {
+            UpdateTextValue(SearchText);
+
+            // Completion will update the selected value
+            UpdateTextCompletion(false);
+        }
+
+        /// <summary>
+        /// A predefined set of filter functions for the known, built-in 
+        /// AutoCompleteFilterMode enumeration values.
+        /// </summary>
+        private static class AutoCompleteSearch
+        {
+            /// <summary>
+            /// Index function that retrieves the filter for the provided 
+            /// AutoCompleteFilterMode.
+            /// </summary>
+            /// <param name="FilterMode">The built-in search mode.</param>
+            /// <returns>Returns the string-based comparison function.</returns>
+            public static AutoCompleteFilterPredicate<string> GetFilter(AutoCompleteFilterMode FilterMode)
+            {
+                switch (FilterMode)
+                {
+                    case AutoCompleteFilterMode.Contains:
+                        return Contains;
+
+                    case AutoCompleteFilterMode.ContainsCaseSensitive:
+                        return ContainsCaseSensitive;
+
+                    case AutoCompleteFilterMode.ContainsOrdinal:
+                        return ContainsOrdinal;
+
+                    case AutoCompleteFilterMode.ContainsOrdinalCaseSensitive:
+                        return ContainsOrdinalCaseSensitive;
+
+                    case AutoCompleteFilterMode.Equals:
+                        return Equals;
+
+                    case AutoCompleteFilterMode.EqualsCaseSensitive:
+                        return EqualsCaseSensitive;
+
+                    case AutoCompleteFilterMode.EqualsOrdinal:
+                        return EqualsOrdinal;
+
+                    case AutoCompleteFilterMode.EqualsOrdinalCaseSensitive:
+                        return EqualsOrdinalCaseSensitive;
+
+                    case AutoCompleteFilterMode.StartsWith:
+                        return StartsWith;
+
+                    case AutoCompleteFilterMode.StartsWithCaseSensitive:
+                        return StartsWithCaseSensitive;
+
+                    case AutoCompleteFilterMode.StartsWithOrdinal:
+                        return StartsWithOrdinal;
+
+                    case AutoCompleteFilterMode.StartsWithOrdinalCaseSensitive:
+                        return StartsWithOrdinalCaseSensitive;
+
+                    case AutoCompleteFilterMode.None:
+                    case AutoCompleteFilterMode.Custom:
+                    default:
+                        return null;
+                }
+            }
+
+            /// <summary>
+            /// An implementation of the Contains member of string that takes in a 
+            /// string comparison. The traditional .NET string Contains member uses 
+            /// StringComparison.Ordinal.
+            /// </summary>
+            /// <param name="s">The string.</param>
+            /// <param name="value">The string value to search for.</param>
+            /// <param name="comparison">The string comparison type.</param>
+            /// <returns>Returns true when the substring is found.</returns>
+            private static bool Contains(string s, string value, StringComparison comparison)
+            {
+                return s.IndexOf(value, comparison) >= 0;
+            }
+
+            /// <summary>
+            /// Check if the string value begins with the text.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool StartsWith(string text, string value)
+            {
+                return value.StartsWith(text, StringComparison.CurrentCultureIgnoreCase);
+            }
+
+            /// <summary>
+            /// Check if the string value begins with the text.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool StartsWithCaseSensitive(string text, string value)
+            {
+                return value.StartsWith(text, StringComparison.CurrentCulture);
+            }
+
+            /// <summary>
+            /// Check if the string value begins with the text.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool StartsWithOrdinal(string text, string value)
+            {
+                return value.StartsWith(text, StringComparison.OrdinalIgnoreCase);
+            }
+
+            /// <summary>
+            /// Check if the string value begins with the text.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool StartsWithOrdinalCaseSensitive(string text, string value)
+            {
+                return value.StartsWith(text, StringComparison.Ordinal);
+            }
+
+            /// <summary>
+            /// Check if the prefix is contained in the string value. The current 
+            /// culture's case insensitive string comparison operator is used.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool Contains(string text, string value)
+            {
+                return Contains(value, text, StringComparison.CurrentCultureIgnoreCase);
+            }
+
+            /// <summary>
+            /// Check if the prefix is contained in the string value.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool ContainsCaseSensitive(string text, string value)
+            {
+                return Contains(value, text, StringComparison.CurrentCulture);
+            }
+
+            /// <summary>
+            /// Check if the prefix is contained in the string value.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool ContainsOrdinal(string text, string value)
+            {
+                return Contains(value, text, StringComparison.OrdinalIgnoreCase);
+            }
+
+            /// <summary>
+            /// Check if the prefix is contained in the string value.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool ContainsOrdinalCaseSensitive(string text, string value)
+            {
+                return Contains(value, text, StringComparison.Ordinal);
+            }
+
+            /// <summary>
+            /// Check if the string values are equal.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool Equals(string text, string value)
+            {
+                return value.Equals(text, StringComparison.CurrentCultureIgnoreCase);
+            }
+
+            /// <summary>
+            /// Check if the string values are equal.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool EqualsCaseSensitive(string text, string value)
+            {
+                return value.Equals(text, StringComparison.CurrentCulture);
+            }
+
+            /// <summary>
+            /// Check if the string values are equal.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool EqualsOrdinal(string text, string value)
+            {
+                return value.Equals(text, StringComparison.OrdinalIgnoreCase);
+            }
+
+            /// <summary>
+            /// Check if the string values are equal.
+            /// </summary>
+            /// <param name="text">The AutoCompleteBox prefix text.</param>
+            /// <param name="value">The item's string value.</param>
+            /// <returns>Returns true if the condition is met.</returns>
+            public static bool EqualsOrdinalCaseSensitive(string text, string value)
+            {
+                return value.Equals(text, StringComparison.Ordinal);
+            }
+        }
+
+        /// <summary>
+        /// A framework element that permits a binding to be evaluated in a new data
+        /// context leaf node.
+        /// </summary>
+        /// <typeparam name="T">The type of dynamic binding to return.</typeparam>
+        public class BindingEvaluator<T> : Control
+        {
+            /// <summary>
+            /// Gets or sets the string value binding used by the control.
+            /// </summary>
+            private IBinding _binding;
+
+            #region public T Value
+
+            /// <summary>
+            /// Identifies the Value dependency property.
+            /// </summary>
+            public static readonly StyledProperty<T> ValueProperty =
+                AvaloniaProperty.Register<BindingEvaluator<T>, T>(nameof(Value));
+
+            /// <summary>
+            /// Gets or sets the data item value.
+            /// </summary>
+            public T Value
+            {
+                get { return GetValue(ValueProperty); }
+                set { SetValue(ValueProperty, value); }
+            }
+            
+            #endregion public string Value
+
+            /// <summary>
+            /// Gets or sets the value binding.
+            /// </summary>
+            public IBinding ValueBinding
+            {
+                get { return _binding; }
+                set
+                {
+                    _binding = value;
+                    AvaloniaObjectExtensions.Bind(this, ValueProperty, value);
+                }
+            }
+
+            /// <summary>
+            /// Initializes a new instance of the BindingEvaluator class.
+            /// </summary>
+            public BindingEvaluator()
+            { }
+
+            /// <summary>
+            /// Initializes a new instance of the BindingEvaluator class,
+            /// setting the initial binding to the provided parameter.
+            /// </summary>
+            /// <param name="binding">The initial string value binding.</param>
+            public BindingEvaluator(IBinding binding)
+                : this()
+            {
+                ValueBinding = binding;
+            }
+
+            /// <summary>
+            /// Clears the data context so that the control does not keep a
+            /// reference to the last-looked up item.
+            /// </summary>
+            public void ClearDataContext()
+            {
+                DataContext = null;
+            }
+
+            /// <summary>
+            /// Updates the data context of the framework element and returns the 
+            /// updated binding value.
+            /// </summary>
+            /// <param name="o">The object to use as the data context.</param>
+            /// <param name="clearDataContext">If set to true, this parameter will
+            /// clear the data context immediately after retrieving the value.</param>
+            /// <returns>Returns the evaluated T value of the bound dependency
+            /// property.</returns>
+            public T GetDynamicValue(object o, bool clearDataContext)
+            {
+                DataContext = o;
+                T value = Value;
+                if (clearDataContext)
+                {
+                    DataContext = null;
+                }
+                return value;
+            }
+
+            /// <summary>
+            /// Updates the data context of the framework element and returns the 
+            /// updated binding value.
+            /// </summary>
+            /// <param name="o">The object to use as the data context.</param>
+            /// <returns>Returns the evaluated T value of the bound dependency
+            /// property.</returns>
+            public T GetDynamicValue(object o)
+            {
+                DataContext = o;
+                return Value;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Utils/ISelectionAdapter.cs b/src/Avalonia.Controls/Utils/ISelectionAdapter.cs
new file mode 100644
index 0000000000..3c1006a12e
--- /dev/null
+++ b/src/Avalonia.Controls/Utils/ISelectionAdapter.cs
@@ -0,0 +1,64 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using System;
+using System.Collections;
+using Avalonia.Interactivity;
+using Avalonia.Input;
+
+namespace Avalonia.Controls.Utils
+{
+    /// <summary>
+    /// Defines an item collection, selection members, and key handling for the
+    /// selection adapter contained in the drop-down portion of an
+    /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.
+    /// </summary>
+    public interface ISelectionAdapter
+    {
+        /// <summary>
+        /// Gets or sets the selected item.
+        /// </summary>
+        /// <value>The currently selected item.</value>
+        object SelectedItem { get; set; }
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="P:Avalonia.Controls.Utils.ISelectionAdapter.SelectedItem" />
+        /// property value changes.
+        /// </summary>
+        event EventHandler<SelectionChangedEventArgs> SelectionChanged;
+        
+        /// <summary>
+        /// Gets or sets a collection that is used to generate content for the
+        /// selection adapter.
+        /// </summary>
+        /// <value>The collection that is used to generate content for the
+        /// selection adapter.</value>
+        IEnumerable Items { get; set; }
+
+        /// <summary>
+        /// Occurs when a selected item is not cancelled and is committed as the
+        /// selected item.
+        /// </summary>
+        event EventHandler<RoutedEventArgs> Commit;
+
+        /// <summary>
+        /// Occurs when a selection has been canceled.
+        /// </summary>
+        event EventHandler<RoutedEventArgs> Cancel;
+
+        /// <summary>
+        /// Provides handling for the
+        /// <see cref="E:Avalonia.Input.InputElement.KeyDown" /> event that occurs
+        /// when a key is pressed while the drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> has focus.
+        /// </summary>
+        /// <param name="e">A <see cref="T:Avalonia.Input.KeyEventArgs" />
+        /// that contains data about the
+        /// <see cref="E:Avalonia.Input.InputElement.KeyDown" /> event.</param>
+        void HandleKeyDown(KeyEventArgs e);
+    }
+
+}
diff --git a/src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs b/src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs
new file mode 100644
index 0000000000..43c8a5aa6c
--- /dev/null
+++ b/src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs
@@ -0,0 +1,342 @@
+// (c) Copyright Microsoft Corporation.
+// This source is subject to the Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+using Avalonia.Input;
+using Avalonia.LogicalTree;
+using System.Collections;
+using System.Diagnostics;
+
+namespace Avalonia.Controls.Utils
+{
+    /// <summary>
+    /// Represents the selection adapter contained in the drop-down portion of
+    /// an <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control.
+    /// </summary>
+    public class SelectingItemsControlSelectionAdapter : ISelectionAdapter
+    {
+        /// <summary>
+        /// The SelectingItemsControl instance.
+        /// </summary>
+        private SelectingItemsControl _selector;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the selection change event 
+        /// should not be fired.
+        /// </summary>
+        private bool IgnoringSelectionChanged { get; set; }
+
+        /// <summary>
+        /// Gets or sets the underlying
+        /// <see cref="T:Avalonia.Controls.Primitives.SelectingItemsControl" />
+        /// control.
+        /// </summary>
+        /// <value>The underlying
+        /// <see cref="T:Avalonia.Controls.Primitives.SelectingItemsControl" />
+        /// control.</value>
+        public SelectingItemsControl SelectorControl
+        {
+            get { return _selector; }
+
+            set
+            {
+                if (_selector != null)
+                {
+                    _selector.SelectionChanged -= OnSelectionChanged;
+                    _selector.PointerReleased -= OnSelectorPointerReleased;
+                }
+
+                _selector = value;
+
+                if (_selector != null)
+                {
+                    _selector.SelectionChanged += OnSelectionChanged;
+                    _selector.PointerReleased += OnSelectorPointerReleased;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs when the
+        /// <see cref="P:Avalonia.Controls.Utils.SelectingItemsControlSelectionAdapter.SelectedItem" />
+        /// property value changes.
+        /// </summary>
+        public event EventHandler<SelectionChangedEventArgs> SelectionChanged;
+
+        /// <summary>
+        /// Occurs when an item is selected and is committed to the underlying
+        /// <see cref="T:Avalonia.Controls.Primitives.SelectingItemsControl" />
+        /// control.
+        /// </summary>
+        public event EventHandler<RoutedEventArgs> Commit;
+
+        /// <summary>
+        /// Occurs when a selection is canceled before it is committed.
+        /// </summary>
+        public event EventHandler<RoutedEventArgs> Cancel;
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.Utils.SelectingItemsControlSelectionAdapter" />
+        /// class.
+        /// </summary>
+        public SelectingItemsControlSelectionAdapter()
+        {
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// <see cref="T:Avalonia.Controls.Utils.SelectingItemsControlSelectionAdapterr" />
+        /// class with the specified
+        /// <see cref="T:Avalonia.Controls.Primitives.SelectingItemsControl" />
+        /// control.
+        /// </summary>
+        /// <param name="selector">The
+        /// <see cref="T:Avalonia.Controls.Primitives.SelectingItemsControl" /> control
+        /// to wrap as a
+        /// <see cref="T:Avalonia.Controls.Utils.SelectingItemsControlSelectionAdapter" />.</param>
+        public SelectingItemsControlSelectionAdapter(SelectingItemsControl selector)
+        {
+            SelectorControl = selector;
+        }
+
+        /// <summary>
+        /// Gets or sets the selected item of the selection adapter.
+        /// </summary>
+        /// <value>The selected item of the underlying selection adapter.</value>
+        public object SelectedItem
+        {
+            get
+            {
+                return SelectorControl?.SelectedItem;
+            }
+
+            set
+            {
+                IgnoringSelectionChanged = true;
+                if (SelectorControl != null)
+                {
+                    SelectorControl.SelectedItem = value;
+                }
+
+                // Attempt to reset the scroll viewer's position
+                if (value == null)
+                {
+                    ResetScrollViewer();
+                }
+
+                IgnoringSelectionChanged = false;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a collection that is used to generate the content of
+        /// the selection adapter.
+        /// </summary>
+        /// <value>The collection used to generate content for the selection
+        /// adapter.</value>
+        public IEnumerable Items
+        {
+            get
+            {
+                return SelectorControl?.Items;
+            }
+            set
+            {
+                if (SelectorControl != null)
+                {
+                    SelectorControl.Items = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// If the control contains a ScrollViewer, this will reset the viewer 
+        /// to be scrolled to the top.
+        /// </summary>
+        private void ResetScrollViewer()
+        {
+            if (SelectorControl != null)
+            {
+                ScrollViewer sv = SelectorControl.GetLogicalDescendants().OfType<ScrollViewer>().FirstOrDefault();
+                if (sv != null)
+                {
+                    sv.Offset = new Vector(0, 0);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Handles the mouse left button up event on the selector control.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The event data.</param>
+        private void OnSelectorPointerReleased(object sender, PointerReleasedEventArgs e)
+        {
+            if (e.MouseButton == MouseButton.Left)
+            {
+                OnCommit();
+            }
+        }
+
+        /// <summary>
+        /// Handles the SelectionChanged event on the SelectingItemsControl control.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The selection changed event data.</param>
+        private void OnSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (IgnoringSelectionChanged)
+            {
+                return;
+            }
+
+            SelectionChanged?.Invoke(sender, e);
+        }
+
+        /// <summary>
+        /// Increments the
+        /// <see cref="P:Avalonia.Controls.Primitives.SelectingItemsControl.SelectedIndex" />
+        /// property of the underlying
+        /// <see cref="T:Avalonia.Controls.Primitives.SelectingItemsControl" />
+        /// control.
+        /// </summary>
+        protected void SelectedIndexIncrement()
+        {
+            if (SelectorControl != null)
+            {
+                SelectorControl.SelectedIndex = SelectorControl.SelectedIndex + 1 >= SelectorControl.ItemCount ? -1 : SelectorControl.SelectedIndex + 1;
+            }
+        }
+
+        /// <summary>
+        /// Decrements the
+        /// <see cref="P:Avalonia.Controls.Primitives.SelectingItemsControl.SelectedIndex" />
+        /// property of the underlying
+        /// <see cref="T:Avalonia.Controls.Primitives.SelectingItemsControl" />
+        /// control.
+        /// </summary>
+        protected void SelectedIndexDecrement()
+        {
+            if (SelectorControl != null)
+            {
+                int index = SelectorControl.SelectedIndex;
+                if (index >= 0)
+                {
+                    SelectorControl.SelectedIndex--;
+                }
+                else if (index == -1)
+                {
+                    SelectorControl.SelectedIndex = SelectorControl.ItemCount - 1;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Provides handling for the
+        /// <see cref="E:Avalonia.Input.InputElement.KeyDown" /> event that occurs
+        /// when a key is pressed while the drop-down portion of the
+        /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> has focus.
+        /// </summary>
+        /// <param name="e">A <see cref="T:Avalonia.Input.KeyEventArgs" />
+        /// that contains data about the
+        /// <see cref="E:Avalonia.Input.InputElement.KeyDown" /> event.</param>
+        public void HandleKeyDown(KeyEventArgs e)
+        {
+            switch (e.Key)
+            {
+                case Key.Enter:
+                    OnCommit();
+                    e.Handled = true;
+                    break;
+
+                case Key.Up:
+                    SelectedIndexDecrement();
+                    e.Handled = true;
+                    break;
+
+                case Key.Down:
+                    if ((e.Modifiers & InputModifiers.Alt) == InputModifiers.None)
+                    {
+                        SelectedIndexIncrement();
+                        e.Handled = true;
+                    }
+                    break;
+
+                case Key.Escape:
+                    OnCancel();
+                    e.Handled = true;
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.Utils.SelectingItemsControlSelectionAdapter.Commit" />
+        /// event.
+        /// </summary>
+        protected virtual void OnCommit()
+        {
+            OnCommit(this, new RoutedEventArgs());
+        }
+
+        /// <summary>
+        /// Fires the Commit event.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The event data.</param>
+        private void OnCommit(object sender, RoutedEventArgs e)
+        {
+            Commit?.Invoke(sender, e);
+
+            AfterAdapterAction();
+        }
+
+        /// <summary>
+        /// Raises the
+        /// <see cref="E:Avalonia.Controls.Utils.SelectingItemsControlSelectionAdapter.Cancel" />
+        /// event.
+        /// </summary>
+        protected virtual void OnCancel()
+        {
+            OnCancel(this, new RoutedEventArgs());
+        }
+
+        /// <summary>
+        /// Fires the Cancel event.
+        /// </summary>
+        /// <param name="sender">The source object.</param>
+        /// <param name="e">The event data.</param>
+        private void OnCancel(object sender, RoutedEventArgs e)
+        {
+            Cancel?.Invoke(sender, e);
+
+            AfterAdapterAction();
+        }
+
+        /// <summary>
+        /// Change the selection after the actions are complete.
+        /// </summary>
+        private void AfterAdapterAction()
+        {
+            IgnoringSelectionChanged = true;
+            if (SelectorControl != null)
+            {
+                SelectorControl.SelectedItem = null;
+                SelectorControl.SelectedIndex = -1;
+            }
+            IgnoringSelectionChanged = false;
+        }
+    }
+}
diff --git a/src/Avalonia.Themes.Default/AutoCompleteBox.xaml b/src/Avalonia.Themes.Default/AutoCompleteBox.xaml
new file mode 100644
index 0000000000..82dbf6064b
--- /dev/null
+++ b/src/Avalonia.Themes.Default/AutoCompleteBox.xaml
@@ -0,0 +1,43 @@
+<Styles xmlns="https://github.com/avaloniaui">
+  <Style Selector="AutoCompleteBox">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
+    <Setter Property="Padding" Value="4"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <TextBox Name="PART_TextBox"
+                   Background="{TemplateBinding Background}" 
+                   BorderBrush="{TemplateBinding BorderBrush}" 
+                   BorderThickness="{TemplateBinding BorderThickness}"
+                   Padding="{TemplateBinding Padding}"
+                   Watermark="{TemplateBinding Watermark}"
+                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}" />
+          
+          <Popup Name="PART_Popup"
+                 MinWidth="{TemplateBinding Bounds.Width}"
+                 MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                 PlacementTarget="{TemplateBinding}"
+                 StaysOpen="False">
+            <Border BorderBrush="{DynamicResource ThemeBorderMidBrush}"
+                    BorderThickness="1">
+              <ListBox Name="PART_SelectingItemsControl"
+                       BorderThickness="0"
+                       Background="{TemplateBinding Background}"
+                       Foreground="{TemplateBinding Foreground}"
+                       ItemTemplate="{TemplateBinding ItemTemplate}"
+                       MemberSelector="{TemplateBinding ValueMemberSelector}"
+                       ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                       ScrollViewer.VerticalScrollBarVisibility="Auto" />
+            </Border>
+          </Popup>
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+  
+  <Style Selector="AutoCompleteBox ListBoxItem:pointerover">
+    <Setter Property="Background" Value="#ffd0d0d0"/>
+  </Style>
+</Styles>
\ No newline at end of file
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
index 7c567c1835..9a88b7ab55 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml
@@ -23,7 +23,7 @@
   <StyleInclude Source="resm:Avalonia.Themes.Default.RadioButton.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.RepeatButton.xaml?assembly=Avalonia.Themes.Default" />
   <StyleInclude Source="resm:Avalonia.Themes.Default.Separator.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.Slider.xaml?assembly=Avalonia.Themes.Default"/>  
+  <StyleInclude Source="resm:Avalonia.Themes.Default.Slider.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.ScrollBar.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.ScrollViewer.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.TabStrip.xaml?assembly=Avalonia.Themes.Default"/>
@@ -43,4 +43,5 @@
   <StyleInclude Source="resm:Avalonia.Themes.Default.Calendar.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.DatePicker.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.ButtonSpinner.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.AutoCompleteBox.xaml?assembly=Avalonia.Themes.Default"/>
 </Styles>

From 6bc4c1764c06a7e3efea4ce82db8bb5ca8a4abb8 Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Wed, 28 Feb 2018 20:09:11 -0500
Subject: [PATCH 422/482] Fixed an off by one bug

---
 src/Avalonia.Controls/TextBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index f73725f95a..b4a8095247 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -791,7 +791,7 @@ namespace Avalonia.Controls
             int pos = 0;
             int i;
 
-            for (i = 0; i < lines.Count; ++i)
+            for (i = 0; i < lines.Count - 1; ++i)
             {
                 var line = lines[i];
                 pos += line.Length;

From 28c78d3fc9cad02777a7f16f559f7b5c95152c41 Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Wed, 28 Feb 2018 20:10:35 -0500
Subject: [PATCH 423/482] Moved the setting of FocusedElement

This allows the LostFocus event to check the newly focused element
---
 src/Avalonia.Input/KeyboardDevice.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Input/KeyboardDevice.cs b/src/Avalonia.Input/KeyboardDevice.cs
index d815f8082b..2a1cdec1c0 100644
--- a/src/Avalonia.Input/KeyboardDevice.cs
+++ b/src/Avalonia.Input/KeyboardDevice.cs
@@ -46,13 +46,13 @@ namespace Avalonia.Input
             if (element != FocusedElement)
             {
                 var interactive = FocusedElement as IInteractive;
+                FocusedElement = element;
 
                 interactive?.RaiseEvent(new RoutedEventArgs
                 {
                     RoutedEvent = InputElement.LostFocusEvent,
                 });
 
-                FocusedElement = element;
                 interactive = element as IInteractive;
 
                 interactive?.RaiseEvent(new GotFocusEventArgs

From cee1a79911da2115cb5852ac0bde23b3804c775c Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Mon, 5 Mar 2018 12:09:56 -0500
Subject: [PATCH 424/482] Added Unit Tests

---
 .../AutoCompleteBoxTests.cs                   | 1042 +++++++++++++++++
 1 file changed, 1042 insertions(+)
 create mode 100644 tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs

diff --git a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
new file mode 100644
index 0000000000..f9da2ab6f3
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
@@ -0,0 +1,1042 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+using Avalonia.Markup.Xaml.Data;
+using Avalonia.Platform;
+using Avalonia.Threading;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+using System.Collections.ObjectModel;
+
+namespace Avalonia.Controls.UnitTests
+{
+    public class AutoCompleteBoxTests
+    {
+        [Fact]
+        public void Search_Filters()
+        {
+            Assert.True(GetFilter(AutoCompleteFilterMode.Contains)("am", "name"));
+            Assert.True(GetFilter(AutoCompleteFilterMode.Contains)("AME", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.Contains)("hello", "name"));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.ContainsCaseSensitive)("na", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.ContainsCaseSensitive)("AME", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.ContainsCaseSensitive)("hello", "name"));
+
+            Assert.Null(GetFilter(AutoCompleteFilterMode.Custom));
+            Assert.Null(GetFilter(AutoCompleteFilterMode.None));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.Equals)("na", "na"));
+            Assert.True(GetFilter(AutoCompleteFilterMode.Equals)("na", "NA"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.Equals)("hello", "name"));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.EqualsCaseSensitive)("na", "na"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.EqualsCaseSensitive)("na", "NA"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.EqualsCaseSensitive)("hello", "name"));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.StartsWith)("na", "name"));
+            Assert.True(GetFilter(AutoCompleteFilterMode.StartsWith)("NAM", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.StartsWith)("hello", "name"));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.StartsWithCaseSensitive)("na", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.StartsWithCaseSensitive)("NAM", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.StartsWithCaseSensitive)("hello", "name"));
+        }
+
+        [Fact]
+        public void Ordinal_Search_Filters()
+        {
+            Assert.True(GetFilter(AutoCompleteFilterMode.ContainsOrdinal)("am", "name"));
+            Assert.True(GetFilter(AutoCompleteFilterMode.ContainsOrdinal)("AME", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.ContainsOrdinal)("hello", "name"));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.ContainsOrdinalCaseSensitive)("na", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.ContainsOrdinalCaseSensitive)("AME", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.ContainsOrdinalCaseSensitive)("hello", "name"));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.EqualsOrdinal)("na", "na"));
+            Assert.True(GetFilter(AutoCompleteFilterMode.EqualsOrdinal)("na", "NA"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.EqualsOrdinal)("hello", "name"));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.EqualsOrdinalCaseSensitive)("na", "na"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.EqualsOrdinalCaseSensitive)("na", "NA"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.EqualsOrdinalCaseSensitive)("hello", "name"));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.StartsWithOrdinal)("na", "name"));
+            Assert.True(GetFilter(AutoCompleteFilterMode.StartsWithOrdinal)("NAM", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.StartsWithOrdinal)("hello", "name"));
+
+            Assert.True(GetFilter(AutoCompleteFilterMode.StartsWithOrdinalCaseSensitive)("na", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.StartsWithOrdinalCaseSensitive)("NAM", "name"));
+            Assert.False(GetFilter(AutoCompleteFilterMode.StartsWithOrdinalCaseSensitive)("hello", "name"));
+        }
+
+        [Fact]
+        public void Fires_DropDown_Events()
+        {
+            RunTest((control, textbox) =>
+            {
+                bool openEvent = false;
+                bool closeEvent = false;
+                control.DropDownOpened += (s, e) => openEvent = true;
+                control.DropDownClosed += (s, e) => closeEvent = true;
+                control.Items = CreateSimpleStringArray();
+
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.True(control.SearchText == "a");
+                Assert.True(control.IsDropDownOpen);
+                Assert.True(openEvent);
+
+                textbox.Text = String.Empty;
+                Dispatcher.UIThread.RunJobs();
+                Assert.True(control.SearchText == String.Empty);
+                Assert.False(control.IsDropDownOpen);
+                Assert.True(closeEvent);
+            });
+        }
+
+        [Fact]
+        public void Text_Completion_Via_Text_Property()
+        {
+            RunTest((control, textbox) =>
+            {
+                control.IsTextCompletionEnabled = true;
+
+                Assert.Equal(String.Empty, control.Text);
+                control.Text = "close";
+                Assert.NotNull(control.SelectedItem);
+            });
+        }
+
+        [Fact]
+        public void Text_Completion_Selects_Text()
+        {
+            RunTest((control, textbox) =>
+            {
+                control.IsTextCompletionEnabled = true;
+
+                textbox.Text = "ac";
+                textbox.SelectionEnd = textbox.SelectionStart = 2;
+                Dispatcher.UIThread.RunJobs();
+
+                Assert.True(control.IsDropDownOpen);
+                Assert.True(Math.Abs(textbox.SelectionEnd - textbox.SelectionStart) > 2);
+            });
+        }
+
+        [Fact]
+        public void TextChanged_Event_Fires()
+        {
+            RunTest((control, textbox) =>
+            {
+                bool textChanged = false;
+                control.TextChanged += (s, e) => textChanged = true;
+
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.True(textChanged);
+
+                textChanged = false;
+                control.Text = "conversati";
+                Dispatcher.UIThread.RunJobs();
+                Assert.True(textChanged);
+
+                textChanged = false;
+                control.Text = null;
+                Dispatcher.UIThread.RunJobs();
+                Assert.True(textChanged);
+            });
+        }
+
+        [Fact]
+        public void MinimumPrefixLength_Works()
+        {
+            RunTest((control, textbox) =>
+            {
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.True(control.IsDropDownOpen);
+
+
+                textbox.Text = String.Empty;
+                Dispatcher.UIThread.RunJobs();
+                Assert.False(control.IsDropDownOpen);
+
+                control.MinimumPrefixLength = 3;
+
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.False(control.IsDropDownOpen);
+
+                textbox.Text = "acc";
+                Dispatcher.UIThread.RunJobs();
+                Assert.True(control.IsDropDownOpen);
+            });
+        }
+
+        [Fact]
+        public void Can_Cancel_DropDown_Opening()
+        {
+            RunTest((control, textbox) =>
+            {
+                control.DropDownOpening += (s, e) => e.Cancel = true;
+
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.False(control.IsDropDownOpen);
+            });
+        }
+
+        [Fact]
+        public void Can_Cancel_DropDown_Closing()
+        {
+            RunTest((control, textbox) =>
+            {
+                control.DropDownClosing += (s, e) => e.Cancel = true;
+
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.True(control.IsDropDownOpen);
+
+                control.IsDropDownOpen = false;
+                Assert.True(control.IsDropDownOpen);
+            });
+        }
+
+        [Fact]
+        public void Can_Cancel_Population()
+        {
+            RunTest((control, textbox) =>
+            {
+                bool populating = false;
+                bool populated = false;
+                control.FilterMode = AutoCompleteFilterMode.None;
+                control.Populating += (s, e) =>
+                {
+                    e.Cancel = true;
+                    populating = true;
+                };
+                control.Populated += (s, e) => populated = true;
+
+                textbox.Text = "accounti";
+                Dispatcher.UIThread.RunJobs();
+
+                Assert.True(populating);
+                Assert.False(populated);
+            });
+        }
+
+        [Fact]
+        public void Custom_Population_Supported()
+        {
+            RunTest((control, textbox) =>
+            {
+                string custom = "Custom!";
+                string search = "accounti";
+                bool populated = false;
+                bool populatedOk = false;
+                control.FilterMode = AutoCompleteFilterMode.None;
+                control.Populating += (s, e) =>
+                {
+                    control.Items = new string[] { custom };
+                    Assert.Equal(search, e.Parameter);
+                };
+                control.Populated += (s, e) =>
+                {
+                    populated = true;
+                    ReadOnlyCollection<object> collection = e.Data as ReadOnlyCollection<object>;
+                    populatedOk = collection != null && collection.Count == 1;
+                };
+
+                textbox.Text = search;
+                Dispatcher.UIThread.RunJobs();
+
+                Assert.True(populated);
+                Assert.True(populatedOk);
+            });
+        }
+
+        [Fact]
+        public void Text_Completion()
+        {
+            RunTest((control, textbox) =>
+            {
+                control.IsTextCompletionEnabled = true;
+                textbox.Text = "accounti";
+                textbox.SelectionStart = textbox.SelectionEnd = textbox.Text.Length;
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal("accounti", control.SearchText);
+                Assert.Equal("accounting", textbox.Text);
+            });
+        }
+
+        [Fact]
+        public void String_Search()
+        {
+            RunTest((control, textbox) =>
+            {
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "acc";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "cook";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "accept";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "cook";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+            });
+        }
+
+        [Fact]
+        public void Item_Search()
+        {
+            RunTest((control, textbox) =>
+            {
+                control.FilterMode = AutoCompleteFilterMode.Custom;
+                control.ItemFilter = (search, item) =>
+                {
+                    string s = item as string;
+                    return s == null ? false : true;
+                };
+
+                // Just set to null briefly to exercise that code path
+                AutoCompleteFilterPredicate<object> filter = control.ItemFilter;
+                Assert.NotNull(filter);
+                control.ItemFilter = null;
+                Assert.Null(control.ItemFilter);
+                control.ItemFilter = filter;
+                Assert.NotNull(control.ItemFilter);
+
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "acc";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "a";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "cook";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "accept";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+
+                textbox.Text = "cook";
+                Dispatcher.UIThread.RunJobs();
+                Assert.Equal(textbox.Text, control.Text);
+            });
+        }
+        
+        /// <summary>
+        /// Retrieves a defined predicate filter through a new AutoCompleteBox 
+        /// control instance.
+        /// </summary>
+        /// <param name="mode">The FilterMode of interest.</param>
+        /// <returns>Returns the predicate instance.</returns>
+        private static AutoCompleteFilterPredicate<string> GetFilter(AutoCompleteFilterMode mode)
+        {
+            return new AutoCompleteBox { FilterMode = mode }
+                .TextFilter;
+        }
+
+        /// <summary>
+        /// Creates a large list of strings for AutoCompleteBox testing.
+        /// </summary>
+        /// <returns>Returns a new List of string values.</returns>
+        private IList<string> CreateSimpleStringArray()
+        {
+            return new List<string>
+            {
+            "a",
+            "abide",
+            "able",
+            "about",
+            "above",
+            "absence",
+            "absurd",
+            "accept",
+            "acceptance",
+            "accepted",
+            "accepting",
+            "access",
+            "accessed",
+            "accessible",
+            "accident",
+            "accidentally",
+            "accordance",
+            "account",
+            "accounting",
+            "accounts",
+            "accusation",
+            "accustomed",
+            "ache",
+            "across",
+            "act",
+            "active",
+            "actual",
+            "actually",
+            "ada",
+            "added",
+            "adding",
+            "addition",
+            "additional",
+            "additions",
+            "address",
+            "addressed",
+            "addresses",
+            "addressing",
+            "adjourn",
+            "adoption",
+            "advance",
+            "advantage",
+            "adventures",
+            "advice",
+            "advisable",
+            "advise",
+            "affair",
+            "affectionately",
+            "afford",
+            "afore",
+            "afraid",
+            "after",
+            "afterwards",
+            "again",
+            "against",
+            "age",
+            "aged",
+            "agent",
+            "ago",
+            "agony",
+            "agree",
+            "agreed",
+            "agreement",
+            "ah",
+            "ahem",
+            "air",
+            "airs",
+            "ak",
+            "alarm",
+            "alarmed",
+            "alas",
+            "alice",
+            "alive",
+            "all",
+            "allow",
+            "almost",
+            "alone",
+            "along",
+            "aloud",
+            "already",
+            "also",
+            "alteration",
+            "altered",
+            "alternate",
+            "alternately",
+            "altogether",
+            "always",
+            "am",
+            "ambition",
+            "among",
+            "an",
+            "ancient",
+            "and",
+            "anger",
+            "angrily",
+            "angry",
+            "animal",
+            "animals",
+            "ann",
+            "annoy",
+            "annoyed",
+            "another",
+            "answer",
+            "answered",
+            "answers",
+            "antipathies",
+            "anxious",
+            "anxiously",
+            "any",
+            "anyone",
+            "anything",
+            "anywhere",
+            "appealed",
+            "appear",
+            "appearance",
+            "appeared",
+            "appearing",
+            "appears",
+            "applause",
+            "apple",
+            "apples",
+            "applicable",
+            "apply",
+            "approach",
+            "arch",
+            "archbishop",
+            "arches",
+            "archive",
+            "are",
+            "argue",
+            "argued",
+            "argument",
+            "arguments",
+            "arise",
+            "arithmetic",
+            "arm",
+            "arms",
+            "around",
+            "arranged",
+            "array",
+            "arrived",
+            "arrow",
+            "arrum",
+            "as",
+            "ascii",
+            "ashamed",
+            "ask",
+            "askance",
+            "asked",
+            "asking",
+            "asleep",
+            "assembled",
+            "assistance",
+            "associated",
+            "at",
+            "ate",
+            "atheling",
+            "atom",
+            "attached",
+            "attempt",
+            "attempted",
+            "attempts",
+            "attended",
+            "attending",
+            "attends",
+            "audibly",
+            "australia",
+            "author",
+            "authority",
+            "available",
+            "avoid",
+            "away",
+            "awfully",
+            "axes",
+            "axis",
+            "b",
+            "baby",
+            "back",
+            "backs",
+            "bad",
+            "bag",
+            "baked",
+            "balanced",
+            "bank",
+            "banks",
+            "banquet",
+            "bark",
+            "barking",
+            "barley",
+            "barrowful",
+            "based",
+            "bat",
+            "bathing",
+            "bats",
+            "bawled",
+            "be",
+            "beak",
+            "bear",
+            "beast",
+            "beasts",
+            "beat",
+            "beating",
+            "beau",
+            "beauti",
+            "beautiful",
+            "beautifully",
+            "beautify",
+            "became",
+            "because",
+            "become",
+            "becoming",
+            "bed",
+            "beds",
+            "bee",
+            "been",
+            "before",
+            "beg",
+            "began",
+            "begged",
+            "begin",
+            "beginning",
+            "begins",
+            "begun",
+            "behead",
+            "beheaded",
+            "beheading",
+            "behind",
+            "being",
+            "believe",
+            "believed",
+            "bells",
+            "belong",
+            "belongs",
+            "beloved",
+            "below",
+            "belt",
+            "bend",
+            "bent",
+            "besides",
+            "best",
+            "better",
+            "between",
+            "bill",
+            "binary",
+            "bird",
+            "birds",
+            "birthday",
+            "bit",
+            "bite",
+            "bitter",
+            "blacking",
+            "blades",
+            "blame",
+            "blasts",
+            "bleeds",
+            "blew",
+            "blow",
+            "blown",
+            "blows",
+            "body",
+            "boldly",
+            "bone",
+            "bones",
+            "book",
+            "books",
+            "boon",
+            "boots",
+            "bore",
+            "both",
+            "bother",
+            "bottle",
+            "bottom",
+            "bough",
+            "bound",
+            "bowed",
+            "bowing",
+            "box",
+            "boxed",
+            "boy",
+            "brain",
+            "branch",
+            "branches",
+            "brandy",
+            "brass",
+            "brave",
+            "breach",
+            "bread",
+            "break",
+            "breath",
+            "breathe",
+            "breeze",
+            "bright",
+            "brightened",
+            "bring",
+            "bringing",
+            "bristling",
+            "broke",
+            "broken",
+            "brother",
+            "brought",
+            "brown",
+            "brush",
+            "brushing",
+            "burn",
+            "burning",
+            "burnt",
+            "burst",
+            "bursting",
+            "busily",
+            "business",
+            "business@pglaf",
+            "busy",
+            "but",
+            "butter",
+            "buttercup",
+            "buttered",
+            "butterfly",
+            "buttons",
+            "by",
+            "bye",
+            "c",
+            "cackled",
+            "cake",
+            "cakes",
+            "calculate",
+            "calculated",
+            "call",
+            "called",
+            "calling",
+            "calmly",
+            "came",
+            "camomile",
+            "can",
+            "canary",
+            "candle",
+            "cannot",
+            "canterbury",
+            "canvas",
+            "capering",
+            "capital",
+            "card",
+            "cardboard",
+            "cards",
+            "care",
+            "carefully",
+            "cares",
+            "carried",
+            "carrier",
+            "carroll",
+            "carry",
+            "carrying",
+            "cart",
+            "cartwheels",
+            "case",
+            "cat",
+            "catch",
+            "catching",
+            "caterpillar",
+            "cats",
+            "cattle",
+            "caucus",
+            "caught",
+            "cauldron",
+            "cause",
+            "caused",
+            "cautiously",
+            "cease",
+            "ceiling",
+            "centre",
+            "certain",
+            "certainly",
+            "chain",
+            "chains",
+            "chair",
+            "chance",
+            "chanced",
+            "change",
+            "changed",
+            "changes",
+            "changing",
+            "chapter",
+            "character",
+            "charge",
+            "charges",
+            "charitable",
+            "charities",
+            "chatte",
+            "cheap",
+            "cheated",
+            "check",
+            "checked",
+            "checks",
+            "cheeks",
+            "cheered",
+            "cheerfully",
+            "cherry",
+            "cheshire",
+            "chief",
+            "child",
+            "childhood",
+            "children",
+            "chimney",
+            "chimneys",
+            "chin",
+            "choice",
+            "choke",
+            "choked",
+            "choking",
+            "choose",
+            "choosing",
+            "chop",
+            "chorus",
+            "chose",
+            "christmas",
+            "chrysalis",
+            "chuckled",
+            "circle",
+            "circumstances",
+            "city",
+            "civil",
+            "claim",
+            "clamour",
+            "clapping",
+            "clasped",
+            "classics",
+            "claws",
+            "clean",
+            "clear",
+            "cleared",
+            "clearer",
+            "clearly",
+            "clever",
+            "climb",
+            "clinging",
+            "clock",
+            "close",
+            "closed",
+            "closely",
+            "closer",
+            "clubs",
+            "coast",
+            "coaxing",
+            "codes",
+            "coils",
+            "cold",
+            "collar",
+            "collected",
+            "collection",
+            "come",
+            "comes",
+            "comfits",
+            "comfort",
+            "comfortable",
+            "comfortably",
+            "coming",
+            "commercial",
+            "committed",
+            "common",
+            "commotion",
+            "company",
+            "compilation",
+            "complained",
+            "complaining",
+            "completely",
+            "compliance",
+            "comply",
+            "complying",
+            "compressed",
+            "computer",
+            "computers",
+            "concept",
+            "concerning",
+            "concert",
+            "concluded",
+            "conclusion",
+            "condemn",
+            "conduct",
+            "confirmation",
+            "confirmed",
+            "confused",
+            "confusing",
+            "confusion",
+            "conger",
+            "conqueror",
+            "conquest",
+            "consented",
+            "consequential",
+            "consider",
+            "considerable",
+            "considered",
+            "considering",
+            "constant",
+            "consultation",
+            "contact",
+            "contain",
+            "containing",
+            "contempt",
+            "contemptuous",
+            "contemptuously",
+            "content",
+            "continued",
+            "contract",
+            "contradicted",
+            "contributions",
+            "conversation",
+            "conversations",
+            "convert",
+            "cook",
+            "cool",
+            "copied",
+            "copies",
+            "copy",
+            "copying",
+            "copyright",
+            "corner",
+            "corners",
+            "corporation",
+            "corrupt",
+            "cost",
+            "costs",
+            "could",
+            "couldn",
+            "counting",
+            "countries",
+            "country",
+            "couple",
+            "couples",
+            "courage",
+            "course",
+            "court",
+            "courtiers",
+            "coward",
+            "crab",
+            "crash",
+            "crashed",
+            "crawled",
+            "crawling",
+            "crazy",
+            "created",
+            "creating",
+            "creation",
+            "creature",
+            "creatures",
+            "credit",
+            "creep",
+            "crept",
+            "cried",
+            "cries",
+            "crimson",
+            "critical",
+            "crocodile",
+            "croquet",
+            "croqueted",
+            "croqueting",
+            "cross",
+            "crossed",
+            "crossly",
+            "crouched",
+            "crowd",
+            "crowded",
+            "crown",
+            "crumbs",
+            "crust",
+            "cry",
+            "crying",
+            "cucumber",
+            "cunning",
+            "cup",
+            "cupboards",
+            "cur",
+            "curiosity",
+            "curious",
+            "curiouser",
+            "curled",
+            "curls",
+            "curly",
+            "currants",
+            "current",
+            "curtain",
+            "curtsey",
+            "curtseying",
+            "curving",
+            "cushion",
+            "custard",
+            "custody",
+            "cut",
+            "cutting",
+            };
+        }
+        private void RunTest(Action<AutoCompleteBox, TextBox> test)
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                AutoCompleteBox control = CreateControl();
+                control.Items = CreateSimpleStringArray();
+                TextBox textBox = GetTextBox(control);
+                Dispatcher.UIThread.RunJobs();
+                test.Invoke(control, textBox);
+            }
+        }
+
+        private static TestServices Services => TestServices.StyledWindow;
+
+        /*private static TestServices Services => TestServices.MockThreadingInterface.With(
+            standardCursorFactory: Mock.Of<IStandardCursorFactory>(),
+            windowingPlatform: new MockWindowingPlatform());*/
+
+        private AutoCompleteBox CreateControl()
+        {
+            var datePicker =
+                new AutoCompleteBox
+                {
+                    Template = CreateTemplate()
+                };
+
+            datePicker.ApplyTemplate();
+            return datePicker;
+        }
+        private TextBox GetTextBox(AutoCompleteBox control)
+        {
+            return control.GetTemplateChildren()
+                          .OfType<TextBox>()
+                          .First();
+        }
+        private IControlTemplate CreateTemplate()
+        {
+            return new FuncControlTemplate<AutoCompleteBox>(control =>
+            {
+                var textBox =
+                    new TextBox
+                    {
+                        Name = "PART_TextBox"
+                    };
+                var listbox =
+                    new ListBox
+                    {
+                        Name = "PART_SelectingItemsControl"
+                    };
+                var popup =
+                    new Popup
+                    {
+                        Name = "PART_Popup"
+                    };
+
+                var panel = new Panel();
+                panel.Children.Add(textBox);
+                panel.Children.Add(popup);
+                panel.Children.Add(listbox);
+
+                return panel;
+            });
+        }
+    }
+}

From bac877cd91a4b7d487a3bde7160af68aced45c89 Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Tue, 13 Mar 2018 21:41:38 -0400
Subject: [PATCH 425/482] Fixed a property name mistake in GradientBrush

---
 src/Avalonia.Visuals/Media/GradientBrush.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Visuals/Media/GradientBrush.cs b/src/Avalonia.Visuals/Media/GradientBrush.cs
index 8c2c9a2c01..fb29f68373 100644
--- a/src/Avalonia.Visuals/Media/GradientBrush.cs
+++ b/src/Avalonia.Visuals/Media/GradientBrush.cs
@@ -22,7 +22,7 @@ namespace Avalonia.Media
         /// Defines the <see cref="GradientStops"/> property.
         /// </summary>
         public static readonly StyledProperty<IList<GradientStop>> GradientStopsProperty =
-            AvaloniaProperty.Register<GradientBrush, IList<GradientStop>>(nameof(Opacity));
+            AvaloniaProperty.Register<GradientBrush, IList<GradientStop>>(nameof(GradientStops));
 
         /// <summary>
         /// Initializes a new instance of the <see cref="GradientBrush"/> class.

From 242b9251df78cb16f67320fa358d22d0e4b88866 Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Tue, 13 Mar 2018 21:42:27 -0400
Subject: [PATCH 426/482] Added async population feature

---
 .../Pages/AutoCompleteBoxPage.xaml            |  8 ++-
 .../Pages/AutoCompleteBoxPage.xaml.cs         | 18 +++++
 src/Avalonia.Controls/AutoCompleteBox.cs      | 70 +++++++++++++++++++
 3 files changed, 94 insertions(+), 2 deletions(-)

diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
index 491f41ecbf..943fadf100 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
@@ -8,7 +8,6 @@
               HorizontalAlignment="Center"
               Gap="8">
       <StackPanel Orientation="Vertical">
-        
         <TextBlock Text="MinimumPrefixLength: 1"/>
         <AutoCompleteBox Width="200"
                          Margin="0,0,0,8"
@@ -35,6 +34,7 @@
       
 
       <StackPanel Orientation="Vertical">
+        
         <TextBlock Text="ValueMemeberSelector"/>
         <AutoCompleteBox Width="200"
                          Margin="0,0,0,8"
@@ -47,8 +47,12 @@
         <AutoCompleteBox Name="MultiBindingBox"
                          Width="200"
                          Margin="0,0,0,8"
-                         ValueMemberBinding="{Binding Capital}"
                          FilterMode="Contains"/>
+        <TextBlock Text="Async Populate"/>
+        <AutoCompleteBox Name="AsyncBox"
+                         Width="200"
+                         Margin="0,0,0,8"
+                         FilterMode="None"/>
       </StackPanel>
     </StackPanel>
   </StackPanel>
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
index 9f181d44f2..6f3b8361cd 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
@@ -6,6 +6,8 @@ using Avalonia.Markup.Xaml.Data;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace ControlCatalog.Pages
 {
@@ -109,6 +111,9 @@ namespace ControlCatalog.Pages
 
             var multibindingBox = this.FindControl<AutoCompleteBox>("MultiBindingBox");
             multibindingBox.ValueMemberBinding = binding;
+
+            var asyncBox = this.FindControl<AutoCompleteBox>("AsyncBox");
+            asyncBox.AsyncPopulator = PopulateAsync;
         }
         private IEnumerable<AutoCompleteBox> GetAllAutoCompleteBox()
         {
@@ -117,6 +122,19 @@ namespace ControlCatalog.Pages
                     .OfType<AutoCompleteBox>();
         }
 
+        private bool StringContains(string str, string query)
+        {
+            return str.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0;
+        }
+        private async Task<IEnumerable<object>> PopulateAsync(string searchText, CancellationToken cancellationToken)
+        {
+            await Task.Delay(TimeSpan.FromSeconds(1.5), cancellationToken);
+
+            return
+                States.Where(data => StringContains(data.Name, searchText) || StringContains(data.Capital, searchText))
+                      .ToList();
+        }
+
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
diff --git a/src/Avalonia.Controls/AutoCompleteBox.cs b/src/Avalonia.Controls/AutoCompleteBox.cs
index 0e8b93146c..e4962dc069 100644
--- a/src/Avalonia.Controls/AutoCompleteBox.cs
+++ b/src/Avalonia.Controls/AutoCompleteBox.cs
@@ -23,6 +23,8 @@ using Avalonia.Utilities;
 using System.Globalization;
 using System.Collections.Specialized;
 using System.Reactive.Disposables;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace Avalonia.Controls
 {
@@ -360,6 +362,8 @@ namespace Avalonia.Controls
         private IDisposable _collectionChangeSubscription;
 
         private IMemberSelector _valueMemberSelector;
+        private Func<string, CancellationToken, Task<IEnumerable<object>>> _asyncPopulator;
+        private CancellationTokenSource _populationCancellationTokenSource;
 
         private bool _itemTemplateIsFromValueMemeberBinding = true;
         private bool _settingItemTemplateFromValueMemeberBinding;
@@ -559,6 +563,12 @@ namespace Avalonia.Controls
                 o => o.ValueMemberSelector,
                 (o, v) => o.ValueMemberSelector = v);
 
+        public static readonly DirectProperty<AutoCompleteBox, Func<string, CancellationToken, Task<IEnumerable<object>>>> AsyncPopulatorProperty =
+            AvaloniaProperty.RegisterDirect<AutoCompleteBox, Func<string, CancellationToken, Task<IEnumerable<object>>>>(
+                nameof(AsyncPopulator),
+                o => o.AsyncPopulator,
+                (o, v) => o.AsyncPopulator = v);
+
         private static int ValidateMinimumPrefixLength(AutoCompleteBox control, int value)
         {
             Contract.Requires<ArgumentOutOfRangeException>(value >= -1);
@@ -1107,6 +1117,12 @@ namespace Avalonia.Controls
             set { SetAndRaise(TextFilterProperty, ref _textFilter, value); }
         }
 
+        public Func<string, CancellationToken, Task<IEnumerable<object>>> AsyncPopulator
+        {
+            get { return _asyncPopulator; }
+            set { SetAndRaise(AsyncPopulatorProperty, ref _asyncPopulator, value); }
+        }
+
         /// <summary>
         /// Gets or sets a collection that is used to generate the items for the
         /// drop-down portion of the
@@ -1702,6 +1718,11 @@ namespace Avalonia.Controls
             // Update the prefix/search text.
             SearchText = Text;
 
+            if(TryPopulateAsync(SearchText))
+            {
+                return;
+            }
+
             // The Populated event enables advanced, custom filtering. The 
             // client needs to directly update the ItemsSource collection or
             // call the Populate method on the control to continue the 
@@ -1713,6 +1734,55 @@ namespace Avalonia.Controls
                 PopulateComplete();
             }
         }
+        private bool TryPopulateAsync(string searchText)
+        {
+            _populationCancellationTokenSource?.Cancel(false);
+            _populationCancellationTokenSource?.Dispose();
+            _populationCancellationTokenSource = null;
+
+            if(_asyncPopulator == null)
+            {
+                return false;
+            }
+
+            _populationCancellationTokenSource = new CancellationTokenSource();
+            var task = PopulateAsync(searchText, _populationCancellationTokenSource.Token);
+            if (task.Status == TaskStatus.Created)
+                task.Start();
+
+            return true;
+        }
+        private async Task PopulateAsync(string searchText, CancellationToken cancellationToken)
+        {
+
+            try
+            {
+                IEnumerable<object> result = await _asyncPopulator.Invoke(searchText, cancellationToken);
+                var resultList = result.ToList();
+
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
+
+                await Dispatcher.UIThread.InvokeAsync(() =>
+                {
+                    if (!cancellationToken.IsCancellationRequested)
+                    {
+                        Items = resultList;
+                        PopulateComplete();
+                    }
+                });
+            }
+            catch (TaskCanceledException)
+            { }
+            finally
+            {
+                _populationCancellationTokenSource?.Dispose();
+                _populationCancellationTokenSource = null;
+            }
+
+        }
 
         /// <summary>
         /// Private method that directly opens the popup, checks the expander 

From 2eafd111ecb51f1dde432d1a25ec7c657df119a9 Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Tue, 13 Mar 2018 21:47:13 -0400
Subject: [PATCH 427/482] Moved CancelableEventArgs to Avalonia.Interactivity

---
 src/Avalonia.Controls/AutoCompleteBox.cs         |  9 ---------
 .../CancelableEventArgs.cs                       | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 src/Avalonia.Interactivity/CancelableEventArgs.cs

diff --git a/src/Avalonia.Controls/AutoCompleteBox.cs b/src/Avalonia.Controls/AutoCompleteBox.cs
index e4962dc069..730c1e895e 100644
--- a/src/Avalonia.Controls/AutoCompleteBox.cs
+++ b/src/Avalonia.Controls/AutoCompleteBox.cs
@@ -28,15 +28,6 @@ using System.Threading.Tasks;
 
 namespace Avalonia.Controls
 {
-    public class CancelableEventArgs : EventArgs
-    {
-        public bool Cancel { get; set; }
-
-        public CancelableEventArgs()
-            : base()
-        { }
-    }
-    
     /// <summary>
     /// Provides data for the
     /// <see cref="E:Avalonia.Controls.AutoCompleteBox.Populated" />
diff --git a/src/Avalonia.Interactivity/CancelableEventArgs.cs b/src/Avalonia.Interactivity/CancelableEventArgs.cs
new file mode 100644
index 0000000000..13ff9239f1
--- /dev/null
+++ b/src/Avalonia.Interactivity/CancelableEventArgs.cs
@@ -0,0 +1,16 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+
+namespace Avalonia.Interactivity
+{
+    public class CancelableEventArgs : EventArgs
+    {
+        public bool Cancel { get; set; }
+
+        public CancelableEventArgs()
+            : base()
+        { }
+    }
+}

From e52f966877e941f6adfafe426c57f6cbca85d1a3 Mon Sep 17 00:00:00 2001
From: sdoroff <sdoroff@gmail.com>
Date: Mon, 19 Mar 2018 17:31:42 -0400
Subject: [PATCH 428/482] Made use of existing CancelEventArgs

Uses System.ComponentModel.CancelEventArgs
instead of custom CancelableEventArgs class
---
 src/Avalonia.Controls/AutoCompleteBox.cs      | 44 +++++++++----------
 .../CancelableEventArgs.cs                    | 16 -------
 2 files changed, 20 insertions(+), 40 deletions(-)
 delete mode 100644 src/Avalonia.Interactivity/CancelableEventArgs.cs

diff --git a/src/Avalonia.Controls/AutoCompleteBox.cs b/src/Avalonia.Controls/AutoCompleteBox.cs
index 730c1e895e..f1854cf8fb 100644
--- a/src/Avalonia.Controls/AutoCompleteBox.cs
+++ b/src/Avalonia.Controls/AutoCompleteBox.cs
@@ -3,28 +3,24 @@
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Collections;
 using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
 using Avalonia.Controls.Utils;
 using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.Media;
-using Avalonia.Collections;
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Collections;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
 using Avalonia.Threading;
-using Avalonia.Controls.Templates;
 using Avalonia.VisualTree;
-using Avalonia.Utilities;
-using System.Globalization;
-using System.Collections.Specialized;
-using System.Reactive.Disposables;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Avalonia.Controls
 {
@@ -63,7 +59,7 @@ namespace Avalonia.Controls
     /// event.
     /// </summary>
     /// <QualityBand>Stable</QualityBand>
-    public class PopulatingEventArgs : CancelableEventArgs
+    public class PopulatingEventArgs : CancelEventArgs
     {
         /// <summary>
         /// Gets the text that is used to determine which items to display in
@@ -1490,7 +1486,7 @@ namespace Avalonia.Controls
         /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
         /// property is changing from false to true.
         /// </summary>
-        public event EventHandler<CancelableEventArgs> DropDownOpening;
+        public event EventHandler<CancelEventArgs> DropDownOpening;
 
         /// <summary>
         /// Occurs when the value of the
@@ -1504,7 +1500,7 @@ namespace Avalonia.Controls
         /// <see cref="P:Avalonia.Controls.AutoCompleteBox.IsDropDownOpen" />
         /// property is changing from true to false.
         /// </summary>
-        public event EventHandler<CancelableEventArgs> DropDownClosing;
+        public event EventHandler<CancelEventArgs> DropDownClosing;
 
         /// <summary>
         /// Occurs when the
@@ -1569,9 +1565,9 @@ namespace Avalonia.Controls
         /// event.
         /// </summary>
         /// <param name="e">A
-        /// <see cref="T:Avalonia.Controls.CancelableEventArgs" />
+        /// <see cref="T:Avalonia.Controls.CancelEventArgs" />
         /// that contains the event data.</param>
-        protected virtual void OnDropDownOpening(CancelableEventArgs e)
+        protected virtual void OnDropDownOpening(CancelEventArgs e)
         {
             DropDownOpening?.Invoke(this, e);
         }
@@ -1595,9 +1591,9 @@ namespace Avalonia.Controls
         /// event.
         /// </summary>
         /// <param name="e">A
-        /// <see cref="T:Avalonia.Controls.CancelableEventArgs" />
+        /// <see cref="T:Avalonia.Controls.CancelEventArgs" />
         /// that contains the event data.</param>
-        protected virtual void OnDropDownClosing(CancelableEventArgs e)
+        protected virtual void OnDropDownClosing(CancelEventArgs e)
         {
             DropDownClosing?.Invoke(this, e);
         }
@@ -1633,7 +1629,7 @@ namespace Avalonia.Controls
         /// <param name="oldValue">The original value.</param>
         private void ClosingDropDown(bool oldValue)
         {
-            var args = new CancelableEventArgs();
+            var args = new CancelEventArgs();
             OnDropDownClosing(args);
 
             if (args.Cancel)
@@ -1656,7 +1652,7 @@ namespace Avalonia.Controls
         /// <param name="oldValue">The original value, if needed for a revert.</param>
         private void OpeningDropDown(bool oldValue)
         {
-            var args = new CancelableEventArgs();
+            var args = new CancelEventArgs();
 
             // Opening
             OnDropDownOpening(args);
diff --git a/src/Avalonia.Interactivity/CancelableEventArgs.cs b/src/Avalonia.Interactivity/CancelableEventArgs.cs
deleted file mode 100644
index 13ff9239f1..0000000000
--- a/src/Avalonia.Interactivity/CancelableEventArgs.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-
-namespace Avalonia.Interactivity
-{
-    public class CancelableEventArgs : EventArgs
-    {
-        public bool Cancel { get; set; }
-
-        public CancelableEventArgs()
-            : base()
-        { }
-    }
-}

From a3cdb6c1edd7927dc933148ecc481f60bd0e505a Mon Sep 17 00:00:00 2001
From: dzhelnin <mitya_zh@mail.ru>
Date: Tue, 20 Mar 2018 12:36:28 +0300
Subject: [PATCH 429/482] Update buttons of ButtonSpinner on
 ValidSpinDirections changes

---
 src/Avalonia.Controls/ButtonSpinner.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Avalonia.Controls/ButtonSpinner.cs b/src/Avalonia.Controls/ButtonSpinner.cs
index 3ce81e0b12..866237ecce 100644
--- a/src/Avalonia.Controls/ButtonSpinner.cs
+++ b/src/Avalonia.Controls/ButtonSpinner.cs
@@ -201,6 +201,11 @@ namespace Avalonia.Controls
             }
         }
 
+        protected override void OnValidSpinDirectionChanged(ValidSpinDirections oldValue, ValidSpinDirections newValue)
+        {
+            SetButtonUsage();
+        }
+
         /// <summary>
         /// Called when the <see cref="AllowSpin"/> property value changed.
         /// </summary>

From 0953673b763e4d479ddf864b17f09207f32fe2d3 Mon Sep 17 00:00:00 2001
From: dzhelnin <mitya_zh@mail.ru>
Date: Tue, 20 Mar 2018 13:57:55 +0300
Subject: [PATCH 430/482] Added UpDownBase class

---
 .../NumericUpDown/UpDownBase.cs               | 824 ++++++++++++++++++
 1 file changed, 824 insertions(+)
 create mode 100644 src/Avalonia.Controls/NumericUpDown/UpDownBase.cs

diff --git a/src/Avalonia.Controls/NumericUpDown/UpDownBase.cs b/src/Avalonia.Controls/NumericUpDown/UpDownBase.cs
new file mode 100644
index 0000000000..fa95eb01a7
--- /dev/null
+++ b/src/Avalonia.Controls/NumericUpDown/UpDownBase.cs
@@ -0,0 +1,824 @@
+using System;
+using System.Globalization;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Threading;
+
+namespace Avalonia.Controls
+{
+    public abstract class UpDownBase : TemplatedControl
+    {
+    }
+
+    /// <summary>
+    /// Base class for controls that represents a TextBox with button spinners that allow incrementing and decrementing values.
+    /// </summary>
+    public abstract class UpDownBase<T> : UpDownBase
+    {
+        /// <summary>
+        /// Defines the <see cref="AllowSpin"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> AllowSpinProperty =
+            ButtonSpinner.AllowSpinProperty.AddOwner<UpDownBase<T>>();
+
+        /// <summary>
+        /// Defines the <see cref="ButtonSpinnerLocation"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Location> ButtonSpinnerLocationProperty =
+            ButtonSpinner.ButtonSpinnerLocationProperty.AddOwner<UpDownBase<T>>();
+
+        /// <summary>
+        /// Defines the <see cref="ShowButtonSpinner"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> ShowButtonSpinnerProperty =
+            ButtonSpinner.ShowButtonSpinnerProperty.AddOwner<UpDownBase<T>>();
+
+        /// <summary>
+        /// Defines the <see cref="ClipValueToMinMax"/> property.
+        /// </summary>
+        public static readonly DirectProperty<UpDownBase<T>, bool> ClipValueToMinMaxProperty =
+            AvaloniaProperty.RegisterDirect<UpDownBase<T>, bool>(nameof(ClipValueToMinMax),
+                updown => updown.ClipValueToMinMax, (updown, b) => updown.ClipValueToMinMax = b);
+
+        /// <summary>
+        /// Defines the <see cref="CultureInfo"/> property.
+        /// </summary>
+        public static readonly DirectProperty<UpDownBase<T>, CultureInfo> CultureInfoProperty =
+            AvaloniaProperty.RegisterDirect<UpDownBase<T>, CultureInfo>(nameof(CultureInfo), o => o.CultureInfo,
+                (o, v) => o.CultureInfo = v, CultureInfo.CurrentCulture);
+
+        /// <summary>
+        /// Defines the <see cref="DefaultValue"/> property.
+        /// </summary>
+        public static readonly StyledProperty<T> DefaultValueProperty =
+            AvaloniaProperty.Register<UpDownBase<T>, T>(nameof(DefaultValue));
+
+        /// <summary>
+        /// Defines the <see cref="DisplayDefaultValueOnEmptyText"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> DisplayDefaultValueOnEmptyTextProperty =
+            AvaloniaProperty.Register<UpDownBase<T>, bool>(nameof(DisplayDefaultValueOnEmptyText));
+
+        /// <summary>
+        /// Defines the <see cref="IsReadOnly"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsReadOnlyProperty =
+            AvaloniaProperty.Register<UpDownBase<T>, bool>(nameof(IsReadOnly));
+
+        /// <summary>
+        /// Defines the <see cref="Maximum"/> property.
+        /// </summary>
+        public static readonly StyledProperty<T> MaximumProperty =
+            AvaloniaProperty.Register<UpDownBase<T>, T>(nameof(Maximum), validate: OnCoerceMaximum);
+
+        /// <summary>
+        /// Defines the <see cref="Minimum"/> property.
+        /// </summary>
+        public static readonly StyledProperty<T> MinimumProperty =
+            AvaloniaProperty.Register<UpDownBase<T>, T>(nameof(Minimum), validate: OnCoerceMinimum);
+
+        /// <summary>
+        /// Defines the <see cref="Text"/> property.
+        /// </summary>
+        public static readonly DirectProperty<UpDownBase<T>, string> TextProperty =
+            AvaloniaProperty.RegisterDirect<UpDownBase<T>, string>(nameof(Text), o => o.Text, (o, v) => o.Text = v,
+                defaultBindingMode: BindingMode.TwoWay);
+
+        /// <summary>
+        /// Defines the <see cref="Value"/> property.
+        /// </summary>
+        public static readonly DirectProperty<UpDownBase<T>, T> ValueProperty =
+            AvaloniaProperty.RegisterDirect<UpDownBase<T>, T>(nameof(Value), updown => updown.Value,
+                (updown, v) => updown.Value = v, defaultBindingMode: BindingMode.TwoWay);
+
+        /// <summary>
+        /// Defines the <see cref="Watermark"/> property.
+        /// </summary>
+        public static readonly StyledProperty<string> WatermarkProperty =
+            AvaloniaProperty.Register<UpDownBase<T>, string>(nameof(Watermark));
+
+        private IDisposable _textBoxTextChangedSubscription;
+        private T _value;
+        private string _text;
+        private bool _internalValueSet;
+        private bool _clipValueToMinMax;
+        private bool _isSyncingTextAndValueProperties;
+        private bool _isTextChangedFromUI;
+        private CultureInfo _cultureInfo;
+
+        /// <summary>
+        /// Gets the Spinner template part.
+        /// </summary>
+        protected Spinner Spinner { get; private set; }
+
+        /// <summary>
+        /// Gets the TextBox template part.
+        /// </summary>
+        protected TextBox TextBox { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the ability to perform increment/decrement operations via the keyboard, button spinners, or mouse wheel.
+        /// </summary>
+        public bool AllowSpin
+        {
+            get { return GetValue(AllowSpinProperty); }
+            set { SetValue(AllowSpinProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets current location of the <see cref="ButtonSpinner"/>.
+        /// </summary>
+        public Location ButtonSpinnerLocation
+        {
+            get { return GetValue(ButtonSpinnerLocationProperty); }
+            set { SetValue(ButtonSpinnerLocationProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the spin buttons should be shown.
+        /// </summary>
+        public bool ShowButtonSpinner
+        {
+            get { return GetValue(ShowButtonSpinnerProperty); }
+            set { SetValue(ShowButtonSpinnerProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets if the value should be clipped when minimum/maximum is reached.
+        /// </summary>
+        public bool ClipValueToMinMax
+        {
+            get { return _clipValueToMinMax; }
+            set { SetAndRaise(ClipValueToMinMaxProperty, ref _clipValueToMinMax, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the current CultureInfo.
+        /// </summary>
+        public CultureInfo CultureInfo
+        {
+            get { return _cultureInfo; }
+            set { SetAndRaise(CultureInfoProperty, ref _cultureInfo, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the value to use when the <see cref="Value"/> is null and an increment/decrement operation is performed.
+        /// </summary>
+        public T DefaultValue
+        {
+            get { return GetValue(DefaultValueProperty); }
+            set { SetValue(DefaultValueProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets if the defaultValue should be displayed when the Text is empty.
+        /// </summary>
+        public bool DisplayDefaultValueOnEmptyText
+        {
+            get { return GetValue(DisplayDefaultValueOnEmptyTextProperty); }
+            set { SetValue(DisplayDefaultValueOnEmptyTextProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets if the control is read only.
+        /// </summary>
+        public bool IsReadOnly
+        {
+            get { return GetValue(IsReadOnlyProperty); }
+            set { SetValue(IsReadOnlyProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum allowed value.
+        /// </summary>
+        public T Maximum
+        {
+            get { return GetValue(MaximumProperty); }
+            set { SetValue(MaximumProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum allowed value.
+        /// </summary>
+        public T Minimum
+        {
+            get { return GetValue(MinimumProperty); }
+            set { SetValue(MinimumProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the formatted string representation of the value.
+        /// </summary>
+        public string Text
+        {
+            get { return _text; }
+            set { SetAndRaise(TextProperty, ref _text, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the value.
+        /// </summary>
+        public T Value
+        {
+            get { return _value; }
+            set
+            {
+                value = OnCoerceValue(value);
+                SetAndRaise(ValueProperty, ref _value, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the object to use as a watermark if the <see cref="Value"/> is null.
+        /// </summary>
+        public string Watermark
+        {
+            get { return GetValue(WatermarkProperty); }
+            set { SetValue(WatermarkProperty, value); }
+        }
+
+        /// <summary>
+        /// Initializes new instance of <see cref="UpDownBase{T}"/> class.
+        /// </summary>
+        protected UpDownBase()
+        {
+            Initialized += (sender, e) =>
+            {
+                if (!_internalValueSet && IsInitialized)
+                {
+                    SyncTextAndValueProperties(false, null, true);
+                }
+
+                SetValidSpinDirection();
+            };
+        }
+
+        /// <summary>
+        /// Initializes static members of the <see cref="UpDownBase{T}"/> class.
+        /// </summary>
+        static UpDownBase()
+        {
+            CultureInfoProperty.Changed.Subscribe(OnCultureInfoChanged);
+            DefaultValueProperty.Changed.Subscribe(OnDefaultValueChanged);
+            DisplayDefaultValueOnEmptyTextProperty.Changed.Subscribe(OnDisplayDefaultValueOnEmptyTextChanged);
+            IsReadOnlyProperty.Changed.Subscribe(OnIsReadOnlyChanged);
+            MaximumProperty.Changed.Subscribe(OnMaximumChanged);
+            MinimumProperty.Changed.Subscribe(OnMinimumChanged);
+            TextProperty.Changed.Subscribe(OnTextChanged);
+            ValueProperty.Changed.Subscribe(OnValueChanged);
+        }
+
+        /// <inheritdoc />
+        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        {
+            if (TextBox != null)
+            {
+                TextBox.PointerPressed -= TextBoxOnPointerPressed;
+                _textBoxTextChangedSubscription?.Dispose();
+            }
+            TextBox = e.NameScope.Find<TextBox>("PART_TextBox");
+            if (TextBox != null)
+            {
+                TextBox.Text = Text;
+                TextBox.PointerPressed += TextBoxOnPointerPressed;
+                _textBoxTextChangedSubscription = TextBox.GetObservable(TextBox.TextProperty).Subscribe(txt => TextBoxOnTextChanged());
+            }
+
+            if (Spinner != null)
+            {
+                Spinner.Spin -= OnSpinnerSpin;
+            }
+
+            Spinner = e.NameScope.Find<Spinner>("PART_Spinner");
+
+            if (Spinner != null)
+            {
+                Spinner.Spin += OnSpinnerSpin;
+            }
+
+            SetValidSpinDirection();
+        }
+
+        /// <inheritdoc />
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            switch (e.Key)
+            {
+                case Key.Enter:
+                    var commitSuccess = CommitInput();
+                    e.Handled = !commitSuccess;
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="CultureInfo"/> property value changed.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnCultureInfoChanged(CultureInfo oldValue, CultureInfo newValue)
+        {
+            if (IsInitialized)
+            {
+                SyncTextAndValueProperties(false, null);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="DefaultValue"/> property value changed.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnDefaultValueChanged(T oldValue, T newValue)
+        {
+            if (IsInitialized && string.IsNullOrEmpty(Text))
+            {
+                SyncTextAndValueProperties(true, Text);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="DisplayDefaultValueOnEmptyText"/> property value changed.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnDisplayDefaultValueOnEmptyTextChanged(bool oldValue, bool newValue)
+        {
+            if (IsInitialized && string.IsNullOrEmpty(Text))
+            {
+                SyncTextAndValueProperties(false, Text);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="IsReadOnly"/> property value changed.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnIsReadOnlyChanged(bool oldValue, bool newValue)
+        {
+            SetValidSpinDirection();
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Maximum"/> property value changed.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnMaximumChanged(T oldValue, T newValue)
+        {
+            if (IsInitialized)
+            {
+                SetValidSpinDirection();
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Minimum"/> property value changed.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnMinimumChanged(T oldValue, T newValue)
+        {
+            if (IsInitialized)
+            {
+                SetValidSpinDirection();
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Text"/> property value changed.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnTextChanged(string oldValue, string newValue)
+        {
+            if (IsInitialized)
+            {
+               SyncTextAndValueProperties(true, Text);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Value"/> property value changed.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnValueChanged(T oldValue, T newValue)
+        {
+            if (!_internalValueSet && IsInitialized)
+            {
+                SyncTextAndValueProperties(false, null, true);
+            }
+
+            SetValidSpinDirection();
+
+            RaiseValueChangedEvent(oldValue, newValue);
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Maximum"/> property has to be coerced.
+        /// </summary>
+        /// <param name="baseValue">The value.</param>
+        protected virtual T OnCoerceMaximum(T baseValue)
+        {
+            return baseValue;
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Minimum"/> property has to be coerced.
+        /// </summary>
+        /// <param name="baseValue">The value.</param>
+        protected virtual T OnCoerceMinimum(T baseValue)
+        {
+            return baseValue;
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Value"/> property has to be coerced.
+        /// </summary>
+        /// <param name="baseValue">The value.</param>
+        protected virtual T OnCoerceValue(T baseValue)
+        {
+            return baseValue;
+        }
+
+        /// <summary>
+        /// Raises the OnSpin event when spinning is initiated by the end-user.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnSpin(SpinEventArgs e)
+        {
+            if (e == null)
+            {
+                throw new ArgumentNullException("e");
+            }
+
+            var handler = Spinned;
+            handler?.Invoke(this, e);
+
+            if (e.Direction == SpinDirection.Increase)
+            {
+                DoIncrement();
+            }
+            else
+            {
+                DoDecrement();
+            }
+        }
+
+        /// <summary>
+        /// Raises the <see cref="ValueChanged"/> event.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void RaiseValueChangedEvent(T oldValue, T newValue)
+        {
+            var e = new UpDownValueChangedEventArgs<T>(ValueChangedEvent, oldValue, newValue);
+            RaiseEvent(e);
+        }
+
+        /// <summary>
+        /// Converts the formatted text to a value.
+        /// </summary>
+        protected abstract T ConvertTextToValue(string text);
+
+        /// <summary>
+        /// Converts the value to formatted text.
+        /// </summary>
+        /// <returns></returns>
+        protected abstract string ConvertValueToText();
+
+        /// <summary>
+        /// Called by OnSpin when the spin direction is SpinDirection.Increase.
+        /// </summary>
+        protected abstract void OnIncrement();
+
+        /// <summary>
+        /// Called by OnSpin when the spin direction is SpinDirection.Descrease.
+        /// </summary>
+        protected abstract void OnDecrement();
+
+        /// <summary>
+        /// Sets the valid spin directions.
+        /// </summary>
+        protected abstract void SetValidSpinDirection();
+
+        /// <summary>
+        /// Called when the <see cref="CultureInfo"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void OnCultureInfoChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is UpDownBase<T> upDown)
+            {
+                var oldValue = (CultureInfo)e.OldValue;
+                var newValue = (CultureInfo)e.NewValue;
+                upDown.OnCultureInfoChanged(oldValue, newValue);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="DefaultValue"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void OnDefaultValueChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is UpDownBase<T> upDown)
+            {
+                var oldValue = (T)e.OldValue;
+                var newValue = (T)e.NewValue;
+                upDown.OnDefaultValueChanged(oldValue, newValue);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="DisplayDefaultValueOnEmptyText"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void OnDisplayDefaultValueOnEmptyTextChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is UpDownBase<T> upDown)
+            {
+                var oldValue = (bool) e.OldValue;
+                var newValue = (bool) e.NewValue;
+                upDown.OnDisplayDefaultValueOnEmptyTextChanged(oldValue, newValue);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="IsReadOnly"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void OnIsReadOnlyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is UpDownBase<T> upDown)
+            {
+                var oldValue = (bool)e.OldValue;
+                var newValue = (bool)e.NewValue;
+                upDown.OnIsReadOnlyChanged(oldValue, newValue);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Maximum"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void OnMaximumChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is UpDownBase<T> upDown)
+            {
+                var oldValue = (T)e.OldValue;
+                var newValue = (T)e.NewValue;
+                upDown.OnMaximumChanged(oldValue, newValue);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Minimum"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void OnMinimumChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is UpDownBase<T> upDown)
+            {
+                var oldValue = (T)e.OldValue;
+                var newValue = (T)e.NewValue;
+                upDown.OnMinimumChanged(oldValue, newValue);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Text"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void OnTextChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is UpDownBase<T> upDown)
+            {
+                var oldValue = (string)e.OldValue;
+                var newValue = (string)e.NewValue;
+                upDown.OnTextChanged(oldValue, newValue);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Value"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void OnValueChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is UpDownBase<T> upDown)
+            {
+                var oldValue = (T)e.OldValue;
+                var newValue = (T)e.NewValue;
+                upDown.OnValueChanged(oldValue, newValue);
+            }
+        }
+
+        private void SetValueInternal(T value)
+        {
+            _internalValueSet = true;
+            try
+            {
+                Value = value;
+            }
+            finally
+            {
+                _internalValueSet = false;
+            }
+        }
+
+        private static T OnCoerceMaximum(UpDownBase<T> upDown, T value)
+        {
+            return upDown.OnCoerceMaximum(value);
+        }
+
+        private static T OnCoerceMinimum(UpDownBase<T> upDown, T value)
+        {
+            return upDown.OnCoerceMinimum(value);
+        }
+
+        private void TextBoxOnTextChanged()
+        {
+            try
+            {
+                _isTextChangedFromUI = true;
+                if (TextBox != null)
+                {
+                    Text = TextBox.Text;
+                }
+            }
+            finally
+            {
+                _isTextChangedFromUI = false;
+            }
+        }
+
+        private void OnSpinnerSpin(object sender, SpinEventArgs e)
+        {
+            if (AllowSpin && !IsReadOnly)
+            {
+                var spin = !e.UsingMouseWheel;
+                spin |= ((TextBox != null) && TextBox.IsFocused);
+
+                if (spin)
+                {
+                    e.Handled = true;
+                    OnSpin(e);
+                }
+            }
+        }
+
+        internal void DoDecrement()
+        {
+            if (Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Decrease) == ValidSpinDirections.Decrease)
+            {
+                OnDecrement();
+            }
+        }
+
+        internal void DoIncrement()
+        {
+            if (Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Increase) == ValidSpinDirections.Increase)
+            {
+                OnIncrement();
+            }
+        }
+
+        public event EventHandler<SpinEventArgs> Spinned;
+
+        private void TextBoxOnPointerPressed(object sender, PointerPressedEventArgs e)
+        {
+            if (e.Device.Captured != Spinner)
+            {
+                Dispatcher.UIThread.InvokeAsync(() => { e.Device.Capture(Spinner); }, DispatcherPriority.Input);
+            }
+        }
+
+        /// <summary>
+        /// Defines the <see cref="ValueChanged"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<UpDownValueChangedEventArgs<T>> ValueChangedEvent =
+            RoutedEvent.Register<UpDownBase<T>, UpDownValueChangedEventArgs<T>>(nameof(ValueChanged), RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Raised when the <see cref="Value"/> changes.
+        /// </summary>
+        public event EventHandler<SpinEventArgs> ValueChanged
+        {
+            add { AddHandler(ValueChangedEvent, value); }
+            remove { RemoveHandler(ValueChangedEvent, value); }
+        }
+
+        private bool CommitInput()
+        {
+            return SyncTextAndValueProperties(true, Text);
+        }
+
+        /// <summary>
+        /// Synchronize <see cref="Text"/> and <see cref="Value"/> properties.
+        /// </summary>
+        /// <param name="updateValueFromText">If value should be updated from text.</param>
+        /// <param name="text">The text.</param>
+        protected bool SyncTextAndValueProperties(bool updateValueFromText, string text)
+        {
+            return SyncTextAndValueProperties(updateValueFromText, text, false);
+        }
+
+        /// <summary>
+        /// Synchronize <see cref="Text"/> and <see cref="Value"/> properties.
+        /// </summary>
+        /// <param name="updateValueFromText">If value should be updated from text.</param>
+        /// <param name="text">The text.</param>
+        /// <param name="forceTextUpdate">Force text update.</param>
+        private bool SyncTextAndValueProperties(bool updateValueFromText, string text, bool forceTextUpdate)
+        {
+            if (_isSyncingTextAndValueProperties)
+                return true;
+
+            _isSyncingTextAndValueProperties = true;
+            var parsedTextIsValid = true;
+            try
+            {
+                if (updateValueFromText)
+                {
+                    if (string.IsNullOrEmpty(text))
+                    {
+                        // An empty input sets the value to the default value.
+                        SetValueInternal(DefaultValue);
+                    }
+                    else
+                    {
+                        try
+                        {
+                            var newValue = ConvertTextToValue(text);
+                            if (!Equals(newValue, Value))
+                            {
+                                SetValueInternal(newValue);
+                            }
+                        }
+                        catch
+                        {
+                            parsedTextIsValid = false;
+                        }
+                    }
+                }
+
+                // Do not touch the ongoing text input from user.
+                if (!_isTextChangedFromUI)
+                {
+                    // Don't replace the empty Text with the non-empty representation of DefaultValue.
+                    var shouldKeepEmpty = !forceTextUpdate && string.IsNullOrEmpty(Text) && Equals(Value, DefaultValue) && !DisplayDefaultValueOnEmptyText;
+                    if (!shouldKeepEmpty)
+                    {
+                        var newText = ConvertValueToText();
+                        if (!Equals(Text, newText))
+                        {
+                            Text = newText;
+                        }
+                    }
+
+                    // Sync Text and textBox
+                    if (TextBox != null)
+                    {
+                        TextBox.Text = Text;
+                    }
+                }
+
+                if (_isTextChangedFromUI && !parsedTextIsValid)
+                {
+                    // Text input was made from the user and the text
+                    // repesents an invalid value. Disable the spinner in this case.
+                    if (Spinner != null)
+                    {
+                        Spinner.ValidSpinDirection = ValidSpinDirections.None;
+                    }
+                }
+                else
+                {
+                    SetValidSpinDirection();
+                }
+            }
+            finally
+            {
+                _isSyncingTextAndValueProperties = false;
+            }
+            return parsedTextIsValid;
+        }
+    }
+
+    public class UpDownValueChangedEventArgs<T> : RoutedEventArgs
+    {
+        public UpDownValueChangedEventArgs(RoutedEvent routedEvent, T oldValue,  T newValue) : base(routedEvent)
+        {
+            OldValue = oldValue;
+            NewValue = newValue;
+        }
+
+        public T OldValue { get; }
+        public T NewValue { get; }
+    }
+}

From d07ceec674d1a555233cc417fe35394794326942 Mon Sep 17 00:00:00 2001
From: dzhelnin <mitya_zh@mail.ru>
Date: Tue, 20 Mar 2018 14:11:24 +0300
Subject: [PATCH 431/482] Added NumericUpDown class.

---
 .../NumericUpDown/NumericUpDown.cs            | 132 ++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs

diff --git a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
new file mode 100644
index 0000000000..402dec7284
--- /dev/null
+++ b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
@@ -0,0 +1,132 @@
+using System;
+using System.Globalization;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Base class for controls that represents a TextBox with button spinners that allow incrementing and decrementing numeric values.
+    /// </summary>
+    public abstract class NumericUpDown<T> : UpDownBase<T>
+    {
+        /// <summary>
+        /// Defines the <see cref="FormatString"/> property.
+        /// </summary>
+        public static readonly StyledProperty<string> FormatStringProperty =
+            AvaloniaProperty.Register<NumericUpDown<T>, string>(nameof(FormatString), string.Empty);
+
+        /// <summary>
+        /// Defines the <see cref="Increment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<T> IncrementProperty =
+            AvaloniaProperty.Register<NumericUpDown<T>, T>(nameof(Increment), default(T), validate: OnCoerceIncrement);
+
+        /// <summary>
+        /// Initializes static members of the <see cref="NumericUpDown{T}"/> class.
+        /// </summary>
+        static NumericUpDown()
+        {
+            FormatStringProperty.Changed.Subscribe(FormatStringChanged);
+            IncrementProperty.Changed.Subscribe(IncrementChanged);
+        }
+
+        /// <summary>
+        /// Gets or sets the display format of the <see cref="UpDownBase{T}.Value"/>.
+        /// </summary>
+        public string FormatString
+        {
+            get { return GetValue(FormatStringProperty); }
+            set { SetValue(FormatStringProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the amount in which to increment the <see cref="UpDownBase{T}.Value"/>.
+        /// </summary>
+        public T Increment
+        {
+            get { return GetValue(IncrementProperty); }
+            set { SetValue(IncrementProperty, value); }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="FormatString"/> property value changed.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnFormatStringChanged(string oldValue, string newValue)
+        {
+            if (IsInitialized)
+            {
+                SyncTextAndValueProperties(false, null);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Increment"/> property value changed.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnIncrementChanged(T oldValue, T newValue)
+        {
+            if (IsInitialized)
+            {
+                SetValidSpinDirection();
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Increment"/> property has to be coerced.
+        /// </summary>
+        /// <param name="baseValue">The value.</param>
+        protected virtual T OnCoerceIncrement(T baseValue)
+        {
+            return baseValue;
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Increment"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void IncrementChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is NumericUpDown<T> upDown)
+            {
+                var oldValue = (T)e.OldValue;
+                var newValue = (T)e.NewValue;
+                upDown.OnIncrementChanged(oldValue, newValue);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="FormatString"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void FormatStringChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is NumericUpDown<T> upDown)
+            {
+                var oldValue = (string) e.OldValue;
+                var newValue = (string) e.NewValue;
+                upDown.OnFormatStringChanged(oldValue, newValue);
+            }
+        }
+
+        private static T OnCoerceIncrement(NumericUpDown<T> numericUpDown, T value)
+        {
+            return numericUpDown.OnCoerceIncrement(value);
+        }
+
+        /// <summary>
+        /// Parse percent format text
+        /// </summary>
+        /// <param name="text">Text to parse.</param>
+        /// <param name="cultureInfo">The culture info.</param>
+        protected static decimal ParsePercent(string text, IFormatProvider cultureInfo)
+        {
+            var info = NumberFormatInfo.GetInstance(cultureInfo);
+            text = text.Replace(info.PercentSymbol, null);
+            var result = decimal.Parse(text, NumberStyles.Any, info);
+            result = result / 100;
+            return result;
+        }
+    }
+}
\ No newline at end of file

From 272c0c882fa6c53b3b98fc9fb2af6db10bfd2ca2 Mon Sep 17 00:00:00 2001
From: dzhelnin <mitya_zh@mail.ru>
Date: Tue, 20 Mar 2018 14:54:42 +0300
Subject: [PATCH 432/482] Added CommonNumericUpDown class.

---
 .../NumericUpDown/CommonNumericUpDown.cs      | 346 ++++++++++++++++++
 1 file changed, 346 insertions(+)
 create mode 100644 src/Avalonia.Controls/NumericUpDown/CommonNumericUpDown.cs

diff --git a/src/Avalonia.Controls/NumericUpDown/CommonNumericUpDown.cs b/src/Avalonia.Controls/NumericUpDown/CommonNumericUpDown.cs
new file mode 100644
index 0000000000..1ce2508b4a
--- /dev/null
+++ b/src/Avalonia.Controls/NumericUpDown/CommonNumericUpDown.cs
@@ -0,0 +1,346 @@
+using System;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Base class for controls that represents a TextBox with button spinners that allow incrementing and decrementing numeric values.
+    /// </summary>
+    public abstract class CommonNumericUpDown<T> : NumericUpDown<T?> where T : struct, IFormattable, IComparable<T>
+    {
+        protected delegate bool FromText(string s, NumberStyles style, IFormatProvider provider, out T result);
+        protected delegate T FromDecimal(decimal d);
+
+        private readonly FromText _fromText;
+        private readonly FromDecimal _fromDecimal;
+        private readonly Func<T, T, bool> _fromLowerThan;
+        private readonly Func<T, T, bool> _fromGreaterThan;
+
+        private NumberStyles _parsingNumberStyle = NumberStyles.Any;
+
+        /// <summary>
+        /// Defines the <see cref="ParsingNumberStyle"/> property.
+        /// </summary>
+        public static readonly DirectProperty<CommonNumericUpDown<T>, NumberStyles> ParsingNumberStyleProperty =
+            AvaloniaProperty.RegisterDirect<CommonNumericUpDown<T>, NumberStyles>(nameof(ParsingNumberStyle),
+                updown => updown.ParsingNumberStyle, (updown, style) => updown.ParsingNumberStyle = style);
+
+
+        /// <summary>
+        /// Initializes new instance of the <see cref="CommonNumericUpDown{T}"/> class.
+        /// </summary>
+        /// <param name="fromText">Delegate to parse value from text.</param>
+        /// <param name="fromDecimal">Delegate to parse value from decimal.</param>
+        /// <param name="fromLowerThan">Delegate to compare if one value is lower than another.</param>
+        /// <param name="fromGreaterThan">Delegate to compare if one value is greater than another.</param>
+        protected CommonNumericUpDown(FromText fromText, FromDecimal fromDecimal, Func<T, T, bool> fromLowerThan, Func<T, T, bool> fromGreaterThan)
+        {
+            _fromText = fromText ?? throw new ArgumentNullException(nameof(fromText));
+            _fromDecimal = fromDecimal ?? throw new ArgumentNullException(nameof(fromDecimal));
+            _fromLowerThan = fromLowerThan ?? throw new ArgumentNullException(nameof(fromLowerThan));
+            _fromGreaterThan = fromGreaterThan ?? throw new ArgumentNullException(nameof(fromGreaterThan));
+        }
+
+        /// <summary>
+        /// Gets or sets the parsing style (AllowLeadingWhite, Float, AllowHexSpecifier, ...). By default, Any.
+        /// </summary>
+        public NumberStyles ParsingNumberStyle
+        {
+            get { return _parsingNumberStyle; }
+            set { SetAndRaise(ParsingNumberStyleProperty, ref _parsingNumberStyle, value); }
+        }
+
+        /// <inheritdoc />
+        protected override void OnIncrement()
+        {
+            if (!HandleNullSpin())
+            {
+                var result = IncrementValue(Value.Value, Increment.Value);
+                Value = CoerceValueMinMax(result);
+            }
+        }
+
+        /// <inheritdoc />
+        protected override void OnDecrement()
+        {
+            if (!HandleNullSpin())
+            {
+                var result = DecrementValue(Value.Value, Increment.Value);
+                Value = CoerceValueMinMax(result);
+            }
+        }
+
+        /// <inheritdoc />
+        protected override void OnMinimumChanged(T? oldValue, T? newValue)
+        {
+            base.OnMinimumChanged(oldValue, newValue);
+
+            if (Value.HasValue && ClipValueToMinMax)
+            {
+                Value = CoerceValueMinMax(Value.Value);
+            }
+        }
+
+        /// <inheritdoc />
+        protected override void OnMaximumChanged(T? oldValue, T? newValue)
+        {
+            base.OnMaximumChanged(oldValue, newValue);
+
+            if (Value.HasValue && ClipValueToMinMax)
+            {
+                Value = CoerceValueMinMax(Value.Value);
+            }
+        }
+
+        /// <inheritdoc />
+        protected override T? ConvertTextToValue(string text)
+        {
+            T? result = null;
+
+            if (string.IsNullOrEmpty(text))
+            {
+                return result;
+            }
+
+            // Since the conversion from Value to text using a FormartString may not be parsable,
+            // we verify that the already existing text is not the exact same value.
+            var currentValueText = ConvertValueToText();
+            if (Equals(currentValueText, text))
+            {
+                return Value;
+            }
+
+            result = ConvertTextToValueCore(currentValueText, text);
+
+            if (ClipValueToMinMax)
+            {
+                return GetClippedMinMaxValue(result);
+            }
+
+            ValidateDefaultMinMax(result);
+
+            return result;
+        }
+
+        /// <inheritdoc />
+        protected override string ConvertValueToText()
+        {
+            if (Value == null)
+            {
+                return string.Empty;
+            }
+
+            //Manage FormatString of type "{}{0:N2} °" (in xaml) or "{0:N2} °" in code-behind.
+            if (FormatString.Contains("{0"))
+            {
+                return string.Format(CultureInfo, FormatString, Value.Value);
+            }
+
+            return Value.Value.ToString(FormatString, CultureInfo);
+        }
+
+        /// <inheritdoc />
+        protected override void SetValidSpinDirection()
+        {
+            var validDirections = ValidSpinDirections.None;
+
+            // Null increment always prevents spin.
+            if (Increment != null && !IsReadOnly)
+            {
+                if (IsLowerThan(Value, Maximum) || !Value.HasValue || !Maximum.HasValue)
+                {
+                    validDirections = validDirections | ValidSpinDirections.Increase;
+                }
+
+                if (IsGreaterThan(Value, Minimum) || !Value.HasValue || !Minimum.HasValue)
+                {
+                    validDirections = validDirections | ValidSpinDirections.Decrease;
+                }
+            }
+
+            if (Spinner != null)
+            {
+                Spinner.ValidSpinDirection = validDirections;
+            }
+        }
+
+        /// <summary>
+        /// Checks if provided value is within allowed values.
+        /// </summary>
+        /// <param name="allowedValues">The alowed values.</param>
+        /// <param name="valueToCompare">The value to check.</param>
+        protected void TestInputSpecialValue(AllowedSpecialValues allowedValues, AllowedSpecialValues valueToCompare)
+        {
+            if ((allowedValues & valueToCompare) != valueToCompare)
+            {
+                switch (valueToCompare)
+                {
+                    case AllowedSpecialValues.NaN:
+                        throw new InvalidDataException("Value to parse shouldn't be NaN.");
+                    case AllowedSpecialValues.PositiveInfinity:
+                        throw new InvalidDataException("Value to parse shouldn't be Positive Infinity.");
+                    case AllowedSpecialValues.NegativeInfinity:
+                        throw new InvalidDataException("Value to parse shouldn't be Negative Infinity.");
+                }
+            }
+        }
+
+        protected static void UpdateMetadata(Type type, T? increment, T? minimun, T? maximum)
+        {
+            IncrementProperty.OverrideDefaultValue(type, increment);
+            MinimumProperty.OverrideDefaultValue(type, minimun);
+            MaximumProperty.OverrideDefaultValue(type, maximum);
+        }
+
+        protected abstract T IncrementValue(T value, T increment);
+
+        protected abstract T DecrementValue(T value, T increment);
+
+        private bool IsLowerThan(T? value1, T? value2)
+        {
+            if (value1 == null || value2 == null)
+            {
+                return false;
+            }
+            return _fromLowerThan(value1.Value, value2.Value);
+        }
+
+        private bool IsGreaterThan(T? value1, T? value2)
+        {
+            if (value1 == null || value2 == null)
+            {
+                return false;
+            }
+            return _fromGreaterThan(value1.Value, value2.Value);
+        }
+
+        private bool HandleNullSpin()
+        {
+            if (!Value.HasValue)
+            {
+                var forcedValue = DefaultValue ?? default(T);
+                Value = CoerceValueMinMax(forcedValue);
+                return true;
+            }
+            else if (!Increment.HasValue)
+            {
+                return true;
+            }
+            return false;
+        }
+
+        internal bool IsValid(T? value)
+        {
+            return !IsLowerThan(value, Minimum) && !IsGreaterThan(value, Maximum);
+        }
+
+        private T? CoerceValueMinMax(T value)
+        {
+            if (IsLowerThan(value, Minimum))
+            {
+                return Minimum;
+            }
+            else if (IsGreaterThan(value, Maximum))
+            {
+                return Maximum;
+            }
+            else
+            {
+                return value;
+            }
+        }
+
+        private bool IsPercent(string stringToTest)
+        {
+            var PIndex = stringToTest.IndexOf("P", StringComparison.Ordinal);
+            if (PIndex >= 0)
+            {
+                //stringToTest contains a "P" between 2 "'", it's considered as text, not percent
+                var isText = stringToTest.Substring(0, PIndex).Contains("'")
+                             && stringToTest.Substring(PIndex, FormatString.Length - PIndex).Contains("'");
+
+                return !isText;
+            }
+            return false;
+        }
+
+        private T? ConvertTextToValueCore(string currentValueText, string text)
+        {
+            T? result;
+
+            if (IsPercent(FormatString))
+            {
+                result = _fromDecimal(ParsePercent(text, CultureInfo));
+            }
+            else
+            {
+                // Problem while converting new text
+                if (!_fromText(text, ParsingNumberStyle, CultureInfo, out T outputValue))
+                {
+                    var shouldThrow = true;
+
+                    // Check if CurrentValueText is also failing => it also contains special characters. ex : 90°
+                    if (!_fromText(currentValueText, ParsingNumberStyle, CultureInfo, out T _))
+                    {
+                        // extract non-digit characters
+                        var currentValueTextSpecialCharacters = currentValueText.Where(c => !char.IsDigit(c));
+                        var textSpecialCharacters = text.Where(c => !char.IsDigit(c));
+                        // same non-digit characters on currentValueText and new text => remove them on new Text to parse it again.
+                        if (currentValueTextSpecialCharacters.Except(textSpecialCharacters).ToList().Count == 0)
+                        {
+                            foreach (var character in textSpecialCharacters)
+                            {
+                                text = text.Replace(character.ToString(), string.Empty);
+                            }
+                            // if without the special characters, parsing is good, do not throw
+                            if (_fromText(text, ParsingNumberStyle, CultureInfo, out outputValue))
+                            {
+                                shouldThrow = false;
+                            }
+                        }
+                    }
+
+                    if (shouldThrow)
+                    {
+                        throw new InvalidDataException("Input string was not in a correct format.");
+                    }
+                }
+                result = outputValue;
+            }
+            return result;
+        }
+
+        private T? GetClippedMinMaxValue(T? result)
+        {
+            if (IsGreaterThan(result, Maximum))
+            {
+                return Maximum;
+            }
+            else if (IsLowerThan(result, Minimum))
+            {
+                return Minimum;
+            }
+            return result;
+        }
+
+        private void ValidateDefaultMinMax(T? value)
+        {
+            // DefaultValue is always accepted.
+            if (Equals(value, DefaultValue))
+            {
+                return;
+            }
+
+            if (IsLowerThan(value, Minimum))
+            {
+                throw new ArgumentOutOfRangeException(nameof(Minimum), string.Format("Value must be greater than Minimum value of {0}", Minimum));
+            }
+            else if (IsGreaterThan(value, Maximum))
+            {
+                throw new ArgumentOutOfRangeException(nameof(Maximum), string.Format("Value must be less than Maximum value of {0}", Maximum));
+            }
+        }
+    }
+}
\ No newline at end of file

From c1ed2b3b280b4341139796b2c7ec558f888293fa Mon Sep 17 00:00:00 2001
From: dzhelnin <mitya_zh@mail.ru>
Date: Tue, 20 Mar 2018 15:14:53 +0300
Subject: [PATCH 433/482] Added concrete implementations for various numeric
 types

---
 .../NumericUpDown/AllowedSpecialValues.cs     |  15 +++
 .../NumericUpDown/ByteUpDown.cs               |  24 ++++
 .../NumericUpDown/CommonNumericUpDown.cs      |   2 +-
 .../NumericUpDown/DecimalUpDown.cs            |  24 ++++
 .../NumericUpDown/DoubleUpDown.cs             | 109 ++++++++++++++++++
 .../NumericUpDown/IntegerUpDown.cs            |  24 ++++
 .../NumericUpDown/LongUpDown.cs               |  24 ++++
 .../NumericUpDown/ShortUpDown.cs              |  24 ++++
 .../NumericUpDown/SingleUpDown.cs             | 106 +++++++++++++++++
 9 files changed, 351 insertions(+), 1 deletion(-)
 create mode 100644 src/Avalonia.Controls/NumericUpDown/AllowedSpecialValues.cs
 create mode 100644 src/Avalonia.Controls/NumericUpDown/ByteUpDown.cs
 create mode 100644 src/Avalonia.Controls/NumericUpDown/DecimalUpDown.cs
 create mode 100644 src/Avalonia.Controls/NumericUpDown/DoubleUpDown.cs
 create mode 100644 src/Avalonia.Controls/NumericUpDown/IntegerUpDown.cs
 create mode 100644 src/Avalonia.Controls/NumericUpDown/LongUpDown.cs
 create mode 100644 src/Avalonia.Controls/NumericUpDown/ShortUpDown.cs
 create mode 100644 src/Avalonia.Controls/NumericUpDown/SingleUpDown.cs

diff --git a/src/Avalonia.Controls/NumericUpDown/AllowedSpecialValues.cs b/src/Avalonia.Controls/NumericUpDown/AllowedSpecialValues.cs
new file mode 100644
index 0000000000..a4ec5ecdaf
--- /dev/null
+++ b/src/Avalonia.Controls/NumericUpDown/AllowedSpecialValues.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace Avalonia.Controls
+{
+    [Flags]
+    public enum AllowedSpecialValues
+    {
+        None = 0,
+        NaN = 1,
+        PositiveInfinity = 2,
+        NegativeInfinity = 4,
+        AnyInfinity = PositiveInfinity | NegativeInfinity,
+        Any = NaN | AnyInfinity
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/NumericUpDown/ByteUpDown.cs b/src/Avalonia.Controls/NumericUpDown/ByteUpDown.cs
new file mode 100644
index 0000000000..835abae773
--- /dev/null
+++ b/src/Avalonia.Controls/NumericUpDown/ByteUpDown.cs
@@ -0,0 +1,24 @@
+namespace Avalonia.Controls
+{
+    /// <inheritdoc />
+    public class ByteUpDown : CommonNumericUpDown<byte>
+    {
+        /// <summary>
+        /// Initializes static members of the <see cref="ByteUpDown"/> class.
+        /// </summary>
+        static ByteUpDown() => UpdateMetadata(typeof(ByteUpDown), 1, byte.MinValue, byte.MaxValue);
+
+        /// <summary>
+        /// Initializes new instance of the <see cref="ByteUpDown"/> class.
+        /// </summary>
+        public ByteUpDown() : base(byte.TryParse, decimal.ToByte, (v1, v2) => v1 < v2, (v1, v2) => v1 > v2)
+        {
+        }
+
+        /// <inheritdoc />
+        protected override byte IncrementValue(byte value, byte increment) => (byte)(value + increment);
+
+        /// <inheritdoc />
+        protected override byte DecrementValue(byte value, byte increment) => (byte)(value - increment);
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/NumericUpDown/CommonNumericUpDown.cs b/src/Avalonia.Controls/NumericUpDown/CommonNumericUpDown.cs
index 1ce2508b4a..eed792d9dd 100644
--- a/src/Avalonia.Controls/NumericUpDown/CommonNumericUpDown.cs
+++ b/src/Avalonia.Controls/NumericUpDown/CommonNumericUpDown.cs
@@ -6,7 +6,7 @@ using System.Linq;
 namespace Avalonia.Controls
 {
     /// <summary>
-    /// Base class for controls that represents a TextBox with button spinners that allow incrementing and decrementing numeric values.
+    /// Base class for controls that represents a TextBox with button spinners that allow incrementing and decrementing nullable numeric values.
     /// </summary>
     public abstract class CommonNumericUpDown<T> : NumericUpDown<T?> where T : struct, IFormattable, IComparable<T>
     {
diff --git a/src/Avalonia.Controls/NumericUpDown/DecimalUpDown.cs b/src/Avalonia.Controls/NumericUpDown/DecimalUpDown.cs
new file mode 100644
index 0000000000..10cfa537d7
--- /dev/null
+++ b/src/Avalonia.Controls/NumericUpDown/DecimalUpDown.cs
@@ -0,0 +1,24 @@
+namespace Avalonia.Controls
+{
+    /// <inheritdoc />
+    public class DecimalUpDown : CommonNumericUpDown<decimal>
+    {
+        /// <summary>
+        /// Initializes static members of the <see cref="DecimalUpDown"/> class.
+        /// </summary>
+        static DecimalUpDown() => UpdateMetadata(typeof(DecimalUpDown), 1m, decimal.MinValue, decimal.MaxValue);
+
+        /// <summary>
+        /// Initializes new instance of the <see cref="DecimalUpDown"/> class.
+        /// </summary>
+        public DecimalUpDown() : base(decimal.TryParse, d => d, (v1, v2) => v1 < v2, (v1, v2) => v1 > v2)
+        {
+        }
+
+        /// <inheritdoc />
+        protected override decimal IncrementValue(decimal value, decimal increment) => value + increment;
+
+        /// <inheritdoc />
+        protected override decimal DecrementValue(decimal value, decimal increment) => value - increment;
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/NumericUpDown/DoubleUpDown.cs b/src/Avalonia.Controls/NumericUpDown/DoubleUpDown.cs
new file mode 100644
index 0000000000..edee1247fb
--- /dev/null
+++ b/src/Avalonia.Controls/NumericUpDown/DoubleUpDown.cs
@@ -0,0 +1,109 @@
+using System;
+
+namespace Avalonia.Controls
+{
+    /// <inheritdoc />
+    public class DoubleUpDown : CommonNumericUpDown<double>
+    {
+        /// <summary>
+        /// Defines the <see cref="AllowInputSpecialValues"/> property.
+        /// </summary>
+        public static readonly DirectProperty<DoubleUpDown, AllowedSpecialValues> AllowInputSpecialValuesProperty =
+            AvaloniaProperty.RegisterDirect<DoubleUpDown, AllowedSpecialValues>(nameof(AllowInputSpecialValues),
+                updown => updown.AllowInputSpecialValues, (updown, v) => updown.AllowInputSpecialValues = v);
+
+        private AllowedSpecialValues _allowInputSpecialValues;
+
+        /// <summary>
+        /// Initializes static members of the <see cref="DoubleUpDown"/> class.
+        /// </summary>
+        static DoubleUpDown() => UpdateMetadata(typeof(DoubleUpDown), 1d, double.NegativeInfinity, double.PositiveInfinity);
+
+        /// <summary>
+        /// Initializes new instance of the <see cref="DoubleUpDown"/> class.
+        /// </summary>
+        public DoubleUpDown() : base(double.TryParse, decimal.ToDouble, (v1, v2) => v1 < v2, (v1, v2) => v1 > v2)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets a value representing the special values the user is allowed to input, such as "Infinity", "-Infinity" and "NaN" values.
+        /// </summary>
+        public AllowedSpecialValues AllowInputSpecialValues
+        {
+            get { return _allowInputSpecialValues; }
+            set { SetAndRaise(AllowInputSpecialValuesProperty, ref _allowInputSpecialValues, value); }
+        }
+
+        /// <inheritdoc />
+        protected override double IncrementValue(double value, double increment) => value + increment;
+
+        /// <inheritdoc />
+        protected override double DecrementValue(double value, double increment) => value - increment;
+
+        /// <inheritdoc />
+        protected override double? OnCoerceIncrement(double? baseValue)
+        {
+            if (baseValue.HasValue && double.IsNaN(baseValue.Value))
+            {
+                throw new ArgumentException("NaN is invalid for Increment.");
+            }
+            return base.OnCoerceIncrement(baseValue);
+        }
+
+        /// <inheritdoc />
+        protected override double? OnCoerceMaximum(double? baseValue)
+        {
+            if (baseValue.HasValue && double.IsNaN(baseValue.Value))
+            {
+                throw new ArgumentException("NaN is invalid for Maximum.");
+            }
+            return base.OnCoerceMaximum(baseValue);
+        }
+
+        /// <inheritdoc />
+        protected override double? OnCoerceMinimum(double? baseValue)
+        {
+            if (baseValue.HasValue && double.IsNaN(baseValue.Value))
+            {
+                throw new ArgumentException("NaN is invalid for Minimum.");
+            }
+            return base.OnCoerceMinimum(baseValue);
+        }
+
+        /// <inheritdoc />
+        protected override void SetValidSpinDirection()
+        {
+            if (Value.HasValue && double.IsInfinity(Value.Value) && (Spinner != null))
+            {
+                Spinner.ValidSpinDirection = ValidSpinDirections.None;
+            }
+            else
+            {
+                base.SetValidSpinDirection();
+            }
+        }
+
+        /// <inheritdoc />
+        protected override double? ConvertTextToValue(string text)
+        {
+            var result = base.ConvertTextToValue(text);
+            if (result != null)
+            {
+                if (double.IsNaN(result.Value))
+                {
+                    TestInputSpecialValue(AllowInputSpecialValues, AllowedSpecialValues.NaN);
+                }
+                else if (double.IsPositiveInfinity(result.Value))
+                {
+                    TestInputSpecialValue(AllowInputSpecialValues, AllowedSpecialValues.PositiveInfinity);
+                }
+                else if (double.IsNegativeInfinity(result.Value))
+                {
+                    TestInputSpecialValue(AllowInputSpecialValues, AllowedSpecialValues.NegativeInfinity);
+                }
+            }
+            return result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/NumericUpDown/IntegerUpDown.cs b/src/Avalonia.Controls/NumericUpDown/IntegerUpDown.cs
new file mode 100644
index 0000000000..7f9e05762c
--- /dev/null
+++ b/src/Avalonia.Controls/NumericUpDown/IntegerUpDown.cs
@@ -0,0 +1,24 @@
+namespace Avalonia.Controls
+{
+    /// <inheritdoc />
+    public class IntegerUpDown : CommonNumericUpDown<int>
+    {
+        /// <summary>
+        /// Initializes static members of the <see cref="IntegerUpDown"/> class.
+        /// </summary>
+        static IntegerUpDown() => UpdateMetadata(typeof(IntegerUpDown), 1, int.MinValue, int.MaxValue);
+
+        /// <summary>
+        /// Initializes new instance of the <see cref="IntegerUpDown"/> class.
+        /// </summary>
+        public IntegerUpDown() : base(int.TryParse, decimal.ToInt32, (v1, v2) => v1 < v2, (v1, v2) => v1 > v2)
+        {
+        }
+
+        /// <inheritdoc />
+        protected override int IncrementValue(int value, int increment) => value + increment;
+
+        /// <inheritdoc />
+        protected override int DecrementValue(int value, int increment) => value - increment;
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/NumericUpDown/LongUpDown.cs b/src/Avalonia.Controls/NumericUpDown/LongUpDown.cs
new file mode 100644
index 0000000000..d116df0ad2
--- /dev/null
+++ b/src/Avalonia.Controls/NumericUpDown/LongUpDown.cs
@@ -0,0 +1,24 @@
+namespace Avalonia.Controls
+{
+    /// <inheritdoc />
+    public class LongUpDown : CommonNumericUpDown<long>
+    {
+        /// <summary>
+        /// Initializes static members of the <see cref="LongUpDown"/> class.
+        /// </summary>
+        static LongUpDown() => UpdateMetadata(typeof(LongUpDown), 1L, long.MinValue, long.MaxValue);
+
+        /// <summary>
+        /// Initializes new instance of the <see cref="LongUpDown"/> class.
+        /// </summary>
+        public LongUpDown() : base(long.TryParse, decimal.ToInt64, (v1, v2) => v1 < v2, (v1, v2) => v1 > v2)
+        {
+        }
+
+        /// <inheritdoc />
+        protected override long IncrementValue(long value, long increment) => value + increment;
+
+        /// <inheritdoc />
+        protected override long DecrementValue(long value, long increment) => value - increment;
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/NumericUpDown/ShortUpDown.cs b/src/Avalonia.Controls/NumericUpDown/ShortUpDown.cs
new file mode 100644
index 0000000000..cdba5b9b64
--- /dev/null
+++ b/src/Avalonia.Controls/NumericUpDown/ShortUpDown.cs
@@ -0,0 +1,24 @@
+namespace Avalonia.Controls
+{
+    /// <inheritdoc />
+    public class ShortUpDown : CommonNumericUpDown<short>
+    {
+        /// <summary>
+        /// Initializes static members of the <see cref="ShortUpDown"/> class.
+        /// </summary>
+        static ShortUpDown() => UpdateMetadata(typeof(ShortUpDown), 1, short.MinValue, short.MaxValue);
+
+        /// <summary>
+        /// Initializes new instance of the <see cref="ShortUpDown"/> class.
+        /// </summary>
+        public ShortUpDown() : base(short.TryParse, decimal.ToInt16, (v1, v2) => v1 < v2, (v1, v2) => v1 > v2)
+        {
+        }
+
+        /// <inheritdoc />
+        protected override short IncrementValue(short value, short increment) => (short)(value + increment);
+
+        /// <inheritdoc />
+        protected override short DecrementValue(short value, short increment) => (short)(value - increment);
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/NumericUpDown/SingleUpDown.cs b/src/Avalonia.Controls/NumericUpDown/SingleUpDown.cs
new file mode 100644
index 0000000000..cc3da078bf
--- /dev/null
+++ b/src/Avalonia.Controls/NumericUpDown/SingleUpDown.cs
@@ -0,0 +1,106 @@
+using System;
+
+namespace Avalonia.Controls
+{
+    /// <inheritdoc />
+    public class SingleUpDown : CommonNumericUpDown<float>
+    {
+        /// <summary>
+        /// Defines the <see cref="AllowInputSpecialValues"/> property.
+        /// </summary>
+        public static readonly DirectProperty<SingleUpDown, AllowedSpecialValues> AllowInputSpecialValuesProperty =
+            AvaloniaProperty.RegisterDirect<SingleUpDown, AllowedSpecialValues>(nameof(AllowInputSpecialValues),
+                updown => updown.AllowInputSpecialValues, (updown, v) => updown.AllowInputSpecialValues = v);
+
+        private AllowedSpecialValues _allowInputSpecialValues;
+
+        /// <summary>
+        /// Initializes static members of the <see cref="SingleUpDown"/> class.
+        /// </summary>
+        static SingleUpDown() => UpdateMetadata(typeof(SingleUpDown), 1f, float.NegativeInfinity, float.PositiveInfinity);
+
+        /// <summary>
+        /// Initializes new instance of the <see cref="SingleUpDown"/> class.
+        /// </summary>
+        public SingleUpDown() : base(float.TryParse, decimal.ToSingle, (v1, v2) => v1 < v2, (v1, v2) => v1 > v2)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets a value representing the special values the user is allowed to input, such as "Infinity", "-Infinity" and "NaN" values.
+        /// </summary>
+        public AllowedSpecialValues AllowInputSpecialValues
+        {
+            get { return _allowInputSpecialValues; }
+            set { SetAndRaise(AllowInputSpecialValuesProperty, ref _allowInputSpecialValues, value); }
+        }
+
+        /// <inheritdoc />
+        protected override float? OnCoerceIncrement(float? baseValue)
+        {
+            if (baseValue.HasValue && float.IsNaN(baseValue.Value))
+                throw new ArgumentException("NaN is invalid for Increment.");
+
+            return base.OnCoerceIncrement(baseValue);
+        }
+
+        /// <inheritdoc />
+        protected override float? OnCoerceMaximum(float? baseValue)
+        {
+            if (baseValue.HasValue && float.IsNaN(baseValue.Value))
+                throw new ArgumentException("NaN is invalid for Maximum.");
+
+            return base.OnCoerceMaximum(baseValue);
+        }
+
+        /// <inheritdoc />
+        protected override float? OnCoerceMinimum(float? baseValue)
+        {
+            if (baseValue.HasValue && float.IsNaN(baseValue.Value))
+                throw new ArgumentException("NaN is invalid for Minimum.");
+
+            return base.OnCoerceMinimum(baseValue);
+        }
+
+        /// <inheritdoc />
+        protected override float IncrementValue(float value, float increment) => value + increment;
+
+        /// <inheritdoc />
+        protected override float DecrementValue(float value, float increment) => value - increment;
+
+        /// <inheritdoc />
+        protected override void SetValidSpinDirection()
+        {
+            if (Value.HasValue && float.IsInfinity(Value.Value) && (Spinner != null))
+            {
+                Spinner.ValidSpinDirection = ValidSpinDirections.None;
+            }
+            else
+            {
+                base.SetValidSpinDirection();
+            }
+        }
+
+        /// <inheritdoc />
+        protected override float? ConvertTextToValue(string text)
+        {
+            var result = base.ConvertTextToValue(text);
+            if (result != null)
+            {
+                if (float.IsNaN(result.Value))
+                {
+                    TestInputSpecialValue(AllowInputSpecialValues, AllowedSpecialValues.NaN);
+                }
+                else if (float.IsPositiveInfinity(result.Value))
+                {
+                    TestInputSpecialValue(AllowInputSpecialValues, AllowedSpecialValues.PositiveInfinity);
+                }
+                else if (float.IsNegativeInfinity(result.Value))
+                {
+                    TestInputSpecialValue(AllowInputSpecialValues, AllowedSpecialValues.NegativeInfinity);
+                }
+            }
+            return result;
+        }
+    }
+}
\ No newline at end of file

From 1aa4d8749f5c1bc9b6c64b748835f6f6e18de54f Mon Sep 17 00:00:00 2001
From: dzhelnin <mitya_zh@mail.ru>
Date: Tue, 20 Mar 2018 15:15:43 +0300
Subject: [PATCH 434/482] Added default template for NumericUpDown classes.

---
 src/Avalonia.Themes.Default/DefaultTheme.xaml |  1 +
 .../NumericUpDown.xaml                        | 41 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 src/Avalonia.Themes.Default/NumericUpDown.xaml

diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
index 7c567c1835..aa1a3c6385 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml
@@ -43,4 +43,5 @@
   <StyleInclude Source="resm:Avalonia.Themes.Default.Calendar.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.DatePicker.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.ButtonSpinner.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.NumericUpDown.xaml?assembly=Avalonia.Themes.Default"/>
 </Styles>
diff --git a/src/Avalonia.Themes.Default/NumericUpDown.xaml b/src/Avalonia.Themes.Default/NumericUpDown.xaml
new file mode 100644
index 0000000000..e2ab6bf149
--- /dev/null
+++ b/src/Avalonia.Themes.Default/NumericUpDown.xaml
@@ -0,0 +1,41 @@
+<Styles xmlns="https://github.com/avaloniaui">
+  <Style Selector=":is(UpDownBase)">
+    <Setter Property="TemplatedControl.BorderBrush" Value="{DynamicResource ThemeBorderLightBrush}"/>
+    <Setter Property="TemplatedControl.BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
+    <Setter Property="TemplatedControl.Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="TemplatedControl.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="TemplatedControl.Template">
+      <ControlTemplate>
+        <ButtonSpinner Name="PART_Spinner"
+                       Background="{TemplateBinding Background}"
+                       BorderThickness="{TemplateBinding BorderThickness}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       HorizontalContentAlignment="Stretch"
+                       VerticalContentAlignment="Stretch"
+                       AllowSpin="{TemplateBinding AllowSpin}"
+                       ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
+                       ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}">
+          <TextBox Name="PART_TextBox"
+                   BorderThickness="0"
+                   Background="Transparent"
+                   ContextMenu="{TemplateBinding ContextMenu}"
+                   FontFamily="{TemplateBinding FontFamily}"
+                   FontSize="{TemplateBinding FontSize}"
+                   FontStyle="{TemplateBinding FontStyle}"
+                   FontWeight="{TemplateBinding FontWeight}"
+                   Foreground="{TemplateBinding Foreground}"
+                   Watermark="{TemplateBinding Watermark}"
+                   IsReadOnly="{TemplateBinding IsReadOnly}"
+                   Text="{TemplateBinding Text}"
+                   Padding="{TemplateBinding Padding}"
+                   TextAlignment="Left"
+                   Margin="1"
+                   MinWidth="20"
+                   AcceptsReturn="False"
+                   TextWrapping="NoWrap">
+          </TextBox>
+        </ButtonSpinner>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+</Styles>
\ No newline at end of file

From 89cfa644ae2ff3fac454a9c27e1148aaef9dd68d Mon Sep 17 00:00:00 2001
From: dzhelnin <mitya_zh@mail.ru>
Date: Tue, 20 Mar 2018 15:17:42 +0300
Subject: [PATCH 435/482] Added NumbersPage to ControlCatalog.

---
 samples/ControlCatalog/ControlCatalog.csproj  |   6 +
 samples/ControlCatalog/MainView.xaml          |   1 +
 samples/ControlCatalog/Pages/NumbersPage.xaml |  96 +++++++++++++++
 .../ControlCatalog/Pages/NumbersPage.xaml.cs  | 111 ++++++++++++++++++
 4 files changed, 214 insertions(+)
 create mode 100644 samples/ControlCatalog/Pages/NumbersPage.xaml
 create mode 100644 samples/ControlCatalog/Pages/NumbersPage.xaml.cs

diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index a3d7a0cdce..c3f14b045d 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -78,6 +78,9 @@
     <EmbeddedResource Include="Pages\MenuPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Pages\NumbersPage.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Pages\ProgressBarPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -169,6 +172,9 @@
     </Compile>
     <Compile Include="Pages\ButtonSpinnerPage.xaml.cs">
       <DependentUpon>ButtonSpinnerPage.xaml</DependentUpon>
+    </Compile>
+	<Compile Include="Pages\NumbersPage.xaml.cs">
+      <DependentUpon>NumbersPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Pages\ScreenPage.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 142d0d42b1..f8976401e7 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -19,6 +19,7 @@
     <TabItem Header="Image"><pages:ImagePage/></TabItem>
     <TabItem Header="LayoutTransformControl"><pages:LayoutTransformControlPage/></TabItem>
     <TabItem Header="Menu"><pages:MenuPage/></TabItem>
+	  <TabItem Header="Numbers"><pages:NumbersPage/></TabItem>
     <TabItem Header="ProgressBar"><pages:ProgressBarPage/></TabItem>
     <TabItem Header="RadioButton"><pages:RadioButtonPage/></TabItem>
     <TabItem Header="Slider"><pages:SliderPage/></TabItem>
diff --git a/samples/ControlCatalog/Pages/NumbersPage.xaml b/samples/ControlCatalog/Pages/NumbersPage.xaml
new file mode 100644
index 0000000000..fa1990b472
--- /dev/null
+++ b/samples/ControlCatalog/Pages/NumbersPage.xaml
@@ -0,0 +1,96 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <StackPanel Orientation="Vertical" Gap="4">
+    <TextBlock Margin="2" Classes="h1">Numeric up-down controls</TextBlock>
+    <TextBlock Margin="2" Classes="h2" TextWrapping="Wrap">Numeric up-down controls provide a TextBox with button spinners that allow incrementing and decrementing numeric values by using the spinner buttons, keyboard up/down arrows, or mouse wheel.</TextBlock>
+    <TextBlock Margin="2" Classes="h2">The following controls are available to support various native numeric types:</TextBlock>
+    <TextBlock Margin="2" Classes="h2">ByteUpDown, ShortUpDown, IntegerUpDown, LongUpDown, SingleUpDown, DoubleUpDown, DecimalUpDown.</TextBlock>
+
+    <TextBlock Margin="2,5,2,2" FontSize="14" FontWeight="Bold">Features:</TextBlock>
+    <Grid Margin="2" ColumnDefinitions="Auto,Auto,Auto,Auto" RowDefinitions="Auto,Auto">
+      <Grid Grid.Row="0" Grid.Column="0" ColumnDefinitions="Auto, Auto" RowDefinitions="35,35,35,35,35">
+	      <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="2">ShowButtonSpinner:</TextBlock>
+        <CheckBox Grid.Row="0" Grid.Column="1" IsChecked="{Binding #doubleUpDown.ShowButtonSpinner}" VerticalAlignment="Center" Margin="2"/>
+
+	      <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Margin="2">IsReadOnly:</TextBlock>
+        <CheckBox Grid.Row="1" Grid.Column="1" IsChecked="{Binding #doubleUpDown.IsReadOnly}" VerticalAlignment="Center" Margin="2"/>
+	      
+	      <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="2">AllowSpin:</TextBlock>
+        <CheckBox Grid.Row="2" Grid.Column="1" IsChecked="{Binding #doubleUpDown.AllowSpin}" IsEnabled="{Binding #doubleUpDown.!IsReadOnly}" VerticalAlignment="Center" Margin="2"/>
+        
+	      <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="2">ClipValueToMinMax:</TextBlock>
+	      <CheckBox Grid.Row="3" Grid.Column="1" IsChecked="{Binding #doubleUpDown.ClipValueToMinMax}" VerticalAlignment="Center" Margin="2"/>
+        
+	      <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="2">DisplayDefaultValueOnEmptyText:</TextBlock>
+	      <CheckBox Grid.Row="4" Grid.Column="1" IsChecked="{Binding #doubleUpDown.DisplayDefaultValueOnEmptyText}" VerticalAlignment="Center" Margin="2"/>
+      </Grid>
+      <Grid Grid.Row="0" Grid.Column="1" Margin="10,2,2,2" ColumnDefinitions="Auto, 120" RowDefinitions="35,35,35,35,35">
+        <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="2">FormatString:</TextBlock>
+        <DropDown Grid.Row="0" Grid.Column="1" Items="{Binding Formats}" SelectedItem="{Binding SelectedFormat}"
+                  VerticalAlignment="Center" Margin="2">
+          <DropDown.ItemTemplate>
+            <DataTemplate>
+              <StackPanel Orientation="Horizontal" Gap="2">
+                <TextBlock Text="{Binding Name}"/>
+                <TextBlock Text="-"/>
+                <TextBlock Text="{Binding Value}"/>
+              </StackPanel>
+            </DataTemplate>
+          </DropDown.ItemTemplate>
+        </DropDown>
+
+        <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Margin="2">ButtonSpinnerLocation:</TextBlock>
+        <DropDown Grid.Row="1" Grid.Column="1" Items="{Binding SpinnerLocations}" SelectedItem="{Binding #doubleUpDown.ButtonSpinnerLocation}"
+	                VerticalAlignment="Center" Margin="2"/>
+
+        <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="2">CultureInfo:</TextBlock>
+        <DropDown Grid.Row="2" Grid.Column="1" Items="{Binding Cultures}" SelectedItem="{Binding #doubleUpDown.CultureInfo}"
+	                VerticalAlignment="Center" Margin="2"/>
+
+	      <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="2">Watermark:</TextBlock>
+	      <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding #doubleUpDown.Watermark}" VerticalAlignment="Center" Margin="2" />
+          
+	      <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="2">Text:</TextBlock>
+	      <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding #doubleUpDown.Text}" VerticalAlignment="Center" Margin="2" />
+      </Grid>
+      <Grid Grid.Row="0" Grid.Column="2" Margin="10,2,2,2" RowDefinitions="35,35,35,35,35" ColumnDefinitions="Auto, 120">
+        <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Minimum:</TextBlock>
+        <DoubleUpDown Grid.Row="0" Grid.Column="1" Value="{Binding #doubleUpDown.Minimum}" AllowInputSpecialValues="NegativeInfinity" 
+                      CultureInfo="{Binding #doubleUpDown.CultureInfo}" VerticalAlignment="Center" Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
+
+        <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Maximum:</TextBlock>
+        <DoubleUpDown Grid.Row="1" Grid.Column="1" Value="{Binding #doubleUpDown.Maximum}" AllowInputSpecialValues="PositiveInfinity"
+                      CultureInfo="{Binding #doubleUpDown.CultureInfo}" VerticalAlignment="Center" Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
+
+        <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Increment:</TextBlock>
+        <DoubleUpDown Grid.Row="2" Grid.Column="1" Value="{Binding #doubleUpDown.Increment}" VerticalAlignment="Center"
+                      Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
+
+        <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Value:</TextBlock>
+        <DoubleUpDown Grid.Row="3" Grid.Column="1" Value="{Binding #doubleUpDown.Value}" VerticalAlignment="Center"
+		                  Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
+          
+	      <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">DefaultValue:</TextBlock>
+	      <DoubleUpDown Grid.Row="4" Grid.Column="1" Value="{Binding #doubleUpDown.DefaultValue}" AllowInputSpecialValues="Any"
+	                    VerticalAlignment="Center" Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
+
+      </Grid>
+    </Grid>
+
+    <TextBlock Margin="2" Classes="h2">DoubleUpDown and SingleUpDown support the AllowInputSpecialValues property</TextBlock>
+    <StackPanel Orientation="Horizontal">
+      <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="2">AllowInputSpecialValues:</TextBlock>
+      <DropDown Grid.Row="1" Grid.Column="1" Items="{Binding AllowedSpecialValues}" SelectedItem="{Binding #doubleUpDown.AllowInputSpecialValues}"
+                VerticalAlignment="Center" Margin="2"/>
+    </StackPanel>
+
+    <StackPanel Margin="2,10,2,2" Orientation="Horizontal" Gap="10">
+      <TextBlock FontSize="14" FontWeight="Bold" VerticalAlignment="Center">Usage of DoubleUpDown:</TextBlock>
+      <DoubleUpDown Name="doubleUpDown" Minimum="0" Maximum="10" Increment="0.5"
+                    AllowInputSpecialValues="Any" CultureInfo="en-US"
+                    VerticalAlignment="Center" Height="25" Width="100"
+	                  Watermark="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
+    </StackPanel>
+
+  </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/NumbersPage.xaml.cs b/samples/ControlCatalog/Pages/NumbersPage.xaml.cs
new file mode 100644
index 0000000000..a68bdc3bcf
--- /dev/null
+++ b/samples/ControlCatalog/Pages/NumbersPage.xaml.cs
@@ -0,0 +1,111 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Markup.Xaml;
+using ReactiveUI;
+
+namespace ControlCatalog.Pages
+{
+    public class NumbersPage : UserControl
+    {
+        public NumbersPage()
+        {
+            this.InitializeComponent();
+            var viewModel = new NumbersPageViewModel();
+            DataContext = viewModel;
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+    }
+
+    public class NumbersPageViewModel : ReactiveObject
+    {
+        private IList<FormatObject> _formats;
+        private FormatObject _selectedFormat;
+        private IList<Location> _spinnerLocations;
+        private IList<AllowedSpecialValues> _allowedSpecialValues;
+
+        public NumbersPageViewModel()
+        {
+            SelectedFormat = Formats.FirstOrDefault();
+        }
+
+        public IList<FormatObject> Formats
+        {
+            get
+            {
+                return _formats ?? (_formats = new List<FormatObject>()
+                {
+                    new FormatObject() {Name = "Currency", Value = "C2"},
+                    new FormatObject() {Name = "Fixed point", Value = "F2"},
+                    new FormatObject() {Name = "General", Value = "G"},
+                    new FormatObject() {Name = "Number", Value = "N"},
+                    new FormatObject() {Name = "Percent", Value = "P"},
+                    new FormatObject() {Name = "Degrees", Value = "{0:N2} °"},
+                });
+            }
+        }
+
+        public IList<Location> SpinnerLocations
+        {
+            get
+            {
+                if (_spinnerLocations == null)
+                {
+                    _spinnerLocations = new List<Location>();
+                    foreach (Location value in Enum.GetValues(typeof(Location)))
+                    {
+                        _spinnerLocations.Add(value);
+                    }
+                }
+                return _spinnerLocations ;
+            }
+        }
+
+        public IList<CultureInfo> Cultures { get; } = new List<CultureInfo>()
+        {
+            new CultureInfo("en-US"),
+            new CultureInfo("en-GB"),
+            new CultureInfo("fr-FR"),
+            new CultureInfo("ar-DZ"),
+            new CultureInfo("zh-CN"),
+            new CultureInfo("cs-CZ")
+        };
+
+        public IList<AllowedSpecialValues> AllowedSpecialValues
+        {
+            get
+            {
+                if (_allowedSpecialValues == null)
+                {
+                    _allowedSpecialValues = new List<AllowedSpecialValues>();
+                    foreach (AllowedSpecialValues value in Enum.GetValues(typeof(AllowedSpecialValues)))
+                    {
+                        _allowedSpecialValues.Add(value);
+                    }
+                }
+                return _allowedSpecialValues;
+            }
+        }
+
+    public FormatObject SelectedFormat
+        {
+            get { return _selectedFormat; }
+            set { this.RaiseAndSetIfChanged(ref _selectedFormat, value); }
+        }
+    }
+
+    public class FormatObject
+    {
+        public string Value { get; set; }
+        public string Name { get; set; }
+    }
+}

From 27a666467cc36d860790f8e3e9e04bebe78818a9 Mon Sep 17 00:00:00 2001
From: Benedikt Schroeder <benedikt.schroeder@outlook.de>
Date: Thu, 22 Mar 2018 11:31:54 +0100
Subject: [PATCH 436/482] Initial

---
 src/Avalonia.Controls/Border.cs               | 333 ++++++++++++++++--
 .../Presenters/ContentPresenter.cs            | 153 ++++----
 .../Primitives/TemplatedControl.cs            |   4 +-
 .../Accents/BaseLight.xaml                    |   5 +-
 src/Avalonia.Visuals/CornerRadius.cs          |  97 +++++
 src/Avalonia.Visuals/Thickness.cs             |   7 +-
 .../Avalonia.Markup.Xaml.csproj               |   1 +
 .../Converters/CornerRadiusTypeConverter.cs   |  19 +
 .../AvaloniaDefaultTypeConverters.cs          |   1 +
 .../Avalonia.Direct2D1/Media/GeometryImpl.cs  |  11 +-
 .../Styling/ApplyStyling.cs                   |   2 +-
 .../BorderTests.cs                            |   2 +-
 .../Controls/BorderTests.cs                   |  26 +-
 .../Media/VisualBrushTests.cs                 |   2 +-
 .../Avalonia.RenderTests/Shapes/PathTests.cs  |   2 +-
 .../Avalonia.Styling.UnitTests/StyleTests.cs  |   6 +-
 .../CornerRadiusTests.cs                      |  43 +++
 .../ThicknessTests.cs                         |   4 +-
 18 files changed, 582 insertions(+), 136 deletions(-)
 create mode 100644 src/Avalonia.Visuals/CornerRadius.cs
 create mode 100644 src/Markup/Avalonia.Markup.Xaml/Converters/CornerRadiusTypeConverter.cs
 create mode 100644 tests/Avalonia.Visuals.UnitTests/CornerRadiusTests.cs

diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index 002c5ea3f2..4ddf81565a 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -1,6 +1,8 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using System;
+using Avalonia;
 using Avalonia.Media;
 
 namespace Avalonia.Controls
@@ -25,14 +27,16 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="BorderThickness"/> property.
         /// </summary>
-        public static readonly StyledProperty<double> BorderThicknessProperty =
-            AvaloniaProperty.Register<Border, double>(nameof(BorderThickness));
+        public static readonly StyledProperty<Thickness> BorderThicknessProperty =
+            AvaloniaProperty.Register<Border, Thickness>(nameof(BorderThickness));
 
         /// <summary>
         /// Defines the <see cref="CornerRadius"/> property.
         /// </summary>
-        public static readonly StyledProperty<float> CornerRadiusProperty =
-            AvaloniaProperty.Register<Border, float>(nameof(CornerRadius));
+        public static readonly StyledProperty<CornerRadius> CornerRadiusProperty =
+            AvaloniaProperty.Register<Border, CornerRadius>(nameof(CornerRadius));
+
+        private readonly BorderRenderer _borderRenderer = new BorderRenderer();
 
         /// <summary>
         /// Initializes static members of the <see cref="Border"/> class.
@@ -63,7 +67,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the thickness of the border.
         /// </summary>
-        public double BorderThickness
+        public Thickness BorderThickness
         {
             get { return GetValue(BorderThicknessProperty); }
             set { SetValue(BorderThicknessProperty, value); }
@@ -72,7 +76,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the radius of the border rounded corners.
         /// </summary>
-        public float CornerRadius
+        public CornerRadius CornerRadius
         {
             get { return GetValue(CornerRadiusProperty); }
             set { SetValue(CornerRadiusProperty, value); }
@@ -84,21 +88,7 @@ namespace Avalonia.Controls
         /// <param name="context">The drawing context.</param>
         public override void Render(DrawingContext context)
         {
-            var background = Background;
-            var borderBrush = BorderBrush;
-            var borderThickness = BorderThickness;
-            var cornerRadius = CornerRadius;
-            var rect = new Rect(Bounds.Size).Deflate(BorderThickness);
-
-            if (background != null)
-            {
-                context.FillRectangle(background, rect, cornerRadius);
-            }
-
-            if (borderBrush != null && borderThickness > 0)
-            {
-                context.DrawRectangle(new Pen(borderBrush, borderThickness), rect, cornerRadius);
-            }
+            _borderRenderer.Render(context, Bounds.Size, BorderThickness, CornerRadius, Background, BorderBrush);
         }
 
         /// <summary>
@@ -120,10 +110,12 @@ namespace Avalonia.Controls
         {
             if (Child != null)
             {
-                var padding = Padding + new Thickness(BorderThickness);
+                var padding = Padding + BorderThickness;
                 Child.Arrange(new Rect(finalSize).Deflate(padding));
             }
 
+            _borderRenderer.Update(finalSize, BorderThickness, CornerRadius);
+
             return finalSize;
         }
 
@@ -131,18 +123,307 @@ namespace Avalonia.Controls
             Size availableSize,
             IControl child,
             Thickness padding,
-            double borderThickness)
+            Thickness borderThickness)
         {
-            padding += new Thickness(borderThickness);
+            padding += borderThickness;
 
             if (child != null)
             {
                 child.Measure(availableSize.Deflate(padding));
                 return child.DesiredSize.Inflate(padding);
             }
-            else
+
+            return new Size(padding.Left + padding.Right, padding.Bottom + padding.Top);
+        }
+
+
+        internal class BorderRenderer
+        {
+            private bool _useComplexRendering;
+            private StreamGeometry _backgroundGeometryCache;
+            private StreamGeometry _borderGeometryCache;
+
+            public void Update(Size finalSize, Thickness borderThickness, CornerRadius cornerRadius)
+            {
+                if (borderThickness.IsUniform && cornerRadius.IsUniform)
+                {
+                    _backgroundGeometryCache = null;
+                    _borderGeometryCache = null;
+                    _useComplexRendering = false;
+                }
+                else
+                {
+                    _useComplexRendering = true;
+
+                    var boundRect = new Rect(finalSize);
+                    var innerRect = boundRect.Deflate(borderThickness);
+                    var innerRadii = new Radii(cornerRadius, borderThickness, false);
+
+                    StreamGeometry backgroundGeometry = null;
+
+                    //  calculate border / background rendering geometry
+                    if (!innerRect.Width.Equals(0) && !innerRect.Height.Equals(0))
+                    {
+                        backgroundGeometry = new StreamGeometry();
+
+                        using (var ctx = backgroundGeometry.Open())
+                        {
+                            GenerateGeometry(ctx, innerRect, innerRadii);
+                        }
+
+                        _backgroundGeometryCache = backgroundGeometry;
+                    }
+                    else
+                    {
+                        _backgroundGeometryCache = null;
+                    }
+
+                    if (!boundRect.Width.Equals(0) && !boundRect.Height.Equals(0))
+                    {
+                        var outerRadii = new Radii(cornerRadius, borderThickness, true);
+                        var borderGeometry = new StreamGeometry();
+
+                        using (var ctx = borderGeometry.Open())
+                        {
+                            GenerateGeometry(ctx, boundRect, outerRadii);
+
+                            if (backgroundGeometry != null)
+                            {
+                                GenerateGeometry(ctx, innerRect, innerRadii);
+                            }
+                        }
+
+                        _borderGeometryCache = borderGeometry;
+                    }
+                    else
+                    {
+                        _borderGeometryCache = null;
+                    }
+                }
+            }
+
+            public void Render(DrawingContext context, Size size, Thickness borders, CornerRadius radii, IBrush background, IBrush borderBrush)
             {
-                return new Size(padding.Left + padding.Right, padding.Bottom + padding.Top);
+                if (_useComplexRendering)
+                {
+                    IBrush brush;
+                    var borderGeometry = _borderGeometryCache;
+                    if (borderGeometry != null && (brush = borderBrush) != null)
+                    {
+                        context.DrawGeometry(brush, null, borderGeometry);
+                    }
+
+                    var backgroundGeometry = _backgroundGeometryCache;
+                    if (backgroundGeometry != null && (brush = background) != null)
+                    {
+                        context.DrawGeometry(brush, null, backgroundGeometry);
+                    }
+                }
+                else
+                {
+                    var borderThickness = borders.Left;
+                    var cornerRadius = (float)radii.TopLeft;
+                    var rect = new Rect(size);
+
+                    if (background != null)
+                    {
+                        context.FillRectangle(background, rect.Deflate(borders), cornerRadius);
+                    }
+
+                    if (borderBrush != null && borderThickness > 0)
+                    {
+                        context.DrawRectangle(new Pen(borderBrush, borderThickness), rect.Deflate(borderThickness), cornerRadius);
+                    }
+                }
+            }
+
+            private static void GenerateGeometry(StreamGeometryContext ctx, Rect rect, Radii radii)
+            {
+                //
+                //  Compute the coordinates of the key points
+                //
+
+                var topLeft = new Point(radii.LeftTop, 0);
+                var topRight = new Point(rect.Width - radii.RightTop, 0);
+                var rightTop = new Point(rect.Width, radii.TopRight);
+                var rightBottom = new Point(rect.Width, rect.Height - radii.BottomRight);
+                var bottomRight = new Point(rect.Width - radii.RightBottom, rect.Height);
+                var bottomLeft = new Point(radii.LeftBottom, rect.Height);
+                var leftBottom = new Point(0, rect.Height - radii.BottomLeft);
+                var leftTop = new Point(0, radii.TopLeft);
+
+                //
+                //  Check keypoints for overlap and resolve by partitioning radii according to
+                //  the percentage of each one.  
+                //
+
+                //  Top edge is handled here
+                if (topLeft.X > topRight.X)
+                {
+                    var x = radii.LeftTop / (radii.LeftTop + radii.RightTop) * rect.Width;
+                    topLeft += new Point(x, 0);
+                    topRight += new Point(x, 0);
+                }
+
+                //  Right edge
+                if (rightTop.Y > rightBottom.Y)
+                {
+                    var y = radii.TopRight / (radii.TopRight + radii.BottomRight) * rect.Height;
+                    rightTop += new Point(0, y);
+                    rightBottom += new Point(0, y);
+                }
+
+                //  Bottom edge
+                if (bottomRight.X < bottomLeft.X)
+                {
+                    var x = radii.LeftBottom / (radii.LeftBottom + radii.RightBottom) * rect.Width;
+                    bottomRight += new Point(x, 0);
+                    bottomLeft += new Point(x, 0);
+                }
+
+                // Left edge
+                if (leftBottom.Y < leftTop.Y)
+                {
+                    var y = radii.TopLeft / (radii.TopLeft + radii.BottomLeft) * rect.Height;
+                    leftBottom += new Point(0, y);
+                    leftTop += new Point(0, y);
+                }
+
+                //
+                //  Add on offsets
+                //
+
+                var offset = new Vector(rect.TopLeft.X, rect.TopLeft.Y);
+                topLeft += offset;
+                topRight += offset;
+                rightTop += offset;
+                rightBottom += offset;
+                bottomRight += offset;
+                bottomLeft += offset;
+                leftBottom += offset;
+                leftTop += offset;
+
+                //
+                //  Create the border geometry
+                //
+                ctx.BeginFigure(topLeft, true);
+
+                // Top
+                ctx.LineTo(topRight);
+
+                // TopRight
+                var radiusX = rect.TopRight.X - topRight.X;
+                var radiusY = rightTop.Y - rect.TopRight.Y;
+                if (!radiusX.Equals(0) || !radiusY.Equals(0))
+                {
+                    ctx.ArcTo(rightTop, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+                }
+
+                // Right
+                ctx.LineTo(rightBottom);
+
+                // BottomRight
+                radiusX = rect.BottomRight.X - bottomRight.X;
+                radiusY = rect.BottomRight.Y - rightBottom.Y;
+                if (!radiusX.Equals(0) || !radiusY.Equals(0))
+                {
+                    ctx.ArcTo(bottomRight, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+                }
+
+                // Bottom
+                ctx.LineTo(bottomLeft);
+
+                // BottomLeft
+                radiusX = bottomLeft.X - rect.BottomLeft.X;
+                radiusY = rect.BottomLeft.Y - leftBottom.Y;
+                if (!radiusX.Equals(0) || !radiusY.Equals(0))
+                {
+                    ctx.ArcTo(leftBottom, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+                }
+
+                // Left
+                ctx.LineTo(leftTop);
+
+                // TopLeft
+                radiusX = topLeft.X - rect.TopLeft.X;
+                radiusY = leftTop.Y - rect.TopLeft.Y;
+                if (!radiusX.Equals(0) || !radiusY.Equals(0))
+                {
+                    ctx.ArcTo(topLeft, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+                }
+
+                ctx.EndFigure(true);
+            }
+
+            private struct Radii
+            {
+                internal Radii(CornerRadius radii, Thickness borders, bool outer)
+                {
+                    var left = 0.5 * borders.Left;
+                    var top = 0.5 * borders.Top;
+                    var right = 0.5 * borders.Right;
+                    var bottom = 0.5 * borders.Bottom;
+
+                    if (outer)
+                    {
+                        if (radii.TopLeft.Equals(0))
+                        {
+                            LeftTop = TopLeft = 0.0;
+                        }
+                        else
+                        {
+                            LeftTop = radii.TopLeft + left;
+                            TopLeft = radii.TopLeft + top;
+                        }
+                        if (radii.TopRight.Equals(0))
+                        {
+                            TopRight = RightTop = 0.0;
+                        }
+                        else
+                        {
+                            TopRight = radii.TopRight + top;
+                            RightTop = radii.TopRight + right;
+                        }
+                        if (radii.BottomRight.Equals(0))
+                        {
+                            RightBottom = BottomRight = 0.0;
+                        }
+                        else
+                        {
+                            RightBottom = radii.BottomRight + right;
+                            BottomRight = radii.BottomRight + bottom;
+                        }
+                        if (radii.BottomLeft.Equals(0))
+                        {
+                            BottomLeft = LeftBottom = 0.0;
+                        }
+                        else
+                        {
+                            BottomLeft = radii.BottomLeft + bottom;
+                            LeftBottom = radii.BottomLeft + left;
+                        }
+                    }
+                    else
+                    {
+                        LeftTop = Math.Max(0.0, radii.TopLeft - left);
+                        TopLeft = Math.Max(0.0, radii.TopLeft - top);
+                        TopRight = Math.Max(0.0, radii.TopRight - top);
+                        RightTop = Math.Max(0.0, radii.TopRight - right);
+                        RightBottom = Math.Max(0.0, radii.BottomRight - right);
+                        BottomRight = Math.Max(0.0, radii.BottomRight - bottom);
+                        BottomLeft = Math.Max(0.0, radii.BottomLeft - bottom);
+                        LeftBottom = Math.Max(0.0, radii.BottomLeft - left);
+                    }
+                }
+
+                internal readonly double LeftTop;
+                internal readonly double TopLeft;
+                internal readonly double TopRight;
+                internal readonly double RightTop;
+                internal readonly double RightBottom;
+                internal readonly double BottomRight;
+                internal readonly double BottomLeft;
+                internal readonly double LeftBottom;
             }
         }
     }
diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index d0a438cc2b..2d623dcbf7 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -31,7 +31,7 @@ namespace Avalonia.Controls.Presenters
         /// <summary>
         /// Defines the <see cref="BorderThickness"/> property.
         /// </summary>
-        public static readonly StyledProperty<double> BorderThicknessProperty =
+        public static readonly StyledProperty<Thickness> BorderThicknessProperty =
             Border.BorderThicknessProperty.AddOwner<ContentPresenter>();
 
         /// <summary>
@@ -57,7 +57,7 @@ namespace Avalonia.Controls.Presenters
         /// <summary>
         /// Defines the <see cref="CornerRadius"/> property.
         /// </summary>
-        public static readonly StyledProperty<float> CornerRadiusProperty =
+        public static readonly StyledProperty<CornerRadius> CornerRadiusProperty =
             Border.CornerRadiusProperty.AddOwner<ContentPresenter>();
 
         /// <summary>
@@ -81,6 +81,7 @@ namespace Avalonia.Controls.Presenters
         private IControl _child;
         private bool _createdChild;
         private IDataTemplate _dataTemplate;
+        private readonly Border.BorderRenderer _borderRenderer = new Border.BorderRenderer();
 
         /// <summary>
         /// Initializes static members of the <see cref="ContentPresenter"/> class.
@@ -120,7 +121,7 @@ namespace Avalonia.Controls.Presenters
         /// <summary>
         /// Gets or sets the thickness of the border.
         /// </summary>
-        public double BorderThickness
+        public Thickness BorderThickness
         {
             get { return GetValue(BorderThicknessProperty); }
             set { SetValue(BorderThicknessProperty, value); }
@@ -157,7 +158,7 @@ namespace Avalonia.Controls.Presenters
         /// <summary>
         /// Gets or sets the radius of the border rounded corners.
         /// </summary>
-        public float CornerRadius
+        public CornerRadius CornerRadius
         {
             get { return GetValue(CornerRadiusProperty); }
             set { SetValue(CornerRadiusProperty, value); }
@@ -221,7 +222,7 @@ namespace Avalonia.Controls.Presenters
         {
             var content = Content;
             var oldChild = Child;
-            var newChild = CreateChild();            
+            var newChild = CreateChild();
 
             // Remove the old child if we're not recycling it.
             if (oldChild != null && newChild != oldChild)
@@ -277,21 +278,7 @@ namespace Avalonia.Controls.Presenters
         /// <inheritdoc/>
         public override void Render(DrawingContext context)
         {
-            var background = Background;
-            var borderBrush = BorderBrush;
-            var borderThickness = BorderThickness;
-            var cornerRadius = CornerRadius;
-            var rect = new Rect(Bounds.Size).Deflate(BorderThickness);
-
-            if (background != null)
-            {
-                context.FillRectangle(background, rect, cornerRadius);
-            }
-
-            if (borderBrush != null && borderThickness > 0)
-            {
-                context.DrawRectangle(new Pen(borderBrush, borderThickness), rect, cornerRadius);
-            }
+            _borderRenderer.Render(context, Bounds.Size, BorderThickness, CornerRadius, Background, BorderBrush);
         }
 
         /// <summary>
@@ -344,7 +331,11 @@ namespace Avalonia.Controls.Presenters
         /// <inheritdoc/>
         protected override Size ArrangeOverride(Size finalSize)
         {
-            return ArrangeOverrideImpl(finalSize, new Vector());
+            finalSize = ArrangeOverrideImpl(finalSize, new Vector());
+
+            _borderRenderer.Update(finalSize, BorderThickness, CornerRadius);
+
+            return finalSize;
         }
 
         /// <summary>
@@ -372,74 +363,74 @@ namespace Avalonia.Controls.Presenters
 
         internal Size ArrangeOverrideImpl(Size finalSize, Vector offset)
         {
-            if (Child != null)
-            {
-                var padding = Padding;
-                var borderThickness = BorderThickness;
-                var horizontalContentAlignment = HorizontalContentAlignment;
-                var verticalContentAlignment = VerticalContentAlignment;
-                var useLayoutRounding = UseLayoutRounding;
-                var availableSizeMinusMargins = new Size(
-                    Math.Max(0, finalSize.Width - padding.Left - padding.Right - borderThickness),
-                    Math.Max(0, finalSize.Height - padding.Top - padding.Bottom - borderThickness));
-                var size = availableSizeMinusMargins;
-                var scale = GetLayoutScale();
-                var originX = offset.X + padding.Left + borderThickness;
-                var originY = offset.Y + padding.Top + borderThickness;
-
-                if (horizontalContentAlignment != HorizontalAlignment.Stretch)
-                {
-                    size = size.WithWidth(Math.Min(size.Width, DesiredSize.Width - padding.Left - padding.Right));
-                }
+            if (Child == null) return finalSize;
 
-                if (verticalContentAlignment != VerticalAlignment.Stretch)
-                {
-                    size = size.WithHeight(Math.Min(size.Height, DesiredSize.Height - padding.Top - padding.Bottom));
-                }
+            var padding = Padding;
+            var borderThickness = BorderThickness;
+            var horizontalContentAlignment = HorizontalContentAlignment;
+            var verticalContentAlignment = VerticalContentAlignment;
+            var useLayoutRounding = UseLayoutRounding;
+            //Not sure about this part
+            var availableSizeMinusMargins = new Size(
+                Math.Max(0, finalSize.Width - padding.Left - padding.Right - borderThickness.Left - borderThickness.Right),
+                Math.Max(0, finalSize.Height - padding.Top - padding.Bottom - borderThickness.Top - borderThickness.Bottom));
+            var size = availableSizeMinusMargins;
+            var scale = GetLayoutScale();
+            var originX = offset.X + padding.Left + borderThickness.Left;
+            var originY = offset.Y + padding.Top + borderThickness.Top;
+
+            if (horizontalContentAlignment != HorizontalAlignment.Stretch)
+            {
+                size = size.WithWidth(Math.Min(size.Width, DesiredSize.Width - padding.Left - padding.Right));
+            }
 
-                size = LayoutHelper.ApplyLayoutConstraints(Child, size);
+            if (verticalContentAlignment != VerticalAlignment.Stretch)
+            {
+                size = size.WithHeight(Math.Min(size.Height, DesiredSize.Height - padding.Top - padding.Bottom));
+            }
 
-                if (useLayoutRounding)
-                {
-                    size = new Size(
-                        Math.Ceiling(size.Width * scale) / scale,
-                        Math.Ceiling(size.Height * scale) / scale);
-                    availableSizeMinusMargins = new Size(
-                        Math.Ceiling(availableSizeMinusMargins.Width * scale) / scale,
-                        Math.Ceiling(availableSizeMinusMargins.Height * scale) / scale);
-                }
+            size = LayoutHelper.ApplyLayoutConstraints(Child, size);
 
-                switch (horizontalContentAlignment)
-                {
-                    case HorizontalAlignment.Center:
-                    case HorizontalAlignment.Stretch:
-                        originX += (availableSizeMinusMargins.Width - size.Width) / 2;
-                        break;
-                    case HorizontalAlignment.Right:
-                        originX += availableSizeMinusMargins.Width - size.Width;
-                        break;
-                }
+            if (useLayoutRounding)
+            {
+                size = new Size(
+                    Math.Ceiling(size.Width * scale) / scale,
+                    Math.Ceiling(size.Height * scale) / scale);
+                availableSizeMinusMargins = new Size(
+                    Math.Ceiling(availableSizeMinusMargins.Width * scale) / scale,
+                    Math.Ceiling(availableSizeMinusMargins.Height * scale) / scale);
+            }
 
-                switch (verticalContentAlignment)
-                {
-                    case VerticalAlignment.Center:
-                    case VerticalAlignment.Stretch:
-                        originY += (availableSizeMinusMargins.Height - size.Height) / 2;
-                        break;
-                    case VerticalAlignment.Bottom:
-                        originY += availableSizeMinusMargins.Height - size.Height;
-                        break;
-                }
+            switch (horizontalContentAlignment)
+            {
+                case HorizontalAlignment.Center:
+                case HorizontalAlignment.Stretch:
+                    originX += (availableSizeMinusMargins.Width - size.Width) / 2;
+                    break;
+                case HorizontalAlignment.Right:
+                    originX += availableSizeMinusMargins.Width - size.Width;
+                    break;
+            }
 
-                if (useLayoutRounding)
-                {
-                    originX = Math.Floor(originX * scale) / scale;
-                    originY = Math.Floor(originY * scale) / scale;
-                }
+            switch (verticalContentAlignment)
+            {
+                case VerticalAlignment.Center:
+                case VerticalAlignment.Stretch:
+                    originY += (availableSizeMinusMargins.Height - size.Height) / 2;
+                    break;
+                case VerticalAlignment.Bottom:
+                    originY += availableSizeMinusMargins.Height - size.Height;
+                    break;
+            }
 
-                Child.Arrange(new Rect(originX, originY, size.Width, size.Height));
+            if (useLayoutRounding)
+            {
+                originX = Math.Floor(originX * scale) / scale;
+                originY = Math.Floor(originY * scale) / scale;
             }
 
+            Child.Arrange(new Rect(originX, originY, size.Width, size.Height));
+
             return finalSize;
         }
 
@@ -447,7 +438,7 @@ namespace Avalonia.Controls.Presenters
         {
             var result = (VisualRoot as ILayoutRoot)?.LayoutScaling ?? 1.0;
 
-            if (result == 0 || double.IsNaN(result) || double.IsInfinity(result))
+            if (result.Equals(0) || double.IsNaN(result) || double.IsInfinity(result))
             {
                 throw new Exception($"Invalid LayoutScaling returned from {VisualRoot.GetType()}");
             }
diff --git a/src/Avalonia.Controls/Primitives/TemplatedControl.cs b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
index 6deef7c7b9..77735f3f12 100644
--- a/src/Avalonia.Controls/Primitives/TemplatedControl.cs
+++ b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
@@ -32,7 +32,7 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Defines the <see cref="BorderThickness"/> property.
         /// </summary>
-        public static readonly StyledProperty<double> BorderThicknessProperty =
+        public static readonly StyledProperty<Thickness> BorderThicknessProperty =
             Border.BorderThicknessProperty.AddOwner<TemplatedControl>();
 
         /// <summary>
@@ -132,7 +132,7 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Gets or sets the thickness of the control's border.
         /// </summary>
-        public double BorderThickness
+        public Thickness BorderThickness
         {
             get { return GetValue(BorderThicknessProperty); }
             set { SetValue(BorderThicknessProperty, value); }
diff --git a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
index cb86598a42..ebb14579b4 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
@@ -1,6 +1,7 @@
 <Style xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:sys="clr-namespace:System;assembly=mscorlib">
+       xmlns:sys="clr-namespace:System;assembly=mscorlib"
+       xmlns:avalonia="clr-namespace:Avalonia;assembly=Avalonia.Visuals">
   <Style.Resources>
     <SolidColorBrush x:Key="ThemeBackgroundBrush">#FFFFFFFF</SolidColorBrush>
     <SolidColorBrush x:Key="ThemeBorderLightBrush">#FFAAAAAA</SolidColorBrush>
@@ -20,7 +21,7 @@
     <SolidColorBrush x:Key="ErrorBrush">Red</SolidColorBrush>
     <SolidColorBrush x:Key="ErrorBrushLight">#10ff0000</SolidColorBrush>
 
-    <sys:Double x:Key="ThemeBorderThickness">2</sys:Double>
+    <avalonia:Thickness x:Key="ThemeBorderThickness">2</avalonia:Thickness>
     <sys:Double x:Key="ThemeDisabledOpacity">0.5</sys:Double>
 
     <sys:Double x:Key="FontSizeSmall">10</sys:Double>
diff --git a/src/Avalonia.Visuals/CornerRadius.cs b/src/Avalonia.Visuals/CornerRadius.cs
new file mode 100644
index 0000000000..25e3b103cd
--- /dev/null
+++ b/src/Avalonia.Visuals/CornerRadius.cs
@@ -0,0 +1,97 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Globalization;
+using System.Linq;
+
+namespace Avalonia
+{
+    public struct CornerRadius
+    {
+        public CornerRadius(double uniformRadius)
+        {
+            TopLeft = TopRight = BottomLeft = BottomRight = uniformRadius;
+
+        }
+        public CornerRadius(double top, double bottom)
+        {
+            TopLeft = TopRight = top;
+            BottomLeft = BottomRight = bottom;
+        }
+        public CornerRadius(double topLeft, double topRight, double bottomRight, double bottomLeft)
+        {
+            TopLeft = topLeft;
+            TopRight = topRight;
+            BottomRight = bottomRight;
+            BottomLeft = bottomLeft;
+        }
+
+        public double TopLeft { get; }
+        public double TopRight { get; }
+        public double BottomRight { get; }
+        public double BottomLeft { get; }
+        public bool IsEmpty => TopLeft.Equals(0) && IsUniform;
+        public bool IsUniform => TopLeft.Equals(TopRight) && BottomLeft.Equals(BottomRight) && TopRight.Equals(BottomRight);
+
+        public override bool Equals(object obj)
+        {
+            if (obj is CornerRadius)
+            {
+                return this == (CornerRadius)obj;
+            }
+            return false;
+        }
+
+        public override int GetHashCode()
+        {
+            return TopLeft.GetHashCode() ^ TopRight.GetHashCode() ^ BottomLeft.GetHashCode() ^ BottomRight.GetHashCode();
+        }
+
+        public override string ToString()
+        {
+            return $"{TopLeft},{TopRight},{BottomRight},{BottomLeft}";
+        }
+
+        public static CornerRadius Parse(string s, CultureInfo culture)
+        {
+            var parts = s.Split(new[] { ',', ' ' }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(x => x.Trim())
+                .ToList();
+
+            switch (parts.Count)
+            {
+                case 1:
+                    var uniform = double.Parse(parts[0], culture);
+                    return new CornerRadius(uniform);
+                case 2:
+                    var top = double.Parse(parts[0], culture);
+                    var bottom = double.Parse(parts[1], culture);
+                    return new CornerRadius(top, bottom);
+                case 4:
+                    var topLeft = double.Parse(parts[0], culture);
+                    var topRight = double.Parse(parts[1], culture);
+                    var bottomRight = double.Parse(parts[2], culture);
+                    var bottomLeft = double.Parse(parts[3], culture);
+                    return new CornerRadius(topLeft, topRight, bottomRight, bottomLeft);
+                default:
+                    {
+                        throw new FormatException("Invalid CornerRadius.");
+                    }
+            }
+        }
+
+        public static bool operator ==(CornerRadius cr1, CornerRadius cr2)
+        {
+            return ((cr1.TopLeft.Equals(cr2.TopLeft) || double.IsNaN(cr1.TopLeft) && double.IsNaN(cr2.TopLeft)))
+                   && (cr1.TopRight.Equals(cr2.TopRight) || (double.IsNaN(cr1.TopRight) && double.IsNaN(cr2.TopRight)))
+                   && (cr1.BottomRight.Equals(cr2.BottomRight) || double.IsNaN(cr1.BottomRight) && double.IsNaN(cr2.BottomRight))
+                   && (cr1.BottomLeft.Equals(cr2.BottomLeft) || double.IsNaN(cr1.BottomLeft) && double.IsNaN(cr2.BottomLeft));
+        }
+
+        public static bool operator !=(CornerRadius cr1, CornerRadius cr2)
+        {
+            return (!(cr1 == cr2));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Thickness.cs b/src/Avalonia.Visuals/Thickness.cs
index dc9be7341d..ead9fd004a 100644
--- a/src/Avalonia.Visuals/Thickness.cs
+++ b/src/Avalonia.Visuals/Thickness.cs
@@ -90,7 +90,12 @@ namespace Avalonia
         /// <summary>
         /// Gets a value indicating whether all sides are set to 0.
         /// </summary>
-        public bool IsEmpty => Left == 0 && Top == 0 && Right == 0 && Bottom == 0;
+        public bool IsEmpty => Left.Equals(0) && IsUniform;
+
+        /// <summary>
+        /// Gets a value indicating whether all sides are equal.
+        /// </summary>
+        public bool IsUniform => Left.Equals(Right) && Top.Equals(Bottom) && Right.Equals(Bottom);
 
         /// <summary>
         /// Compares two Thicknesses.
diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index 0ce2a1a992..bd6acfdad1 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -31,6 +31,7 @@
         </Compile>
         <Compile Include="AvaloniaXamlLoaderPortableXaml.cs" />
         <Compile Include="AvaloniaXamlLoader.cs" />
+        <Compile Include="Converters\CornerRadiusTypeConverter.cs" />
         <Compile Include="Converters\MatrixTypeConverter.cs" />
         <Compile Include="Converters\RectTypeConverter.cs" />
         <Compile Include="Converters\SetterValueTypeConverter.cs" />
diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/CornerRadiusTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/CornerRadiusTypeConverter.cs
new file mode 100644
index 0000000000..5da0efae1b
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/Converters/CornerRadiusTypeConverter.cs
@@ -0,0 +1,19 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace Avalonia.Markup.Xaml.Converters
+{
+    public class CornerRadiusTypeConverter : TypeConverter
+    {
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return sourceType == typeof(string);
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            return CornerRadius.Parse((string)value, culture);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaDefaultTypeConverters.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaDefaultTypeConverters.cs
index 1cf5b6a58e..1ae24c8a34 100644
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaDefaultTypeConverters.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaDefaultTypeConverters.cs
@@ -43,6 +43,7 @@ namespace Avalonia.Markup.Xaml.PortableXaml
             { typeof(Selector), typeof(SelectorTypeConverter)},
             { typeof(SolidColorBrush), typeof(BrushTypeConverter) },
             { typeof(Thickness), typeof(ThicknessTypeConverter) },
+            { typeof(CornerRadius), typeof(CornerRadiusTypeConverter) },
             { typeof(TimeSpan), typeof(TimeSpanTypeConverter) },
             //{ typeof(Uri), typeof(Converters.UriTypeConverter) },
             { typeof(Cursor), typeof(CursorTypeConverter) },
diff --git a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
index 8f11d1463b..4b0bb4d7f9 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
@@ -26,8 +26,15 @@ namespace Avalonia.Direct2D1.Media
         /// <inheritdoc/>
         public Rect GetRenderBounds(Avalonia.Media.Pen pen)
         {
-            var factory = AvaloniaLocator.Current.GetService<Factory>();
-            return Geometry.GetWidenedBounds((float)pen.Thickness).ToAvalonia();
+            //var factory = AvaloniaLocator.Current.GetService<Factory>();
+            if (pen == null)
+            {
+                return Geometry.GetWidenedBounds(0).ToAvalonia();
+            }
+            else
+            {
+                return Geometry.GetWidenedBounds((float)pen.Thickness).ToAvalonia();
+            }
         }
 
         /// <inheritdoc/>
diff --git a/tests/Avalonia.Benchmarks/Styling/ApplyStyling.cs b/tests/Avalonia.Benchmarks/Styling/ApplyStyling.cs
index 33af55fdf9..d24a646f74 100644
--- a/tests/Avalonia.Benchmarks/Styling/ApplyStyling.cs
+++ b/tests/Avalonia.Benchmarks/Styling/ApplyStyling.cs
@@ -33,7 +33,7 @@ namespace Avalonia.Benchmarks.Styling
 
             var border = (Border)textBox.GetVisualChildren().Single();
 
-            if (border.BorderThickness != 2)
+            if (border.BorderThickness != new Thickness(2))
             {
                 throw new Exception("Styles not applied.");
             }
diff --git a/tests/Avalonia.Controls.UnitTests/BorderTests.cs b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
index c0d2a39ab2..3660a7b4ca 100644
--- a/tests/Avalonia.Controls.UnitTests/BorderTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
@@ -13,7 +13,7 @@ namespace Avalonia.Controls.UnitTests
             var target = new Border
             {
                 Padding = new Thickness(6),
-                BorderThickness = 4,
+                BorderThickness = new Thickness(4)
             };
 
             target.Measure(new Size(100, 100));
diff --git a/tests/Avalonia.RenderTests/Controls/BorderTests.cs b/tests/Avalonia.RenderTests/Controls/BorderTests.cs
index 3bd5a6e1cb..411870785a 100644
--- a/tests/Avalonia.RenderTests/Controls/BorderTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/BorderTests.cs
@@ -31,7 +31,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 1,
+                    BorderThickness = new Thickness(1),
                 }
             };
 
@@ -50,7 +50,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                 }
             };
 
@@ -87,7 +87,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new Border
                     {
                         Background = Brushes.Red,
@@ -110,7 +110,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Padding = new Thickness(2),
                     Child = new Border
                     {
@@ -134,7 +134,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new Border
                     {
                         Background = Brushes.Red,
@@ -159,7 +159,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new TextBlock
                     {
                         Text = "Foo",
@@ -186,7 +186,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new TextBlock
                     {
                         Text = "Foo",
@@ -213,7 +213,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new TextBlock
                     {
                         Text = "Foo",
@@ -240,7 +240,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new TextBlock
                     {
                         Text = "Foo",
@@ -267,7 +267,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new TextBlock
                     {
                         Text = "Foo",
@@ -294,7 +294,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new TextBlock
                     {
                         Text = "Foo",
@@ -321,7 +321,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new TextBlock
                     {
                         Text = "Foo",
@@ -348,7 +348,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                 Child = new Border
                 {
                     BorderBrush = Brushes.Black,
-                    BorderThickness = 2,
+                    BorderThickness = new Thickness(2),
                     Child = new TextBlock
                     {
                         Text = "Foo",
diff --git a/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs b/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs
index 099b022862..cfa15ae304 100644
--- a/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs
+++ b/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs
@@ -42,7 +42,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
                         new Border
                         {
                             BorderBrush = Brushes.Blue,
-                            BorderThickness = 2,
+                            BorderThickness = new Thickness(2),
                             HorizontalAlignment = HorizontalAlignment.Center,
                             VerticalAlignment = VerticalAlignment.Center,
                             Child = new TextBlock
diff --git a/tests/Avalonia.RenderTests/Shapes/PathTests.cs b/tests/Avalonia.RenderTests/Shapes/PathTests.cs
index fab867f428..4703daca25 100644
--- a/tests/Avalonia.RenderTests/Shapes/PathTests.cs
+++ b/tests/Avalonia.RenderTests/Shapes/PathTests.cs
@@ -316,7 +316,7 @@ namespace Avalonia.Direct2D1.RenderTests.Shapes
                 Child = new Border
                 {
                     BorderBrush = Brushes.Red,
-                    BorderThickness = 1,
+                    BorderThickness = new Thickness(1),
                     HorizontalAlignment = HorizontalAlignment.Center,
                     VerticalAlignment = VerticalAlignment.Center,
                     Child = new Path
diff --git a/tests/Avalonia.Styling.UnitTests/StyleTests.cs b/tests/Avalonia.Styling.UnitTests/StyleTests.cs
index a7c559668b..5ef559b887 100644
--- a/tests/Avalonia.Styling.UnitTests/StyleTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/StyleTests.cs
@@ -151,7 +151,7 @@ namespace Avalonia.Styling.UnitTests
             {
                 Setters = new[]
                 {
-                    new Setter(Border.BorderThicknessProperty, 4),
+                    new Setter(Border.BorderThicknessProperty, new Thickness(4)),
                 }
             };
 
@@ -162,9 +162,9 @@ namespace Avalonia.Styling.UnitTests
 
             style.Attach(border, null);
 
-            Assert.Equal(4, border.BorderThickness);
+            Assert.Equal(new Thickness(4), border.BorderThickness);
             root.Child = null;
-            Assert.Equal(0, border.BorderThickness);
+            Assert.Equal(new Thickness(0), border.BorderThickness);
         }
 
         private class Class1 : Control
diff --git a/tests/Avalonia.Visuals.UnitTests/CornerRadiusTests.cs b/tests/Avalonia.Visuals.UnitTests/CornerRadiusTests.cs
new file mode 100644
index 0000000000..bc0bbdc867
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/CornerRadiusTests.cs
@@ -0,0 +1,43 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System.Globalization;
+using Xunit;
+
+namespace Avalonia.Visuals.UnitTests
+{
+    public class CornerRadiusTests
+    {
+        [Fact]
+        public void Parse_Parses_Single_Uniform_Radius()
+        {
+            var result = CornerRadius.Parse("3.4", CultureInfo.InvariantCulture);
+
+            Assert.Equal(new CornerRadius(3.4), result);
+        }
+
+        [Fact]
+        public void Parse_Parses_Top_Bottom()
+        {
+            var result = CornerRadius.Parse("1.1,2.2", CultureInfo.InvariantCulture);
+
+            Assert.Equal(new CornerRadius(1.1, 2.2), result);
+        }
+
+        [Fact]
+        public void Parse_Parses_TopLeft_TopRight_BottomRight_BottomLeft()
+        {
+            var result = CornerRadius.Parse("1.1,2.2,3.3,4.4", CultureInfo.InvariantCulture);
+
+            Assert.Equal(new CornerRadius(1.1, 2.2, 3.3, 4.4), result);
+        }
+
+        [Fact]
+        public void Parse_Accepts_Spaces()
+        {
+            var result = CornerRadius.Parse("1.1 2.2 3.3 4.4", CultureInfo.InvariantCulture);
+
+            Assert.Equal(new CornerRadius(1.1, 2.2, 3.3, 4.4), result);
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs b/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs
index bd694d073a..03bf395d1e 100644
--- a/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs
@@ -4,7 +4,7 @@
 using System.Globalization;
 using Xunit;
 
-namespace Avalonia.Visuals.UnitTests.Media
+namespace Avalonia.Visuals.UnitTests
 {
     public class ThicknessTests
     {
@@ -40,4 +40,4 @@ namespace Avalonia.Visuals.UnitTests.Media
             Assert.Equal(new Thickness(1.2, 3.4, 5, 6), result);
         }
     }
-}
+}
\ No newline at end of file

From 5b9de833a23d6af00562aa5f6aa2507e9c7e9dd5 Mon Sep 17 00:00:00 2001
From: Benedikt Schroeder <benedikt.schroeder@outlook.de>
Date: Thu, 22 Mar 2018 12:24:22 +0100
Subject: [PATCH 437/482] Clean complex rendering code

---
 src/Avalonia.Controls/Border.cs | 299 ++++++++++----------------------
 1 file changed, 92 insertions(+), 207 deletions(-)

diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index 4ddf81565a..4fc60478e7 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -136,7 +136,6 @@ namespace Avalonia.Controls
             return new Size(padding.Left + padding.Right, padding.Bottom + padding.Top);
         }
 
-
         internal class BorderRenderer
         {
             private bool _useComplexRendering;
@@ -156,19 +155,28 @@ namespace Avalonia.Controls
                     _useComplexRendering = true;
 
                     var boundRect = new Rect(finalSize);
-                    var innerRect = boundRect.Deflate(borderThickness);
-                    var innerRadii = new Radii(cornerRadius, borderThickness, false);
+                    var innerRect = new Rect(borderThickness.Left, borderThickness.Top,
+                        boundRect.Width - borderThickness.Right, boundRect.Height - borderThickness.Bottom);
 
                     StreamGeometry backgroundGeometry = null;
 
-                    //  calculate border / background rendering geometry
-                    if (!innerRect.Width.Equals(0) && !innerRect.Height.Equals(0))
+                    if (!boundRect.Width.Equals(0) && !boundRect.Height.Equals(0))
                     {
                         backgroundGeometry = new StreamGeometry();
 
-                        using (var ctx = backgroundGeometry.Open())
+                        if (cornerRadius.IsEmpty)
                         {
-                            GenerateGeometry(ctx, innerRect, innerRadii);
+                            using (var ctx = backgroundGeometry.Open())
+                            {
+                                CreateGeometry(ctx, innerRect, cornerRadius);
+                            }
+                        }
+                        else
+                        {
+                            using (var ctx = backgroundGeometry.Open())
+                            {
+                                CreateGeometry(ctx, innerRect, cornerRadius);
+                            }
                         }
 
                         _backgroundGeometryCache = backgroundGeometry;
@@ -180,16 +188,31 @@ namespace Avalonia.Controls
 
                     if (!boundRect.Width.Equals(0) && !boundRect.Height.Equals(0))
                     {
-                        var outerRadii = new Radii(cornerRadius, borderThickness, true);
                         var borderGeometry = new StreamGeometry();
 
-                        using (var ctx = borderGeometry.Open())
+                        if (cornerRadius.IsEmpty)
                         {
-                            GenerateGeometry(ctx, boundRect, outerRadii);
+                            using (var ctx = borderGeometry.Open())
+                            {
+                                CreateGeometry(ctx, boundRect, cornerRadius);
 
-                            if (backgroundGeometry != null)
+                                if (backgroundGeometry != null)
+                                {
+                                    CreateGeometry(ctx, innerRect, cornerRadius);
+                                }
+                            }
+                        }
+                        else
+                        {
+                            using (var ctx = borderGeometry.Open())
                             {
-                                GenerateGeometry(ctx, innerRect, innerRadii);
+                                CreateGeometry(ctx, boundRect, cornerRadius);
+
+                                if (backgroundGeometry != null)
+                                {
+                                    CreateGeometry(ctx, innerRect, cornerRadius);
+                                }
+
                             }
                         }
 
@@ -202,228 +225,90 @@ namespace Avalonia.Controls
                 }
             }
 
-            public void Render(DrawingContext context, Size size, Thickness borders, CornerRadius radii, IBrush background, IBrush borderBrush)
+            private static void CreateGeometry(StreamGeometryContext context, Rect boundRect, CornerRadius cornerRadius)
             {
-                if (_useComplexRendering)
+                var topLeft = new Point(boundRect.X + cornerRadius.TopLeft, boundRect.Y);
+                var topRight = new Point(boundRect.Width - cornerRadius.TopRight, boundRect.Y);
+                var rightTop = new Point(boundRect.Width, boundRect.Y + cornerRadius.TopRight);
+                var rightBottom = new Point(boundRect.Width, boundRect.Height - cornerRadius.BottomRight);
+                var bottomRight = new Point(boundRect.Width - cornerRadius.BottomRight, boundRect.Height);
+                var bottomLeft = new Point(boundRect.X + cornerRadius.BottomLeft, boundRect.Height);
+                var leftBottom = new Point(boundRect.X, boundRect.Height - cornerRadius.BottomLeft);
+                var leftTop = new Point(boundRect.X, boundRect.Y + cornerRadius.TopLeft);
+
+                context.BeginFigure(topLeft, true);
+
+                //Top
+                context.LineTo(topRight);
+
+                //TopRight corner
+                if (topRight != rightTop)
                 {
-                    IBrush brush;
-                    var borderGeometry = _borderGeometryCache;
-                    if (borderGeometry != null && (brush = borderBrush) != null)
-                    {
-                        context.DrawGeometry(brush, null, borderGeometry);
-                    }
-
-                    var backgroundGeometry = _backgroundGeometryCache;
-                    if (backgroundGeometry != null && (brush = background) != null)
-                    {
-                        context.DrawGeometry(brush, null, backgroundGeometry);
-                    }
-                }
-                else
-                {
-                    var borderThickness = borders.Left;
-                    var cornerRadius = (float)radii.TopLeft;
-                    var rect = new Rect(size);
-
-                    if (background != null)
-                    {
-                        context.FillRectangle(background, rect.Deflate(borders), cornerRadius);
-                    }
-
-                    if (borderBrush != null && borderThickness > 0)
-                    {
-                        context.DrawRectangle(new Pen(borderBrush, borderThickness), rect.Deflate(borderThickness), cornerRadius);
-                    }
-                }
-            }
-
-            private static void GenerateGeometry(StreamGeometryContext ctx, Rect rect, Radii radii)
-            {
-                //
-                //  Compute the coordinates of the key points
-                //
-
-                var topLeft = new Point(radii.LeftTop, 0);
-                var topRight = new Point(rect.Width - radii.RightTop, 0);
-                var rightTop = new Point(rect.Width, radii.TopRight);
-                var rightBottom = new Point(rect.Width, rect.Height - radii.BottomRight);
-                var bottomRight = new Point(rect.Width - radii.RightBottom, rect.Height);
-                var bottomLeft = new Point(radii.LeftBottom, rect.Height);
-                var leftBottom = new Point(0, rect.Height - radii.BottomLeft);
-                var leftTop = new Point(0, radii.TopLeft);
-
-                //
-                //  Check keypoints for overlap and resolve by partitioning radii according to
-                //  the percentage of each one.  
-                //
-
-                //  Top edge is handled here
-                if (topLeft.X > topRight.X)
-                {
-                    var x = radii.LeftTop / (radii.LeftTop + radii.RightTop) * rect.Width;
-                    topLeft += new Point(x, 0);
-                    topRight += new Point(x, 0);
+                    context.ArcTo(rightTop, new Size(cornerRadius.TopRight, cornerRadius.TopRight), 0, false, SweepDirection.Clockwise);
                 }
 
-                //  Right edge
-                if (rightTop.Y > rightBottom.Y)
-                {
-                    var y = radii.TopRight / (radii.TopRight + radii.BottomRight) * rect.Height;
-                    rightTop += new Point(0, y);
-                    rightBottom += new Point(0, y);
-                }
+                //Right
+                context.LineTo(rightBottom);
 
-                //  Bottom edge
-                if (bottomRight.X < bottomLeft.X)
+                //BottomRight corner
+                if (rightBottom != bottomRight)
                 {
-                    var x = radii.LeftBottom / (radii.LeftBottom + radii.RightBottom) * rect.Width;
-                    bottomRight += new Point(x, 0);
-                    bottomLeft += new Point(x, 0);
+                    context.ArcTo(bottomRight, new Size(cornerRadius.BottomRight, cornerRadius.BottomRight), 0, false, SweepDirection.Clockwise);
                 }
 
-                // Left edge
-                if (leftBottom.Y < leftTop.Y)
-                {
-                    var y = radii.TopLeft / (radii.TopLeft + radii.BottomLeft) * rect.Height;
-                    leftBottom += new Point(0, y);
-                    leftTop += new Point(0, y);
-                }
+                //Bottom
+                context.LineTo(bottomLeft);
 
-                //
-                //  Add on offsets
-                //
-
-                var offset = new Vector(rect.TopLeft.X, rect.TopLeft.Y);
-                topLeft += offset;
-                topRight += offset;
-                rightTop += offset;
-                rightBottom += offset;
-                bottomRight += offset;
-                bottomLeft += offset;
-                leftBottom += offset;
-                leftTop += offset;
-
-                //
-                //  Create the border geometry
-                //
-                ctx.BeginFigure(topLeft, true);
-
-                // Top
-                ctx.LineTo(topRight);
-
-                // TopRight
-                var radiusX = rect.TopRight.X - topRight.X;
-                var radiusY = rightTop.Y - rect.TopRight.Y;
-                if (!radiusX.Equals(0) || !radiusY.Equals(0))
+                //BottomLeft corner
+                if (bottomLeft != leftBottom)
                 {
-                    ctx.ArcTo(rightTop, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+                    context.ArcTo(leftBottom, new Size(cornerRadius.BottomLeft, cornerRadius.BottomLeft), 0, false, SweepDirection.Clockwise);
                 }
 
-                // Right
-                ctx.LineTo(rightBottom);
+                //Left
+                context.LineTo(leftTop);
 
-                // BottomRight
-                radiusX = rect.BottomRight.X - bottomRight.X;
-                radiusY = rect.BottomRight.Y - rightBottom.Y;
-                if (!radiusX.Equals(0) || !radiusY.Equals(0))
+                //TopLeft corner
+                if (leftTop != topLeft)
                 {
-                    ctx.ArcTo(bottomRight, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+                    context.ArcTo(topLeft, new Size(cornerRadius.TopLeft, cornerRadius.TopLeft), 0, false, SweepDirection.Clockwise);
                 }
 
-                // Bottom
-                ctx.LineTo(bottomLeft);
+                context.EndFigure(true);
+            }
 
-                // BottomLeft
-                radiusX = bottomLeft.X - rect.BottomLeft.X;
-                radiusY = rect.BottomLeft.Y - leftBottom.Y;
-                if (!radiusX.Equals(0) || !radiusY.Equals(0))
+            public void Render(DrawingContext context, Size size, Thickness borders, CornerRadius radii, IBrush background, IBrush borderBrush)
+            {
+                if (_useComplexRendering)
                 {
-                    ctx.ArcTo(leftBottom, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
-                }
-
-                // Left
-                ctx.LineTo(leftTop);
+                    var backgroundGeometry = _backgroundGeometryCache;
+                    if (backgroundGeometry != null)
+                    {
+                        context.DrawGeometry(background, null, backgroundGeometry);
+                    }
 
-                // TopLeft
-                radiusX = topLeft.X - rect.TopLeft.X;
-                radiusY = leftTop.Y - rect.TopLeft.Y;
-                if (!radiusX.Equals(0) || !radiusY.Equals(0))
-                {
-                    ctx.ArcTo(topLeft, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+                    var borderGeometry = _borderGeometryCache;
+                    if (borderGeometry != null)
+                    {
+                        context.DrawGeometry(borderBrush, null, borderGeometry);
+                    }
                 }
-
-                ctx.EndFigure(true);
-            }
-
-            private struct Radii
-            {
-                internal Radii(CornerRadius radii, Thickness borders, bool outer)
+                else
                 {
-                    var left = 0.5 * borders.Left;
-                    var top = 0.5 * borders.Top;
-                    var right = 0.5 * borders.Right;
-                    var bottom = 0.5 * borders.Bottom;
+                    var borderThickness = borders.Left;
+                    var cornerRadius = (float)radii.TopLeft;
+                    var rect = new Rect(size);
 
-                    if (outer)
+                    if (background != null)
                     {
-                        if (radii.TopLeft.Equals(0))
-                        {
-                            LeftTop = TopLeft = 0.0;
-                        }
-                        else
-                        {
-                            LeftTop = radii.TopLeft + left;
-                            TopLeft = radii.TopLeft + top;
-                        }
-                        if (radii.TopRight.Equals(0))
-                        {
-                            TopRight = RightTop = 0.0;
-                        }
-                        else
-                        {
-                            TopRight = radii.TopRight + top;
-                            RightTop = radii.TopRight + right;
-                        }
-                        if (radii.BottomRight.Equals(0))
-                        {
-                            RightBottom = BottomRight = 0.0;
-                        }
-                        else
-                        {
-                            RightBottom = radii.BottomRight + right;
-                            BottomRight = radii.BottomRight + bottom;
-                        }
-                        if (radii.BottomLeft.Equals(0))
-                        {
-                            BottomLeft = LeftBottom = 0.0;
-                        }
-                        else
-                        {
-                            BottomLeft = radii.BottomLeft + bottom;
-                            LeftBottom = radii.BottomLeft + left;
-                        }
+                        context.FillRectangle(background, rect.Deflate(borders), cornerRadius);
                     }
-                    else
+
+                    if (borderBrush != null && borderThickness > 0)
                     {
-                        LeftTop = Math.Max(0.0, radii.TopLeft - left);
-                        TopLeft = Math.Max(0.0, radii.TopLeft - top);
-                        TopRight = Math.Max(0.0, radii.TopRight - top);
-                        RightTop = Math.Max(0.0, radii.TopRight - right);
-                        RightBottom = Math.Max(0.0, radii.BottomRight - right);
-                        BottomRight = Math.Max(0.0, radii.BottomRight - bottom);
-                        BottomLeft = Math.Max(0.0, radii.BottomLeft - bottom);
-                        LeftBottom = Math.Max(0.0, radii.BottomLeft - left);
+                        context.DrawRectangle(new Pen(borderBrush, borderThickness), rect.Deflate(borderThickness), cornerRadius);
                     }
                 }
-
-                internal readonly double LeftTop;
-                internal readonly double TopLeft;
-                internal readonly double TopRight;
-                internal readonly double RightTop;
-                internal readonly double RightBottom;
-                internal readonly double BottomRight;
-                internal readonly double BottomLeft;
-                internal readonly double LeftBottom;
             }
         }
     }

From 1b283105fefd43abaf39906d2e8242a9ad9924b9 Mon Sep 17 00:00:00 2001
From: Benedikt Schroeder <benedikt.schroeder@outlook.de>
Date: Fri, 23 Mar 2018 13:48:06 +0100
Subject: [PATCH 438/482] Removed redundant if

---
 src/Avalonia.Controls/Border.cs | 47 ++++++++-------------------------
 1 file changed, 11 insertions(+), 36 deletions(-)

diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index 4fc60478e7..2dd3c0fa05 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -156,27 +156,18 @@ namespace Avalonia.Controls
 
                     var boundRect = new Rect(finalSize);
                     var innerRect = new Rect(borderThickness.Left, borderThickness.Top,
-                        boundRect.Width - borderThickness.Right, boundRect.Height - borderThickness.Bottom);
+                        Math.Max(0, boundRect.Width - borderThickness.Right), 
+                        Math.Max(0, boundRect.Height - borderThickness.Bottom));
 
                     StreamGeometry backgroundGeometry = null;
 
-                    if (!boundRect.Width.Equals(0) && !boundRect.Height.Equals(0))
+                    if (!innerRect.Width.Equals(0) && !innerRect.Height.Equals(0))
                     {
                         backgroundGeometry = new StreamGeometry();
 
-                        if (cornerRadius.IsEmpty)
+                        using (var ctx = backgroundGeometry.Open())
                         {
-                            using (var ctx = backgroundGeometry.Open())
-                            {
-                                CreateGeometry(ctx, innerRect, cornerRadius);
-                            }
-                        }
-                        else
-                        {
-                            using (var ctx = backgroundGeometry.Open())
-                            {
-                                CreateGeometry(ctx, innerRect, cornerRadius);
-                            }
+                            CreateGeometry(ctx, innerRect, cornerRadius);
                         }
 
                         _backgroundGeometryCache = backgroundGeometry;
@@ -184,35 +175,19 @@ namespace Avalonia.Controls
                     else
                     {
                         _backgroundGeometryCache = null;
-                    }
+                    }                  
 
-                    if (!boundRect.Width.Equals(0) && !boundRect.Height.Equals(0))
+                    if (!boundRect.Width.Equals(0) && !innerRect.Height.Equals(0))
                     {
                         var borderGeometry = new StreamGeometry();
 
-                        if (cornerRadius.IsEmpty)
+                        using (var ctx = borderGeometry.Open())
                         {
-                            using (var ctx = borderGeometry.Open())
-                            {
-                                CreateGeometry(ctx, boundRect, cornerRadius);
+                            CreateGeometry(ctx, boundRect, cornerRadius);
 
-                                if (backgroundGeometry != null)
-                                {
-                                    CreateGeometry(ctx, innerRect, cornerRadius);
-                                }
-                            }
-                        }
-                        else
-                        {
-                            using (var ctx = borderGeometry.Open())
+                            if (backgroundGeometry != null)
                             {
-                                CreateGeometry(ctx, boundRect, cornerRadius);
-
-                                if (backgroundGeometry != null)
-                                {
-                                    CreateGeometry(ctx, innerRect, cornerRadius);
-                                }
-
+                                CreateGeometry(ctx, innerRect, cornerRadius);
                             }
                         }
 

From 6682c3e2dce122a6bb6abea0597d37955ac7d228 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 23 Mar 2018 23:54:16 +0100
Subject: [PATCH 439/482] Moved the reentrancy check to TextBox.

---
 src/Avalonia.Controls/TextBox.cs              | 23 +++++++++++--
 src/Avalonia.Controls/Utils/UndoRedoHelper.cs | 33 ++++---------------
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index a91b7b2a72..460ddf10b6 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -85,6 +85,7 @@ namespace Avalonia.Controls
         private int _selectionEnd;
         private TextPresenter _presenter;
         private UndoRedoHelper<UndoRedoState> _undoRedoHelper;
+        private bool _isUndoingRedoing;
         private bool _ignoreTextChanges;
         private static readonly string[] invalidCharacters = new String[1]{"\u007f"};
 
@@ -199,7 +200,7 @@ namespace Avalonia.Controls
                 {
                     CaretIndex = CoerceCaretIndex(CaretIndex, value?.Length ?? 0);
 
-                    if (SetAndRaise(TextProperty, ref _text, value))
+                    if (SetAndRaise(TextProperty, ref _text, value) && !_isUndoingRedoing)
                     {
                         _undoRedoHelper.Clear();
                     }
@@ -368,14 +369,30 @@ namespace Avalonia.Controls
                 case Key.Z:
                     if (modifiers == InputModifiers.Control)
                     {
-                        _undoRedoHelper.Undo();
+                        try
+                        {
+                            _isUndoingRedoing = true;
+                            _undoRedoHelper.Undo();
+                        }
+                        finally
+                        {
+                            _isUndoingRedoing = false;
+                        }
                         handled = true;
                     }
                     break;
                 case Key.Y:
                     if (modifiers == InputModifiers.Control)
                     {
-                        _undoRedoHelper.Redo();
+                        try
+                        {
+                            _isUndoingRedoing = true;
+                            _undoRedoHelper.Redo();
+                        }
+                        finally
+                        {
+                            _isUndoingRedoing = false;
+                        }
                         handled = true;
                     }
                     break;
diff --git a/src/Avalonia.Controls/Utils/UndoRedoHelper.cs b/src/Avalonia.Controls/Utils/UndoRedoHelper.cs
index fce002f0f1..c76555e554 100644
--- a/src/Avalonia.Controls/Utils/UndoRedoHelper.cs
+++ b/src/Avalonia.Controls/Utils/UndoRedoHelper.cs
@@ -10,7 +10,6 @@ namespace Avalonia.Controls.Utils
     class UndoRedoHelper<TState> : WeakTimer.IWeakTimerSubscriber where TState : struct, IEquatable<TState>
     {
         private readonly IUndoRedoHost _host;
-        bool _undoRedoing;
 
         public interface IUndoRedoHost
         {
@@ -33,19 +32,10 @@ namespace Avalonia.Controls.Utils
 
         public void Undo()
         {
-            _undoRedoing = true;
-
-            try
-            {
-                if (_currentNode?.Previous != null)
-                {
-                    _currentNode = _currentNode.Previous;
-                    _host.UndoRedoState = _currentNode.Value;
-                }
-            }
-            finally
+            if (_currentNode?.Previous != null)
             {
-                _undoRedoing = false;
+                _currentNode = _currentNode.Previous;
+                _host.UndoRedoState = _currentNode.Value;
             }
         }
 
@@ -80,19 +70,10 @@ namespace Avalonia.Controls.Utils
 
         public void Redo()
         {
-            _undoRedoing = true;
-
-            try
-            {
-                if (_currentNode?.Next != null)
-                {
-                    _currentNode = _currentNode.Next;
-                    _host.UndoRedoState = _currentNode.Value;
-                }
-            }
-            finally
+            if (_currentNode?.Next != null)
             {
-                _undoRedoing = false;
+                _currentNode = _currentNode.Next;
+                _host.UndoRedoState = _currentNode.Value;
             }
         }
 
@@ -112,7 +93,7 @@ namespace Avalonia.Controls.Utils
 
         public void Clear()
         {
-            if (!_undoRedoing) _states.Clear();
+            _states.Clear();
         }
 
         bool WeakTimer.IWeakTimerSubscriber.Tick()

From d6b5e04f0c73c29d6f6b69c5ed4366d262432e58 Mon Sep 17 00:00:00 2001
From: dzhelnin <mitya_zh@mail.ru>
Date: Sat, 24 Mar 2018 18:43:51 +0300
Subject: [PATCH 440/482] Reworked to provide common NumericUpDown control
 which values are doubles.

---
 samples/ControlCatalog/ControlCatalog.csproj  |    6 +-
 samples/ControlCatalog/MainView.xaml          |    2 +-
 samples/ControlCatalog/Pages/NumbersPage.xaml |   96 --
 .../Pages/NumericUpDownPage.xaml              |   86 ++
 ...Page.xaml.cs => NumericUpDownPage.xaml.cs} |   21 +-
 .../NumericUpDown/AllowedSpecialValues.cs     |   15 -
 .../NumericUpDown/ByteUpDown.cs               |   24 -
 .../NumericUpDown/CommonNumericUpDown.cs      |  346 -----
 .../NumericUpDown/DecimalUpDown.cs            |   24 -
 .../NumericUpDown/DoubleUpDown.cs             |  109 --
 .../NumericUpDown/IntegerUpDown.cs            |   24 -
 .../NumericUpDown/LongUpDown.cs               |   24 -
 .../NumericUpDown/NumericUpDown.cs            | 1117 ++++++++++++++++-
 .../NumericUpDownValueChangedEventArgs.cs     |   16 +
 .../NumericUpDown/ShortUpDown.cs              |   24 -
 .../NumericUpDown/SingleUpDown.cs             |  106 --
 .../NumericUpDown/UpDownBase.cs               |  824 ------------
 .../NumericUpDown.xaml                        |    2 +-
 18 files changed, 1184 insertions(+), 1682 deletions(-)
 delete mode 100644 samples/ControlCatalog/Pages/NumbersPage.xaml
 create mode 100644 samples/ControlCatalog/Pages/NumericUpDownPage.xaml
 rename samples/ControlCatalog/Pages/{NumbersPage.xaml.cs => NumericUpDownPage.xaml.cs} (79%)
 delete mode 100644 src/Avalonia.Controls/NumericUpDown/AllowedSpecialValues.cs
 delete mode 100644 src/Avalonia.Controls/NumericUpDown/ByteUpDown.cs
 delete mode 100644 src/Avalonia.Controls/NumericUpDown/CommonNumericUpDown.cs
 delete mode 100644 src/Avalonia.Controls/NumericUpDown/DecimalUpDown.cs
 delete mode 100644 src/Avalonia.Controls/NumericUpDown/DoubleUpDown.cs
 delete mode 100644 src/Avalonia.Controls/NumericUpDown/IntegerUpDown.cs
 delete mode 100644 src/Avalonia.Controls/NumericUpDown/LongUpDown.cs
 create mode 100644 src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs
 delete mode 100644 src/Avalonia.Controls/NumericUpDown/ShortUpDown.cs
 delete mode 100644 src/Avalonia.Controls/NumericUpDown/SingleUpDown.cs
 delete mode 100644 src/Avalonia.Controls/NumericUpDown/UpDownBase.cs

diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index c3f14b045d..5d8f661990 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -78,7 +78,7 @@
     <EmbeddedResource Include="Pages\MenuPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Pages\NumbersPage.xaml">
+    <EmbeddedResource Include="Pages\NumericUpDownPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Pages\ProgressBarPage.xaml">
@@ -173,8 +173,8 @@
     <Compile Include="Pages\ButtonSpinnerPage.xaml.cs">
       <DependentUpon>ButtonSpinnerPage.xaml</DependentUpon>
     </Compile>
-	<Compile Include="Pages\NumbersPage.xaml.cs">
-      <DependentUpon>NumbersPage.xaml</DependentUpon>
+	<Compile Include="Pages\NumericUpDownPage.xaml.cs">
+      <DependentUpon>NumericUpDownPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Pages\ScreenPage.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index f8976401e7..a2e0980d6a 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -19,7 +19,7 @@
     <TabItem Header="Image"><pages:ImagePage/></TabItem>
     <TabItem Header="LayoutTransformControl"><pages:LayoutTransformControlPage/></TabItem>
     <TabItem Header="Menu"><pages:MenuPage/></TabItem>
-	  <TabItem Header="Numbers"><pages:NumbersPage/></TabItem>
+	  <TabItem Header="NumericUpDown"><pages:NumericUpDownPage/></TabItem>
     <TabItem Header="ProgressBar"><pages:ProgressBarPage/></TabItem>
     <TabItem Header="RadioButton"><pages:RadioButtonPage/></TabItem>
     <TabItem Header="Slider"><pages:SliderPage/></TabItem>
diff --git a/samples/ControlCatalog/Pages/NumbersPage.xaml b/samples/ControlCatalog/Pages/NumbersPage.xaml
deleted file mode 100644
index fa1990b472..0000000000
--- a/samples/ControlCatalog/Pages/NumbersPage.xaml
+++ /dev/null
@@ -1,96 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <StackPanel Orientation="Vertical" Gap="4">
-    <TextBlock Margin="2" Classes="h1">Numeric up-down controls</TextBlock>
-    <TextBlock Margin="2" Classes="h2" TextWrapping="Wrap">Numeric up-down controls provide a TextBox with button spinners that allow incrementing and decrementing numeric values by using the spinner buttons, keyboard up/down arrows, or mouse wheel.</TextBlock>
-    <TextBlock Margin="2" Classes="h2">The following controls are available to support various native numeric types:</TextBlock>
-    <TextBlock Margin="2" Classes="h2">ByteUpDown, ShortUpDown, IntegerUpDown, LongUpDown, SingleUpDown, DoubleUpDown, DecimalUpDown.</TextBlock>
-
-    <TextBlock Margin="2,5,2,2" FontSize="14" FontWeight="Bold">Features:</TextBlock>
-    <Grid Margin="2" ColumnDefinitions="Auto,Auto,Auto,Auto" RowDefinitions="Auto,Auto">
-      <Grid Grid.Row="0" Grid.Column="0" ColumnDefinitions="Auto, Auto" RowDefinitions="35,35,35,35,35">
-	      <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="2">ShowButtonSpinner:</TextBlock>
-        <CheckBox Grid.Row="0" Grid.Column="1" IsChecked="{Binding #doubleUpDown.ShowButtonSpinner}" VerticalAlignment="Center" Margin="2"/>
-
-	      <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Margin="2">IsReadOnly:</TextBlock>
-        <CheckBox Grid.Row="1" Grid.Column="1" IsChecked="{Binding #doubleUpDown.IsReadOnly}" VerticalAlignment="Center" Margin="2"/>
-	      
-	      <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="2">AllowSpin:</TextBlock>
-        <CheckBox Grid.Row="2" Grid.Column="1" IsChecked="{Binding #doubleUpDown.AllowSpin}" IsEnabled="{Binding #doubleUpDown.!IsReadOnly}" VerticalAlignment="Center" Margin="2"/>
-        
-	      <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="2">ClipValueToMinMax:</TextBlock>
-	      <CheckBox Grid.Row="3" Grid.Column="1" IsChecked="{Binding #doubleUpDown.ClipValueToMinMax}" VerticalAlignment="Center" Margin="2"/>
-        
-	      <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="2">DisplayDefaultValueOnEmptyText:</TextBlock>
-	      <CheckBox Grid.Row="4" Grid.Column="1" IsChecked="{Binding #doubleUpDown.DisplayDefaultValueOnEmptyText}" VerticalAlignment="Center" Margin="2"/>
-      </Grid>
-      <Grid Grid.Row="0" Grid.Column="1" Margin="10,2,2,2" ColumnDefinitions="Auto, 120" RowDefinitions="35,35,35,35,35">
-        <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="2">FormatString:</TextBlock>
-        <DropDown Grid.Row="0" Grid.Column="1" Items="{Binding Formats}" SelectedItem="{Binding SelectedFormat}"
-                  VerticalAlignment="Center" Margin="2">
-          <DropDown.ItemTemplate>
-            <DataTemplate>
-              <StackPanel Orientation="Horizontal" Gap="2">
-                <TextBlock Text="{Binding Name}"/>
-                <TextBlock Text="-"/>
-                <TextBlock Text="{Binding Value}"/>
-              </StackPanel>
-            </DataTemplate>
-          </DropDown.ItemTemplate>
-        </DropDown>
-
-        <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Margin="2">ButtonSpinnerLocation:</TextBlock>
-        <DropDown Grid.Row="1" Grid.Column="1" Items="{Binding SpinnerLocations}" SelectedItem="{Binding #doubleUpDown.ButtonSpinnerLocation}"
-	                VerticalAlignment="Center" Margin="2"/>
-
-        <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="2">CultureInfo:</TextBlock>
-        <DropDown Grid.Row="2" Grid.Column="1" Items="{Binding Cultures}" SelectedItem="{Binding #doubleUpDown.CultureInfo}"
-	                VerticalAlignment="Center" Margin="2"/>
-
-	      <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="2">Watermark:</TextBlock>
-	      <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding #doubleUpDown.Watermark}" VerticalAlignment="Center" Margin="2" />
-          
-	      <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="2">Text:</TextBlock>
-	      <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding #doubleUpDown.Text}" VerticalAlignment="Center" Margin="2" />
-      </Grid>
-      <Grid Grid.Row="0" Grid.Column="2" Margin="10,2,2,2" RowDefinitions="35,35,35,35,35" ColumnDefinitions="Auto, 120">
-        <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Minimum:</TextBlock>
-        <DoubleUpDown Grid.Row="0" Grid.Column="1" Value="{Binding #doubleUpDown.Minimum}" AllowInputSpecialValues="NegativeInfinity" 
-                      CultureInfo="{Binding #doubleUpDown.CultureInfo}" VerticalAlignment="Center" Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
-
-        <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Maximum:</TextBlock>
-        <DoubleUpDown Grid.Row="1" Grid.Column="1" Value="{Binding #doubleUpDown.Maximum}" AllowInputSpecialValues="PositiveInfinity"
-                      CultureInfo="{Binding #doubleUpDown.CultureInfo}" VerticalAlignment="Center" Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
-
-        <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Increment:</TextBlock>
-        <DoubleUpDown Grid.Row="2" Grid.Column="1" Value="{Binding #doubleUpDown.Increment}" VerticalAlignment="Center"
-                      Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
-
-        <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Value:</TextBlock>
-        <DoubleUpDown Grid.Row="3" Grid.Column="1" Value="{Binding #doubleUpDown.Value}" VerticalAlignment="Center"
-		                  Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
-          
-	      <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">DefaultValue:</TextBlock>
-	      <DoubleUpDown Grid.Row="4" Grid.Column="1" Value="{Binding #doubleUpDown.DefaultValue}" AllowInputSpecialValues="Any"
-	                    VerticalAlignment="Center" Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
-
-      </Grid>
-    </Grid>
-
-    <TextBlock Margin="2" Classes="h2">DoubleUpDown and SingleUpDown support the AllowInputSpecialValues property</TextBlock>
-    <StackPanel Orientation="Horizontal">
-      <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="2">AllowInputSpecialValues:</TextBlock>
-      <DropDown Grid.Row="1" Grid.Column="1" Items="{Binding AllowedSpecialValues}" SelectedItem="{Binding #doubleUpDown.AllowInputSpecialValues}"
-                VerticalAlignment="Center" Margin="2"/>
-    </StackPanel>
-
-    <StackPanel Margin="2,10,2,2" Orientation="Horizontal" Gap="10">
-      <TextBlock FontSize="14" FontWeight="Bold" VerticalAlignment="Center">Usage of DoubleUpDown:</TextBlock>
-      <DoubleUpDown Name="doubleUpDown" Minimum="0" Maximum="10" Increment="0.5"
-                    AllowInputSpecialValues="Any" CultureInfo="en-US"
-                    VerticalAlignment="Center" Height="25" Width="100"
-	                  Watermark="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
-    </StackPanel>
-
-  </StackPanel>
-</UserControl>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
new file mode 100644
index 0000000000..d90f2dffb2
--- /dev/null
+++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
@@ -0,0 +1,86 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <StackPanel Orientation="Vertical" Gap="4">
+    <TextBlock Margin="2" Classes="h1">Numeric up-down control</TextBlock>
+    <TextBlock Margin="2" Classes="h2" TextWrapping="Wrap">Numeric up-down control provides a TextBox with button spinners that allow incrementing and decrementing numeric values by using the spinner buttons, keyboard up/down arrows, or mouse wheel.</TextBlock>
+
+    <TextBlock Margin="2,5,2,2" FontSize="14" FontWeight="Bold">Features:</TextBlock>
+    <Grid Margin="2" ColumnDefinitions="Auto,Auto,Auto,Auto" RowDefinitions="Auto,Auto">
+      <Grid Grid.Row="0" Grid.Column="0" ColumnDefinitions="Auto, Auto" RowDefinitions="35,35,35,35,35">
+        <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="2">ShowButtonSpinner:</TextBlock>
+        <CheckBox Grid.Row="0" Grid.Column="1" IsChecked="{Binding #upDown.ShowButtonSpinner}" VerticalAlignment="Center" Margin="2"/>
+
+        <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Margin="2">IsReadOnly:</TextBlock>
+        <CheckBox Grid.Row="1" Grid.Column="1" IsChecked="{Binding #upDown.IsReadOnly}" VerticalAlignment="Center" Margin="2"/>
+
+        <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="2">AllowSpin:</TextBlock>
+        <CheckBox Grid.Row="2" Grid.Column="1" IsChecked="{Binding #upDown.AllowSpin}" IsEnabled="{Binding #upDown.!IsReadOnly}" VerticalAlignment="Center" Margin="2"/>
+
+        <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="2">ClipValueToMinMax:</TextBlock>
+        <CheckBox Grid.Row="3" Grid.Column="1" IsChecked="{Binding #upDown.ClipValueToMinMax}" VerticalAlignment="Center" Margin="2"/>
+
+        <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="2">DisplayDefaultValueOnEmptyText:</TextBlock>
+        <CheckBox Grid.Row="4" Grid.Column="1" IsChecked="{Binding #upDown.DisplayDefaultValueOnEmptyText}" VerticalAlignment="Center" Margin="2"/>
+      </Grid>
+      <Grid Grid.Row="0" Grid.Column="1" Margin="10,2,2,2" ColumnDefinitions="Auto, 120" RowDefinitions="35,35,35,35,35">
+        <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="2">FormatString:</TextBlock>
+        <DropDown Grid.Row="0" Grid.Column="1" Items="{Binding Formats}" SelectedItem="{Binding SelectedFormat}"
+                  VerticalAlignment="Center" Margin="2">
+          <DropDown.ItemTemplate>
+            <DataTemplate>
+              <StackPanel Orientation="Horizontal" Gap="2">
+                <TextBlock Text="{Binding Name}"/>
+                <TextBlock Text="-"/>
+                <TextBlock Text="{Binding Value}"/>
+              </StackPanel>
+            </DataTemplate>
+          </DropDown.ItemTemplate>
+        </DropDown>
+
+        <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Margin="2">ButtonSpinnerLocation:</TextBlock>
+        <DropDown Grid.Row="1" Grid.Column="1" Items="{Binding SpinnerLocations}" SelectedItem="{Binding #upDown.ButtonSpinnerLocation}"
+                  VerticalAlignment="Center" Margin="2"/>
+
+        <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="2">CultureInfo:</TextBlock>
+        <DropDown Grid.Row="2" Grid.Column="1" Items="{Binding Cultures}" SelectedItem="{Binding #upDown.CultureInfo}"
+                  VerticalAlignment="Center" Margin="2"/>
+
+        <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="2">Watermark:</TextBlock>
+        <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding #upDown.Watermark}" VerticalAlignment="Center" Margin="2" />
+
+        <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="2">Text:</TextBlock>
+        <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding #upDown.Text}" VerticalAlignment="Center" Margin="2" />
+      </Grid>
+      <Grid Grid.Row="0" Grid.Column="2" Margin="10,2,2,2" RowDefinitions="35,35,35,35,35" ColumnDefinitions="Auto, 120">
+        <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Minimum:</TextBlock>
+        <NumericUpDown Grid.Row="0" Grid.Column="1" Value="{Binding #upDown.Minimum}"
+                       CultureInfo="{Binding #upDown.CultureInfo}" VerticalAlignment="Center" Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
+
+        <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Maximum:</TextBlock>
+        <NumericUpDown Grid.Row="1" Grid.Column="1" Value="{Binding #upDown.Maximum}"
+                       CultureInfo="{Binding #upDown.CultureInfo}" VerticalAlignment="Center" Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
+
+        <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Increment:</TextBlock>
+        <NumericUpDown Grid.Row="2" Grid.Column="1" Value="{Binding #upDown.Increment}" VerticalAlignment="Center"
+                       Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
+
+        <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Value:</TextBlock>
+        <NumericUpDown Grid.Row="3" Grid.Column="1" Value="{Binding #upDown.Value}" VerticalAlignment="Center"
+                       Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
+
+        <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">DefaultValue:</TextBlock>
+        <NumericUpDown Grid.Row="4" Grid.Column="1" Value="{Binding #upDown.DefaultValue}"
+                       VerticalAlignment="Center" Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
+
+      </Grid>
+    </Grid>
+
+    <StackPanel Margin="2,10,2,2" Orientation="Horizontal" Gap="10">
+      <TextBlock FontSize="14" FontWeight="Bold" VerticalAlignment="Center">Usage of NumericUpDown:</TextBlock>
+      <NumericUpDown Name="upDown" Minimum="0" Maximum="10" Increment="0.5"
+                     CultureInfo="en-US" VerticalAlignment="Center" Height="25" Width="100"
+                     Watermark="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
+    </StackPanel>
+
+  </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/NumbersPage.xaml.cs b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
similarity index 79%
rename from samples/ControlCatalog/Pages/NumbersPage.xaml.cs
rename to samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
index a68bdc3bcf..4e3da69ede 100644
--- a/samples/ControlCatalog/Pages/NumbersPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
@@ -10,9 +10,9 @@ using ReactiveUI;
 
 namespace ControlCatalog.Pages
 {
-    public class NumbersPage : UserControl
+    public class NumericUpDownPage : UserControl
     {
-        public NumbersPage()
+        public NumericUpDownPage()
         {
             this.InitializeComponent();
             var viewModel = new NumbersPageViewModel();
@@ -31,7 +31,6 @@ namespace ControlCatalog.Pages
         private IList<FormatObject> _formats;
         private FormatObject _selectedFormat;
         private IList<Location> _spinnerLocations;
-        private IList<AllowedSpecialValues> _allowedSpecialValues;
 
         public NumbersPageViewModel()
         {
@@ -80,22 +79,6 @@ namespace ControlCatalog.Pages
             new CultureInfo("cs-CZ")
         };
 
-        public IList<AllowedSpecialValues> AllowedSpecialValues
-        {
-            get
-            {
-                if (_allowedSpecialValues == null)
-                {
-                    _allowedSpecialValues = new List<AllowedSpecialValues>();
-                    foreach (AllowedSpecialValues value in Enum.GetValues(typeof(AllowedSpecialValues)))
-                    {
-                        _allowedSpecialValues.Add(value);
-                    }
-                }
-                return _allowedSpecialValues;
-            }
-        }
-
     public FormatObject SelectedFormat
         {
             get { return _selectedFormat; }
diff --git a/src/Avalonia.Controls/NumericUpDown/AllowedSpecialValues.cs b/src/Avalonia.Controls/NumericUpDown/AllowedSpecialValues.cs
deleted file mode 100644
index a4ec5ecdaf..0000000000
--- a/src/Avalonia.Controls/NumericUpDown/AllowedSpecialValues.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-namespace Avalonia.Controls
-{
-    [Flags]
-    public enum AllowedSpecialValues
-    {
-        None = 0,
-        NaN = 1,
-        PositiveInfinity = 2,
-        NegativeInfinity = 4,
-        AnyInfinity = PositiveInfinity | NegativeInfinity,
-        Any = NaN | AnyInfinity
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/NumericUpDown/ByteUpDown.cs b/src/Avalonia.Controls/NumericUpDown/ByteUpDown.cs
deleted file mode 100644
index 835abae773..0000000000
--- a/src/Avalonia.Controls/NumericUpDown/ByteUpDown.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace Avalonia.Controls
-{
-    /// <inheritdoc />
-    public class ByteUpDown : CommonNumericUpDown<byte>
-    {
-        /// <summary>
-        /// Initializes static members of the <see cref="ByteUpDown"/> class.
-        /// </summary>
-        static ByteUpDown() => UpdateMetadata(typeof(ByteUpDown), 1, byte.MinValue, byte.MaxValue);
-
-        /// <summary>
-        /// Initializes new instance of the <see cref="ByteUpDown"/> class.
-        /// </summary>
-        public ByteUpDown() : base(byte.TryParse, decimal.ToByte, (v1, v2) => v1 < v2, (v1, v2) => v1 > v2)
-        {
-        }
-
-        /// <inheritdoc />
-        protected override byte IncrementValue(byte value, byte increment) => (byte)(value + increment);
-
-        /// <inheritdoc />
-        protected override byte DecrementValue(byte value, byte increment) => (byte)(value - increment);
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/NumericUpDown/CommonNumericUpDown.cs b/src/Avalonia.Controls/NumericUpDown/CommonNumericUpDown.cs
deleted file mode 100644
index eed792d9dd..0000000000
--- a/src/Avalonia.Controls/NumericUpDown/CommonNumericUpDown.cs
+++ /dev/null
@@ -1,346 +0,0 @@
-using System;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Base class for controls that represents a TextBox with button spinners that allow incrementing and decrementing nullable numeric values.
-    /// </summary>
-    public abstract class CommonNumericUpDown<T> : NumericUpDown<T?> where T : struct, IFormattable, IComparable<T>
-    {
-        protected delegate bool FromText(string s, NumberStyles style, IFormatProvider provider, out T result);
-        protected delegate T FromDecimal(decimal d);
-
-        private readonly FromText _fromText;
-        private readonly FromDecimal _fromDecimal;
-        private readonly Func<T, T, bool> _fromLowerThan;
-        private readonly Func<T, T, bool> _fromGreaterThan;
-
-        private NumberStyles _parsingNumberStyle = NumberStyles.Any;
-
-        /// <summary>
-        /// Defines the <see cref="ParsingNumberStyle"/> property.
-        /// </summary>
-        public static readonly DirectProperty<CommonNumericUpDown<T>, NumberStyles> ParsingNumberStyleProperty =
-            AvaloniaProperty.RegisterDirect<CommonNumericUpDown<T>, NumberStyles>(nameof(ParsingNumberStyle),
-                updown => updown.ParsingNumberStyle, (updown, style) => updown.ParsingNumberStyle = style);
-
-
-        /// <summary>
-        /// Initializes new instance of the <see cref="CommonNumericUpDown{T}"/> class.
-        /// </summary>
-        /// <param name="fromText">Delegate to parse value from text.</param>
-        /// <param name="fromDecimal">Delegate to parse value from decimal.</param>
-        /// <param name="fromLowerThan">Delegate to compare if one value is lower than another.</param>
-        /// <param name="fromGreaterThan">Delegate to compare if one value is greater than another.</param>
-        protected CommonNumericUpDown(FromText fromText, FromDecimal fromDecimal, Func<T, T, bool> fromLowerThan, Func<T, T, bool> fromGreaterThan)
-        {
-            _fromText = fromText ?? throw new ArgumentNullException(nameof(fromText));
-            _fromDecimal = fromDecimal ?? throw new ArgumentNullException(nameof(fromDecimal));
-            _fromLowerThan = fromLowerThan ?? throw new ArgumentNullException(nameof(fromLowerThan));
-            _fromGreaterThan = fromGreaterThan ?? throw new ArgumentNullException(nameof(fromGreaterThan));
-        }
-
-        /// <summary>
-        /// Gets or sets the parsing style (AllowLeadingWhite, Float, AllowHexSpecifier, ...). By default, Any.
-        /// </summary>
-        public NumberStyles ParsingNumberStyle
-        {
-            get { return _parsingNumberStyle; }
-            set { SetAndRaise(ParsingNumberStyleProperty, ref _parsingNumberStyle, value); }
-        }
-
-        /// <inheritdoc />
-        protected override void OnIncrement()
-        {
-            if (!HandleNullSpin())
-            {
-                var result = IncrementValue(Value.Value, Increment.Value);
-                Value = CoerceValueMinMax(result);
-            }
-        }
-
-        /// <inheritdoc />
-        protected override void OnDecrement()
-        {
-            if (!HandleNullSpin())
-            {
-                var result = DecrementValue(Value.Value, Increment.Value);
-                Value = CoerceValueMinMax(result);
-            }
-        }
-
-        /// <inheritdoc />
-        protected override void OnMinimumChanged(T? oldValue, T? newValue)
-        {
-            base.OnMinimumChanged(oldValue, newValue);
-
-            if (Value.HasValue && ClipValueToMinMax)
-            {
-                Value = CoerceValueMinMax(Value.Value);
-            }
-        }
-
-        /// <inheritdoc />
-        protected override void OnMaximumChanged(T? oldValue, T? newValue)
-        {
-            base.OnMaximumChanged(oldValue, newValue);
-
-            if (Value.HasValue && ClipValueToMinMax)
-            {
-                Value = CoerceValueMinMax(Value.Value);
-            }
-        }
-
-        /// <inheritdoc />
-        protected override T? ConvertTextToValue(string text)
-        {
-            T? result = null;
-
-            if (string.IsNullOrEmpty(text))
-            {
-                return result;
-            }
-
-            // Since the conversion from Value to text using a FormartString may not be parsable,
-            // we verify that the already existing text is not the exact same value.
-            var currentValueText = ConvertValueToText();
-            if (Equals(currentValueText, text))
-            {
-                return Value;
-            }
-
-            result = ConvertTextToValueCore(currentValueText, text);
-
-            if (ClipValueToMinMax)
-            {
-                return GetClippedMinMaxValue(result);
-            }
-
-            ValidateDefaultMinMax(result);
-
-            return result;
-        }
-
-        /// <inheritdoc />
-        protected override string ConvertValueToText()
-        {
-            if (Value == null)
-            {
-                return string.Empty;
-            }
-
-            //Manage FormatString of type "{}{0:N2} °" (in xaml) or "{0:N2} °" in code-behind.
-            if (FormatString.Contains("{0"))
-            {
-                return string.Format(CultureInfo, FormatString, Value.Value);
-            }
-
-            return Value.Value.ToString(FormatString, CultureInfo);
-        }
-
-        /// <inheritdoc />
-        protected override void SetValidSpinDirection()
-        {
-            var validDirections = ValidSpinDirections.None;
-
-            // Null increment always prevents spin.
-            if (Increment != null && !IsReadOnly)
-            {
-                if (IsLowerThan(Value, Maximum) || !Value.HasValue || !Maximum.HasValue)
-                {
-                    validDirections = validDirections | ValidSpinDirections.Increase;
-                }
-
-                if (IsGreaterThan(Value, Minimum) || !Value.HasValue || !Minimum.HasValue)
-                {
-                    validDirections = validDirections | ValidSpinDirections.Decrease;
-                }
-            }
-
-            if (Spinner != null)
-            {
-                Spinner.ValidSpinDirection = validDirections;
-            }
-        }
-
-        /// <summary>
-        /// Checks if provided value is within allowed values.
-        /// </summary>
-        /// <param name="allowedValues">The alowed values.</param>
-        /// <param name="valueToCompare">The value to check.</param>
-        protected void TestInputSpecialValue(AllowedSpecialValues allowedValues, AllowedSpecialValues valueToCompare)
-        {
-            if ((allowedValues & valueToCompare) != valueToCompare)
-            {
-                switch (valueToCompare)
-                {
-                    case AllowedSpecialValues.NaN:
-                        throw new InvalidDataException("Value to parse shouldn't be NaN.");
-                    case AllowedSpecialValues.PositiveInfinity:
-                        throw new InvalidDataException("Value to parse shouldn't be Positive Infinity.");
-                    case AllowedSpecialValues.NegativeInfinity:
-                        throw new InvalidDataException("Value to parse shouldn't be Negative Infinity.");
-                }
-            }
-        }
-
-        protected static void UpdateMetadata(Type type, T? increment, T? minimun, T? maximum)
-        {
-            IncrementProperty.OverrideDefaultValue(type, increment);
-            MinimumProperty.OverrideDefaultValue(type, minimun);
-            MaximumProperty.OverrideDefaultValue(type, maximum);
-        }
-
-        protected abstract T IncrementValue(T value, T increment);
-
-        protected abstract T DecrementValue(T value, T increment);
-
-        private bool IsLowerThan(T? value1, T? value2)
-        {
-            if (value1 == null || value2 == null)
-            {
-                return false;
-            }
-            return _fromLowerThan(value1.Value, value2.Value);
-        }
-
-        private bool IsGreaterThan(T? value1, T? value2)
-        {
-            if (value1 == null || value2 == null)
-            {
-                return false;
-            }
-            return _fromGreaterThan(value1.Value, value2.Value);
-        }
-
-        private bool HandleNullSpin()
-        {
-            if (!Value.HasValue)
-            {
-                var forcedValue = DefaultValue ?? default(T);
-                Value = CoerceValueMinMax(forcedValue);
-                return true;
-            }
-            else if (!Increment.HasValue)
-            {
-                return true;
-            }
-            return false;
-        }
-
-        internal bool IsValid(T? value)
-        {
-            return !IsLowerThan(value, Minimum) && !IsGreaterThan(value, Maximum);
-        }
-
-        private T? CoerceValueMinMax(T value)
-        {
-            if (IsLowerThan(value, Minimum))
-            {
-                return Minimum;
-            }
-            else if (IsGreaterThan(value, Maximum))
-            {
-                return Maximum;
-            }
-            else
-            {
-                return value;
-            }
-        }
-
-        private bool IsPercent(string stringToTest)
-        {
-            var PIndex = stringToTest.IndexOf("P", StringComparison.Ordinal);
-            if (PIndex >= 0)
-            {
-                //stringToTest contains a "P" between 2 "'", it's considered as text, not percent
-                var isText = stringToTest.Substring(0, PIndex).Contains("'")
-                             && stringToTest.Substring(PIndex, FormatString.Length - PIndex).Contains("'");
-
-                return !isText;
-            }
-            return false;
-        }
-
-        private T? ConvertTextToValueCore(string currentValueText, string text)
-        {
-            T? result;
-
-            if (IsPercent(FormatString))
-            {
-                result = _fromDecimal(ParsePercent(text, CultureInfo));
-            }
-            else
-            {
-                // Problem while converting new text
-                if (!_fromText(text, ParsingNumberStyle, CultureInfo, out T outputValue))
-                {
-                    var shouldThrow = true;
-
-                    // Check if CurrentValueText is also failing => it also contains special characters. ex : 90°
-                    if (!_fromText(currentValueText, ParsingNumberStyle, CultureInfo, out T _))
-                    {
-                        // extract non-digit characters
-                        var currentValueTextSpecialCharacters = currentValueText.Where(c => !char.IsDigit(c));
-                        var textSpecialCharacters = text.Where(c => !char.IsDigit(c));
-                        // same non-digit characters on currentValueText and new text => remove them on new Text to parse it again.
-                        if (currentValueTextSpecialCharacters.Except(textSpecialCharacters).ToList().Count == 0)
-                        {
-                            foreach (var character in textSpecialCharacters)
-                            {
-                                text = text.Replace(character.ToString(), string.Empty);
-                            }
-                            // if without the special characters, parsing is good, do not throw
-                            if (_fromText(text, ParsingNumberStyle, CultureInfo, out outputValue))
-                            {
-                                shouldThrow = false;
-                            }
-                        }
-                    }
-
-                    if (shouldThrow)
-                    {
-                        throw new InvalidDataException("Input string was not in a correct format.");
-                    }
-                }
-                result = outputValue;
-            }
-            return result;
-        }
-
-        private T? GetClippedMinMaxValue(T? result)
-        {
-            if (IsGreaterThan(result, Maximum))
-            {
-                return Maximum;
-            }
-            else if (IsLowerThan(result, Minimum))
-            {
-                return Minimum;
-            }
-            return result;
-        }
-
-        private void ValidateDefaultMinMax(T? value)
-        {
-            // DefaultValue is always accepted.
-            if (Equals(value, DefaultValue))
-            {
-                return;
-            }
-
-            if (IsLowerThan(value, Minimum))
-            {
-                throw new ArgumentOutOfRangeException(nameof(Minimum), string.Format("Value must be greater than Minimum value of {0}", Minimum));
-            }
-            else if (IsGreaterThan(value, Maximum))
-            {
-                throw new ArgumentOutOfRangeException(nameof(Maximum), string.Format("Value must be less than Maximum value of {0}", Maximum));
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/NumericUpDown/DecimalUpDown.cs b/src/Avalonia.Controls/NumericUpDown/DecimalUpDown.cs
deleted file mode 100644
index 10cfa537d7..0000000000
--- a/src/Avalonia.Controls/NumericUpDown/DecimalUpDown.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace Avalonia.Controls
-{
-    /// <inheritdoc />
-    public class DecimalUpDown : CommonNumericUpDown<decimal>
-    {
-        /// <summary>
-        /// Initializes static members of the <see cref="DecimalUpDown"/> class.
-        /// </summary>
-        static DecimalUpDown() => UpdateMetadata(typeof(DecimalUpDown), 1m, decimal.MinValue, decimal.MaxValue);
-
-        /// <summary>
-        /// Initializes new instance of the <see cref="DecimalUpDown"/> class.
-        /// </summary>
-        public DecimalUpDown() : base(decimal.TryParse, d => d, (v1, v2) => v1 < v2, (v1, v2) => v1 > v2)
-        {
-        }
-
-        /// <inheritdoc />
-        protected override decimal IncrementValue(decimal value, decimal increment) => value + increment;
-
-        /// <inheritdoc />
-        protected override decimal DecrementValue(decimal value, decimal increment) => value - increment;
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/NumericUpDown/DoubleUpDown.cs b/src/Avalonia.Controls/NumericUpDown/DoubleUpDown.cs
deleted file mode 100644
index edee1247fb..0000000000
--- a/src/Avalonia.Controls/NumericUpDown/DoubleUpDown.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System;
-
-namespace Avalonia.Controls
-{
-    /// <inheritdoc />
-    public class DoubleUpDown : CommonNumericUpDown<double>
-    {
-        /// <summary>
-        /// Defines the <see cref="AllowInputSpecialValues"/> property.
-        /// </summary>
-        public static readonly DirectProperty<DoubleUpDown, AllowedSpecialValues> AllowInputSpecialValuesProperty =
-            AvaloniaProperty.RegisterDirect<DoubleUpDown, AllowedSpecialValues>(nameof(AllowInputSpecialValues),
-                updown => updown.AllowInputSpecialValues, (updown, v) => updown.AllowInputSpecialValues = v);
-
-        private AllowedSpecialValues _allowInputSpecialValues;
-
-        /// <summary>
-        /// Initializes static members of the <see cref="DoubleUpDown"/> class.
-        /// </summary>
-        static DoubleUpDown() => UpdateMetadata(typeof(DoubleUpDown), 1d, double.NegativeInfinity, double.PositiveInfinity);
-
-        /// <summary>
-        /// Initializes new instance of the <see cref="DoubleUpDown"/> class.
-        /// </summary>
-        public DoubleUpDown() : base(double.TryParse, decimal.ToDouble, (v1, v2) => v1 < v2, (v1, v2) => v1 > v2)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets a value representing the special values the user is allowed to input, such as "Infinity", "-Infinity" and "NaN" values.
-        /// </summary>
-        public AllowedSpecialValues AllowInputSpecialValues
-        {
-            get { return _allowInputSpecialValues; }
-            set { SetAndRaise(AllowInputSpecialValuesProperty, ref _allowInputSpecialValues, value); }
-        }
-
-        /// <inheritdoc />
-        protected override double IncrementValue(double value, double increment) => value + increment;
-
-        /// <inheritdoc />
-        protected override double DecrementValue(double value, double increment) => value - increment;
-
-        /// <inheritdoc />
-        protected override double? OnCoerceIncrement(double? baseValue)
-        {
-            if (baseValue.HasValue && double.IsNaN(baseValue.Value))
-            {
-                throw new ArgumentException("NaN is invalid for Increment.");
-            }
-            return base.OnCoerceIncrement(baseValue);
-        }
-
-        /// <inheritdoc />
-        protected override double? OnCoerceMaximum(double? baseValue)
-        {
-            if (baseValue.HasValue && double.IsNaN(baseValue.Value))
-            {
-                throw new ArgumentException("NaN is invalid for Maximum.");
-            }
-            return base.OnCoerceMaximum(baseValue);
-        }
-
-        /// <inheritdoc />
-        protected override double? OnCoerceMinimum(double? baseValue)
-        {
-            if (baseValue.HasValue && double.IsNaN(baseValue.Value))
-            {
-                throw new ArgumentException("NaN is invalid for Minimum.");
-            }
-            return base.OnCoerceMinimum(baseValue);
-        }
-
-        /// <inheritdoc />
-        protected override void SetValidSpinDirection()
-        {
-            if (Value.HasValue && double.IsInfinity(Value.Value) && (Spinner != null))
-            {
-                Spinner.ValidSpinDirection = ValidSpinDirections.None;
-            }
-            else
-            {
-                base.SetValidSpinDirection();
-            }
-        }
-
-        /// <inheritdoc />
-        protected override double? ConvertTextToValue(string text)
-        {
-            var result = base.ConvertTextToValue(text);
-            if (result != null)
-            {
-                if (double.IsNaN(result.Value))
-                {
-                    TestInputSpecialValue(AllowInputSpecialValues, AllowedSpecialValues.NaN);
-                }
-                else if (double.IsPositiveInfinity(result.Value))
-                {
-                    TestInputSpecialValue(AllowInputSpecialValues, AllowedSpecialValues.PositiveInfinity);
-                }
-                else if (double.IsNegativeInfinity(result.Value))
-                {
-                    TestInputSpecialValue(AllowInputSpecialValues, AllowedSpecialValues.NegativeInfinity);
-                }
-            }
-            return result;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/NumericUpDown/IntegerUpDown.cs b/src/Avalonia.Controls/NumericUpDown/IntegerUpDown.cs
deleted file mode 100644
index 7f9e05762c..0000000000
--- a/src/Avalonia.Controls/NumericUpDown/IntegerUpDown.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace Avalonia.Controls
-{
-    /// <inheritdoc />
-    public class IntegerUpDown : CommonNumericUpDown<int>
-    {
-        /// <summary>
-        /// Initializes static members of the <see cref="IntegerUpDown"/> class.
-        /// </summary>
-        static IntegerUpDown() => UpdateMetadata(typeof(IntegerUpDown), 1, int.MinValue, int.MaxValue);
-
-        /// <summary>
-        /// Initializes new instance of the <see cref="IntegerUpDown"/> class.
-        /// </summary>
-        public IntegerUpDown() : base(int.TryParse, decimal.ToInt32, (v1, v2) => v1 < v2, (v1, v2) => v1 > v2)
-        {
-        }
-
-        /// <inheritdoc />
-        protected override int IncrementValue(int value, int increment) => value + increment;
-
-        /// <inheritdoc />
-        protected override int DecrementValue(int value, int increment) => value - increment;
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/NumericUpDown/LongUpDown.cs b/src/Avalonia.Controls/NumericUpDown/LongUpDown.cs
deleted file mode 100644
index d116df0ad2..0000000000
--- a/src/Avalonia.Controls/NumericUpDown/LongUpDown.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace Avalonia.Controls
-{
-    /// <inheritdoc />
-    public class LongUpDown : CommonNumericUpDown<long>
-    {
-        /// <summary>
-        /// Initializes static members of the <see cref="LongUpDown"/> class.
-        /// </summary>
-        static LongUpDown() => UpdateMetadata(typeof(LongUpDown), 1L, long.MinValue, long.MaxValue);
-
-        /// <summary>
-        /// Initializes new instance of the <see cref="LongUpDown"/> class.
-        /// </summary>
-        public LongUpDown() : base(long.TryParse, decimal.ToInt64, (v1, v2) => v1 < v2, (v1, v2) => v1 > v2)
-        {
-        }
-
-        /// <inheritdoc />
-        protected override long IncrementValue(long value, long increment) => value + increment;
-
-        /// <inheritdoc />
-        protected override long DecrementValue(long value, long increment) => value - increment;
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
index 402dec7284..67c0827155 100644
--- a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
+++ b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
@@ -1,36 +1,207 @@
 using System;
 using System.Globalization;
+using System.IO;
+using System.Linq;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Threading;
 
 namespace Avalonia.Controls
 {
     /// <summary>
-    /// Base class for controls that represents a TextBox with button spinners that allow incrementing and decrementing numeric values.
+    /// Control that represents a TextBox with button spinners that allow incrementing and decrementing numeric values.
     /// </summary>
-    public abstract class NumericUpDown<T> : UpDownBase<T>
+    public class NumericUpDown : TemplatedControl
     {
+        /// <summary>
+        /// Defines the <see cref="AllowSpin"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> AllowSpinProperty =
+            ButtonSpinner.AllowSpinProperty.AddOwner<NumericUpDown>();
+
+        /// <summary>
+        /// Defines the <see cref="ButtonSpinnerLocation"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Location> ButtonSpinnerLocationProperty =
+            ButtonSpinner.ButtonSpinnerLocationProperty.AddOwner<NumericUpDown>();
+
+        /// <summary>
+        /// Defines the <see cref="ShowButtonSpinner"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> ShowButtonSpinnerProperty =
+            ButtonSpinner.ShowButtonSpinnerProperty.AddOwner<NumericUpDown>();
+
+        /// <summary>
+        /// Defines the <see cref="ClipValueToMinMax"/> property.
+        /// </summary>
+        public static readonly DirectProperty<NumericUpDown, bool> ClipValueToMinMaxProperty =
+            AvaloniaProperty.RegisterDirect<NumericUpDown, bool>(nameof(ClipValueToMinMax),
+                updown => updown.ClipValueToMinMax, (updown, b) => updown.ClipValueToMinMax = b);
+
+        /// <summary>
+        /// Defines the <see cref="CultureInfo"/> property.
+        /// </summary>
+        public static readonly DirectProperty<NumericUpDown, CultureInfo> CultureInfoProperty =
+            AvaloniaProperty.RegisterDirect<NumericUpDown, CultureInfo>(nameof(CultureInfo), o => o.CultureInfo,
+                (o, v) => o.CultureInfo = v, CultureInfo.CurrentCulture);
+
+        /// <summary>
+        /// Defines the <see cref="DefaultValue"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double?> DefaultValueProperty =
+            AvaloniaProperty.Register<NumericUpDown, double?>(nameof(DefaultValue));
+
+        /// <summary>
+        /// Defines the <see cref="DisplayDefaultValueOnEmptyText"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> DisplayDefaultValueOnEmptyTextProperty =
+            AvaloniaProperty.Register<NumericUpDown, bool>(nameof(DisplayDefaultValueOnEmptyText));
+
         /// <summary>
         /// Defines the <see cref="FormatString"/> property.
         /// </summary>
         public static readonly StyledProperty<string> FormatStringProperty =
-            AvaloniaProperty.Register<NumericUpDown<T>, string>(nameof(FormatString), string.Empty);
+            AvaloniaProperty.Register<NumericUpDown, string>(nameof(FormatString), string.Empty);
 
         /// <summary>
         /// Defines the <see cref="Increment"/> property.
         /// </summary>
-        public static readonly StyledProperty<T> IncrementProperty =
-            AvaloniaProperty.Register<NumericUpDown<T>, T>(nameof(Increment), default(T), validate: OnCoerceIncrement);
+        public static readonly StyledProperty<double> IncrementProperty =
+            AvaloniaProperty.Register<NumericUpDown, double>(nameof(Increment), 1.0d, validate: OnCoerceIncrement);
 
         /// <summary>
-        /// Initializes static members of the <see cref="NumericUpDown{T}"/> class.
+        /// Defines the <see cref="IsReadOnly"/> property.
         /// </summary>
-        static NumericUpDown()
+        public static readonly StyledProperty<bool> IsReadOnlyProperty =
+            AvaloniaProperty.Register<NumericUpDown, bool>(nameof(IsReadOnly));
+
+        /// <summary>
+        /// Defines the <see cref="Maximum"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MaximumProperty =
+            AvaloniaProperty.Register<NumericUpDown, double>(nameof(Maximum), double.MaxValue, validate: OnCoerceMaximum);
+
+        /// <summary>
+        /// Defines the <see cref="Minimum"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MinimumProperty =
+            AvaloniaProperty.Register<NumericUpDown, double>(nameof(Minimum), double.MinValue, validate: OnCoerceMinimum);
+
+        /// <summary>
+        /// Defines the <see cref="ParsingNumberStyle"/> property.
+        /// </summary>
+        public static readonly DirectProperty<NumericUpDown, NumberStyles> ParsingNumberStyleProperty =
+            AvaloniaProperty.RegisterDirect<NumericUpDown, NumberStyles>(nameof(ParsingNumberStyle),
+                updown => updown.ParsingNumberStyle, (updown, style) => updown.ParsingNumberStyle = style);
+
+        /// <summary>
+        /// Defines the <see cref="Text"/> property.
+        /// </summary>
+        public static readonly DirectProperty<NumericUpDown, string> TextProperty =
+            AvaloniaProperty.RegisterDirect<NumericUpDown, string>(nameof(Text), o => o.Text, (o, v) => o.Text = v,
+                defaultBindingMode: BindingMode.TwoWay);
+
+        /// <summary>
+        /// Defines the <see cref="Value"/> property.
+        /// </summary>
+        public static readonly DirectProperty<NumericUpDown, double?> ValueProperty =
+            AvaloniaProperty.RegisterDirect<NumericUpDown, double?>(nameof(Value), updown => updown.Value,
+                (updown, v) => updown.Value = v, defaultBindingMode: BindingMode.TwoWay);
+
+        /// <summary>
+        /// Defines the <see cref="Watermark"/> property.
+        /// </summary>
+        public static readonly StyledProperty<string> WatermarkProperty =
+            AvaloniaProperty.Register<NumericUpDown, string>(nameof(Watermark));
+
+        private IDisposable _textBoxTextChangedSubscription;
+
+        private double? _value;
+        private string _text;
+        private bool _internalValueSet;
+        private bool _clipValueToMinMax;
+        private bool _isSyncingTextAndValueProperties;
+        private bool _isTextChangedFromUI;
+        private CultureInfo _cultureInfo;
+        private NumberStyles _parsingNumberStyle = NumberStyles.Any;
+        
+        /// <summary>
+        /// Gets the Spinner template part.
+        /// </summary>
+        private Spinner Spinner { get; set; }
+
+        /// <summary>
+        /// Gets the TextBox template part.
+        /// </summary>
+        private TextBox TextBox { get; set; }
+
+        /// <summary>
+        /// Gets or sets the ability to perform increment/decrement operations via the keyboard, button spinners, or mouse wheel.
+        /// </summary>
+        public bool AllowSpin
         {
-            FormatStringProperty.Changed.Subscribe(FormatStringChanged);
-            IncrementProperty.Changed.Subscribe(IncrementChanged);
+            get { return GetValue(AllowSpinProperty); }
+            set { SetValue(AllowSpinProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets current location of the <see cref="ButtonSpinner"/>.
+        /// </summary>
+        public Location ButtonSpinnerLocation
+        {
+            get { return GetValue(ButtonSpinnerLocationProperty); }
+            set { SetValue(ButtonSpinnerLocationProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the spin buttons should be shown.
+        /// </summary>
+        public bool ShowButtonSpinner
+        {
+            get { return GetValue(ShowButtonSpinnerProperty); }
+            set { SetValue(ShowButtonSpinnerProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets if the value should be clipped when minimum/maximum is reached.
+        /// </summary>
+        public bool ClipValueToMinMax
+        {
+            get { return _clipValueToMinMax; }
+            set { SetAndRaise(ClipValueToMinMaxProperty, ref _clipValueToMinMax, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the current CultureInfo.
+        /// </summary>
+        public CultureInfo CultureInfo
+        {
+            get { return _cultureInfo; }
+            set { SetAndRaise(CultureInfoProperty, ref _cultureInfo, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the value to use when the <see cref="Value"/> is null and an increment/decrement operation is performed.
+        /// </summary>
+        public double? DefaultValue
+        {
+            get { return GetValue(DefaultValueProperty); }
+            set { SetValue(DefaultValueProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets if the defaultValue should be displayed when the Text is empty.
+        /// </summary>
+        public bool DisplayDefaultValueOnEmptyText
+        {
+            get { return GetValue(DisplayDefaultValueOnEmptyTextProperty); }
+            set { SetValue(DisplayDefaultValueOnEmptyTextProperty, value); }
         }
 
         /// <summary>
-        /// Gets or sets the display format of the <see cref="UpDownBase{T}.Value"/>.
+        /// Gets or sets the display format of the <see cref="Value"/>.
         /// </summary>
         public string FormatString
         {
@@ -39,14 +210,196 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Gets or sets the amount in which to increment the <see cref="UpDownBase{T}.Value"/>.
+        /// Gets or sets the amount in which to increment the <see cref="Value"/>.
         /// </summary>
-        public T Increment
+        public double Increment
         {
             get { return GetValue(IncrementProperty); }
             set { SetValue(IncrementProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets if the control is read only.
+        /// </summary>
+        public bool IsReadOnly
+        {
+            get { return GetValue(IsReadOnlyProperty); }
+            set { SetValue(IsReadOnlyProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum allowed value.
+        /// </summary>
+        public double Maximum
+        {
+            get { return GetValue(MaximumProperty); }
+            set { SetValue(MaximumProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum allowed value.
+        /// </summary>
+        public double Minimum
+        {
+            get { return GetValue(MinimumProperty); }
+            set { SetValue(MinimumProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the parsing style (AllowLeadingWhite, Float, AllowHexSpecifier, ...). By default, Any.
+        /// </summary>
+        public NumberStyles ParsingNumberStyle
+        {
+            get { return _parsingNumberStyle; }
+            set { SetAndRaise(ParsingNumberStyleProperty, ref _parsingNumberStyle, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the formatted string representation of the value.
+        /// </summary>
+        public string Text
+        {
+            get { return _text; }
+            set { SetAndRaise(TextProperty, ref _text, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the value.
+        /// </summary>
+        public double? Value
+        {
+            get { return _value; }
+            set
+            {
+                value = OnCoerceValue(value);
+                SetAndRaise(ValueProperty, ref _value, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the object to use as a watermark if the <see cref="Value"/> is null.
+        /// </summary>
+        public string Watermark
+        {
+            get { return GetValue(WatermarkProperty); }
+            set { SetValue(WatermarkProperty, value); }
+        }
+
+        /// <summary>
+        /// Initializes new instance of <see cref="NumericUpDown"/> class.
+        /// </summary>
+        public NumericUpDown()
+        {
+            Initialized += (sender, e) =>
+            {
+                if (!_internalValueSet && IsInitialized)
+                {
+                    SyncTextAndValueProperties(false, null, true);
+                }
+
+                SetValidSpinDirection();
+            };
+        }
+
+        /// <summary>
+        /// Initializes static members of the <see cref="NumericUpDown"/> class.
+        /// </summary>
+        static NumericUpDown()
+        {
+            CultureInfoProperty.Changed.Subscribe(OnCultureInfoChanged);
+            DefaultValueProperty.Changed.Subscribe(OnDefaultValueChanged);
+            DisplayDefaultValueOnEmptyTextProperty.Changed.Subscribe(OnDisplayDefaultValueOnEmptyTextChanged);
+            FormatStringProperty.Changed.Subscribe(FormatStringChanged);
+            IncrementProperty.Changed.Subscribe(IncrementChanged);
+            IsReadOnlyProperty.Changed.Subscribe(OnIsReadOnlyChanged);
+            MaximumProperty.Changed.Subscribe(OnMaximumChanged);
+            MinimumProperty.Changed.Subscribe(OnMinimumChanged);
+            TextProperty.Changed.Subscribe(OnTextChanged);
+            ValueProperty.Changed.Subscribe(OnValueChanged);
+        }
+
+        /// <inheritdoc />
+        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        {
+            if (TextBox != null)
+            {
+                TextBox.PointerPressed -= TextBoxOnPointerPressed;
+                _textBoxTextChangedSubscription?.Dispose();
+            }
+            TextBox = e.NameScope.Find<TextBox>("PART_TextBox");
+            if (TextBox != null)
+            {
+                TextBox.Text = Text;
+                TextBox.PointerPressed += TextBoxOnPointerPressed;
+                _textBoxTextChangedSubscription = TextBox.GetObservable(TextBox.TextProperty).Subscribe(txt => TextBoxOnTextChanged());
+            }
+
+            if (Spinner != null)
+            {
+                Spinner.Spin -= OnSpinnerSpin;
+            }
+
+            Spinner = e.NameScope.Find<Spinner>("PART_Spinner");
+
+            if (Spinner != null)
+            {
+                Spinner.Spin += OnSpinnerSpin;
+            }
+
+            SetValidSpinDirection();
+        }
+
+        /// <inheritdoc />
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            switch (e.Key)
+            {
+                case Key.Enter:
+                    var commitSuccess = CommitInput();
+                    e.Handled = !commitSuccess;
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="CultureInfo"/> property value changed.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnCultureInfoChanged(CultureInfo oldValue, CultureInfo newValue)
+        {
+            if (IsInitialized)
+            {
+                SyncTextAndValueProperties(false, null);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="DefaultValue"/> property value changed.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnDefaultValueChanged(double oldValue, double newValue)
+        {
+            if (IsInitialized && string.IsNullOrEmpty(Text))
+            {
+                SyncTextAndValueProperties(true, Text);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="DisplayDefaultValueOnEmptyText"/> property value changed.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnDisplayDefaultValueOnEmptyTextChanged(bool oldValue, bool newValue)
+        {
+            if (IsInitialized && string.IsNullOrEmpty(Text))
+            {
+                SyncTextAndValueProperties(false, Text);
+            }
+        }
+
         /// <summary>
         /// Called when the <see cref="FormatString"/> property value changed.
         /// </summary>
@@ -65,7 +418,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="oldValue">The old value.</param>
         /// <param name="newValue">The new value.</param>
-        protected virtual void OnIncrementChanged(T oldValue, T newValue)
+        protected virtual void OnIncrementChanged(double oldValue, double newValue)
         {
             if (IsInitialized)
             {
@@ -74,59 +427,739 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Called when the <see cref="Increment"/> property has to be coerced.
+        /// Called when the <see cref="IsReadOnly"/> property value changed.
         /// </summary>
-        /// <param name="baseValue">The value.</param>
-        protected virtual T OnCoerceIncrement(T baseValue)
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnIsReadOnlyChanged(bool oldValue, bool newValue)
         {
-            return baseValue;
+            SetValidSpinDirection();
         }
 
         /// <summary>
-        /// Called when the <see cref="Increment"/> property value changed.
+        /// Called when the <see cref="Maximum"/> property value changed.
         /// </summary>
-        /// <param name="e">The event args.</param>
-        private static void IncrementChanged(AvaloniaPropertyChangedEventArgs e)
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnMaximumChanged(double oldValue, double newValue)
         {
-            if (e.Sender is NumericUpDown<T> upDown)
+            if (IsInitialized)
             {
-                var oldValue = (T)e.OldValue;
-                var newValue = (T)e.NewValue;
-                upDown.OnIncrementChanged(oldValue, newValue);
+                SetValidSpinDirection();
+            }
+            if (Value.HasValue && ClipValueToMinMax)
+            {
+                Value = CoerceValueMinMax(Value.Value);
             }
         }
 
         /// <summary>
-        /// Called when the <see cref="FormatString"/> property value changed.
+        /// Called when the <see cref="Minimum"/> property value changed.
         /// </summary>
-        /// <param name="e">The event args.</param>
-        private static void FormatStringChanged(AvaloniaPropertyChangedEventArgs e)
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnMinimumChanged(double oldValue, double newValue)
         {
-            if (e.Sender is NumericUpDown<T> upDown)
+            if (IsInitialized)
             {
-                var oldValue = (string) e.OldValue;
-                var newValue = (string) e.NewValue;
-                upDown.OnFormatStringChanged(oldValue, newValue);
+                SetValidSpinDirection();
+            }
+            if (Value.HasValue && ClipValueToMinMax)
+            {
+                Value = CoerceValueMinMax(Value.Value);
             }
         }
 
-        private static T OnCoerceIncrement(NumericUpDown<T> numericUpDown, T value)
+        /// <summary>
+        /// Called when the <see cref="Text"/> property value changed.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnTextChanged(string oldValue, string newValue)
         {
-            return numericUpDown.OnCoerceIncrement(value);
+            if (IsInitialized)
+            {
+                SyncTextAndValueProperties(true, Text);
+            }
         }
 
         /// <summary>
-        /// Parse percent format text
+        /// Called when the <see cref="Value"/> property value changed.
         /// </summary>
-        /// <param name="text">Text to parse.</param>
-        /// <param name="cultureInfo">The culture info.</param>
-        protected static decimal ParsePercent(string text, IFormatProvider cultureInfo)
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void OnValueChanged(double? oldValue, double? newValue)
         {
-            var info = NumberFormatInfo.GetInstance(cultureInfo);
-            text = text.Replace(info.PercentSymbol, null);
-            var result = decimal.Parse(text, NumberStyles.Any, info);
-            result = result / 100;
-            return result;
+            if (!_internalValueSet && IsInitialized)
+            {
+                SyncTextAndValueProperties(false, null, true);
+            }
+
+            SetValidSpinDirection();
+
+            RaiseValueChangedEvent(oldValue, newValue);
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Increment"/> property has to be coerced.
+        /// </summary>
+        /// <param name="baseValue">The value.</param>
+        protected virtual double OnCoerceIncrement(double baseValue)
+        {
+            return baseValue;
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Maximum"/> property has to be coerced.
+        /// </summary>
+        /// <param name="baseValue">The value.</param>
+        protected virtual double OnCoerceMaximum(double baseValue)
+        {
+            return baseValue;
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Minimum"/> property has to be coerced.
+        /// </summary>
+        /// <param name="baseValue">The value.</param>
+        protected virtual double OnCoerceMinimum(double baseValue)
+        {
+            return baseValue;
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Value"/> property has to be coerced.
+        /// </summary>
+        /// <param name="baseValue">The value.</param>
+        protected virtual double? OnCoerceValue(double? baseValue)
+        {
+            return baseValue;
+        }
+
+        /// <summary>
+        /// Raises the OnSpin event when spinning is initiated by the end-user.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnSpin(SpinEventArgs e)
+        {
+            if (e == null)
+            {
+                throw new ArgumentNullException("e");
+            }
+
+            var handler = Spinned;
+            handler?.Invoke(this, e);
+
+            if (e.Direction == SpinDirection.Increase)
+            {
+                DoIncrement();
+            }
+            else
+            {
+                DoDecrement();
+            }
+        }
+
+        /// <summary>
+        /// Raises the <see cref="ValueChanged"/> event.
+        /// </summary>
+        /// <param name="oldValue">The old value.</param>
+        /// <param name="newValue">The new value.</param>
+        protected virtual void RaiseValueChangedEvent(double? oldValue, double? newValue)
+        {
+            var e = new NumericUpDownValueChangedEventArgs(ValueChangedEvent, oldValue, newValue);
+            RaiseEvent(e);
+        }
+
+        /// <summary>
+        /// Converts the formatted text to a value.
+        /// </summary>
+        private double? ConvertTextToValue(string text)
+        {
+            double? result = null;
+
+            if (string.IsNullOrEmpty(text))
+            {
+                return result;
+            }
+
+            // Since the conversion from Value to text using a FormartString may not be parsable,
+            // we verify that the already existing text is not the exact same value.
+            var currentValueText = ConvertValueToText();
+            if (Equals(currentValueText, text))
+            {
+                return Value;
+            }
+
+            result = ConvertTextToValueCore(currentValueText, text);
+
+            if (ClipValueToMinMax)
+            {
+                return GetClippedMinMaxValue(result);
+            }
+
+            ValidateDefaultMinMax(result);
+
+            return result;
+        }
+
+        /// <summary>
+        /// Converts the value to formatted text.
+        /// </summary>
+        /// <returns></returns>
+        private string ConvertValueToText()
+        {
+            if (Value == null)
+            {
+                return string.Empty;
+            }
+
+            //Manage FormatString of type "{}{0:N2} °" (in xaml) or "{0:N2} °" in code-behind.
+            if (FormatString.Contains("{0"))
+            {
+                return string.Format(CultureInfo, FormatString, Value.Value);
+            }
+
+            return Value.Value.ToString(FormatString, CultureInfo);
+
+        }
+
+        /// <summary>
+        /// Called by OnSpin when the spin direction is SpinDirection.Increase.
+        /// </summary>
+        private void OnIncrement()
+        {
+            if (!HandleNullSpin())
+            {
+                var result = Value.Value + Increment;
+                Value = CoerceValueMinMax(result);
+            }
+        }
+
+        /// <summary>
+        /// Called by OnSpin when the spin direction is SpinDirection.Descrease.
+        /// </summary>
+        private void OnDecrement()
+        {
+            if (!HandleNullSpin())
+            {
+                var result = Value.Value - Increment;
+                Value = CoerceValueMinMax(result);
+            }
+        }
+
+        /// <summary>
+        /// Sets the valid spin directions.
+        /// </summary>
+        private void SetValidSpinDirection()
+        {
+            var validDirections = ValidSpinDirections.None;
+
+            // Zero increment always prevents spin.
+            if (Increment != 0 && !IsReadOnly)
+            {
+                if (IsLowerThan(Value, Maximum) || !Value.HasValue)
+                {
+                    validDirections = validDirections | ValidSpinDirections.Increase;
+                }
+
+                if (IsGreaterThan(Value, Minimum) || !Value.HasValue)
+                {
+                    validDirections = validDirections | ValidSpinDirections.Decrease;
+                }
+            }
+
+            if (Spinner != null)
+            {
+                Spinner.ValidSpinDirection = validDirections;
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="CultureInfo"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void OnCultureInfoChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is NumericUpDown upDown)
+            {
+                var oldValue = (CultureInfo)e.OldValue;
+                var newValue = (CultureInfo)e.NewValue;
+                upDown.OnCultureInfoChanged(oldValue, newValue);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="DefaultValue"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void OnDefaultValueChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is NumericUpDown upDown)
+            {
+                var oldValue = (double)e.OldValue;
+                var newValue = (double)e.NewValue;
+                upDown.OnDefaultValueChanged(oldValue, newValue);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="DisplayDefaultValueOnEmptyText"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void OnDisplayDefaultValueOnEmptyTextChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is NumericUpDown upDown)
+            {
+                var oldValue = (bool) e.OldValue;
+                var newValue = (bool) e.NewValue;
+                upDown.OnDisplayDefaultValueOnEmptyTextChanged(oldValue, newValue);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Increment"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void IncrementChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is NumericUpDown upDown)
+            {
+                var oldValue = (double)e.OldValue;
+                var newValue = (double)e.NewValue;
+                upDown.OnIncrementChanged(oldValue, newValue);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="FormatString"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void FormatStringChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is NumericUpDown upDown)
+            {
+                var oldValue = (string)e.OldValue;
+                var newValue = (string)e.NewValue;
+                upDown.OnFormatStringChanged(oldValue, newValue);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="IsReadOnly"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void OnIsReadOnlyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is NumericUpDown upDown)
+            {
+                var oldValue = (bool)e.OldValue;
+                var newValue = (bool)e.NewValue;
+                upDown.OnIsReadOnlyChanged(oldValue, newValue);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Maximum"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void OnMaximumChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is NumericUpDown upDown)
+            {
+                var oldValue = (double)e.OldValue;
+                var newValue = (double)e.NewValue;
+                upDown.OnMaximumChanged(oldValue, newValue);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Minimum"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void OnMinimumChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is NumericUpDown upDown)
+            {
+                var oldValue = (double)e.OldValue;
+                var newValue = (double)e.NewValue;
+                upDown.OnMinimumChanged(oldValue, newValue);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Text"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void OnTextChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is NumericUpDown upDown)
+            {
+                var oldValue = (string)e.OldValue;
+                var newValue = (string)e.NewValue;
+                upDown.OnTextChanged(oldValue, newValue);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="Value"/> property value changed.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void OnValueChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is NumericUpDown upDown)
+            {
+                var oldValue = (double?)e.OldValue;
+                var newValue = (double?)e.NewValue;
+                upDown.OnValueChanged(oldValue, newValue);
+            }
+        }
+
+        private void SetValueInternal(double? value)
+        {
+            _internalValueSet = true;
+            try
+            {
+                Value = value;
+            }
+            finally
+            {
+                _internalValueSet = false;
+            }
+        }
+
+        private static double OnCoerceMaximum(NumericUpDown upDown, double value)
+        {
+            return upDown.OnCoerceMaximum(value);
+        }
+
+        private static double OnCoerceMinimum(NumericUpDown upDown, double value)
+        {
+            return upDown.OnCoerceMinimum(value);
+        }
+
+        private static double OnCoerceIncrement(NumericUpDown upDown, double value)
+        {
+            return upDown.OnCoerceIncrement(value);
+        }
+
+        private void TextBoxOnTextChanged()
+        {
+            try
+            {
+                _isTextChangedFromUI = true;
+                if (TextBox != null)
+                {
+                    Text = TextBox.Text;
+                }
+            }
+            finally
+            {
+                _isTextChangedFromUI = false;
+            }
+        }
+
+        private void OnSpinnerSpin(object sender, SpinEventArgs e)
+        {
+            if (AllowSpin && !IsReadOnly)
+            {
+                var spin = !e.UsingMouseWheel;
+                spin |= ((TextBox != null) && TextBox.IsFocused);
+
+                if (spin)
+                {
+                    e.Handled = true;
+                    OnSpin(e);
+                }
+            }
+        }
+
+        private void DoDecrement()
+        {
+            if (Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Decrease) == ValidSpinDirections.Decrease)
+            {
+                OnDecrement();
+            }
+        }
+
+        private void DoIncrement()
+        {
+            if (Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Increase) == ValidSpinDirections.Increase)
+            {
+                OnIncrement();
+            }
+        }
+
+        public event EventHandler<SpinEventArgs> Spinned;
+
+        private void TextBoxOnPointerPressed(object sender, PointerPressedEventArgs e)
+        {
+            if (e.Device.Captured != Spinner)
+            {
+                Dispatcher.UIThread.InvokeAsync(() => { e.Device.Capture(Spinner); }, DispatcherPriority.Input);
+            }
+        }
+
+        /// <summary>
+        /// Defines the <see cref="ValueChanged"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<NumericUpDownValueChangedEventArgs> ValueChangedEvent =
+            RoutedEvent.Register<NumericUpDown, NumericUpDownValueChangedEventArgs>(nameof(ValueChanged), RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Raised when the <see cref="Value"/> changes.
+        /// </summary>
+        public event EventHandler<SpinEventArgs> ValueChanged
+        {
+            add { AddHandler(ValueChangedEvent, value); }
+            remove { RemoveHandler(ValueChangedEvent, value); }
+        }
+
+        private bool CommitInput()
+        {
+            return SyncTextAndValueProperties(true, Text);
+        }
+
+        /// <summary>
+        /// Synchronize <see cref="Text"/> and <see cref="Value"/> properties.
+        /// </summary>
+        /// <param name="updateValueFromText">If value should be updated from text.</param>
+        /// <param name="text">The text.</param>
+        private bool SyncTextAndValueProperties(bool updateValueFromText, string text)
+        {
+            return SyncTextAndValueProperties(updateValueFromText, text, false);
+        }
+
+        /// <summary>
+        /// Synchronize <see cref="Text"/> and <see cref="Value"/> properties.
+        /// </summary>
+        /// <param name="updateValueFromText">If value should be updated from text.</param>
+        /// <param name="text">The text.</param>
+        /// <param name="forceTextUpdate">Force text update.</param>
+        private bool SyncTextAndValueProperties(bool updateValueFromText, string text, bool forceTextUpdate)
+        {
+            if (_isSyncingTextAndValueProperties)
+                return true;
+
+            _isSyncingTextAndValueProperties = true;
+            var parsedTextIsValid = true;
+            try
+            {
+                if (updateValueFromText)
+                {
+                    if (string.IsNullOrEmpty(text))
+                    {
+                        // An empty input sets the value to the default value.
+                        SetValueInternal(DefaultValue);
+                    }
+                    else
+                    {
+                        try
+                        {
+                            var newValue = ConvertTextToValue(text);
+                            if (!Equals(newValue, Value))
+                            {
+                                SetValueInternal(newValue);
+                            }
+                        }
+                        catch
+                        {
+                            parsedTextIsValid = false;
+                        }
+                    }
+                }
+
+                // Do not touch the ongoing text input from user.
+                if (!_isTextChangedFromUI)
+                {
+                    // Don't replace the empty Text with the non-empty representation of DefaultValue.
+                    var shouldKeepEmpty = !forceTextUpdate && string.IsNullOrEmpty(Text) && Equals(Value, DefaultValue) && !DisplayDefaultValueOnEmptyText;
+                    if (!shouldKeepEmpty)
+                    {
+                        var newText = ConvertValueToText();
+                        if (!Equals(Text, newText))
+                        {
+                            Text = newText;
+                        }
+                    }
+
+                    // Sync Text and textBox
+                    if (TextBox != null)
+                    {
+                        TextBox.Text = Text;
+                    }
+                }
+
+                if (_isTextChangedFromUI && !parsedTextIsValid)
+                {
+                    // Text input was made from the user and the text
+                    // repesents an invalid value. Disable the spinner in this case.
+                    if (Spinner != null)
+                    {
+                        Spinner.ValidSpinDirection = ValidSpinDirections.None;
+                    }
+                }
+                else
+                {
+                    SetValidSpinDirection();
+                }
+            }
+            finally
+            {
+                _isSyncingTextAndValueProperties = false;
+            }
+            return parsedTextIsValid;
+        }
+
+        private double? CoerceValueMinMax(double? value)
+        {
+            if (IsLowerThan(value, Minimum))
+            {
+                return Minimum;
+            }
+            else if (IsGreaterThan(value, Maximum))
+            {
+                return Maximum;
+            }
+            else
+            {
+                return value;
+            }
+        }
+
+        private static bool IsLowerThan(double? value1, double? value2)
+        {
+            if (value1 == null || value2 == null)
+            {
+                return false;
+            }
+            return value1.Value < value2.Value;
+        }
+
+        private static bool IsGreaterThan(double? value1, double? value2)
+        {
+            if (value1 == null || value2 == null)
+            {
+                return false;
+            }
+            return value1.Value > value2.Value;
+        }
+
+        private bool HandleNullSpin()
+        {
+            if (!Value.HasValue)
+            {
+                var forcedValue = DefaultValue ?? default(double);
+                Value = CoerceValueMinMax(forcedValue);
+                return true;
+            }
+            return false;
+        }
+
+        private double? ConvertTextToValueCore(string currentValueText, string text)
+        {
+            double? result;
+
+            if (IsPercent(FormatString))
+            {
+                result = decimal.ToDouble(ParsePercent(text, CultureInfo));
+            }
+            else
+            {
+                // Problem while converting new text
+                if (!double.TryParse(text, ParsingNumberStyle, CultureInfo, out var outputValue))
+                {
+                    var shouldThrow = true;
+
+                    // Check if CurrentValueText is also failing => it also contains special characters. ex : 90°
+                    if (!double.TryParse(currentValueText, ParsingNumberStyle, CultureInfo, out var _))
+                    {
+                        // extract non-digit characters
+                        var currentValueTextSpecialCharacters = currentValueText.Where(c => !char.IsDigit(c));
+                        var textSpecialCharacters = text.Where(c => !char.IsDigit(c));
+                        // same non-digit characters on currentValueText and new text => remove them on new Text to parse it again.
+                        if (currentValueTextSpecialCharacters.Except(textSpecialCharacters).ToList().Count == 0)
+                        {
+                            foreach (var character in textSpecialCharacters)
+                            {
+                                text = text.Replace(character.ToString(), string.Empty);
+                            }
+                            // if without the special characters, parsing is good, do not throw
+                            if (double.TryParse(text, ParsingNumberStyle, CultureInfo, out outputValue))
+                            {
+                                shouldThrow = false;
+                            }
+                        }
+                    }
+
+                    if (shouldThrow)
+                    {
+                        throw new InvalidDataException("Input string was not in a correct format.");
+                    }
+                }
+                result = outputValue;
+            }
+            return result;
+        }
+
+        private double? GetClippedMinMaxValue(double? result)
+        {
+            if (IsGreaterThan(result, Maximum))
+            {
+                return Maximum;
+            }
+            else if (IsLowerThan(result, Minimum))
+            {
+                return Minimum;
+            }
+            return result;
+        }
+
+        private void ValidateDefaultMinMax(double? value)
+        {
+            // DefaultValue is always accepted.
+            if (Equals(value, DefaultValue))
+            {
+                return;
+            }
+
+            if (IsLowerThan(value, Minimum))
+            {
+                throw new ArgumentOutOfRangeException(nameof(Minimum), string.Format("Value must be greater than Minimum value of {0}", Minimum));
+            }
+            else if (IsGreaterThan(value, Maximum))
+            {
+                throw new ArgumentOutOfRangeException(nameof(Maximum), string.Format("Value must be less than Maximum value of {0}", Maximum));
+            }
+        }
+
+        /// <summary>
+        /// Parse percent format text
+        /// </summary>
+        /// <param name="text">Text to parse.</param>
+        /// <param name="cultureInfo">The culture info.</param>
+        private static decimal ParsePercent(string text, IFormatProvider cultureInfo)
+        {
+            var info = NumberFormatInfo.GetInstance(cultureInfo);
+            text = text.Replace(info.PercentSymbol, null);
+            var result = decimal.Parse(text, NumberStyles.Any, info);
+            result = result / 100;
+            return result;
+        }
+
+
+        private bool IsPercent(string stringToTest)
+        {
+            var PIndex = stringToTest.IndexOf("P", StringComparison.Ordinal);
+            if (PIndex >= 0)
+            {
+                //stringToTest contains a "P" between 2 "'", it's considered as text, not percent
+                var isText = stringToTest.Substring(0, PIndex).Contains("'")
+                             && stringToTest.Substring(PIndex, FormatString.Length - PIndex).Contains("'");
+
+                return !isText;
+            }
+            return false;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs b/src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs
new file mode 100644
index 0000000000..4fd8873c53
--- /dev/null
+++ b/src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs
@@ -0,0 +1,16 @@
+using Avalonia.Interactivity;
+
+namespace Avalonia.Controls
+{
+    public class NumericUpDownValueChangedEventArgs : RoutedEventArgs
+    {
+        public NumericUpDownValueChangedEventArgs(RoutedEvent routedEvent, double? oldValue,  double? newValue) : base(routedEvent)
+        {
+            OldValue = oldValue;
+            NewValue = newValue;
+        }
+
+        public double? OldValue { get; }
+        public double? NewValue { get; }
+    }
+}
diff --git a/src/Avalonia.Controls/NumericUpDown/ShortUpDown.cs b/src/Avalonia.Controls/NumericUpDown/ShortUpDown.cs
deleted file mode 100644
index cdba5b9b64..0000000000
--- a/src/Avalonia.Controls/NumericUpDown/ShortUpDown.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace Avalonia.Controls
-{
-    /// <inheritdoc />
-    public class ShortUpDown : CommonNumericUpDown<short>
-    {
-        /// <summary>
-        /// Initializes static members of the <see cref="ShortUpDown"/> class.
-        /// </summary>
-        static ShortUpDown() => UpdateMetadata(typeof(ShortUpDown), 1, short.MinValue, short.MaxValue);
-
-        /// <summary>
-        /// Initializes new instance of the <see cref="ShortUpDown"/> class.
-        /// </summary>
-        public ShortUpDown() : base(short.TryParse, decimal.ToInt16, (v1, v2) => v1 < v2, (v1, v2) => v1 > v2)
-        {
-        }
-
-        /// <inheritdoc />
-        protected override short IncrementValue(short value, short increment) => (short)(value + increment);
-
-        /// <inheritdoc />
-        protected override short DecrementValue(short value, short increment) => (short)(value - increment);
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/NumericUpDown/SingleUpDown.cs b/src/Avalonia.Controls/NumericUpDown/SingleUpDown.cs
deleted file mode 100644
index cc3da078bf..0000000000
--- a/src/Avalonia.Controls/NumericUpDown/SingleUpDown.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using System;
-
-namespace Avalonia.Controls
-{
-    /// <inheritdoc />
-    public class SingleUpDown : CommonNumericUpDown<float>
-    {
-        /// <summary>
-        /// Defines the <see cref="AllowInputSpecialValues"/> property.
-        /// </summary>
-        public static readonly DirectProperty<SingleUpDown, AllowedSpecialValues> AllowInputSpecialValuesProperty =
-            AvaloniaProperty.RegisterDirect<SingleUpDown, AllowedSpecialValues>(nameof(AllowInputSpecialValues),
-                updown => updown.AllowInputSpecialValues, (updown, v) => updown.AllowInputSpecialValues = v);
-
-        private AllowedSpecialValues _allowInputSpecialValues;
-
-        /// <summary>
-        /// Initializes static members of the <see cref="SingleUpDown"/> class.
-        /// </summary>
-        static SingleUpDown() => UpdateMetadata(typeof(SingleUpDown), 1f, float.NegativeInfinity, float.PositiveInfinity);
-
-        /// <summary>
-        /// Initializes new instance of the <see cref="SingleUpDown"/> class.
-        /// </summary>
-        public SingleUpDown() : base(float.TryParse, decimal.ToSingle, (v1, v2) => v1 < v2, (v1, v2) => v1 > v2)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets a value representing the special values the user is allowed to input, such as "Infinity", "-Infinity" and "NaN" values.
-        /// </summary>
-        public AllowedSpecialValues AllowInputSpecialValues
-        {
-            get { return _allowInputSpecialValues; }
-            set { SetAndRaise(AllowInputSpecialValuesProperty, ref _allowInputSpecialValues, value); }
-        }
-
-        /// <inheritdoc />
-        protected override float? OnCoerceIncrement(float? baseValue)
-        {
-            if (baseValue.HasValue && float.IsNaN(baseValue.Value))
-                throw new ArgumentException("NaN is invalid for Increment.");
-
-            return base.OnCoerceIncrement(baseValue);
-        }
-
-        /// <inheritdoc />
-        protected override float? OnCoerceMaximum(float? baseValue)
-        {
-            if (baseValue.HasValue && float.IsNaN(baseValue.Value))
-                throw new ArgumentException("NaN is invalid for Maximum.");
-
-            return base.OnCoerceMaximum(baseValue);
-        }
-
-        /// <inheritdoc />
-        protected override float? OnCoerceMinimum(float? baseValue)
-        {
-            if (baseValue.HasValue && float.IsNaN(baseValue.Value))
-                throw new ArgumentException("NaN is invalid for Minimum.");
-
-            return base.OnCoerceMinimum(baseValue);
-        }
-
-        /// <inheritdoc />
-        protected override float IncrementValue(float value, float increment) => value + increment;
-
-        /// <inheritdoc />
-        protected override float DecrementValue(float value, float increment) => value - increment;
-
-        /// <inheritdoc />
-        protected override void SetValidSpinDirection()
-        {
-            if (Value.HasValue && float.IsInfinity(Value.Value) && (Spinner != null))
-            {
-                Spinner.ValidSpinDirection = ValidSpinDirections.None;
-            }
-            else
-            {
-                base.SetValidSpinDirection();
-            }
-        }
-
-        /// <inheritdoc />
-        protected override float? ConvertTextToValue(string text)
-        {
-            var result = base.ConvertTextToValue(text);
-            if (result != null)
-            {
-                if (float.IsNaN(result.Value))
-                {
-                    TestInputSpecialValue(AllowInputSpecialValues, AllowedSpecialValues.NaN);
-                }
-                else if (float.IsPositiveInfinity(result.Value))
-                {
-                    TestInputSpecialValue(AllowInputSpecialValues, AllowedSpecialValues.PositiveInfinity);
-                }
-                else if (float.IsNegativeInfinity(result.Value))
-                {
-                    TestInputSpecialValue(AllowInputSpecialValues, AllowedSpecialValues.NegativeInfinity);
-                }
-            }
-            return result;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/NumericUpDown/UpDownBase.cs b/src/Avalonia.Controls/NumericUpDown/UpDownBase.cs
deleted file mode 100644
index fa95eb01a7..0000000000
--- a/src/Avalonia.Controls/NumericUpDown/UpDownBase.cs
+++ /dev/null
@@ -1,824 +0,0 @@
-using System;
-using System.Globalization;
-using Avalonia.Controls.Primitives;
-using Avalonia.Data;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using Avalonia.Threading;
-
-namespace Avalonia.Controls
-{
-    public abstract class UpDownBase : TemplatedControl
-    {
-    }
-
-    /// <summary>
-    /// Base class for controls that represents a TextBox with button spinners that allow incrementing and decrementing values.
-    /// </summary>
-    public abstract class UpDownBase<T> : UpDownBase
-    {
-        /// <summary>
-        /// Defines the <see cref="AllowSpin"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> AllowSpinProperty =
-            ButtonSpinner.AllowSpinProperty.AddOwner<UpDownBase<T>>();
-
-        /// <summary>
-        /// Defines the <see cref="ButtonSpinnerLocation"/> property.
-        /// </summary>
-        public static readonly StyledProperty<Location> ButtonSpinnerLocationProperty =
-            ButtonSpinner.ButtonSpinnerLocationProperty.AddOwner<UpDownBase<T>>();
-
-        /// <summary>
-        /// Defines the <see cref="ShowButtonSpinner"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> ShowButtonSpinnerProperty =
-            ButtonSpinner.ShowButtonSpinnerProperty.AddOwner<UpDownBase<T>>();
-
-        /// <summary>
-        /// Defines the <see cref="ClipValueToMinMax"/> property.
-        /// </summary>
-        public static readonly DirectProperty<UpDownBase<T>, bool> ClipValueToMinMaxProperty =
-            AvaloniaProperty.RegisterDirect<UpDownBase<T>, bool>(nameof(ClipValueToMinMax),
-                updown => updown.ClipValueToMinMax, (updown, b) => updown.ClipValueToMinMax = b);
-
-        /// <summary>
-        /// Defines the <see cref="CultureInfo"/> property.
-        /// </summary>
-        public static readonly DirectProperty<UpDownBase<T>, CultureInfo> CultureInfoProperty =
-            AvaloniaProperty.RegisterDirect<UpDownBase<T>, CultureInfo>(nameof(CultureInfo), o => o.CultureInfo,
-                (o, v) => o.CultureInfo = v, CultureInfo.CurrentCulture);
-
-        /// <summary>
-        /// Defines the <see cref="DefaultValue"/> property.
-        /// </summary>
-        public static readonly StyledProperty<T> DefaultValueProperty =
-            AvaloniaProperty.Register<UpDownBase<T>, T>(nameof(DefaultValue));
-
-        /// <summary>
-        /// Defines the <see cref="DisplayDefaultValueOnEmptyText"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> DisplayDefaultValueOnEmptyTextProperty =
-            AvaloniaProperty.Register<UpDownBase<T>, bool>(nameof(DisplayDefaultValueOnEmptyText));
-
-        /// <summary>
-        /// Defines the <see cref="IsReadOnly"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> IsReadOnlyProperty =
-            AvaloniaProperty.Register<UpDownBase<T>, bool>(nameof(IsReadOnly));
-
-        /// <summary>
-        /// Defines the <see cref="Maximum"/> property.
-        /// </summary>
-        public static readonly StyledProperty<T> MaximumProperty =
-            AvaloniaProperty.Register<UpDownBase<T>, T>(nameof(Maximum), validate: OnCoerceMaximum);
-
-        /// <summary>
-        /// Defines the <see cref="Minimum"/> property.
-        /// </summary>
-        public static readonly StyledProperty<T> MinimumProperty =
-            AvaloniaProperty.Register<UpDownBase<T>, T>(nameof(Minimum), validate: OnCoerceMinimum);
-
-        /// <summary>
-        /// Defines the <see cref="Text"/> property.
-        /// </summary>
-        public static readonly DirectProperty<UpDownBase<T>, string> TextProperty =
-            AvaloniaProperty.RegisterDirect<UpDownBase<T>, string>(nameof(Text), o => o.Text, (o, v) => o.Text = v,
-                defaultBindingMode: BindingMode.TwoWay);
-
-        /// <summary>
-        /// Defines the <see cref="Value"/> property.
-        /// </summary>
-        public static readonly DirectProperty<UpDownBase<T>, T> ValueProperty =
-            AvaloniaProperty.RegisterDirect<UpDownBase<T>, T>(nameof(Value), updown => updown.Value,
-                (updown, v) => updown.Value = v, defaultBindingMode: BindingMode.TwoWay);
-
-        /// <summary>
-        /// Defines the <see cref="Watermark"/> property.
-        /// </summary>
-        public static readonly StyledProperty<string> WatermarkProperty =
-            AvaloniaProperty.Register<UpDownBase<T>, string>(nameof(Watermark));
-
-        private IDisposable _textBoxTextChangedSubscription;
-        private T _value;
-        private string _text;
-        private bool _internalValueSet;
-        private bool _clipValueToMinMax;
-        private bool _isSyncingTextAndValueProperties;
-        private bool _isTextChangedFromUI;
-        private CultureInfo _cultureInfo;
-
-        /// <summary>
-        /// Gets the Spinner template part.
-        /// </summary>
-        protected Spinner Spinner { get; private set; }
-
-        /// <summary>
-        /// Gets the TextBox template part.
-        /// </summary>
-        protected TextBox TextBox { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the ability to perform increment/decrement operations via the keyboard, button spinners, or mouse wheel.
-        /// </summary>
-        public bool AllowSpin
-        {
-            get { return GetValue(AllowSpinProperty); }
-            set { SetValue(AllowSpinProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets current location of the <see cref="ButtonSpinner"/>.
-        /// </summary>
-        public Location ButtonSpinnerLocation
-        {
-            get { return GetValue(ButtonSpinnerLocationProperty); }
-            set { SetValue(ButtonSpinnerLocationProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the spin buttons should be shown.
-        /// </summary>
-        public bool ShowButtonSpinner
-        {
-            get { return GetValue(ShowButtonSpinnerProperty); }
-            set { SetValue(ShowButtonSpinnerProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets if the value should be clipped when minimum/maximum is reached.
-        /// </summary>
-        public bool ClipValueToMinMax
-        {
-            get { return _clipValueToMinMax; }
-            set { SetAndRaise(ClipValueToMinMaxProperty, ref _clipValueToMinMax, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the current CultureInfo.
-        /// </summary>
-        public CultureInfo CultureInfo
-        {
-            get { return _cultureInfo; }
-            set { SetAndRaise(CultureInfoProperty, ref _cultureInfo, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the value to use when the <see cref="Value"/> is null and an increment/decrement operation is performed.
-        /// </summary>
-        public T DefaultValue
-        {
-            get { return GetValue(DefaultValueProperty); }
-            set { SetValue(DefaultValueProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets if the defaultValue should be displayed when the Text is empty.
-        /// </summary>
-        public bool DisplayDefaultValueOnEmptyText
-        {
-            get { return GetValue(DisplayDefaultValueOnEmptyTextProperty); }
-            set { SetValue(DisplayDefaultValueOnEmptyTextProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets if the control is read only.
-        /// </summary>
-        public bool IsReadOnly
-        {
-            get { return GetValue(IsReadOnlyProperty); }
-            set { SetValue(IsReadOnlyProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the maximum allowed value.
-        /// </summary>
-        public T Maximum
-        {
-            get { return GetValue(MaximumProperty); }
-            set { SetValue(MaximumProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the minimum allowed value.
-        /// </summary>
-        public T Minimum
-        {
-            get { return GetValue(MinimumProperty); }
-            set { SetValue(MinimumProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the formatted string representation of the value.
-        /// </summary>
-        public string Text
-        {
-            get { return _text; }
-            set { SetAndRaise(TextProperty, ref _text, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the value.
-        /// </summary>
-        public T Value
-        {
-            get { return _value; }
-            set
-            {
-                value = OnCoerceValue(value);
-                SetAndRaise(ValueProperty, ref _value, value);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the object to use as a watermark if the <see cref="Value"/> is null.
-        /// </summary>
-        public string Watermark
-        {
-            get { return GetValue(WatermarkProperty); }
-            set { SetValue(WatermarkProperty, value); }
-        }
-
-        /// <summary>
-        /// Initializes new instance of <see cref="UpDownBase{T}"/> class.
-        /// </summary>
-        protected UpDownBase()
-        {
-            Initialized += (sender, e) =>
-            {
-                if (!_internalValueSet && IsInitialized)
-                {
-                    SyncTextAndValueProperties(false, null, true);
-                }
-
-                SetValidSpinDirection();
-            };
-        }
-
-        /// <summary>
-        /// Initializes static members of the <see cref="UpDownBase{T}"/> class.
-        /// </summary>
-        static UpDownBase()
-        {
-            CultureInfoProperty.Changed.Subscribe(OnCultureInfoChanged);
-            DefaultValueProperty.Changed.Subscribe(OnDefaultValueChanged);
-            DisplayDefaultValueOnEmptyTextProperty.Changed.Subscribe(OnDisplayDefaultValueOnEmptyTextChanged);
-            IsReadOnlyProperty.Changed.Subscribe(OnIsReadOnlyChanged);
-            MaximumProperty.Changed.Subscribe(OnMaximumChanged);
-            MinimumProperty.Changed.Subscribe(OnMinimumChanged);
-            TextProperty.Changed.Subscribe(OnTextChanged);
-            ValueProperty.Changed.Subscribe(OnValueChanged);
-        }
-
-        /// <inheritdoc />
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
-        {
-            if (TextBox != null)
-            {
-                TextBox.PointerPressed -= TextBoxOnPointerPressed;
-                _textBoxTextChangedSubscription?.Dispose();
-            }
-            TextBox = e.NameScope.Find<TextBox>("PART_TextBox");
-            if (TextBox != null)
-            {
-                TextBox.Text = Text;
-                TextBox.PointerPressed += TextBoxOnPointerPressed;
-                _textBoxTextChangedSubscription = TextBox.GetObservable(TextBox.TextProperty).Subscribe(txt => TextBoxOnTextChanged());
-            }
-
-            if (Spinner != null)
-            {
-                Spinner.Spin -= OnSpinnerSpin;
-            }
-
-            Spinner = e.NameScope.Find<Spinner>("PART_Spinner");
-
-            if (Spinner != null)
-            {
-                Spinner.Spin += OnSpinnerSpin;
-            }
-
-            SetValidSpinDirection();
-        }
-
-        /// <inheritdoc />
-        protected override void OnKeyDown(KeyEventArgs e)
-        {
-            switch (e.Key)
-            {
-                case Key.Enter:
-                    var commitSuccess = CommitInput();
-                    e.Handled = !commitSuccess;
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Called when the <see cref="CultureInfo"/> property value changed.
-        /// </summary>
-        /// <param name="oldValue">The old value.</param>
-        /// <param name="newValue">The new value.</param>
-        protected virtual void OnCultureInfoChanged(CultureInfo oldValue, CultureInfo newValue)
-        {
-            if (IsInitialized)
-            {
-                SyncTextAndValueProperties(false, null);
-            }
-        }
-
-        /// <summary>
-        /// Called when the <see cref="DefaultValue"/> property value changed.
-        /// </summary>
-        /// <param name="oldValue">The old value.</param>
-        /// <param name="newValue">The new value.</param>
-        protected virtual void OnDefaultValueChanged(T oldValue, T newValue)
-        {
-            if (IsInitialized && string.IsNullOrEmpty(Text))
-            {
-                SyncTextAndValueProperties(true, Text);
-            }
-        }
-
-        /// <summary>
-        /// Called when the <see cref="DisplayDefaultValueOnEmptyText"/> property value changed.
-        /// </summary>
-        /// <param name="oldValue">The old value.</param>
-        /// <param name="newValue">The new value.</param>
-        protected virtual void OnDisplayDefaultValueOnEmptyTextChanged(bool oldValue, bool newValue)
-        {
-            if (IsInitialized && string.IsNullOrEmpty(Text))
-            {
-                SyncTextAndValueProperties(false, Text);
-            }
-        }
-
-        /// <summary>
-        /// Called when the <see cref="IsReadOnly"/> property value changed.
-        /// </summary>
-        /// <param name="oldValue">The old value.</param>
-        /// <param name="newValue">The new value.</param>
-        protected virtual void OnIsReadOnlyChanged(bool oldValue, bool newValue)
-        {
-            SetValidSpinDirection();
-        }
-
-        /// <summary>
-        /// Called when the <see cref="Maximum"/> property value changed.
-        /// </summary>
-        /// <param name="oldValue">The old value.</param>
-        /// <param name="newValue">The new value.</param>
-        protected virtual void OnMaximumChanged(T oldValue, T newValue)
-        {
-            if (IsInitialized)
-            {
-                SetValidSpinDirection();
-            }
-        }
-
-        /// <summary>
-        /// Called when the <see cref="Minimum"/> property value changed.
-        /// </summary>
-        /// <param name="oldValue">The old value.</param>
-        /// <param name="newValue">The new value.</param>
-        protected virtual void OnMinimumChanged(T oldValue, T newValue)
-        {
-            if (IsInitialized)
-            {
-                SetValidSpinDirection();
-            }
-        }
-
-        /// <summary>
-        /// Called when the <see cref="Text"/> property value changed.
-        /// </summary>
-        /// <param name="oldValue">The old value.</param>
-        /// <param name="newValue">The new value.</param>
-        protected virtual void OnTextChanged(string oldValue, string newValue)
-        {
-            if (IsInitialized)
-            {
-               SyncTextAndValueProperties(true, Text);
-            }
-        }
-
-        /// <summary>
-        /// Called when the <see cref="Value"/> property value changed.
-        /// </summary>
-        /// <param name="oldValue">The old value.</param>
-        /// <param name="newValue">The new value.</param>
-        protected virtual void OnValueChanged(T oldValue, T newValue)
-        {
-            if (!_internalValueSet && IsInitialized)
-            {
-                SyncTextAndValueProperties(false, null, true);
-            }
-
-            SetValidSpinDirection();
-
-            RaiseValueChangedEvent(oldValue, newValue);
-        }
-
-        /// <summary>
-        /// Called when the <see cref="Maximum"/> property has to be coerced.
-        /// </summary>
-        /// <param name="baseValue">The value.</param>
-        protected virtual T OnCoerceMaximum(T baseValue)
-        {
-            return baseValue;
-        }
-
-        /// <summary>
-        /// Called when the <see cref="Minimum"/> property has to be coerced.
-        /// </summary>
-        /// <param name="baseValue">The value.</param>
-        protected virtual T OnCoerceMinimum(T baseValue)
-        {
-            return baseValue;
-        }
-
-        /// <summary>
-        /// Called when the <see cref="Value"/> property has to be coerced.
-        /// </summary>
-        /// <param name="baseValue">The value.</param>
-        protected virtual T OnCoerceValue(T baseValue)
-        {
-            return baseValue;
-        }
-
-        /// <summary>
-        /// Raises the OnSpin event when spinning is initiated by the end-user.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnSpin(SpinEventArgs e)
-        {
-            if (e == null)
-            {
-                throw new ArgumentNullException("e");
-            }
-
-            var handler = Spinned;
-            handler?.Invoke(this, e);
-
-            if (e.Direction == SpinDirection.Increase)
-            {
-                DoIncrement();
-            }
-            else
-            {
-                DoDecrement();
-            }
-        }
-
-        /// <summary>
-        /// Raises the <see cref="ValueChanged"/> event.
-        /// </summary>
-        /// <param name="oldValue">The old value.</param>
-        /// <param name="newValue">The new value.</param>
-        protected virtual void RaiseValueChangedEvent(T oldValue, T newValue)
-        {
-            var e = new UpDownValueChangedEventArgs<T>(ValueChangedEvent, oldValue, newValue);
-            RaiseEvent(e);
-        }
-
-        /// <summary>
-        /// Converts the formatted text to a value.
-        /// </summary>
-        protected abstract T ConvertTextToValue(string text);
-
-        /// <summary>
-        /// Converts the value to formatted text.
-        /// </summary>
-        /// <returns></returns>
-        protected abstract string ConvertValueToText();
-
-        /// <summary>
-        /// Called by OnSpin when the spin direction is SpinDirection.Increase.
-        /// </summary>
-        protected abstract void OnIncrement();
-
-        /// <summary>
-        /// Called by OnSpin when the spin direction is SpinDirection.Descrease.
-        /// </summary>
-        protected abstract void OnDecrement();
-
-        /// <summary>
-        /// Sets the valid spin directions.
-        /// </summary>
-        protected abstract void SetValidSpinDirection();
-
-        /// <summary>
-        /// Called when the <see cref="CultureInfo"/> property value changed.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private static void OnCultureInfoChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            if (e.Sender is UpDownBase<T> upDown)
-            {
-                var oldValue = (CultureInfo)e.OldValue;
-                var newValue = (CultureInfo)e.NewValue;
-                upDown.OnCultureInfoChanged(oldValue, newValue);
-            }
-        }
-
-        /// <summary>
-        /// Called when the <see cref="DefaultValue"/> property value changed.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private static void OnDefaultValueChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            if (e.Sender is UpDownBase<T> upDown)
-            {
-                var oldValue = (T)e.OldValue;
-                var newValue = (T)e.NewValue;
-                upDown.OnDefaultValueChanged(oldValue, newValue);
-            }
-        }
-
-        /// <summary>
-        /// Called when the <see cref="DisplayDefaultValueOnEmptyText"/> property value changed.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private static void OnDisplayDefaultValueOnEmptyTextChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            if (e.Sender is UpDownBase<T> upDown)
-            {
-                var oldValue = (bool) e.OldValue;
-                var newValue = (bool) e.NewValue;
-                upDown.OnDisplayDefaultValueOnEmptyTextChanged(oldValue, newValue);
-            }
-        }
-
-        /// <summary>
-        /// Called when the <see cref="IsReadOnly"/> property value changed.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private static void OnIsReadOnlyChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            if (e.Sender is UpDownBase<T> upDown)
-            {
-                var oldValue = (bool)e.OldValue;
-                var newValue = (bool)e.NewValue;
-                upDown.OnIsReadOnlyChanged(oldValue, newValue);
-            }
-        }
-
-        /// <summary>
-        /// Called when the <see cref="Maximum"/> property value changed.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private static void OnMaximumChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            if (e.Sender is UpDownBase<T> upDown)
-            {
-                var oldValue = (T)e.OldValue;
-                var newValue = (T)e.NewValue;
-                upDown.OnMaximumChanged(oldValue, newValue);
-            }
-        }
-
-        /// <summary>
-        /// Called when the <see cref="Minimum"/> property value changed.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private static void OnMinimumChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            if (e.Sender is UpDownBase<T> upDown)
-            {
-                var oldValue = (T)e.OldValue;
-                var newValue = (T)e.NewValue;
-                upDown.OnMinimumChanged(oldValue, newValue);
-            }
-        }
-
-        /// <summary>
-        /// Called when the <see cref="Text"/> property value changed.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private static void OnTextChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            if (e.Sender is UpDownBase<T> upDown)
-            {
-                var oldValue = (string)e.OldValue;
-                var newValue = (string)e.NewValue;
-                upDown.OnTextChanged(oldValue, newValue);
-            }
-        }
-
-        /// <summary>
-        /// Called when the <see cref="Value"/> property value changed.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private static void OnValueChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            if (e.Sender is UpDownBase<T> upDown)
-            {
-                var oldValue = (T)e.OldValue;
-                var newValue = (T)e.NewValue;
-                upDown.OnValueChanged(oldValue, newValue);
-            }
-        }
-
-        private void SetValueInternal(T value)
-        {
-            _internalValueSet = true;
-            try
-            {
-                Value = value;
-            }
-            finally
-            {
-                _internalValueSet = false;
-            }
-        }
-
-        private static T OnCoerceMaximum(UpDownBase<T> upDown, T value)
-        {
-            return upDown.OnCoerceMaximum(value);
-        }
-
-        private static T OnCoerceMinimum(UpDownBase<T> upDown, T value)
-        {
-            return upDown.OnCoerceMinimum(value);
-        }
-
-        private void TextBoxOnTextChanged()
-        {
-            try
-            {
-                _isTextChangedFromUI = true;
-                if (TextBox != null)
-                {
-                    Text = TextBox.Text;
-                }
-            }
-            finally
-            {
-                _isTextChangedFromUI = false;
-            }
-        }
-
-        private void OnSpinnerSpin(object sender, SpinEventArgs e)
-        {
-            if (AllowSpin && !IsReadOnly)
-            {
-                var spin = !e.UsingMouseWheel;
-                spin |= ((TextBox != null) && TextBox.IsFocused);
-
-                if (spin)
-                {
-                    e.Handled = true;
-                    OnSpin(e);
-                }
-            }
-        }
-
-        internal void DoDecrement()
-        {
-            if (Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Decrease) == ValidSpinDirections.Decrease)
-            {
-                OnDecrement();
-            }
-        }
-
-        internal void DoIncrement()
-        {
-            if (Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Increase) == ValidSpinDirections.Increase)
-            {
-                OnIncrement();
-            }
-        }
-
-        public event EventHandler<SpinEventArgs> Spinned;
-
-        private void TextBoxOnPointerPressed(object sender, PointerPressedEventArgs e)
-        {
-            if (e.Device.Captured != Spinner)
-            {
-                Dispatcher.UIThread.InvokeAsync(() => { e.Device.Capture(Spinner); }, DispatcherPriority.Input);
-            }
-        }
-
-        /// <summary>
-        /// Defines the <see cref="ValueChanged"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<UpDownValueChangedEventArgs<T>> ValueChangedEvent =
-            RoutedEvent.Register<UpDownBase<T>, UpDownValueChangedEventArgs<T>>(nameof(ValueChanged), RoutingStrategies.Bubble);
-
-        /// <summary>
-        /// Raised when the <see cref="Value"/> changes.
-        /// </summary>
-        public event EventHandler<SpinEventArgs> ValueChanged
-        {
-            add { AddHandler(ValueChangedEvent, value); }
-            remove { RemoveHandler(ValueChangedEvent, value); }
-        }
-
-        private bool CommitInput()
-        {
-            return SyncTextAndValueProperties(true, Text);
-        }
-
-        /// <summary>
-        /// Synchronize <see cref="Text"/> and <see cref="Value"/> properties.
-        /// </summary>
-        /// <param name="updateValueFromText">If value should be updated from text.</param>
-        /// <param name="text">The text.</param>
-        protected bool SyncTextAndValueProperties(bool updateValueFromText, string text)
-        {
-            return SyncTextAndValueProperties(updateValueFromText, text, false);
-        }
-
-        /// <summary>
-        /// Synchronize <see cref="Text"/> and <see cref="Value"/> properties.
-        /// </summary>
-        /// <param name="updateValueFromText">If value should be updated from text.</param>
-        /// <param name="text">The text.</param>
-        /// <param name="forceTextUpdate">Force text update.</param>
-        private bool SyncTextAndValueProperties(bool updateValueFromText, string text, bool forceTextUpdate)
-        {
-            if (_isSyncingTextAndValueProperties)
-                return true;
-
-            _isSyncingTextAndValueProperties = true;
-            var parsedTextIsValid = true;
-            try
-            {
-                if (updateValueFromText)
-                {
-                    if (string.IsNullOrEmpty(text))
-                    {
-                        // An empty input sets the value to the default value.
-                        SetValueInternal(DefaultValue);
-                    }
-                    else
-                    {
-                        try
-                        {
-                            var newValue = ConvertTextToValue(text);
-                            if (!Equals(newValue, Value))
-                            {
-                                SetValueInternal(newValue);
-                            }
-                        }
-                        catch
-                        {
-                            parsedTextIsValid = false;
-                        }
-                    }
-                }
-
-                // Do not touch the ongoing text input from user.
-                if (!_isTextChangedFromUI)
-                {
-                    // Don't replace the empty Text with the non-empty representation of DefaultValue.
-                    var shouldKeepEmpty = !forceTextUpdate && string.IsNullOrEmpty(Text) && Equals(Value, DefaultValue) && !DisplayDefaultValueOnEmptyText;
-                    if (!shouldKeepEmpty)
-                    {
-                        var newText = ConvertValueToText();
-                        if (!Equals(Text, newText))
-                        {
-                            Text = newText;
-                        }
-                    }
-
-                    // Sync Text and textBox
-                    if (TextBox != null)
-                    {
-                        TextBox.Text = Text;
-                    }
-                }
-
-                if (_isTextChangedFromUI && !parsedTextIsValid)
-                {
-                    // Text input was made from the user and the text
-                    // repesents an invalid value. Disable the spinner in this case.
-                    if (Spinner != null)
-                    {
-                        Spinner.ValidSpinDirection = ValidSpinDirections.None;
-                    }
-                }
-                else
-                {
-                    SetValidSpinDirection();
-                }
-            }
-            finally
-            {
-                _isSyncingTextAndValueProperties = false;
-            }
-            return parsedTextIsValid;
-        }
-    }
-
-    public class UpDownValueChangedEventArgs<T> : RoutedEventArgs
-    {
-        public UpDownValueChangedEventArgs(RoutedEvent routedEvent, T oldValue,  T newValue) : base(routedEvent)
-        {
-            OldValue = oldValue;
-            NewValue = newValue;
-        }
-
-        public T OldValue { get; }
-        public T NewValue { get; }
-    }
-}
diff --git a/src/Avalonia.Themes.Default/NumericUpDown.xaml b/src/Avalonia.Themes.Default/NumericUpDown.xaml
index e2ab6bf149..e6325d07dc 100644
--- a/src/Avalonia.Themes.Default/NumericUpDown.xaml
+++ b/src/Avalonia.Themes.Default/NumericUpDown.xaml
@@ -1,5 +1,5 @@
 <Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector=":is(UpDownBase)">
+  <Style Selector="NumericUpDown">
     <Setter Property="TemplatedControl.BorderBrush" Value="{DynamicResource ThemeBorderLightBrush}"/>
     <Setter Property="TemplatedControl.BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
     <Setter Property="TemplatedControl.Background" Value="{DynamicResource ThemeBackgroundBrush}" />

From e120d9c15786e608c6e3b084367b572f882e2ff4 Mon Sep 17 00:00:00 2001
From: dzhelnin <mitya_zh@mail.ru>
Date: Sat, 24 Mar 2018 19:06:38 +0300
Subject: [PATCH 441/482] Minimum/Maximum coercion functions implementation
 added

---
 src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
index 67c0827155..4d3c983640 100644
--- a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
+++ b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
@@ -515,7 +515,7 @@ namespace Avalonia.Controls
         /// <param name="baseValue">The value.</param>
         protected virtual double OnCoerceMaximum(double baseValue)
         {
-            return baseValue;
+            return Math.Max(baseValue, Minimum);
         }
 
         /// <summary>
@@ -524,7 +524,7 @@ namespace Avalonia.Controls
         /// <param name="baseValue">The value.</param>
         protected virtual double OnCoerceMinimum(double baseValue)
         {
-            return baseValue;
+            return Math.Min(baseValue, Maximum);
         }
 
         /// <summary>

From 7c0f1f937422a69271c0d2cf91d2b41c48721e1f Mon Sep 17 00:00:00 2001
From: dzhelnin <mitya_zh@mail.ru>
Date: Sun, 25 Mar 2018 00:23:50 +0300
Subject: [PATCH 442/482] Use "double" instead of "double?" for Value.
 DefaultValue removed.

---
 .../Pages/NumericUpDownPage.xaml              |   6 -
 .../Pages/NumericUpDownPage.xaml.cs           |   2 +-
 .../NumericUpDown/NumericUpDown.cs            | 229 +++---------------
 3 files changed, 32 insertions(+), 205 deletions(-)

diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
index d90f2dffb2..a5c911f47d 100644
--- a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
+++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
@@ -19,8 +19,6 @@
         <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="2">ClipValueToMinMax:</TextBlock>
         <CheckBox Grid.Row="3" Grid.Column="1" IsChecked="{Binding #upDown.ClipValueToMinMax}" VerticalAlignment="Center" Margin="2"/>
 
-        <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="2">DisplayDefaultValueOnEmptyText:</TextBlock>
-        <CheckBox Grid.Row="4" Grid.Column="1" IsChecked="{Binding #upDown.DisplayDefaultValueOnEmptyText}" VerticalAlignment="Center" Margin="2"/>
       </Grid>
       <Grid Grid.Row="0" Grid.Column="1" Margin="10,2,2,2" ColumnDefinitions="Auto, 120" RowDefinitions="35,35,35,35,35">
         <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="2">FormatString:</TextBlock>
@@ -68,10 +66,6 @@
         <NumericUpDown Grid.Row="3" Grid.Column="1" Value="{Binding #upDown.Value}" VerticalAlignment="Center"
                        Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
 
-        <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">DefaultValue:</TextBlock>
-        <NumericUpDown Grid.Row="4" Grid.Column="1" Value="{Binding #upDown.DefaultValue}"
-                       VerticalAlignment="Center" Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
-
       </Grid>
     </Grid>
 
diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
index 4e3da69ede..92da64d87e 100644
--- a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
@@ -79,7 +79,7 @@ namespace ControlCatalog.Pages
             new CultureInfo("cs-CZ")
         };
 
-    public FormatObject SelectedFormat
+        public FormatObject SelectedFormat
         {
             get { return _selectedFormat; }
             set { this.RaiseAndSetIfChanged(ref _selectedFormat, value); }
diff --git a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
index 4d3c983640..258ab2c508 100644
--- a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
+++ b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
@@ -7,6 +7,7 @@ using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Threading;
+using Avalonia.Utilities;
 
 namespace Avalonia.Controls
 {
@@ -47,18 +48,6 @@ namespace Avalonia.Controls
             AvaloniaProperty.RegisterDirect<NumericUpDown, CultureInfo>(nameof(CultureInfo), o => o.CultureInfo,
                 (o, v) => o.CultureInfo = v, CultureInfo.CurrentCulture);
 
-        /// <summary>
-        /// Defines the <see cref="DefaultValue"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double?> DefaultValueProperty =
-            AvaloniaProperty.Register<NumericUpDown, double?>(nameof(DefaultValue));
-
-        /// <summary>
-        /// Defines the <see cref="DisplayDefaultValueOnEmptyText"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> DisplayDefaultValueOnEmptyTextProperty =
-            AvaloniaProperty.Register<NumericUpDown, bool>(nameof(DisplayDefaultValueOnEmptyText));
-
         /// <summary>
         /// Defines the <see cref="FormatString"/> property.
         /// </summary>
@@ -106,8 +95,8 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="Value"/> property.
         /// </summary>
-        public static readonly DirectProperty<NumericUpDown, double?> ValueProperty =
-            AvaloniaProperty.RegisterDirect<NumericUpDown, double?>(nameof(Value), updown => updown.Value,
+        public static readonly DirectProperty<NumericUpDown, double> ValueProperty =
+            AvaloniaProperty.RegisterDirect<NumericUpDown, double>(nameof(Value), updown => updown.Value,
                 (updown, v) => updown.Value = v, defaultBindingMode: BindingMode.TwoWay);
 
         /// <summary>
@@ -118,7 +107,7 @@ namespace Avalonia.Controls
 
         private IDisposable _textBoxTextChangedSubscription;
 
-        private double? _value;
+        private double _value;
         private string _text;
         private bool _internalValueSet;
         private bool _clipValueToMinMax;
@@ -182,24 +171,6 @@ namespace Avalonia.Controls
             set { SetAndRaise(CultureInfoProperty, ref _cultureInfo, value); }
         }
 
-        /// <summary>
-        /// Gets or sets the value to use when the <see cref="Value"/> is null and an increment/decrement operation is performed.
-        /// </summary>
-        public double? DefaultValue
-        {
-            get { return GetValue(DefaultValueProperty); }
-            set { SetValue(DefaultValueProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets if the defaultValue should be displayed when the Text is empty.
-        /// </summary>
-        public bool DisplayDefaultValueOnEmptyText
-        {
-            get { return GetValue(DisplayDefaultValueOnEmptyTextProperty); }
-            set { SetValue(DisplayDefaultValueOnEmptyTextProperty, value); }
-        }
-
         /// <summary>
         /// Gets or sets the display format of the <see cref="Value"/>.
         /// </summary>
@@ -266,7 +237,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the value.
         /// </summary>
-        public double? Value
+        public double Value
         {
             get { return _value; }
             set
@@ -307,8 +278,6 @@ namespace Avalonia.Controls
         static NumericUpDown()
         {
             CultureInfoProperty.Changed.Subscribe(OnCultureInfoChanged);
-            DefaultValueProperty.Changed.Subscribe(OnDefaultValueChanged);
-            DisplayDefaultValueOnEmptyTextProperty.Changed.Subscribe(OnDisplayDefaultValueOnEmptyTextChanged);
             FormatStringProperty.Changed.Subscribe(FormatStringChanged);
             IncrementProperty.Changed.Subscribe(IncrementChanged);
             IsReadOnlyProperty.Changed.Subscribe(OnIsReadOnlyChanged);
@@ -374,32 +343,6 @@ namespace Avalonia.Controls
             }
         }
 
-        /// <summary>
-        /// Called when the <see cref="DefaultValue"/> property value changed.
-        /// </summary>
-        /// <param name="oldValue">The old value.</param>
-        /// <param name="newValue">The new value.</param>
-        protected virtual void OnDefaultValueChanged(double oldValue, double newValue)
-        {
-            if (IsInitialized && string.IsNullOrEmpty(Text))
-            {
-                SyncTextAndValueProperties(true, Text);
-            }
-        }
-
-        /// <summary>
-        /// Called when the <see cref="DisplayDefaultValueOnEmptyText"/> property value changed.
-        /// </summary>
-        /// <param name="oldValue">The old value.</param>
-        /// <param name="newValue">The new value.</param>
-        protected virtual void OnDisplayDefaultValueOnEmptyTextChanged(bool oldValue, bool newValue)
-        {
-            if (IsInitialized && string.IsNullOrEmpty(Text))
-            {
-                SyncTextAndValueProperties(false, Text);
-            }
-        }
-
         /// <summary>
         /// Called when the <see cref="FormatString"/> property value changed.
         /// </summary>
@@ -447,9 +390,9 @@ namespace Avalonia.Controls
             {
                 SetValidSpinDirection();
             }
-            if (Value.HasValue && ClipValueToMinMax)
+            if (ClipValueToMinMax)
             {
-                Value = CoerceValueMinMax(Value.Value);
+                Value = MathUtilities.Clamp(Value, Minimum, Maximum);
             }
         }
 
@@ -464,9 +407,9 @@ namespace Avalonia.Controls
             {
                 SetValidSpinDirection();
             }
-            if (Value.HasValue && ClipValueToMinMax)
+            if (ClipValueToMinMax)
             {
-                Value = CoerceValueMinMax(Value.Value);
+                Value = MathUtilities.Clamp(Value, Minimum, Maximum);
             }
         }
 
@@ -531,7 +474,7 @@ namespace Avalonia.Controls
         /// Called when the <see cref="Value"/> property has to be coerced.
         /// </summary>
         /// <param name="baseValue">The value.</param>
-        protected virtual double? OnCoerceValue(double? baseValue)
+        protected virtual double OnCoerceValue(double baseValue)
         {
             return baseValue;
         }
@@ -574,9 +517,9 @@ namespace Avalonia.Controls
         /// <summary>
         /// Converts the formatted text to a value.
         /// </summary>
-        private double? ConvertTextToValue(string text)
+        private double ConvertTextToValue(string text)
         {
-            double? result = null;
+            double result = 0;
 
             if (string.IsNullOrEmpty(text))
             {
@@ -595,10 +538,10 @@ namespace Avalonia.Controls
 
             if (ClipValueToMinMax)
             {
-                return GetClippedMinMaxValue(result);
+                return MathUtilities.Clamp(result, Minimum, Maximum);
             }
 
-            ValidateDefaultMinMax(result);
+            ValidateMinMax(result);
 
             return result;
         }
@@ -609,19 +552,13 @@ namespace Avalonia.Controls
         /// <returns></returns>
         private string ConvertValueToText()
         {
-            if (Value == null)
-            {
-                return string.Empty;
-            }
-
             //Manage FormatString of type "{}{0:N2} °" (in xaml) or "{0:N2} °" in code-behind.
             if (FormatString.Contains("{0"))
             {
-                return string.Format(CultureInfo, FormatString, Value.Value);
+                return string.Format(CultureInfo, FormatString, Value);
             }
 
-            return Value.Value.ToString(FormatString, CultureInfo);
-
+            return Value.ToString(FormatString, CultureInfo);
         }
 
         /// <summary>
@@ -629,11 +566,8 @@ namespace Avalonia.Controls
         /// </summary>
         private void OnIncrement()
         {
-            if (!HandleNullSpin())
-            {
-                var result = Value.Value + Increment;
-                Value = CoerceValueMinMax(result);
-            }
+            var result = Value + Increment;
+            Value = MathUtilities.Clamp(result, Minimum, Maximum);
         }
 
         /// <summary>
@@ -641,11 +575,8 @@ namespace Avalonia.Controls
         /// </summary>
         private void OnDecrement()
         {
-            if (!HandleNullSpin())
-            {
-                var result = Value.Value - Increment;
-                Value = CoerceValueMinMax(result);
-            }
+            var result = Value - Increment;
+            Value = MathUtilities.Clamp(result, Minimum, Maximum);
         }
 
         /// <summary>
@@ -658,12 +589,12 @@ namespace Avalonia.Controls
             // Zero increment always prevents spin.
             if (Increment != 0 && !IsReadOnly)
             {
-                if (IsLowerThan(Value, Maximum) || !Value.HasValue)
+                if (Value < Maximum)
                 {
                     validDirections = validDirections | ValidSpinDirections.Increase;
                 }
 
-                if (IsGreaterThan(Value, Minimum) || !Value.HasValue)
+                if (Value > Minimum)
                 {
                     validDirections = validDirections | ValidSpinDirections.Decrease;
                 }
@@ -689,34 +620,6 @@ namespace Avalonia.Controls
             }
         }
 
-        /// <summary>
-        /// Called when the <see cref="DefaultValue"/> property value changed.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private static void OnDefaultValueChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            if (e.Sender is NumericUpDown upDown)
-            {
-                var oldValue = (double)e.OldValue;
-                var newValue = (double)e.NewValue;
-                upDown.OnDefaultValueChanged(oldValue, newValue);
-            }
-        }
-
-        /// <summary>
-        /// Called when the <see cref="DisplayDefaultValueOnEmptyText"/> property value changed.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private static void OnDisplayDefaultValueOnEmptyTextChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            if (e.Sender is NumericUpDown upDown)
-            {
-                var oldValue = (bool) e.OldValue;
-                var newValue = (bool) e.NewValue;
-                upDown.OnDisplayDefaultValueOnEmptyTextChanged(oldValue, newValue);
-            }
-        }
-
         /// <summary>
         /// Called when the <see cref="Increment"/> property value changed.
         /// </summary>
@@ -815,7 +718,7 @@ namespace Avalonia.Controls
             }
         }
 
-        private void SetValueInternal(double? value)
+        private void SetValueInternal(double value)
         {
             _internalValueSet = true;
             try
@@ -947,12 +850,7 @@ namespace Avalonia.Controls
             {
                 if (updateValueFromText)
                 {
-                    if (string.IsNullOrEmpty(text))
-                    {
-                        // An empty input sets the value to the default value.
-                        SetValueInternal(DefaultValue);
-                    }
-                    else
+                    if (!string.IsNullOrEmpty(text))
                     {
                         try
                         {
@@ -972,9 +870,8 @@ namespace Avalonia.Controls
                 // Do not touch the ongoing text input from user.
                 if (!_isTextChangedFromUI)
                 {
-                    // Don't replace the empty Text with the non-empty representation of DefaultValue.
-                    var shouldKeepEmpty = !forceTextUpdate && string.IsNullOrEmpty(Text) && Equals(Value, DefaultValue) && !DisplayDefaultValueOnEmptyText;
-                    if (!shouldKeepEmpty)
+                    var keepEmpty = !forceTextUpdate && string.IsNullOrEmpty(Text);
+                    if (!keepEmpty)
                     {
                         var newText = ConvertValueToText();
                         if (!Equals(Text, newText))
@@ -1011,54 +908,9 @@ namespace Avalonia.Controls
             return parsedTextIsValid;
         }
 
-        private double? CoerceValueMinMax(double? value)
-        {
-            if (IsLowerThan(value, Minimum))
-            {
-                return Minimum;
-            }
-            else if (IsGreaterThan(value, Maximum))
-            {
-                return Maximum;
-            }
-            else
-            {
-                return value;
-            }
-        }
-
-        private static bool IsLowerThan(double? value1, double? value2)
-        {
-            if (value1 == null || value2 == null)
-            {
-                return false;
-            }
-            return value1.Value < value2.Value;
-        }
-
-        private static bool IsGreaterThan(double? value1, double? value2)
-        {
-            if (value1 == null || value2 == null)
-            {
-                return false;
-            }
-            return value1.Value > value2.Value;
-        }
-
-        private bool HandleNullSpin()
-        {
-            if (!Value.HasValue)
-            {
-                var forcedValue = DefaultValue ?? default(double);
-                Value = CoerceValueMinMax(forcedValue);
-                return true;
-            }
-            return false;
-        }
-
-        private double? ConvertTextToValueCore(string currentValueText, string text)
+        private double ConvertTextToValueCore(string currentValueText, string text)
         {
-            double? result;
+            double result;
 
             if (IsPercent(FormatString))
             {
@@ -1102,32 +954,13 @@ namespace Avalonia.Controls
             return result;
         }
 
-        private double? GetClippedMinMaxValue(double? result)
+        private void ValidateMinMax(double value)
         {
-            if (IsGreaterThan(result, Maximum))
-            {
-                return Maximum;
-            }
-            else if (IsLowerThan(result, Minimum))
-            {
-                return Minimum;
-            }
-            return result;
-        }
-
-        private void ValidateDefaultMinMax(double? value)
-        {
-            // DefaultValue is always accepted.
-            if (Equals(value, DefaultValue))
-            {
-                return;
-            }
-
-            if (IsLowerThan(value, Minimum))
+            if (value < Minimum)
             {
                 throw new ArgumentOutOfRangeException(nameof(Minimum), string.Format("Value must be greater than Minimum value of {0}", Minimum));
             }
-            else if (IsGreaterThan(value, Maximum))
+            else if (value > Maximum)
             {
                 throw new ArgumentOutOfRangeException(nameof(Maximum), string.Format("Value must be less than Maximum value of {0}", Maximum));
             }

From 19dbf38e1ecdf889d14f1b3cb0382b8083e7e1aa Mon Sep 17 00:00:00 2001
From: dzhelnin <mitya_zh@mail.ru>
Date: Sun, 25 Mar 2018 00:34:02 +0300
Subject: [PATCH 443/482] Cleanup remaining "double?" entries

---
 src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs      | 8 ++++----
 .../NumericUpDown/NumericUpDownValueChangedEventArgs.cs   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
index 258ab2c508..59d2949b81 100644
--- a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
+++ b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
@@ -431,7 +431,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="oldValue">The old value.</param>
         /// <param name="newValue">The new value.</param>
-        protected virtual void OnValueChanged(double? oldValue, double? newValue)
+        protected virtual void OnValueChanged(double oldValue, double newValue)
         {
             if (!_internalValueSet && IsInitialized)
             {
@@ -508,7 +508,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="oldValue">The old value.</param>
         /// <param name="newValue">The new value.</param>
-        protected virtual void RaiseValueChangedEvent(double? oldValue, double? newValue)
+        protected virtual void RaiseValueChangedEvent(double oldValue, double newValue)
         {
             var e = new NumericUpDownValueChangedEventArgs(ValueChangedEvent, oldValue, newValue);
             RaiseEvent(e);
@@ -712,8 +712,8 @@ namespace Avalonia.Controls
         {
             if (e.Sender is NumericUpDown upDown)
             {
-                var oldValue = (double?)e.OldValue;
-                var newValue = (double?)e.NewValue;
+                var oldValue = (double)e.OldValue;
+                var newValue = (double)e.NewValue;
                 upDown.OnValueChanged(oldValue, newValue);
             }
         }
diff --git a/src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs b/src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs
index 4fd8873c53..e994ffdd15 100644
--- a/src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs
+++ b/src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs
@@ -4,13 +4,13 @@ namespace Avalonia.Controls
 {
     public class NumericUpDownValueChangedEventArgs : RoutedEventArgs
     {
-        public NumericUpDownValueChangedEventArgs(RoutedEvent routedEvent, double? oldValue,  double? newValue) : base(routedEvent)
+        public NumericUpDownValueChangedEventArgs(RoutedEvent routedEvent, double oldValue,  double newValue) : base(routedEvent)
         {
             OldValue = oldValue;
             NewValue = newValue;
         }
 
-        public double? OldValue { get; }
-        public double? NewValue { get; }
+        public double OldValue { get; }
+        public double NewValue { get; }
     }
 }

From 50dd6cb66d82ee19e872e9f56f6f5d284dc198d2 Mon Sep 17 00:00:00 2001
From: Benedikt Schroeder <benedikt.schroeder@outlook.de>
Date: Mon, 26 Mar 2018 11:39:17 +0200
Subject: [PATCH 444/482] Requested changes

---
 src/Avalonia.Controls/Border.cs               | 161 +---------
 .../Presenters/ContentPresenter.cs            |   7 +-
 .../Utils/BorderRenderHelper.cs               | 279 ++++++++++++++++++
 .../Accents/BaseLight.xaml                    |   5 +-
 src/Avalonia.Visuals/CornerRadius.cs          |  10 +-
 .../Properties/AssemblyInfo.cs                |   1 +
 .../Avalonia.Direct2D1/Media/GeometryImpl.cs  |  12 +-
 7 files changed, 297 insertions(+), 178 deletions(-)
 create mode 100644 src/Avalonia.Controls/Utils/BorderRenderHelper.cs

diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index 2dd3c0fa05..06ad8a4837 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -1,8 +1,8 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using System;
 using Avalonia;
+using Avalonia.Controls.Utils;
 using Avalonia.Media;
 
 namespace Avalonia.Controls
@@ -10,7 +10,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// A control which decorates a child with a border and background.
     /// </summary>
-    public class Border : Decorator
+    public partial class Border : Decorator
     {
         /// <summary>
         /// Defines the <see cref="Background"/> property.
@@ -36,7 +36,7 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<CornerRadius> CornerRadiusProperty =
             AvaloniaProperty.Register<Border, CornerRadius>(nameof(CornerRadius));
 
-        private readonly BorderRenderer _borderRenderer = new BorderRenderer();
+        private readonly BorderRenderHelper _borderRenderHelper = new BorderRenderHelper();
 
         /// <summary>
         /// Initializes static members of the <see cref="Border"/> class.
@@ -88,7 +88,7 @@ namespace Avalonia.Controls
         /// <param name="context">The drawing context.</param>
         public override void Render(DrawingContext context)
         {
-            _borderRenderer.Render(context, Bounds.Size, BorderThickness, CornerRadius, Background, BorderBrush);
+            _borderRenderHelper.Render(context, Bounds.Size, BorderThickness, CornerRadius, Background, BorderBrush);
         }
 
         /// <summary>
@@ -114,7 +114,7 @@ namespace Avalonia.Controls
                 Child.Arrange(new Rect(finalSize).Deflate(padding));
             }
 
-            _borderRenderer.Update(finalSize, BorderThickness, CornerRadius);
+            _borderRenderHelper.Update(finalSize, BorderThickness, CornerRadius);           
 
             return finalSize;
         }
@@ -135,156 +135,5 @@ namespace Avalonia.Controls
 
             return new Size(padding.Left + padding.Right, padding.Bottom + padding.Top);
         }
-
-        internal class BorderRenderer
-        {
-            private bool _useComplexRendering;
-            private StreamGeometry _backgroundGeometryCache;
-            private StreamGeometry _borderGeometryCache;
-
-            public void Update(Size finalSize, Thickness borderThickness, CornerRadius cornerRadius)
-            {
-                if (borderThickness.IsUniform && cornerRadius.IsUniform)
-                {
-                    _backgroundGeometryCache = null;
-                    _borderGeometryCache = null;
-                    _useComplexRendering = false;
-                }
-                else
-                {
-                    _useComplexRendering = true;
-
-                    var boundRect = new Rect(finalSize);
-                    var innerRect = new Rect(borderThickness.Left, borderThickness.Top,
-                        Math.Max(0, boundRect.Width - borderThickness.Right), 
-                        Math.Max(0, boundRect.Height - borderThickness.Bottom));
-
-                    StreamGeometry backgroundGeometry = null;
-
-                    if (!innerRect.Width.Equals(0) && !innerRect.Height.Equals(0))
-                    {
-                        backgroundGeometry = new StreamGeometry();
-
-                        using (var ctx = backgroundGeometry.Open())
-                        {
-                            CreateGeometry(ctx, innerRect, cornerRadius);
-                        }
-
-                        _backgroundGeometryCache = backgroundGeometry;
-                    }
-                    else
-                    {
-                        _backgroundGeometryCache = null;
-                    }                  
-
-                    if (!boundRect.Width.Equals(0) && !innerRect.Height.Equals(0))
-                    {
-                        var borderGeometry = new StreamGeometry();
-
-                        using (var ctx = borderGeometry.Open())
-                        {
-                            CreateGeometry(ctx, boundRect, cornerRadius);
-
-                            if (backgroundGeometry != null)
-                            {
-                                CreateGeometry(ctx, innerRect, cornerRadius);
-                            }
-                        }
-
-                        _borderGeometryCache = borderGeometry;
-                    }
-                    else
-                    {
-                        _borderGeometryCache = null;
-                    }
-                }
-            }
-
-            private static void CreateGeometry(StreamGeometryContext context, Rect boundRect, CornerRadius cornerRadius)
-            {
-                var topLeft = new Point(boundRect.X + cornerRadius.TopLeft, boundRect.Y);
-                var topRight = new Point(boundRect.Width - cornerRadius.TopRight, boundRect.Y);
-                var rightTop = new Point(boundRect.Width, boundRect.Y + cornerRadius.TopRight);
-                var rightBottom = new Point(boundRect.Width, boundRect.Height - cornerRadius.BottomRight);
-                var bottomRight = new Point(boundRect.Width - cornerRadius.BottomRight, boundRect.Height);
-                var bottomLeft = new Point(boundRect.X + cornerRadius.BottomLeft, boundRect.Height);
-                var leftBottom = new Point(boundRect.X, boundRect.Height - cornerRadius.BottomLeft);
-                var leftTop = new Point(boundRect.X, boundRect.Y + cornerRadius.TopLeft);
-
-                context.BeginFigure(topLeft, true);
-
-                //Top
-                context.LineTo(topRight);
-
-                //TopRight corner
-                if (topRight != rightTop)
-                {
-                    context.ArcTo(rightTop, new Size(cornerRadius.TopRight, cornerRadius.TopRight), 0, false, SweepDirection.Clockwise);
-                }
-
-                //Right
-                context.LineTo(rightBottom);
-
-                //BottomRight corner
-                if (rightBottom != bottomRight)
-                {
-                    context.ArcTo(bottomRight, new Size(cornerRadius.BottomRight, cornerRadius.BottomRight), 0, false, SweepDirection.Clockwise);
-                }
-
-                //Bottom
-                context.LineTo(bottomLeft);
-
-                //BottomLeft corner
-                if (bottomLeft != leftBottom)
-                {
-                    context.ArcTo(leftBottom, new Size(cornerRadius.BottomLeft, cornerRadius.BottomLeft), 0, false, SweepDirection.Clockwise);
-                }
-
-                //Left
-                context.LineTo(leftTop);
-
-                //TopLeft corner
-                if (leftTop != topLeft)
-                {
-                    context.ArcTo(topLeft, new Size(cornerRadius.TopLeft, cornerRadius.TopLeft), 0, false, SweepDirection.Clockwise);
-                }
-
-                context.EndFigure(true);
-            }
-
-            public void Render(DrawingContext context, Size size, Thickness borders, CornerRadius radii, IBrush background, IBrush borderBrush)
-            {
-                if (_useComplexRendering)
-                {
-                    var backgroundGeometry = _backgroundGeometryCache;
-                    if (backgroundGeometry != null)
-                    {
-                        context.DrawGeometry(background, null, backgroundGeometry);
-                    }
-
-                    var borderGeometry = _borderGeometryCache;
-                    if (borderGeometry != null)
-                    {
-                        context.DrawGeometry(borderBrush, null, borderGeometry);
-                    }
-                }
-                else
-                {
-                    var borderThickness = borders.Left;
-                    var cornerRadius = (float)radii.TopLeft;
-                    var rect = new Rect(size);
-
-                    if (background != null)
-                    {
-                        context.FillRectangle(background, rect.Deflate(borders), cornerRadius);
-                    }
-
-                    if (borderBrush != null && borderThickness > 0)
-                    {
-                        context.DrawRectangle(new Pen(borderBrush, borderThickness), rect.Deflate(borderThickness), cornerRadius);
-                    }
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index 2d623dcbf7..cc6c6f364f 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -4,6 +4,7 @@
 using System;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
+using Avalonia.Controls.Utils;
 using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
@@ -76,12 +77,12 @@ namespace Avalonia.Controls.Presenters
         /// Defines the <see cref="Padding"/> property.
         /// </summary>
         public static readonly StyledProperty<Thickness> PaddingProperty =
-            Border.PaddingProperty.AddOwner<ContentPresenter>();
+            Decorator.PaddingProperty.AddOwner<ContentPresenter>();
 
         private IControl _child;
         private bool _createdChild;
         private IDataTemplate _dataTemplate;
-        private readonly Border.BorderRenderer _borderRenderer = new Border.BorderRenderer();
+        private readonly BorderRenderHelper _borderRenderer = new BorderRenderHelper();
 
         /// <summary>
         /// Initializes static members of the <see cref="ContentPresenter"/> class.
@@ -438,7 +439,7 @@ namespace Avalonia.Controls.Presenters
         {
             var result = (VisualRoot as ILayoutRoot)?.LayoutScaling ?? 1.0;
 
-            if (result.Equals(0) || double.IsNaN(result) || double.IsInfinity(result))
+            if (result == 0 || double.IsNaN(result) || double.IsInfinity(result))
             {
                 throw new Exception($"Invalid LayoutScaling returned from {VisualRoot.GetType()}");
             }
diff --git a/src/Avalonia.Controls/Utils/BorderRenderHelper.cs b/src/Avalonia.Controls/Utils/BorderRenderHelper.cs
new file mode 100644
index 0000000000..d9169e51f3
--- /dev/null
+++ b/src/Avalonia.Controls/Utils/BorderRenderHelper.cs
@@ -0,0 +1,279 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Utils
+{
+    internal class BorderRenderHelper
+    {
+        private bool _useComplexRendering;
+        private StreamGeometry _backgroundGeometryCache;
+        private StreamGeometry _borderGeometryCache;
+
+        public void Update(Size finalSize, Thickness borderThickness, CornerRadius cornerRadius)
+        {
+            if (borderThickness.IsUniform && cornerRadius.IsUniform)
+            {
+                _backgroundGeometryCache = null;
+                _borderGeometryCache = null;
+                _useComplexRendering = false;
+            }
+            else
+            {
+                _useComplexRendering = true;
+
+                var boundRect = new Rect(finalSize);
+                var innerRect = boundRect.Deflate(borderThickness);
+                var innerCoordinates = new BorderCoordinates(cornerRadius, borderThickness, false);
+
+                StreamGeometry backgroundGeometry = null;
+
+                if (innerRect.Width != 0 && innerRect.Height != 0)
+                {
+                    backgroundGeometry = new StreamGeometry();
+
+                    using (var ctx = backgroundGeometry.Open())
+                    {
+                        CreateGeometry(ctx, innerRect, innerCoordinates);
+                    }
+
+                    _backgroundGeometryCache = backgroundGeometry;
+                }
+                else
+                {
+                    _backgroundGeometryCache = null;
+                }
+
+                if (boundRect.Width != 0 && innerRect.Height != 0)
+                {
+                    var outerCoordinates = new BorderCoordinates(cornerRadius, borderThickness, true);
+                    var borderGeometry = new StreamGeometry();
+
+                    using (var ctx = borderGeometry.Open())
+                    {
+                        CreateGeometry(ctx, boundRect, outerCoordinates);
+
+                        if (backgroundGeometry != null)
+                        {
+                            CreateGeometry(ctx, innerRect, innerCoordinates);
+                        }
+                    }
+
+                    _borderGeometryCache = borderGeometry;
+                }
+                else
+                {
+                    _borderGeometryCache = null;
+                }
+            }
+        }
+
+        public void Render(DrawingContext context, Size size, Thickness borders, CornerRadius radii, IBrush background, IBrush borderBrush)
+        {
+            if (_useComplexRendering)
+            {
+                var backgroundGeometry = _backgroundGeometryCache;
+                if (backgroundGeometry != null)
+                {
+                    context.DrawGeometry(background, null, backgroundGeometry);
+                }
+
+                var borderGeometry = _borderGeometryCache;
+                if (borderGeometry != null)
+                {
+                    context.DrawGeometry(borderBrush, null, borderGeometry);
+                }
+            }
+            else
+            {
+                var borderThickness = borders.Left;
+                var cornerRadius = (float)radii.TopLeft;
+                var rect = new Rect(size);
+
+                if (background != null)
+                {
+                    context.FillRectangle(background, rect.Deflate(borders), cornerRadius);
+                }
+
+                if (borderBrush != null && borderThickness > 0)
+                {
+                    context.DrawRectangle(new Pen(borderBrush, borderThickness), rect.Deflate(borderThickness), cornerRadius);
+                }
+            }
+        }
+
+        private static void CreateGeometry(StreamGeometryContext context, Rect boundRect, BorderCoordinates borderCoordinates)
+        {
+            var topLeft = new Point(borderCoordinates.LeftTop, 0);
+            var topRight = new Point(boundRect.Width - borderCoordinates.RightTop, 0);
+            var rightTop = new Point(boundRect.Width, borderCoordinates.TopRight);
+            var rightBottom = new Point(boundRect.Width, boundRect.Height - borderCoordinates.BottomRight);
+            var bottomRight = new Point(boundRect.Width - borderCoordinates.RightBottom, boundRect.Height);
+            var bottomLeft = new Point(borderCoordinates.LeftBottom, boundRect.Height);
+            var leftBottom = new Point(0, boundRect.Height - borderCoordinates.BottomLeft);
+            var leftTop = new Point(0, borderCoordinates.TopLeft);
+
+
+            if (topLeft.X > topRight.X)
+            {
+                var scaledX = borderCoordinates.LeftTop / (borderCoordinates.LeftTop + borderCoordinates.RightTop) * boundRect.Width;
+                topLeft = new Point(scaledX, topLeft.Y);
+                topRight = new Point(scaledX, topRight.Y);
+            }
+
+            if (rightTop.Y > rightBottom.Y)
+            {
+                var scaledY = borderCoordinates.TopRight / (borderCoordinates.TopRight + borderCoordinates.BottomRight) * boundRect.Height;
+                rightTop = new Point(rightTop.X, scaledY);
+                rightBottom = new Point(rightBottom.X, scaledY);
+            }
+
+            if (bottomRight.X < bottomLeft.X)
+            {
+                var scaledX = borderCoordinates.LeftBottom / (borderCoordinates.LeftBottom + borderCoordinates.RightBottom) * boundRect.Width;
+                bottomRight = new Point(scaledX, bottomRight.Y);
+                bottomLeft = new Point(scaledX, bottomLeft.Y);
+            }
+
+            if (leftBottom.Y < leftTop.Y)
+            {
+                var scaledY = borderCoordinates.TopLeft / (borderCoordinates.TopLeft + borderCoordinates.BottomLeft) * boundRect.Height;
+                leftBottom = new Point(leftBottom.X, scaledY);
+                leftTop = new Point(leftTop.X, scaledY);
+            }
+
+            var offset = new Vector(boundRect.TopLeft.X, boundRect.TopLeft.Y);
+            topLeft += offset;
+            topRight += offset;
+            rightTop += offset;
+            rightBottom += offset;
+            bottomRight += offset;
+            bottomLeft += offset;
+            leftBottom += offset;
+            leftTop += offset;
+
+            context.BeginFigure(topLeft, true);
+
+            //Top
+            context.LineTo(topRight);
+
+            //TopRight corner
+            var radiusX = boundRect.TopRight.X - topRight.X;
+            var radiusY = rightTop.Y - boundRect.TopRight.Y;
+            if (radiusX != 0 || radiusY != 0)
+            {
+                context.ArcTo(rightTop, new Size(radiusY, radiusY), 0, false, SweepDirection.Clockwise);
+            }
+
+            //Right
+            context.LineTo(rightBottom);
+
+            //BottomRight corner
+            radiusX = boundRect.BottomRight.X - bottomRight.X;
+            radiusY = boundRect.BottomRight.Y - rightBottom.Y;
+            if (radiusX != 0 || radiusY != 0)
+            {
+                context.ArcTo(bottomRight, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+            }
+
+            //Bottom
+            context.LineTo(bottomLeft);
+
+            //BottomLeft corner
+            radiusX = bottomLeft.X - boundRect.BottomLeft.X;
+            radiusY = boundRect.BottomLeft.Y - leftBottom.Y;
+            if (radiusX != 0 || radiusY != 0)
+            {
+                context.ArcTo(leftBottom, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+            }
+
+            //Left
+            context.LineTo(leftTop);
+
+            //TopLeft corner
+            radiusX = topLeft.X - boundRect.TopLeft.X;
+            radiusY = leftTop.Y - boundRect.TopLeft.Y;
+
+            if (radiusX != 0 || radiusY != 0)
+            {
+                context.ArcTo(topLeft, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
+            }
+
+            context.EndFigure(true);
+        }
+
+        private struct BorderCoordinates
+        {
+            internal BorderCoordinates(CornerRadius cornerRadius, Thickness borderThickness, bool isOuter)
+            {
+                var left = 0.5 * borderThickness.Left;
+                var top = 0.5 * borderThickness.Top;
+                var right = 0.5 * borderThickness.Right;
+                var bottom = 0.5 * borderThickness.Bottom;
+
+                if (isOuter)
+                {
+                    if (cornerRadius.TopLeft == 0)
+                    {
+                        LeftTop = TopLeft = 0.0;
+                    }
+                    else
+                    {
+                        LeftTop = cornerRadius.TopLeft + left;
+                        TopLeft = cornerRadius.TopLeft + top;
+                    }
+                    if (cornerRadius.TopRight == 0)
+                    {
+                        TopRight = RightTop = 0;
+                    }
+                    else
+                    {
+                        TopRight = cornerRadius.TopRight + top;
+                        RightTop = cornerRadius.TopRight + right;
+                    }
+                    if (cornerRadius.BottomRight == 0)
+                    {
+                        RightBottom = BottomRight = 0;
+                    }
+                    else
+                    {
+                        RightBottom = cornerRadius.BottomRight + right;
+                        BottomRight = cornerRadius.BottomRight + bottom;
+                    }
+                    if (cornerRadius.BottomLeft == 0)
+                    {
+                        BottomLeft = LeftBottom = 0;
+                    }
+                    else
+                    {
+                        BottomLeft = cornerRadius.BottomLeft + bottom;
+                        LeftBottom = cornerRadius.BottomLeft + left;
+                    }
+                }
+                else
+                {
+                    LeftTop = Math.Max(0, cornerRadius.TopLeft - left);
+                    TopLeft = Math.Max(0, cornerRadius.TopLeft - top);
+                    TopRight = Math.Max(0, cornerRadius.TopRight - top);
+                    RightTop = Math.Max(0, cornerRadius.TopRight - right);
+                    RightBottom = Math.Max(0, cornerRadius.BottomRight - right);
+                    BottomRight = Math.Max(0, cornerRadius.BottomRight - bottom);
+                    BottomLeft = Math.Max(0, cornerRadius.BottomLeft - bottom);
+                    LeftBottom = Math.Max(0, cornerRadius.BottomLeft - left);
+                }
+            }
+
+            internal readonly double LeftTop;
+            internal readonly double TopLeft;
+            internal readonly double TopRight;
+            internal readonly double RightTop;
+            internal readonly double RightBottom;
+            internal readonly double BottomRight;
+            internal readonly double BottomLeft;
+            internal readonly double LeftBottom;
+        }
+
+    }
+}
diff --git a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
index ebb14579b4..4c85e172ff 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
@@ -1,7 +1,6 @@
 <Style xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:sys="clr-namespace:System;assembly=mscorlib"
-       xmlns:avalonia="clr-namespace:Avalonia;assembly=Avalonia.Visuals">
+       xmlns:sys="clr-namespace:System;assembly=mscorlib">
   <Style.Resources>
     <SolidColorBrush x:Key="ThemeBackgroundBrush">#FFFFFFFF</SolidColorBrush>
     <SolidColorBrush x:Key="ThemeBorderLightBrush">#FFAAAAAA</SolidColorBrush>
@@ -21,7 +20,7 @@
     <SolidColorBrush x:Key="ErrorBrush">Red</SolidColorBrush>
     <SolidColorBrush x:Key="ErrorBrushLight">#10ff0000</SolidColorBrush>
 
-    <avalonia:Thickness x:Key="ThemeBorderThickness">2</avalonia:Thickness>
+    <Thickness x:Key="ThemeBorderThickness">2</Thickness>
     <sys:Double x:Key="ThemeDisabledOpacity">0.5</sys:Double>
 
     <sys:Double x:Key="FontSizeSmall">10</sys:Double>
diff --git a/src/Avalonia.Visuals/CornerRadius.cs b/src/Avalonia.Visuals/CornerRadius.cs
index 25e3b103cd..db0ac97d49 100644
--- a/src/Avalonia.Visuals/CornerRadius.cs
+++ b/src/Avalonia.Visuals/CornerRadius.cs
@@ -83,15 +83,15 @@ namespace Avalonia
 
         public static bool operator ==(CornerRadius cr1, CornerRadius cr2)
         {
-            return ((cr1.TopLeft.Equals(cr2.TopLeft) || double.IsNaN(cr1.TopLeft) && double.IsNaN(cr2.TopLeft)))
-                   && (cr1.TopRight.Equals(cr2.TopRight) || (double.IsNaN(cr1.TopRight) && double.IsNaN(cr2.TopRight)))
-                   && (cr1.BottomRight.Equals(cr2.BottomRight) || double.IsNaN(cr1.BottomRight) && double.IsNaN(cr2.BottomRight))
-                   && (cr1.BottomLeft.Equals(cr2.BottomLeft) || double.IsNaN(cr1.BottomLeft) && double.IsNaN(cr2.BottomLeft));
+            return cr1.TopLeft.Equals(cr2.TopLeft)
+                   && cr1.TopRight.Equals(cr2.TopRight)
+                   && cr1.BottomRight.Equals(cr2.BottomRight) 
+                   && cr1.BottomLeft.Equals(cr2.BottomLeft);
         }
 
         public static bool operator !=(CornerRadius cr1, CornerRadius cr2)
         {
-            return (!(cr1 == cr2));
+            return !(cr1 == cr2);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Properties/AssemblyInfo.cs b/src/Avalonia.Visuals/Properties/AssemblyInfo.cs
index 87347d64b1..900746d05a 100644
--- a/src/Avalonia.Visuals/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Visuals/Properties/AssemblyInfo.cs
@@ -9,6 +9,7 @@ using Avalonia.Metadata;
 [assembly: InternalsVisibleTo("Avalonia.Visuals.UnitTests")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia")]
 
 [assembly: InternalsVisibleTo("Avalonia.Direct2D1.RenderTests")]
 [assembly: InternalsVisibleTo("Avalonia.Skia.RenderTests")]
\ No newline at end of file
diff --git a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
index 4b0bb4d7f9..092b49e209 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
@@ -1,7 +1,6 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using System;
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
@@ -20,21 +19,12 @@ namespace Avalonia.Direct2D1.Media
         /// <inheritdoc/>
         public Rect Bounds => Geometry.GetWidenedBounds(0).ToAvalonia();
 
-        /// <inheritdoc/>
         public Geometry Geometry { get; }
 
         /// <inheritdoc/>
         public Rect GetRenderBounds(Avalonia.Media.Pen pen)
         {
-            //var factory = AvaloniaLocator.Current.GetService<Factory>();
-            if (pen == null)
-            {
-                return Geometry.GetWidenedBounds(0).ToAvalonia();
-            }
-            else
-            {
-                return Geometry.GetWidenedBounds((float)pen.Thickness).ToAvalonia();
-            }
+            return Geometry.GetWidenedBounds((float) (pen?.Thickness ?? 0)).ToAvalonia();
         }
 
         /// <inheritdoc/>

From a89f9486f17173c4f5392393b0b99afffbdb8a47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Tue, 3 Apr 2018 00:23:32 +0100
Subject: [PATCH 445/482] Implemented correct behavior for Command.CanExecute
 on MenuItem.

---
 src/Avalonia.Controls/MenuItem.cs         | 35 +++++++++++++++++++++++
 src/Avalonia.Themes.Default/MenuItem.xaml |  4 +++
 2 files changed, 39 insertions(+)

diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs
index dadd3b910b..96f6fb59b0 100644
--- a/src/Avalonia.Controls/MenuItem.cs
+++ b/src/Avalonia.Controls/MenuItem.cs
@@ -93,6 +93,7 @@ namespace Avalonia.Controls
         static MenuItem()
         {
             SelectableMixin.Attach<MenuItem>(IsSelectedProperty);
+            CommandProperty.Changed.Subscribe(CommandChanged);
             FocusableProperty.OverrideDefaultValue<MenuItem>(true);
             IconProperty.Changed.AddClassHandler<MenuItem>(x => x.IconChanged);
             ItemsPanelProperty.OverrideDefaultValue<MenuItem>(DefaultPanel);
@@ -424,6 +425,40 @@ namespace Avalonia.Controls
             }
         }
 
+        /// <summary>
+        /// Called when the <see cref="Command"/> property changes.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        private static void CommandChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Sender is MenuItem menuItem)
+            {
+                if (e.OldValue is ICommand oldCommand)
+                {
+                    oldCommand.CanExecuteChanged -= menuItem.CanExecuteChanged;
+                }
+
+                if (e.NewValue is ICommand newCommand)
+                {
+                    newCommand.CanExecuteChanged += menuItem.CanExecuteChanged;
+                }
+
+                menuItem.CanExecuteChanged(menuItem, EventArgs.Empty);
+            }
+        }
+
+        /// <summary>
+        /// Called when the <see cref="ICommand.CanExecuteChanged"/> event fires.
+        /// </summary>
+        /// <param name="sender">The event sender.</param>
+        /// <param name="e">The event args.</param>
+        private void CanExecuteChanged(object sender, EventArgs e)
+        {
+            // HACK: Just set the IsEnabled property for the moment. This needs to be changed to
+            // use IsEnabledCore etc. but it will do for now.
+            IsEnabled = Command == null || Command.CanExecute(CommandParameter);
+        }
+
         /// <summary>
         /// Called when the <see cref="Icon"/> property changes.
         /// </summary>
diff --git a/src/Avalonia.Themes.Default/MenuItem.xaml b/src/Avalonia.Themes.Default/MenuItem.xaml
index 1cd9587297..66f226d2f6 100644
--- a/src/Avalonia.Themes.Default/MenuItem.xaml
+++ b/src/Avalonia.Themes.Default/MenuItem.xaml
@@ -133,4 +133,8 @@
   <Style Selector="MenuItem:empty /template/ Path#rightArrow">
     <Setter Property="IsVisible" Value="False"/>
   </Style>
+
+  <Style Selector="MenuItem:disabled">
+    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
+  </Style>
 </Styles>
\ No newline at end of file

From 253ff568952e1b122f3f0efac98ac7bfc7e6e704 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 3 Apr 2018 23:05:08 +0200
Subject: [PATCH 446/482] Added a couple of Border CornerRadius render tests.

---
 .../Controls/BorderTests.cs                   |  40 ++++++++++++++++++
 ...order_NonUniform_CornerRadius.expected.png | Bin 0 -> 1084 bytes
 .../Border_Uniform_CornerRadius.expected.png  | Bin 0 -> 1307 bytes
 ...order_NonUniform_CornerRadius.expected.png | Bin 0 -> 1084 bytes
 .../Border_Uniform_CornerRadius.expected.png  | Bin 0 -> 1307 bytes
 5 files changed, 40 insertions(+)
 create mode 100644 tests/TestFiles/Direct2D1/Controls/Border/Border_NonUniform_CornerRadius.expected.png
 create mode 100644 tests/TestFiles/Direct2D1/Controls/Border/Border_Uniform_CornerRadius.expected.png
 create mode 100644 tests/TestFiles/Skia/Controls/Border/Border_NonUniform_CornerRadius.expected.png
 create mode 100644 tests/TestFiles/Skia/Controls/Border/Border_Uniform_CornerRadius.expected.png

diff --git a/tests/Avalonia.RenderTests/Controls/BorderTests.cs b/tests/Avalonia.RenderTests/Controls/BorderTests.cs
index 411870785a..7d2e40c3b4 100644
--- a/tests/Avalonia.RenderTests/Controls/BorderTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/BorderTests.cs
@@ -58,6 +58,46 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
             CompareImages();
         }
 
+        [Fact]
+        public async Task Border_Uniform_CornerRadius()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 200,
+                Child = new Border
+                {
+                    BorderBrush = Brushes.Black,
+                    BorderThickness = new Thickness(2),
+                    CornerRadius = new CornerRadius(16),
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
+        [Fact]
+        public async Task Border_NonUniform_CornerRadius()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 200,
+                Child = new Border
+                {
+                    BorderBrush = Brushes.Black,
+                    BorderThickness = new Thickness(2),
+                    CornerRadius = new CornerRadius(16, 4, 7, 10),
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
         [Fact]
         public async Task Border_Fill()
         {
diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_NonUniform_CornerRadius.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_NonUniform_CornerRadius.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..9deb45aaeb067d61c2774ba50214b80950db4763
GIT binary patch
literal 1084
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-V}>VM%xNb!1@J
z*w6hZk(Ggg`I)DSV@O5Z+gl4y$Fj;C`&gb7V;~_W*3-?lIB~&(gBuhgdf65q+>kcy
zFDG|cqNB@^1qRKIvk#^P1k6YXh={mRciuvLnjBwM+}`K+&a=z$z32R{`~3I3;`g=s
zK-+-8@5<DtJEpGQd_8^r*}OCB^iNm**#Fn?ciy*;Z)VT=v3`%y@1$=9-)_7)@jaug
zy6ok;v+vH$`}_2J`p>84={vi3R2S%cGWq;ar}0VDS<|Y_PmlQ1e!A`~zB5x*!lLXa
z^SsyJHZQl2ZTg<p&h`Fm+^mCfPy8ljo7X=upKkH#(M@+tM(dItZRS&tuR1*U@!vTO
zb8p#9*t6ea&+~%k3GdDLpM1y+y;pqTUapkKzUL>ppI+9=KViu_n{ARl<L9KG8sdHj
z(;A<2?>lV%WZ&}#Avt0v)<(u@+@ElGWrXO7;?o;X+RGiAep>L{u~`nE{)c>gThy|7
zquPWTUHSd`?hhpE&wg6-Y=4oZ>gs#VYc}5GJ}4Mj8oR#oNYiFj0Sy+WR)+-w93o7O
zP6`1WEL@Eailc%986ZbzIsA+33!kn$r`NRc&n}tuy6zUz*-SqRE$_wj6_{OP`Si1>
zCf)MTy}dhR`2F4gpW@!kzWMm(@?xg4cV{ElJ+Jn!zjfgD<~<MQZ+;C-b!F+(UjO`d
zdA`}FlRElU^=d-jUR}Mp_~zl8y>o7O$!)EhC;LuCZu^bdM?T)xx&DFOa^qH)qVj3+
z6KZWw=e}Bd^I<Q)%;cEqmFFiOUv<Z_=x&{9bzNDe&=LL3&Khae5pt`Go=3<YpZfHN
z|C8BYqc@wU>7W0!Po-SKLhYx<_un`9H~XjCpM_+=b9as&74}<xbj{mLxe}0&r>mdK
II;Vst0D%^uoB#j-

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Direct2D1/Controls/Border/Border_Uniform_CornerRadius.expected.png b/tests/TestFiles/Direct2D1/Controls/Border/Border_Uniform_CornerRadius.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4bfa75eb8fad329e993f4dde010964fa5572837
GIT binary patch
literal 1307
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-V}>VM%xNb!1@J
z*w6hZkrl{2>gnPbQW5v|*4n<%bcwda6{{SS1UOilm>m>6yPB7Dc=0V*v<}E;X?!AJ
z!N6k5o5|!UTqSUVi-ogvf`Y)8>KDI+&e-G}x@Ek1+4ZS=A~zg4)A9XWoc(VRpk)jU
z2RKWsEZ03fGb1~>PNF#T%+J&!xoh9@&a6(2>#MYTc5}uY`!K!!N~>poXY?PFd6>e!
zx%=ix<?_5Uiw)=hZ`40_N4B`s$Ii8;YJ>jGwQnNI-kzKB=HBz&Gwz=0lk5Bwn1AdE
zzvou|<1#npnY%Y9%k|6*H@<l>=9~Pg`NwM{Cfh$aIfFa-fyK$a`DMn|vtsw!J_}Ik
z`*Z2c-#HD*Z|=?5xqj!D`>SKZ&iePo7crSVxHd!bWbd3C?RVnORP)W3$vOK+rPBIY
zlHZzKyS1lEWpgg>QLp^-vR?a?@zXyKY$OYu&xNIyKfk<I+j8TyJryVU&n}L+vFS}g
znWgpKu01_7uU4Kvc<t%O{4z`a*<qEPwZ%Sl3HO2yc^cf`@%&}j*SkeIpN<~>k!*SB
z+S%BB`(*gHcq{x|=ly4^OycWjdi5WtB~EuJIxDt*x^m9lJ5NLBop^TCYu)u4?dg-1
zcF&o6F0X#`p9MT~RIJ~A)tesiVZW+?1`AWG!vX;g5vE2bg#Zo~u0{vNQ9-%}$ZnQT
zd6x4c`!<voPk){#pE2DbPWSld(}LUb-hHw^{m~&__{7eq9MR_GKi@yCSP;upxl?An
zj{A*WJ5R5l{<yJ>^U2SmJ^R4%|9_v%e$Tv&d;LExp5^!*XiIJ1d|Lik&Bue6*ZFV!
z_viim<#n-r8$yfQ=lA}66uc%jR&MgEPo9r5#iFO)og41F`hKvz)MWWTPcHvYsNS^u
z=ELLj|83u7BUNpzw*NsK(7Zdclke7o68D?KTMc*aJgL8Hs_+Iz``($=v+LhqeQWsB
z)z0%qQ%%tsi+9hDB+ifzpBZyKR)YDsXWohDw#OG9GrTJ?`Ss2}pKK&6ERJ0dw8*MF
z|1sfAP1ID`yT4PfIu>o7tj@Ig(wT0<pDjDBo?Vi-&y*IwDf;HdH@D^*-rRe>+;I2K
z?b4stPfS1MfBa0gZE|1MrskVRL+=&OiR;Vuyl8&>kA>Rw=$(9LKK?e`ux$_L`S5F>
v*WRi5XmEe+uiP_P`6n2`1&rUa;N|~VPtJY8w`!Hxb&!y!tDnm{r-UW|rRW{c

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Skia/Controls/Border/Border_NonUniform_CornerRadius.expected.png b/tests/TestFiles/Skia/Controls/Border/Border_NonUniform_CornerRadius.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..9deb45aaeb067d61c2774ba50214b80950db4763
GIT binary patch
literal 1084
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-V}>VM%xNb!1@J
z*w6hZk(Ggg`I)DSV@O5Z+gl4y$Fj;C`&gb7V;~_W*3-?lIB~&(gBuhgdf65q+>kcy
zFDG|cqNB@^1qRKIvk#^P1k6YXh={mRciuvLnjBwM+}`K+&a=z$z32R{`~3I3;`g=s
zK-+-8@5<DtJEpGQd_8^r*}OCB^iNm**#Fn?ciy*;Z)VT=v3`%y@1$=9-)_7)@jaug
zy6ok;v+vH$`}_2J`p>84={vi3R2S%cGWq;ar}0VDS<|Y_PmlQ1e!A`~zB5x*!lLXa
z^SsyJHZQl2ZTg<p&h`Fm+^mCfPy8ljo7X=upKkH#(M@+tM(dItZRS&tuR1*U@!vTO
zb8p#9*t6ea&+~%k3GdDLpM1y+y;pqTUapkKzUL>ppI+9=KViu_n{ARl<L9KG8sdHj
z(;A<2?>lV%WZ&}#Avt0v)<(u@+@ElGWrXO7;?o;X+RGiAep>L{u~`nE{)c>gThy|7
zquPWTUHSd`?hhpE&wg6-Y=4oZ>gs#VYc}5GJ}4Mj8oR#oNYiFj0Sy+WR)+-w93o7O
zP6`1WEL@Eailc%986ZbzIsA+33!kn$r`NRc&n}tuy6zUz*-SqRE$_wj6_{OP`Si1>
zCf)MTy}dhR`2F4gpW@!kzWMm(@?xg4cV{ElJ+Jn!zjfgD<~<MQZ+;C-b!F+(UjO`d
zdA`}FlRElU^=d-jUR}Mp_~zl8y>o7O$!)EhC;LuCZu^bdM?T)xx&DFOa^qH)qVj3+
z6KZWw=e}Bd^I<Q)%;cEqmFFiOUv<Z_=x&{9bzNDe&=LL3&Khae5pt`Go=3<YpZfHN
z|C8BYqc@wU>7W0!Po-SKLhYx<_un`9H~XjCpM_+=b9as&74}<xbj{mLxe}0&r>mdK
II;Vst0D%^uoB#j-

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Skia/Controls/Border/Border_Uniform_CornerRadius.expected.png b/tests/TestFiles/Skia/Controls/Border/Border_Uniform_CornerRadius.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4bfa75eb8fad329e993f4dde010964fa5572837
GIT binary patch
literal 1307
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-V}>VM%xNb!1@J
z*w6hZkrl{2>gnPbQW5v|*4n<%bcwda6{{SS1UOilm>m>6yPB7Dc=0V*v<}E;X?!AJ
z!N6k5o5|!UTqSUVi-ogvf`Y)8>KDI+&e-G}x@Ek1+4ZS=A~zg4)A9XWoc(VRpk)jU
z2RKWsEZ03fGb1~>PNF#T%+J&!xoh9@&a6(2>#MYTc5}uY`!K!!N~>poXY?PFd6>e!
zx%=ix<?_5Uiw)=hZ`40_N4B`s$Ii8;YJ>jGwQnNI-kzKB=HBz&Gwz=0lk5Bwn1AdE
zzvou|<1#npnY%Y9%k|6*H@<l>=9~Pg`NwM{Cfh$aIfFa-fyK$a`DMn|vtsw!J_}Ik
z`*Z2c-#HD*Z|=?5xqj!D`>SKZ&iePo7crSVxHd!bWbd3C?RVnORP)W3$vOK+rPBIY
zlHZzKyS1lEWpgg>QLp^-vR?a?@zXyKY$OYu&xNIyKfk<I+j8TyJryVU&n}L+vFS}g
znWgpKu01_7uU4Kvc<t%O{4z`a*<qEPwZ%Sl3HO2yc^cf`@%&}j*SkeIpN<~>k!*SB
z+S%BB`(*gHcq{x|=ly4^OycWjdi5WtB~EuJIxDt*x^m9lJ5NLBop^TCYu)u4?dg-1
zcF&o6F0X#`p9MT~RIJ~A)tesiVZW+?1`AWG!vX;g5vE2bg#Zo~u0{vNQ9-%}$ZnQT
zd6x4c`!<voPk){#pE2DbPWSld(}LUb-hHw^{m~&__{7eq9MR_GKi@yCSP;upxl?An
zj{A*WJ5R5l{<yJ>^U2SmJ^R4%|9_v%e$Tv&d;LExp5^!*XiIJ1d|Lik&Bue6*ZFV!
z_viim<#n-r8$yfQ=lA}66uc%jR&MgEPo9r5#iFO)og41F`hKvz)MWWTPcHvYsNS^u
z=ELLj|83u7BUNpzw*NsK(7Zdclke7o68D?KTMc*aJgL8Hs_+Iz``($=v+LhqeQWsB
z)z0%qQ%%tsi+9hDB+ifzpBZyKR)YDsXWohDw#OG9GrTJ?`Ss2}pKK&6ERJ0dw8*MF
z|1sfAP1ID`yT4PfIu>o7tj@Ig(wT0<pDjDBo?Vi-&y*IwDf;HdH@D^*-rRe>+;I2K
z?b4stPfS1MfBa0gZE|1MrskVRL+=&OiR;Vuyl8&>kA>Rw=$(9LKK?e`ux$_L`S5F>
v*WRi5XmEe+uiP_P`6n2`1&rUa;N|~VPtJY8w`!Hxb&!y!tDnm{r-UW|rRW{c

literal 0
HcmV?d00001


From 6b231ba3359c1a60f68ae77f310fdc9d650b1190 Mon Sep 17 00:00:00 2001
From: lindexi <lindexi_gd@163.com>
Date: Wed, 4 Apr 2018 15:52:48 +0800
Subject: [PATCH 447/482] fix comment

---
 src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
index c76a5b5da5..b2b5ecdf8f 100644
--- a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
+++ b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
@@ -103,7 +103,7 @@ namespace Avalonia.Direct2D1
         /// Converts a pen to a Direct2D stroke style.
         /// </summary>
         /// <param name="pen">The pen to convert.</param>
-        /// <param name="target">The render target.</param>
+        /// <param name="renderTarget">The render target.</param>
         /// <returns>The Direct2D brush.</returns>
         public static StrokeStyle ToDirect2DStrokeStyle(this Avalonia.Media.Pen pen, SharpDX.Direct2D1.RenderTarget renderTarget)
         {
@@ -114,7 +114,7 @@ namespace Avalonia.Direct2D1
         /// Converts a pen to a Direct2D stroke style.
         /// </summary>
         /// <param name="pen">The pen to convert.</param>
-        /// <param name="target">The render target.</param>
+        /// <param name="factory">The factory associated with this resource.</param>
         /// <returns>The Direct2D brush.</returns>
         public static StrokeStyle ToDirect2DStrokeStyle(this Avalonia.Media.Pen pen, Factory factory)
         {

From 3e43fc221bf2056520f941cd8995c554551b9466 Mon Sep 17 00:00:00 2001
From: lindexi <lindexi_gd@163.com>
Date: Wed, 4 Apr 2018 15:54:32 +0800
Subject: [PATCH 448/482] for this code in  `pen.DashStyle?.Dashes != null`
 that pen.DashStyle isnt null and we dont need add `?`

---
 src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
index b2b5ecdf8f..959bf118f0 100644
--- a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
+++ b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
@@ -132,7 +132,7 @@ namespace Avalonia.Direct2D1
             {
                 properties.DashStyle = DashStyle.Custom;
                 properties.DashOffset = (float)pen.DashStyle.Offset;
-                dashes = pen.DashStyle?.Dashes.Select(x => (float)x).ToArray();
+                dashes = pen.DashStyle.Dashes.Select(x => (float)x).ToArray();
             }
             return new StrokeStyle(factory, properties, dashes);
         }

From c064d05e8c64b871f0d657ac628041db9696e9cf Mon Sep 17 00:00:00 2001
From: lindexi <lindexi_gd@163.com>
Date: Wed, 4 Apr 2018 16:03:00 +0800
Subject: [PATCH 449/482] Lasy new the dashes for if we new an array first that
 we may waste it when we use `dashes = pen.DashStyle.Dashes.Select(x =>
 (float)x).ToArray()`. As a frequently used code I think this optimize is
 necessary.

---
 .../Avalonia.Direct2D1/PrimitiveExtensions.cs        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
index 959bf118f0..56d0624f52 100644
--- a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
+++ b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
@@ -127,13 +127,21 @@ namespace Avalonia.Direct2D1
                 EndCap = pen.EndLineCap.ToDirect2D(),
                 DashCap = pen.DashCap.ToDirect2D()
             };
-            var dashes = new float[0];
+            float[] dashes = null;//If we new an array first that we may waste it when we use `dashes = pen.DashStyle.Dashes.Select(x => (float)x).ToArray()`. As a frequently used code I think this optimize is necessary.
             if (pen.DashStyle?.Dashes != null && pen.DashStyle.Dashes.Count > 0)
             {
                 properties.DashStyle = DashStyle.Custom;
-                properties.DashOffset = (float)pen.DashStyle.Offset;
+                properties.DashOffset = (float) pen.DashStyle.Offset;
+                //for `pen.DashStyle?.Dashes != null` that you shouldnt add `?` in `pen.DashStyle.Dashes`
                 dashes = pen.DashStyle.Dashes.Select(x => (float)x).ToArray();
             }
+
+            //If we don't enter the code above that it is null. We should set it a default value to solve the null exception.
+            if (dashes == null)
+            {
+                dashes = new float[0];
+            }
+
             return new StrokeStyle(factory, properties, dashes);
         }
 

From f63b85f677dbdb07b24be03df303db18bc38fd64 Mon Sep 17 00:00:00 2001
From: Benedikt Schroeder <benedikt.schroeder@outlook.de>
Date: Fri, 6 Apr 2018 11:25:42 +0200
Subject: [PATCH 450/482] Remove comment

---
 src/Avalonia.Controls/Presenters/ContentPresenter.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index cc6c6f364f..478c68a963 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -371,7 +371,6 @@ namespace Avalonia.Controls.Presenters
             var horizontalContentAlignment = HorizontalContentAlignment;
             var verticalContentAlignment = VerticalContentAlignment;
             var useLayoutRounding = UseLayoutRounding;
-            //Not sure about this part
             var availableSizeMinusMargins = new Size(
                 Math.Max(0, finalSize.Width - padding.Left - padding.Right - borderThickness.Left - borderThickness.Right),
                 Math.Max(0, finalSize.Height - padding.Top - padding.Bottom - borderThickness.Top - borderThickness.Bottom));

From a139ce0116ce9ce9be33efea37960f3a906eb295 Mon Sep 17 00:00:00 2001
From: David Maas <contact@pathogenstudios.com>
Date: Mon, 9 Apr 2018 03:05:34 -0500
Subject: [PATCH 451/482] Fixed Direct3DInteropSample.

---
 .../Direct3DInteropSample/Direct3DInteropSample.csproj        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
index 4271d05f91..e0f3e92c74 100644
--- a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
+++ b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
@@ -17,7 +17,9 @@
       <None Remove="MiniCube.fx" />
     </ItemGroup>
     <ItemGroup>
-      <EmbeddedResource Include="MiniCube.fx" />
+      <EmbeddedResource Include="MiniCube.fx">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </EmbeddedResource>
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\..\src\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj" />

From 71c25cae2d46b4f774f0038d6582fe6a076543cf Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 10 Apr 2018 20:46:54 +0200
Subject: [PATCH 452/482] Allow null pen in GeometryImpl.

The `pen` parameter to `GeometryImpl.GetRenderBounds` and `StrokeContains` can be null. Don't try to dereference this null!
---
 src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
index 8f11d1463b..3e89dcc9b7 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
@@ -27,7 +27,7 @@ namespace Avalonia.Direct2D1.Media
         public Rect GetRenderBounds(Avalonia.Media.Pen pen)
         {
             var factory = AvaloniaLocator.Current.GetService<Factory>();
-            return Geometry.GetWidenedBounds((float)pen.Thickness).ToAvalonia();
+            return Geometry.GetWidenedBounds((float)(pen?.Thickness ?? 0)).ToAvalonia();
         }
 
         /// <inheritdoc/>
@@ -51,7 +51,7 @@ namespace Avalonia.Direct2D1.Media
         /// <inheritdoc/>
         public bool StrokeContains(Avalonia.Media.Pen pen, Point point)
         {
-            return Geometry.StrokeContainsPoint(point.ToSharpDX(), (float)pen.Thickness);
+            return Geometry.StrokeContainsPoint(point.ToSharpDX(), (float)(pen?.Thickness ?? 0));
         }
 
         public ITransformedGeometryImpl WithTransform(Matrix transform)

From fef1422fdbab2e29bf04d1f7188b2f697f09c68d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 10 Apr 2018 21:04:49 +0200
Subject: [PATCH 453/482] Removed unused variable.

---
 src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
index f057d191b6..120ab71ead 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
@@ -24,7 +24,6 @@ namespace Avalonia.Direct2D1.Media
         /// <inheritdoc/>
         public Rect GetRenderBounds(Avalonia.Media.Pen pen)
         {
-            var factory = AvaloniaLocator.Current.GetService<Factory>();
             return Geometry.GetWidenedBounds((float)(pen?.Thickness ?? 0)).ToAvalonia();
         }
 

From 8713cd5c9f13e1e6e6b0b662cc9151350cb6de3b Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@gmail.com>
Date: Wed, 11 Apr 2018 07:34:16 +0200
Subject: [PATCH 454/482] code cleanup

---
 src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs b/src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs
index e9c1119e44..c2bc1d5712 100644
--- a/src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs
+++ b/src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs
@@ -14,7 +14,7 @@ namespace Avalonia.Controls.DragDrop.Raw
 
         public RawDragEvent(IDragDropDevice inputDevice, RawDragEventType type, 
             IInputElement inputRoot, Point location, IDataObject data, DragDropEffects effects)
-            :base(inputDevice, GetTimeStamp())
+            :base(inputDevice, 0)
         {
             Type = type;
             InputRoot = inputRoot;
@@ -22,10 +22,5 @@ namespace Avalonia.Controls.DragDrop.Raw
             Data = data;
             Effects = effects;
         }
-
-        private static uint GetTimeStamp()
-        {
-            return (uint)0;
-        }
     }
 }
\ No newline at end of file

From 7032b9b8eb64ce7ffddbccb5f161d45429e43a86 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@gmail.com>
Date: Wed, 11 Apr 2018 08:11:33 +0200
Subject: [PATCH 455/482] moved Drag+Drop sources to Avalonia.Input

Also the windows specific DragSource is
only used when the application runs as STA
---
 src/Avalonia.Controls/Application.cs                   |  5 +++--
 .../{DragDrop => Platform}/DragSource.cs               | 10 +++++-----
 .../DragDrop/DataFormats.cs                            |  2 +-
 .../DragDrop/DataObject.cs                             |  2 +-
 .../DragDrop/DragDrop.cs                               |  4 ++--
 .../DragDrop/DragDropDevice.cs                         |  9 ++++-----
 .../DragDrop/DragDropEffects.cs                        |  2 +-
 .../DragDrop/DragEventArgs.cs                          |  2 +-
 .../DragDrop/IDataObject.cs                            |  2 +-
 .../DragDrop/Raw/IDragDropDevice.cs                    |  2 +-
 .../DragDrop/Raw/RawDragEvent.cs                       |  2 +-
 .../DragDrop/Raw/RawDragEventType.cs                   |  2 +-
 .../Platform/IPlatformDragSource.cs                    |  4 ++--
 src/OSX/Avalonia.MonoMac/DragSource.cs                 |  4 ++--
 src/OSX/Avalonia.MonoMac/DraggingInfo.cs               |  2 +-
 src/OSX/Avalonia.MonoMac/TopLevelImpl.cs               |  4 ++--
 src/Windows/Avalonia.Win32/ClipboardFormats.cs         |  2 +-
 src/Windows/Avalonia.Win32/DataObject.cs               |  4 ++--
 src/Windows/Avalonia.Win32/DragSource.cs               |  5 ++---
 src/Windows/Avalonia.Win32/OleDataObject.cs            |  4 ++--
 src/Windows/Avalonia.Win32/OleDropTarget.cs            |  6 +++---
 src/Windows/Avalonia.Win32/Win32Platform.cs            |  6 ++++--
 22 files changed, 43 insertions(+), 42 deletions(-)
 rename src/Avalonia.Controls/{DragDrop => Platform}/DragSource.cs (98%)
 rename src/{Avalonia.Controls => Avalonia.Input}/DragDrop/DataFormats.cs (89%)
 rename src/{Avalonia.Controls => Avalonia.Input}/DragDrop/DataObject.cs (96%)
 rename src/{Avalonia.Controls => Avalonia.Input}/DragDrop/DragDrop.cs (96%)
 rename src/{Avalonia.Controls => Avalonia.Input}/DragDrop/DragDropDevice.cs (95%)
 rename src/{Avalonia.Controls => Avalonia.Input}/DragDrop/DragDropEffects.cs (79%)
 rename src/{Avalonia.Controls => Avalonia.Input}/DragDrop/DragEventArgs.cs (90%)
 rename src/{Avalonia.Controls => Avalonia.Input}/DragDrop/IDataObject.cs (88%)
 rename src/{Avalonia.Controls => Avalonia.Input}/DragDrop/Raw/IDragDropDevice.cs (68%)
 rename src/{Avalonia.Controls => Avalonia.Input}/DragDrop/Raw/RawDragEvent.cs (94%)
 rename src/{Avalonia.Controls => Avalonia.Input}/DragDrop/Raw/RawDragEventType.cs (72%)
 rename src/{Avalonia.Controls => Avalonia.Input}/Platform/IPlatformDragSource.cs (79%)

diff --git a/src/Avalonia.Controls/Application.cs b/src/Avalonia.Controls/Application.cs
index 6ed797dc51..f94a85f31d 100644
--- a/src/Avalonia.Controls/Application.cs
+++ b/src/Avalonia.Controls/Application.cs
@@ -12,9 +12,10 @@ using Avalonia.Rendering;
 using Avalonia.Styling;
 using Avalonia.Threading;
 using System.Reactive.Concurrency;
-using Avalonia.Controls.DragDrop;
-using Avalonia.Controls.DragDrop.Raw;
+using Avalonia.Input.DragDrop.Raw;
 using Avalonia.Controls.Platform;
+using Avalonia.Platform;
+using Avalonia.Input.DragDrop;
 
 namespace Avalonia
 {
diff --git a/src/Avalonia.Controls/DragDrop/DragSource.cs b/src/Avalonia.Controls/Platform/DragSource.cs
similarity index 98%
rename from src/Avalonia.Controls/DragDrop/DragSource.cs
rename to src/Avalonia.Controls/Platform/DragSource.cs
index ceb962ad98..ed873ec961 100644
--- a/src/Avalonia.Controls/DragDrop/DragSource.cs
+++ b/src/Avalonia.Controls/Platform/DragSource.cs
@@ -2,17 +2,17 @@
 using System.Linq;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
-using System.Text;
 using System.Threading.Tasks;
-using Avalonia.Controls.DragDrop.Raw;
-using Avalonia.Controls.Platform;
+using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.Input.DragDrop;
+using Avalonia.Input.DragDrop.Raw;
+using Avalonia.Input.Platform;
 using Avalonia.Input.Raw;
-using Avalonia.Interactivity;
 using Avalonia.Threading;
 using Avalonia.VisualTree;
 
-namespace Avalonia.Controls.DragDrop
+namespace Avalonia.Platform
 {
     class DragSource : IPlatformDragSource
     {
diff --git a/src/Avalonia.Controls/DragDrop/DataFormats.cs b/src/Avalonia.Input/DragDrop/DataFormats.cs
similarity index 89%
rename from src/Avalonia.Controls/DragDrop/DataFormats.cs
rename to src/Avalonia.Input/DragDrop/DataFormats.cs
index f46651ed3b..4115701478 100644
--- a/src/Avalonia.Controls/DragDrop/DataFormats.cs
+++ b/src/Avalonia.Input/DragDrop/DataFormats.cs
@@ -1,4 +1,4 @@
-namespace Avalonia.Controls.DragDrop
+namespace Avalonia.Input.DragDrop
 {
     public static class DataFormats
     {
diff --git a/src/Avalonia.Controls/DragDrop/DataObject.cs b/src/Avalonia.Input/DragDrop/DataObject.cs
similarity index 96%
rename from src/Avalonia.Controls/DragDrop/DataObject.cs
rename to src/Avalonia.Input/DragDrop/DataObject.cs
index e0e7b6d069..0db1008a6c 100644
--- a/src/Avalonia.Controls/DragDrop/DataObject.cs
+++ b/src/Avalonia.Input/DragDrop/DataObject.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Avalonia.Controls.DragDrop
+namespace Avalonia.Input.DragDrop
 {
     public class DataObject : IDataObject
     {
diff --git a/src/Avalonia.Controls/DragDrop/DragDrop.cs b/src/Avalonia.Input/DragDrop/DragDrop.cs
similarity index 96%
rename from src/Avalonia.Controls/DragDrop/DragDrop.cs
rename to src/Avalonia.Input/DragDrop/DragDrop.cs
index bbac80e38f..9d68deb62b 100644
--- a/src/Avalonia.Controls/DragDrop/DragDrop.cs
+++ b/src/Avalonia.Input/DragDrop/DragDrop.cs
@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
-using Avalonia.Controls.Platform;
 using Avalonia.Interactivity;
+using Avalonia.Input.Platform;
 
-namespace Avalonia.Controls.DragDrop
+namespace Avalonia.Input.DragDrop
 {
     public static class DragDrop
     {
diff --git a/src/Avalonia.Controls/DragDrop/DragDropDevice.cs b/src/Avalonia.Input/DragDrop/DragDropDevice.cs
similarity index 95%
rename from src/Avalonia.Controls/DragDrop/DragDropDevice.cs
rename to src/Avalonia.Input/DragDrop/DragDropDevice.cs
index 0aadda79f4..0a64800346 100644
--- a/src/Avalonia.Controls/DragDrop/DragDropDevice.cs
+++ b/src/Avalonia.Input/DragDrop/DragDropDevice.cs
@@ -1,13 +1,12 @@
-using Avalonia.Input;
-using Avalonia.Interactivity;
+using Avalonia.Interactivity;
 using Avalonia.VisualTree;
 using System.Linq;
-using Avalonia.Controls.DragDrop.Raw;
+using Avalonia.Input.DragDrop.Raw;
 using Avalonia.Input.Raw;
 
-namespace Avalonia.Controls.DragDrop
+namespace Avalonia.Input.DragDrop
 {
-    class DragDropDevice : IDragDropDevice
+    public class DragDropDevice : IDragDropDevice
     {
         public static readonly DragDropDevice Instance = new DragDropDevice();
         
diff --git a/src/Avalonia.Controls/DragDrop/DragDropEffects.cs b/src/Avalonia.Input/DragDrop/DragDropEffects.cs
similarity index 79%
rename from src/Avalonia.Controls/DragDrop/DragDropEffects.cs
rename to src/Avalonia.Input/DragDrop/DragDropEffects.cs
index cec3dab89d..7f093bc89c 100644
--- a/src/Avalonia.Controls/DragDrop/DragDropEffects.cs
+++ b/src/Avalonia.Input/DragDrop/DragDropEffects.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Avalonia.Controls.DragDrop
+namespace Avalonia.Input.DragDrop
 {
     [Flags]
     public enum DragDropEffects
diff --git a/src/Avalonia.Controls/DragDrop/DragEventArgs.cs b/src/Avalonia.Input/DragDrop/DragEventArgs.cs
similarity index 90%
rename from src/Avalonia.Controls/DragDrop/DragEventArgs.cs
rename to src/Avalonia.Input/DragDrop/DragEventArgs.cs
index f31bfd4820..bff19c760c 100644
--- a/src/Avalonia.Controls/DragDrop/DragEventArgs.cs
+++ b/src/Avalonia.Input/DragDrop/DragEventArgs.cs
@@ -1,6 +1,6 @@
 using Avalonia.Interactivity;
 
-namespace Avalonia.Controls.DragDrop
+namespace Avalonia.Input.DragDrop
 {
     public class DragEventArgs : RoutedEventArgs
     {
diff --git a/src/Avalonia.Controls/DragDrop/IDataObject.cs b/src/Avalonia.Input/DragDrop/IDataObject.cs
similarity index 88%
rename from src/Avalonia.Controls/DragDrop/IDataObject.cs
rename to src/Avalonia.Input/DragDrop/IDataObject.cs
index c8fd720c48..5d26a20cee 100644
--- a/src/Avalonia.Controls/DragDrop/IDataObject.cs
+++ b/src/Avalonia.Input/DragDrop/IDataObject.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Avalonia.Controls.DragDrop
+namespace Avalonia.Input.DragDrop
 {
     public interface IDataObject
     {
diff --git a/src/Avalonia.Controls/DragDrop/Raw/IDragDropDevice.cs b/src/Avalonia.Input/DragDrop/Raw/IDragDropDevice.cs
similarity index 68%
rename from src/Avalonia.Controls/DragDrop/Raw/IDragDropDevice.cs
rename to src/Avalonia.Input/DragDrop/Raw/IDragDropDevice.cs
index 6e2db67ac3..2022e842ae 100644
--- a/src/Avalonia.Controls/DragDrop/Raw/IDragDropDevice.cs
+++ b/src/Avalonia.Input/DragDrop/Raw/IDragDropDevice.cs
@@ -1,6 +1,6 @@
 using Avalonia.Input;
 
-namespace Avalonia.Controls.DragDrop.Raw
+namespace Avalonia.Input.DragDrop.Raw
 {
     public interface IDragDropDevice : IInputDevice
     {
diff --git a/src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs b/src/Avalonia.Input/DragDrop/Raw/RawDragEvent.cs
similarity index 94%
rename from src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs
rename to src/Avalonia.Input/DragDrop/Raw/RawDragEvent.cs
index c2bc1d5712..af18186d4b 100644
--- a/src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs
+++ b/src/Avalonia.Input/DragDrop/Raw/RawDragEvent.cs
@@ -2,7 +2,7 @@
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 
-namespace Avalonia.Controls.DragDrop.Raw
+namespace Avalonia.Input.DragDrop.Raw
 {
     public class RawDragEvent : RawInputEventArgs
     {
diff --git a/src/Avalonia.Controls/DragDrop/Raw/RawDragEventType.cs b/src/Avalonia.Input/DragDrop/Raw/RawDragEventType.cs
similarity index 72%
rename from src/Avalonia.Controls/DragDrop/Raw/RawDragEventType.cs
rename to src/Avalonia.Input/DragDrop/Raw/RawDragEventType.cs
index 44c4bbd595..31450efb51 100644
--- a/src/Avalonia.Controls/DragDrop/Raw/RawDragEventType.cs
+++ b/src/Avalonia.Input/DragDrop/Raw/RawDragEventType.cs
@@ -1,4 +1,4 @@
-namespace Avalonia.Controls.DragDrop.Raw
+namespace Avalonia.Input.DragDrop.Raw
 {
     public enum RawDragEventType
     {
diff --git a/src/Avalonia.Controls/Platform/IPlatformDragSource.cs b/src/Avalonia.Input/Platform/IPlatformDragSource.cs
similarity index 79%
rename from src/Avalonia.Controls/Platform/IPlatformDragSource.cs
rename to src/Avalonia.Input/Platform/IPlatformDragSource.cs
index 667e1f005c..44b4d30760 100644
--- a/src/Avalonia.Controls/Platform/IPlatformDragSource.cs
+++ b/src/Avalonia.Input/Platform/IPlatformDragSource.cs
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
-using Avalonia.Controls.DragDrop;
+using Avalonia.Input.DragDrop;
 using Avalonia.Interactivity;
 
-namespace Avalonia.Controls.Platform
+namespace Avalonia.Input.Platform
 {
     public interface IPlatformDragSource
     {
diff --git a/src/OSX/Avalonia.MonoMac/DragSource.cs b/src/OSX/Avalonia.MonoMac/DragSource.cs
index 07f2e186aa..96d650ab3a 100644
--- a/src/OSX/Avalonia.MonoMac/DragSource.cs
+++ b/src/OSX/Avalonia.MonoMac/DragSource.cs
@@ -10,8 +10,8 @@ using System.Runtime.InteropServices;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using Avalonia.Controls.DragDrop;
-using Avalonia.Controls.Platform;
+using Avalonia.Input.DragDrop;
+using Avalonia.Input.Platform;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using MonoMac;
diff --git a/src/OSX/Avalonia.MonoMac/DraggingInfo.cs b/src/OSX/Avalonia.MonoMac/DraggingInfo.cs
index 2fb28a50f5..ca8a24ba82 100644
--- a/src/OSX/Avalonia.MonoMac/DraggingInfo.cs
+++ b/src/OSX/Avalonia.MonoMac/DraggingInfo.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Avalonia.Controls.DragDrop;
+using Avalonia.Input.DragDrop;
 using MonoMac.AppKit;
 using MonoMac.Foundation;
 
diff --git a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
index 97c4302c57..34d0949b57 100644
--- a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
+++ b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using Avalonia.Controls.DragDrop;
-using Avalonia.Controls.DragDrop.Raw;
+using Avalonia.Input.DragDrop;
+using Avalonia.Input.DragDrop.Raw;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Platform;
diff --git a/src/Windows/Avalonia.Win32/ClipboardFormats.cs b/src/Windows/Avalonia.Win32/ClipboardFormats.cs
index a59c6a1664..a604f634f6 100644
--- a/src/Windows/Avalonia.Win32/ClipboardFormats.cs
+++ b/src/Windows/Avalonia.Win32/ClipboardFormats.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Text;
-using Avalonia.Controls.DragDrop;
+using Avalonia.Input.DragDrop;
 using Avalonia.Win32.Interop;
 
 namespace Avalonia.Win32
diff --git a/src/Windows/Avalonia.Win32/DataObject.cs b/src/Windows/Avalonia.Win32/DataObject.cs
index aa3ee91ef9..2a990419e7 100644
--- a/src/Windows/Avalonia.Win32/DataObject.cs
+++ b/src/Windows/Avalonia.Win32/DataObject.cs
@@ -4,9 +4,9 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 using System.Text;
-using Avalonia.Controls.DragDrop;
+using Avalonia.Input.DragDrop;
 using Avalonia.Win32.Interop;
-using IDataObject = Avalonia.Controls.DragDrop.IDataObject;
+using IDataObject = Avalonia.Input.DragDrop.IDataObject;
 using IOleDataObject = System.Runtime.InteropServices.ComTypes.IDataObject;
 using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
diff --git a/src/Windows/Avalonia.Win32/DragSource.cs b/src/Windows/Avalonia.Win32/DragSource.cs
index 937471f9ad..81dd790066 100644
--- a/src/Windows/Avalonia.Win32/DragSource.cs
+++ b/src/Windows/Avalonia.Win32/DragSource.cs
@@ -2,9 +2,8 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
-using Avalonia.Controls.DragDrop;
-using Avalonia.Controls.Platform;
-using Avalonia.Interactivity;
+using Avalonia.Input.DragDrop;
+using Avalonia.Input.Platform;
 using Avalonia.Threading;
 using Avalonia.Win32.Interop;
 
diff --git a/src/Windows/Avalonia.Win32/OleDataObject.cs b/src/Windows/Avalonia.Win32/OleDataObject.cs
index 60527bb7d6..ee1c3046eb 100644
--- a/src/Windows/Avalonia.Win32/OleDataObject.cs
+++ b/src/Windows/Avalonia.Win32/OleDataObject.cs
@@ -6,13 +6,13 @@ using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Text;
-using Avalonia.Controls.DragDrop;
+using Avalonia.Input.DragDrop;
 using Avalonia.Win32.Interop;
 using IDataObject = System.Runtime.InteropServices.ComTypes.IDataObject;
 
 namespace Avalonia.Win32
 {
-    class OleDataObject : Avalonia.Controls.DragDrop.IDataObject
+    class OleDataObject : Avalonia.Input.DragDrop.IDataObject
     {
         private IDataObject _wrapped;
 
diff --git a/src/Windows/Avalonia.Win32/OleDropTarget.cs b/src/Windows/Avalonia.Win32/OleDropTarget.cs
index 747006673a..e3791747b1 100644
--- a/src/Windows/Avalonia.Win32/OleDropTarget.cs
+++ b/src/Windows/Avalonia.Win32/OleDropTarget.cs
@@ -1,9 +1,9 @@
-using Avalonia.Controls.DragDrop;
-using Avalonia.Controls.DragDrop.Raw;
+using Avalonia.Input.DragDrop;
+using Avalonia.Input.DragDrop.Raw;
 using Avalonia.Input;
 using Avalonia.Platform;
 using Avalonia.Win32.Interop;
-using IDataObject = Avalonia.Controls.DragDrop.IDataObject;
+using IDataObject = Avalonia.Input.DragDrop.IDataObject;
 using IOleDataObject = System.Runtime.InteropServices.ComTypes.IDataObject;
 
 namespace Avalonia.Win32
diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
index ef1c4e987d..902abaf65b 100644
--- a/src/Windows/Avalonia.Win32/Win32Platform.cs
+++ b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -84,8 +84,10 @@ namespace Avalonia.Win32
                 .Bind<IRenderLoop>().ToConstant(new RenderLoop(60))
                 .Bind<ISystemDialogImpl>().ToSingleton<SystemDialogImpl>()
                 .Bind<IWindowingPlatform>().ToConstant(s_instance)
-                .Bind<IPlatformIconLoader>().ToConstant(s_instance)
-                .Bind<IPlatformDragSource>().ToSingleton<DragSource>();
+                .Bind<IPlatformIconLoader>().ToConstant(s_instance);
+
+            if (OleContext.Current != null)
+                AvaloniaLocator.CurrentMutable.Bind<IPlatformDragSource>().ToSingleton<DragSource>();
 
             UseDeferredRendering = deferredRendering;
             _uiThread = UnmanagedMethods.GetCurrentThreadId();

From 15fed263fdbdedbb470a7e4739d564a1aae21b1f Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 11 Apr 2018 10:19:05 +0100
Subject: [PATCH 456/482] tidy ControlCatalog.cspoj

---
 samples/ControlCatalog/ControlCatalog.csproj | 192 +------------------
 1 file changed, 6 insertions(+), 186 deletions(-)

diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 862de9d320..08c9a48e42 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -21,181 +20,17 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+
   <ItemGroup>
-    <None Remove="Pages\ContextMenuPage.xaml" />
-  </ItemGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
-    <EmbeddedResource Include="App.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MainView.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DecoratedWindow.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\ButtonSpinnerPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\DialogsPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\AutoCompleteBoxPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\BorderPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\ButtonPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\CalendarPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\CanvasPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\CarouselPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\CheckBoxPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\ContextMenuPage.xaml" />
-    <EmbeddedResource Include="Pages\DropDownPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\DatePickerPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\ExpanderPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\ImagePage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\LayoutTransformControlPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\MenuPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\NumericUpDownPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\ProgressBarPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\RadioButtonPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\SliderPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\TextBoxPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Pages\ToolTipPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="MainView.xaml.cs">
-      <DependentUpon>MainView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="DecoratedWindow.xaml.cs">
-      <DependentUpon>DecoratedWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\DialogsPage.xaml.cs">
-      <DependentUpon>DialogsPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\BorderPage.xaml.cs">
-      <DependentUpon>BorderPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\AutoCompleteBoxPage.xaml.cs">
-      <DependentUpon>AutoCompleteBoxPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\ButtonPage.xaml.cs">
-      <DependentUpon>ButtonPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\CalendarPage.xaml.cs">
-      <DependentUpon>CalendarPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\CanvasPage.xaml.cs">
-      <DependentUpon>CanvasPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\CarouselPage.xaml.cs">
-      <DependentUpon>CarouselPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\ContextMenuPage.xaml.cs">
-      <DependentUpon>ContextMenuPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\CheckBoxPage.xaml.cs">
-      <DependentUpon>CheckBoxPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\DropDownPage.xaml.cs">
-      <DependentUpon>DropDownPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\DatePickerPage.xaml.cs">
-      <DependentUpon>DatePickerPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\ExpanderPage.xaml.cs">
-      <DependentUpon>ExpanderPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\ImagePage.xaml.cs">
-      <DependentUpon>ImagePage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\LayoutTransformControlPage.xaml.cs">
-      <DependentUpon>LayoutTransformControlPage.xaml</DependentUpon>
+    <Compile Update="**\*.xaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
     </Compile>
-    <Compile Include="Pages\MenuPage.xaml.cs">
-      <DependentUpon>MenuPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\ProgressBarPage.xaml.cs">
-      <DependentUpon>ProgressBarPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\RadioButtonPage.xaml.cs">
-      <DependentUpon>RadioButtonPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\SliderPage.xaml.cs">
-      <DependentUpon>SliderPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\TreeViewPage.xaml.cs">
-      <DependentUpon>TreeViewPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\TextBoxPage.xaml.cs">
-      <DependentUpon>TextBoxPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\ToolTipPage.xaml.cs">
-      <DependentUpon>ToolTipPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\ButtonSpinnerPage.xaml.cs">
-      <DependentUpon>ButtonSpinnerPage.xaml</DependentUpon>
-    </Compile>
-	<Compile Include="Pages\NumericUpDownPage.xaml.cs">
-      <DependentUpon>NumericUpDownPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\ScreenPage.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Assets\delicate-arch-896885_640.jpg" />
-    <EmbeddedResource Include="Assets\github_icon.png" />
-    <EmbeddedResource Include="Assets\hirsch-899118_640.jpg" />
-    <EmbeddedResource Include="Assets\maple-leaf-888807_640.jpg" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="SideBar.xaml">
+    <EmbeddedResource Include="**\*.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Assets\*"/>
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
@@ -212,20 +47,5 @@
     <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Assets\test_icon.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Pages\TreeViewPage.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>
-      </SubType>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="..\..\build\Serilog.props" />
 </Project>
\ No newline at end of file

From fedae81cb884e3fc9b595c73e633ad44a4757575 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 11 Apr 2018 12:08:33 +0100
Subject: [PATCH 457/482] partial fix for 1436.

---
 src/Avalonia.Controls/Border.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index 06ad8a4837..2dc42bd923 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -43,7 +43,8 @@ namespace Avalonia.Controls
         /// </summary>
         static Border()
         {
-            AffectsRender(BackgroundProperty, BorderBrushProperty);
+            AffectsRender(BackgroundProperty, BorderBrushProperty, BorderThicknessProperty);
+            AffectsMeasure(BorderThicknessProperty);
         }
 
         /// <summary>

From d1b06cb7844b64fd44a56e03c6794fa78cee3da0 Mon Sep 17 00:00:00 2001
From: lindexi <lindexi_gd@163.com>
Date: Thu, 12 Apr 2018 09:03:03 +0800
Subject: [PATCH 458/482] Comments at this low level are't really necessary

---
 src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
index 56d0624f52..caff1e9e0f 100644
--- a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
+++ b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
@@ -132,7 +132,6 @@ namespace Avalonia.Direct2D1
             {
                 properties.DashStyle = DashStyle.Custom;
                 properties.DashOffset = (float) pen.DashStyle.Offset;
-                //for `pen.DashStyle?.Dashes != null` that you shouldnt add `?` in `pen.DashStyle.Dashes`
                 dashes = pen.DashStyle.Dashes.Select(x => (float)x).ToArray();
             }
 

From 31b88dc58967ce8a53099103d50bfdb10d9a5af8 Mon Sep 17 00:00:00 2001
From: lindexi <lindexi_gd@163.com>
Date: Thu, 12 Apr 2018 09:10:26 +0800
Subject: [PATCH 459/482] Change code

---
 src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
index caff1e9e0f..a0fd3c0172 100644
--- a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
+++ b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
@@ -136,10 +136,7 @@ namespace Avalonia.Direct2D1
             }
 
             //If we don't enter the code above that it is null. We should set it a default value to solve the null exception.
-            if (dashes == null)
-            {
-                dashes = new float[0];
-            }
+            dashes = dashes ?? Array.Empty<float>();
 
             return new StrokeStyle(factory, properties, dashes);
         }

From a0b1ad62b36e3806d1bb7da3280814dd956f0181 Mon Sep 17 00:00:00 2001
From: ahopper <alan@samsararesearch.com>
Date: Thu, 12 Apr 2018 11:30:53 +0100
Subject: [PATCH 460/482] Fix #1484

---
 samples/ControlCatalog/ControlCatalog.csproj  |  4 ++
 samples/ControlCatalog/MainView.xaml          |  1 +
 samples/ControlCatalog/Pages/PopupPage.xaml   | 49 +++++++++++++++++++
 .../ControlCatalog/Pages/PopupPage.xaml.cs    | 19 +++++++
 src/Avalonia.Controls/Primitives/Popup.cs     | 47 +++++++++++++++---
 5 files changed, 114 insertions(+), 6 deletions(-)
 create mode 100644 samples/ControlCatalog/Pages/PopupPage.xaml
 create mode 100644 samples/ControlCatalog/Pages/PopupPage.xaml.cs

diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 862de9d320..4fb0ff2059 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -23,6 +23,8 @@
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Pages\ContextMenuPage.xaml" />
+    <None Remove="Pages\PopupPage.xaml" />
+    <None Remove="Pages\PopupPage.xaml.cs" />
   </ItemGroup>
   <ItemGroup>
     <!-- A reference to the entire .NET Framework is automatically included -->
@@ -84,6 +86,7 @@
     <EmbeddedResource Include="Pages\NumericUpDownPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Pages\PopupPage.xaml" />
     <EmbeddedResource Include="Pages\ProgressBarPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -158,6 +161,7 @@
     <Compile Include="Pages\MenuPage.xaml.cs">
       <DependentUpon>MenuPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\PopupPage.xaml.cs" />
     <Compile Include="Pages\ProgressBarPage.xaml.cs">
       <DependentUpon>ProgressBarPage.xaml</DependentUpon>
     </Compile>
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index a0e0df450b..3a19d8e8ed 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -27,5 +27,6 @@
     <TabItem Header="TextBox"><pages:TextBoxPage/></TabItem>
     <TabItem Header="ToolTip"><pages:ToolTipPage/></TabItem>
     <TabItem Header="TreeView"><pages:TreeViewPage/></TabItem>
+    <TabItem Header="Popup"><pages:PopupPage/></TabItem>
   </TabControl>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/PopupPage.xaml b/samples/ControlCatalog/Pages/PopupPage.xaml
new file mode 100644
index 0000000000..8469ac480d
--- /dev/null
+++ b/samples/ControlCatalog/Pages/PopupPage.xaml
@@ -0,0 +1,49 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             >
+  <StackPanel Orientation="Vertical" Gap="4">
+    <TextBlock Classes="h1">Popup</TextBlock>
+    <TextBlock Classes="h2">A Popup dialog</TextBlock>
+    <StackPanel Gap="4">
+    <ToggleButton IsChecked="{Binding #flyout.IsOpen, Mode=TwoWay}" Width="150" ClickMode="Press" >Flyout Auto close</ToggleButton>
+    <ToggleButton IsChecked="{Binding #flyout2.IsOpen, Mode=TwoWay}" Width="150" ClickMode="Press" >Flyout Toggle</ToggleButton>
+      <Popup Name="flyout" StaysOpen="False" Width="200" Height="100"  >
+      <Border Background="LightGray" BorderBrush="Gray" BorderThickness="1" Padding="6" >
+        <StackPanel>
+          <DropDown>
+            <DropDownItem ToolTip.Tip="Yet another nested popup">Item A</DropDownItem>
+            <DropDownItem ToolTip.Tip="Yet another nested popup">Item B</DropDownItem>
+            <DropDownItem ToolTip.Tip="Yet another nested popup">Item C</DropDownItem>
+            <DropDownItem ToolTip.Tip="Yet another nested popup">Item D</DropDownItem>
+            <DropDownItem ToolTip.Tip="Yet another nested popup">Item E</DropDownItem>
+            <DropDownItem ToolTip.Tip="Yet another nested popup">Item F</DropDownItem>
+            <DropDownItem ToolTip.Tip="Yet another nested popup">Item G</DropDownItem>
+          </DropDown>
+          <ToggleButton IsChecked="{Binding #nestedflyout.IsOpen, Mode=TwoWay}" Width="150" ClickMode="Press" >Nested Auto close</ToggleButton>
+          <Popup Name="nestedflyout" StaysOpen="False" Width="200" Height="200"  >
+            <Border Background="LightGray" BorderBrush="Gray" BorderThickness="1" Padding="6" >
+              <StackPanel>
+                <TextBox>Nested Content</TextBox>
+              </StackPanel>
+            </Border>
+          </Popup> 
+        </StackPanel>
+      </Border>
+    </Popup>
+      <Popup Name="flyout2" StaysOpen="True" Width="200" Height="100"  >
+        <Border Background="LightGray" BorderBrush="Gray" BorderThickness="1" Padding="6" >
+          <StackPanel>
+            <DropDown>
+              <DropDownItem ToolTip.Tip="Yet another nested popup">Item A</DropDownItem>
+              <DropDownItem ToolTip.Tip="Yet another nested popup">Item B</DropDownItem>
+              <DropDownItem ToolTip.Tip="Yet another nested popup">Item C</DropDownItem>
+              <DropDownItem ToolTip.Tip="Yet another nested popup">Item D</DropDownItem>
+              <DropDownItem ToolTip.Tip="Yet another nested popup">Item E</DropDownItem>
+              <DropDownItem ToolTip.Tip="Yet another nested popup">Item F</DropDownItem>
+              <DropDownItem ToolTip.Tip="Yet another nested popup">Item G</DropDownItem>
+            </DropDown>
+          </StackPanel>
+        </Border>
+      </Popup>
+    </StackPanel>
+  </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/PopupPage.xaml.cs b/samples/ControlCatalog/Pages/PopupPage.xaml.cs
new file mode 100644
index 0000000000..08aca56bad
--- /dev/null
+++ b/samples/ControlCatalog/Pages/PopupPage.xaml.cs
@@ -0,0 +1,19 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public class PopupPage : UserControl
+    {
+        public PopupPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs
index 5cd3b22fc9..b8817d28f3 100644
--- a/src/Avalonia.Controls/Primitives/Popup.cs
+++ b/src/Avalonia.Controls/Primitives/Popup.cs
@@ -215,7 +215,17 @@ namespace Avalonia.Controls.Primitives
             {
                 var window = _topLevel as Window;
                 if (window != null)
-                    window.Deactivated += WindowDeactivated;
+                {
+                    window.Deactivated += WindowDeactivated;                  
+                }
+                else
+                {
+                    var parentPopuproot = _topLevel as PopupRoot;
+                    if(parentPopuproot != null && parentPopuproot.Parent!=null)
+                    {
+                        ((Popup)(parentPopuproot.Parent)).Closed += ParentClosed;
+                    }
+                }
                 _topLevel.AddHandler(PointerPressedEvent, PointerPressedOutside, RoutingStrategies.Tunnel);
                 _nonClientListener = InputManager.Instance.Process.Subscribe(ListenForNonClientClick);
             }
@@ -230,7 +240,7 @@ namespace Avalonia.Controls.Primitives
 
             Opened?.Invoke(this, EventArgs.Empty);
         }
-
+        
         /// <summary>
         /// Closes the popup.
         /// </summary>
@@ -244,6 +254,14 @@ namespace Avalonia.Controls.Primitives
                     var window = _topLevel as Window;
                     if (window != null)
                         window.Deactivated -= WindowDeactivated;
+                    else
+                    {
+                        var parentPopuproot = _topLevel as PopupRoot;
+                        if (parentPopuproot != null && parentPopuproot.Parent != null)
+                        {
+                            ((Popup)parentPopuproot.Parent).Closed -= ParentClosed;
+                        }
+                    }
                     _nonClientListener?.Dispose();
                     _nonClientListener = null;
                 }
@@ -381,16 +399,25 @@ namespace Avalonia.Controls.Primitives
         {
             if (!StaysOpen)
             {
-                var root = ((IVisual)e.Source).GetVisualRoot();
-
-                if (root != this.PopupRoot)
-                {
+                if(!IsChildOrThis((IVisual)e.Source))
+                {                     
                     Close();
                     e.Handled = true;
                 }
             }
         }
 
+        private bool IsChildOrThis(IVisual child)
+        {
+            IVisual root = child.GetVisualRoot();
+            while (root is PopupRoot)
+            {
+                if (root == PopupRoot) return true;              
+                root = ((PopupRoot)root).Parent.GetVisualRoot();
+            }
+            return false;
+        }
+        
         private void WindowDeactivated(object sender, EventArgs e)
         {
             if (!StaysOpen)
@@ -398,5 +425,13 @@ namespace Avalonia.Controls.Primitives
                 Close();
             }
         }
+
+        private void ParentClosed(object sender, EventArgs e)
+        {
+            if (!StaysOpen)
+            {
+                Close();
+            }
+        }
     }
 }
\ No newline at end of file

From f412c696f068314a5d608b7ddd438cc268aa168c Mon Sep 17 00:00:00 2001
From: ReeJK <wnezros@gmail.com>
Date: Thu, 12 Apr 2018 23:29:13 +0300
Subject: [PATCH 461/482] use Source in Binding

---
 .../Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
index c6705cbb4b..6e8fe1e4c0 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
@@ -43,6 +43,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
                 Mode = Mode,
                 Path = pathInfo.Path,
                 Priority = Priority,
+                Source = Source,
                 RelativeSource = pathInfo.RelativeSource ?? RelativeSource,
                 DefaultAnchor = new WeakReference(GetDefaultAnchor((ITypeDescriptorContext)serviceProvider))
             };

From 272939464eaa6341b718ec8621967df29bc2e826 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 12 Apr 2018 23:28:08 +0200
Subject: [PATCH 462/482] Need to press a button to click it!

Only raise a `Button` click event on pointer release when the button has been pressed first!
---
 src/Avalonia.Controls/Button.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index 4922761a84..fa69d72d67 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -245,7 +245,7 @@ namespace Avalonia.Controls
         {
             base.OnPointerReleased(e);
 
-            if (e.MouseButton == MouseButton.Left)
+            if (IsPressed && e.MouseButton == MouseButton.Left)
             {
                 e.Device.Capture(null);
                 IsPressed = false;

From ef44f2b9083b81289889da46cc2f84159b94b6bd Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 12 Apr 2018 23:28:21 +0200
Subject: [PATCH 463/482] Handle the click that opens a DropDown.

---
 src/Avalonia.Controls/DropDown.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Avalonia.Controls/DropDown.cs b/src/Avalonia.Controls/DropDown.cs
index a7ea2da4a4..932179028e 100644
--- a/src/Avalonia.Controls/DropDown.cs
+++ b/src/Avalonia.Controls/DropDown.cs
@@ -164,6 +164,7 @@ namespace Avalonia.Controls
                 else
                 {
                     IsDropDownOpen = !IsDropDownOpen;
+                    e.Handled = true;
                 }
             }
             base.OnPointerPressed(e);

From 85339e4585084d4b3e301bd73940c8ad9d1b62f0 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 12 Apr 2018 22:44:19 +0100
Subject: [PATCH 464/482] remove other unnecesary stuff from ControlCatalog
 project file.

---
 samples/ControlCatalog/ControlCatalog.csproj | 25 ++++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 08c9a48e42..63b0f4a961 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -1,26 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <TargetFramework>netstandard2.0</TargetFramework>    
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-
+  
   <ItemGroup>
     <Compile Update="**\*.xaml.cs">
       <DependentUpon>%(Filename)</DependentUpon>
@@ -28,7 +10,7 @@
     <EmbeddedResource Include="**\*.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Assets\*"/>
+    <EmbeddedResource Include="Assets\*" />
   </ItemGroup>
 
   <ItemGroup>
@@ -47,5 +29,6 @@
     <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
   </ItemGroup>
+  
   <Import Project="..\..\build\Serilog.props" />
 </Project>
\ No newline at end of file

From 5cba2f4aac7c86eaa99a1b62c6fae3ae107c8aef Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 12 Apr 2018 22:48:24 +0100
Subject: [PATCH 465/482] auto generate assembly info for control catalog.

---
 .../ControlCatalog/Properties/AssemblyInfo.cs | 36 -------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 samples/ControlCatalog/Properties/AssemblyInfo.cs

diff --git a/samples/ControlCatalog/Properties/AssemblyInfo.cs b/samples/ControlCatalog/Properties/AssemblyInfo.cs
deleted file mode 100644
index 30c069d7d8..0000000000
--- a/samples/ControlCatalog/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ControlCatalog")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ControlCatalog")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("61bec86c-f307-4295-b5b8-9428610d7d55")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

From 27680c35e9355abe3512890e40d36cd6eebb1a28 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 12 Apr 2018 23:25:26 +0100
Subject: [PATCH 466/482] [Border] CornerRadius affects render.

---
 src/Avalonia.Controls/Border.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index 2dc42bd923..d90f292183 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -43,7 +43,7 @@ namespace Avalonia.Controls
         /// </summary>
         static Border()
         {
-            AffectsRender(BackgroundProperty, BorderBrushProperty, BorderThicknessProperty);
+            AffectsRender(BackgroundProperty, BorderBrushProperty, BorderThicknessProperty, CornerRadiusProperty);
             AffectsMeasure(BorderThicknessProperty);
         }
 

From 653372009aa77e6e05d84ac885cd48106790cc89 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 12 Apr 2018 23:26:06 +0100
Subject: [PATCH 467/482] [ContentPresenter] BorderThickness affects render and
 measure.

---
 src/Avalonia.Controls/Presenters/ContentPresenter.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index 6acbc047ae..d2fb838657 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -92,6 +92,9 @@ namespace Avalonia.Controls.Presenters
             ContentProperty.Changed.AddClassHandler<ContentPresenter>(x => x.ContentChanged);
             ContentTemplateProperty.Changed.AddClassHandler<ContentPresenter>(x => x.ContentChanged);
             TemplatedParentProperty.Changed.AddClassHandler<ContentPresenter>(x => x.TemplatedParentChanged);
+
+            AffectsRender(BorderThicknessProperty);
+            AffectsMeasure(BorderThicknessProperty);
         }
 
         /// <summary>

From f03d0e9a4fe5ed570b97d42aadcba54716dedd2e Mon Sep 17 00:00:00 2001
From: lindexi <lindexi_gd@163.com>
Date: Fri, 13 Apr 2018 08:54:05 +0800
Subject: [PATCH 468/482] remove comment

---
 src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
index a0fd3c0172..124e33c5a3 100644
--- a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
+++ b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
@@ -127,15 +127,14 @@ namespace Avalonia.Direct2D1
                 EndCap = pen.EndLineCap.ToDirect2D(),
                 DashCap = pen.DashCap.ToDirect2D()
             };
-            float[] dashes = null;//If we new an array first that we may waste it when we use `dashes = pen.DashStyle.Dashes.Select(x => (float)x).ToArray()`. As a frequently used code I think this optimize is necessary.
+            float[] dashes = null;
             if (pen.DashStyle?.Dashes != null && pen.DashStyle.Dashes.Count > 0)
             {
                 properties.DashStyle = DashStyle.Custom;
-                properties.DashOffset = (float) pen.DashStyle.Offset;
+                properties.DashOffset = (float)pen.DashStyle.Offset;
                 dashes = pen.DashStyle.Dashes.Select(x => (float)x).ToArray();
             }
 
-            //If we don't enter the code above that it is null. We should set it a default value to solve the null exception.
             dashes = dashes ?? Array.Empty<float>();
 
             return new StrokeStyle(factory, properties, dashes);

From c09233e4b462271ee667bd2b5312497501fdc126 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@gmail.com>
Date: Fri, 13 Apr 2018 13:28:49 +0200
Subject: [PATCH 469/482] renamed DragSource to InProcessDragSource

---
 src/Avalonia.Controls/Application.cs                          | 2 +-
 .../Platform/{DragSource.cs => InProcessDragSource.cs}        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename src/Avalonia.Controls/Platform/{DragSource.cs => InProcessDragSource.cs} (98%)

diff --git a/src/Avalonia.Controls/Application.cs b/src/Avalonia.Controls/Application.cs
index f94a85f31d..3dc07f81e6 100644
--- a/src/Avalonia.Controls/Application.cs
+++ b/src/Avalonia.Controls/Application.cs
@@ -240,7 +240,7 @@ namespace Avalonia
                 .Bind<IApplicationLifecycle>().ToConstant(this)
                 .Bind<IScheduler>().ToConstant(AvaloniaScheduler.Instance)
                 .Bind<IDragDropDevice>().ToConstant(DragDropDevice.Instance)
-                .Bind<IPlatformDragSource>().ToTransient<DragSource>();
+                .Bind<IPlatformDragSource>().ToTransient<InProcessDragSource>();
         }
     }
 }
diff --git a/src/Avalonia.Controls/Platform/DragSource.cs b/src/Avalonia.Controls/Platform/InProcessDragSource.cs
similarity index 98%
rename from src/Avalonia.Controls/Platform/DragSource.cs
rename to src/Avalonia.Controls/Platform/InProcessDragSource.cs
index ed873ec961..1e97c7bf96 100644
--- a/src/Avalonia.Controls/Platform/DragSource.cs
+++ b/src/Avalonia.Controls/Platform/InProcessDragSource.cs
@@ -14,7 +14,7 @@ using Avalonia.VisualTree;
 
 namespace Avalonia.Platform
 {
-    class DragSource : IPlatformDragSource
+    class InProcessDragSource : IPlatformDragSource
     {
         private const InputModifiers MOUSE_INPUTMODIFIERS = InputModifiers.LeftMouseButton|InputModifiers.MiddleMouseButton|InputModifiers.RightMouseButton;
         private readonly IDragDropDevice _dragDrop;
@@ -29,7 +29,7 @@ namespace Avalonia.Platform
         private object _originalCursor;
         private InputModifiers? _initialInputModifiers;
 
-        public DragSource()
+        public InProcessDragSource()
         {
             _inputManager = AvaloniaLocator.Current.GetService<IInputManager>();
             _dragDrop = AvaloniaLocator.Current.GetService<IDragDropDevice>();

From d5d8d049a415944f1ba5e851f65774d039c24448 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@gmail.com>
Date: Fri, 13 Apr 2018 13:30:42 +0200
Subject: [PATCH 470/482] Renamed AcceptDrag to AllowDrop and added docs

---
 src/Avalonia.Input/DragDrop/DragDrop.cs       | 30 +++++++++++++++----
 src/Avalonia.Input/DragDrop/DragDropDevice.cs |  2 +-
 src/Avalonia.Input/DragDrop/IDataObject.cs    | 22 ++++++++++++++
 3 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Input/DragDrop/DragDrop.cs b/src/Avalonia.Input/DragDrop/DragDrop.cs
index 9d68deb62b..0cbbfb1dbe 100644
--- a/src/Avalonia.Input/DragDrop/DragDrop.cs
+++ b/src/Avalonia.Input/DragDrop/DragDrop.cs
@@ -6,21 +6,39 @@ namespace Avalonia.Input.DragDrop
 {
     public static class DragDrop
     {
+        /// <summary>
+        /// Event which is raised, when a drag-and-drop operation enters the element.
+        /// </summary>
         public static RoutedEvent<DragEventArgs> DragEnterEvent = RoutedEvent.Register<DragEventArgs>("DragEnter", RoutingStrategies.Bubble, typeof(DragDrop));
+        /// <summary>
+        /// Event which is raised, when a drag-and-drop operation leaves the element.
+        /// </summary>
         public static RoutedEvent<RoutedEventArgs> DragLeaveEvent = RoutedEvent.Register<RoutedEventArgs>("DragLeave", RoutingStrategies.Bubble, typeof(DragDrop));
+        /// <summary>
+        /// Event which is raised, when a drag-and-drop operation is updated while over the element.
+        /// </summary>
         public static RoutedEvent<DragEventArgs> DragOverEvent = RoutedEvent.Register<DragEventArgs>("DragOver", RoutingStrategies.Bubble, typeof(DragDrop));
+        /// <summary>
+        /// Event which is raised, when a drag-and-drop operation should complete over the element.
+        /// </summary>
         public static RoutedEvent<DragEventArgs> DropEvent = RoutedEvent.Register<DragEventArgs>("Drop", RoutingStrategies.Bubble, typeof(DragDrop));
 
-        public static AvaloniaProperty<bool> AcceptDragProperty = AvaloniaProperty.RegisterAttached<Interactive, bool>("AcceptDrag", typeof(DragDrop), inherits: true);
+        public static AvaloniaProperty<bool> AllowDropProperty = AvaloniaProperty.RegisterAttached<Interactive, bool>("AllowDrop", typeof(DragDrop), inherits: true);
 
-        public static bool GetAcceptDrag(Interactive interactive)
+        /// <summary>
+        /// Gets a value indicating whether the given element can be used as the target of a drag-and-drop operation. 
+        /// </summary>
+        public static bool GetAllowDrop(Interactive interactive)
         {
-            return interactive.GetValue(AcceptDragProperty);
+            return interactive.GetValue(AllowDropProperty);
         }
-        
-        public static void SetAcceptDrag(Interactive interactive, bool value)
+
+        /// <summary>
+        /// Sets a value indicating whether the given interactive can be used as the target of a drag-and-drop operation. 
+        /// </summary>
+        public static void SetAllowDrop(Interactive interactive, bool value)
         {
-            interactive.SetValue(AcceptDragProperty, value);
+            interactive.SetValue(AllowDropProperty, value);
         }
 
         /// <summary>
diff --git a/src/Avalonia.Input/DragDrop/DragDropDevice.cs b/src/Avalonia.Input/DragDrop/DragDropDevice.cs
index 0a64800346..7ef6f212f8 100644
--- a/src/Avalonia.Input/DragDrop/DragDropDevice.cs
+++ b/src/Avalonia.Input/DragDrop/DragDropDevice.cs
@@ -15,7 +15,7 @@ namespace Avalonia.Input.DragDrop
         private Interactive GetTarget(IInputElement root, Point local)
         {
             var target = root.InputHitTest(local)?.GetSelfAndVisualAncestors()?.OfType<Interactive>()?.FirstOrDefault();
-            if (target != null && DragDrop.GetAcceptDrag(target))
+            if (target != null && DragDrop.GetAllowDrop(target))
                 return target;
             return null;
         }
diff --git a/src/Avalonia.Input/DragDrop/IDataObject.cs b/src/Avalonia.Input/DragDrop/IDataObject.cs
index 5d26a20cee..bf2d00f529 100644
--- a/src/Avalonia.Input/DragDrop/IDataObject.cs
+++ b/src/Avalonia.Input/DragDrop/IDataObject.cs
@@ -2,16 +2,38 @@
 
 namespace Avalonia.Input.DragDrop
 {
+    /// <summary>
+    /// Interface to access information about the data of a drag-and-drop operation.
+    /// </summary>
     public interface IDataObject
     {
+        /// <summary>
+        /// Lists all formats which are present in the DataObject.
+        /// <seealso cref="DataFormats"/>
+        /// </summary>
         IEnumerable<string> GetDataFormats();
 
+        /// <summary>
+        /// Checks wether a given DataFormat is present in this object
+        /// <seealso cref="DataFormats"/>
+        /// </summary>
         bool Contains(string dataFormat);
 
+        /// <summary>
+        /// Returns the dragged text if the DataObject contains any text.
+        /// <seealso cref="DataFormats.Text"/>
+        /// </summary>
         string GetText();
 
+        /// <summary>
+        /// Returns a list of filenames if the DataObject contains filenames.
+        /// <seealso cref="DataFormats.FileNames"/>
+        /// </summary>
         IEnumerable<string> GetFileNames();
         
+        /// <summary>
+        /// Tries to get the data of the given DataFormat.
+        /// </summary>
         object Get(string dataFormat);
     }
 }
\ No newline at end of file

From 36186b31078aa911ecbd3c931f1514b074d24627 Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@gmail.com>
Date: Fri, 13 Apr 2018 13:31:53 +0200
Subject: [PATCH 471/482] added Drag+Drop sample

---
 samples/ControlCatalog/ControlCatalog.csproj  |  8 +++
 samples/ControlCatalog/MainView.xaml          |  1 +
 .../ControlCatalog/Pages/DragAndDropPage.cs   | 71 +++++++++++++++++++
 .../ControlCatalog/Pages/DragAndDropPage.xaml | 19 +++++
 4 files changed, 99 insertions(+)
 create mode 100644 samples/ControlCatalog/Pages/DragAndDropPage.cs
 create mode 100644 samples/ControlCatalog/Pages/DragAndDropPage.xaml

diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 862de9d320..5cdf5c59de 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -23,6 +23,8 @@
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Pages\ContextMenuPage.xaml" />
+    <None Remove="Pages\DragAndDropPage.cs" />
+    <None Remove="Pages\DragAndDropPage.xaml" />
   </ItemGroup>
   <ItemGroup>
     <!-- A reference to the entire .NET Framework is automatically included -->
@@ -35,6 +37,9 @@
     <EmbeddedResource Include="DecoratedWindow.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Pages\DragAndDropPage.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Pages\ButtonSpinnerPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -140,6 +145,9 @@
     <Compile Include="Pages\CheckBoxPage.xaml.cs">
       <DependentUpon>CheckBoxPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\DragAndDropPage.cs">
+      <DependentUpon>DragAndDropPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\DropDownPage.xaml.cs">
       <DependentUpon>DropDownPage.xaml</DependentUpon>
     </Compile>
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index a0e0df450b..1107d34b3e 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -15,6 +15,7 @@
     <TabItem Header="CheckBox"><pages:CheckBoxPage/></TabItem>
     <TabItem Header="ContextMenu"><pages:ContextMenuPage/></TabItem>
     <TabItem Header="DatePicker"><pages:DatePickerPage/></TabItem>
+    <TabItem Header="Drag+Drop"><pages:DragAndDropPage/></TabItem>
     <TabItem Header="DropDown"><pages:DropDownPage/></TabItem>
     <TabItem Header="Expander"><pages:ExpanderPage/></TabItem>
     <TabItem Header="Image"><pages:ImagePage/></TabItem>
diff --git a/samples/ControlCatalog/Pages/DragAndDropPage.cs b/samples/ControlCatalog/Pages/DragAndDropPage.cs
new file mode 100644
index 0000000000..172331204f
--- /dev/null
+++ b/samples/ControlCatalog/Pages/DragAndDropPage.cs
@@ -0,0 +1,71 @@
+using Avalonia.Controls;
+using Avalonia.Input.DragDrop;
+using Avalonia.Markup.Xaml;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ControlCatalog.Pages
+{
+    public class DragAndDropPage : UserControl
+    {
+        private TextBlock _DropState;
+        private TextBlock _DragState;
+        private Border _DragMe;
+        private int DragCount = 0;
+
+        public DragAndDropPage()
+        {
+            this.InitializeComponent();
+
+            _DragMe.PointerPressed += DoDrag;
+
+            AddHandler(DragDrop.DropEvent, Drop);
+            AddHandler(DragDrop.DragOverEvent, DragOver);
+        }
+
+        private async void DoDrag(object sender, Avalonia.Input.PointerPressedEventArgs e)
+        {
+            DataObject dragData = new DataObject();
+            dragData.Set(DataFormats.Text, $"You have dragged text {++DragCount} times");
+
+            var result = await DragDrop.DoDragDrop(dragData, DragDropEffects.Copy);
+            switch(result)
+            {
+                case DragDropEffects.Copy:
+                    _DragState.Text = "The text was copied"; break;
+                case DragDropEffects.Link:
+                    _DragState.Text = "The text was linked"; break;
+                case DragDropEffects.None:
+                    _DragState.Text = "The drag operation was canceled"; break;
+            }
+        }
+
+        private void DragOver(object sender, DragEventArgs e)
+        {
+            // Only allow Copy or Link as Drop Operations.
+            e.DragEffects = e.DragEffects & (DragDropEffects.Copy | DragDropEffects.Link);
+
+            // Only allow if the dragged data contains text or filenames.
+            if (!e.Data.Contains(DataFormats.Text) && !e.Data.Contains(DataFormats.FileNames))
+                e.DragEffects = DragDropEffects.None; 
+        }
+
+        private void Drop(object sender, DragEventArgs e)
+        {
+            if (e.Data.Contains(DataFormats.Text))
+                _DropState.Text = e.Data.GetText();
+            else if (e.Data.Contains(DataFormats.FileNames))
+                _DropState.Text = string.Join(Environment.NewLine, e.Data.GetFileNames());
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+
+            _DropState = this.Find<TextBlock>("DropState");
+            _DragState = this.Find<TextBlock>("DragState");
+            _DragMe = this.Find<Border>("DragMe");
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/DragAndDropPage.xaml b/samples/ControlCatalog/Pages/DragAndDropPage.xaml
new file mode 100644
index 0000000000..af679d2f9a
--- /dev/null
+++ b/samples/ControlCatalog/Pages/DragAndDropPage.xaml
@@ -0,0 +1,19 @@
+<UserControl xmlns="https://github.com/avaloniaui">
+    <StackPanel Orientation="Vertical" Gap="4">
+        <TextBlock Classes="h1">Drag+Drop</TextBlock>
+        <TextBlock Classes="h2">Example of Drag+Drop capabilities</TextBlock>
+
+        <StackPanel Orientation="Horizontal"
+                Margin="0,16,0,0"
+                HorizontalAlignment="Center"
+                Gap="16">
+            <Border BorderBrush="{DynamicResource ThemeAccentBrush}" BorderThickness="2" Padding="16" Name="DragMe">
+                <TextBlock Name="DragState">Drag Me</TextBlock>
+            </Border>
+            <Border Background="{DynamicResource ThemeAccentBrush2}" Padding="16" 
+                    DragDrop.AllowDrop="True">
+                <TextBlock Name="DropState">Drop some text or files here</TextBlock>
+            </Border>
+        </StackPanel>
+    </StackPanel>
+</UserControl>
\ No newline at end of file

From 6bb1cb471ef37da8b756534cb241056982f42aab Mon Sep 17 00:00:00 2001
From: boombuler <boombuler@gmail.com>
Date: Fri, 13 Apr 2018 13:33:33 +0200
Subject: [PATCH 472/482] don't use OSX-Platform DragSource

this should be used when the DragSource does work with any object.
For now only strings and filenames work.
---
 src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs b/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs
index 3db02de209..ba45ad8403 100644
--- a/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs
+++ b/src/OSX/Avalonia.MonoMac/MonoMacPlatform.cs
@@ -36,7 +36,7 @@ namespace Avalonia.MonoMac
                 .Bind<IClipboard>().ToSingleton<ClipboardImpl>()
                 .Bind<IRenderLoop>().ToConstant(s_renderLoop)
                 .Bind<IPlatformThreadingInterface>().ToConstant(PlatformThreadingInterface.Instance)
-                .Bind<IPlatformDragSource>().ToTransient<DragSource>();
+                /*.Bind<IPlatformDragSource>().ToTransient<DragSource>()*/;
         }
 
         public static void Initialize()

From 2d1ab0a106f180f154ad5d680320f60950eaf19f Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 13 Apr 2018 14:36:46 +0200
Subject: [PATCH 473/482] Only update clip bounds when ClipToBounds = true.

Fixes #1436
---
 .../Rendering/SceneGraph/SceneBuilder.cs      |  4 +-
 .../Rendering/SceneGraph/SceneBuilderTests.cs | 48 +++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
index 6005ee8b8f..799380cb85 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
@@ -167,7 +167,9 @@ namespace Avalonia.Rendering.SceneGraph
                 using (context.PushPostTransform(m))
                 using (context.PushTransformContainer())
                 {
-                    var clipBounds = bounds.TransformToAABB(contextImpl.Transform).Intersect(clip);
+                    var clipBounds = clipToBounds ?
+                        bounds.TransformToAABB(contextImpl.Transform).Intersect(clip) :
+                        clip;
 
                     forceRecurse = forceRecurse ||
                         node.ClipBounds != clipBounds ||
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
index 2ada7bdbba..df4584518e 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
@@ -83,6 +83,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                         Margin = new Thickness(10, 20, 30, 40),
                         Child = canvas = new Canvas
                         {
+                            ClipToBounds = true,
                             Background = Brushes.AliceBlue,
                         }
                     }
@@ -129,6 +130,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                             (border = new Border
                             {
                                 Background = Brushes.AliceBlue,
+                                ClipToBounds = true,
                                 Width = 100,
                                 Height = 100,
                                 [Canvas.LeftProperty] = 50,
@@ -173,6 +175,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                             (border = new Border
                             {
                                 Background = Brushes.AliceBlue,
+                                ClipToBounds = true,
                                 Width = 100,
                                 Height = 100,
                                 [Canvas.LeftProperty] = 50,
@@ -254,6 +257,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                         Margin = new Thickness(24, 26),
                         Child = target = new Border
                         {
+                            ClipToBounds = true,
                             Margin = new Thickness(26, 24),
                             Width = 100,
                             Height = 100,
@@ -515,6 +519,50 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             }
         }
 
+        [Fact]
+        public void Should_Update_ClipBounds_For_Negative_Margin()
+        {
+            using (TestApplication())
+            {
+                Decorator decorator;
+                Border border;
+                var tree = new TestRoot
+                {
+                    Width = 100,
+                    Height = 100,
+                    Child = decorator = new Decorator
+                    {
+                        Margin = new Thickness(0, 10, 0, 0),
+                        Child = border = new Border
+                        {
+                            Background = Brushes.Red,
+                            ClipToBounds = true,
+                            Margin = new Thickness(0, -5, 0, 0),
+                        }
+                    }
+                };
+
+                var layout = AvaloniaLocator.Current.GetService<ILayoutManager>();
+                layout.ExecuteInitialLayoutPass(tree);
+
+                var scene = new Scene(tree);
+                var sceneBuilder = new SceneBuilder();
+                sceneBuilder.UpdateAll(scene);
+
+                var borderNode = scene.FindNode(border);
+                Assert.Equal(new Rect(0, 5, 100, 95), borderNode.ClipBounds);
+
+                border.Margin = new Thickness(0, -8, 0, 0);
+                layout.ExecuteLayoutPass();
+
+                scene = scene.CloneScene();
+                sceneBuilder.Update(scene, border);
+
+                borderNode = scene.FindNode(border);
+                Assert.Equal(new Rect(0, 2, 100, 98), borderNode.ClipBounds);
+            }
+        }
+
         [Fact]
         public void Should_Update_Descendent_Tranform_When_Margin_Changed()
         {

From 67003577a0dc9c7aac2326c527f001d075ef9823 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 13 Apr 2018 13:40:56 +0100
Subject: [PATCH 474/482] Add failing unit tests for border and content
 presenter.

---
 .../BorderTests.cs                            | 23 +++++++++++++++++++
 .../ContentPresenterTests_Layout.cs           | 23 +++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/tests/Avalonia.Controls.UnitTests/BorderTests.cs b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
index 3660a7b4ca..4f58e5e780 100644
--- a/tests/Avalonia.Controls.UnitTests/BorderTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
@@ -20,5 +20,28 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Equal(new Size(20, 20), target.DesiredSize);
         }
+
+        [Fact]
+        public void Child_Should_Arrange_With_Zero_Height_Width_If_Padding_Greater_Than_Child_Size()
+        {
+            Border content;
+
+            var target = new Border
+            {
+                Padding = new Thickness(6),
+                MaxHeight = 12,
+                MaxWidth = 12,
+                Content = content = new Border
+                {
+                     Height = 0,
+                     Width = 0
+                }
+            };
+
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Rect(0, 0, 0, 0), content.Bounds);
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
index b3c617c4ab..d88716279a 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
@@ -210,5 +210,28 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
             Assert.Equal(new Rect(84, 0, 16, 16), content.Bounds);
         }
+
+        [Fact]
+        public void Child_Arrange_With_Zero_Height_When_Padding_Height_Greater_Than_Child_Height()
+        {
+            Border content;
+            var target = new ContentPresenter
+            {
+                Padding = 32,
+                MaxHeight = 32,
+                MaxWidth = 32,
+                Content = content = new Border
+                {
+                    MinWidth = 16,
+                    MinHeight = 16,                    
+                },
+            };
+
+            target.UpdateChild();
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            Assert.Equal(new Rect(0, 0, 0, 0), content.Bounds);
+        }
     }
 }
\ No newline at end of file

From a98d289af8abcf50e3b29bdd589b92a6e2ccd72a Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 13 Apr 2018 13:42:36 +0100
Subject: [PATCH 475/482] Add arrange fix for border and content presenter.

---
 src/Avalonia.Controls/Border.cs                      | 3 ++-
 src/Avalonia.Controls/Presenters/ContentPresenter.cs | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index 06ad8a4837..6bceba3401 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -111,7 +111,8 @@ namespace Avalonia.Controls
             if (Child != null)
             {
                 var padding = Padding + BorderThickness;
-                Child.Arrange(new Rect(finalSize).Deflate(padding));
+                var arrangeRect = new Rect(finalSize).Deflate(padding);
+                Child.Arrange(new Rect(arrangeRect.X, arrangeRect.Y, Math.Max(0, arrangeRect.Width), Math.Max(0, arrangeRect.Height)));                            
             }
 
             _borderRenderHelper.Update(finalSize, BorderThickness, CornerRadius);           
diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index 6acbc047ae..1c5883d980 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -386,7 +386,7 @@ namespace Avalonia.Controls.Presenters
             
             if (verticalContentAlignment != VerticalAlignment.Stretch)
             {
-                size = size.WithHeight(Math.Min(size.Height, DesiredSize.Height - padding.Top - padding.Bottom));
+                size = size.WithHeight(Math.Min(size.Height, DesiredSize.Height - padding.Top - padding.Bottom));                
             }
 
             if (useLayoutRounding)
@@ -425,7 +425,7 @@ namespace Avalonia.Controls.Presenters
                 originY = Math.Floor(originY * scale) / scale;
             }
 
-            Child.Arrange(new Rect(originX, originY, size.Width, size.Height));
+            Child.Arrange(new Rect(originX, originY, Math.Max(0, size.Width), Math.Max(0, size.Height)));
 
             return finalSize;
         }

From 2c9f3ede54cf7aca8c2fdd8b1e1af437c81aa805 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 13 Apr 2018 14:12:51 +0100
Subject: [PATCH 476/482] fix tests and and fixes.

---
 src/Avalonia.Controls/Border.cs                      |  5 ++---
 tests/Avalonia.Controls.UnitTests/BorderTests.cs     |  7 +++----
 .../Presenters/ContentPresenterTests_Layout.cs       | 12 +++++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index 6bceba3401..e6846978dc 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -110,9 +110,8 @@ namespace Avalonia.Controls
         {
             if (Child != null)
             {
-                var padding = Padding + BorderThickness;
-                var arrangeRect = new Rect(finalSize).Deflate(padding);
-                Child.Arrange(new Rect(arrangeRect.X, arrangeRect.Y, Math.Max(0, arrangeRect.Width), Math.Max(0, arrangeRect.Height)));                            
+                var padding = Padding + BorderThickness;                
+                Child.Arrange(new Rect(finalSize).Deflate(padding));
             }
 
             _borderRenderHelper.Update(finalSize, BorderThickness, CornerRadius);           
diff --git a/tests/Avalonia.Controls.UnitTests/BorderTests.cs b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
index 4f58e5e780..9d6c838bc3 100644
--- a/tests/Avalonia.Controls.UnitTests/BorderTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
@@ -31,17 +31,16 @@ namespace Avalonia.Controls.UnitTests
                 Padding = new Thickness(6),
                 MaxHeight = 12,
                 MaxWidth = 12,
-                Content = content = new Border
+                Child = content = new Border
                 {
                      Height = 0,
                      Width = 0
                 }
             };
-
-            target.Measure(new Size(100, 100));
+            
             target.Arrange(new Rect(0, 0, 100, 100));
 
-            Assert.Equal(new Rect(0, 0, 0, 0), content.Bounds);
+            Assert.Equal(new Rect(6, 6, 0, 0), content.Bounds);
         }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
index d88716279a..2c1074aa9a 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
@@ -217,21 +217,23 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Border content;
             var target = new ContentPresenter
             {
-                Padding = 32,
+                Padding = new Thickness(32),
                 MaxHeight = 32,
                 MaxWidth = 32,
+                HorizontalContentAlignment = HorizontalAlignment.Center,
+                VerticalContentAlignment = VerticalAlignment.Center,
                 Content = content = new Border
                 {
-                    MinWidth = 16,
-                    MinHeight = 16,                    
+                    Height = 0,
+                    Width = 0,
                 },
             };
 
             target.UpdateChild();
-            target.Measure(new Size(100, 100));
+
             target.Arrange(new Rect(0, 0, 100, 100));
 
-            Assert.Equal(new Rect(0, 0, 0, 0), content.Bounds);
+            Assert.Equal(new Rect(48, 48, 0, 0), content.Bounds);
         }
     }
 }
\ No newline at end of file

From 8d07861e5976fa1930d2da40271031019b242d05 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 13 Apr 2018 14:14:24 +0100
Subject: [PATCH 477/482] white space.

---
 src/Avalonia.Controls/Border.cs                      | 4 ++--
 src/Avalonia.Controls/Presenters/ContentPresenter.cs | 4 ++--
 tests/Avalonia.Controls.UnitTests/BorderTests.cs     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index e6846978dc..93a6c203c9 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -110,11 +110,11 @@ namespace Avalonia.Controls
         {
             if (Child != null)
             {
-                var padding = Padding + BorderThickness;                
+                var padding = Padding + BorderThickness;
                 Child.Arrange(new Rect(finalSize).Deflate(padding));
             }
 
-            _borderRenderHelper.Update(finalSize, BorderThickness, CornerRadius);           
+            _borderRenderHelper.Update(finalSize, BorderThickness, CornerRadius);
 
             return finalSize;
         }
diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index 1c5883d980..ce8fe52c22 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -383,10 +383,10 @@ namespace Avalonia.Controls.Presenters
             {
                 size = size.WithWidth(Math.Min(size.Width, DesiredSize.Width - padding.Left - padding.Right));
             }
-            
+
             if (verticalContentAlignment != VerticalAlignment.Stretch)
             {
-                size = size.WithHeight(Math.Min(size.Height, DesiredSize.Height - padding.Top - padding.Bottom));                
+                size = size.WithHeight(Math.Min(size.Height, DesiredSize.Height - padding.Top - padding.Bottom));
             }
 
             if (useLayoutRounding)
diff --git a/tests/Avalonia.Controls.UnitTests/BorderTests.cs b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
index 9d6c838bc3..9a6a041ec7 100644
--- a/tests/Avalonia.Controls.UnitTests/BorderTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
@@ -33,11 +33,11 @@ namespace Avalonia.Controls.UnitTests
                 MaxWidth = 12,
                 Child = content = new Border
                 {
-                     Height = 0,
-                     Width = 0
+                    Height = 0,
+                    Width = 0
                 }
             };
-            
+
             target.Arrange(new Rect(0, 0, 100, 100));
 
             Assert.Equal(new Rect(6, 6, 0, 0), content.Bounds);

From 4ca13f2e3f7bde9e2735063318701365fb8362c4 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 13 Apr 2018 15:25:52 +0200
Subject: [PATCH 478/482] Added additional invalidation properties...

...to `ContentPresenter`
---
 src/Avalonia.Controls/Presenters/ContentPresenter.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index d2fb838657..408e777ef8 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -89,12 +89,11 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         static ContentPresenter()
         {
+            AffectsRender(BackgroundProperty, BorderBrushProperty, BorderThicknessProperty, CornerRadiusProperty);
+            AffectsMeasure(BorderThicknessProperty);
             ContentProperty.Changed.AddClassHandler<ContentPresenter>(x => x.ContentChanged);
             ContentTemplateProperty.Changed.AddClassHandler<ContentPresenter>(x => x.ContentChanged);
             TemplatedParentProperty.Changed.AddClassHandler<ContentPresenter>(x => x.TemplatedParentChanged);
-
-            AffectsRender(BorderThicknessProperty);
-            AffectsMeasure(BorderThicknessProperty);
         }
 
         /// <summary>

From 195c2bb57a696d7e8d600d43b6b17a13cd620863 Mon Sep 17 00:00:00 2001
From: factormystic <factormystic@gmail.com>
Date: Fri, 13 Apr 2018 17:47:56 -0400
Subject: [PATCH 479/482] Fix broken quickstart link

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index eeee39dabe..96cfde3eb2 100644
--- a/readme.md
+++ b/readme.md
@@ -35,7 +35,7 @@ https://ci.appveyor.com/project/AvaloniaUI/Avalonia/branch/master/artifacts
 
 ## Documentation
 
-As mentioned above, Avalonia is still in alpha and as such there's not much documentation yet. You can take a look at the [getting started page](http://avaloniaui.net/guides/quickstart) for an overview of how to get started but probably the best thing to do for now is to already know a little bit about WPF/Silverlight/UWP/XAML and ask questions in our [Gitter room](https://gitter.im/AvaloniaUI/Avalonia).
+As mentioned above, Avalonia is still in alpha and as such there's not much documentation yet. You can take a look at the [getting started page](http://avaloniaui.net/docs/quickstart/) for an overview of how to get started but probably the best thing to do for now is to already know a little bit about WPF/Silverlight/UWP/XAML and ask questions in our [Gitter room](https://gitter.im/AvaloniaUI/Avalonia).
 
 There's also a high-level [architecture document](http://avaloniaui.net/architecture/project-structure) that is currently a little bit out of date, and I've also started writing blog posts on Avalonia at http://grokys.github.io/.
 

From 3b2012dcd8f1babd4b96490d5a1d49e88d98ad8c Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 15 Mar 2018 23:16:05 +0100
Subject: [PATCH 480/482] Fixed focused control display in DevTools.

---
 src/Avalonia.Diagnostics/ViewModels/DevToolsViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Diagnostics/ViewModels/DevToolsViewModel.cs b/src/Avalonia.Diagnostics/ViewModels/DevToolsViewModel.cs
index 2d3f978462..555a0b2354 100644
--- a/src/Avalonia.Diagnostics/ViewModels/DevToolsViewModel.cs
+++ b/src/Avalonia.Diagnostics/ViewModels/DevToolsViewModel.cs
@@ -86,7 +86,7 @@ namespace Avalonia.Diagnostics.ViewModels
 
         private void UpdateFocusedControl()
         {
-            _focusedControl = KeyboardDevice.Instance.FocusedElement?.GetType().Name;
+            FocusedControl = KeyboardDevice.Instance.FocusedElement?.GetType().Name;
         }
     }
 }

From cea86f36474d85b9cee079f477681669bbf301fe Mon Sep 17 00:00:00 2001
From: ahopper <alan@samsararesearch.com>
Date: Tue, 17 Apr 2018 07:08:58 +0100
Subject: [PATCH 481/482] removed popup from control catalog

---
 samples/ControlCatalog/ControlCatalog.csproj  |  4 --
 samples/ControlCatalog/MainView.xaml          |  1 -
 samples/ControlCatalog/Pages/PopupPage.xaml   | 49 -------------------
 .../ControlCatalog/Pages/PopupPage.xaml.cs    | 19 -------
 4 files changed, 73 deletions(-)
 delete mode 100644 samples/ControlCatalog/Pages/PopupPage.xaml
 delete mode 100644 samples/ControlCatalog/Pages/PopupPage.xaml.cs

diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 4fb0ff2059..862de9d320 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -23,8 +23,6 @@
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Pages\ContextMenuPage.xaml" />
-    <None Remove="Pages\PopupPage.xaml" />
-    <None Remove="Pages\PopupPage.xaml.cs" />
   </ItemGroup>
   <ItemGroup>
     <!-- A reference to the entire .NET Framework is automatically included -->
@@ -86,7 +84,6 @@
     <EmbeddedResource Include="Pages\NumericUpDownPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Pages\PopupPage.xaml" />
     <EmbeddedResource Include="Pages\ProgressBarPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -161,7 +158,6 @@
     <Compile Include="Pages\MenuPage.xaml.cs">
       <DependentUpon>MenuPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\PopupPage.xaml.cs" />
     <Compile Include="Pages\ProgressBarPage.xaml.cs">
       <DependentUpon>ProgressBarPage.xaml</DependentUpon>
     </Compile>
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 3a19d8e8ed..a0e0df450b 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -27,6 +27,5 @@
     <TabItem Header="TextBox"><pages:TextBoxPage/></TabItem>
     <TabItem Header="ToolTip"><pages:ToolTipPage/></TabItem>
     <TabItem Header="TreeView"><pages:TreeViewPage/></TabItem>
-    <TabItem Header="Popup"><pages:PopupPage/></TabItem>
   </TabControl>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/PopupPage.xaml b/samples/ControlCatalog/Pages/PopupPage.xaml
deleted file mode 100644
index 8469ac480d..0000000000
--- a/samples/ControlCatalog/Pages/PopupPage.xaml
+++ /dev/null
@@ -1,49 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             >
-  <StackPanel Orientation="Vertical" Gap="4">
-    <TextBlock Classes="h1">Popup</TextBlock>
-    <TextBlock Classes="h2">A Popup dialog</TextBlock>
-    <StackPanel Gap="4">
-    <ToggleButton IsChecked="{Binding #flyout.IsOpen, Mode=TwoWay}" Width="150" ClickMode="Press" >Flyout Auto close</ToggleButton>
-    <ToggleButton IsChecked="{Binding #flyout2.IsOpen, Mode=TwoWay}" Width="150" ClickMode="Press" >Flyout Toggle</ToggleButton>
-      <Popup Name="flyout" StaysOpen="False" Width="200" Height="100"  >
-      <Border Background="LightGray" BorderBrush="Gray" BorderThickness="1" Padding="6" >
-        <StackPanel>
-          <DropDown>
-            <DropDownItem ToolTip.Tip="Yet another nested popup">Item A</DropDownItem>
-            <DropDownItem ToolTip.Tip="Yet another nested popup">Item B</DropDownItem>
-            <DropDownItem ToolTip.Tip="Yet another nested popup">Item C</DropDownItem>
-            <DropDownItem ToolTip.Tip="Yet another nested popup">Item D</DropDownItem>
-            <DropDownItem ToolTip.Tip="Yet another nested popup">Item E</DropDownItem>
-            <DropDownItem ToolTip.Tip="Yet another nested popup">Item F</DropDownItem>
-            <DropDownItem ToolTip.Tip="Yet another nested popup">Item G</DropDownItem>
-          </DropDown>
-          <ToggleButton IsChecked="{Binding #nestedflyout.IsOpen, Mode=TwoWay}" Width="150" ClickMode="Press" >Nested Auto close</ToggleButton>
-          <Popup Name="nestedflyout" StaysOpen="False" Width="200" Height="200"  >
-            <Border Background="LightGray" BorderBrush="Gray" BorderThickness="1" Padding="6" >
-              <StackPanel>
-                <TextBox>Nested Content</TextBox>
-              </StackPanel>
-            </Border>
-          </Popup> 
-        </StackPanel>
-      </Border>
-    </Popup>
-      <Popup Name="flyout2" StaysOpen="True" Width="200" Height="100"  >
-        <Border Background="LightGray" BorderBrush="Gray" BorderThickness="1" Padding="6" >
-          <StackPanel>
-            <DropDown>
-              <DropDownItem ToolTip.Tip="Yet another nested popup">Item A</DropDownItem>
-              <DropDownItem ToolTip.Tip="Yet another nested popup">Item B</DropDownItem>
-              <DropDownItem ToolTip.Tip="Yet another nested popup">Item C</DropDownItem>
-              <DropDownItem ToolTip.Tip="Yet another nested popup">Item D</DropDownItem>
-              <DropDownItem ToolTip.Tip="Yet another nested popup">Item E</DropDownItem>
-              <DropDownItem ToolTip.Tip="Yet another nested popup">Item F</DropDownItem>
-              <DropDownItem ToolTip.Tip="Yet another nested popup">Item G</DropDownItem>
-            </DropDown>
-          </StackPanel>
-        </Border>
-      </Popup>
-    </StackPanel>
-  </StackPanel>
-</UserControl>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/PopupPage.xaml.cs b/samples/ControlCatalog/Pages/PopupPage.xaml.cs
deleted file mode 100644
index 08aca56bad..0000000000
--- a/samples/ControlCatalog/Pages/PopupPage.xaml.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace ControlCatalog.Pages
-{
-    public class PopupPage : UserControl
-    {
-        public PopupPage()
-        {
-            this.InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-    }
-}

From 0561ee2cb2484bd3733b0d7c73a37e09c7ac5c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= <wieslaw.soltes@gmail.com>
Date: Tue, 17 Apr 2018 16:38:09 +0200
Subject: [PATCH 482/482] Fix DragAndDropPage file name

---
 .../Pages/{DragAndDropPage.cs => DragAndDropPage.xaml.cs}         | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename samples/ControlCatalog/Pages/{DragAndDropPage.cs => DragAndDropPage.xaml.cs} (100%)

diff --git a/samples/ControlCatalog/Pages/DragAndDropPage.cs b/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs
similarity index 100%
rename from samples/ControlCatalog/Pages/DragAndDropPage.cs
rename to samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs