From 6fdb9d73d4779e101875b98d152df041fee094ac Mon Sep 17 00:00:00 2001 From: Nigel Sampson Date: Thu, 13 Dec 2018 23:26:07 +1300 Subject: [PATCH] Update samples to Microsoft.Xaml.Behaviors --- samples/features/Features.WPF/Features.WPF.csproj | 8 ++++---- samples/features/Features.WPF/Views/ActionsView.xaml | 2 +- samples/features/Features.WPF/packages.config | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 samples/features/Features.WPF/packages.config diff --git a/samples/features/Features.WPF/Features.WPF.csproj b/samples/features/Features.WPF/Features.WPF.csproj index f37113af..805865ac 100644 --- a/samples/features/Features.WPF/Features.WPF.csproj +++ b/samples/features/Features.WPF/Features.WPF.csproj @@ -44,12 +44,11 @@ ..\..\..\bin\Caliburn.Micro.Platform\debug\net46\Caliburn.Micro.Platform.dll + + ..\packages\Microsoft.Xaml.Behaviors.Wpf.1.0.1\lib\net45\Microsoft.Xaml.Behaviors.dll + - - False - ..\..\..\bin\net45\Debug\System.Windows.Interactivity.dll - @@ -147,6 +146,7 @@ ResXFileCodeGenerator Resources.Designer.cs + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/samples/features/Features.WPF/Views/ActionsView.xaml b/samples/features/Features.WPF/Views/ActionsView.xaml index 09e3074b..cc6b02d6 100644 --- a/samples/features/Features.WPF/Views/ActionsView.xaml +++ b/samples/features/Features.WPF/Views/ActionsView.xaml @@ -5,7 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Features.CrossPlatform.Views" xmlns:cal="http://www.caliburnproject.org" - xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" + xmlns:i="http://schemas.microsoft.com/xaml/behaviors" mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300" Title="ActionsView"> diff --git a/samples/features/Features.WPF/packages.config b/samples/features/Features.WPF/packages.config new file mode 100644 index 00000000..95305dfc --- /dev/null +++ b/samples/features/Features.WPF/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file