Merge pull request PrismLibrary#1934 from tibel/XamlBehaviorsWpf

Microsoft.Xaml.Behaviors.Wpf
dprevato · Dec 13, 2019 · f474c28 · f474c28
2 parents 8c7d704 + 3b37dd2
commit f474c28
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 23 deletions.
diff --git a/Sandbox/Wpf/HelloWorld/HelloWorld/HelloWorld.csproj b/Sandbox/Wpf/HelloWorld/HelloWorld/HelloWorld.csproj
@@ -38,10 +38,6 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Source\Wpf\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />

diff --git a/Source/Wpf/Prism.Wpf.Tests/Interactivity/InteractionRequestTriggerFixture.cs b/Source/Wpf/Prism.Wpf.Tests/Interactivity/InteractionRequestTriggerFixture.cs
@@ -60,7 +60,7 @@ protected override void OnEvent(EventArgs eventArgs)
         }
     }
 
-    public class TestableTriggerAction : System.Windows.Interactivity.TriggerAction<DependencyObject>
+    public class TestableTriggerAction : Microsoft.Xaml.Behaviors.TriggerAction<DependencyObject>
     {
         public int ExecutionCount { get; set; }
 

diff --git a/Source/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj b/Source/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj
@@ -29,9 +29,6 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Transactions" />
-    <Reference Include="System.Windows.Interactivity">
-      <HintPath>..\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
     <PackageReference Include="Moq" Version="4.13.0" />
     <PackageReference Include="xunit" Version="2.4.1" />

diff --git a/Source/Wpf/Prism.Wpf/Interactivity/InteractionRequest/InteractionRequestTrigger.cs b/Source/Wpf/Prism.Wpf/Interactivity/InteractionRequest/InteractionRequestTrigger.cs
@@ -1,13 +1,13 @@
+using Microsoft.Xaml.Behaviors;
 using System;
-using System.Windows.Interactivity;
 
 namespace Prism.Interactivity.InteractionRequest
 {
     /// <summary>
     /// Custom event trigger for using with <see cref="IInteractionRequest"/> objects.
     /// </summary>
     /// <remarks>
-    /// The standard <see cref="System.Windows.Interactivity.EventTrigger"/> class can be used instead, as long as the 'Raised' event 
+    /// The standard <see cref="Microsoft.Xaml.Behaviors.EventTrigger"/> class can be used instead, as long as the 'Raised' event 
     /// name is specified.
     /// </remarks>
     [Obsolete("Please use the new IDialogService for an improved dialog experience.")]

diff --git a/Source/Wpf/Prism.Wpf/Interactivity/InvokeCommandAction.cs b/Source/Wpf/Prism.Wpf/Interactivity/InvokeCommandAction.cs
@@ -1,7 +1,7 @@
+using Microsoft.Xaml.Behaviors;
 using System.Reflection;
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Interactivity;
 
 namespace Prism.Interactivity
 {

diff --git a/Source/Wpf/Prism.Wpf/Interactivity/PopupWindowAction.cs b/Source/Wpf/Prism.Wpf/Interactivity/PopupWindowAction.cs
@@ -5,8 +5,8 @@
 using Prism.Interactivity.InteractionRequest;
 using System;
 using System.Windows;
-using System.Windows.Interactivity;
 using CommonServiceLocator;
+using Microsoft.Xaml.Behaviors;
 
 namespace Prism.Interactivity
 {

diff --git a/Source/Wpf/Prism.Wpf/Prism.Wpf.csproj b/Source/Wpf/Prism.Wpf/Prism.Wpf.csproj
@@ -30,12 +30,7 @@ Prism.Wpf helps you more easily design and build rich, flexible, and easy to mai
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="System.Windows.Interactivity">
-      <HintPath>..\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
-  <ItemGroup>
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.3" />
     <PackageReference Include="CommonServiceLocator" Version="2.0.4" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All" />
   </ItemGroup>
@@ -44,9 +39,4 @@ Prism.Wpf helps you more easily design and build rich, flexible, and easy to mai
     <ProjectReference Include="..\..\Prism\Prism.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Include="..\System.Windows.Interactivity.dll" Pack="true" PackagePath="lib\net45" />
-    <Content Include="..\System.Windows.Interactivity.dll" Pack="true" PackagePath="lib\netcoreapp3.0" />
-  </ItemGroup>
-
 </Project>
diff --git a/Source/Wpf/System.Windows.Interactivity.dll b/Source/Wpf/System.Windows.Interactivity.dll
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,7 +60,7 @@ protected override void OnEvent(EventArgs eventArgs) @@
             }
         }
-        public class TestableTriggerAction : System.Windows.Interactivity.TriggerAction<DependencyObject>
+        public class TestableTriggerAction : Microsoft.Xaml.Behaviors.TriggerAction<DependencyObject>
         {
             public int ExecutionCount { get; set; }
@@ Expand Down @@