Merge branch 'master' into update_geometry_segments_onpropchange

src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlTransformInstanceAttachedProperties.cs

@@ -22,7 +22,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                 var avaloniaObject = context.Configuration.TypeSystem.FindType("Avalonia.AvaloniaObject");
                 if (avaloniaObject.IsAssignableFrom(targetRef.Type)
                     && avaloniaObject.IsAssignableFrom(declaringRef.Type)
-                    && !targetRef.Type.IsAssignableFrom(declaringRef.Type))
+                    && !declaringRef.Type.IsAssignableFrom(targetRef.Type))
                 {
                     // Instance property
                     var clrProp = declaringRef.Type.GetAllProperties().FirstOrDefault(p => p.Name == prop.Name);

tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs

@@ -295,8 +295,27 @@ namespace Avalonia.Markup.Xaml.UnitTests
                 Assert.Equal("Test", templated.Text);
             }
         }
+
+        [Fact]
+        public void Should_Work_With_Base_Property()
+        {
+            var parsed = (ListBox)AvaloniaRuntimeXamlLoader.Load(@"
+<ListBox
+  xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+  xmlns='https://github.com/avaloniaui'
+  xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests;assembly=Avalonia.Markup.Xaml.UnitTests'
+>
+    <ItemsControl.ItemTemplate>
+      <DataTemplate>
+        <ContentControl Content='{Binding}' />
+      </DataTemplate>
+    </ItemsControl.ItemTemplate>
+</ListBox>");
+
+            Assert.NotNull(parsed.ItemTemplate);
+        }
     }
-    
+
     public class XamlIlBugTestsEventHandlerCodeBehind : Window
     {
         public object SavedContext;