diff --git a/src/Controls/src/Build.Tasks/CompiledValueProviders/PassthroughValueProvider.cs b/src/Controls/src/Build.Tasks/CompiledValueProviders/PassthroughValueProvider.cs deleted file mode 100644 index bad82a085d9d..000000000000 --- a/src/Controls/src/Build.Tasks/CompiledValueProviders/PassthroughValueProvider.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections.Generic; -using Microsoft.Maui.Controls.Build.Tasks; -using Microsoft.Maui.Controls.Xaml; -using Mono.Cecil; -using Mono.Cecil.Cil; - -namespace Microsoft.Maui.Controls.XamlC -{ - class PassthroughValueProvider : ICompiledValueProvider - { - public IEnumerable ProvideValue(VariableDefinitionReference vardefref, ModuleDefinition module, BaseNode node, ILContext context) - { - yield break; - } - } -} \ No newline at end of file diff --git a/src/Controls/src/Core/Interactivity/BindingCondition.cs b/src/Controls/src/Core/Interactivity/BindingCondition.cs index 505bb3953383..e054a2f55e1f 100644 --- a/src/Controls/src/Core/Interactivity/BindingCondition.cs +++ b/src/Controls/src/Core/Interactivity/BindingCondition.cs @@ -5,9 +5,7 @@ namespace Microsoft.Maui.Controls { /// - [ProvideCompiled("Microsoft.Maui.Controls.XamlC.PassthroughValueProvider")] - [AcceptEmptyServiceProvider] - public sealed class BindingCondition : Condition, IValueProvider + public sealed class BindingCondition : Condition { readonly BindableProperty _boundProperty; @@ -48,12 +46,6 @@ public object Value } } - object IValueProvider.ProvideValue(IServiceProvider serviceProvider) - { - //This is no longer required - return this; - } - internal override bool GetState(BindableObject bindable) { object newValue = bindable.GetValue(_boundProperty); diff --git a/src/Controls/src/Core/Interactivity/DataTrigger.cs b/src/Controls/src/Core/Interactivity/DataTrigger.cs index 6e64662f5d8a..51e85432fd4b 100644 --- a/src/Controls/src/Core/Interactivity/DataTrigger.cs +++ b/src/Controls/src/Core/Interactivity/DataTrigger.cs @@ -7,9 +7,7 @@ namespace Microsoft.Maui.Controls { /// [ContentProperty("Setters")] - [ProvideCompiled("Microsoft.Maui.Controls.XamlC.PassthroughValueProvider")] - [AcceptEmptyServiceProvider] - public sealed class DataTrigger : TriggerBase, IValueProvider + public sealed class DataTrigger : TriggerBase { /// public DataTrigger([System.ComponentModel.TypeConverter(typeof(TypeTypeConverter))][Parameter("TargetType")] Type targetType) : base(new BindingCondition(), targetType) @@ -53,11 +51,5 @@ public object Value OnPropertyChanged(); } } - - object IValueProvider.ProvideValue(IServiceProvider serviceProvider) - { - //This is no longer required - return this; - } } } \ No newline at end of file diff --git a/src/Controls/src/Core/Interactivity/PropertyCondition.cs b/src/Controls/src/Core/Interactivity/PropertyCondition.cs index 370683c673b0..05dd31beef8f 100644 --- a/src/Controls/src/Core/Interactivity/PropertyCondition.cs +++ b/src/Controls/src/Core/Interactivity/PropertyCondition.cs @@ -7,9 +7,7 @@ namespace Microsoft.Maui.Controls { /// - [ProvideCompiled("Microsoft.Maui.Controls.XamlC.PassthroughValueProvider")] - [AcceptEmptyServiceProvider] - public sealed class PropertyCondition : Condition, IValueProvider + public sealed class PropertyCondition : Condition { readonly BindableProperty _stateProperty; @@ -84,12 +82,6 @@ public object Value } } - object IValueProvider.ProvideValue(IServiceProvider serviceProvider) - { - //This is no longer required - return this; - } - internal override bool GetState(BindableObject bindable) { return (bool)bindable.GetValue(_stateProperty); diff --git a/src/Controls/src/Core/Interactivity/Trigger.cs b/src/Controls/src/Core/Interactivity/Trigger.cs index b6e424365180..0b92cf9fd7d5 100644 --- a/src/Controls/src/Core/Interactivity/Trigger.cs +++ b/src/Controls/src/Core/Interactivity/Trigger.cs @@ -7,9 +7,7 @@ namespace Microsoft.Maui.Controls { /// [ContentProperty("Setters")] - [ProvideCompiled("Microsoft.Maui.Controls.XamlC.PassthroughValueProvider")] - [AcceptEmptyServiceProvider] - public sealed class Trigger : TriggerBase, IValueProvider + public sealed class Trigger : TriggerBase { /// public Trigger([System.ComponentModel.TypeConverter(typeof(TypeTypeConverter))][Parameter("TargetType")] Type targetType) : base(new PropertyCondition(), targetType) @@ -53,11 +51,5 @@ public object Value OnPropertyChanged(); } } - - object IValueProvider.ProvideValue(IServiceProvider serviceProvider) - { - //This is no longer required - return this; - } } } \ No newline at end of file