Switch main projects to Microsoft.Xaml.Behaviors

Caliburn-Micro · Dec 13, 2018 · 19176c5 · 19176c5
1 parent f23095d
commit 19176c5
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 19 deletions.
diff --git a/lib/System.Windows.Interactivity.dll b/lib/System.Windows.Interactivity.dll
diff --git 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
 
     /// <summary>

diff --git a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.csproj b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.csproj
@@ -23,19 +23,15 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net46'">
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version=" 1.0.1" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="System.Windows.Interactivity">
-      <HintPath>..\..\lib\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
-
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
     <Compile Include="Platforms\net46\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup Label="Package">
-    <None Include="..\..\lib\System.Windows.Interactivity.dll" PackagePath="lib\net46" Pack="true" />
     <None Include="Platforms\uap\Caliburn.Micro.Platform.rd.xml" PackagePath="lib\uap10.0.16299\Caliburn.Micro.Platform\Properties\Caliburn.Micro.Platform.rd.xml" Pack="true" />
   </ItemGroup>
 

diff --git 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
@@ -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
 
     /// <summary>

diff --git 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
@@ -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
@@ -2,7 +2,7 @@
     using System.Collections.Specialized;
     using System.Linq;
     using System.Windows;
-    using System.Windows.Interactivity;
+    using Microsoft.Xaml.Behaviors;
 
     /// <summary>
     /// 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
@@ -2,7 +2,7 @@
     using System;
     using System.ComponentModel;
     using System.Windows;
-    using System.Windows.Interactivity;
+    using Microsoft.Xaml.Behaviors;
 
     /// <summary>
     /// Represents a parameter of an <see cref="ActionMessage"/>.

diff --git 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
 
     /// <summary>