diff options
author | Stephane Delcroix <stephane@delcroix.org> | 2017-02-13 12:19:05 +0100 |
---|---|---|
committer | Rui Marinho <me@ruimarinho.net> | 2017-03-09 18:52:40 +0000 |
commit | 1068d53e021b3a541414ddd47a3b35782d757caa (patch) | |
tree | 2d7abdf1c30b234ebd88c793c18becca005dc389 /Xamarin.Forms.Build.Tasks | |
parent | f94dbe6be6ea18aab7b4caff79595cd877c9071c (diff) | |
download | xamarin-forms-1068d53e021b3a541414ddd47a3b35782d757caa.tar.gz xamarin-forms-1068d53e021b3a541414ddd47a3b35782d757caa.tar.bz2 xamarin-forms-1068d53e021b3a541414ddd47a3b35782d757caa.zip |
[XamlC] complete the Setter/Trigger fix (#737)
Diffstat (limited to 'Xamarin.Forms.Build.Tasks')
-rw-r--r-- | Xamarin.Forms.Build.Tasks/CompiledValueProviders/SetterValueProvider.cs | 4 | ||||
-rw-r--r-- | Xamarin.Forms.Build.Tasks/CompiledValueProviders/TriggerValueProvider.cs | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Xamarin.Forms.Build.Tasks/CompiledValueProviders/SetterValueProvider.cs b/Xamarin.Forms.Build.Tasks/CompiledValueProviders/SetterValueProvider.cs index e417f118..e8bca7c1 100644 --- a/Xamarin.Forms.Build.Tasks/CompiledValueProviders/SetterValueProvider.cs +++ b/Xamarin.Forms.Build.Tasks/CompiledValueProviders/SetterValueProvider.cs @@ -14,7 +14,9 @@ namespace Xamarin.Forms.Core.XamlC public IEnumerable<Instruction> ProvideValue(VariableDefinitionReference vardefref, ModuleDefinition module, BaseNode node, ILContext context) { INode valueNode = null; - if (!((IElementNode)node).Properties.TryGetValue(new XmlName("", "Value"), out valueNode) && ((IElementNode)node).CollectionItems.Count == 1) + if (!((IElementNode)node).Properties.TryGetValue(new XmlName("", "Value"), out valueNode) && + !((IElementNode)node).Properties.TryGetValue(new XmlName("http://xamarin.com/schemas/2014/forms", "Value"), out valueNode) && + ((IElementNode)node).CollectionItems.Count == 1) valueNode = ((IElementNode)node).CollectionItems[0]; if (valueNode == null) diff --git a/Xamarin.Forms.Build.Tasks/CompiledValueProviders/TriggerValueProvider.cs b/Xamarin.Forms.Build.Tasks/CompiledValueProviders/TriggerValueProvider.cs index e00a1c11..6b4f0b6b 100644 --- a/Xamarin.Forms.Build.Tasks/CompiledValueProviders/TriggerValueProvider.cs +++ b/Xamarin.Forms.Build.Tasks/CompiledValueProviders/TriggerValueProvider.cs @@ -14,7 +14,9 @@ namespace Xamarin.Forms.Core.XamlC public IEnumerable<Instruction> ProvideValue(VariableDefinitionReference vardefref, ModuleDefinition module, BaseNode node, ILContext context) { INode valueNode = null; - if (!((IElementNode)node).Properties.TryGetValue(new XmlName("", "Value"), out valueNode) && ((IElementNode)node).CollectionItems.Count == 1) + if (!((IElementNode)node).Properties.TryGetValue(new XmlName("", "Value"), out valueNode) && + !((IElementNode)node).Properties.TryGetValue(new XmlName("http://xamarin.com/schemas/2014/forms", "Value"), out valueNode) && + ((IElementNode)node).CollectionItems.Count == 1) valueNode = ((IElementNode)node).CollectionItems[0]; if (valueNode == null) |