summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Build.Tasks/SetNamescopesAndRegisterNamesVisitor.cs
diff options
context:
space:
mode:
authorStephane Delcroix <stephane@delcroix.org>2017-03-01 19:45:03 +0100
committerJason Smith <jason.smith@xamarin.com>2017-03-01 10:45:03 -0800
commitc57f859745aeef7965e03639fc016ee0c7a8a218 (patch)
treea9629670f09032d2d352dcd8c368a0661c901392 /Xamarin.Forms.Build.Tasks/SetNamescopesAndRegisterNamesVisitor.cs
parent9b18ab9fb438a88c2be8a54aa3f567a9b1c398da (diff)
downloadxamarin-forms-c57f859745aeef7965e03639fc016ee0c7a8a218.tar.gz
xamarin-forms-c57f859745aeef7965e03639fc016ee0c7a8a218.tar.bz2
xamarin-forms-c57f859745aeef7965e03639fc016ee0c7a8a218.zip
Xamlc ppdb backport (#792)
* [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 * [XamlC] support portable pdb (#726) * [XamlC] update to cecil 0.10.0-b4 to better symbol detection (#791)
Diffstat (limited to 'Xamarin.Forms.Build.Tasks/SetNamescopesAndRegisterNamesVisitor.cs')
-rw-r--r--Xamarin.Forms.Build.Tasks/SetNamescopesAndRegisterNamesVisitor.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/Xamarin.Forms.Build.Tasks/SetNamescopesAndRegisterNamesVisitor.cs b/Xamarin.Forms.Build.Tasks/SetNamescopesAndRegisterNamesVisitor.cs
index 860ff44e..d810bd80 100644
--- a/Xamarin.Forms.Build.Tasks/SetNamescopesAndRegisterNamesVisitor.cs
+++ b/Xamarin.Forms.Build.Tasks/SetNamescopesAndRegisterNamesVisitor.cs
@@ -54,7 +54,7 @@ namespace Xamarin.Forms.Build.Tasks
namescopeVarDef = Context.Scopes[parentNode].Item1;
namesInNamescope = Context.Scopes[parentNode].Item2;
}
- if (Context.Variables[node].VariableType.InheritsFromOrImplements(Context.Body.Method.Module.Import(typeof (BindableObject))))
+ if (Context.Variables[node].VariableType.InheritsFromOrImplements(Context.Body.Method.Module.ImportReference(typeof (BindableObject))))
SetNameScope(node, namescopeVarDef);
Context.Scopes[node] = new System.Tuple<VariableDefinition, IList<string>>(namescopeVarDef, namesInNamescope);
}
@@ -63,7 +63,7 @@ namespace Xamarin.Forms.Build.Tasks
{
var namescopeVarDef = CreateNamescope();
IList<string> namesInNamescope = new List<string>();
- if (Context.Variables[node].VariableType.InheritsFromOrImplements(Context.Body.Method.Module.Import(typeof (BindableObject))))
+ if (Context.Variables[node].VariableType.InheritsFromOrImplements(Context.Body.Method.Module.ImportReference(typeof (BindableObject))))
SetNameScope(node, namescopeVarDef);
Context.Scopes[node] = new System.Tuple<VariableDefinition, IList<string>>(namescopeVarDef, namesInNamescope);
}
@@ -101,12 +101,12 @@ namespace Xamarin.Forms.Build.Tasks
VariableDefinition CreateNamescope()
{
var module = Context.Body.Method.Module;
- var nsRef = module.Import(typeof (NameScope));
+ var nsRef = module.ImportReference(typeof (NameScope));
var vardef = new VariableDefinition(nsRef);
Context.Body.Variables.Add(vardef);
var nsDef = nsRef.Resolve();
var ctorinfo = nsDef.Methods.First(md => md.IsConstructor && !md.HasParameters);
- var ctor = module.Import(ctorinfo);
+ var ctor = module.ImportReference(ctorinfo);
Context.IL.Emit(OpCodes.Newobj, ctor);
Context.IL.Emit(OpCodes.Stloc, vardef);
return vardef;
@@ -115,10 +115,10 @@ namespace Xamarin.Forms.Build.Tasks
void SetNameScope(ElementNode node, VariableDefinition ns)
{
var module = Context.Body.Method.Module;
- var nsRef = module.Import(typeof (NameScope));
+ var nsRef = module.ImportReference(typeof (NameScope));
var nsDef = nsRef.Resolve();
var setNSInfo = nsDef.Methods.First(md => md.Name == "SetNameScope" && md.IsStatic);
- var setNS = module.Import(setNSInfo);
+ var setNS = module.ImportReference(setNSInfo);
Context.IL.Emit(OpCodes.Ldloc, Context.Variables[node]);
Context.IL.Emit(OpCodes.Ldloc, ns);
Context.IL.Emit(OpCodes.Call, setNS);
@@ -131,10 +131,10 @@ namespace Xamarin.Forms.Build.Tasks
namesInNamescope.Add(str);
var module = Context.Body.Method.Module;
- var nsRef = module.Import(typeof (INameScope));
+ var nsRef = module.ImportReference(typeof (INameScope));
var nsDef = nsRef.Resolve();
var registerInfo = nsDef.Methods.First(md => md.Name == "RegisterName" && md.Parameters.Count == 2);
- var register = module.Import(registerInfo);
+ var register = module.ImportReference(registerInfo);
Context.IL.Emit(OpCodes.Ldloc, namescopeVarDef);
Context.IL.Emit(OpCodes.Ldstr, str);