More Xaml generic support (#857)

* [XamlG] allow x:Name on nested generic types

* [Xaml*] fail on undeclared xmlns

* [XamlC] allow x:Arguments on generic ctors

2 files changed, 17 insertions, 2 deletions

diff --git a/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml b/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml
index da224282..0fe02287 100644
--- a/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml
+++ b/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
 			 xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
 			 xmlns:sys="clr-namespace:System;assembly=mscorlib"
@@ -16,6 +16,14 @@
 			<scg:Dictionary x:TypeArguments="sys:String, sys:String"  x:Key="dict"/>
 			<scgs:Queue x:TypeArguments="scg:KeyValuePair(sys:String,sys:String)" x:Key="queue"/>
 			<scg:List x:TypeArguments="x:String" x:Key="stringList"/>
+			<scg:List x:TypeArguments="scg:KeyValuePair(x:String,x:String)" x:Key="TestList" x:Name="TestListMember" >
+				<scg:KeyValuePair x:TypeArguments="x:String,x:String" >
+					<x:Arguments>
+						<x:String>TheKey</x:String>
+						<x:String>TheValue</x:String>
+					</x:Arguments>
+				</scg:KeyValuePair>
+			</scg:List>
 		</ResourceDictionary>
 	</ContentPage.Resources>
 </ContentPage>
\ No newline at end of file
diff --git a/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml.cs b/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml.cs
index 5a62b9fa..6171b327 100644
--- a/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml.cs
+++ b/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml.cs
@@ -56,7 +56,14 @@ namespace Xamarin.Forms.Xaml.UnitTests
 			{
 				var layout = new GenericsTests (useCompiledXaml);
 				var list = layout.FindByName<List<Button>> ("myList");
-				Assert.NotNull (list);
+				Assert.That(list, Is.Not.Null);
+				Assert.That(list, Is.TypeOf<List<Button>>());
+
+				var nestedGenericList = layout.TestListMember;
+				Assert.That(nestedGenericList, Is.Not.Null);
+				Assert.That(nestedGenericList, Is.TypeOf<List<KeyValuePair<string, string>>>());
+
+				Assert.That(nestedGenericList.Count, Is.EqualTo(1));
 			}
 
 			[TestCase (false)]