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 1/2] 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 2/2] 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