diff options
| author | Stephane Delcroix <stephane@delcroix.org> | 2017-02-13 12:19:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 12:19:05 +0100 |
| commit | c2a6bb05b1fe9e530652445e7c8101cfb39155bd (patch) | |
| tree | d19e20451a6aacaceddf3d5b42e3fa1e419d03e3 /Xamarin.Forms.Build.Tasks | |
| parent | d108dfe17652d3f6a18bf76d0b7f955b74244998 (diff) | |
| download | xamarin-forms-c2a6bb05b1fe9e530652445e7c8101cfb39155bd.tar.gz xamarin-forms-c2a6bb05b1fe9e530652445e7c8101cfb39155bd.tar.bz2 xamarin-forms-c2a6bb05b1fe9e530652445e7c8101cfb39155bd.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) |