Merge pull request #1327 from PrismLibrary/wpf-interactivitydll

ensure correct version of System.Windows.Interactivity
PrismLibrary · Jan 11, 2018 · 0c2d11f · 0c2d11f
2 parents 3980a58 + 578ccd6
commit 0c2d11f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,8 @@
 # WPF Version Info
 VersionInfo.cs
 
+!Source/Wpf/System.Windows.Interactivity.dll
+
 # User-specific files
 *.suo
 *.user

diff --git a/Source/Wpf/Prism.Wpf/Prism.Wpf.csproj b/Source/Wpf/Prism.Wpf/Prism.Wpf.csproj
@@ -57,7 +57,9 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
-    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Windows.Interactivity">
+      <HintPath>..\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Xaml">

diff --git a/Source/Wpf/System.Windows.Interactivity.dll b/Source/Wpf/System.Windows.Interactivity.dll