From 60acae7d16430310303e87043fbed261681b4164 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shane94@hotmail.com>
Date: Mon, 14 Jan 2019 10:05:51 -0700
Subject: [PATCH 1/3] [ios] clear perfect value add ui test (#4968)

- fixes #4957
---
 .../Issue3652.cs                              | 45 ++++++++++++++++++-
 .../Renderers/LabelRenderer.cs                |  2 +
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3652.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3652.cs
index b9e163b1a..93f902139 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3652.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3652.cs
@@ -2,6 +2,13 @@
 using Xamarin.Forms.CustomAttributes;
 using Xamarin.Forms.Internals;
 
+
+#if UITEST
+using Xamarin.UITest;
+using NUnit.Framework;
+using Xamarin.Forms.Core.UITests;
+#endif
+
 namespace Xamarin.Forms.Controls.Issues
 {
 	[Preserve(AllMembers = true)]
@@ -49,7 +56,7 @@ namespace Xamarin.Forms.Controls.Issues
 			{
 				var label = new Label();
 				label.SetBinding(Label.TextProperty, "Description");
-
+				label.AutomationId = "pandabear";
 				var menu = new MenuItem { Text = "Remove" };
 				menu.Command = new Command(() => ((ListItemViewModel)BindingContext).Remove.Execute((this, BindingContext)));
 				ContextActions.Add(menu);
@@ -102,5 +109,41 @@ namespace Xamarin.Forms.Controls.Issues
 			public Command Remove =>
 				new Command(() => MessagingCenter.Send(this, "Remove", this));
 		}
+
+#if UITEST && !__WINDOWS__
+		[Test]
+		public void TestRemovingContextMenuItems()
+		{
+			for(int i = 1; i <= 3; i++)
+			{
+				string searchFor = $"Remove me using the context menu. #{i}";
+				RunningApp.WaitForElement(searchFor);
+
+				RunningApp.ActivateContextMenu(searchFor);
+				RunningApp.WaitForElement(c => c.Marked("Remove"));
+				RunningApp.Tap(c => c.Marked("Remove"));
+			}
+
+
+			for (int i = 4; i <= 6; i++)
+			{
+				RunningApp.Tap("Add an item");
+				string searchFor = $"Remove me using the context menu. #{i}";
+
+				RunningApp.ActivateContextMenu(searchFor);
+				RunningApp.WaitForElement(c => c.Marked("Remove"));
+				RunningApp.Tap(c => c.Marked("Remove"));
+			}
+
+
+			for (int i = 1; i <= 6; i++)
+			{
+				string searchFor = $"Remove me using the context menu. #{i}";
+				RunningApp.WaitForNoElement(c => c.Marked("Remove"));
+			}
+
+		}
+#endif
+
 	}
 }
\ No newline at end of file
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
index ef0855419..ad4c08ecb 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
@@ -142,6 +142,8 @@ namespace Xamarin.Forms.Platform.MacOS
 
 		protected override void OnElementChanged(ElementChangedEventArgs<Label> e)
 		{
+			_perfectSizeValid = false;
+
 			if (e.OldElement != null)
 			{
 				e.OldElement.PropertyChanging -= ElementPropertyChanging;

From a2c3ff5ae2b543a96e6f6a5eee5c5fc149ee55bc Mon Sep 17 00:00:00 2001
From: Samantha Houts <samantha.houts@xamarin.com>
Date: Mon, 14 Jan 2019 16:19:57 -0800
Subject: [PATCH 2/3] Add instructions to test 33450

fixes #2246
---
 .../Bugzilla33450.cs                          | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33450.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33450.cs
index 5875c7c01..e70d03f97 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33450.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33450.cs
@@ -3,13 +3,13 @@ using Xamarin.Forms.Internals;
 
 namespace Xamarin.Forms.Controls.Issues
 {
-	[Preserve (AllMembers = true)]
-	[Issue (IssueTracker.Bugzilla, 33450, "[iOS] Cell with ContextAction has a different layout")]
+	[Preserve(AllMembers = true)]
+	[Issue(IssueTracker.Bugzilla, 33450, "[iOS] Cell with ContextAction has a different layout")]
 	public class Bugzilla33450 : TestContentPage // or TestMasterDetailPage, etc ...
 	{
-		protected override void Init ()
+		protected override void Init()
 		{
-			var list = new ListView { ItemTemplate = new DataTemplate (typeof(MyImageCell)) };
+			var list = new ListView { ItemTemplate = new DataTemplate(typeof(MyImageCell)) };
 
 			list.ItemsSource = new[] {
 				"One",
@@ -24,10 +24,15 @@ namespace Xamarin.Forms.Controls.Issues
 				"Ten",
 			};
 
-			Content = list;
+			Content = new StackLayout
+			{
+				Children = {
+					new Label { Text = "The following list contains cells with and without context actions, but all of the cells should be laid out identically. If the cells do not look identical, this test has failed." },
+					list }
+			};
 		}
 
-		[Preserve (AllMembers = true)]
+		[Preserve(AllMembers = true)]
 		public class MyImageCell : ImageCell
 		{
 			static bool s_addContextAction = false;
@@ -36,8 +41,8 @@ namespace Xamarin.Forms.Controls.Issues
 			{
 				ImageSource = "bank.png";
 				SetBinding(TextProperty, new Binding("."));
-			
-				if(s_addContextAction)
+
+				if (s_addContextAction)
 				{
 					ContextActions.Add(new MenuItem() { Text = "Delete" });
 				}

From cc7e7eb8c2669738a01856262c9c79a15a0d28b3 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Tue, 15 Jan 2019 11:54:14 +0000
Subject: [PATCH 3/3] =?UTF-8?q?[UITest]=C2=A0Add=20Preserve=20to=20issue?=
 =?UTF-8?q?=20#1931=20uitest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Xamarin.Forms.Controls.Issues.Shared/Issue1931.cs            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1931.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1931.cs
index 937b5641e..34dfca988 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1931.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1931.cs
@@ -55,6 +55,7 @@ namespace Xamarin.Forms.Controls.Issues
 			return page;
 		}
 
+		[Preserve(AllMembers = true)]
 		public class Item2 : System.ComponentModel.INotifyPropertyChanged
 		{
 			public string Name