Skip to content
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

fix!: Make ContentPropertyAttribute.Name field instead of a property. #11164

Merged
merged 5 commits into from
Feb 15, 2023
Merged

fix!: Make ContentPropertyAttribute.Name field instead of a property. #11164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f079127
fix!: Make `ContentPropertyAttribute.Name` field instead of a property.
Youssef1313 Feb 2, 2023
43d84d1
chore: Update PackageDiffIgnore
Youssef1313 Feb 2, 2023
716efb6
chore: Update PackageDiffIgnore
Youssef1313 Feb 2, 2023
24a8ad2
Merge branch 'feature/breaking-changes' into contentproperty-name
Youssef1313 Feb 4, 2023
a1e57aa
Merge branch 'feature/breaking-changes' into contentproperty-name
Youssef1313 Feb 7, 2023
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: 3 additions & 0 deletions build/PackageDiffIgnore.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9222,6 +9222,7 @@
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Media.RevealBrush::AlwaysUseFallbackProperty()" reason="Not present in WinAppSDK 1.2" />
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Media.RevealBrush::StateProperty()" reason="Not present in WinAppSDK 1.2" />
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Media.RevealBrush::TargetThemeProperty()" reason="Not present in WinAppSDK 1.2" />
<Member fullName="System.String Windows.UI.Xaml.Markup.ContentPropertyAttribute::Name()" reason="Property changed to field to match Windows" />
<Member fullName="Windows.UI.Xaml.DependencyProperty Uno.UI.Toolkit.ElevatedView::CornerRadiusProperty()" reason="Already exists in Control and ElevatedView should not shadow it" />
<Member fullName="Windows.UI.Xaml.CornerRadius Uno.UI.Toolkit.ElevatedView::CornerRadius()" reason="Already exists in Control and ElevatedView should not shadow it" />
</Properties>
Expand Down Expand Up @@ -9387,6 +9388,8 @@
<Member fullName="Microsoft.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Media.RevealBrush.get_TargetThemeProperty()" reason="Not present in WinAppSDK 1.2" />
<Member fullName="System.Void Microsoft.UI.Xaml.Media.RevealBrush.SetState(Microsoft.UI.Xaml.UIElement element, Microsoft.UI.Xaml.Media.RevealBrushState value)" reason="Not present in WinAppSDK 1.2" />
<Member fullName="Microsoft.UI.Xaml.Media.RevealBrushState Microsoft.UI.Xaml.Media.RevealBrush.GetState(Microsoft.UI.Xaml.UIElement element)" reason="Not present in WinAppSDK 1.2" />
<Member fullName="System.String Windows.UI.Xaml.Markup.ContentPropertyAttribute.get_Name()" reason="Property changed to field to match Windows" />
<Member fullName="System.Void Windows.UI.Xaml.Markup.ContentPropertyAttribute.set_Name(System.String value)" reason="Property changed to field to match Windows" />
<Member fullName="System.Void Windows.Foundation.Deferral.Close()" reason="Shouldn't be visible in .NET" />
<Member fullName="Uno.UI.Xaml.RoutedEventFlag Windows.UI.Xaml.Controls.Control.GetImplementedRoutedEvents(System.Type type)" reason="Not in Windows and is unnecessary now." />
<Member fullName="Windows.UI.Xaml.CornerRadius Uno.UI.Toolkit.ElevatedView.get_CornerRadius()" reason="Already exists in Control and ElevatedView should not shadow it" />
Expand Down
2 changes: 1 addition & 1 deletion src/Uno.UI/UI/Xaml/Markup/ContentPropertyAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ public ContentPropertyAttribute()
/// <summary>
/// Gets or sets the Content property name.
/// </summary>
public string Name { get; set; }
public string Name;
}