From 6dfd7056606427ffa8e4c54d706f937b2eb20a44 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 5 May 2018 22:07:26 +0200
Subject: [PATCH 1/2] Added failing test for #1548.

Caused by a bug in Portable.Xaml: https://github.com/cwensley/Portable.Xaml/issues/95
---
 .../Xaml/BasicTests.cs                            | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
index ac25b7ccbe..4213a31c39 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
@@ -81,6 +81,21 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             Assert.Equal(21.0, TextBlock.GetFontSize(target));
         }
 
+        [Fact]
+        public void Attached_Property_Is_Set_On_Control_Outside_Avalonia_Namspace()
+        {
+            // Test for issue #1548
+            var xaml =
+@"<UserControl xmlns='https://github.com/avaloniaui'
+    xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
+  <local:TestControl Grid.Column='2' />
+</UserControl>";
+
+            var target = AvaloniaXamlLoader.Parse<UserControl>(xaml);
+
+            Assert.Equal(2, Grid.GetColumn((TestControl)target.Content));
+        }
+
         [Fact]
         public void Attached_Property_With_Namespace_Is_Set()
         {

From 6a6662df92e9c97e125e11ec309c448b6740290a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 5 May 2018 22:13:02 +0200
Subject: [PATCH 2/2] Fix attached member namespaces resolution.

Updated Portable.Xaml to include fix from https://github.com/cwensley/Portable.Xaml/pull/96
---
 .../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 faa952f3a0..cdf46d7892 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 faa952f3a05b4bdf2986d686f4154b1ab084508a
+Subproject commit cdf46d7892def8a6ba29f12a9339147377f7cf5c