xamarin
diff --git a/‎Xamarin.Forms.Build.Tasks/CompiledConverters/BindingTypeConverter.cs
Copy file name to clipboard
+7-5Lines changed: 7 additions & 5 deletions b/‎Xamarin.Forms.Build.Tasks/CompiledConverters/BindingTypeConverter.cs
Copy file name to clipboard
+7-5Lines changed: 7 additions & 5 deletions
diff --git a/‎Xamarin.Forms.Build.Tasks/CompiledConverters/BoundsTypeConverter.cs
Copy file name to clipboard
+5-3Lines changed: 5 additions & 3 deletions b/‎Xamarin.Forms.Build.Tasks/CompiledConverters/BoundsTypeConverter.cs
Copy file name to clipboard
+5-3Lines changed: 5 additions & 3 deletions
diff --git a/‎Xamarin.Forms.Build.Tasks/CompiledConverters/ColorTypeConverter.cs
Copy file name to clipboard
+7-8Lines changed: 7 additions & 8 deletions b/‎Xamarin.Forms.Build.Tasks/CompiledConverters/ColorTypeConverter.cs
Copy file name to clipboard
+7-8Lines changed: 7 additions & 8 deletions
diff --git a/‎Xamarin.Forms.Build.Tasks/CompiledConverters/ConstraintTypeConverter.cs
Copy file name to clipboard
+8-8Lines changed: 8 additions & 8 deletions b/‎Xamarin.Forms.Build.Tasks/CompiledConverters/ConstraintTypeConverter.cs
Copy file name to clipboard
+8-8Lines changed: 8 additions & 8 deletions
diff --git a/‎Xamarin.Forms.Build.Tasks/CompiledConverters/LayoutOptionsConverter.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎Xamarin.Forms.Build.Tasks/CompiledConverters/LayoutOptionsConverter.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎Xamarin.Forms.Build.Tasks/CompiledConverters/ListStringTypeConverter.cs
Copy file name to clipboard
+14-15Lines changed: 14 additions & 15 deletions b/‎Xamarin.Forms.Build.Tasks/CompiledConverters/ListStringTypeConverter.cs
Copy file name to clipboard
+14-15Lines changed: 14 additions & 15 deletions
diff --git a/‎Xamarin.Forms.Build.Tasks/CompiledConverters/RDSourceTypeConverter.cs
Copy file name to clipboard
+5-3Lines changed: 5 additions & 3 deletions b/‎Xamarin.Forms.Build.Tasks/CompiledConverters/RDSourceTypeConverter.cs
Copy file name to clipboard
+5-3Lines changed: 5 additions & 3 deletions
diff --git a/‎Xamarin.Forms.Build.Tasks/CompiledConverters/RectangleTypeConverter.cs
Copy file name to clipboard
+5-2Lines changed: 5 additions & 2 deletions b/‎Xamarin.Forms.Build.Tasks/CompiledConverters/RectangleTypeConverter.cs
Copy file name to clipboard
+5-2Lines changed: 5 additions & 2 deletions
diff --git a/‎Xamarin.Forms.Build.Tasks/CompiledConverters/ThicknessTypeConverter.cs
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions b/‎Xamarin.Forms.Build.Tasks/CompiledConverters/ThicknessTypeConverter.cs
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎Xamarin.Forms.Build.Tasks/CompiledConverters/TypeTypeConverter.cs
Copy file name to clipboard
+8-3Lines changed: 8 additions & 3 deletions b/‎Xamarin.Forms.Build.Tasks/CompiledConverters/TypeTypeConverter.cs
Copy file name to clipboard
+8-3Lines changed: 8 additions & 3 deletions
@@ -1,7 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
-
-using Mono.Cecil;
 using Mono.Cecil.Cil;
 
 using Xamarin.Forms.Xaml;
@@ -20,14 +17,19 @@ public IEnumerable<Instruction> ConvertFromString(string value, ILContext contex
 			if (IsNullOrEmpty(value))
 				throw new XamlParseException($"Cannot convert \"{value}\" into {typeof(Binding)}", node);
 
-			var bindingCtorRef = module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Binding"), paramCount: 6);
 			yield return Instruction.Create(OpCodes.Ldstr, value);
 			yield return Instruction.Create(OpCodes.Ldc_I4, (int)BindingMode.Default);
 			yield return Instruction.Create(OpCodes.Ldnull);
 			yield return Instruction.Create(OpCodes.Ldnull);
 			yield return Instruction.Create(OpCodes.Ldnull);
 			yield return Instruction.Create(OpCodes.Ldnull);
-			yield return Instruction.Create(OpCodes.Newobj, bindingCtorRef);
+			yield return Instruction.Create(OpCodes.Newobj, module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Binding"), parameterTypes: new[] {
+				("mscorlib", "System", "String"),
+				("Xamarin.Forms.Core", "Xamarin.Forms", "BindingMode"),
+				("Xamarin.Forms.Core", "Xamarin.Forms", "IValueConverter"),
+				("mscorlib", "System", "Object"),
+				("mscorlib", "System", "String"),
+				("mscorlib", "System", "Object")}));
 		}
 	}
 }
@@ -67,9 +67,11 @@ IEnumerable<Instruction> GenerateIL(double x, double y, double w, double h, Modu
 			yield return Instruction.Create(OpCodes.Ldc_R8, y);
 			yield return Instruction.Create(OpCodes.Ldc_R8, w);
 			yield return Instruction.Create(OpCodes.Ldc_R8, h);
-
-			var rectangleCtorRef = module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Rectangle"), paramCount: 4);
-			yield return Instruction.Create(OpCodes.Newobj, rectangleCtorRef);
+			yield return Instruction.Create(OpCodes.Newobj, module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Rectangle"), parameterTypes: new[] {
+				("mscorlib", "System", "Double"),
+				("mscorlib", "System", "Double"),
+				("mscorlib", "System", "Double"),
+				("mscorlib", "System", "Double")}));
 		}
 	}
 }
@@ -29,10 +29,11 @@ public IEnumerable<Instruction> ConvertFromString(string value, ILContext contex
 					yield return Instruction.Create(OpCodes.Ldc_R8, color.B);
 					yield return Instruction.Create(OpCodes.Ldc_R8, color.A);
 
-					var colorCtorRef = module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Color"),
-																  paramCount: 4,
-																  predicate: md => md.Parameters.All(p => p.ParameterType.FullName == "System.Double"));
-					yield return Instruction.Create(OpCodes.Newobj, colorCtorRef);
+					yield return Instruction.Create(OpCodes.Newobj, module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Color"), parameterTypes: new[] {
+						("mscorlib", "System", "Double"),
+						("mscorlib", "System", "Double"),
+						("mscorlib", "System", "Double"),
+						("mscorlib", "System", "Double")}));
 					yield break;
 				}
 				var parts = value.Split('.');
@@ -41,14 +42,12 @@ public IEnumerable<Instruction> ConvertFromString(string value, ILContext contex
 
 					var fieldReference = module.ImportFieldReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Color"),
 																	 color,
-																	 fd => fd.IsStatic);
+																	 isStatic: true);
 					if (fieldReference != null) {
 						yield return Instruction.Create(OpCodes.Ldsfld, fieldReference);
 						yield break;
 					}
-					var propertyGetterReference = module.ImportPropertyGetterReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Color"),
-																					   color,
-																					   pd => pd.GetMethod.IsStatic);
+					var propertyGetterReference = module.ImportPropertyGetterReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Color"), color, isStatic: true);
 					if (propertyGetterReference != null) {
 						yield return Instruction.Create(OpCodes.Call, propertyGetterReference);
 						yield break;
 
@@ -1,13 +1,14 @@
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 
-using Mono.Cecil;
 using Mono.Cecil.Cil;
 
 using Xamarin.Forms.Xaml;
 using Xamarin.Forms.Build.Tasks;
 
+using static Mono.Cecil.Cil.Instruction;
+using static Mono.Cecil.Cil.OpCodes;
+
 namespace Xamarin.Forms.Core.XamlC
 {
 	class ConstraintTypeConverter : ICompiledTypeConverter
@@ -21,12 +22,11 @@ public IEnumerable<Instruction> ConvertFromString(string value, ILContext contex
 			if (string.IsNullOrEmpty(value) || !double.TryParse(value, NumberStyles.Number, CultureInfo.InvariantCulture, out size))
 				throw new XamlParseException($"Cannot convert \"{value}\" into {typeof(Constraint)}", node);
 
-			yield return Instruction.Create(OpCodes.Ldc_R8, size);
-			var constantReference = module.ImportMethodReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Constraint"),
-																 methodName: "Constant",
-																 paramCount: 1,
-																 predicate: md => md.IsStatic);
-			yield return Instruction.Create(OpCodes.Call, constantReference);
+			yield return Create(Ldc_R8, size);
+			yield return Create(Call, module.ImportMethodReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Constraint"),
+																   methodName: "Constant",
+																   parameterTypes: new[] { ("mscorlib", "System", "Double") },
+																   isStatic: true));
 		}
 	}
 }
@@ -28,7 +28,7 @@ public IEnumerable<Instruction> ConvertFromString(string value, ILContext contex
 
 					var fieldReference = module.ImportFieldReference(("Xamarin.Forms.Core", "Xamarin.Forms", "LayoutOptions"),
 																	 fieldName: options,
-																	 predicate: fd => fd.IsStatic);
+																	 isStatic: true);
 					if (fieldReference != null) {
 						yield return Instruction.Create(OpCodes.Ldsfld, fieldReference);
 						yield break;
 
@@ -2,12 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using Mono.Cecil;
 using Mono.Cecil.Cil;
 
 using Xamarin.Forms.Xaml;
 using Xamarin.Forms.Build.Tasks;
 
+using static Mono.Cecil.Cil.Instruction;
+using static Mono.Cecil.Cil.OpCodes;
+
 namespace Xamarin.Forms.Core.XamlC
 {
 	class ListStringTypeConverter : ICompiledTypeConverter
@@ -17,25 +19,22 @@ public IEnumerable<Instruction> ConvertFromString(string value, ILContext contex
 			var module = context.Body.Method.Module;
 
 			if (value == null) {
-				yield return Instruction.Create(OpCodes.Ldnull);
+				yield return Create(Ldnull);
 				yield break;
 			}
 			var parts = value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(s => s.Trim()).ToList();
 
-			var add = module.ImportMethodReference(("mscorlib", "System.Collections.Generic", "ICollection`1"),
-												   methodName: "Add",
-												   paramCount: 1,
-												   classArguments: new[] { ("mscorlib", "System", "String") });
-
-			yield return Instruction.Create(OpCodes.Ldc_I4, parts.Count);
-			yield return Instruction.Create(OpCodes.Newobj, module.ImportCtorReference(("System.Collections", "System.Collections.Generic", "List`1"),
-																					   paramCount: 1,
-																					   predicate: md => md.Parameters[0].ParameterType.FullName == "System.Int32",
-																					   classArguments: new[] { ("mscorlib", "System", "String") }));
+			yield return Create(Ldc_I4, parts.Count);
+			yield return Create(Newobj, module.ImportCtorReference(("System.Collections", "System.Collections.Generic", "List`1"),
+																   parameterTypes: new[] { ("mscorlib", "System", "Int32") },
+																   classArguments: new[] { ("mscorlib", "System", "String") }));
 			foreach (var part in parts) {
-				yield return Instruction.Create(OpCodes.Dup);
-				yield return Instruction.Create(OpCodes.Ldstr, part);
-				yield return Instruction.Create(OpCodes.Callvirt, add);
+				yield return Create(Dup);
+				yield return Create(Ldstr, part);
+				yield return Create(Callvirt, module.ImportMethodReference(("mscorlib", "System.Collections.Generic", "ICollection`1"),
+																		   methodName: "Add",
+																		   paramCount: 1,
+																		   classArguments: new[] { ("mscorlib", "System", "String") }));
 			}
 		}
 	}
 
@@ -49,13 +49,15 @@ public IEnumerable<Instruction> ConvertFromString(string value, ILContext contex
 			yield return Create(Stloc, uriVarDef);
 			yield return Create(Ldstr, resourcePath); //resourcePath
 			yield return Create(Ldtoken, module.ImportReference(((ILRootNode)rootNode).TypeReference));
-			yield return Create(Call, module.ImportMethodReference(("mscorlib", "System", "Type"), methodName: "GetTypeFromHandle", paramCount: 1, predicate: md => md.IsStatic));
-			yield return Create(Call, module.ImportMethodReference(("mscorlib", "System.Reflection", "IntrospectionExtensions"), methodName: "GetTypeInfo", paramCount: 1, predicate: md => md.IsStatic));
+			yield return Create(Call, module.ImportMethodReference(("mscorlib", "System", "Type"), methodName: "GetTypeFromHandle", parameterTypes: new[] { ("mscorlib", "System", "RuntimeTypeHandle") }, isStatic: true));
+			yield return Create(Call, module.ImportMethodReference(("mscorlib", "System.Reflection", "IntrospectionExtensions"), methodName: "GetTypeInfo", parameterTypes: new[] { ("mscorlib", "System", "Type") }, isStatic: true));
 			yield return Create(Callvirt, module.ImportPropertyGetterReference(("mscorlib", "System.Reflection", "TypeInfo"), propertyName: "Assembly", flatten: true));
 
 			foreach (var instruction in node.PushXmlLineInfo(context))
 				yield return instruction; //lineinfo
-			yield return Create(Callvirt, module.ImportMethodReference(("Xamarin.Forms.Core", "Xamarin.Forms", "ResourceDictionary"), methodName: "SetAndLoadSource", paramCount: 4));
+			yield return Create(Callvirt, module.ImportMethodReference(("Xamarin.Forms.Core", "Xamarin.Forms", "ResourceDictionary"),
+			                                                           methodName: "SetAndLoadSource",
+			                                                           parameterTypes: new[] { ("System", "System", "Uri"), ("mscorlib", "System", "String"), ("mscorlib", "System.Reflection", "Assembly"), ("System.Xml.ReaderWriter", "System.Xml", "IXmlLineInfo") }));
 			//ldloc the stored uri as return value
 			yield return Create(Ldloc, uriVarDef);
 		}
 
@@ -42,8 +42,11 @@ IEnumerable<Instruction> GenerateIL(double x, double y, double w, double h, Modu
 			yield return Instruction.Create(OpCodes.Ldc_R8, y);
 			yield return Instruction.Create(OpCodes.Ldc_R8, w);
 			yield return Instruction.Create(OpCodes.Ldc_R8, h);
-
-			yield return Instruction.Create(OpCodes.Newobj, module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Rectangle"), paramCount: 4));
+			yield return Instruction.Create(OpCodes.Newobj, module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Rectangle"), parameterTypes: new[] {
+				("mscorlib", "System", "Double"),
+				("mscorlib", "System", "Double"),
+				("mscorlib", "System", "Double"),
+				("mscorlib", "System", "Double")}));
 		}
 	}
 }
@@ -45,8 +45,7 @@ IEnumerable<Instruction> GenerateIL(ModuleDefinition module, params double[] arg
 		{
 			foreach (var d in args)
 				yield return Instruction.Create(OpCodes.Ldc_R8, d);
-			yield return Instruction.Create(OpCodes.Newobj, module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Thickness"),
-																					   paramCount: args.Length));
+			yield return Instruction.Create(OpCodes.Newobj, module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Thickness"), parameterTypes: args.Select(a => ("mscorlib", "System", "Double")).ToArray()));
 		}
 	}
 
 
@@ -2,12 +2,14 @@
 using System.Collections.Generic;
 using System.Xml;
 
-using Mono.Cecil;
 using Mono.Cecil.Cil;
 
 using Xamarin.Forms.Build.Tasks;
 using Xamarin.Forms.Xaml;
 
+using static Mono.Cecil.Cil.Instruction;
+using static Mono.Cecil.Cil.OpCodes;
+
 namespace Xamarin.Forms.Core.XamlC
 {
 	class TypeTypeConverter : ICompiledTypeConverter
@@ -33,8 +35,11 @@ public IEnumerable<Instruction> ConvertFromString(string value, ILContext contex
 			if (typeRef == null)
 				goto error;
 
-			yield return Instruction.Create(OpCodes.Ldtoken, module.ImportReference(typeRef));
-			yield return Instruction.Create(OpCodes.Call, module.ImportMethodReference(("mscorlib", "System", "Type"), methodName: "GetTypeFromHandle", paramCount: 1, predicate: md => md.IsStatic));
+			yield return Create(Ldtoken, module.ImportReference(typeRef));
+			yield return Create(Call, module.ImportMethodReference(("mscorlib", "System", "Type"),
+																   methodName: "GetTypeFromHandle",
+																   parameterTypes: new[] { ("mscorlib", "System", "RuntimeTypeHandle") },
+																   isStatic: true));
 
 			yield break;
Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,11 @@ IEnumerable<Instruction> GenerateIL(double x, double y, double w, double h, Modu`
`67`	`67`	`yield return Instruction.Create(OpCodes.Ldc_R8, y);`
`68`	`68`	`yield return Instruction.Create(OpCodes.Ldc_R8, w);`
`69`	`69`	`yield return Instruction.Create(OpCodes.Ldc_R8, h);`
`70`		`-`
`71`		`- var rectangleCtorRef = module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Rectangle"), paramCount: 4);`
`72`		`- yield return Instruction.Create(OpCodes.Newobj, rectangleCtorRef);`
	`70`	`+ yield return Instruction.Create(OpCodes.Newobj, module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Rectangle"), parameterTypes: new[] {`
	`71`	`+ ("mscorlib", "System", "Double"),`
	`72`	`+ ("mscorlib", "System", "Double"),`
	`73`	`+ ("mscorlib", "System", "Double"),`
	`74`	`+ ("mscorlib", "System", "Double")}));`
`73`	`75`	`}`
`74`	`76`	`}`
`75`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,11 @@ IEnumerable<Instruction> GenerateIL(double x, double y, double w, double h, Modu`
`42`	`42`	`yield return Instruction.Create(OpCodes.Ldc_R8, y);`
`43`	`43`	`yield return Instruction.Create(OpCodes.Ldc_R8, w);`
`44`	`44`	`yield return Instruction.Create(OpCodes.Ldc_R8, h);`
`45`		`-`
`46`		`- yield return Instruction.Create(OpCodes.Newobj, module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Rectangle"), paramCount: 4));`
	`45`	`+ yield return Instruction.Create(OpCodes.Newobj, module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Rectangle"), parameterTypes: new[] {`
	`46`	`+ ("mscorlib", "System", "Double"),`
	`47`	`+ ("mscorlib", "System", "Double"),`
	`48`	`+ ("mscorlib", "System", "Double"),`
	`49`	`+ ("mscorlib", "System", "Double")}));`
`47`	`50`	`}`
`48`	`51`	`}`
`49`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,7 @@ IEnumerable<Instruction> GenerateIL(ModuleDefinition module, params double[] arg`
`45`	`45`	`{`
`46`	`46`	`foreach (var d in args)`
`47`	`47`	`yield return Instruction.Create(OpCodes.Ldc_R8, d);`
`48`		`- yield return Instruction.Create(OpCodes.Newobj, module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Thickness"),`
`49`		`- paramCount: args.Length));`
	`48`	`+ yield return Instruction.Create(OpCodes.Newobj, module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Thickness"), parameterTypes: args.Select(a => ("mscorlib", "System", "Double")).ToArray()));`
`50`	`49`	`}`
`51`	`50`	`}`
`52`	`51`