Skip to content

Commit

Permalink
Merge pull request #11164 from Youssef1313/contentproperty-name
Browse files Browse the repository at this point in the history
fix!: Make `ContentPropertyAttribute.Name` field instead of a property.
  • Loading branch information
jeromelaban authored Feb 15, 2023
2 parents d79adf9 + a1e57aa commit f6c0d72
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions build/PackageDiffIgnore.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9223,6 +9223,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 @@ -9388,6 +9389,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
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;
}

0 comments on commit f6c0d72

Please sign in to comment.