From dd0ae93233cda0734d45eb3c89579022bdb23ad5 Mon Sep 17 00:00:00 2001
From: David <github.site@torick.net>
Date: Fri, 31 Jan 2025 18:28:16 -0500
Subject: [PATCH 1/5] fix(hr): Fix ENC1002 when dealing with event handlers

---
 .../0/p1/MainPage.xaml                        |  19 +
 .../0/p1/MainPage.xaml.cs                     |  28 ++
 .../1/p1/MainPage.xaml                        |  18 +
 .../1/p1/MainPage.xaml.cs                     |  28 ++
 .../Scenario.json                             |  24 ++
 .../0/p1/MainPage.xaml                        |  19 +
 .../0/p1/MainPage.xaml.cs                     |  28 ++
 .../1/p1/MainPage.xaml                        |  18 +
 .../1/p1/MainPage.xaml.cs                     |  28 ++
 .../Scenario.json                             |  24 ++
 ...inPage_d6cd66944958ced0c513e0a04797b51d.cs | 140 +++---
 ...Window_c93db19a7202d9eb84ddc41d72fcb89b.cs |  17 +-
 ..._Event_6d62c5ee15120ed189e095faf6d37e20.cs |  17 +-
 .../Verifiers/CSGenerator.cs                  |   5 +-
 .../XamlGenerator/BackingFieldDefinition.cs   |   9 +-
 .../XamlGenerator/NameScope.cs                |  35 +-
 .../XBindEventInitializerDefinition.cs        |  13 +
 .../XamlGenerator/XLoadScope.cs               |   2 +-
 .../XamlGenerator/XamlFileGenerator.cs        | 407 +++++++++---------
 ...amlLazyApplyBlockIIndentedStringBuilder.cs |   6 +-
 20 files changed, 598 insertions(+), 287 deletions(-)
 create mode 100644 src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/0/p1/MainPage.xaml
 create mode 100644 src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/0/p1/MainPage.xaml.cs
 create mode 100644 src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/1/p1/MainPage.xaml
 create mode 100644 src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/1/p1/MainPage.xaml.cs
 create mode 100644 src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/Scenario.json
 create mode 100644 src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/0/p1/MainPage.xaml
 create mode 100644 src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/0/p1/MainPage.xaml.cs
 create mode 100644 src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/1/p1/MainPage.xaml
 create mode 100644 src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/1/p1/MainPage.xaml.cs
 create mode 100644 src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/Scenario.json
 create mode 100644 src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XBindEventInitializerDefinition.cs

diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/0/p1/MainPage.xaml b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/0/p1/MainPage.xaml
new file mode 100644
index 000000000000..9ebf02291dd1
--- /dev/null
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/0/p1/MainPage.xaml
@@ -0,0 +1,19 @@
+<Page
+	x:Class="Test01.MainPage"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:local="using:CSHRTest01"
+	xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	mc:Ignorable="d">
+
+	
+	<Grid>
+		<TextBlock Text="Hello world!" />
+
+		<Button Click="Button_Click" />
+
+		<Button Click="Button_Click" Content="Button 2" />
+	</Grid>
+</Page>
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/0/p1/MainPage.xaml.cs b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/0/p1/MainPage.xaml.cs
new file mode 100644
index 000000000000..be52a48321bc
--- /dev/null
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/0/p1/MainPage.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+
+namespace Test01;
+
+public sealed partial class MainPage : Page
+{
+	public MainPage()
+	{
+		this.InitializeComponent();
+	}
+
+	private async void Button_Click(object sender, RoutedEventArgs e)
+	{
+	}
+}
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/1/p1/MainPage.xaml b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/1/p1/MainPage.xaml
new file mode 100644
index 000000000000..f21a3143de98
--- /dev/null
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/1/p1/MainPage.xaml
@@ -0,0 +1,18 @@
+<Page
+	x:Class="Test01.MainPage"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:local="using:CSHRTest01"
+	xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	mc:Ignorable="d">
+
+	
+	<Grid>
+		<Button Click="Button_Click" />
+
+		<TextBlock Text="Hello world!" /><!--WARNING : The blank line MUST be removed (compared to original) for the test to fail!-->
+		<Button Click="Button_Click" Content="Button 2" />
+	</Grid>
+</Page>
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/1/p1/MainPage.xaml.cs b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/1/p1/MainPage.xaml.cs
new file mode 100644
index 000000000000..be52a48321bc
--- /dev/null
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/1/p1/MainPage.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+
+namespace Test01;
+
+public sealed partial class MainPage : Page
+{
+	public MainPage()
+	{
+		this.InitializeComponent();
+	}
+
+	private async void Button_Click(object sender, RoutedEventArgs e)
+	{
+	}
+}
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/Scenario.json b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/Scenario.json
new file mode 100644
index 000000000000..902d6383b5fd
--- /dev/null
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1/Scenario.json
@@ -0,0 +1,24 @@
+{
+	"Scenarios": [
+		{
+			"IsDebug": true,
+			"IsMono": false,
+			"PassResults": [
+				{
+					"MetadataUpdates": 1,
+					"Diagnostics": []
+				}
+			]
+		},
+		{
+			"IsDebug": true,
+			"IsMono": true,
+			"PassResults": [
+				{
+					"MetadataUpdates": 1,
+					"Diagnostics": []
+				}
+			]
+		}
+	]
+}
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/0/p1/MainPage.xaml b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/0/p1/MainPage.xaml
new file mode 100644
index 000000000000..d34f32e86953
--- /dev/null
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/0/p1/MainPage.xaml
@@ -0,0 +1,19 @@
+<Page
+	x:Class="Test01.MainPage"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:local="using:CSHRTest01"
+	xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	mc:Ignorable="d">
+
+	
+	<Grid>
+		<TextBlock Text="Hello world!" />
+
+		<Button Click="{x:Bind Button_Click}" />
+
+		<Button Click="{x:Bind Button_Click}" Content="Button 2" />
+	</Grid>
+</Page>
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/0/p1/MainPage.xaml.cs b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/0/p1/MainPage.xaml.cs
new file mode 100644
index 000000000000..be52a48321bc
--- /dev/null
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/0/p1/MainPage.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+
+namespace Test01;
+
+public sealed partial class MainPage : Page
+{
+	public MainPage()
+	{
+		this.InitializeComponent();
+	}
+
+	private async void Button_Click(object sender, RoutedEventArgs e)
+	{
+	}
+}
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/1/p1/MainPage.xaml b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/1/p1/MainPage.xaml
new file mode 100644
index 000000000000..cbb9d26ef33c
--- /dev/null
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/1/p1/MainPage.xaml
@@ -0,0 +1,18 @@
+<Page
+	x:Class="Test01.MainPage"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:local="using:CSHRTest01"
+	xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	mc:Ignorable="d">
+
+	
+	<Grid>
+		<Button Click="{x:Bind Button_Click}" />
+
+		<TextBlock Text="Hello world!" /><!--WARNING : The blank line MUST be removed (compared to original) for the test to fail!-->
+		<Button Click="{x:Bind Button_Click}" Content="Button 2" />
+	</Grid>
+</Page>
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/1/p1/MainPage.xaml.cs b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/1/p1/MainPage.xaml.cs
new file mode 100644
index 000000000000..be52a48321bc
--- /dev/null
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/1/p1/MainPage.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+
+namespace Test01;
+
+public sealed partial class MainPage : Page
+{
+	public MainPage()
+	{
+		this.InitializeComponent();
+	}
+
+	private async void Button_Click(object sender, RoutedEventArgs e)
+	{
+	}
+}
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/Scenario.json b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/Scenario.json
new file mode 100644
index 000000000000..902d6383b5fd
--- /dev/null
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Delegates_Fuzzy_Matching_1_xBind/Scenario.json
@@ -0,0 +1,24 @@
+{
+	"Scenarios": [
+		{
+			"IsDebug": true,
+			"IsMono": false,
+			"PassResults": [
+				{
+					"MetadataUpdates": 1,
+					"Diagnostics": []
+				}
+			]
+		},
+		{
+			"IsDebug": true,
+			"IsMono": true,
+			"PassResults": [
+				{
+					"MetadataUpdates": 1,
+					"Diagnostics": []
+				}
+			]
+		}
+	]
+}
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TIM/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TIM/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs
index 323de5cb709d..e845b73f36d2 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TIM/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TIM/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs
@@ -63,16 +63,6 @@ private void InitializeComponent()
 					{
 					/* _isTopLevelDictionary:False */
 					__that._component_0 = __p1;
-					__that.__0_Click_P1_Button_Click_Builder = (__owner) => 
-					{
-						var Click_P1_Button_Click_That = (__that as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference;
-						/* first level targetMethod:TestRepro.C1.Button_Click(object, Microsoft.UI.Xaml.RoutedEventArgs) */ __owner.Click += (_sender,_e) => 
-						{
-							(Click_P1_Button_Click_That.Target as global::TestRepro.MainPage)?.P1.Button_Click(_sender,_e);
-						}
-						;
-					}
-					;
 					global::Uno.UI.FrameworkElementHelper.SetBaseUri(__p1, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d);
 					__p1.CreationComplete();
 					}
@@ -87,16 +77,6 @@ private void InitializeComponent()
 					{
 					/* _isTopLevelDictionary:False */
 					__that._component_1 = __p1;
-					__that.__1_Click_P2_Button_Click_Builder = (__owner) => 
-					{
-						var Click_P2_Button_Click_That = (__that as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference;
-						/* first level targetMethod:TestRepro.ImplicitImpl.Button_Click(object, Microsoft.UI.Xaml.RoutedEventArgs) */ __owner.Click += (_sender,_e) => 
-						{
-							(Click_P2_Button_Click_That.Target as global::TestRepro.MainPage)?.P2.Button_Click(_sender,_e);
-						}
-						;
-					}
-					;
 					global::Uno.UI.FrameworkElementHelper.SetBaseUri(__p1, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d);
 					__p1.CreationComplete();
 					}
@@ -111,16 +91,6 @@ private void InitializeComponent()
 					{
 					/* _isTopLevelDictionary:False */
 					__that._component_2 = __p1;
-					__that.__2_Click_P3_Button_Click_Builder = (__owner) => 
-					{
-						var Click_P3_Button_Click_That = (__that as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference;
-						/* first level targetMethod:TestRepro.I.Button_Click(object, Microsoft.UI.Xaml.RoutedEventArgs) */ __owner.Click += (_sender,_e) => 
-						{
-							(Click_P3_Button_Click_That.Target as global::TestRepro.MainPage)?.P3.Button_Click(_sender,_e);
-						}
-						;
-					}
-					;
 					global::Uno.UI.FrameworkElementHelper.SetBaseUri(__p1, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d);
 					__p1.CreationComplete();
 					}
@@ -161,14 +131,82 @@ private void InitializeComponent()
 			((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += __UpdateBindingsAndResources;
 		}
 		partial void OnInitializeCompleted();
+			[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
+			private bool __is__ApplyMethod_0_Click_Initialized ;
+		
+			[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
+			private void __ApplyMethod_0_Click_Initialize()
+			{
+				if (__is__ApplyMethod_0_Click_Initialized || _component_0 is null)
+				{
+					return;
+				}
+		
+				_component_0.Click += new __MainPage_d6cd66944958ced0c513e0a04797b51d_TestReproMainPage.ApplyMethod_0_Click_Handler((this as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference).Invoke;
+				__is__ApplyMethod_0_Click_Initialized = true;
+			}
+			[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
+			private bool __is__ApplyMethod_1_Click_Initialized ;
+		
+			[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
+			private void __ApplyMethod_1_Click_Initialize()
+			{
+				if (__is__ApplyMethod_1_Click_Initialized || _component_1 is null)
+				{
+					return;
+				}
+		
+				_component_1.Click += new __MainPage_d6cd66944958ced0c513e0a04797b51d_TestReproMainPage.ApplyMethod_1_Click_Handler((this as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference).Invoke;
+				__is__ApplyMethod_1_Click_Initialized = true;
+			}
+			[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
+			private bool __is__ApplyMethod_2_Click_Initialized ;
+		
+			[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
+			private void __ApplyMethod_2_Click_Initialize()
+			{
+				if (__is__ApplyMethod_2_Click_Initialized || _component_2 is null)
+				{
+					return;
+				}
+		
+				_component_2.Click += new __MainPage_d6cd66944958ced0c513e0a04797b51d_TestReproMainPage.ApplyMethod_2_Click_Handler((this as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference).Invoke;
+				__is__ApplyMethod_2_Click_Initialized = true;
+			}
 		private void __UpdateBindingsAndResources(global::Microsoft.UI.Xaml.FrameworkElement s, object e)
 		{
 			this.Bindings.Update();
 			this.Bindings.UpdateResources();
 		}
-		private global::System.Action<global::Microsoft.UI.Xaml.Controls.Primitives.ButtonBase> __0_Click_P1_Button_Click_Builder;
-		private global::System.Action<global::Microsoft.UI.Xaml.Controls.Primitives.ButtonBase> __1_Click_P2_Button_Click_Builder;
-		private global::System.Action<global::Microsoft.UI.Xaml.Controls.Primitives.ButtonBase> __2_Click_P3_Button_Click_Builder;
+		[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
+		[global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdate]
+		private class __MainPage_d6cd66944958ced0c513e0a04797b51d_TestReproMainPage
+		{
+				public class ApplyMethod_0_Click_Handler(global::Uno.UI.DataBinding.ManagedWeakReference target)
+				{
+					public void Invoke(object sender, global::Microsoft.UI.Xaml.RoutedEventArgs e)
+					{
+						(target.Target as global::TestRepro.MainPage)?.P1.Button_Click(sender, e);
+					}
+				}
+
+				public class ApplyMethod_1_Click_Handler(global::Uno.UI.DataBinding.ManagedWeakReference target)
+				{
+					public void Invoke(object sender, global::Microsoft.UI.Xaml.RoutedEventArgs e)
+					{
+						(target.Target as global::TestRepro.MainPage)?.P2.Button_Click(sender, e);
+					}
+				}
+
+				public class ApplyMethod_2_Click_Handler(global::Uno.UI.DataBinding.ManagedWeakReference target)
+				{
+					public void Invoke(object sender, global::Microsoft.UI.Xaml.RoutedEventArgs e)
+					{
+						(target.Target as global::TestRepro.MainPage)?.P3.Button_Click(sender, e);
+					}
+				}
+
+		}
 		private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_0_Holder = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: true);
 		private global::Microsoft.UI.Xaml.Controls.Button _component_0
 		{
@@ -251,32 +289,20 @@ void IMainPage_Bindings.Update()
 			{
 				var owner = Owner;
 				owner._component_0.ApplyXBind();
-				owner.__0_Click_P1_Button_Click_Builder?.Invoke( owner._component_0);
-				owner.__0_Click_P1_Button_Click_Builder = null;
-				owner.__1_Click_P2_Button_Click_Builder?.Invoke( owner._component_1);
-				owner.__1_Click_P2_Button_Click_Builder = null;
-				owner.__2_Click_P3_Button_Click_Builder?.Invoke( owner._component_2);
-				owner.__2_Click_P3_Button_Click_Builder = null;
+				owner.__ApplyMethod_0_Click_Initialize();
+				owner.__ApplyMethod_1_Click_Initialize();
+				owner.__ApplyMethod_2_Click_Initialize();
 				owner._component_1.ApplyXBind();
-				owner.__0_Click_P1_Button_Click_Builder?.Invoke( owner._component_0);
-				owner.__0_Click_P1_Button_Click_Builder = null;
-				owner.__1_Click_P2_Button_Click_Builder?.Invoke( owner._component_1);
-				owner.__1_Click_P2_Button_Click_Builder = null;
-				owner.__2_Click_P3_Button_Click_Builder?.Invoke( owner._component_2);
-				owner.__2_Click_P3_Button_Click_Builder = null;
+				owner.__ApplyMethod_0_Click_Initialize();
+				owner.__ApplyMethod_1_Click_Initialize();
+				owner.__ApplyMethod_2_Click_Initialize();
 				owner._component_2.ApplyXBind();
-				owner.__0_Click_P1_Button_Click_Builder?.Invoke( owner._component_0);
-				owner.__0_Click_P1_Button_Click_Builder = null;
-				owner.__1_Click_P2_Button_Click_Builder?.Invoke( owner._component_1);
-				owner.__1_Click_P2_Button_Click_Builder = null;
-				owner.__2_Click_P3_Button_Click_Builder?.Invoke( owner._component_2);
-				owner.__2_Click_P3_Button_Click_Builder = null;
-				owner.__0_Click_P1_Button_Click_Builder?.Invoke( owner._component_0);
-				owner.__0_Click_P1_Button_Click_Builder = null;
-				owner.__1_Click_P2_Button_Click_Builder?.Invoke( owner._component_1);
-				owner.__1_Click_P2_Button_Click_Builder = null;
-				owner.__2_Click_P3_Button_Click_Builder?.Invoke( owner._component_2);
-				owner.__2_Click_P3_Button_Click_Builder = null;
+				owner.__ApplyMethod_0_Click_Initialize();
+				owner.__ApplyMethod_1_Click_Initialize();
+				owner.__ApplyMethod_2_Click_Initialize();
+				owner.__ApplyMethod_0_Click_Initialize();
+				owner.__ApplyMethod_1_Click_Initialize();
+				owner.__ApplyMethod_2_Click_Initialize();
 			}
 			void IMainPage_Bindings.UpdateResources()
 			{
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/WEOTLNDO/XamlCodeGenerator_MainWindow_c93db19a7202d9eb84ddc41d72fcb89b.cs b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/WEOTLNDO/XamlCodeGenerator_MainWindow_c93db19a7202d9eb84ddc41d72fcb89b.cs
index 8b732a87812e..0c263af0bc36 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/WEOTLNDO/XamlCodeGenerator_MainWindow_c93db19a7202d9eb84ddc41d72fcb89b.cs
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/WEOTLNDO/XamlCodeGenerator_MainWindow_c93db19a7202d9eb84ddc41d72fcb89b.cs
@@ -58,8 +58,8 @@ private void InitializeComponent()
 			.MainWindow_c93db19a7202d9eb84ddc41d72fcb89b_XamlApply((MainWindow_c93db19a7202d9eb84ddc41d72fcb89bXamlApplyExtensions.XamlApplyHandler0)(__p1 => 
 			{
 			// Class TestRepro.MainWindow
-			var Closed_Window_Closed_That = (__that as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference;
-			/* second level */ __p1.Closed += (Window_Closed_sender,Window_Closed_args) => (Closed_Window_Closed_That.Target as global::TestRepro.MainWindow)?.Window_Closed(Window_Closed_sender,Window_Closed_args);
+			var Closed_Handler = new __MainWindow_c93db19a7202d9eb84ddc41d72fcb89b_TestReproMainWindow.ApplyMethod_1_Closed_Handler((this as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference);
+			/* second level */ __p1.Closed += Closed_Handler.Invoke;
 			}
 			))
 			;
@@ -71,6 +71,19 @@ private void InitializeComponent()
 
 		}
 		partial void OnInitializeCompleted();
+		[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
+		[global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdate]
+		private class __MainWindow_c93db19a7202d9eb84ddc41d72fcb89b_TestReproMainWindow
+		{
+				public class ApplyMethod_1_Closed_Handler(global::Uno.UI.DataBinding.ManagedWeakReference target)
+				{
+					public void Invoke(object sender, global::Microsoft.UI.Xaml.WindowEventArgs args)
+					{
+						(target.Target as global::TestRepro.MainWindow)?.Window_Closed(sender, args);
+					}
+				}
+
+		}
 	}
 }
 namespace MyProject
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/WNWSRAE/XamlCodeGenerator_ResourceDictionary_When_Nested_With_Sibling_Ref_And_Event_6d62c5ee15120ed189e095faf6d37e20.cs b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/WNWSRAE/XamlCodeGenerator_ResourceDictionary_When_Nested_With_Sibling_Ref_And_Event_6d62c5ee15120ed189e095faf6d37e20.cs
index 3c5eabde86ee..afe7ef1b7e02 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/WNWSRAE/XamlCodeGenerator_ResourceDictionary_When_Nested_With_Sibling_Ref_And_Event_6d62c5ee15120ed189e095faf6d37e20.cs
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/WNWSRAE/XamlCodeGenerator_ResourceDictionary_When_Nested_With_Sibling_Ref_And_Event_6d62c5ee15120ed189e095faf6d37e20.cs
@@ -136,8 +136,8 @@ public _View Build(object __ResourceOwner_1)
 									__that._component_0 = __p1;
 									global::Microsoft.UI.Xaml.NameScope.SetNameScope(__that._component_0, __nameScope);
 									global::Uno.UI.ResourceResolverSingleton.Instance.ApplyResource(__p1, global::Microsoft.UI.Xaml.Controls.SwipeItem.IconSourceProperty, "SiblingResource", isThemeResourceExtension: false, isHotReloadSupported: false, context: global::MyProject.GlobalStaticResources.__ParseContext_);
-									var Invoked_AnEventHandler_That = (__ResourceOwner_2 as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference;
-									/* second level */ __p1.Invoked += (AnEventHandler_sender,AnEventHandler_args) => (Invoked_AnEventHandler_That.Target as global::Uno.UI.Tests.Given_ResourceDictionary.When_Nested_With_Sibling_Ref_And_Event)?.AnEventHandler(AnEventHandler_sender,AnEventHandler_args);
+									var Invoked_Handler = new __ResourceDictionary_When_Nested_With_Sibling_Ref_And_Event_6d62c5ee15120ed189e095faf6d37e20_MyProject__ResourcesSC0_UnoUITestsGiven_ResourceDictionaryWhen_Nested_With_Sibling_Ref_And_Event.ApplyMethod_3_Invoked_Handler((__ResourceOwner_2 as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference);
+									/* second level */ __p1.Invoked += Invoked_Handler.Invoke;
 									}
 									))
 								);
@@ -203,6 +203,19 @@ private void __UpdateBindingsAndResources(global::Microsoft.UI.Xaml.FrameworkEle
 					var owner = this;
 					_component_0.UpdateResourceBindings();
 				}
+				[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
+				[global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdate]
+				private class __ResourceDictionary_When_Nested_With_Sibling_Ref_And_Event_6d62c5ee15120ed189e095faf6d37e20_MyProject__ResourcesSC0_UnoUITestsGiven_ResourceDictionaryWhen_Nested_With_Sibling_Ref_And_Event
+				{
+						public class ApplyMethod_3_Invoked_Handler(global::Uno.UI.DataBinding.ManagedWeakReference target)
+						{
+							public void Invoke(global::Microsoft.UI.Xaml.Controls.SwipeItem sender, global::Microsoft.UI.Xaml.Controls.SwipeItemInvokedEventArgs args)
+							{
+								(target.Target as global::Uno.UI.Tests.Given_ResourceDictionary.When_Nested_With_Sibling_Ref_And_Event)?.AnEventHandler(sender, args);
+							}
+						}
+
+				}
 			}
 		}
 	}
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Verifiers/CSGenerator.cs b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Verifiers/CSGenerator.cs
index 79fe7ee82300..540fd3f66703 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Verifiers/CSGenerator.cs
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Verifiers/CSGenerator.cs
@@ -1,6 +1,9 @@
-// Uncomment the following line to write expected files to disk
+#if DEBUG
+// Uncomment the following line to write expected files to disk
 // Don't commit this line uncommented.
 // #define WRITE_EXPECTED
+#define WRITE_EXPECTED
+#endif
 
 using System.Collections.Immutable;
 using System.Diagnostics;
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/BackingFieldDefinition.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/BackingFieldDefinition.cs
index ecf5febc2720..8940347d458d 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/BackingFieldDefinition.cs
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/BackingFieldDefinition.cs
@@ -1,11 +1,8 @@
 #nullable enable
 
+using System;
 using Microsoft.CodeAnalysis;
 
-namespace Uno.UI.SourceGenerators.XamlGenerator
-{
-	internal record BackingFieldDefinition(string GlobalizedTypeName, string Name, Accessibility Accessibility);
+namespace Uno.UI.SourceGenerators.XamlGenerator;
 
-	internal record EventHandlerBackingFieldDefinition(string GlobalizedTypeName, string Name, Accessibility Accessibility, string ComponentName)
-		: BackingFieldDefinition(GlobalizedTypeName, Name, Accessibility);
-}
+internal record BackingFieldDefinition(string GlobalizedTypeName, string Name, Accessibility Accessibility);
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/NameScope.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/NameScope.cs
index 41c1efcb2f49..7b2a23620997 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/NameScope.cs
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/NameScope.cs
@@ -2,21 +2,28 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
 using Uno.Extensions;
 
 namespace Uno.UI.SourceGenerators.XamlGenerator
 {
-	internal class NameScope
+	/// <summary>
+	/// Represents the current scope of the XAML generation
+	/// </summary>
+	/// <param name="Parents">The stack of parent scopes</param>
+	/// <param name="FileUniqueId">Unique ID of the generated file.</param>
+	/// <param name="Namespace"></param>
+	/// <param name="ClassName"></param>
+	internal record NameScope(ImmutableStack<NameScope> Parents, string FileUniqueId, string Namespace, string ClassName)
 	{
-		public NameScope(string? @namespace, string className)
-		{
-			Namespace = @namespace ?? string.Empty;
-			ClassName = className;
-		}
-
 		public string Name => $"{Namespace.Replace(".", "")}{ClassName}";
-		public string Namespace { get; private set; }
-		public string ClassName { get; private set; }
+
+		/// <summary>
+		/// Name of the root class for all sub-classes
+		/// </summary>
+		/// <remarks>All sub-classes will be generated nested to this class, which is flagged with CreateNewOnMetadataUpdate attribute to avoid issues with HR.</remarks>
+		public string SubClassesRoot => $"__{FileUniqueId}_{string.Join("_", [Name, ..Parents.Select(scope => scope.Name)])}";
 
 		/// <summary>
 		/// Used to detect duplicate x:Name and report error for those.
@@ -28,7 +35,7 @@ public NameScope(string? @namespace, string className)
 		/// <summary>
 		/// List of action handlers for registering x:Bind events
 		/// </summary>
-		public List<EventHandlerBackingFieldDefinition> xBindEventsHandlers { get; } = [];
+		public List<XBindEventInitializerDefinition> xBindEventsHandlers { get; } = [];
 
 		/// <summary>
 		/// Lists the ElementStub builder holder variables used to pin references for implicit pinning platforms
@@ -39,6 +46,8 @@ public NameScope(string? @namespace, string className)
 
 		public Dictionary<string, Subclass> Subclasses { get; } = [];
 
+		public List<Action<IIndentedStringBuilder>> Subclasses2 { get; } = [];
+
 		public List<ComponentDefinition> Components { get; } = [];
 
 		public List<XamlObjectDefinition> XBindExpressions { get; } = [];
@@ -47,7 +56,11 @@ public NameScope(string? @namespace, string className)
 
 		public List<string> ExplicitApplyMethods { get; } = [];
 
-		public List<Action<IIndentedStringBuilder>> EventHandlers { get; } = [];
+		/// <summary>
+		/// Set of method builders to be generated for the current scope.
+		/// This is usually used to avoid delegates like for event handlers.
+		/// </summary>
+		public List<Action<IIndentedStringBuilder>> CallbackMethods { get; } = [];
 
 		public int ComponentCount => Components.Count;
 	}
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XBindEventInitializerDefinition.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XBindEventInitializerDefinition.cs
new file mode 100644
index 000000000000..a54173d0d7b3
--- /dev/null
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XBindEventInitializerDefinition.cs
@@ -0,0 +1,13 @@
+#nullable enable
+using System;
+using System.Linq;
+using Uno.Extensions;
+
+namespace Uno.UI.SourceGenerators.XamlGenerator;
+
+/// <summary>
+/// The Initialize method of an event handler databind using x:Bind
+/// </summary>
+/// <param name="MethodName">Name of the initialize method</param>
+/// <param name="Build">Body of the method</param>
+internal record XBindEventInitializerDefinition(string MethodName, Action<string, IIndentedStringBuilder> Build);
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XLoadScope.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XLoadScope.cs
index f681231d6cdf..ce79fb531ea8 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XLoadScope.cs
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XLoadScope.cs
@@ -12,7 +12,7 @@ internal class XLoadScope
 		/// <summary>
 		/// List of action handlers for registering x:Bind events
 		/// </summary>
-		public List<EventHandlerBackingFieldDefinition> xBindEventsHandlers { get; } = new();
+		public List<XBindEventInitializerDefinition> xBindEventsHandlers { get; } = new();
 
 	}
 }
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
index cfbd3ed83898..1b54889aacc1 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
@@ -186,6 +186,13 @@ private INamedTypeSymbol? CurrentStyleTargetType
 
 		private const string DictionaryProviderInterfaceName = "global::Uno.UI.IXamlResourceDictionaryProvider";
 
+		private string RoField(string type, string name)
+			=> _isHotReloadEnabled
+				? $"private {type} {name} {{ get; }}"
+				: $"private readonly {type} {name};";
+		private string Field(string type, string name)
+			=> $"private {type} {name} {(_isHotReloadEnabled ? "{ get; set; }" : ";")}";
+
 		public XamlCodeGeneration Generation { get; }
 
 		public XamlFileGenerator(
@@ -385,7 +392,7 @@ private SourceText InnerGenerateFile()
 
 							BuildPartials(writer);
 
-							BuildEventHandlers(writer);
+							BuildCallbackMethods(writer);
 
 							BuildExplicitApplyMethods(writer);
 
@@ -828,11 +835,11 @@ private void BuildXBindTryGetDeclarations(IIndentedStringBuilder writer)
 			}
 		}
 
-		private void BuildEventHandlers(IIndentedStringBuilder writer)
+		private void BuildCallbackMethods(IIndentedStringBuilder writer)
 		{
-			foreach (var eventHandler in CurrentScope.EventHandlers)
+			foreach (var callback in CurrentScope.CallbackMethods)
 			{
-				eventHandler(writer);
+				callback(writer);
 			}
 		}
 
@@ -866,12 +873,6 @@ private void BuildBackingFields(IIndentedStringBuilder writer)
 				}
 			}
 
-			foreach (var xBindEventHandler in CurrentScope.xBindEventsHandlers.OrderBy(f => f.Name, StringComparer.Ordinal))
-			{
-				// Create load-time subjects for ElementName references not in local scope
-				writer.AppendLineIndented($"{FormatAccessibility(xBindEventHandler.Accessibility)} {xBindEventHandler.GlobalizedTypeName} {xBindEventHandler.Name}{rAccessor ?? ";"}");
-			}
-
 			foreach (var remainingReference in CurrentScope.ReferencedElementNames.OrderBy(f => f, StringComparer.Ordinal))
 			{
 				// Create load-time subjects for ElementName references not in local scope
@@ -902,14 +903,14 @@ private void BuildChildSubclasses(IIndentedStringBuilder writer, bool isTopLevel
 			using var _ = isTopLevel ? writer.BlockInvariant($"namespace {ns}") : null;
 
 			// If _isHotReloadEnabled we generate it anyway so we can remove sub-classes without causing rude edit.
-			if (!_isHotReloadEnabled && CurrentScope.Subclasses is not { Count: >= 1 })
+			if (!_isHotReloadEnabled && CurrentScope.Subclasses is not { Count: > 0 } && CurrentScope.Subclasses2 is not { Count: > 0 })
 			{
 				return;
 			}
 
 			writer.AppendLineIndented("[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]");
 			writer.AppendLineIndented("[global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdate]");
-			using (writer.BlockInvariant($"{(isTopLevel ? "internal" : "private")} class __{_fileUniqueId}_{string.Join("_", _scopeStack.Select(scope => scope.Name))}"))
+			using (writer.BlockInvariant($"{(isTopLevel ? "internal" : "private")} class {CurrentScope.SubClassesRoot}"))
 			{
 				foreach (var kvp in CurrentScope.Subclasses)
 				{
@@ -971,7 +972,7 @@ private void BuildChildSubclasses(IIndentedStringBuilder writer, bool isTopLevel
 
 								BuildBackingFields(writer);
 
-								BuildEventHandlers(writer);
+								BuildCallbackMethods(writer);
 
 								BuildExplicitApplyMethods(writer);
 
@@ -982,6 +983,12 @@ private void BuildChildSubclasses(IIndentedStringBuilder writer, bool isTopLevel
 						}
 					}
 				}
+
+				foreach (var subClass in CurrentScope.Subclasses2)
+				{
+					subClass(writer);
+					writer.AppendLine();
+				}
 			}
 		}
 
@@ -1052,7 +1059,7 @@ private void BuildCompiledBindingsInitializer(IndentedStringBuilder writer, INam
 					writer.AppendLineIndented("((global::Microsoft.UI.Xaml.Window)this).Activated += __UpdateBindingsAndResources;");
 				}
 
-				CurrentScope.EventHandlers.Add(eventWriter =>
+				CurrentScope.CallbackMethods.Add(eventWriter =>
 				{
 					using (eventWriter.BlockInvariant(callbackSignature))
 					{
@@ -1078,7 +1085,7 @@ private void BuildCompiledBindingsInitializerForTemplate(IIndentedStringBuilder
 				{
 					writer.AppendLineIndented("__fe.Loading += __UpdateBindingsAndResources;");
 
-					CurrentScope.EventHandlers.Add(eventWriter =>
+					CurrentScope.CallbackMethods.Add(eventWriter =>
 					{
 						using (writer.BlockInvariant("private void __UpdateBindingsAndResources(global::Microsoft.UI.Xaml.FrameworkElement s, object e)"))
 						{
@@ -1093,16 +1100,11 @@ private void BuildCompiledBindingsInitializerForTemplate(IIndentedStringBuilder
 			}
 		}
 
-		private void BuildxBindEventHandlerInitializers(IIndentedStringBuilder writer, List<EventHandlerBackingFieldDefinition> xBindEventsHandlers, string prefix = "")
+		private void BuildxBindEventHandlerInitializers(IIndentedStringBuilder writer, List<XBindEventInitializerDefinition> xBindEventsHandlers, string prefix = "")
 		{
 			foreach (var xBindEventHandler in xBindEventsHandlers)
 			{
-				var ownerParameter = _isHotReloadEnabled ? "owner," : "";
-
-				writer.AppendLineIndented($"{prefix}{xBindEventHandler.Name}?.Invoke({ownerParameter} owner.{xBindEventHandler.ComponentName});");
-
-				// Only needs to happen once per visual tree creation
-				writer.AppendLineIndented($"{prefix}{xBindEventHandler.Name} = null;");
+				writer.AppendLineIndented($"{prefix}{xBindEventHandler.MethodName}();");
 			}
 		}
 
@@ -1423,7 +1425,7 @@ IDisposable WrapSingleton()
 
 						BuildXBindTryGetDeclarations(writer);
 
-						BuildEventHandlers(writer);
+						BuildCallbackMethods(writer);
 					}
 				}
 
@@ -1761,7 +1763,7 @@ private void BuildResourceDictionaryBackingClass(IIndentedStringBuilder writer,
 
 							writer.AppendLine();
 
-							BuildEventHandlers(writer);
+							BuildCallbackMethods(writer);
 							BuildChildSubclasses(writer);
 							BuildXBindTryGetDeclarations(writer);
 						}
@@ -1848,7 +1850,7 @@ bool IsGenerateUpdateResourceBindings(KeyValuePair<string, XamlObjectDefinition>
 			{
 				writer.AppendLineIndented("Loading += __UpdateNamedResources;");
 
-				CurrentScope.EventHandlers.Add(eventWriter =>
+				CurrentScope.CallbackMethods.Add(eventWriter =>
 				{
 					using (eventWriter.BlockInvariant("private void __UpdateNamedResources(global::Microsoft.UI.Xaml.FrameworkElement s, object e)"))
 					{
@@ -3575,213 +3577,197 @@ private bool IsXLoadMember(XamlMemberDefinition member) =>
 
 		private void GenerateInlineEvent(string? closureName, IIndentedStringBuilder writer, XamlMemberDefinition member, IEventSymbol eventSymbol, ComponentDefinition? componentDefinition = null)
 		{
+			if (eventSymbol.Type is not INamedTypeSymbol delegateSymbol)
+			{
+				GenerateError(writer, $"{eventSymbol.Type} is not a supported event");
+				return;
+			}
+
 			// If a binding is inside a DataTemplate, the binding root in the case of an x:Bind is
 			// the DataContext, not the control's instance.
-			var isInsideDataTemplate = IsMemberInsideFrameworkTemplate(member.Owner);
-
-			void writeEvent(string? ownerPrefix)
+			var template = IsMemberInsideFrameworkTemplate(member.Owner);
+			var eventSource = (template.isInside, _xClassName) switch
 			{
-				if (eventSymbol.Type is INamedTypeSymbol delegateSymbol)
-				{
-					var parmsNames = delegateSymbol
-						.DelegateInvokeMethod
-						?.Parameters
-						.Select(p => member.Value + "_" + p.Name)
-						.ToArray();
+				(false, _) => "this",
+				(_, not null) => CurrentResourceOwnerName,
+				_ => null
+			};
+			if (eventSource is null)
+			{
+				GenerateError(writer, $"Unable to use event {member.Member.Name} without a backing class (use x:Class)");
+				return;
+			}
 
-					var parms = parmsNames.JoinBy(",");
+			var parentApply = (writer as XamlLazyApplyBlockIIndentedStringBuilder)?.MethodName;
+			var parametersWithType = delegateSymbol
+				.DelegateInvokeMethod
+				?.Parameters
+				.Select(p => $"{p.Type.GetFullyQualifiedTypeIncludingGlobal()} {p.Name}")
+				.ToArray();
+			var parameters = delegateSymbol
+				.DelegateInvokeMethod
+				?.Parameters
+				.Select(p => p.Name)
+				.ToArray();
 
-					var eventSource = !ownerPrefix.IsNullOrEmpty() ? ownerPrefix : "__that";
+			if (member.Objects.FirstOrDefault() is XamlObjectDefinition bind && bind.Type.Name == "Bind")
+			{
+				if (componentDefinition is null)
+				{
+					throw new InvalidOperationException("The component definition cannot be null.");
+				}
 
-					if (member.Objects.FirstOrDefault() is XamlObjectDefinition bind && bind.Type.Name == "Bind")
-					{
-						CurrentScope.XBindExpressions.Add(bind);
+				CurrentScope.XBindExpressions.Add(bind);
 
-						var eventTarget = XBindExpressionParser.RestoreSinglePath(bind.Members.First().Value?.ToString());
+				var eventTarget = XBindExpressionParser.RestoreSinglePath(bind.Members.First().Value?.ToString());
 
-						if (eventTarget == null)
-						{
-							throw new InvalidOperationException("x:Bind event path cannot by empty");
-						}
+				if (eventTarget == null)
+				{
+					throw new InvalidOperationException("x:Bind event path cannot by empty");
+				}
 
-						var parts = eventTarget.Split('.').ToList();
-						var isStaticTarget = parts.FirstOrDefault()?.Contains(":") ?? false;
+				var parts = eventTarget.Split('.').ToList();
+				var isStaticTarget = parts.FirstOrDefault()?.Contains(":") ?? false;
 
-						eventTarget = RewriteNamespaces(eventTarget);
+				eventTarget = RewriteNamespaces(eventTarget);
 
-						// x:Bind to second-level method generates invalid code
-						// sanitizing member.Member.Name so that "ViewModel.SearchBreeds" becomes "ViewModel_SearchBreeds"
-						var sanitizedEventTarget = SanitizeResourceName(eventTarget);
+				// x:Bind to second-level method generates invalid code
+				// sanitizing member.Member.Name so that "ViewModel.SearchBreeds" becomes "ViewModel_SearchBreeds"
+				var sanitizedEventTarget = SanitizeResourceName(eventTarget);
 
-						(string target, string weakReference, IMethodSymbol targetMethod) buildTargetContext()
+				(string target, string weakReference, IMethodSymbol targetMethod) buildTargetContext()
+				{
+					IMethodSymbol FindTargetMethodSymbol(INamedTypeSymbol? sourceType)
+					{
+						if (eventTarget.Contains("."))
 						{
-							IMethodSymbol FindTargetMethodSymbol(INamedTypeSymbol? sourceType)
-							{
-								if (eventTarget.Contains("."))
-								{
-									ITypeSymbol? currentType = sourceType;
+							ITypeSymbol? currentType = sourceType;
 
-									if (isStaticTarget)
-									{
-										// First part is a type for static method binding and should
-										// overide the original source type
-										currentType = GetType(RewriteNamespaces(parts[0]));
-										parts.RemoveAt(0);
-									}
-
-									for (var i = 0; i < parts.Count - 1; i++)
-									{
-										var next = currentType.GetAllMembersWithName(RewriteNamespaces(parts[i])).FirstOrDefault();
-
-										currentType = next switch
-										{
-											IFieldSymbol fs => fs.Type,
-											IPropertySymbol ps => ps.Type,
-											null => throw new InvalidOperationException($"Unable to find member {parts[i]} on type {currentType}"),
-											_ => throw new InvalidOperationException($"The field {next.Name} is not supported for x:Bind event binding")
-										};
-									}
-
-									var method = currentType?.GetFirstMethodWithName(parts.Last(), includeBaseTypes: true)
-										?? throw new InvalidOperationException($"Failed to find {parts.Last()} on {currentType}");
-
-									return method;
-								}
-								else
-								{
-									return sourceType?.GetFirstMethodWithName(eventTarget, includeBaseTypes: true)
-										?? throw new InvalidOperationException($"Failed to find {eventTarget} on {sourceType}");
-								}
+							if (isStaticTarget)
+							{
+								// First part is a type for static method binding and should
+								// overide the original source type
+								currentType = GetType(RewriteNamespaces(parts[0]));
+								parts.RemoveAt(0);
 							}
 
-							if (isInsideDataTemplate.isInside)
+							for (var i = 0; i < parts.Count - 1; i++)
 							{
-								var dataTypeObject = FindMember(isInsideDataTemplate.xamlObject!, "DataType", XamlConstants.XamlXmlNamespace);
+								var next = currentType.GetAllMembersWithName(RewriteNamespaces(parts[i])).FirstOrDefault();
 
-								if (dataTypeObject?.Value == null)
+								currentType = next switch
 								{
-									throw new Exception($"Unable to find x:DataType in enclosing DataTemplate for x:Bind event");
-								}
-
-								var dataTypeSymbol = GetType(dataTypeObject.Value.ToString() ?? "");
-
-								return (
-									$"({member.Member.Name}_{sanitizedEventTarget}_That.Target as {XamlConstants.Types.FrameworkElement})?.DataContext as {dataTypeSymbol.GetFullyQualifiedTypeIncludingGlobal()}",
-
-									// Use of __rootInstance is required to get the top-level DataContext, as it may be changed
-									// in the current visual tree by the user.
-									$"(__that.__rootInstance as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference",
-									FindTargetMethodSymbol(dataTypeSymbol)
-								);
-							}
-							else
-							{
-								if (_xClassName?.Symbol != null)
-								{
-									return (
-										$"{member.Member.Name}_{sanitizedEventTarget}_That.Target as {_xClassName}",
-										$"({eventSource} as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference",
-										FindTargetMethodSymbol(_xClassName.Symbol)
-									);
-								}
-								else
-								{
-									throw new Exception($"Unable to find the type {_xClassName?.Namespace}.{_xClassName?.ClassName}");
-								}
+									IFieldSymbol fs => fs.Type,
+									IPropertySymbol ps => ps.Type,
+									null => throw new InvalidOperationException($"Unable to find member {parts[i]} on type {currentType}"),
+									_ => throw new InvalidOperationException($"The field {next.Name} is not supported for x:Bind event binding")
+								};
 							}
-						}
 
-						var targetContext = buildTargetContext();
+							var method = currentType?.GetFirstMethodWithName(parts.Last(), includeBaseTypes: true)
+								?? throw new InvalidOperationException($"Failed to find {parts.Last()} on {currentType}");
 
-						var targetMethodHasParamters = targetContext.targetMethod?.Parameters.Any() ?? false;
-						var xBindParams = targetMethodHasParamters ? parms : "";
+							return method;
+						}
+						else
+						{
+							return sourceType?.GetFirstMethodWithName(eventTarget, includeBaseTypes: true)
+								?? throw new InvalidOperationException($"Failed to find {eventTarget} on {sourceType}");
+						}
+					}
 
-						var builderName = $"_{ownerPrefix}_{CurrentScope.xBindEventsHandlers.Count}_{member.Member.Name}_{sanitizedEventTarget}_Builder";
+					if (template.isInside)
+					{
+						var dataTypeObject = FindMember(template.xamlObject!, "DataType", XamlConstants.XamlXmlNamespace);
+						if (dataTypeObject?.Value == null)
+						{
+							throw new Exception($"Unable to find x:DataType in enclosing DataTemplate for x:Bind event");
+						}
 
-						EnsureXClassName();
+						var dataTypeSymbol = GetType(dataTypeObject.Value.ToString() ?? "");
 
-						var ownerName = CurrentScope.ClassName;
+						return (
+							$"({member.Member.Name}_{sanitizedEventTarget}_That.Target as {XamlConstants.Types.FrameworkElement})?.DataContext as {dataTypeSymbol.GetFullyQualifiedTypeIncludingGlobal()}",
 
-						AddXBindEventHandlerToScope(builderName, ownerName, eventSymbol.ContainingType, componentDefinition);
+							// Use of __rootInstance is required to get the top-level DataContext, as it may be changed
+							// in the current visual tree by the user.
+							$"(__rootInstance as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference",
+							FindTargetMethodSymbol(dataTypeSymbol)
+						);
+					}
+					else if (_xClassName?.Symbol != null)
+					{
+						return (
+							$"{member.Member.Name}_{sanitizedEventTarget}_That.Target as {_xClassName}",
+							$"({eventSource} as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference",
+							FindTargetMethodSymbol(_xClassName.Symbol)
+						);
+					}
+					else
+					{
+						throw new Exception($"Unable to find the type {_xClassName?.Namespace}.{_xClassName?.ClassName}");
+					}
+				}
 
-						var handlerParameters = _isHotReloadEnabled ? "(__that, __owner)" : "(__owner)";
+				var targetContext = buildTargetContext();
+				var targetMethodHasParameters = targetContext.targetMethod?.Parameters.Any() ?? false;
 
-						using (writer.BlockInvariant($"__that.{builderName} = {handlerParameters} => "))
-						{
-							//
-							// Generate a weak delegate, so the owner is not being held onto by the delegate. We can
-							// use the WeakReferenceProvider to get a self reference to avoid adding the cost of the
-							// creation of a WeakReference.
-							//
-							var thatVariableName = $"{member.Member.Name}_{sanitizedEventTarget}_That";
-							writer.AppendLineIndented($"var {thatVariableName} = {targetContext.weakReference};");
+				EnsureXClassName();
 
-							if (_isHotReloadEnabled)
+				var handler = RegisterChildSubclass(
+					$"{parentApply}_{member.Member.Name}_Handler",
+					(name, subWriter) => subWriter.AppendMultiLineIndented($$"""
+							public class {{name}}(global::Uno.UI.DataBinding.ManagedWeakReference target)
 							{
-								// Attach the current context to the owner to avoid closing on "this" in the
-								// handler of the event.
-								writer.AppendLineIndented($"global::Uno.UI.Helpers.MarkupHelper.SetElementProperty(__owner, \"{eventTarget}\", {thatVariableName});");
+								public void Invoke({{parametersWithType.JoinBy(", ")}})
+								{
+									(target.Target as {{_xClassName}})?.{{eventTarget}}({{(targetMethodHasParameters ? parameters.JoinBy(", ") : "")}});
+								}
 							}
+						"""));
+
+				RegisterXBindEventInitializer(
+					$"__{parentApply}_{member.Member.Name}_Initialize",
+					(name, subWriter) => subWriter.AppendMultiLineIndented($$"""
+							[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
+							{{Field("bool", $"__is{name}d")}}
 
-							//CurrentScope.ExplicitApplyMethods ICI
-							using (writer.BlockInvariant($"/* first level targetMethod:{targetContext.targetMethod} */ __owner.{member.Member.Name} += ({parms}) => "))
+							[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
+							private void {{name}}()
 							{
-								if (isStaticTarget)
+								if (__is{{name}}d || {{componentDefinition.MemberName}} is null)
 								{
-									writer.AppendLineIndented($"{eventTarget}({xBindParams});");
+									return;
 								}
-								else
-								{
-									if (_isHotReloadEnabled && parmsNames is { Length: > 0 })
-									{
-										writer.AppendLineIndented(
-											$"var {thatVariableName} = /* {delegateSymbol.GetFullyQualifiedTypeExcludingGlobal()} */" +
-											$"global::Uno.UI.Helpers.MarkupHelper.GetElementProperty<global::Uno.UI.DataBinding.ManagedWeakReference>({parmsNames[0]}, \"{eventTarget}\");");
-									}
 
-									writer.AppendLineIndented($"({targetContext.target})?.{eventTarget}({xBindParams});");
-								}
+								{{componentDefinition.MemberName}}.{{member.Member.Name}} += new {{handler}}({{targetContext.weakReference}}).Invoke;
+								__is{{name}}d = true;
 							}
-							writer.AppendLineIndented($";");
-						}
-
-						writer.AppendLineIndented($";");
-					}
-					else
-					{
-						EnsureXClassName();
-
-						// x:Bind to second-level method generates invalid code
-						// sanitizing member.Value so that "ViewModel.SearchBreeds" becomes "ViewModel_SearchBreeds"
-						var sanitizedMemberValue = SanitizeResourceName(member.Value?.ToString());
-
-						//
-						// Generate a weak delegate, so the owner is not being held onto by the delegate. We can
-						// use the WeakReferenceProvider to get a self reference to avoid adding the cost of the
-						// creation of a WeakReference.
-						//
-						writer.AppendLineIndented($"var {member.Member.Name}_{sanitizedMemberValue}_That = ({eventSource} as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference;");
-
-						writer.AppendLineIndented($"/* second level */ {closureName}.{member.Member.Name} += ({parms}) => ({member.Member.Name}_{sanitizedMemberValue}_That.Target as {_xClassName})?.{member.Value}({parms});");
-					}
-				}
-				else
-				{
-					GenerateError(writer, $"{eventSymbol.Type} is not a supported event");
-				}
-			}
-
-			if (!isInsideDataTemplate.isInside)
-			{
-				writeEvent("");
-			}
-			else if (_xClassName?.ClassName != null)
-			{
-				writeEvent(CurrentResourceOwner);
+						"""));
 			}
 			else
 			{
-				GenerateError(writer, $"Unable to use event {member.Member.Name} without a backing class (use x:Class)");
+				EnsureXClassName();
+
+				//
+				// Generate a sub-class that uses a weak ref, so the owner is not being held onto by the delegate.
+				// We can use the WeakReferenceProvider to get a self reference to avoid adding the cost of the
+				// creation of a WeakReference.
+				// The sub-class prevents fuzzy matching of delegates by HR.
+				//
+				var subClass = RegisterChildSubclass(
+					$"{parentApply}_{member.Member.Name}_Handler",
+					(name, subWriter) => subWriter.AppendMultiLineIndented($$"""
+							public class {{name}}(global::Uno.UI.DataBinding.ManagedWeakReference target)
+							{
+								public void Invoke({{parametersWithType.JoinBy(", ")}})
+								{
+									(target.Target as {{_xClassName}})?.{{member.Value}}({{parameters.JoinBy(", ")}});
+								}
+							}
+						"""));
+				writer.AppendLineIndented($"var {member.Member.Name}_Handler = new {subClass}(({eventSource} as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference);");
+				writer.AppendLineIndented($"/* second level */ {closureName}.{member.Member.Name} += {member.Member.Name}_Handler.Invoke;");
 			}
 		}
 
@@ -4036,6 +4022,24 @@ private void RegisterChildSubclass(string name, XamlMemberDefinition owner, stri
 			CurrentScope.Subclasses[name] = new Subclass(owner, returnType, GetDefaultBindMode());
 		}
 
+		/// <summary>
+		/// Register a sub-class to be generated for the current scope.
+		/// </summary>
+		/// <param name="name">
+		/// The **suggested** name of the class.
+		/// Be aware this class might not be directly accessible (might be generated nested into another class).
+		/// **Don't use this name directly**, prefer to use the returned fullname instead.
+		/// </param>
+		/// <param name="build">Callback to write the content of the class.</param>
+		/// <returns>The fullname of the generated class.</returns>
+		private string RegisterChildSubclass(string name, Action<string, IIndentedStringBuilder> build)
+		{
+			var fullName = $"{CurrentScope.SubClassesRoot}.{name}";
+			CurrentScope.Subclasses2.Add(writer => build(name, writer));
+
+			return fullName;
+		}
+
 		private void BuildComplexPropertyValue(IIndentedStringBuilder writer, XamlMemberDefinition member, string? prefix, string? closureName = null, bool generateAssignation = true, ComponentDefinition? componentDefinition = null)
 		{
 			TryAnnotateWithGeneratorSource(writer);
@@ -6656,7 +6660,7 @@ private void BuildChildThroughSubclass(IIndentedStringBuilder writer, XamlMember
 
 			// To prevent conflicting names whenever we are working with dictionaries, subClass index is a Guid in those cases
 			var namespacePrefix = isTopLevel ? "__Resources." : "";
-			var subClassesRoot = $"__{_fileUniqueId}_{string.Join("_", _scopeStack.Select(scope => scope.Name))}";
+			var subClassesRoot = CurrentScope.SubClassesRoot;
 			var subclassName = $"SC{(_subclassIndex++).ToString(CultureInfo.InvariantCulture)}";
 
 			RegisterChildSubclass(subclassName, contentOwner, returnType);
@@ -6859,7 +6863,7 @@ private NameScope CurrentScope
 
 		private IDisposable Scope(string? @namespace, string className)
 		{
-			_scopeStack.Push(new NameScope(@namespace, className));
+			_scopeStack.Push(new NameScope(ImmutableStack.Create(_scopeStack.ToArray()), _fileUniqueId, @namespace ?? string.Empty, className));
 
 			return new DisposableAction(() => _scopeStack.Pop());
 		}
@@ -6911,23 +6915,16 @@ private ComponentDefinition AddComponentForParentScope(XamlObjectDefinition obje
 			return component;
 		}
 
-		private void AddXBindEventHandlerToScope(string fieldName, string ownerTypeName, INamedTypeSymbol declaringType, ComponentDefinition? componentDefinition)
+		private void RegisterXBindEventInitializer(string methodName, Action<string, IIndentedStringBuilder> build)
 		{
-			if (componentDefinition is null)
-			{
-				throw new InvalidOperationException("The component definition cannot be null.");
-			}
-
-			var thatParameter = _isHotReloadEnabled ? $"{ownerTypeName}, " : "";
-
-			var builderDelegateType = $"global::System.Action<{thatParameter}{declaringType.GetFullyQualifiedTypeIncludingGlobal()}>";
-			var definition = new EventHandlerBackingFieldDefinition(builderDelegateType, fieldName, Accessibility.Private, componentDefinition.MemberName);
+			var definition = new XBindEventInitializerDefinition(methodName, build);
 
 			CurrentScope.xBindEventsHandlers.Add(definition);
+			CurrentScope.CallbackMethods.Add(writer => build(methodName, writer));
 
 			if (CurrentXLoadScope is { } xLoadScope)
 			{
-				CurrentXLoadScope.xBindEventsHandlers.Add(definition);
+				xLoadScope.xBindEventsHandlers.Add(definition);
 			}
 		}
 
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlLazyApplyBlockIIndentedStringBuilder.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlLazyApplyBlockIIndentedStringBuilder.cs
index 567fc42a3624..c9be0c21fd6c 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlLazyApplyBlockIIndentedStringBuilder.cs
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlLazyApplyBlockIIndentedStringBuilder.cs
@@ -24,10 +24,12 @@ internal class XamlLazyApplyBlockIIndentedStringBuilder : IIndentedStringBuilder
 		private readonly IDisposable? _parentDisposable;
 		private readonly bool _exposeContext;
 		private readonly Action<string> _onRegisterApplyMethodBody;
-		private readonly string? _exposeContextMethod;
+		private readonly string _exposeContextMethod;
 		private readonly string _appliedType;
 		private readonly string _topLevelType;
 
+		public string? MethodName => _exposeContext ? _exposeContextMethod : null;
+
 		public XamlLazyApplyBlockIIndentedStringBuilder(
 			IIndentedStringBuilder source,
 			string closureName,
@@ -37,7 +39,7 @@ public XamlLazyApplyBlockIIndentedStringBuilder(
 			Action<string> onRegisterApplyMethodBody,
 			string appliedType,
 			string topLevelType,
-			string? exposeContextMethod,
+			string exposeContextMethod,
 			IDisposable? parentDisposable = null)
 		{
 			_closureName = closureName;

From a312e3f67ed65d6f7e45b19327c03f8c1834b32d Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome@platform.uno>
Date: Fri, 31 Jan 2025 22:14:03 -0500
Subject: [PATCH 2/5] chore: Adjust formatting, unused method

---
 .../Uno.UI.SourceGenerators/XamlGenerator/NameScope.cs        | 2 +-
 .../XamlGenerator/XamlFileGenerator.cs                        | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/NameScope.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/NameScope.cs
index 7b2a23620997..2a29c18f010e 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/NameScope.cs
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/NameScope.cs
@@ -23,7 +23,7 @@ internal record NameScope(ImmutableStack<NameScope> Parents, string FileUniqueId
 		/// Name of the root class for all sub-classes
 		/// </summary>
 		/// <remarks>All sub-classes will be generated nested to this class, which is flagged with CreateNewOnMetadataUpdate attribute to avoid issues with HR.</remarks>
-		public string SubClassesRoot => $"__{FileUniqueId}_{string.Join("_", [Name, ..Parents.Select(scope => scope.Name)])}";
+		public string SubClassesRoot => $"__{FileUniqueId}_{string.Join("_", [Name, .. Parents.Select(scope => scope.Name)])}";
 
 		/// <summary>
 		/// Used to detect duplicate x:Name and report error for those.
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
index 1b54889aacc1..c639cb0aefb2 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
@@ -186,10 +186,6 @@ private INamedTypeSymbol? CurrentStyleTargetType
 
 		private const string DictionaryProviderInterfaceName = "global::Uno.UI.IXamlResourceDictionaryProvider";
 
-		private string RoField(string type, string name)
-			=> _isHotReloadEnabled
-				? $"private {type} {name} {{ get; }}"
-				: $"private readonly {type} {name};";
 		private string Field(string type, string name)
 			=> $"private {type} {name} {(_isHotReloadEnabled ? "{ get; set; }" : ";")}";
 

From fa0f6148dd244f26a8ae2efcbac0de18b3795492 Mon Sep 17 00:00:00 2001
From: David <github.site@torick.net>
Date: Mon, 3 Feb 2025 12:25:33 -0500
Subject: [PATCH 3/5] fix(hr): Fix invalid x:Bind event's target resolution

---
 .../Content/Uno.UI.SourceGenerators.props     |   1 +
 .../XamlGenerator/XamlFileGenerator.cs        | 153 +++++++++---------
 2 files changed, 75 insertions(+), 79 deletions(-)

diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props b/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props
index c999051962a4..28f271772675 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props
@@ -211,6 +211,7 @@
 		<XamlGeneratorAnalyzerSuppressions Include="csharp-105 // Ignore duplicate namespaces" />
 		<XamlGeneratorAnalyzerSuppressions Include="csharp-1591 // Ignore missing XML comment warnings" />
 		<XamlGeneratorAnalyzerSuppressions Include="csharp-CS8669 // Ignore annotation for nullable reference types" />
+		<XamlGeneratorAnalyzerSuppressions Include="csharp-CS9113 // Parameter is unread" />
 	</ItemGroup>
 
 	<!--Default UI automation member mappings-->
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
index c639cb0aefb2..ac2c631b42e5 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
@@ -3582,17 +3582,18 @@ private void GenerateInlineEvent(string? closureName, IIndentedStringBuilder wri
 			// If a binding is inside a DataTemplate, the binding root in the case of an x:Bind is
 			// the DataContext, not the control's instance.
 			var template = IsMemberInsideFrameworkTemplate(member.Owner);
-			var eventSource = (template.isInside, _xClassName) switch
+			var targetInstance = (template.isInside, _xClassName) switch
 			{
 				(false, _) => "this",
 				(_, not null) => CurrentResourceOwnerName,
 				_ => null
 			};
-			if (eventSource is null)
+			if (targetInstance is null)
 			{
 				GenerateError(writer, $"Unable to use event {member.Member.Name} without a backing class (use x:Class)");
 				return;
 			}
+			EnsureXClassName();
 
 			var parentApply = (writer as XamlLazyApplyBlockIIndentedStringBuilder)?.MethodName;
 			var parametersWithType = delegateSymbol
@@ -3615,89 +3616,27 @@ private void GenerateInlineEvent(string? closureName, IIndentedStringBuilder wri
 
 				CurrentScope.XBindExpressions.Add(bind);
 
-				var eventTarget = XBindExpressionParser.RestoreSinglePath(bind.Members.First().Value?.ToString());
-
-				if (eventTarget == null)
+				var path = XBindExpressionParser.RestoreSinglePath(bind.Members.First().Value?.ToString());
+				if (path is null)
 				{
 					throw new InvalidOperationException("x:Bind event path cannot by empty");
 				}
 
-				var parts = eventTarget.Split('.').ToList();
-				var isStaticTarget = parts.FirstOrDefault()?.Contains(":") ?? false;
-
-				eventTarget = RewriteNamespaces(eventTarget);
-
-				// x:Bind to second-level method generates invalid code
-				// sanitizing member.Member.Name so that "ViewModel.SearchBreeds" becomes "ViewModel_SearchBreeds"
-				var sanitizedEventTarget = SanitizeResourceName(eventTarget);
-
-				(string target, string weakReference, IMethodSymbol targetMethod) buildTargetContext()
+				INamedTypeSymbol GetTargetType()
 				{
-					IMethodSymbol FindTargetMethodSymbol(INamedTypeSymbol? sourceType)
-					{
-						if (eventTarget.Contains("."))
-						{
-							ITypeSymbol? currentType = sourceType;
-
-							if (isStaticTarget)
-							{
-								// First part is a type for static method binding and should
-								// overide the original source type
-								currentType = GetType(RewriteNamespaces(parts[0]));
-								parts.RemoveAt(0);
-							}
-
-							for (var i = 0; i < parts.Count - 1; i++)
-							{
-								var next = currentType.GetAllMembersWithName(RewriteNamespaces(parts[i])).FirstOrDefault();
-
-								currentType = next switch
-								{
-									IFieldSymbol fs => fs.Type,
-									IPropertySymbol ps => ps.Type,
-									null => throw new InvalidOperationException($"Unable to find member {parts[i]} on type {currentType}"),
-									_ => throw new InvalidOperationException($"The field {next.Name} is not supported for x:Bind event binding")
-								};
-							}
-
-							var method = currentType?.GetFirstMethodWithName(parts.Last(), includeBaseTypes: true)
-								?? throw new InvalidOperationException($"Failed to find {parts.Last()} on {currentType}");
-
-							return method;
-						}
-						else
-						{
-							return sourceType?.GetFirstMethodWithName(eventTarget, includeBaseTypes: true)
-								?? throw new InvalidOperationException($"Failed to find {eventTarget} on {sourceType}");
-						}
-					}
-
 					if (template.isInside)
 					{
 						var dataTypeObject = FindMember(template.xamlObject!, "DataType", XamlConstants.XamlXmlNamespace);
 						if (dataTypeObject?.Value == null)
 						{
-							throw new Exception($"Unable to find x:DataType in enclosing DataTemplate for x:Bind event");
+							throw new Exception("Unable to find x:DataType in enclosing DataTemplate for x:Bind event");
 						}
 
-						var dataTypeSymbol = GetType(dataTypeObject.Value.ToString() ?? "");
-
-						return (
-							$"({member.Member.Name}_{sanitizedEventTarget}_That.Target as {XamlConstants.Types.FrameworkElement})?.DataContext as {dataTypeSymbol.GetFullyQualifiedTypeIncludingGlobal()}",
-
-							// Use of __rootInstance is required to get the top-level DataContext, as it may be changed
-							// in the current visual tree by the user.
-							$"(__rootInstance as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference",
-							FindTargetMethodSymbol(dataTypeSymbol)
-						);
+						return GetType(dataTypeObject.Value.ToString() ?? "");
 					}
-					else if (_xClassName?.Symbol != null)
+					else if (_xClassName?.Symbol is not null)
 					{
-						return (
-							$"{member.Member.Name}_{sanitizedEventTarget}_That.Target as {_xClassName}",
-							$"({eventSource} as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference",
-							FindTargetMethodSymbol(_xClassName.Symbol)
-						);
+						return _xClassName.Symbol;
 					}
 					else
 					{
@@ -3705,10 +3644,19 @@ IMethodSymbol FindTargetMethodSymbol(INamedTypeSymbol? sourceType)
 					}
 				}
 
-				var targetContext = buildTargetContext();
-				var targetMethodHasParameters = targetContext.targetMethod?.Parameters.Any() ?? false;
+				var targetType = GetTargetType(); // The type of the target object onto which the x:Bind path should be resolved
+				var targetInstanceWeakRef = template.isInside
+					// Use of __rootInstance is required to get the top-level DataContext, as it may be changed in the current visual tree by the user.
+					? "(__rootInstance as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference"
+					: $"({targetInstance} as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference";
 
-				EnsureXClassName();
+				var method = ResolveXBindMethod(targetType, path);
+				var invokeTarget = (method.isStatic, template.isInside) switch
+				{
+					(true, _) => method.declaringType.GetFullyQualifiedTypeIncludingGlobal(), // If the method is static, the target onto which the method should be invoked is the declaringType itself
+					(_, true) => $"((target.Target as {XamlConstants.Types.FrameworkElement})?.DataContext as {targetType.GetFullyQualifiedTypeIncludingGlobal()})?",
+					_ => $"(target.Target as {targetType.GetFullyQualifiedTypeIncludingGlobal()})?"
+				};
 
 				var handler = RegisterChildSubclass(
 					$"{parentApply}_{member.Member.Name}_Handler",
@@ -3717,7 +3665,7 @@ public class {{name}}(global::Uno.UI.DataBinding.ManagedWeakReference target)
 							{
 								public void Invoke({{parametersWithType.JoinBy(", ")}})
 								{
-									(target.Target as {{_xClassName}})?.{{eventTarget}}({{(targetMethodHasParameters ? parameters.JoinBy(", ") : "")}});
+									{{invokeTarget}}.{{method.path}}({{(method.symbol.Parameters.Any() ? parameters.JoinBy(", ") : "")}});
 								}
 							}
 						"""));
@@ -3736,15 +3684,13 @@ public void Invoke({{parametersWithType.JoinBy(", ")}})
 									return;
 								}
 
-								{{componentDefinition.MemberName}}.{{member.Member.Name}} += new {{handler}}({{targetContext.weakReference}}).Invoke;
+								{{componentDefinition.MemberName}}.{{member.Member.Name}} += new {{handler}}({{targetInstanceWeakRef}}).Invoke;
 								__is{{name}}d = true;
 							}
 						"""));
 			}
 			else
 			{
-				EnsureXClassName();
-
 				//
 				// Generate a sub-class that uses a weak ref, so the owner is not being held onto by the delegate.
 				// We can use the WeakReferenceProvider to get a self reference to avoid adding the cost of the
@@ -3762,11 +3708,60 @@ public void Invoke({{parametersWithType.JoinBy(", ")}})
 								}
 							}
 						"""));
-				writer.AppendLineIndented($"var {member.Member.Name}_Handler = new {subClass}(({eventSource} as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference);");
+				writer.AppendLineIndented($"var {member.Member.Name}_Handler = new {subClass}(({targetInstance} as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference);");
 				writer.AppendLineIndented($"/* second level */ {closureName}.{member.Member.Name} += {member.Member.Name}_Handler.Invoke;");
 			}
 		}
 
+		private (string path, ITypeSymbol declaringType, IMethodSymbol symbol, bool isStatic) ResolveXBindMethod(INamedTypeSymbol contextType, string path)
+		{
+			if (path.Contains("."))
+			{
+				var rewrittenPath = new StringBuilder();
+				ITypeSymbol currentType = contextType;
+
+				var parts = path.Split('.').ToList();
+				var isStatic = parts.FirstOrDefault()?.Contains(":") ?? false;
+				if (isStatic)
+				{
+					// First part is a type for static method binding and should override the original source type
+					currentType = contextType = GetType(RewriteNamespaces(parts[0]));
+					parts.RemoveAt(0);
+				}
+
+				for (var i = 0; i < parts.Count - 1; i++)
+				{
+					var memberName = RewriteNamespaces(parts[i]);
+					var next = currentType.GetAllMembersWithName(memberName).FirstOrDefault();
+
+					currentType = next switch
+					{
+						IFieldSymbol fs => fs.Type,
+						IPropertySymbol ps => ps.Type,
+						null => throw new InvalidOperationException($"Unable to find member {parts[i]} on type {currentType}"),
+						_ => throw new InvalidOperationException($"The field {next.Name} is not supported for x:Bind event binding")
+					};
+
+					rewrittenPath.Append(memberName);
+					rewrittenPath.Append("?.");
+				}
+
+				var method = currentType.GetFirstMethodWithName(parts.Last(), includeBaseTypes: true)
+					?? throw new InvalidOperationException($"Failed to find {parts.Last()} on {currentType}");
+
+				rewrittenPath.Append(method.Name);
+
+				return (rewrittenPath.ToString(), contextType, method, isStatic);
+			}
+			else
+			{
+				var method = contextType.GetFirstMethodWithName(path, includeBaseTypes: true)
+					?? throw new InvalidOperationException($"Failed to find {path} on {contextType}");
+
+				return (method.Name, contextType, method, false);
+			}
+		}
+
 		/// <summary>
 		/// Build localized properties which have not been set in the xaml.
 		/// </summary>

From 32a646cb61b3bfcf851f335ebc5ccdd6c8e0d783 Mon Sep 17 00:00:00 2001
From: David <github.site@torick.net>
Date: Mon, 3 Feb 2025 12:53:13 -0500
Subject: [PATCH 4/5] chore: Apply review suggestions

---
 .../Uno.UI.SourceGenerators/XamlGenerator/NameScope.cs      | 2 +-
 .../XamlGenerator/XamlFileGenerator.cs                      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/NameScope.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/NameScope.cs
index 2a29c18f010e..7717ded3f959 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/NameScope.cs
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/NameScope.cs
@@ -46,7 +46,7 @@ internal record NameScope(ImmutableStack<NameScope> Parents, string FileUniqueId
 
 		public Dictionary<string, Subclass> Subclasses { get; } = [];
 
-		public List<Action<IIndentedStringBuilder>> Subclasses2 { get; } = [];
+		public List<Action<IIndentedStringBuilder>> SubclassBuilders { get; } = [];
 
 		public List<ComponentDefinition> Components { get; } = [];
 
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
index ac2c631b42e5..7393b0936452 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
@@ -899,7 +899,7 @@ private void BuildChildSubclasses(IIndentedStringBuilder writer, bool isTopLevel
 			using var _ = isTopLevel ? writer.BlockInvariant($"namespace {ns}") : null;
 
 			// If _isHotReloadEnabled we generate it anyway so we can remove sub-classes without causing rude edit.
-			if (!_isHotReloadEnabled && CurrentScope.Subclasses is not { Count: > 0 } && CurrentScope.Subclasses2 is not { Count: > 0 })
+			if (!_isHotReloadEnabled && CurrentScope.Subclasses is not { Count: > 0 } && CurrentScope.SubclassBuilders is not { Count: > 0 })
 			{
 				return;
 			}
@@ -980,7 +980,7 @@ private void BuildChildSubclasses(IIndentedStringBuilder writer, bool isTopLevel
 					}
 				}
 
-				foreach (var subClass in CurrentScope.Subclasses2)
+				foreach (var subClass in CurrentScope.SubclassBuilders)
 				{
 					subClass(writer);
 					writer.AppendLine();
@@ -4026,7 +4026,7 @@ private void RegisterChildSubclass(string name, XamlMemberDefinition owner, stri
 		private string RegisterChildSubclass(string name, Action<string, IIndentedStringBuilder> build)
 		{
 			var fullName = $"{CurrentScope.SubClassesRoot}.{name}";
-			CurrentScope.Subclasses2.Add(writer => build(name, writer));
+			CurrentScope.SubclassBuilders.Add(writer => build(name, writer));
 
 			return fullName;
 		}

From cf72c95e85f052d0f655d83ec31afc35ea85dec7 Mon Sep 17 00:00:00 2001
From: David <github.site@torick.net>
Date: Mon, 3 Feb 2025 12:56:46 -0500
Subject: [PATCH 5/5] fix: Make sure to re-subscribe when x:load goes back to
 false

---
 ...inPage_d6cd66944958ced0c513e0a04797b51d.cs | 54 ++++++++++++-------
 .../XamlGenerator/XamlFileGenerator.cs        | 23 +++++++-
 2 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TIM/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TIM/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs
index e845b73f36d2..4fa17b2ac5dc 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TIM/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TIM/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs
@@ -135,10 +135,16 @@ private void InitializeComponent()
 			private bool __is__ApplyMethod_0_Click_Initialized ;
 		
 			[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-			private void __ApplyMethod_0_Click_Initialize()
+			private void __ApplyMethod_0_Click_Initialize(bool init)
 			{
 				if (__is__ApplyMethod_0_Click_Initialized || _component_0 is null)
 				{
+					if (!init)
+					{
+						__is__ApplyMethod_0_Click_Initialized = false;
+						// Note: _component_0 will be collected, no needs to unsubscribe
+					}
+					
 					return;
 				}
 		
@@ -149,10 +155,16 @@ private void __ApplyMethod_0_Click_Initialize()
 			private bool __is__ApplyMethod_1_Click_Initialized ;
 		
 			[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-			private void __ApplyMethod_1_Click_Initialize()
+			private void __ApplyMethod_1_Click_Initialize(bool init)
 			{
 				if (__is__ApplyMethod_1_Click_Initialized || _component_1 is null)
 				{
+					if (!init)
+					{
+						__is__ApplyMethod_1_Click_Initialized = false;
+						// Note: _component_1 will be collected, no needs to unsubscribe
+					}
+					
 					return;
 				}
 		
@@ -163,10 +175,16 @@ private void __ApplyMethod_1_Click_Initialize()
 			private bool __is__ApplyMethod_2_Click_Initialized ;
 		
 			[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-			private void __ApplyMethod_2_Click_Initialize()
+			private void __ApplyMethod_2_Click_Initialize(bool init)
 			{
 				if (__is__ApplyMethod_2_Click_Initialized || _component_2 is null)
 				{
+					if (!init)
+					{
+						__is__ApplyMethod_2_Click_Initialized = false;
+						// Note: _component_2 will be collected, no needs to unsubscribe
+					}
+					
 					return;
 				}
 		
@@ -186,7 +204,7 @@ public class ApplyMethod_0_Click_Handler(global::Uno.UI.DataBinding.ManagedWeakR
 				{
 					public void Invoke(object sender, global::Microsoft.UI.Xaml.RoutedEventArgs e)
 					{
-						(target.Target as global::TestRepro.MainPage)?.P1.Button_Click(sender, e);
+						(target.Target as global::TestRepro.MainPage)?.P1?.Button_Click(sender, e);
 					}
 				}
 
@@ -194,7 +212,7 @@ public class ApplyMethod_1_Click_Handler(global::Uno.UI.DataBinding.ManagedWeakR
 				{
 					public void Invoke(object sender, global::Microsoft.UI.Xaml.RoutedEventArgs e)
 					{
-						(target.Target as global::TestRepro.MainPage)?.P2.Button_Click(sender, e);
+						(target.Target as global::TestRepro.MainPage)?.P2?.Button_Click(sender, e);
 					}
 				}
 
@@ -202,7 +220,7 @@ public class ApplyMethod_2_Click_Handler(global::Uno.UI.DataBinding.ManagedWeakR
 				{
 					public void Invoke(object sender, global::Microsoft.UI.Xaml.RoutedEventArgs e)
 					{
-						(target.Target as global::TestRepro.MainPage)?.P3.Button_Click(sender, e);
+						(target.Target as global::TestRepro.MainPage)?.P3?.Button_Click(sender, e);
 					}
 				}
 
@@ -289,20 +307,20 @@ void IMainPage_Bindings.Update()
 			{
 				var owner = Owner;
 				owner._component_0.ApplyXBind();
-				owner.__ApplyMethod_0_Click_Initialize();
-				owner.__ApplyMethod_1_Click_Initialize();
-				owner.__ApplyMethod_2_Click_Initialize();
+				owner.__ApplyMethod_0_Click_Initialize(true);
+				owner.__ApplyMethod_1_Click_Initialize(true);
+				owner.__ApplyMethod_2_Click_Initialize(true);
 				owner._component_1.ApplyXBind();
-				owner.__ApplyMethod_0_Click_Initialize();
-				owner.__ApplyMethod_1_Click_Initialize();
-				owner.__ApplyMethod_2_Click_Initialize();
+				owner.__ApplyMethod_0_Click_Initialize(true);
+				owner.__ApplyMethod_1_Click_Initialize(true);
+				owner.__ApplyMethod_2_Click_Initialize(true);
 				owner._component_2.ApplyXBind();
-				owner.__ApplyMethod_0_Click_Initialize();
-				owner.__ApplyMethod_1_Click_Initialize();
-				owner.__ApplyMethod_2_Click_Initialize();
-				owner.__ApplyMethod_0_Click_Initialize();
-				owner.__ApplyMethod_1_Click_Initialize();
-				owner.__ApplyMethod_2_Click_Initialize();
+				owner.__ApplyMethod_0_Click_Initialize(true);
+				owner.__ApplyMethod_1_Click_Initialize(true);
+				owner.__ApplyMethod_2_Click_Initialize(true);
+				owner.__ApplyMethod_0_Click_Initialize(true);
+				owner.__ApplyMethod_1_Click_Initialize(true);
+				owner.__ApplyMethod_2_Click_Initialize(true);
 			}
 			void IMainPage_Bindings.UpdateResources()
 			{
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
index 7393b0936452..b5123c7114a4 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
@@ -1100,7 +1100,15 @@ private void BuildxBindEventHandlerInitializers(IIndentedStringBuilder writer, L
 		{
 			foreach (var xBindEventHandler in xBindEventsHandlers)
 			{
-				writer.AppendLineIndented($"{prefix}{xBindEventHandler.MethodName}();");
+				writer.AppendLineIndented($"{prefix}{xBindEventHandler.MethodName}(true);");
+			}
+		}
+
+		private void BuildxBindEventHandlerUnInitializers(IIndentedStringBuilder writer, List<XBindEventInitializerDefinition> xBindEventsHandlers, string prefix = "")
+		{
+			foreach (var xBindEventHandler in xBindEventsHandlers)
+			{
+				writer.AppendLineIndented($"{prefix}{xBindEventHandler.MethodName}(false);");
 			}
 		}
 
@@ -3677,10 +3685,16 @@ public void Invoke({{parametersWithType.JoinBy(", ")}})
 							{{Field("bool", $"__is{name}d")}}
 
 							[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-							private void {{name}}()
+							private void {{name}}(bool init)
 							{
 								if (__is{{name}}d || {{componentDefinition.MemberName}} is null)
 								{
+									if (!init)
+									{
+										__is{{name}}d = false;
+										// Note: {{componentDefinition.MemberName}} will be collected, no needs to unsubscribe
+									}
+									
 									return;
 								}
 
@@ -6514,6 +6528,11 @@ private IEnumerable<XamlObjectDefinition> EnumerateSubElements(IEnumerable<XamlO
 											{
 												innerWriter.AppendLineIndented($"that._{elementName}Subject.ElementInstance = null;");
 											}
+
+											if (CurrentXLoadScope is not null)
+											{
+												BuildxBindEventHandlerUnInitializers(innerWriter, CurrentXLoadScope.xBindEventsHandlers, "that.");
+											}
 										}
 									}
 								}