From 20605373ad53b2ac37f790a71b93e5837525ef3b Mon Sep 17 00:00:00 2001
From: Tim Johnson <tjohnson@aptos.com>
Date: Sun, 11 Oct 2020 00:19:14 -0400
Subject: [PATCH 1/6] Fixes #6742 The Item created to measure was never
 removed, causing memory leak until the page is closed.

---
 .../Issue6742.xaml                            |  31 +++
 .../Issue6742.xaml.cs                         | 183 ++++++++++++++++++
 ...rin.Forms.Controls.Issues.Shared.projitems |  10 +
 .../Renderers/ListViewRenderer.cs             |  13 +-
 4 files changed, 234 insertions(+), 3 deletions(-)
 create mode 100644 Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6742.xaml
 create mode 100644 Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6742.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6742.xaml b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6742.xaml
new file mode 100644
index 00000000000..02cc8d6a058
--- /dev/null
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6742.xaml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<controls:TestContentPage xmlns:controls="clr-namespace:Xamarin.Forms.Controls"
+             xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:d="http://xamarin.com/schemas/2014/forms/design"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"
+             x:Class="Xamarin.Forms.Controls.Issues.Issue6742">
+    <StackLayout>
+        <Button AutomationId="Issue6742Refresh" Clicked="RefreshItems" Text="Refresh" BackgroundColor="Cyan"/>
+
+        <Label Text="Tap Refresh button a few times." />
+        <Label AutomationId="Issue6742Label" Text="{Binding DisposeString}"/>
+        <Label AutomationId="Issue6742Mem" Text="{Binding TotalMemory}"/>
+
+        <ListView
+            HasUnevenRows="True"
+            ItemsSource="{Binding ItemGroups}"
+            IsGroupingEnabled="True"
+            GroupDisplayBinding="{Binding GroupName}">
+            <ListView.ItemTemplate>
+                <DataTemplate>
+                    <ViewCell>
+                        <StackLayout Margin="20">
+                            <Label Text="{Binding Name}" />
+                        </StackLayout>
+                    </ViewCell>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
+    </StackLayout>
+</controls:TestContentPage>
\ No newline at end of file
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6742.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6742.xaml.cs
new file mode 100644
index 00000000000..9b3f7e3eaf3
--- /dev/null
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6742.xaml.cs
@@ -0,0 +1,183 @@
+using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.Internals;
+using System;
+using System.Collections.ObjectModel;
+using System.Runtime.CompilerServices;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+#if UITEST
+using Xamarin.UITest;
+using NUnit.Framework;
+using Xamarin.Forms.Core.UITests;
+#endif
+
+namespace Xamarin.Forms.Controls.Issues
+{
+#if UITEST
+	[Category(UITestCategories.ManualReview)]
+#endif
+	[Preserve(AllMembers = true)]
+	[Issue(IssueTracker.Github, 6742, "Memory leak in ListView with uneven rows on IOS", PlatformAffected.Default)]
+	public partial class Issue6742 : TestContentPage
+	{
+		public Issue6742()
+		{
+#if APP
+			InitializeComponent();
+#endif
+			BindingContext = viewModel = new ViewModelIssue6742();
+
+		}
+		protected override void Init()
+		{
+
+		}
+		ViewModelIssue6742 viewModel;
+		IList<WeakReference<ModelIssue6742>> _weakList = new List<WeakReference<ModelIssue6742>>();
+		private void RefreshItems(object sender, EventArgs e)
+		{
+			foreach (var item in this.viewModel.ItemGroups)
+			{
+				item.Clear();
+			}
+			this.viewModel.ItemGroups.Clear();
+
+			GC.Collect();
+			GC.WaitForPendingFinalizers();
+			GC.Collect();
+
+			CleanWeakList(_weakList);
+			viewModel.DisposeString = $"{_weakList.Count} object(s) alive";
+
+			string report = $"MEMORY:{GC.GetTotalMemory(true)}";
+			viewModel.TotalMemory = report;
+
+			var g1 = new ModelIssue6742Group("Group 1")
+			{
+				new ModelIssue6742("first", viewModel),
+				new ModelIssue6742("second", viewModel),
+			};
+
+			_weakList.Add(new WeakReference<ModelIssue6742>(g1[0]));
+			_weakList.Add(new WeakReference<ModelIssue6742>(g1[1]));
+
+			this.viewModel.ItemGroups.Add(g1);
+
+			var g2 = new ModelIssue6742Group("Group 2")
+			{
+				new ModelIssue6742("third", viewModel),
+				new ModelIssue6742("fourth", viewModel),
+			};
+
+			_weakList.Add(new WeakReference<ModelIssue6742>(g2[0]));
+			_weakList.Add(new WeakReference<ModelIssue6742>(g2[1]));
+
+			this.viewModel.ItemGroups.Add(g2);
+
+			var g3 = new ModelIssue6742Group("Group 3")
+			{
+				new ModelIssue6742("fifth", viewModel),
+				new ModelIssue6742("sixth", viewModel),
+				new ModelIssue6742("seventh", viewModel),
+			};
+
+			_weakList.Add(new WeakReference<ModelIssue6742>(g3[0]));
+			_weakList.Add(new WeakReference<ModelIssue6742>(g3[1]));
+			_weakList.Add(new WeakReference<ModelIssue6742>(g3[2]));
+
+			this.viewModel.ItemGroups.Add(g3);
+		}
+
+		private void CleanWeakList(IList<WeakReference<ModelIssue6742>> weakList)
+		{
+			ModelIssue6742 item;
+			for (int i = weakList.Count-1; i >= 0; i--)
+			{
+				if (!weakList[i].TryGetTarget(out item))
+				{
+					weakList.RemoveAt(i);
+				}
+			}
+		}
+
+#if UITEST
+		[Test]
+		public void Issue6742Test()
+		{
+			RunningApp.WaitForElement("Issue6742Refresh");
+			RunningApp.Tap("Issue6742Refresh");
+			RunningApp.Wait(500);
+			RunningApp.Tap("Issue6742Refresh");
+			RunningApp.WaitForElement(p => p.Text = "Good, its disposed!");
+			
+		}
+#endif
+	}
+
+	[Preserve(AllMembers = true)]
+	public class ViewModelIssue6742 : INotifyPropertyChanged
+	{
+		public ObservableCollection<ModelIssue6742Group> ItemGroups { get; set; } = new ObservableCollection<ModelIssue6742Group>();
+		public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
+
+		private void NotifyPropertyChanged([CallerMemberName] string propertyName = null)
+		{
+			this.PropertyChanged?.Invoke(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
+		}
+
+
+		string _DisposeString;
+		public string DisposeString
+		{
+			get { return _DisposeString; } 
+			set
+			{
+				_DisposeString = value;
+				NotifyPropertyChanged();
+			}
+		}
+
+		string _totalMemory;
+		public string TotalMemory 
+		{
+			get => _totalMemory;
+			set
+			{
+				_totalMemory = value;
+				NotifyPropertyChanged();
+			}
+		}
+
+		public ViewModelIssue6742()
+		{
+
+		}
+	}
+
+	[Preserve(AllMembers = true)]
+	public class ModelIssue6742Group : ObservableCollection<ModelIssue6742>
+	{
+		public ModelIssue6742Group(string name)
+		{
+			GroupName = name;
+		}
+		public string GroupName { get; set; }
+
+	}
+
+	[Preserve(AllMembers = true)]
+	public class ModelIssue6742
+	{
+		ViewModelIssue6742 _model;
+		bool _disposedValue;
+
+		public ModelIssue6742(string name, ViewModelIssue6742 model)
+		{
+			_model = model;
+			Name = name;
+		}
+		public string Name { get; set; }
+
+	}
+}
\ No newline at end of file
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
index 401138aee94..fec9029ac88 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
@@ -35,6 +35,9 @@
       <DependentUpon>Issue11794.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Issue11769.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Issue6742.xaml.cs">
+      <DependentUpon>Issue6742.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Issue8613.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue9137.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue8691.cs" />
@@ -2408,4 +2411,11 @@
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue6742.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+</Project>
 </Project>
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs
index 79c528a506c..e1c761db74d 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs
@@ -858,6 +858,7 @@ nfloat GetEstimatedRowHeight(UITableView table)
 
 				var firstCell = templatedItems.ActivateContent(0, item);
 
+				nfloat returnValue;
 				// Let's skip this optimization for grouped lists. It will likely cause more trouble than it's worth.
 				if (firstCell?.Height > 0 && !isGroupingEnabled)
 				{
@@ -867,10 +868,16 @@ nfloat GetEstimatedRowHeight(UITableView table)
 					// In this case, we will cache the specified cell heights asynchronously, which will be returned one time on
 					// table load by EstimatedHeight.
 
-					return 0;
+					returnValue= 0;
 				}
-
-				return CalculateHeightForCell(table, firstCell);
+				else
+				{
+					returnValue = CalculateHeightForCell(table, firstCell);
+				}
+				//_prototype.DisposeRendererAndChildren();
+				//_prototype = null;
+				TemplatedItemsView.UnhookContent(firstCell);
+				return returnValue;
 			}
 
 			internal override void InvalidatingPrototypicalCellCache()

From 5282e31dffc330b4d7045aca0f0fa3e004771d3b Mon Sep 17 00:00:00 2001
From: Tim Johnson <tjohnson@aptos.com>
Date: Sun, 11 Oct 2020 00:33:09 -0400
Subject: [PATCH 2/6] cleanup

---
 .../Xamarin.Forms.ControlGallery.iOS.csproj            | 10 ++++++++--
 .../Renderers/ListViewRenderer.cs                      |  3 +--
 Xamarin.Forms.sln                                      |  2 --
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
index 4aca2b35c79..a1a770a15c0 100644
--- a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
+++ b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
@@ -27,8 +27,8 @@
     <ConsolePause>false</ConsolePause>
     <MtouchArch>i386, x86_64</MtouchArch>
     <MtouchLink>SdkOnly</MtouchLink>
-    <MtouchDebug>True</MtouchDebug>
-    <MtouchProfiling>False</MtouchProfiling>
+    <MtouchDebug>true</MtouchDebug>
+    <MtouchProfiling>false</MtouchProfiling>
     <MtouchFastDev>False</MtouchFastDev>
     <MtouchEnableGenericValueTypeSharing>True</MtouchEnableGenericValueTypeSharing>
     <MtouchUseLlvm>False</MtouchUseLlvm>
@@ -42,6 +42,7 @@
     <CodesignKey>iPhone Developer</CodesignKey>
     <CodesignProvision />
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DeviceSpecificBuild>true</DeviceSpecificBuild>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>
@@ -440,4 +441,9 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties XamarinHotReloadWrongLinkerErrorInfoBarXamarinFormsControlGalleryiOSHideInfoBar="True" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs
index e1c761db74d..9e600a10773 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs
@@ -874,8 +874,7 @@ nfloat GetEstimatedRowHeight(UITableView table)
 				{
 					returnValue = CalculateHeightForCell(table, firstCell);
 				}
-				//_prototype.DisposeRendererAndChildren();
-				//_prototype = null;
+
 				TemplatedItemsView.UnhookContent(firstCell);
 				return returnValue;
 			}
diff --git a/Xamarin.Forms.sln b/Xamarin.Forms.sln
index e2e2637e9d5..18b5cd0c8cc 100644
--- a/Xamarin.Forms.sln
+++ b/Xamarin.Forms.sln
@@ -153,12 +153,10 @@ Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{0a39a74b-6f7a-4d41-84f2-b0ccdce899df}*SharedItemsImports = 4
 		Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{0a39a74b-6f7a-4d41-84f2-b0ccdce899df}*SharedItemsImports = 4
-		Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{0f0db9cc-ea65-429c-9363-38624bf8f49c}*SharedItemsImports = 13
 		Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{9db0cabb-24cc-4538-88ec-6e0a0fe40248}*SharedItemsImports = 4
 		Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{9db0cabb-24cc-4538-88ec-6e0a0fe40248}*SharedItemsImports = 4
 		Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{a34ebe01-25bf-4e69-a2dc-2288dc625541}*SharedItemsImports = 4
 		Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{a34ebe01-25bf-4e69-a2dc-2288dc625541}*SharedItemsImports = 4
-		Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1}*SharedItemsImports = 5
 		Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{e175485b-3c8c-47d7-8dd5-f7fed627eb25}*SharedItemsImports = 13
 		Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{eadd8100-b3ae-4a31-92c4-267a64a1c6eb}*SharedItemsImports = 4
 		Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{eadd8100-b3ae-4a31-92c4-267a64a1c6eb}*SharedItemsImports = 4

From 482e332215299dd88da464936be221a0f9c38407 Mon Sep 17 00:00:00 2001
From: Tim Johnson <tjohnson@aptos.com>
Date: Sun, 11 Oct 2020 08:18:09 -0400
Subject: [PATCH 3/6] cleanup, remove UITEST code

---
 .../Issue6742.xaml.cs                         | 41 ++++---------------
 1 file changed, 9 insertions(+), 32 deletions(-)

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6742.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6742.xaml.cs
index 9b3f7e3eaf3..5c3e0207237 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6742.xaml.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6742.xaml.cs
@@ -1,22 +1,13 @@
-using Xamarin.Forms.CustomAttributes;
-using Xamarin.Forms.Internals;
-using System;
+using System;
 using System.Collections.ObjectModel;
 using System.Runtime.CompilerServices;
 using System.ComponentModel;
 using System.Collections.Generic;
-
-#if UITEST
-using Xamarin.UITest;
-using NUnit.Framework;
-using Xamarin.Forms.Core.UITests;
-#endif
+using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.Internals;
 
 namespace Xamarin.Forms.Controls.Issues
 {
-#if UITEST
-	[Category(UITestCategories.ManualReview)]
-#endif
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Github, 6742, "Memory leak in ListView with uneven rows on IOS", PlatformAffected.Default)]
 	public partial class Issue6742 : TestContentPage
@@ -41,7 +32,7 @@ private void RefreshItems(object sender, EventArgs e)
 			{
 				item.Clear();
 			}
-			this.viewModel.ItemGroups.Clear();
+			viewModel.ItemGroups.Clear();
 
 			GC.Collect();
 			GC.WaitForPendingFinalizers();
@@ -62,7 +53,7 @@ private void RefreshItems(object sender, EventArgs e)
 			_weakList.Add(new WeakReference<ModelIssue6742>(g1[0]));
 			_weakList.Add(new WeakReference<ModelIssue6742>(g1[1]));
 
-			this.viewModel.ItemGroups.Add(g1);
+			viewModel.ItemGroups.Add(g1);
 
 			var g2 = new ModelIssue6742Group("Group 2")
 			{
@@ -73,7 +64,7 @@ private void RefreshItems(object sender, EventArgs e)
 			_weakList.Add(new WeakReference<ModelIssue6742>(g2[0]));
 			_weakList.Add(new WeakReference<ModelIssue6742>(g2[1]));
 
-			this.viewModel.ItemGroups.Add(g2);
+			viewModel.ItemGroups.Add(g2);
 
 			var g3 = new ModelIssue6742Group("Group 3")
 			{
@@ -86,7 +77,7 @@ private void RefreshItems(object sender, EventArgs e)
 			_weakList.Add(new WeakReference<ModelIssue6742>(g3[1]));
 			_weakList.Add(new WeakReference<ModelIssue6742>(g3[2]));
 
-			this.viewModel.ItemGroups.Add(g3);
+			viewModel.ItemGroups.Add(g3);
 		}
 
 		private void CleanWeakList(IList<WeakReference<ModelIssue6742>> weakList)
@@ -100,19 +91,6 @@ private void CleanWeakList(IList<WeakReference<ModelIssue6742>> weakList)
 				}
 			}
 		}
-
-#if UITEST
-		[Test]
-		public void Issue6742Test()
-		{
-			RunningApp.WaitForElement("Issue6742Refresh");
-			RunningApp.Tap("Issue6742Refresh");
-			RunningApp.Wait(500);
-			RunningApp.Tap("Issue6742Refresh");
-			RunningApp.WaitForElement(p => p.Text = "Good, its disposed!");
-			
-		}
-#endif
 	}
 
 	[Preserve(AllMembers = true)]
@@ -123,7 +101,7 @@ public class ViewModelIssue6742 : INotifyPropertyChanged
 
 		private void NotifyPropertyChanged([CallerMemberName] string propertyName = null)
 		{
-			this.PropertyChanged?.Invoke(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
+			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 		}
 
 
@@ -178,6 +156,5 @@ public ModelIssue6742(string name, ViewModelIssue6742 model)
 			Name = name;
 		}
 		public string Name { get; set; }
-
 	}
-}
\ No newline at end of file
+}

From 23b1e2c8d50a6d350fc063b876dd77573dc49143 Mon Sep 17 00:00:00 2001
From: Tim Johnson <tjohnson@aptos.com>
Date: Sun, 11 Oct 2020 08:26:57 -0400
Subject: [PATCH 4/6] remove commented code

---
 .../Xamarin.Forms.ControlGallery.iOS.csproj            | 10 ++--------
 Xamarin.Forms.sln                                      |  2 ++
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
index a1a770a15c0..4aca2b35c79 100644
--- a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
+++ b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
@@ -27,8 +27,8 @@
     <ConsolePause>false</ConsolePause>
     <MtouchArch>i386, x86_64</MtouchArch>
     <MtouchLink>SdkOnly</MtouchLink>
-    <MtouchDebug>true</MtouchDebug>
-    <MtouchProfiling>false</MtouchProfiling>
+    <MtouchDebug>True</MtouchDebug>
+    <MtouchProfiling>False</MtouchProfiling>
     <MtouchFastDev>False</MtouchFastDev>
     <MtouchEnableGenericValueTypeSharing>True</MtouchEnableGenericValueTypeSharing>
     <MtouchUseLlvm>False</MtouchUseLlvm>
@@ -42,7 +42,6 @@
     <CodesignKey>iPhone Developer</CodesignKey>
     <CodesignProvision />
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DeviceSpecificBuild>true</DeviceSpecificBuild>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>
@@ -441,9 +440,4 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties XamarinHotReloadWrongLinkerErrorInfoBarXamarinFormsControlGalleryiOSHideInfoBar="True" />
-    </VisualStudio>
-  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Xamarin.Forms.sln b/Xamarin.Forms.sln
index 18b5cd0c8cc..e2e2637e9d5 100644
--- a/Xamarin.Forms.sln
+++ b/Xamarin.Forms.sln
@@ -153,10 +153,12 @@ Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{0a39a74b-6f7a-4d41-84f2-b0ccdce899df}*SharedItemsImports = 4
 		Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{0a39a74b-6f7a-4d41-84f2-b0ccdce899df}*SharedItemsImports = 4
+		Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{0f0db9cc-ea65-429c-9363-38624bf8f49c}*SharedItemsImports = 13
 		Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{9db0cabb-24cc-4538-88ec-6e0a0fe40248}*SharedItemsImports = 4
 		Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{9db0cabb-24cc-4538-88ec-6e0a0fe40248}*SharedItemsImports = 4
 		Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{a34ebe01-25bf-4e69-a2dc-2288dc625541}*SharedItemsImports = 4
 		Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{a34ebe01-25bf-4e69-a2dc-2288dc625541}*SharedItemsImports = 4
+		Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1}*SharedItemsImports = 5
 		Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{e175485b-3c8c-47d7-8dd5-f7fed627eb25}*SharedItemsImports = 13
 		Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{eadd8100-b3ae-4a31-92c4-267a64a1c6eb}*SharedItemsImports = 4
 		Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{eadd8100-b3ae-4a31-92c4-267a64a1c6eb}*SharedItemsImports = 4

From c95808255a31a4f7688a65edc6d770cd463f7999 Mon Sep 17 00:00:00 2001
From: Tim Johnson <tjohnson@aptos.com>
Date: Wed, 14 Oct 2020 16:14:21 -0400
Subject: [PATCH 5/6] remove unused variable

---
 .../Xamarin.Forms.Controls.Issues.Shared/Issue6742.xaml.cs       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6742.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6742.xaml.cs
index 5c3e0207237..2ee8baf7cca 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6742.xaml.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6742.xaml.cs
@@ -148,7 +148,6 @@ public ModelIssue6742Group(string name)
 	public class ModelIssue6742
 	{
 		ViewModelIssue6742 _model;
-		bool _disposedValue;
 
 		public ModelIssue6742(string name, ViewModelIssue6742 model)
 		{

From a9d39cfa1e1fd7a08409de01615c8d6ff211cd3e Mon Sep 17 00:00:00 2001
From: Tim Johnson <tjohnson@aptos.com>
Date: Wed, 2 Dec 2020 07:56:29 -0500
Subject: [PATCH 6/6] Fix bad merge of project file.

---
 .../Xamarin.Forms.Controls.Issues.Shared.projitems             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
index 2ea9fe06144..5d1e2b3dbd8 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
@@ -2495,6 +2495,9 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue6742.xaml">
+        <SubType>Designer</SubType>
+        <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue10897.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>