From 1c456e294e9bd3c020282b37c55c7d8a4310e0d5 Mon Sep 17 00:00:00 2001 From: AKIMITSU Taichi Date: Wed, 7 Dec 2022 19:29:06 +0900 Subject: [PATCH] updated Behaviors --- PreviewTest/Behaviors/CameraController.cs | 5 +++-- PreviewTest/PreviewTest.csproj | 2 +- PreviewTest/Views/MainWindow.xaml | 2 +- PreviewTest/packages.config | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/PreviewTest/Behaviors/CameraController.cs b/PreviewTest/Behaviors/CameraController.cs index 7dbf0da..c103997 100644 --- a/PreviewTest/Behaviors/CameraController.cs +++ b/PreviewTest/Behaviors/CameraController.cs @@ -1,4 +1,6 @@ -using PreviewTest.Extensions; +using Microsoft.Xaml.Behaviors; + +using PreviewTest.Extensions; using System; using System.Collections.Generic; using System.Linq; @@ -7,7 +9,6 @@ using System.Threading.Tasks; using System.Windows; using System.Windows.Input; -using System.Windows.Interactivity; using System.Windows.Media.Media3D; using System.Windows.Threading; diff --git a/PreviewTest/PreviewTest.csproj b/PreviewTest/PreviewTest.csproj index 2f654b0..11eeed7 100644 --- a/PreviewTest/PreviewTest.csproj +++ b/PreviewTest/PreviewTest.csproj @@ -61,7 +61,7 @@ ..\packages\LivetCask.Mvvm.3.2.2.2\lib\net452\Livet.Mvvm.dll - ..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.3\lib\net45\Microsoft.Xaml.Behaviors.dll + ..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.39\lib\net45\Microsoft.Xaml.Behaviors.dll diff --git a/PreviewTest/Views/MainWindow.xaml b/PreviewTest/Views/MainWindow.xaml index 9ef35d3..c3501ff 100644 --- a/PreviewTest/Views/MainWindow.xaml +++ b/PreviewTest/Views/MainWindow.xaml @@ -2,7 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" + xmlns:i="http://schemas.microsoft.com/xaml/behaviors" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:PreviewTest.ViewModels" xmlns:ctrls="clr-namespace:PreviewTest.Controls" diff --git a/PreviewTest/packages.config b/PreviewTest/packages.config index d24a11a..406f0e2 100644 --- a/PreviewTest/packages.config +++ b/PreviewTest/packages.config @@ -8,5 +8,5 @@ - + \ No newline at end of file