Skip to content

Added support for Microsoft.UI.Xaml dependency property #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
huangmin-ms merged 6 commits into from
Sep 14, 2021
Merged

Added support for Microsoft.UI.Xaml dependency property #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
24ba59f
Merge pull request #544 from mono/develop
anmeng10101 Apr 2, 2021
eb934bc
Merge pull request #559 from mono/develop
anmeng10101 May 18, 2021
5a31137
Merge remote-tracking branch 'upstream/develop' into develop
jeffreyxrh Jun 24, 2021
3323753
Added Microsoft Xaml Dependency Property support
jeffreyxrh Jun 24, 2021
cff90fa
Trigger CI
jeffreyxrh Jun 29, 2021
f8e7f8e
Update AttachedEntitiesHelper.cs
jeffreyxrh Jun 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion mdoc/Consts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
9 changes: 6 additions & 3 deletions mdoc/Mono.Documentation/Util/AttachedEntitiesHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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
Expand All @@ -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.FullName == 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]
Expand Down