Remove circular reference from ShapeDrawable

eng/pipelines/common/device-tests.yml

@@ -29,7 +29,7 @@ stages:
         clean: all
       displayName: "Android emulator tests"
       pool: ${{ parameters.androidPool }}
-      timeoutInMinutes: 240
+      timeoutInMinutes: 60
       strategy:
         matrix:
           # create all the variables used for the matrix

src/Controls/tests/DeviceTests/Elements/BoxView/BoxViewTests.iOS.cs

@@ -1,14 +1,50 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Graphics.Platform;
 using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Platform;
+using Microsoft.Maui.Controls;
+using System.Reflection;
+using Xunit;
 
 namespace Microsoft.Maui.DeviceTests
 {
 	public partial class BoxViewTests
 	{
 		MauiShapeView GetNativeBoxView(ShapeViewHandler boxViewHandler) =>
 			boxViewHandler.PlatformView;
+
+		[Fact(DisplayName = "ShapeView Parts Keep Around")]
+		public async Task ShapeViewPartsKeepAround()
+		{
+			var boxView = new BoxView()
+			{
+				HeightRequest = 100,
+				WidthRequest = 200
+			};
+
+			await AttachAndRun<ShapeViewHandler>(boxView, async handler =>
+			{
+				var shapeView = GetNativeBoxView(handler);
+				var renderer = (DirectRenderer)shapeView.Renderer;
+
+				GC.Collect();
+				GC.WaitForPendingFinalizers();
+				await Task.Yield();
+
+				GC.Collect();
+				GC.WaitForPendingFinalizers();
+				await Task.Yield();
+
+				Assert.NotNull(shapeView.Renderer);
+				Assert.NotNull(shapeView.Drawable);
+				Assert.NotNull(renderer.Drawable);
+
+				var flags = BindingFlags.NonPublic | BindingFlags.Instance;
+				var graphicsView = renderer.GetType().GetField("_graphicsView", flags)?.GetValue(renderer) as PlatformGraphicsView;
+				Assert.NotNull(graphicsView);
+			});
+		}
 	}
 }

src/Core/src/Graphics/ShapeDrawable.cs

@@ -1,9 +1,11 @@
-using System.Numerics;
+using System;
+using System.Numerics;
 
 namespace Microsoft.Maui.Graphics
 {
 	public class ShapeDrawable : IDrawable
 	{
+		WeakReference<IShapeView>? _shapeView;
 		public ShapeDrawable()
 		{
 
@@ -14,7 +16,21 @@ public ShapeDrawable(IShapeView? shape)
 			UpdateShapeView(shape);
 		}
 
-		internal IShapeView? ShapeView { get; set; }
+		internal IShapeView? ShapeView 
+		{ 
+			get => _shapeView is not null && _shapeView.TryGetTarget(out var d) ? d : null;
+			set
+			{
+				if (value is null)
+				{
+					_shapeView = null;
+					return;
+				}
+
+				_shapeView = new(value);
+			}
+		}
+
 		internal WindingMode WindingMode { get; set; }
 		internal Matrix3x2? RenderTransform { get; set; }
 

src/Core/tests/DeviceTests.Shared/HandlerTests/TestBase.cs

@@ -36,6 +36,7 @@ protected static async Task WaitForGC()
 			await Task.Delay(10);
 			GC.Collect();
 			GC.WaitForPendingFinalizers();
+			await Task.Delay(10);
 		}
 	}
 }

src/Core/tests/DeviceTests/Memory/MemoryTestTypes.cs

@@ -9,7 +9,9 @@ public class MemoryTestTypes : IEnumerable<object[]>
 	{
 		public IEnumerator<object[]> GetEnumerator()
 		{
+#if !ANDROID
 			yield return new object[] { (typeof(DatePickerStub), typeof(DatePickerHandler)) };
+#endif
 			yield return new object[] { (typeof(EditorStub), typeof(EditorHandler)) };
 			yield return new object[] { (typeof(EntryStub), typeof(EntryHandler)) };
 			yield return new object[] { (typeof(SearchBarStub), typeof(SearchBarHandler)) };

src/Graphics/src/Graphics/Platforms/iOS/PlatformGraphicsView.cs

@@ -8,9 +8,9 @@ namespace Microsoft.Maui.Graphics.Platform
 	[Register(nameof(PlatformGraphicsView))]
 	public class PlatformGraphicsView : UIView
 	{
-		private WeakReference<IGraphicsRenderer> _renderer;
+		private IGraphicsRenderer _renderer;
 		private CGColorSpace _colorSpace;
-		private WeakReference<IDrawable> _drawable;
+		private IDrawable _drawable;
 		private CGRect _lastBounds;
 
 		public PlatformGraphicsView(CGRect frame, IDrawable drawable = null, IGraphicsRenderer renderer = null) : base(frame)
@@ -34,34 +34,32 @@ public PlatformGraphicsView(IntPtr aPtr) : base(aPtr)
 
 		public IGraphicsRenderer Renderer
 		{
-			get => _renderer is not null && _renderer.TryGetTarget(out var r) ? r : null;
+			get => _renderer;
 
 			set
 			{
-				var renderer = Renderer;
-				if (renderer != null)
+				if (_renderer != null)
 				{
-					renderer.Drawable = null;
-					renderer.GraphicsView = null;
-					renderer.Dispose();
+					_renderer.Drawable = null;
+					_renderer.GraphicsView = null;
+					_renderer.Dispose();
 				}
 
-				renderer = value ?? new DirectRenderer();
-				_renderer = new(renderer);
+				_renderer = value ?? new DirectRenderer();
 
-				renderer.GraphicsView = this;
-				renderer.Drawable = Drawable;
+				_renderer.GraphicsView = this;
+				_renderer.Drawable = Drawable;
 				var bounds = Bounds;
-				renderer.SizeChanged((float)bounds.Width, (float)bounds.Height);
+				_renderer.SizeChanged((float)bounds.Width, (float)bounds.Height);
 			}
 		}
 
 		public IDrawable Drawable
 		{
-			get => _drawable is not null && _drawable.TryGetTarget(out var d) ? d : null;
+			get => _drawable;
 			set
 			{
-				_drawable = new(value);
+				_drawable = value;
 				if (Renderer is IGraphicsRenderer renderer)
 				{
 					renderer.Drawable = value;