Merge pull request #92 from haacked/KeRNeLith-update_to_quikgraph_gra…

…phshape Install open source XAML behaviors for WPF
haacked · Jun 7, 2020 · ec9a747 · ec9a747
2 parents b17c87d + 628ea16
commit ec9a747
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/SeeGitApp/App.xaml b/SeeGitApp/App.xaml
@@ -1,5 +1,9 @@
-<Application x:Class="GraphSharpDemo.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:SeeGit="clr-namespace:SeeGit" StartupUri="MainWindow.xaml">
+<Application
+    x:Class="GraphSharpDemo.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:SeeGit="clr-namespace:SeeGit"
+    StartupUri="MainWindow.xaml">
   <Application.Resources>
 
     <ResourceDictionary>

diff --git 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
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props')" />
   <PropertyGroup>
@@ -54,7 +54,6 @@
       <HintPath>..\packages\LibGit2Sharp.0.24.0\lib\net40\LibGit2Sharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Expression.Interactions" />
     <Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Windows7APICodePack-Core.1.1.0.0\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
@@ -63,6 +62,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Windows7APICodePack-Shell.1.1.0.0\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.19\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
+    </Reference>
     <Reference Include="QuikGraph, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\QuikGraph.2.2.0\lib\net40\QuikGraph.dll</HintPath>
     </Reference>
@@ -74,7 +76,6 @@
     </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Forms.DataVisualization" />
-    <Reference Include="System.Windows.Interactivity" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />

diff --git 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">
   <Grid DataContext="{Binding Model, ElementName=View}">
 

diff --git a/SeeGitApp/packages.config b/SeeGitApp/packages.config
@@ -4,6 +4,7 @@
   <package id="GraphShape.Controls" version="1.1.0" targetFramework="net40" />
   <package id="LibGit2Sharp" version="0.24.0" targetFramework="net462" />
   <package id="LibGit2Sharp.NativeBinaries" version="1.0.185" targetFramework="net462" />
+  <package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.19" targetFramework="net462" />
   <package id="QuikGraph" version="2.2.0" targetFramework="net40" />
   <package id="Rx_Experimental-Main" version="1.1.11111" requireReinstallation="true" />
   <package id="Windows7APICodePack-Core" version="1.1.0.0" targetFramework="net40-Client" />