diff --git a/lib/System.Windows.Interactivity.dll b/lib/System.Windows.Interactivity.dll deleted file mode 100644 index 931c744c8..000000000 Binary files a/lib/System.Windows.Interactivity.dll and /dev/null differ diff --git a/src/Caliburn.Micro.Platform/ActionMessage.cs b/src/Caliburn.Micro.Platform/ActionMessage.cs index 70d80e6b5..82ee992b4 100644 --- a/src/Caliburn.Micro.Platform/ActionMessage.cs +++ b/src/Caliburn.Micro.Platform/ActionMessage.cs @@ -15,13 +15,11 @@ using EventTrigger = Microsoft.Xaml.Interactions.Core.EventTriggerBehavior; #else using System.Windows; - using System.Windows.Controls; using System.Windows.Controls.Primitives; using System.Windows.Data; - using System.Windows.Interactivity; using System.Windows.Markup; - using System.Windows.Media; - using EventTrigger = System.Windows.Interactivity.EventTrigger; + using Microsoft.Xaml.Behaviors; + using EventTrigger = Microsoft.Xaml.Behaviors.EventTrigger; #endif /// diff --git a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.csproj b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.csproj index bb14876a7..3e9db3c0d 100644 --- a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.csproj +++ b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.csproj @@ -23,19 +23,15 @@ + - - ..\..\lib\System.Windows.Interactivity.dll - - - diff --git a/src/Caliburn.Micro.Platform/ConventionManager.cs b/src/Caliburn.Micro.Platform/ConventionManager.cs index ec85adc8f..fdcb534f3 100644 --- a/src/Caliburn.Micro.Platform/ConventionManager.cs +++ b/src/Caliburn.Micro.Platform/ConventionManager.cs @@ -19,7 +19,7 @@ using System.Windows.Data; using System.Windows.Markup; using System.Windows.Shapes; - using EventTrigger = System.Windows.Interactivity.EventTrigger; + using EventTrigger = Microsoft.Xaml.Behaviors.EventTrigger; #endif #if !WINDOWS_UWP using System.Windows.Documents; diff --git a/src/Caliburn.Micro.Platform/ElementConvention.cs b/src/Caliburn.Micro.Platform/ElementConvention.cs index 64bc18d6c..5946817f0 100644 --- a/src/Caliburn.Micro.Platform/ElementConvention.cs +++ b/src/Caliburn.Micro.Platform/ElementConvention.cs @@ -12,7 +12,7 @@ using FrameworkElement = global::Xamarin.Forms.VisualElement; #else using System.Windows; - using TriggerBase = System.Windows.Interactivity.TriggerBase; + using TriggerBase = Microsoft.Xaml.Behaviors.TriggerBase; #endif /// diff --git a/src/Caliburn.Micro.Platform/Message.cs b/src/Caliburn.Micro.Platform/Message.cs index b315ff283..422a0b030 100644 --- a/src/Caliburn.Micro.Platform/Message.cs +++ b/src/Caliburn.Micro.Platform/Message.cs @@ -15,8 +15,8 @@ using DependencyObject = global::Xamarin.Forms.BindableObject; #else using System.Windows; - using System.Windows.Interactivity; - using TriggerBase = System.Windows.Interactivity.TriggerBase; + using Microsoft.Xaml.Behaviors; + using TriggerBase = Microsoft.Xaml.Behaviors.TriggerBase; #endif diff --git a/src/Caliburn.Micro.Platform/Parser.cs b/src/Caliburn.Micro.Platform/Parser.cs index 7c8337ecb..c06b9421f 100644 --- a/src/Caliburn.Micro.Platform/Parser.cs +++ b/src/Caliburn.Micro.Platform/Parser.cs @@ -24,9 +24,9 @@ using System.Text.RegularExpressions; using System.Windows; using System.Windows.Data; - using EventTrigger = System.Windows.Interactivity.EventTrigger; - using TriggerBase = System.Windows.Interactivity.TriggerBase; - using TriggerAction = System.Windows.Interactivity.TriggerAction; + using EventTrigger = Microsoft.Xaml.Behaviors.EventTrigger; + using TriggerBase = Microsoft.Xaml.Behaviors.TriggerBase; + using TriggerAction = Microsoft.Xaml.Behaviors.TriggerAction; using System.Text; #endif diff --git a/src/Caliburn.Micro.Platform/Platforms/net46/AttachedCollection.cs b/src/Caliburn.Micro.Platform/Platforms/net46/AttachedCollection.cs index bb4f85a37..6a59ccf5a 100644 --- a/src/Caliburn.Micro.Platform/Platforms/net46/AttachedCollection.cs +++ b/src/Caliburn.Micro.Platform/Platforms/net46/AttachedCollection.cs @@ -2,7 +2,7 @@ using System.Collections.Specialized; using System.Linq; using System.Windows; - using System.Windows.Interactivity; + using Microsoft.Xaml.Behaviors; /// /// A collection that can exist as part of a behavior. diff --git a/src/Caliburn.Micro.Platform/Platforms/net46/Parameter.cs b/src/Caliburn.Micro.Platform/Platforms/net46/Parameter.cs index 7f1d1f6f6..e00344c11 100644 --- a/src/Caliburn.Micro.Platform/Platforms/net46/Parameter.cs +++ b/src/Caliburn.Micro.Platform/Platforms/net46/Parameter.cs @@ -2,7 +2,7 @@ using System; using System.ComponentModel; using System.Windows; - using System.Windows.Interactivity; + using Microsoft.Xaml.Behaviors; /// /// Represents a parameter of an . diff --git a/src/Caliburn.Micro.Platform/ViewModelBinder.cs b/src/Caliburn.Micro.Platform/ViewModelBinder.cs index 9e8bf3ddc..d148b0ceb 100644 --- a/src/Caliburn.Micro.Platform/ViewModelBinder.cs +++ b/src/Caliburn.Micro.Platform/ViewModelBinder.cs @@ -15,7 +15,7 @@ using Microsoft.Xaml.Interactivity; #else using System.Windows; - using System.Windows.Interactivity; + using Microsoft.Xaml.Behaviors; #endif ///