Fixed a regression with abstract types with the same property as a base type.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>

src/Generator/Generators/CSharp/CSharpTextTemplate.cs

@@ -1213,7 +1213,7 @@ namespace CppSharp.Generators.CSharp
                     // check if overriding a property from a secondary base
                     Property rootBaseProperty;
                     var isOverride = prop.IsOverride &&
-                        (rootBaseProperty = @class.GetBaseProperty(prop, true)) != null &&
+                        (rootBaseProperty = @class.GetBaseProperty(prop, true, true)) != null &&
                         (rootBaseProperty.IsVirtual || rootBaseProperty.IsPure);
 
                     if (isOverride)

tests/CSharp/CSharp.cpp

@@ -858,3 +858,16 @@ void QApplication::notify(QObject* receiver)
 {
     delete receiver;
 }
+
+HasSamePropertyInDerivedAbstractType::HasSamePropertyInDerivedAbstractType()
+{
+}
+
+char* HasSamePropertyInDerivedAbstractType::property()
+{
+    return 0;
+}
+
+InheritsFromHasSamePropertyInDerivedAbstractType::InheritsFromHasSamePropertyInDerivedAbstractType()
+{
+}

tests/CSharp/CSharp.h

@@ -786,3 +786,16 @@ public:
     virtual void notify(QObject* receiver);
 };
 
+class DLL_API HasSamePropertyInDerivedAbstractType
+{
+public:
+    HasSamePropertyInDerivedAbstractType();
+    char* property();
+};
+
+class InheritsFromHasSamePropertyInDerivedAbstractType : public HasSamePropertyInDerivedAbstractType
+{
+public:
+    InheritsFromHasSamePropertyInDerivedAbstractType();
+    virtual int property() = 0;
+};