diff --git a/SeeGitApp/App.xaml b/SeeGitApp/App.xaml index 85f1ec8..cb6873b 100644 --- a/SeeGitApp/App.xaml +++ b/SeeGitApp/App.xaml @@ -1,5 +1,9 @@ - + diff --git a/SeeGitApp/Extensions/CommitAdornerBehavior.cs b/SeeGitApp/Extensions/CommitAdornerBehavior.cs index 900d4e2..51c6c8f 100644 --- a/SeeGitApp/Extensions/CommitAdornerBehavior.cs +++ b/SeeGitApp/Extensions/CommitAdornerBehavior.cs @@ -4,8 +4,8 @@ using System.Windows.Data; using System.Windows.Documents; using System.Windows.Input; -using System.Windows.Interactivity; -using Microsoft.Expression.Interactivity.Core; +using Microsoft.Xaml.Behaviors; +using Microsoft.Xaml.Behaviors.Core; // Lovingly borrowed from http://www.codeproject.com/Articles/271082/Use-and-DataTemplate-as-an-Adorner diff --git a/SeeGitApp/SeeGitApp.csproj b/SeeGitApp/SeeGitApp.csproj index 27bca02..149f219 100644 --- a/SeeGitApp/SeeGitApp.csproj +++ b/SeeGitApp/SeeGitApp.csproj @@ -1,4 +1,4 @@ - + @@ -54,7 +54,6 @@ ..\packages\LibGit2Sharp.0.24.0\lib\net40\LibGit2Sharp.dll True - False ..\packages\Windows7APICodePack-Core.1.1.0.0\lib\Microsoft.WindowsAPICodePack.dll @@ -63,6 +62,9 @@ False ..\packages\Windows7APICodePack-Shell.1.1.0.0\lib\Microsoft.WindowsAPICodePack.Shell.dll + + ..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.19\lib\net45\Microsoft.Xaml.Behaviors.dll + ..\packages\QuikGraph.2.2.0\lib\net40\QuikGraph.dll @@ -74,7 +76,6 @@ - diff --git a/SeeGitApp/Views/CommitVertexView.xaml b/SeeGitApp/Views/CommitVertexView.xaml index 527c308..3b34ae4 100644 --- a/SeeGitApp/Views/CommitVertexView.xaml +++ b/SeeGitApp/Views/CommitVertexView.xaml @@ -2,7 +2,8 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:local="clr-namespace:SeeGit" + xmlns:i="http://schemas.microsoft.com/xaml/behaviors" + xmlns:local="clr-namespace:SeeGit" mc:Ignorable="d" x:Name="View" d:DesignHeight="300" d:DesignWidth="300"> diff --git a/SeeGitApp/packages.config b/SeeGitApp/packages.config index eb6d361..7650449 100644 --- a/SeeGitApp/packages.config +++ b/SeeGitApp/packages.config @@ -4,6 +4,7 @@ +