From 3323753e4612aa6f8c4473c8206dae2ae5172628 Mon Sep 17 00:00:00 2001
From: RanhaoXu <v-jex@microsoft.com>
Date: Thu, 24 Jun 2021 17:04:16 +0800
Subject: [PATCH 1/3] Added Microsoft Xaml Dependency Property support

---
 mdoc/Consts.cs                                         | 3 ++-
 mdoc/Mono.Documentation/Util/AttachedEntitiesHelper.cs | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mdoc/Consts.cs b/mdoc/Consts.cs
index 2453363db..1c9d98641 100644
--- a/mdoc/Consts.cs
+++ b/mdoc/Consts.cs
@@ -22,7 +22,8 @@ public static class Consts
 		public const string JavascriptLowCase = "javascript";
 
 		public const string DependencyPropertyFullName = "System.Windows.DependencyProperty";
-        public const string DependencyPropertyFullNameXaml = "Windows.UI.Xaml.DependencyProperty";
+        public const string DependencyPropertyFullNameWindowsXaml = "Windows.UI.Xaml.DependencyProperty";
+		public const string DependencyPropertyFullNameMicrosoftXaml = "Microsoft.UI.Xaml.DependencyProperty";
 
         public const string DependencyObjectFullName = "System.Windows.DependencyObject";
         public const string DependencyObjectFullNameXaml = "Windows.UI.Xaml.DependencyObject";
diff --git a/mdoc/Mono.Documentation/Util/AttachedEntitiesHelper.cs b/mdoc/Mono.Documentation/Util/AttachedEntitiesHelper.cs
index cb451fb13..f888da66a 100644
--- a/mdoc/Mono.Documentation/Util/AttachedEntitiesHelper.cs
+++ b/mdoc/Mono.Documentation/Util/AttachedEntitiesHelper.cs
@@ -116,7 +116,8 @@ private static IEnumerable<AttachedPropertyReference> GetAttachedProperties(Type
             }
 
             foreach (var property in type.Properties.Where(t => t.PropertyType.FullName == Consts.DependencyPropertyFullName
-            || t.PropertyType.FullName == Consts.DependencyPropertyFullNameXaml))
+            || t.PropertyType.FullName == Consts.DependencyPropertyFullNameWindowsXaml
+            || t.PropertyType.FullName == Consts.DependencyPropertyFullNameMicrosoftXaml))
             {
                 if (IsAttachedProperty(property, methods))
                     yield return new AttachedPropertyReference(property);
@@ -138,7 +139,8 @@ private static bool IsAttachedProperty(FieldDefinition field, Dictionary<string,
 
             return !hasExistingProperty.IsTrue () && !hasExistingField.IsTrue () &&
                 // Class X has a static field of type DependencyProperty [Name]Property
-                (field.FieldType.FullName == Consts.DependencyPropertyFullName || field.FieldType.FullName == Consts.DependencyPropertyFullNameXaml)
+                (field.FieldType.FullName == Consts.DependencyPropertyFullName || field.FieldType.FullName == Consts.DependencyPropertyFullNameWindowsXaml
+                || field.FieldType.FullName == Consts.DependencyPropertyFullNameMicrosoftXaml)
                 && field.IsPublic
                 && field.IsStatic
                 && field.IsInitOnly
@@ -163,7 +165,8 @@ private static bool IsAttachedProperty(PropertyDefinition property, Dictionary<s
 
             return !hasExistingProperty.IsTrue() && !hasExistingField.IsTrue() &&
                 // Class X has a static field of type DependencyProperty [Name]Property
-                (property.PropertyType.Name == Consts.DependencyPropertyFullName || property.PropertyType.FullName == Consts.DependencyPropertyFullNameXaml)
+                (property.PropertyType.Name == Consts.DependencyPropertyFullName || property.PropertyType.FullName == Consts.DependencyPropertyFullNameWindowsXaml
+                || property.PropertyType.FullName == Consts.DependencyPropertyFullNameMicrosoftXaml)
 
 
                 // Class X also has static methods with the following names: Get[Name] and Set[Name]

From cff90fa2a0dee65bf7e013b17272c630b93e16c0 Mon Sep 17 00:00:00 2001
From: RanhaoXu <v-jex@microsoft.com>
Date: Tue, 29 Jun 2021 15:40:12 +0800
Subject: [PATCH 2/3] Trigger CI

---
 mdoc/Consts.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mdoc/Consts.cs b/mdoc/Consts.cs
index 1c9d98641..6b775d32b 100644
--- a/mdoc/Consts.cs
+++ b/mdoc/Consts.cs
@@ -23,7 +23,7 @@ public static class Consts
 
 		public const string DependencyPropertyFullName = "System.Windows.DependencyProperty";
         public const string DependencyPropertyFullNameWindowsXaml = "Windows.UI.Xaml.DependencyProperty";
-		public const string DependencyPropertyFullNameMicrosoftXaml = "Microsoft.UI.Xaml.DependencyProperty";
+        public const string DependencyPropertyFullNameMicrosoftXaml = "Microsoft.UI.Xaml.DependencyProperty";
 
         public const string DependencyObjectFullName = "System.Windows.DependencyObject";
         public const string DependencyObjectFullNameXaml = "Windows.UI.Xaml.DependencyObject";

From f8e7f8eee1fc234052ad6be67ab6439fa913e575 Mon Sep 17 00:00:00 2001
From: RanhaoXu <v-jex@microsoft.com>
Date: Wed, 30 Jun 2021 15:44:41 +0800
Subject: [PATCH 3/3] Update AttachedEntitiesHelper.cs

---
 mdoc/Mono.Documentation/Util/AttachedEntitiesHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mdoc/Mono.Documentation/Util/AttachedEntitiesHelper.cs b/mdoc/Mono.Documentation/Util/AttachedEntitiesHelper.cs
index f888da66a..02057c38c 100644
--- a/mdoc/Mono.Documentation/Util/AttachedEntitiesHelper.cs
+++ b/mdoc/Mono.Documentation/Util/AttachedEntitiesHelper.cs
@@ -165,7 +165,7 @@ private static bool IsAttachedProperty(PropertyDefinition property, Dictionary<s
 
             return !hasExistingProperty.IsTrue() && !hasExistingField.IsTrue() &&
                 // Class X has a static field of type DependencyProperty [Name]Property
-                (property.PropertyType.Name == Consts.DependencyPropertyFullName || property.PropertyType.FullName == Consts.DependencyPropertyFullNameWindowsXaml
+                (property.PropertyType.FullName == Consts.DependencyPropertyFullName || property.PropertyType.FullName == Consts.DependencyPropertyFullNameWindowsXaml
                 || property.PropertyType.FullName == Consts.DependencyPropertyFullNameMicrosoftXaml)