From 88aec0b1a36c8ff361d63d6ce1b7bb760010b3e3 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 17 Aug 2017 16:51:10 +0100
Subject: [PATCH 01/25] remove call to fully redraw the editor everytime the
 scroll offset is chagned.

This was causing poor scroll performance and is not necessary.
---
 src/AvaloniaEdit/Editing/TextArea.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/AvaloniaEdit/Editing/TextArea.cs b/src/AvaloniaEdit/Editing/TextArea.cs
index bb47e489..42e1a939 100644
--- a/src/AvaloniaEdit/Editing/TextArea.cs
+++ b/src/AvaloniaEdit/Editing/TextArea.cs
@@ -1027,8 +1027,6 @@ protected override Size ArrangeOverride(Size finalSize)
                 TextView.SetScrollData(new Size(_viewPort.Width, _viewPort.Height * TextView.DefaultLineHeight), _extent);
 
                 (this as ILogicalScrollable).InvalidateScroll?.Invoke();
-                
-                TextView.Redraw();
             }
 
             return base.ArrangeOverride(finalSize);

From 83e7f1782e2681e0237c76bdaacae94a55448989 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 6 Sep 2017 21:14:19 +0100
Subject: [PATCH 02/25] update to netstandard2.0 in order to support upcoming
 avalonia release.

---
 src/AvaloniaEdit/AvaloniaEdit.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/AvaloniaEdit/AvaloniaEdit.csproj b/src/AvaloniaEdit/AvaloniaEdit.csproj
index 4e8edd77..65604b57 100644
--- a/src/AvaloniaEdit/AvaloniaEdit.csproj
+++ b/src/AvaloniaEdit/AvaloniaEdit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
     <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" />
-    <PackageReference Include="Avalonia" Version="0.5.1-build3595-alpha" />
+    <PackageReference Include="Avalonia" Version="0.5.2-build3791-alpha" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file

From f85389e97fc350b9a67082d56b6925752a151d6b Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 6 Sep 2017 21:33:37 +0100
Subject: [PATCH 03/25] remove our own icloneable as no longer needed.

---
 src/AvaloniaEdit/AvaloniaEdit.csproj | 2 +-
 src/AvaloniaEdit/Utils/IFreezable.cs | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/AvaloniaEdit/AvaloniaEdit.csproj b/src/AvaloniaEdit/AvaloniaEdit.csproj
index 65604b57..89e121d0 100644
--- a/src/AvaloniaEdit/AvaloniaEdit.csproj
+++ b/src/AvaloniaEdit/AvaloniaEdit.csproj
@@ -9,9 +9,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Avalonia" Version="0.5.2-build3791-alpha" />
     <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
     <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" />
-    <PackageReference Include="Avalonia" Version="0.5.2-build3791-alpha" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/AvaloniaEdit/Utils/IFreezable.cs b/src/AvaloniaEdit/Utils/IFreezable.cs
index b8a0c585..ac0d97f1 100644
--- a/src/AvaloniaEdit/Utils/IFreezable.cs
+++ b/src/AvaloniaEdit/Utils/IFreezable.cs
@@ -34,12 +34,7 @@ internal interface IFreezable
 		/// Freezes this instance.
 		/// </summary>
 		void Freeze();
-	}
-
-    internal interface ICloneable
-    {
-        object Clone();
-    }
+	}    
 
     internal static class FreezableHelper
 	{

From b633e9952bcd13bd354fd83ac32f09a4d511af93 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 21 Sep 2017 10:26:52 +0100
Subject: [PATCH 04/25] support latest avalonia.

---
 src/AvaloniaEdit/AvaloniaEdit.csproj       | 11 +++++++++--
 src/AvaloniaEdit/Utils/ExtensionMethods.cs | 13 ++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/AvaloniaEdit/AvaloniaEdit.csproj b/src/AvaloniaEdit/AvaloniaEdit.csproj
index 89e121d0..461a975c 100644
--- a/src/AvaloniaEdit/AvaloniaEdit.csproj
+++ b/src/AvaloniaEdit/AvaloniaEdit.csproj
@@ -9,9 +9,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.5.2-build3791-alpha" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
+    <PackageReference Include="Avalonia" Version="0.5.2-build3869-alpha" />
+    <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
     <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" />
   </ItemGroup>
 
+  <Target Name="ChangeAliasesOfSystemDrawing" BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">
+    <ItemGroup>
+      <ReferencePath Condition="'%(FileName)' == 'Splat'">
+        <Aliases>SystemDrawing</Aliases>
+      </ReferencePath>
+    </ItemGroup>
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/AvaloniaEdit/Utils/ExtensionMethods.cs b/src/AvaloniaEdit/Utils/ExtensionMethods.cs
index 81458fa3..fb6f7c90 100644
--- a/src/AvaloniaEdit/Utils/ExtensionMethods.cs
+++ b/src/AvaloniaEdit/Utils/ExtensionMethods.cs
@@ -15,6 +15,7 @@
 // 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.
+extern alias SystemDrawing;
 
 using System;
 using System.Collections.Generic;
@@ -24,6 +25,8 @@
 using Avalonia;
 using Avalonia.Input;
 using Avalonia.VisualTree;
+using SystemDrawingColor = global::System.Drawing;
+
 
 namespace AvaloniaEdit.Utils
 {
@@ -177,22 +180,22 @@ public static IEnumerable<T> Sequence<T>(T value)
         #endregion
 
         #region System.Drawing <-> Avalonia conversions
-        public static System.Drawing.Point ToSystemDrawing(this Point p)
+        public static SystemDrawing::System.Drawing.Point ToSystemDrawing(this Point p)
         {
-            return new System.Drawing.Point((int)p.X, (int)p.Y);
+            return new SystemDrawing::System.Drawing.Point((int)p.X, (int)p.Y);
         }
 
-        public static Point ToAvalonia(this System.Drawing.Point p)
+        public static Point ToAvalonia(this SystemDrawing::System.Drawing.Point p)
         {
             return new Point(p.X, p.Y);
         }
 
-        public static Size ToAvalonia(this System.Drawing.Size s)
+        public static Size ToAvalonia(this SystemDrawing::System.Drawing.Size s)
         {
             return new Size(s.Width, s.Height);
         }
 
-        public static Rect ToAvalonia(this System.Drawing.Rectangle rect)
+        public static Rect ToAvalonia(this SystemDrawing::System.Drawing.Rectangle rect)
         {
             return new Rect(rect.Location.ToAvalonia(), rect.Size.ToAvalonia());
         }

From f94f81c54a3b1f2fc9d3f29530f14159bc8e7f7c Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 5 Oct 2017 14:14:23 +0100
Subject: [PATCH 05/25] update avalonia with fixes.

---
 src/AvaloniaEdit/AvaloniaEdit.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AvaloniaEdit/AvaloniaEdit.csproj b/src/AvaloniaEdit/AvaloniaEdit.csproj
index 461a975c..7e728c00 100644
--- a/src/AvaloniaEdit/AvaloniaEdit.csproj
+++ b/src/AvaloniaEdit/AvaloniaEdit.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.5.2-build3869-alpha" />
+    <PackageReference Include="Avalonia" Version="0.5.2-build3991-alpha" />
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
     <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" />
   </ItemGroup>

From d185abfa066404e1f6976fa9d26c42fc39e6cf94 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 23 Oct 2017 11:03:58 +0100
Subject: [PATCH 06/25] compatibility with latest avalonia.

---
 src/AvaloniaEdit/AvaloniaEdit.csproj               | 2 +-
 src/AvaloniaEdit/CodeCompletion/InsightWindow.xaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/AvaloniaEdit/AvaloniaEdit.csproj b/src/AvaloniaEdit/AvaloniaEdit.csproj
index 7e728c00..8d5c234b 100644
--- a/src/AvaloniaEdit/AvaloniaEdit.csproj
+++ b/src/AvaloniaEdit/AvaloniaEdit.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.5.2-build3991-alpha" />
+    <PackageReference Include="Avalonia" Version="0.5.2-build4149-alpha" />
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
     <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" />
   </ItemGroup>
diff --git a/src/AvaloniaEdit/CodeCompletion/InsightWindow.xaml b/src/AvaloniaEdit/CodeCompletion/InsightWindow.xaml
index 79228529..2ece259e 100644
--- a/src/AvaloniaEdit/CodeCompletion/InsightWindow.xaml
+++ b/src/AvaloniaEdit/CodeCompletion/InsightWindow.xaml
@@ -24,7 +24,7 @@
                                     Grid.Column="0"
                                     Margin="0,0,4,0"
                                     Orientation="Horizontal"
-                                    IsVisible="{TemplateBinding Path=Provider.Count, Converter={Static cc:CollapseIfSingleOverloadConverter.Instance}}">
+                                    IsVisible="{TemplateBinding Path=Provider.Count, Converter={x:Static cc:CollapseIfSingleOverloadConverter.Instance}}">
                             <Button Name="PART_UP">
                                 <Path Stroke="Black"
                                       Fill="Black"

From b1d29cf1c1b3165e4cc0b1b5491e096db5ea6e80 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 2 Nov 2017 16:11:31 +0000
Subject: [PATCH 07/25] redraw visual lines when scroll viewer changes.

---
 src/AvaloniaEdit/Rendering/TextView.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/AvaloniaEdit/Rendering/TextView.cs b/src/AvaloniaEdit/Rendering/TextView.cs
index 0b1ae2aa..cdad4b5a 100644
--- a/src/AvaloniaEdit/Rendering/TextView.cs
+++ b/src/AvaloniaEdit/Rendering/TextView.cs
@@ -1369,6 +1369,8 @@ public bool SetScrollData(Size viewport, Size extent)
             {
                 _scrollViewport = viewport;
                 _scrollExtent = extent;
+
+                Redraw();
                 return true;
             }
             return false;

From cc864e954aa06becd5ed36eb8ebf741784ded21c Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 2 Nov 2017 16:16:03 +0000
Subject: [PATCH 08/25] redraw visual lines when resizing, is controlled by
 textarea.

---
 src/AvaloniaEdit/Editing/TextArea.cs   | 5 ++++-
 src/AvaloniaEdit/Rendering/TextView.cs | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/AvaloniaEdit/Editing/TextArea.cs b/src/AvaloniaEdit/Editing/TextArea.cs
index 42e1a939..1f084f14 100644
--- a/src/AvaloniaEdit/Editing/TextArea.cs
+++ b/src/AvaloniaEdit/Editing/TextArea.cs
@@ -1024,7 +1024,10 @@ protected override Size ArrangeOverride(Size finalSize)
                 _viewPort = new Size(finalSize.Width, finalSize.Height / TextView.DefaultLineHeight);
                 _extent = new Size(finalSize.Width, LogicalScrollSize);
 
-                TextView.SetScrollData(new Size(_viewPort.Width, _viewPort.Height * TextView.DefaultLineHeight), _extent);
+                if(TextView.SetScrollData(new Size(_viewPort.Width, _viewPort.Height * TextView.DefaultLineHeight), _extent))
+                {
+                    TextView.Redraw();
+                }
 
                 (this as ILogicalScrollable).InvalidateScroll?.Invoke();
             }
diff --git a/src/AvaloniaEdit/Rendering/TextView.cs b/src/AvaloniaEdit/Rendering/TextView.cs
index cdad4b5a..0b1ae2aa 100644
--- a/src/AvaloniaEdit/Rendering/TextView.cs
+++ b/src/AvaloniaEdit/Rendering/TextView.cs
@@ -1369,8 +1369,6 @@ public bool SetScrollData(Size viewport, Size extent)
             {
                 _scrollViewport = viewport;
                 _scrollExtent = extent;
-
-                Redraw();
                 return true;
             }
             return false;

From d6da40b3f7f3b0659dc73a426b7b466e3c46c7aa Mon Sep 17 00:00:00 2001
From: Unknown <dan@walms.co.uk>
Date: Sat, 11 Nov 2017 17:01:30 +0000
Subject: [PATCH 09/25] add support for highlighting XAML as XML.

---
 src/AvaloniaEdit/Highlighting/Resources/Resources.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/AvaloniaEdit/Highlighting/Resources/Resources.cs b/src/AvaloniaEdit/Highlighting/Resources/Resources.cs
index 92af58ce..47ee8e91 100644
--- a/src/AvaloniaEdit/Highlighting/Resources/Resources.cs
+++ b/src/AvaloniaEdit/Highlighting/Resources/Resources.cs
@@ -58,6 +58,7 @@ internal static void RegisterBuiltInHighlightings(HighlightingManager.DefaultHig
 			                                 ".booproj;.build;.xfrm;.targets;.xaml;.xpt;" +
 			                                 ".xft;.map;.wsdl;.disco;.ps1xml;.nuspec").Split(';'),
 			                         "XML-Mode.xshd");
+            hlm.RegisterHighlighting("XAML", new[] { ".xaml", ".paml" }, "XML-mode.xshd");
 			hlm.RegisterHighlighting("MarkDown", new[] { ".md" }, "MarkDown-Mode.xshd");
 		}
 	}

From 81f172e89a9a5fc91f66eb56e9fa0fd59119f8cb Mon Sep 17 00:00:00 2001
From: Unknown <dan@walms.co.uk>
Date: Sat, 11 Nov 2017 17:10:21 +0000
Subject: [PATCH 10/25] fix xaml highlighting support

---
 src/AvaloniaEdit/Highlighting/Resources/Resources.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AvaloniaEdit/Highlighting/Resources/Resources.cs b/src/AvaloniaEdit/Highlighting/Resources/Resources.cs
index 47ee8e91..ace5520e 100644
--- a/src/AvaloniaEdit/Highlighting/Resources/Resources.cs
+++ b/src/AvaloniaEdit/Highlighting/Resources/Resources.cs
@@ -58,7 +58,7 @@ internal static void RegisterBuiltInHighlightings(HighlightingManager.DefaultHig
 			                                 ".booproj;.build;.xfrm;.targets;.xaml;.xpt;" +
 			                                 ".xft;.map;.wsdl;.disco;.ps1xml;.nuspec").Split(';'),
 			                         "XML-Mode.xshd");
-            hlm.RegisterHighlighting("XAML", new[] { ".xaml", ".paml" }, "XML-mode.xshd");
+            hlm.RegisterHighlighting("XAML", new[] { ".xaml", ".paml" }, "XML-Mode.xshd");
 			hlm.RegisterHighlighting("MarkDown", new[] { ".md" }, "MarkDown-Mode.xshd");
 		}
 	}

From a3a2b2923c51b25f16a801370d0690e4056427cc Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 8 Dec 2017 10:26:06 +0000
Subject: [PATCH 11/25] compatibility with latest avalonia

---
 src/AvaloniaEdit/AvaloniaEdit.csproj       |  2 +-
 src/AvaloniaEdit/Utils/ExtensionMethods.cs | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/AvaloniaEdit/AvaloniaEdit.csproj b/src/AvaloniaEdit/AvaloniaEdit.csproj
index 8d5c234b..8eb74d1c 100644
--- a/src/AvaloniaEdit/AvaloniaEdit.csproj
+++ b/src/AvaloniaEdit/AvaloniaEdit.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.5.2-build4149-alpha" />
+    <PackageReference Include="Avalonia" Version="0.5.2-build4323-alpha" />
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
     <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" />
   </ItemGroup>
diff --git a/src/AvaloniaEdit/Utils/ExtensionMethods.cs b/src/AvaloniaEdit/Utils/ExtensionMethods.cs
index fb6f7c90..1a9439a9 100644
--- a/src/AvaloniaEdit/Utils/ExtensionMethods.cs
+++ b/src/AvaloniaEdit/Utils/ExtensionMethods.cs
@@ -15,8 +15,6 @@
 // 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.
-extern alias SystemDrawing;
-
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
@@ -25,8 +23,6 @@
 using Avalonia;
 using Avalonia.Input;
 using Avalonia.VisualTree;
-using SystemDrawingColor = global::System.Drawing;
-
 
 namespace AvaloniaEdit.Utils
 {
@@ -180,22 +176,23 @@ public static IEnumerable<T> Sequence<T>(T value)
         #endregion
 
         #region System.Drawing <-> Avalonia conversions
-        public static SystemDrawing::System.Drawing.Point ToSystemDrawing(this Point p)
+        public static System.Drawing.Point ToSystemDrawing(this Point p)
         {
-            return new SystemDrawing::System.Drawing.Point((int)p.X, (int)p.Y);
+            return new System.Drawing.Point((int)p.X, (int)p.Y);
+            
         }
 
-        public static Point ToAvalonia(this SystemDrawing::System.Drawing.Point p)
+        public static Point ToAvalonia(this System.Drawing.Point p)
         {
             return new Point(p.X, p.Y);
         }
 
-        public static Size ToAvalonia(this SystemDrawing::System.Drawing.Size s)
+        public static Size ToAvalonia(this System.Drawing.Size s)
         {
             return new Size(s.Width, s.Height);
         }
 
-        public static Rect ToAvalonia(this SystemDrawing::System.Drawing.Rectangle rect)
+        public static Rect ToAvalonia(this System.Drawing.Rectangle rect)
         {
             return new Rect(rect.Location.ToAvalonia(), rect.Size.ToAvalonia());
         }

From 55a7ae7743d935490203bd514f911ebd434e5e01 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 11 Dec 2017 09:52:16 +0000
Subject: [PATCH 12/25] lastest avalonia

---
 src/AvaloniaEdit/AvaloniaEdit.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AvaloniaEdit/AvaloniaEdit.csproj b/src/AvaloniaEdit/AvaloniaEdit.csproj
index 8eb74d1c..69961ae4 100644
--- a/src/AvaloniaEdit/AvaloniaEdit.csproj
+++ b/src/AvaloniaEdit/AvaloniaEdit.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.5.2-build4323-alpha" />
+    <PackageReference Include="Avalonia" Version="0.5.2-build4356-alpha" />
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
     <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" />
   </ItemGroup>

From 86e5c36cafff7b0328b435139d793ce5fe6f8e54 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 12 Dec 2017 14:04:13 +0000
Subject: [PATCH 13/25] update avalonia.

---
 src/AvaloniaEdit/AvaloniaEdit.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AvaloniaEdit/AvaloniaEdit.csproj b/src/AvaloniaEdit/AvaloniaEdit.csproj
index 69961ae4..99a906a1 100644
--- a/src/AvaloniaEdit/AvaloniaEdit.csproj
+++ b/src/AvaloniaEdit/AvaloniaEdit.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.5.2-build4356-alpha" />
+    <PackageReference Include="Avalonia" Version="0.5.2-build4358-alpha" />
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
     <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" />
   </ItemGroup>

From 4018b32d11c066d58810add5a6b488cd43902020 Mon Sep 17 00:00:00 2001
From: Unknown <dan@walms.co.uk>
Date: Tue, 16 Jan 2018 17:17:36 +0000
Subject: [PATCH 14/25] update avalonia

---
 src/AvaloniaEdit/AvaloniaEdit.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AvaloniaEdit/AvaloniaEdit.csproj b/src/AvaloniaEdit/AvaloniaEdit.csproj
index 99a906a1..573bc3b7 100644
--- a/src/AvaloniaEdit/AvaloniaEdit.csproj
+++ b/src/AvaloniaEdit/AvaloniaEdit.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.5.2-build4358-alpha" />
+    <PackageReference Include="Avalonia" Version="0.5.2-build4436-alpha" />
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
     <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" />
   </ItemGroup>

From a2ac85ded8b22c1e2109072254307056a5e050e0 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 23 Jan 2018 16:28:29 +0000
Subject: [PATCH 15/25] update avalonia

---
 src/AvaloniaEdit/AvaloniaEdit.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AvaloniaEdit/AvaloniaEdit.csproj b/src/AvaloniaEdit/AvaloniaEdit.csproj
index 573bc3b7..9198a20f 100644
--- a/src/AvaloniaEdit/AvaloniaEdit.csproj
+++ b/src/AvaloniaEdit/AvaloniaEdit.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.5.2-build4436-alpha" />
+    <PackageReference Include="Avalonia" Version="0.5.2-build4485-alpha" />
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
     <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" />
   </ItemGroup>

From 116bd34961f9789ab6d96569286438f954edb4ec Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 23 Jan 2018 16:35:05 +0000
Subject: [PATCH 16/25] update avalonia api.

---
 src/AvaloniaEdit/Editing/TextArea.cs   | 4 ++++
 src/AvaloniaEdit/Rendering/TextView.cs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/AvaloniaEdit/Editing/TextArea.cs b/src/AvaloniaEdit/Editing/TextArea.cs
index 1f084f14..0c38bff8 100644
--- a/src/AvaloniaEdit/Editing/TextArea.cs
+++ b/src/AvaloniaEdit/Editing/TextArea.cs
@@ -1092,6 +1092,10 @@ Vector IScrollable.Offset
         }
 
         Size IScrollable.Viewport => _viewPort;
+
+        public bool CanHorizontallyScroll { get; set; } = false;
+
+        public bool CanVerticallyScroll { get; set; } = true;
     }
 
     /// <summary>
diff --git a/src/AvaloniaEdit/Rendering/TextView.cs b/src/AvaloniaEdit/Rendering/TextView.cs
index 0b1ae2aa..e00665c1 100644
--- a/src/AvaloniaEdit/Rendering/TextView.cs
+++ b/src/AvaloniaEdit/Rendering/TextView.cs
@@ -745,7 +745,7 @@ private void InvalidateMeasure(DispatcherPriority priority)
             {
                 if (_invalidateMeasureOperation == null)
                 {
-                    _invalidateMeasureOperation = Dispatcher.UIThread.InvokeTaskAsync(
+                    _invalidateMeasureOperation = Dispatcher.UIThread.InvokeAsync(
                         delegate
                         {
                             _invalidateMeasureOperation = null;

From 88cb1b3396db485d12dcbf4c8a9f6218c56462f9 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 7 Feb 2018 22:53:50 +0000
Subject: [PATCH 17/25] update avalonia.

---
 src/AvaloniaEdit/AvaloniaEdit.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AvaloniaEdit/AvaloniaEdit.csproj b/src/AvaloniaEdit/AvaloniaEdit.csproj
index 9198a20f..6459ed1f 100644
--- a/src/AvaloniaEdit/AvaloniaEdit.csproj
+++ b/src/AvaloniaEdit/AvaloniaEdit.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.5.2-build4485-alpha" />
+    <PackageReference Include="Avalonia" Version="0.5.2-build4519-alpha" />
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
     <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" />
   </ItemGroup>

From f3d26ff8f64d00989d9aaf673866c48ae4fa7575 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 12 Feb 2018 15:18:32 +0000
Subject: [PATCH 18/25] update avalonia

---
 src/AvaloniaEdit/AvaloniaEdit.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AvaloniaEdit/AvaloniaEdit.csproj b/src/AvaloniaEdit/AvaloniaEdit.csproj
index 6459ed1f..c36a8ce5 100644
--- a/src/AvaloniaEdit/AvaloniaEdit.csproj
+++ b/src/AvaloniaEdit/AvaloniaEdit.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.5.2-build4519-alpha" />
+    <PackageReference Include="Avalonia" Version="0.5.2-build4525-alpha" />
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
     <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" />
   </ItemGroup>

From 3beec5202d6f7a9c27a0370b9e6f11bdd1b2aa10 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sat, 17 Feb 2018 17:56:15 +0000
Subject: [PATCH 19/25] update to avalonia release candidate.

---
 src/AvaloniaEdit/AvaloniaEdit.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AvaloniaEdit/AvaloniaEdit.csproj b/src/AvaloniaEdit/AvaloniaEdit.csproj
index c36a8ce5..bf8e2af4 100644
--- a/src/AvaloniaEdit/AvaloniaEdit.csproj
+++ b/src/AvaloniaEdit/AvaloniaEdit.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.5.2-build4525-alpha" />
+    <PackageReference Include="Avalonia" Version="0.5.2-build4554-alpha" />
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
     <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" />
   </ItemGroup>

From fa4c4b7ca906d81c3ddb11f39cceb3847ddc9902 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 18 Feb 2018 12:01:06 +0000
Subject: [PATCH 20/25] update to avalonia beta-1

---
 src/AvaloniaEdit/AvaloniaEdit.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AvaloniaEdit/AvaloniaEdit.csproj b/src/AvaloniaEdit/AvaloniaEdit.csproj
index bf8e2af4..f44e359f 100644
--- a/src/AvaloniaEdit/AvaloniaEdit.csproj
+++ b/src/AvaloniaEdit/AvaloniaEdit.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.5.2-build4554-alpha" />
+    <PackageReference Include="Avalonia" Version="0.6.0" />
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
     <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" />
   </ItemGroup>

From 9ed84819d76e3290bae3b76ded338049019ebbcb Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 18 Feb 2018 12:15:05 +0000
Subject: [PATCH 21/25] update nugets.

---
 src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj | 2 +-
 src/AvaloniaEdit/AvaloniaEdit.csproj           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj b/src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj
index d2ee06b7..9aa0049f 100644
--- a/src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj
+++ b/src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="0.5.2-build4199-alpha" />    
+    <PackageReference Include="Avalonia.Desktop" Version="0.6.0" />    
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/AvaloniaEdit/AvaloniaEdit.csproj b/src/AvaloniaEdit/AvaloniaEdit.csproj
index f44e359f..6e6b7e30 100644
--- a/src/AvaloniaEdit/AvaloniaEdit.csproj
+++ b/src/AvaloniaEdit/AvaloniaEdit.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="0.6.0" />
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
-    <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" />
+    <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.1" />
   </ItemGroup>
 
   <Target Name="ChangeAliasesOfSystemDrawing" BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">

From fada1d9308031063870f87e4301f6a7f394d6f68 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 18 Feb 2018 12:15:16 +0000
Subject: [PATCH 22/25] remove whitespace.

---
 src/AvaloniaEdit/Utils/ExtensionMethods.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/AvaloniaEdit/Utils/ExtensionMethods.cs b/src/AvaloniaEdit/Utils/ExtensionMethods.cs
index 1a9439a9..fda75452 100644
--- a/src/AvaloniaEdit/Utils/ExtensionMethods.cs
+++ b/src/AvaloniaEdit/Utils/ExtensionMethods.cs
@@ -178,8 +178,7 @@ public static IEnumerable<T> Sequence<T>(T value)
         #region System.Drawing <-> Avalonia conversions
         public static System.Drawing.Point ToSystemDrawing(this Point p)
         {
-            return new System.Drawing.Point((int)p.X, (int)p.Y);
-            
+            return new System.Drawing.Point((int)p.X, (int)p.Y);            
         }
 
         public static Point ToAvalonia(this System.Drawing.Point p)

From 2f77fda5f489082567b26fbfcd02580f286c3d47 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 18 Feb 2018 12:15:28 +0000
Subject: [PATCH 23/25] fix ICloneable issues.

---
 src/AvaloniaEdit/Highlighting/HighlightingColor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/AvaloniaEdit/Highlighting/HighlightingColor.cs b/src/AvaloniaEdit/Highlighting/HighlightingColor.cs
index 894985a9..5cf1835b 100644
--- a/src/AvaloniaEdit/Highlighting/HighlightingColor.cs
+++ b/src/AvaloniaEdit/Highlighting/HighlightingColor.cs
@@ -28,7 +28,7 @@ namespace AvaloniaEdit.Highlighting
     /// <summary>
     /// A highlighting color is a set of font properties and foreground and background color.
     /// </summary>
-    public class HighlightingColor : IFreezable, AvaloniaEdit.Utils.ICloneable, IEquatable<HighlightingColor>
+    public class HighlightingColor : IFreezable, ICloneable, IEquatable<HighlightingColor>
     {
         internal static readonly HighlightingColor Empty = FreezableHelper.FreezeAndReturn(new HighlightingColor());
 
@@ -207,7 +207,7 @@ public virtual HighlightingColor Clone()
             return c;
         }
 
-        object AvaloniaEdit.Utils.ICloneable.Clone()
+        object ICloneable.Clone()
         {
             return Clone();
         }

From b3114efea0853399ff45f3df5112dfaaecb7293d Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 18 Feb 2018 12:17:28 +0000
Subject: [PATCH 24/25] correct whitespace.

---
 src/AvaloniaEdit/Utils/ExtensionMethods.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AvaloniaEdit/Utils/ExtensionMethods.cs b/src/AvaloniaEdit/Utils/ExtensionMethods.cs
index fda75452..6ccee687 100644
--- a/src/AvaloniaEdit/Utils/ExtensionMethods.cs
+++ b/src/AvaloniaEdit/Utils/ExtensionMethods.cs
@@ -178,7 +178,7 @@ public static IEnumerable<T> Sequence<T>(T value)
         #region System.Drawing <-> Avalonia conversions
         public static System.Drawing.Point ToSystemDrawing(this Point p)
         {
-            return new System.Drawing.Point((int)p.X, (int)p.Y);            
+            return new System.Drawing.Point((int)p.X, (int)p.Y);
         }
 
         public static Point ToAvalonia(this System.Drawing.Point p)

From 7e15fe725d436f492280d8ea83d2ebb48b9d23db Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 18 Feb 2018 12:22:00 +0000
Subject: [PATCH 25/25] fix editbin location.

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

diff --git a/build.cake b/build.cake
index 03a81789..6b763244 100644
--- a/build.cake
+++ b/build.cake
@@ -80,7 +80,7 @@ if (isRunningOnAppVeyor)
     }
 }
 
-var editbin = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.11.25503\bin\HostX86\x86\editbin.exe";
+var editbin = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.12.25827\bin\HostX86\x86\editbin.exe";
 
 ///////////////////////////////////////////////////////////////////////////////
 // DIRECTORIES