diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/DependencyObject/DependencyObjectGenerator.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/DependencyObject/DependencyObjectGenerator.cs index d9dff08f8268..14e87f129cff 100644 --- a/src/SourceGenerators/Uno.UI.SourceGenerators/DependencyObject/DependencyObjectGenerator.cs +++ b/src/SourceGenerators/Uno.UI.SourceGenerators/DependencyObject/DependencyObjectGenerator.cs @@ -699,12 +699,8 @@ public DependencyObject TemplatedParent {protectedModifier} {virtualModifier} void OnTemplatedParentChanged(DependencyPropertyChangedEventArgs e) {{ - // Attempt to work around a native fault - if (this != null) - {{ - __Store.SetTemplatedParent(e.NewValue as FrameworkElement); - OnTemplatedParentChangedPartial(e); - }} + __Store.SetTemplatedParent(e.NewValue as FrameworkElement); + OnTemplatedParentChangedPartial(e); }} #endregion diff --git a/src/Uno.UI/UI/Xaml/Controls/ListViewBase/ListViewBaseSource.iOS.cs b/src/Uno.UI/UI/Xaml/Controls/ListViewBase/ListViewBaseSource.iOS.cs index 1b266dffebd2..cb5e8f7cffda 100644 --- a/src/Uno.UI/UI/Xaml/Controls/ListViewBase/ListViewBaseSource.iOS.cs +++ b/src/Uno.UI/UI/Xaml/Controls/ListViewBase/ListViewBaseSource.iOS.cs @@ -834,6 +834,12 @@ public override CGRect Frame set { + if (this is null) + { + // Don't fail on null instance from native call + return; + } + base.Frame = value; try