Xamlc compile data triggers (#648)

* [Xaml] DataTrigger and PropertyCondition no longer use a ServiceProvider

* [XamlC] avoid generating ServiceProvider for unused ProvideValue

* fix tests

2 files changed, 8 insertions, 12 deletions

diff --git a/Xamarin.Forms.Core/Interactivity/BindingCondition.cs b/Xamarin.Forms.Core/Interactivity/BindingCondition.cs
index 1d111850..ccf55e58 100644
--- a/Xamarin.Forms.Core/Interactivity/BindingCondition.cs
+++ b/Xamarin.Forms.Core/Interactivity/BindingCondition.cs
@@ -3,6 +3,7 @@ using Xamarin.Forms.Xaml;
 
 namespace Xamarin.Forms
 {
+	[ProvideCompiled("Xamarin.Forms.Core.XamlC.PassthroughValueProvider")]
 	public sealed class BindingCondition : Condition, IValueProvider
 	{
 		readonly BindableProperty _boundProperty;
@@ -41,15 +42,9 @@ namespace Xamarin.Forms
 			}
 		}
 
-		internal IServiceProvider ServiceProvider { get; set; }
-
-		internal IValueConverterProvider ValueConverter { get; set; }
-
 		object IValueProvider.ProvideValue(IServiceProvider serviceProvider)
 		{
-			ValueConverter = serviceProvider.GetService(typeof(IValueConverterProvider)) as IValueConverterProvider;
-			ServiceProvider = serviceProvider;
-
+			//This is no longer required
 			return this;
 		}
 
@@ -71,14 +66,16 @@ namespace Xamarin.Forms
 			bindable.ClearValue(_boundProperty);
 		}
 
+		static IValueConverterProvider s_valueConverter = DependencyService.Get<IValueConverterProvider>();
+
 		bool EqualsToValue(object other)
 		{
 			if ((other == Value) || (other != null && other.Equals(Value)))
 				return true;
 
 			object converted = null;
-			if (ValueConverter != null)
-				converted = ValueConverter.Convert(Value, other != null ? other.GetType() : typeof(object), null, ServiceProvider);
+			if (s_valueConverter != null)
+				converted = s_valueConverter.Convert(Value, other != null ? other.GetType() : typeof(object), null, null);
 			else
 				return false;
 
diff --git a/Xamarin.Forms.Core/Interactivity/DataTrigger.cs b/Xamarin.Forms.Core/Interactivity/DataTrigger.cs
index e27ec134..d90cf44e 100644
--- a/Xamarin.Forms.Core/Interactivity/DataTrigger.cs
+++ b/Xamarin.Forms.Core/Interactivity/DataTrigger.cs
@@ -5,6 +5,7 @@ using Xamarin.Forms.Xaml;
 namespace Xamarin.Forms
 {
 	[ContentProperty("Setters")]
+	[ProvideCompiled("Xamarin.Forms.Core.XamlC.PassthroughValueProvider")]
 	public sealed class DataTrigger : TriggerBase, IValueProvider
 	{
 		public DataTrigger([TypeConverter(typeof(TypeTypeConverter))] [Parameter("TargetType")] Type targetType) : base(new BindingCondition(), targetType)
@@ -48,9 +49,7 @@ namespace Xamarin.Forms
 
 		object IValueProvider.ProvideValue(IServiceProvider serviceProvider)
 		{
-			var valueconverter = serviceProvider.GetService(typeof(IValueConverterProvider)) as IValueConverterProvider;
-			(Condition as BindingCondition).ValueConverter = valueconverter;
-
+			//This is no longer required
 			return this;
 		}
 	}