From 95318ac44cdb1c1c93e0466684639b7ffe499b21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Tue, 11 Jun 2024 22:11:32 -0400
Subject: [PATCH] chore: Adjust for null invocation validation

---
 .../DependencyObject/DependencyObjectGenerator.cs         | 8 ++------
 .../Xaml/Controls/ListViewBase/ListViewBaseSource.iOS.cs  | 6 ++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

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