From 61ebeb2ac93312cafd3c5eaa686e1cd2f7775fa7 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 24 May 2018 19:50:00 -0500
Subject: [PATCH] Move Avalonia.Styling to be below Avalonia.Animation in the
 dependency chain per conversation in Gitter.

---
 src/Avalonia.Animation/Animatable.cs             | 2 +-
 src/Avalonia.Animation/Avalonia.Animation.csproj | 1 +
 src/Avalonia.Styling/StyledElement.cs            | 5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Animation/Animatable.cs b/src/Avalonia.Animation/Animatable.cs
index a27d996301..e879f30369 100644
--- a/src/Avalonia.Animation/Animatable.cs
+++ b/src/Avalonia.Animation/Animatable.cs
@@ -16,7 +16,7 @@ namespace Avalonia.Animation
     /// <summary>
     /// Base class for control which can have property transitions.
     /// </summary>
-    public class Animatable : AvaloniaObject
+    public class Animatable : StyledElement
     {
         /// <summary>
         /// Initializes this <see cref="Animatable"/> object.
diff --git a/src/Avalonia.Animation/Avalonia.Animation.csproj b/src/Avalonia.Animation/Avalonia.Animation.csproj
index 46e41dd32a..e64bf0a7fc 100644
--- a/src/Avalonia.Animation/Avalonia.Animation.csproj
+++ b/src/Avalonia.Animation/Avalonia.Animation.csproj
@@ -4,6 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Avalonia.Styling/StyledElement.cs b/src/Avalonia.Styling/StyledElement.cs
index bd0d0b8c1f..259119eb5f 100644
--- a/src/Avalonia.Styling/StyledElement.cs
+++ b/src/Avalonia.Styling/StyledElement.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using System.Text;
-using Avalonia.Animation;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Data;
@@ -17,14 +16,14 @@ using Avalonia.Styling;
 namespace Avalonia
 {
     /// <summary>
-    /// Extends an <see cref="Animatable"/> with the following features:
+    /// Extends an <see cref="AvaloniaObject"/> with the following features:
     /// 
     /// - An inherited <see cref="DataContext"/>.
     /// - Implements <see cref="IStyleable"/> to allow styling to work on the styled element.
     /// - Implements <see cref="ILogical"/> to form part of a logical tree.
     /// - A collection of class strings for custom styling.
     /// </summary>
-    public class StyledElement : Animatable, IStyledElement, ISetLogicalParent, ISetInheritanceParent
+    public class StyledElement : AvaloniaObject, IStyledElement, ISetLogicalParent, ISetInheritanceParent
     {
         /// <summary>
         /// Defines the <see cref="DataContext"/> property.