From 088d3697390e42d686b73d921bdd40714149808f Mon Sep 17 00:00:00 2001
From: Stephane Delcroix <stephane@delcroix.org>
Date: Tue, 14 Aug 2018 08:14:18 +0000
Subject: [PATCH 1/2] [XamlC] Throws on duplicate x:Key (#3542)

Throws a XamlParseException on duplicate x:Key on RDs. This will find
duplicate in xaml, but duplicates can still happen if the RD is modified
in code. Those dupes are already detectd at runtime.

- helps, but doesn't fixes, #3512
---
 .../SetPropertiesVisitor.cs                   | 18 +++++--
 .../Issues/Gh3512.xaml                        |  7 +++
 .../Issues/Gh3512.xaml.cs                     | 48 +++++++++++++++++++
 .../Xamarin.Forms.Xaml.UnitTests.csproj       |  7 +++
 4 files changed, 75 insertions(+), 5 deletions(-)
 create mode 100644 Xamarin.Forms.Xaml.UnitTests/Issues/Gh3512.xaml
 create mode 100644 Xamarin.Forms.Xaml.UnitTests/Issues/Gh3512.xaml.cs

diff --git a/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs b/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs
index 18ba9151f..9891d2cf7 100644
--- a/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs
+++ b/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs
@@ -137,7 +137,7 @@ namespace Xamarin.Forms.Build.Tasks
 				var parentVar = Context.Variables[(IElementNode)parentNode];
 				string contentProperty;
 
-				if (CanAddToResourceDictionary(parentVar.VariableType, node, node, Context)) {
+				if (CanAddToResourceDictionary(parentVar, parentVar.VariableType, node, node, Context)) {
 					Context.IL.Emit(Ldloc, parentVar);
 					Context.IL.Append(AddToResourceDictionary(node, node, Context));
 				}
@@ -186,7 +186,7 @@ namespace Xamarin.Forms.Build.Tasks
 				TypeReference propertyType;
 				Context.IL.Append(GetPropertyValue(parent, parentList.XmlName, Context, node, out propertyType));
 
-				if (CanAddToResourceDictionary(propertyType, node, node, Context)) {
+				if (CanAddToResourceDictionary(parent, propertyType, node, node, Context)) {
 					Context.IL.Append(AddToResourceDictionary(node, node, Context));
 					return;
 				} 
@@ -1220,15 +1220,23 @@ namespace Xamarin.Forms.Build.Tasks
 			return true;
 		}
 
-		static bool CanAddToResourceDictionary(TypeReference collectionType, IElementNode node, IXmlLineInfo lineInfo, ILContext context)
+		static Dictionary<VariableDefinition, IList<string>> resourceNamesInUse = new Dictionary<VariableDefinition, IList<string>>();
+		static bool CanAddToResourceDictionary(VariableDefinition parent, TypeReference collectionType, IElementNode node, IXmlLineInfo lineInfo, ILContext context)
 		{
 			if (   collectionType.FullName != "Xamarin.Forms.ResourceDictionary"
 				&& collectionType.ResolveCached().BaseType?.FullName != "Xamarin.Forms.ResourceDictionary")
 				return false;
 
 
-			if (node.Properties.ContainsKey(XmlName.xKey))
+			if (node.Properties.ContainsKey(XmlName.xKey)) {
+				var key = (node.Properties[XmlName.xKey] as ValueNode).Value as string;
+				if (!resourceNamesInUse.TryGetValue(parent, out var names))
+					resourceNamesInUse[parent] = (names = new List<string>());
+				if (names.Contains(key))
+					throw new XamlParseException($"A resource with the key '{key}' is already present in the ResourceDictionary.", lineInfo);
+				names.Add(key);
 				return true;
+			}
 
 			//is there a RD.Add() overrides that accepts this ?
 			var nodeTypeRef = context.Variables[node].VariableType;
@@ -1251,7 +1259,7 @@ namespace Xamarin.Forms.Build.Tasks
 			foreach (var instruction in GetPropertyValue(parent, propertyName, context, iXmlLineInfo, out propertyType))
 				yield return instruction;
 
-			if (CanAddToResourceDictionary(propertyType, elementNode, iXmlLineInfo, context)) {
+			if (CanAddToResourceDictionary(parent, propertyType, elementNode, iXmlLineInfo, context)) {
 				foreach (var instruction in AddToResourceDictionary(elementNode, iXmlLineInfo, context))
 					yield return instruction;
 				yield break;
diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3512.xaml b/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3512.xaml
new file mode 100644
index 000000000..f4399702e
--- /dev/null
+++ b/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3512.xaml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="Xamarin.Forms.Xaml.UnitTests.Gh3512">
+	<ContentPage.Resources>
+		<Style x:Key="foo" TargetType="Label"/>
+		<Style x:Key="foo" TargetType="Label"/>
+	</ContentPage.Resources>
+</ContentPage>
diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3512.xaml.cs b/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3512.xaml.cs
new file mode 100644
index 000000000..effb24ec3
--- /dev/null
+++ b/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3512.xaml.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using Xamarin.Forms;
+using Xamarin.Forms.Core.UnitTests;
+
+namespace Xamarin.Forms.Xaml.UnitTests
+{
+	[XamlCompilation(XamlCompilationOptions.Skip)]
+	public partial class Gh3512 : ContentPage
+	{
+		public Gh3512()
+		{
+			InitializeComponent();
+		}
+
+		public Gh3512(bool useCompiledXaml)
+		{
+			//this stub will be replaced at compile time
+		}
+
+
+		[TestFixture]
+		class Tests
+		{
+			[SetUp]
+			public void Setup()
+			{
+				Device.PlatformServices = new MockPlatformServices();
+			}
+
+			[TearDown]
+			public void TearDown()
+			{
+				Device.PlatformServices = null;
+			}
+
+			[TestCase(false), TestCase(true)]
+			public void ThrowsOnDuplicateXKey(bool useCompiledXaml)
+			{
+				if (useCompiledXaml)
+					Assert.Throws<XamlParseException>(() => MockCompiler.Compile(typeof(Gh3512)));
+				else
+					Assert.Throws<ArgumentException>(() => new Gh3512(useCompiledXaml));
+			}
+		}
+	}
+}
diff --git a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
index fa36aa41e..6f104aa1a 100644
--- a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
+++ b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
@@ -634,6 +634,9 @@
     <Compile Include="Issues\Gh3280.xaml.cs">
       <DependentUpon>Gh3280.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Issues\Gh3512.xaml.cs">
+      <DependentUpon>Gh3512.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="..\.nuspec\Xamarin.Forms.Debug.targets" Condition="'$(BuildingInsideVisualStudio)' == 'true' AND Exists('..\.nuspec\Xamarin.Forms.Build.Tasks.dll')" />
@@ -1152,6 +1155,10 @@
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Issues\Gh3512.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

From 689a0bb9bc14b0beecb7bdf96315c28e0166cff7 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Wed, 15 Aug 2018 20:06:16 +0100
Subject: [PATCH 2/2] =?UTF-8?q?[iOS]=C2=A0Fix=20sizing=20issue=20on=20MDP?=
 =?UTF-8?q?=20=20(#3515)=20fixes=20#3458?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [iOS] Fix sizing of MDP when rotating

* [Controls]Add a NavigationPage to MDP FlowDirectionGallery so we can have the toggle button
---
 .../ControlGalleryPages/FlowDirectionGallery.cs              | 2 +-
 .../Renderers/TabletMasterDetailRenderer.cs                  | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/FlowDirectionGallery.cs b/Xamarin.Forms.Controls/ControlGalleryPages/FlowDirectionGallery.cs
index eb2e0f791..85f92740e 100644
--- a/Xamarin.Forms.Controls/ControlGalleryPages/FlowDirectionGallery.cs
+++ b/Xamarin.Forms.Controls/ControlGalleryPages/FlowDirectionGallery.cs
@@ -75,7 +75,7 @@ namespace Xamarin.Forms.Controls
 		{
 			FlowDirection = direction;
 			Master = new FlowDirectionGalleryCP(direction) { Title = "Master", BackgroundColor = Color.Red };
-			Detail = new FlowDirectionGalleryCP(direction) { Title = "Detail" };
+			Detail = new NavigationPage(new FlowDirectionGalleryCP(direction) { Title = "Detail" });
 			IsPresented = true;
 		}
 	}
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs
index 4f707dee9..1f705c21c 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs
@@ -47,11 +47,8 @@ namespace Xamarin.Forms.Platform.iOS
 		InnerDelegate _innerDelegate;
 		nfloat _masterWidth = 0;
 		EventedViewController _masterController;
-
 		MasterDetailPage _masterDetailPage;
-
 		bool _masterVisible;
-
 		VisualElementTracker _tracker;
 
 		Page PageController => Element as Page;
@@ -186,7 +183,7 @@ namespace Xamarin.Forms.Platform.iOS
 			_masterWidth = (nfloat)Math.Max(_masterWidth, masterBounds.Width);
 
 			if (!masterBounds.IsEmpty)
-				MasterDetailPage.MasterBounds = new Rectangle(_masterWidth, 0, _masterWidth, masterBounds.Height);
+				MasterDetailPage.MasterBounds = new Rectangle(0, 0, _masterWidth, masterBounds.Height);
 
 			if (!detailsBounds.IsEmpty)
 				MasterDetailPage.DetailBounds = new Rectangle(0, 0, detailsBounds.Width, detailsBounds.Height);