diff options
author | Stephane Delcroix <stephane@delcroix.org> | 2016-10-12 09:11:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-12 09:11:29 +0200 |
commit | 0a9f7bbc5598906feb59bae714d5bbc6d37919e2 (patch) | |
tree | 282c665c2cd4b855c737d9f5bcac98897e43e53d /Xamarin.Forms.Build.Tasks | |
parent | 46b57aaa0e9e902537c1cc8c99e4c7bd07c70657 (diff) | |
download | xamarin-forms-0a9f7bbc5598906feb59bae714d5bbc6d37919e2.tar.gz xamarin-forms-0a9f7bbc5598906feb59bae714d5bbc6d37919e2.tar.bz2 xamarin-forms-0a9f7bbc5598906feb59bae714d5bbc6d37919e2.zip |
[XamlG] Fully qualify method names (#417)
Diffstat (limited to 'Xamarin.Forms.Build.Tasks')
-rw-r--r-- | Xamarin.Forms.Build.Tasks/XamlGTask.cs | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Xamarin.Forms.Build.Tasks/XamlGTask.cs b/Xamarin.Forms.Build.Tasks/XamlGTask.cs index 79a49c46..a0813a5c 100644 --- a/Xamarin.Forms.Build.Tasks/XamlGTask.cs +++ b/Xamarin.Forms.Build.Tasks/XamlGTask.cs @@ -113,10 +113,6 @@ namespace Xamarin.Forms.Build.Tasks var declNs = new CodeNamespace(rootNs); ccu.Namespaces.Add(declNs); - declNs.Imports.Add(new CodeNamespaceImport("System")); - declNs.Imports.Add(new CodeNamespaceImport("Xamarin.Forms")); - declNs.Imports.Add(new CodeNamespaceImport("Xamarin.Forms.Xaml")); - var declType = new CodeTypeDeclaration(rootType); declType.IsPartial = true; declType.BaseTypes.Add(baseType); @@ -136,8 +132,8 @@ namespace Xamarin.Forms.Build.Tasks declType.Members.Add(initcomp); initcomp.Statements.Add(new CodeMethodInvokeExpression( - new CodeThisReferenceExpression(), - "LoadFromXaml", new CodeTypeOfExpression(declType.Name))); + new CodeTypeReferenceExpression(new CodeTypeReference("global::Xamarin.Forms.Xaml.Extensions")), + "LoadFromXaml", new CodeThisReferenceExpression(), new CodeTypeOfExpression(declType.Name))); foreach (var entry in namesAndTypes) { @@ -160,8 +156,9 @@ namespace Xamarin.Forms.Build.Tasks var find_invoke = new CodeMethodInvokeExpression( new CodeMethodReferenceExpression( - new CodeThisReferenceExpression(), - "FindByName", type), new CodePrimitiveExpression(name)); + new CodeTypeReferenceExpression(new CodeTypeReference("global::Xamarin.Forms.NameScopeExtensions")), + "FindByName", type), + new CodeThisReferenceExpression(), new CodePrimitiveExpression(name)); //CodeCastExpression cast = new CodeCastExpression (type, find_invoke); |