housekeeeping: Change blend SDK to use official microsoft version. (r…

…eactiveui#2070)
InitialForce · Jun 13, 2019 · a8d1439 · a8d1439
1 parent ee5d742
commit a8d1439
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/ReactiveUI.Blend/FollowObservableStateBehavior.cs b/src/ReactiveUI.Blend/FollowObservableStateBehavior.cs
@@ -12,7 +12,7 @@
 #else
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 #endif
 
 #pragma warning disable SA1201 // A field should not follow a property - macro if statements make this hard

diff --git a/src/ReactiveUI.Blend/Platforms/net461/ObservableTrigger.cs b/src/ReactiveUI.Blend/Platforms/net461/ObservableTrigger.cs
@@ -9,7 +9,7 @@
 using System.Reactive.Linq;
 using System.Text;
 using System.Windows;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 
 namespace ReactiveUI.Blend
 {

diff --git a/src/ReactiveUI.Blend/ReactiveUI.Blend.csproj b/src/ReactiveUI.Blend/ReactiveUI.Blend.csproj
@@ -20,7 +20,7 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="PresentationFramework.Aero" />
-    <PackageReference Include="Expression.Blend.Sdk" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('uap')) ">

diff --git a/src/ReactiveUI.Tests/Platforms/windows-xaml/Api/ApiApprovalTests.Blend.net461.approved.txt b/src/ReactiveUI.Tests/Platforms/windows-xaml/Api/ApiApprovalTests.Blend.net461.approved.txt
@@ -1,7 +1,7 @@
 [assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName=".NET Framework 4.6.1")]
 namespace ReactiveUI.Blend
 {
-    public class FollowObservableStateBehavior : System.Windows.Interactivity.Behavior<System.Windows.FrameworkElement>
+    public class FollowObservableStateBehavior : Microsoft.Xaml.Behaviors.Behavior<System.Windows.FrameworkElement>
     {
         public static readonly System.Windows.DependencyProperty StateObservableProperty;
         public static readonly System.Windows.DependencyProperty TargetObjectProperty;
@@ -12,7 +12,7 @@ namespace ReactiveUI.Blend
         protected override void OnDetaching() { }
         protected static void OnStateObservableChanged(System.Windows.DependencyObject sender, System.Windows.DependencyPropertyChangedEventArgs e) { }
     }
-    public class ObservableTrigger : System.Windows.Interactivity.TriggerBase<System.Windows.FrameworkElement>
+    public class ObservableTrigger : Microsoft.Xaml.Behaviors.TriggerBase<System.Windows.FrameworkElement>
     {
         public static readonly System.Windows.DependencyProperty ObservableProperty;
         public ObservableTrigger() { }