Skip to content

Commit 88a5a9d

Browse files
committed
bugfix - switch to official xaml behaviors package
1 parent e66430a commit 88a5a9d

3 files changed

Lines changed: 5 additions & 7 deletions

File tree

WpfDesign.Design.ExpressionBlendInteractionAddon/InteractionHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
1717
// DEALINGS IN THE SOFTWARE.
1818

19+
using Microsoft.Xaml.Behaviors;
1920
using System;
2021
using System.Collections.Generic;
2122
using System.Linq;
2223
using System.Reflection;
2324
using System.Windows;
24-
using System.Windows.Interactivity;
2525

2626
namespace ICSharpCode.WpfDesign.Designer.ExpressionBlendInteractionAddon
2727
{
@@ -94,7 +94,7 @@ public static IEnumerable<Type> GetBehaviors(params Assembly[] assemblies)
9494

9595
public static IEnumerable<Type> GetTriggers(params Assembly[] assemblies)
9696
{
97-
return assemblies.SelectMany(x => x.GetTypes()).Where(x => !x.IsAbstract && !x.IsInterface && !x.IsEnum && typeof(System.Windows.Interactivity.TriggerBase).IsAssignableFrom(x));
97+
return assemblies.SelectMany(x => x.GetTypes()).Where(x => !x.IsAbstract && !x.IsInterface && !x.IsEnum && typeof(Microsoft.Xaml.Behaviors.TriggerBase).IsAssignableFrom(x));
9898
}
9999
}
100100
}

WpfDesign.Design.ExpressionBlendInteractionAddon/WpfDesign.Designer.ExpressionBlendInteractionAddon.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<PackageReference Include="MicrosoftExpressionInteractions" Version="3.0.40218" />
15-
<PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
14+
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.0.1" />
1615
</ItemGroup>
1716
<ItemGroup>
1817
<ProjectReference Include="..\WpfDesign.Designer\Project\WpfDesign.Designer.csproj" />

XamlDesigner/TestFiles/5.xaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Window xmlns="http://schemas.microsoft.com/netfx/2007/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:sys="clr-namespace:System;assembly=mscorlib"
4-
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
5-
xmlns:ei="http://schemas.microsoft.com/expression/2010/interactions"
3+
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
4+
xmlns:ei="http://schemas.microsoft.com/xaml/behaviors"
65
xmlns:System="clr-namespace:System;assembly=mscorlib"
76
Name="root"
87
Title="Hydralisk">

0 commit comments

Comments
 (0)