D-R-R
diff --git a/‎src/SamplesApp/UITests.Shared/Windows_UI_Xaml/FrameworkElementTests/XamlEvent_Leak_UserControl.xaml‎
Lines changed: 4 additions & 1 deletion b/‎src/SamplesApp/UITests.Shared/Windows_UI_Xaml/FrameworkElementTests/XamlEvent_Leak_UserControl.xaml‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎src/Uno.UI/UI/Xaml/NameScope.cs‎
Lines changed: 8 additions & 10 deletions b/‎src/Uno.UI/UI/Xaml/NameScope.cs‎
Lines changed: 8 additions & 10 deletions
@@ -10,6 +10,9 @@
     d:DesignWidth="400">
 
     <Grid>
-		<Button Content="Button With Handler" Click="Button_Click" />
+		<!-- A named button with an event must not leak -->
+		<Button x:Name="namedButton"
+				Content="Button With Handler"
+				Click="Button_Click" />
 	</Grid>
 </UserControl>
@@ -2,37 +2,35 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text;
+using Uno.UI.DataBinding;
 using Windows.UI.Xaml.Markup;
 
 namespace Windows.UI.Xaml
 {
 	[EditorBrowsable(EditorBrowsableState.Never)]
-	public class NameScope :
-		Dictionary<string, object>,
-		INameScope,
-		IDictionary<string, object>,
-		ICollection<KeyValuePair<string, object>>,
-		IEnumerable<KeyValuePair<string, object>>
+	public class NameScope : INameScope
 	{
+		private Dictionary<string, ManagedWeakReference> _names = new Dictionary<string, ManagedWeakReference>();
+
 		public NameScope()
 		{
 		}
 
 		public object FindName(string name)
 		{
-			return TryGetValue(name, out var element)
-				? element
+			return _names.TryGetValue(name, out var element)
+				? element.Target
 				: null;
 		}
 
 		public void RegisterName(string name, object scopedElement)
 		{
-			Add(name, scopedElement);
+			_names.Add(name, WeakReferencePool.RentWeakReference(this, scopedElement));
 		}
 
 		public void UnregisterName(string name)
 		{
-			Remove(name);
+			_names.Remove(name);
 		}
 
 		#region NameScope attached property
Original file line number	Diff line number	Diff line change
`@@ -2,37 +2,35 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.ComponentModel;`
`4`	`4`	`using System.Text;`
	`5`	`+using Uno.UI.DataBinding;`
`5`	`6`	`using Windows.UI.Xaml.Markup;`
`6`	`7`
`7`	`8`	`namespace Windows.UI.Xaml`
`8`	`9`	`{`
`9`	`10`	`[EditorBrowsable(EditorBrowsableState.Never)]`
`10`		`- public class NameScope :`
`11`		`- Dictionary<string, object>,`
`12`		`- INameScope,`
`13`		`- IDictionary<string, object>,`
`14`		`- ICollection<KeyValuePair<string, object>>,`
`15`		`- IEnumerable<KeyValuePair<string, object>>`
	`11`	`+ public class NameScope : INameScope`
`16`	`12`	`{`
	`13`	`+ private Dictionary<string, ManagedWeakReference> _names = new Dictionary<string, ManagedWeakReference>();`
	`14`	`+`
`17`	`15`	`public NameScope()`
`18`	`16`	`{`
`19`	`17`	`}`
`20`	`18`
`21`	`19`	`public object FindName(string name)`
`22`	`20`	`{`
`23`		`- return TryGetValue(name, out var element)`
`24`		`- ? element`
	`21`	`+ return _names.TryGetValue(name, out var element)`
	`22`	`+ ? element.Target`
`25`	`23`	`: null;`
`26`	`24`	`}`
`27`	`25`
`28`	`26`	`public void RegisterName(string name, object scopedElement)`
`29`	`27`	`{`
`30`		`- Add(name, scopedElement);`
	`28`	`+ _names.Add(name, WeakReferencePool.RentWeakReference(this, scopedElement));`
`31`	`29`	`}`
`32`	`30`
`33`	`31`	`public void UnregisterName(string name)`
`34`	`32`	`{`
`35`		`- Remove(name);`
	`33`	`+ _names.Remove(name);`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`#region NameScope attached property`