xamarin
diff --git a/‎Xamarin.Forms.Build.Tasks/BindablePropertyReferenceExtensions.cs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎Xamarin.Forms.Build.Tasks/BindablePropertyReferenceExtensions.cs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎Xamarin.Forms.Build.Tasks/CompiledConverters/BindingTypeConverter.cs
Copy file name to clipboard
+1-3Lines changed: 1 addition & 3 deletions b/‎Xamarin.Forms.Build.Tasks/CompiledConverters/BindingTypeConverter.cs
Copy file name to clipboard
+1-3Lines changed: 1 addition & 3 deletions
diff --git a/‎Xamarin.Forms.Build.Tasks/CompiledConverters/BoundsTypeConverter.cs
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions b/‎Xamarin.Forms.Build.Tasks/CompiledConverters/BoundsTypeConverter.cs
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎Xamarin.Forms.Build.Tasks/CompiledConverters/ColorTypeConverter.cs
Copy file name to clipboard
+14-10Lines changed: 14 additions & 10 deletions b/‎Xamarin.Forms.Build.Tasks/CompiledConverters/ColorTypeConverter.cs
Copy file name to clipboard
+14-10Lines changed: 14 additions & 10 deletions
diff --git a/‎Xamarin.Forms.Build.Tasks/CompiledConverters/ConstraintTypeConverter.cs
Copy file name to clipboard
+5-4Lines changed: 5 additions & 4 deletions b/‎Xamarin.Forms.Build.Tasks/CompiledConverters/ConstraintTypeConverter.cs
Copy file name to clipboard
+5-4Lines changed: 5 additions & 4 deletions
diff --git a/‎Xamarin.Forms.Build.Tasks/CompiledConverters/LayoutOptionsConverter.cs
Copy file name to clipboard
+5-3Lines changed: 5 additions & 3 deletions b/‎Xamarin.Forms.Build.Tasks/CompiledConverters/LayoutOptionsConverter.cs
Copy file name to clipboard
+5-3Lines changed: 5 additions & 3 deletions
diff --git a/‎Xamarin.Forms.Build.Tasks/CompiledConverters/ListStringTypeConverter.cs
Copy file name to clipboard
+9-10Lines changed: 9 additions & 10 deletions b/‎Xamarin.Forms.Build.Tasks/CompiledConverters/ListStringTypeConverter.cs
Copy file name to clipboard
+9-10Lines changed: 9 additions & 10 deletions
diff --git a/‎Xamarin.Forms.Build.Tasks/CompiledConverters/RDSourceTypeConverter.cs
Copy file name to clipboard
+7-15Lines changed: 7 additions & 15 deletions b/‎Xamarin.Forms.Build.Tasks/CompiledConverters/RDSourceTypeConverter.cs
Copy file name to clipboard
+7-15Lines changed: 7 additions & 15 deletions
diff --git a/‎Xamarin.Forms.Build.Tasks/CompiledConverters/RectangleTypeConverter.cs
Copy file name to clipboard
+1-3Lines changed: 1 addition & 3 deletions b/‎Xamarin.Forms.Build.Tasks/CompiledConverters/RectangleTypeConverter.cs
Copy file name to clipboard
+1-3Lines changed: 1 addition & 3 deletions
diff --git a/‎Xamarin.Forms.Build.Tasks/CompiledConverters/ThicknessTypeConverter.cs
Copy file name to clipboard
+2-3Lines changed: 2 additions & 3 deletions b/‎Xamarin.Forms.Build.Tasks/CompiledConverters/ThicknessTypeConverter.cs
Copy file name to clipboard
+2-3Lines changed: 2 additions & 3 deletions
@@ -26,7 +26,7 @@ public static TypeReference GetBindablePropertyType(this FieldReference bpRef, I
 												md.IsStatic &&
 												md.IsPublic &&
 												md.Parameters.Count == 1 &&
-												md.Parameters[0].ParameterType.InheritsFromOrImplements(module.ImportReferenceCached(typeof(BindableObject))), module).SingleOrDefault()?.Item1;
+												md.Parameters[0].ParameterType.InheritsFromOrImplements(module.ImportReference(("Xamarin.Forms.Core", "Xamarin.Forms", "BindableObject"))), module).SingleOrDefault()?.Item1;
 			if (getter == null)
 				throw new XamlParseException($"Missing a public static Get{bpName} or a public instance property getter for the attached property \"{bpRef.DeclaringType}.{bpRef.Name}\"", iXmlLineInfo);
 			return getter.ResolveGenericReturnType(declaringTypeRef, module);
@@ -43,7 +43,7 @@ public static TypeReference GetBindablePropertyTypeConverter(this FieldReference
 												md.IsStatic &&
 												md.IsPublic &&
 												md.Parameters.Count == 1 &&
-												md.Parameters[0].ParameterType.InheritsFromOrImplements(module.ImportReferenceCached(typeof(BindableObject))), module).SingleOrDefault()?.Item1;
+												md.Parameters[0].ParameterType.InheritsFromOrImplements(module.ImportReference(("Xamarin.Forms.Core", "Xamarin.Forms", "BindableObject"))), module).SingleOrDefault()?.Item1;
 
 			var attributes = new List<CustomAttribute>();
 			if (property != null && property.HasCustomAttributes)
 
@@ -20,9 +20,7 @@ public IEnumerable<Instruction> ConvertFromString(string value, ILContext contex
 			if (IsNullOrEmpty(value))
 				throw new XamlParseException($"Cannot convert \"{value}\" into {typeof(Binding)}", node);
 
-			var bindingCtor = module.ImportReferenceCached(typeof(Binding)).ResolveCached().Methods.FirstOrDefault(md => md.IsConstructor && md.Parameters.Count == 6);
-			var bindingCtorRef = module.ImportReference(bindingCtor);
-
+			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);
 
@@ -68,8 +68,7 @@ IEnumerable<Instruction> GenerateIL(double x, double y, double w, double h, Modu
 			yield return Instruction.Create(OpCodes.Ldc_R8, w);
 			yield return Instruction.Create(OpCodes.Ldc_R8, h);
 
-			var rectangleCtor = module.ImportReferenceCached(typeof(Rectangle)).ResolveCached().Methods.FirstOrDefault(md => md.IsConstructor && md.Parameters.Count == 4);
-			var rectangleCtorRef = module.ImportReference(rectangleCtor);
+			var rectangleCtorRef = module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Rectangle"), paramCount: 4);
 			yield return Instruction.Create(OpCodes.Newobj, rectangleCtorRef);
 		}
 	}
 
@@ -28,25 +28,29 @@ public IEnumerable<Instruction> ConvertFromString(string value, ILContext contex
 					yield return Instruction.Create(OpCodes.Ldc_R8, color.G);
 					yield return Instruction.Create(OpCodes.Ldc_R8, color.B);
 					yield return Instruction.Create(OpCodes.Ldc_R8, color.A);
-					var colorCtor = module.ImportReferenceCached(typeof(Color)).ResolveCached().Methods.FirstOrDefault(
-						md => md.IsConstructor && md.Parameters.Count == 4 &&
-						md.Parameters.All(p => p.ParameterType.FullName == "System.Double"));
-					var colorCtorRef = module.ImportReference(colorCtor);
+
+					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 break;
 				}
 				var parts = value.Split('.');
 				if (parts.Length == 1 || (parts.Length == 2 && parts [0] == "Color")) {
 					var color = parts [parts.Length - 1];
 
-					var field = module.ImportReferenceCached(typeof(Color)).ResolveCached().Fields.SingleOrDefault(fd => fd.Name == color && fd.IsStatic);
-					if (field != null) {
-						yield return Instruction.Create(OpCodes.Ldsfld, module.ImportReference(field));
+					var fieldReference = module.ImportFieldReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Color"),
+																	 color,
+																	 fd => fd.IsStatic);
+					if (fieldReference != null) {
+						yield return Instruction.Create(OpCodes.Ldsfld, fieldReference);
 						yield break;
 					}
-					var propertyGetter = module.ImportReferenceCached(typeof(Color)).ResolveCached().Properties.SingleOrDefault(pd => pd.Name == color && pd.GetMethod.IsStatic)?.GetMethod;
-					if (propertyGetter != null) {
-						yield return Instruction.Create(OpCodes.Call, module.ImportReference(propertyGetter));
+					var propertyGetterReference = module.ImportPropertyGetterReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Color"),
+																					   color,
+																					   pd => pd.GetMethod.IsStatic);
+					if (propertyGetterReference != null) {
+						yield return Instruction.Create(OpCodes.Call, propertyGetterReference);
 						yield break;
 					}
 				}
 
@@ -22,10 +22,11 @@ public IEnumerable<Instruction> ConvertFromString(string value, ILContext contex
 				throw new XamlParseException($"Cannot convert \"{value}\" into {typeof(Constraint)}", node);
 
 			yield return Instruction.Create(OpCodes.Ldc_R8, size);
-
-			var constantDef = module.ImportReferenceCached(typeof(Constraint)).ResolveCached().Methods.FirstOrDefault(md => md.IsStatic && md.Name == "Constant");
-			var constantRef = module.ImportReference(constantDef);
-			yield return Instruction.Create(OpCodes.Call, constantRef);
+			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);
 		}
 	}
 }
@@ -26,9 +26,11 @@ public IEnumerable<Instruction> ConvertFromString(string value, ILContext contex
 				if (parts.Length == 1 || (parts.Length == 2 && parts [0] == "LayoutOptions")) {
 					var options = parts [parts.Length - 1];
 
-					var field = module.ImportReferenceCached(typeof(LayoutOptions)).ResolveCached().Fields.SingleOrDefault(fd => fd.Name == options && fd.IsStatic);
-					if (field != null) {
-						yield return Instruction.Create(OpCodes.Ldsfld, module.ImportReference(field));
+					var fieldReference = module.ImportFieldReference(("Xamarin.Forms.Core", "Xamarin.Forms", "LayoutOptions"),
+																	 fieldName: options,
+																	 predicate: fd => fd.IsStatic);
+					if (fieldReference != null) {
+						yield return Instruction.Create(OpCodes.Ldsfld, fieldReference);
 						yield break;
 					}
 				}
 
@@ -22,21 +22,20 @@ public IEnumerable<Instruction> ConvertFromString(string value, ILContext contex
 			}
 			var parts = value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(s => s.Trim()).ToList();
 
-			var listCtor = module.ImportReferenceCached(typeof(List<>)).ResolveCached().Methods.FirstOrDefault(md => md.IsConstructor && md.Parameters.Count == 1 && md.Parameters[0].ParameterType.FullName == "System.Int32");
-			var listCtorRef = module.ImportReference(listCtor);
-			listCtorRef = module.ImportReference(listCtorRef.ResolveGenericParameters(module.ImportReferenceCached(typeof(List<string>)), module));
-
-			var adder = module.ImportReferenceCached(typeof(ICollection<>)).ResolveCached().Methods.FirstOrDefault(md => md.Name == "Add" && md.Parameters.Count == 1);
-			var adderRef = module.ImportReference(adder);
-			adderRef = module.ImportReference(adderRef.ResolveGenericParameters(module.ImportReferenceCached(typeof(ICollection<string>)), module));
+			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, listCtorRef);
-
+			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") }));
 			foreach (var part in parts) {
 				yield return Instruction.Create(OpCodes.Dup);
 				yield return Instruction.Create(OpCodes.Ldstr, part);
-				yield return Instruction.Create(OpCodes.Callvirt, adderRef);
+				yield return Instruction.Create(OpCodes.Callvirt, add);
 			}
 		}
 	}
 
@@ -44,34 +44,26 @@ public IEnumerable<Instruction> ConvertFromString(string value, ILContext contex
 
 			//keep the Uri for later
 			yield return Create(Dup);
-			var uriVarDef = new VariableDefinition(module.ImportReferenceCached(typeof(Uri)));
+			var uriVarDef = new VariableDefinition(module.ImportReference(("System", "System", "Uri")));
 			body.Variables.Add(uriVarDef);
 			yield return Create(Stloc, uriVarDef);
-
 			yield return Create(Ldstr, resourcePath); //resourcePath
-
-			var getTypeFromHandle = module.ImportReferenceCached(typeof(Type).GetMethod("GetTypeFromHandle", new[] { typeof(RuntimeTypeHandle) }));
-			var getTypeInfo = module.ImportReferenceCached(typeof(System.Reflection.IntrospectionExtensions).GetMethod("GetTypeInfo", new Type[] { typeof(Type) }));
-			var getAssembly = module.ImportReferenceCached(typeof(System.Reflection.TypeInfo).GetProperty("Assembly").GetMethod);
 			yield return Create(Ldtoken, module.ImportReference(((ILRootNode)rootNode).TypeReference));
-			yield return Create(Call, module.ImportReference(getTypeFromHandle));
-			yield return Create(Call, module.ImportReference(getTypeInfo));
-			yield return Create(Callvirt, module.ImportReference(getAssembly)); //assembly
+			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(Callvirt, module.ImportPropertyGetterReference(("mscorlib", "System.Reflection", "TypeInfo"), propertyName: "Assembly", flatten: true));
 
 			foreach (var instruction in node.PushXmlLineInfo(context))
 				yield return instruction; //lineinfo
-
-			var setAndLoadSource = module.ImportReferenceCached(typeof(ResourceDictionary).GetMethod("SetAndLoadSource"));
-			yield return Create(Callvirt, module.ImportReference(setAndLoadSource));
-
+			yield return Create(Callvirt, module.ImportMethodReference(("Xamarin.Forms.Core", "Xamarin.Forms", "ResourceDictionary"), methodName: "SetAndLoadSource", paramCount: 4));
 			//ldloc the stored uri as return value
 			yield return Create(Ldloc, uriVarDef);
 		}
 
 		internal static string GetPathForType(ModuleDefinition module, TypeReference type)
 		{
 			foreach (var ca in type.Module.GetCustomAttributes()) {
-				if (!TypeRefComparer.Default.Equals(ca.AttributeType, module.ImportReferenceCached(typeof(XamlResourceIdAttribute))))
+				if (!TypeRefComparer.Default.Equals(ca.AttributeType, module.ImportReference(("Xamarin.Forms.Core", "Xamarin.Forms.Xaml", "XamlResourceIdAttribute"))))
 					continue;
 				if (!TypeRefComparer.Default.Equals(ca.ConstructorArguments[2].Value as TypeReference, type))
 					continue;
@@ -80,4 +72,4 @@ internal static string GetPathForType(ModuleDefinition module, TypeReference typ
 			return null;
 		}
 	}
-}
+}
@@ -43,9 +43,7 @@ IEnumerable<Instruction> GenerateIL(double x, double y, double w, double h, Modu
 			yield return Instruction.Create(OpCodes.Ldc_R8, w);
 			yield return Instruction.Create(OpCodes.Ldc_R8, h);
 
-			var rectangleCtor = module.ImportReferenceCached(typeof(Rectangle)).ResolveCached().Methods.FirstOrDefault(md => md.IsConstructor && md.Parameters.Count == 4);
-			var rectangleCtorRef = module.ImportReference(rectangleCtor);
-			yield return Instruction.Create(OpCodes.Newobj, rectangleCtorRef);
+			yield return Instruction.Create(OpCodes.Newobj, module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Rectangle"), paramCount: 4));
 		}
 	}
 }
@@ -45,9 +45,8 @@ IEnumerable<Instruction> GenerateIL(ModuleDefinition module, params double[] arg
 		{
 			foreach (var d in args)
 				yield return Instruction.Create(OpCodes.Ldc_R8, d);
-			var thicknessCtor = module.ImportReferenceCached(typeof(Thickness)).ResolveCached().Methods.FirstOrDefault(md => md.IsConstructor && md.Parameters.Count == args.Length);
-			var thicknessCtorRef = module.ImportReference(thicknessCtor);
-			yield return Instruction.Create(OpCodes.Newobj, thicknessCtorRef);
+			yield return Instruction.Create(OpCodes.Newobj, module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Thickness"),
+																					   paramCount: args.Length));
 		}
 	}
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,7 @@ IEnumerable<Instruction> GenerateIL(double x, double y, double w, double h, Modu`
`68`	`68`	`yield return Instruction.Create(OpCodes.Ldc_R8, w);`
`69`	`69`	`yield return Instruction.Create(OpCodes.Ldc_R8, h);`
`70`	`70`
`71`		`- var rectangleCtor = module.ImportReferenceCached(typeof(Rectangle)).ResolveCached().Methods.FirstOrDefault(md => md.IsConstructor && md.Parameters.Count == 4);`
`72`		`- var rectangleCtorRef = module.ImportReference(rectangleCtor);`
	`71`	`+ var rectangleCtorRef = module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Rectangle"), paramCount: 4);`
`73`	`72`	`yield return Instruction.Create(OpCodes.Newobj, rectangleCtorRef);`
`74`	`73`	`}`
`75`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,11 @@ public IEnumerable<Instruction> ConvertFromString(string value, ILContext contex`
`22`	`22`	`throw new XamlParseException($"Cannot convert \"{value}\" into {typeof(Constraint)}", node);`
`23`	`23`
`24`	`24`	`yield return Instruction.Create(OpCodes.Ldc_R8, size);`
`25`		`-`
`26`		`- var constantDef = module.ImportReferenceCached(typeof(Constraint)).ResolveCached().Methods.FirstOrDefault(md => md.IsStatic && md.Name == "Constant");`
`27`		`- var constantRef = module.ImportReference(constantDef);`
`28`		`- yield return Instruction.Create(OpCodes.Call, constantRef);`
	`25`	`+ var constantReference = module.ImportMethodReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Constraint"),`
	`26`	`+ methodName: "Constant",`
	`27`	`+ paramCount: 1,`
	`28`	`+ predicate: md => md.IsStatic);`
	`29`	`+ yield return Instruction.Create(OpCodes.Call, constantReference);`
`29`	`30`	`}`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,11 @@ public IEnumerable<Instruction> ConvertFromString(string value, ILContext contex`
`26`	`26`	`if (parts.Length == 1 \|\| (parts.Length == 2 && parts [0] == "LayoutOptions")) {`
`27`	`27`	`var options = parts [parts.Length - 1];`
`28`	`28`
`29`		`- var field = module.ImportReferenceCached(typeof(LayoutOptions)).ResolveCached().Fields.SingleOrDefault(fd => fd.Name == options && fd.IsStatic);`
`30`		`- if (field != null) {`
`31`		`- yield return Instruction.Create(OpCodes.Ldsfld, module.ImportReference(field));`
	`29`	`+ var fieldReference = module.ImportFieldReference(("Xamarin.Forms.Core", "Xamarin.Forms", "LayoutOptions"),`
	`30`	`+ fieldName: options,`
	`31`	`+ predicate: fd => fd.IsStatic);`
	`32`	`+ if (fieldReference != null) {`
	`33`	`+ yield return Instruction.Create(OpCodes.Ldsfld, fieldReference);`
`32`	`34`	`yield break;`
`33`	`35`	`}`
`34`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,7 @@ IEnumerable<Instruction> GenerateIL(double x, double y, double w, double h, Modu`
`43`	`43`	`yield return Instruction.Create(OpCodes.Ldc_R8, w);`
`44`	`44`	`yield return Instruction.Create(OpCodes.Ldc_R8, h);`
`45`	`45`
`46`		`- var rectangleCtor = module.ImportReferenceCached(typeof(Rectangle)).ResolveCached().Methods.FirstOrDefault(md => md.IsConstructor && md.Parameters.Count == 4);`
`47`		`- var rectangleCtorRef = module.ImportReference(rectangleCtor);`
`48`		`- yield return Instruction.Create(OpCodes.Newobj, rectangleCtorRef);`
	`46`	`+ yield return Instruction.Create(OpCodes.Newobj, module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Rectangle"), paramCount: 4));`
`49`	`47`	`}`
`50`	`48`	`}`
`51`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,8 @@ 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`		`- var thicknessCtor = module.ImportReferenceCached(typeof(Thickness)).ResolveCached().Methods.FirstOrDefault(md => md.IsConstructor && md.Parameters.Count == args.Length);`
`49`		`- var thicknessCtorRef = module.ImportReference(thicknessCtor);`
`50`		`- yield return Instruction.Create(OpCodes.Newobj, thicknessCtorRef);`
	`48`	`+ yield return Instruction.Create(OpCodes.Newobj, module.ImportCtorReference(("Xamarin.Forms.Core", "Xamarin.Forms", "Thickness"),`
	`49`	`+ paramCount: args.Length));`
`51`	`50`	`}`
`52`	`51`	`}`
`53`	`52`