summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Delcroix <stephane@delcroix.org>2017-02-02 10:57:50 +0100
committerKangho Hur <kangho.hur@samsung.com>2017-03-24 13:18:09 +0900
commitd76030e441b0b64aa6aaaea7cdaab243161da535 (patch)
treee79f9951a29481763cc77030dd4d2a4808d261b5
parentc4d6f22082106321825660a1ecd3b8154acaab52 (diff)
downloadxamarin-forms-d76030e441b0b64aa6aaaea7cdaab243161da535.tar.gz
xamarin-forms-d76030e441b0b64aa6aaaea7cdaab243161da535.tar.bz2
xamarin-forms-d76030e441b0b64aa6aaaea7cdaab243161da535.zip
[XamlC] Produce correct mdb files (#699)
* [XamlC] change MockCompile (internal) API * [XamlC] fix debugging in unit test project * f * [XamlC] update cecil to 0.10.0-beta1-v2 * beta2 * avoid method duplication * [XamlC] force loading MdbReader and Writer * [XamlC] force use the writer in the other task too * [XamlC] fix test and test code generator * try building this * [XamlC] Ensure InitializeComponent is correctly routed * fix
-rw-r--r--Xamarin.Forms.Build.Tasks/CompiledConverters/ListStringTypeConverter.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/Xamarin.Forms.Build.Tasks/CompiledConverters/ListStringTypeConverter.cs b/Xamarin.Forms.Build.Tasks/CompiledConverters/ListStringTypeConverter.cs
index 62d7d69d..3f1c0569 100644
--- a/Xamarin.Forms.Build.Tasks/CompiledConverters/ListStringTypeConverter.cs
+++ b/Xamarin.Forms.Build.Tasks/CompiledConverters/ListStringTypeConverter.cs
@@ -20,13 +20,13 @@ namespace Xamarin.Forms.Core.XamlC
}
var parts = value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(s => s.Trim()).ToList();
- var listCtor = module.Import(typeof(List<>)).Resolve().Methods.FirstOrDefault(md => md.IsConstructor && md.Parameters.Count == 1 && md.Parameters[0].ParameterType.FullName == "System.Int32");
- var listCtorRef = module.Import(listCtor);
- listCtorRef = module.Import(listCtorRef.ResolveGenericParameters(module.Import(typeof(List<string>)), module));
+ var listCtor = module.ImportReference(typeof(List<>)).Resolve().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.ImportReference(typeof(List<string>)), module));
- var adder = module.Import(typeof(ICollection<>)).Resolve().Methods.FirstOrDefault(md => md.Name == "Add" && md.Parameters.Count == 1);
- var adderRef = module.Import(adder);
- adderRef = module.Import(adderRef.ResolveGenericParameters(module.Import(typeof(ICollection<string>)), module));
+ var adder = module.ImportReference(typeof(ICollection<>)).Resolve().Methods.FirstOrDefault(md => md.Name == "Add" && md.Parameters.Count == 1);
+ var adderRef = module.ImportReference(adder);
+ adderRef = module.ImportReference(adderRef.ResolveGenericParameters(module.ImportReference(typeof(ICollection<string>)), module));
yield return Instruction.Create(OpCodes.Ldc_I4, parts.Count);
yield return Instruction.Create(OpCodes.Newobj, listCtorRef);