From 45ce925a114af5d6b2f007e3b40a34b43d71006a Mon Sep 17 00:00:00 2001 From: Stephane Delcroix Date: Wed, 25 Jan 2017 15:09:54 +0100 Subject: [PATCH] [XamlC] allow xml-elements as Setter/Trigger Values (#684) --- .../CompiledValueProviders/SetterValueProvider.cs | 2 +- .../CompiledValueProviders/TriggerValueProvider.cs | 2 +- Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Xamarin.Forms.Build.Tasks/CompiledValueProviders/SetterValueProvider.cs b/Xamarin.Forms.Build.Tasks/CompiledValueProviders/SetterValueProvider.cs index e8bca7c..e2d7488 100644 --- a/Xamarin.Forms.Build.Tasks/CompiledValueProviders/SetterValueProvider.cs +++ b/Xamarin.Forms.Build.Tasks/CompiledValueProviders/SetterValueProvider.cs @@ -44,4 +44,4 @@ namespace Xamarin.Forms.Core.XamlC yield return Instruction.Create(OpCodes.Callvirt, setValueRef); } } -} \ No newline at end of file +} diff --git a/Xamarin.Forms.Build.Tasks/CompiledValueProviders/TriggerValueProvider.cs b/Xamarin.Forms.Build.Tasks/CompiledValueProviders/TriggerValueProvider.cs index 6b4f0b6..35b4adc 100644 --- a/Xamarin.Forms.Build.Tasks/CompiledValueProviders/TriggerValueProvider.cs +++ b/Xamarin.Forms.Build.Tasks/CompiledValueProviders/TriggerValueProvider.cs @@ -44,4 +44,4 @@ namespace Xamarin.Forms.Core.XamlC yield return Instruction.Create(OpCodes.Callvirt, setValueRef); } } -} \ No newline at end of file +} diff --git a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj index b0e4fa5..edd19e4 100644 --- a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj +++ b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj @@ -427,6 +427,9 @@ Bz53203.xaml + + Bz51567.xaml + @@ -775,6 +778,9 @@ MSBuild:UpdateDesignTimeXaml + + MSBuild:UpdateDesignTimeXaml + -- 2.7.4