diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/FadeHeaderBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/FadeHeaderBehavior.cs
index c965f783473..7116ad40fa9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/FadeHeaderBehavior.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/FadeHeaderBehavior.cs
@@ -2,8 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using Microsoft.Toolkit.Uwp.UI.Animations.Expressions;
using Microsoft.Toolkit.Uwp.UI.Behaviors;
+using Microsoft.Toolkit.Uwp.UI.Expressions;
using Microsoft.Toolkit.Uwp.UI.Extensions;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/QuickReturnHeaderBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/QuickReturnHeaderBehavior.cs
index fe86fd75bbb..718e21a9659 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/QuickReturnHeaderBehavior.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/QuickReturnHeaderBehavior.cs
@@ -2,8 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using Microsoft.Toolkit.Uwp.UI.Animations.Expressions;
using Microsoft.Toolkit.Uwp.UI.Behaviors;
+using Microsoft.Toolkit.Uwp.UI.Expressions;
using Microsoft.Toolkit.Uwp.UI.Extensions;
using Windows.Foundation;
using Windows.UI.Composition;
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/StickyHeaderBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/StickyHeaderBehavior.cs
index ec322bf6eb3..788cd1fb29e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/StickyHeaderBehavior.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/StickyHeaderBehavior.cs
@@ -2,8 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using Microsoft.Toolkit.Uwp.UI.Animations.Expressions;
using Microsoft.Toolkit.Uwp.UI.Behaviors;
+using Microsoft.Toolkit.Uwp.UI.Expressions;
using Microsoft.Toolkit.Uwp.UI.Extensions;
using Windows.Foundation;
using Windows.UI.Composition;
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj b/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj
index df6558d9426..0f66f73235b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj
@@ -13,7 +13,6 @@
- CompositionAnimations: ExpressionKeyFrame, KeyFrame, KeyFrameCollection, ScalarKeyFrame, TypedKeyFrame, Vector2KeyFrame, Vector3KeyFrame, Vector4KeyFrame
- ConnectedAnimations: Connected, ConnectedAnimationHelper, ConnectedAnimationListProperty, ConnectedAnimationProperties
- Effects: AnimationEffect, Blur, Saturation
- - Expressions: ExpressionNodes, ExpressionValues, ReferenceNodes, CompositionExtensions, ExpressionFunctions, OperationType
- AnimationExtensions: Blur, Fade, Light, Offset, Rotate, Saturation, Scale
UWP Toolkit Windows Animations Composition Connected Implicit XAML
@@ -24,6 +23,7 @@
+
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 294ac153355..58f6426b70e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -51,6 +51,7 @@
+
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs b/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs
index 1b7c445edc0..296cebb1e10 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs
@@ -6,7 +6,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Numerics;
-using Microsoft.Toolkit.Uwp.UI.Animations.Expressions;
+using Microsoft.Toolkit.Uwp.UI.Expressions;
using Windows.UI;
using Windows.UI.Composition;
using Windows.UI.Xaml;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs
index 00912da8913..955c61352b9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
using System.Numerics;
using System.Threading;
using System.Threading.Tasks;
- using Microsoft.Toolkit.Uwp.UI.Animations.Expressions;
+ using Microsoft.Toolkit.Uwp.UI.Expressions;
using Microsoft.Toolkit.Uwp.UI.Extensions;
using Windows.Foundation;
using Windows.UI.Composition;
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/CompositionExtensions.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/CompositionExtensions.cs
similarity index 99%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/CompositionExtensions.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/CompositionExtensions.cs
index 16f0525b369..054b9b34421 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/CompositionExtensions.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/CompositionExtensions.cs
@@ -5,7 +5,7 @@
using Windows.UI.Composition;
using Windows.UI.Composition.Interactions;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Class CompositionExtensions.
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionFunctions.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionFunctions.cs
similarity index 99%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionFunctions.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionFunctions.cs
index b0f7b69b40d..0b637f46074 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionFunctions.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionFunctions.cs
@@ -4,7 +4,7 @@
using System.Collections.Generic;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Class ExpressionFunctions.
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/BooleanNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/BooleanNode.cs
similarity index 97%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/BooleanNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/BooleanNode.cs
index 6e49f5e9417..38015fd9b43 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/BooleanNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/BooleanNode.cs
@@ -2,14 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
// Ignore warning: 'BooleanNode' defines operator == or operator != but does not override Object.Equals(object o) && Object.GetHashCode()
#pragma warning disable CS0660, CS0661
///
/// Class BooleanNode. This class cannot be inherited.
///
- ///
+ ///
public sealed class BooleanNode : ExpressionNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ColorNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/ColorNode.cs
similarity index 95%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ColorNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/ColorNode.cs
index 553beee5005..185aab85a87 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ColorNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/ColorNode.cs
@@ -4,14 +4,14 @@
using Windows.UI;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
// Ignore warning: 'ColorNode' defines operator == or operator != but does not override Object.Equals(object o) && Object.GetHashCode()
#pragma warning disable CS0660, CS0661
///
/// Class ColorNode. This class cannot be inherited.
///
- ///
+ ///
public sealed class ColorNode : ExpressionNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ExpressionNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/ExpressionNode.cs
similarity index 99%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ExpressionNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/ExpressionNode.cs
index e578a450adf..2dc0a83b566 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ExpressionNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/ExpressionNode.cs
@@ -8,7 +8,7 @@
using Windows.UI;
using Windows.UI.Composition;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Class ExpressionNode.
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ExpressionNodeType.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/ExpressionNodeType.cs
similarity index 99%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ExpressionNodeType.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/ExpressionNodeType.cs
index f1d134c9997..51ac4d9ad86 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ExpressionNodeType.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/ExpressionNodeType.cs
@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Enum ExpressionNodeType
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix3x2Node.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/Matrix3x2Node.cs
similarity index 98%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix3x2Node.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/Matrix3x2Node.cs
index 5c8ca867818..80081ffc40b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix3x2Node.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/Matrix3x2Node.cs
@@ -4,7 +4,7 @@
using System.Numerics;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
// Ignore warning: 'Matrix3x2Node' defines operator == or operator != but does not override Object.Equals(object o) && Object.GetHashCode()
#pragma warning disable CS0660, CS0661
@@ -12,7 +12,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
///
/// Class Matrix3x2Node. This class cannot be inherited.
///
- ///
+ ///
public sealed class Matrix3x2Node : ExpressionNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix4x4Node.Subchannel.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/Matrix4x4Node.Subchannel.cs
similarity index 93%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix4x4Node.Subchannel.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/Matrix4x4Node.Subchannel.cs
index 928f2358555..6abb87bd56c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix4x4Node.Subchannel.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/Matrix4x4Node.Subchannel.cs
@@ -2,12 +2,12 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Class Matrix4x4Node. This class cannot be inherited.
///
- ///
+ ///
public sealed partial class Matrix4x4Node : ExpressionNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix4x4Node.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/Matrix4x4Node.cs
similarity index 99%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix4x4Node.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/Matrix4x4Node.cs
index 7b00d426046..b6021afcc76 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix4x4Node.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/Matrix4x4Node.cs
@@ -4,14 +4,14 @@
using System.Numerics;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
// Ignore warning: 'Matrix4x4Node' defines operator == or operator != but does not override Object.Equals(object o) && Object.GetHashCode()
#pragma warning disable CS0660, CS0661
///
/// Class Matrix4x4Node. This class cannot be inherited.
///
- ///
+ ///
public sealed partial class Matrix4x4Node : ExpressionNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/QuaternionNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/QuaternionNode.cs
similarity index 97%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/QuaternionNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/QuaternionNode.cs
index 4d8b7ed7b90..eae033ad8a1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/QuaternionNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/QuaternionNode.cs
@@ -4,14 +4,14 @@
using System.Numerics;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
// Ignore warning: 'QuaternionNode' defines operator == or operator != but does not override Object.Equals(object o) && Object.GetHashCode()
#pragma warning disable CS0660, CS0661
///
/// Class QuaternionNode. This class cannot be inherited.
///
- ///
+ ///
public sealed class QuaternionNode : ExpressionNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ScalarNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/ScalarNode.cs
similarity index 98%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ScalarNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/ScalarNode.cs
index b777663acca..c77efa59803 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ScalarNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/ScalarNode.cs
@@ -2,14 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
// Ignore warning: 'ScalarNode' defines operator == or operator != but does not override Object.Equals(object o) && Object.GetHashCode()
#pragma warning disable CS0660, CS0661
///
/// Class ScalarNode. This class cannot be inherited.
///
- ///
+ ///
public sealed class ScalarNode : ExpressionNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ValueKeywordKind.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/ValueKeywordKind.cs
similarity index 89%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ValueKeywordKind.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/ValueKeywordKind.cs
index 352b7750891..bff59be4cdd 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ValueKeywordKind.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/ValueKeywordKind.cs
@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Enum ValueKeywordKind
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector2Node.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/Vector2Node.cs
similarity index 98%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector2Node.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/Vector2Node.cs
index 9b17ea11c77..a5b11f13ca4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector2Node.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/Vector2Node.cs
@@ -4,14 +4,14 @@
using System.Numerics;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
// Ignore warning: 'Vector2Node' defines operator == or operator != but does not override Object.Equals(object o) && Object.GetHashCode()
#pragma warning disable CS0660, CS0661
///
/// Class Vector2Node. This class cannot be inherited.
///
- ///
+ ///
public sealed class Vector2Node : ExpressionNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector3Node.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/Vector3Node.cs
similarity index 98%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector3Node.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/Vector3Node.cs
index f527d4fda54..83b95b47331 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector3Node.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/Vector3Node.cs
@@ -4,14 +4,14 @@
using System.Numerics;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
// Ignore warning: 'Vector3Node' defines operator == or operator != but does not override Object.Equals(object o) && Object.GetHashCode()
#pragma warning disable CS0660, CS0661
///
/// Class Vector3Node. This class cannot be inherited.
///
- ///
+ ///
public sealed class Vector3Node : ExpressionNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector4Node.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/Vector4Node.cs
similarity index 98%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector4Node.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/Vector4Node.cs
index 3aeaf76d43b..02c58cad0a3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector4Node.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionNodes/Vector4Node.cs
@@ -4,14 +4,14 @@
using System.Numerics;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
// Ignore warning: 'Vector4Node' defines operator == or operator != but does not override Object.Equals(object o) && Object.GetHashCode()
#pragma warning disable CS0660, CS0661
///
/// Class Vector4Node. This class cannot be inherited.
///
- ///
+ ///
public sealed class Vector4Node : ExpressionNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionValues/ExpressionValues.Constant.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionValues/ExpressionValues.Constant.cs
similarity index 99%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionValues/ExpressionValues.Constant.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionValues/ExpressionValues.Constant.cs
index 612032c9115..67fa1c2735f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionValues/ExpressionValues.Constant.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionValues/ExpressionValues.Constant.cs
@@ -5,7 +5,7 @@
using System.Numerics;
using Windows.UI;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
// ExpressionValues is a static class instead of a namespace to improve intellisense discoverablity and consistency with the other helper classes.
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionValues/ExpressionValues.CurrentValue.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionValues/ExpressionValues.CurrentValue.cs
similarity index 98%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionValues/ExpressionValues.CurrentValue.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionValues/ExpressionValues.CurrentValue.cs
index 892d9ef7098..edfffd3972b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionValues/ExpressionValues.CurrentValue.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionValues/ExpressionValues.CurrentValue.cs
@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
// ExpressionValues is a static class instead of a namespace to improve intellisense discoverablity and consistency with the other helper classes.
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionValues/ExpressionValues.Reference.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionValues/ExpressionValues.Reference.cs
similarity index 99%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionValues/ExpressionValues.Reference.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionValues/ExpressionValues.Reference.cs
index ecb78064ba7..16315db522a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionValues/ExpressionValues.Reference.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionValues/ExpressionValues.Reference.cs
@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
// ExpressionValues is a static class instead of a namespace to improve intellisense discoverablity and consistency with the other helper classes.
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionValues/ExpressionValues.StartingValue.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionValues/ExpressionValues.StartingValue.cs
similarity index 98%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionValues/ExpressionValues.StartingValue.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionValues/ExpressionValues.StartingValue.cs
index 080b96082f2..85f3d9ff023 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionValues/ExpressionValues.StartingValue.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionValues/ExpressionValues.StartingValue.cs
@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
// ExpressionValues is a static class instead of a namespace to improve intellisense discoverablity and consistency with the other helper classes.
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionValues/ExpressionValues.Target.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionValues/ExpressionValues.Target.cs
similarity index 98%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionValues/ExpressionValues.Target.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionValues/ExpressionValues.Target.cs
index e2afdcca8e0..f84fcc514c5 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionValues/ExpressionValues.Target.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ExpressionValues/ExpressionValues.Target.cs
@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
// ExpressionValues is a static class instead of a namespace to improve intellisense discoverablity and consistency with the other helper classes.
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/OperationType.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/OperationType.cs
similarity index 94%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/OperationType.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/OperationType.cs
index 6708645909f..7777190bd32 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/OperationType.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/OperationType.cs
@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Enum OperationType
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/AmbientLightReferenceNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/AmbientLightReferenceNode.cs
similarity index 90%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/AmbientLightReferenceNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/AmbientLightReferenceNode.cs
index 04d31366f18..8fded950bb1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/AmbientLightReferenceNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/AmbientLightReferenceNode.cs
@@ -4,12 +4,12 @@
using Windows.UI.Composition;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Class AmbientLightReferenceNode. This class cannot be inherited.
///
- ///
+ ///
public sealed class AmbientLightReferenceNode : ReferenceNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/ColorBrushReferenceNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/ColorBrushReferenceNode.cs
similarity index 90%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/ColorBrushReferenceNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/ColorBrushReferenceNode.cs
index aa89a2798ae..8562994271a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/ColorBrushReferenceNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/ColorBrushReferenceNode.cs
@@ -4,12 +4,12 @@
using Windows.UI.Composition;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Class ColorBrushReferenceNode. This class cannot be inherited.
///
- ///
+ ///
public sealed class ColorBrushReferenceNode : ReferenceNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/DistantLightReferenceNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/DistantLightReferenceNode.cs
similarity index 92%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/DistantLightReferenceNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/DistantLightReferenceNode.cs
index 178b7298ce0..19499a10b87 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/DistantLightReferenceNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/DistantLightReferenceNode.cs
@@ -4,12 +4,12 @@
using Windows.UI.Composition;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Class DistantLightReferenceNode. This class cannot be inherited.
///
- ///
+ ///
public sealed class DistantLightReferenceNode : ReferenceNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/DropShadowReferenceNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/DropShadowReferenceNode.cs
similarity index 93%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/DropShadowReferenceNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/DropShadowReferenceNode.cs
index a06a25be4af..bfbe6df9dc2 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/DropShadowReferenceNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/DropShadowReferenceNode.cs
@@ -4,12 +4,12 @@
using Windows.UI.Composition;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Class DropShadowReferenceNode. This class cannot be inherited.
///
- ///
+ ///
public sealed class DropShadowReferenceNode : ReferenceNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/InsetClipReferenceNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/InsetClipReferenceNode.cs
similarity index 96%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/InsetClipReferenceNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/InsetClipReferenceNode.cs
index 5b28df8086c..ee8328adb0a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/InsetClipReferenceNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/InsetClipReferenceNode.cs
@@ -4,12 +4,12 @@
using Windows.UI.Composition;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Class InsetClipReferenceNode. This class cannot be inherited.
///
- ///
+ ///
public sealed class InsetClipReferenceNode : ReferenceNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/InteractionTrackerReferenceNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/InteractionTrackerReferenceNode.cs
similarity index 97%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/InteractionTrackerReferenceNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/InteractionTrackerReferenceNode.cs
index 350c94ced4a..283f1857077 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/InteractionTrackerReferenceNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/InteractionTrackerReferenceNode.cs
@@ -4,12 +4,12 @@
using Windows.UI.Composition.Interactions;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Class InteractionTrackerReferenceNode. This class cannot be inherited.
///
- ///
+ ///
public sealed class InteractionTrackerReferenceNode : ReferenceNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/ManipulationPropertySetReferenceNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/ManipulationPropertySetReferenceNode.cs
similarity index 93%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/ManipulationPropertySetReferenceNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/ManipulationPropertySetReferenceNode.cs
index 7c8372d28c5..de0ab294256 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/ManipulationPropertySetReferenceNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/ManipulationPropertySetReferenceNode.cs
@@ -4,12 +4,12 @@
using Windows.UI.Composition;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Class ManipulationPropertySetReferenceNode. This class cannot be inherited.
///
- ///
+ ///
public sealed class ManipulationPropertySetReferenceNode : PropertySetReferenceNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/NineGridBrushReferenceNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/NineGridBrushReferenceNode.cs
similarity index 95%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/NineGridBrushReferenceNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/NineGridBrushReferenceNode.cs
index 9e7af465676..44f4e51f2a4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/NineGridBrushReferenceNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/NineGridBrushReferenceNode.cs
@@ -4,12 +4,12 @@
using Windows.UI.Composition;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Class NineGridBrushReferenceNode. This class cannot be inherited.
///
- ///
+ ///
public sealed class NineGridBrushReferenceNode : ReferenceNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/PointLightReferenceNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/PointLightReferenceNode.cs
similarity index 94%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/PointLightReferenceNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/PointLightReferenceNode.cs
index f80cfc364cb..70e4de84eef 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/PointLightReferenceNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/PointLightReferenceNode.cs
@@ -4,12 +4,12 @@
using Windows.UI.Composition;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Class PointLightReferenceNode. This class cannot be inherited.
///
- ///
+ ///
public sealed class PointLightReferenceNode : ReferenceNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/PointerPositionPropertySetReferenceNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/PointerPositionPropertySetReferenceNode.cs
similarity index 90%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/PointerPositionPropertySetReferenceNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/PointerPositionPropertySetReferenceNode.cs
index d035dd6d68d..ccb0a8953a0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/PointerPositionPropertySetReferenceNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/PointerPositionPropertySetReferenceNode.cs
@@ -4,12 +4,12 @@
using Windows.UI.Composition;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Class PointerPositionPropertySetReferenceNode. This class cannot be inherited.
///
- ///
+ ///
public sealed class PointerPositionPropertySetReferenceNode : PropertySetReferenceNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/PropertySetReferenceNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/PropertySetReferenceNode.cs
similarity index 91%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/PropertySetReferenceNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/PropertySetReferenceNode.cs
index 95652790b82..6f3e406eed6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/PropertySetReferenceNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/PropertySetReferenceNode.cs
@@ -4,12 +4,12 @@
using Windows.UI.Composition;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Class PropertySetReferenceNode.
///
- ///
+ ///
public class PropertySetReferenceNode : ReferenceNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/ReferenceNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/ReferenceNode.cs
similarity index 97%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/ReferenceNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/ReferenceNode.cs
index fb95338d1e7..80e62bed3e4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/ReferenceNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/ReferenceNode.cs
@@ -5,12 +5,12 @@
using System;
using Windows.UI.Composition;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Class ReferenceNode.
///
- ///
+ ///
public abstract class ReferenceNode : ExpressionNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/SpotLightReferenceNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/SpotLightReferenceNode.cs
similarity index 96%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/SpotLightReferenceNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/SpotLightReferenceNode.cs
index 20f627a94f5..f2d44b26d9a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/SpotLightReferenceNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/SpotLightReferenceNode.cs
@@ -4,12 +4,12 @@
using Windows.UI.Composition;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Class SpotLightReferenceNode. This class cannot be inherited.
///
- ///
+ ///
public sealed class SpotLightReferenceNode : ReferenceNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/SurfaceBrushReferenceNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/SurfaceBrushReferenceNode.cs
similarity index 96%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/SurfaceBrushReferenceNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/SurfaceBrushReferenceNode.cs
index 5a0ad859a5f..78f3b430488 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/SurfaceBrushReferenceNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/SurfaceBrushReferenceNode.cs
@@ -4,12 +4,12 @@
using Windows.UI.Composition;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Class SurfaceBrushReferenceNode. This class cannot be inherited.
///
- ///
+ ///
public sealed class SurfaceBrushReferenceNode : ReferenceNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/VisualReferenceNode.cs b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/VisualReferenceNode.cs
similarity index 96%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/VisualReferenceNode.cs
rename to Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/VisualReferenceNode.cs
index 21c49296b91..9ccfd4c2875 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ReferenceNodes/VisualReferenceNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Expressions/ReferenceNodes/VisualReferenceNode.cs
@@ -4,12 +4,12 @@
using Windows.UI.Composition;
-namespace Microsoft.Toolkit.Uwp.UI.Animations.Expressions
+namespace Microsoft.Toolkit.Uwp.UI.Expressions
{
///
/// Class VisualReferenceNode. This class cannot be inherited.
///
- ///
+ ///
public sealed class VisualReferenceNode : ReferenceNode
{
///
diff --git a/Microsoft.Toolkit.Uwp.UI.Expressions/Microsoft.Toolkit.Uwp.UI.Expressions.csproj b/Microsoft.Toolkit.Uwp.UI.Expressions/Microsoft.Toolkit.Uwp.UI.Expressions.csproj
new file mode 100644
index 00000000000..fae36f48021
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Microsoft.Toolkit.Uwp.UI.Expressions.csproj
@@ -0,0 +1,15 @@
+
+
+
+ uap10.0.17763
+ Windows Community Toolkit Expressions
+
+ This library provides helpers and extensions on top of Windows Composition and XAML storyboards. It is part of the Windows Community Toolkit.
+
+ Namespace:
+ - Expressions: ExpressionNodes, ExpressionValues, ReferenceNodes, CompositionExtensions, ExpressionFunctions, OperationType
+
+ UWP Toolkit Windows Expressions Composition Connected Implicit XAML
+
+
+
diff --git a/Microsoft.Toolkit.Uwp.UI.Expressions/Microsoft.Toolkit.Uwp.UI.Expressions.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Expressions/Microsoft.Toolkit.Uwp.UI.Expressions.csproj.DotSettings
new file mode 100644
index 00000000000..17962b139d0
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Microsoft.Toolkit.Uwp.UI.Expressions.csproj.DotSettings
@@ -0,0 +1,2 @@
+
+ True
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Expressions/Properties/Microsoft.Windows.Toolkit.UI.Expressions.rd.xml b/Microsoft.Toolkit.Uwp.UI.Expressions/Properties/Microsoft.Windows.Toolkit.UI.Expressions.rd.xml
new file mode 100644
index 00000000000..0a692b03556
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Expressions/Properties/Microsoft.Windows.Toolkit.UI.Expressions.rd.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index 0c75200e754..6112eabe95c 100644
--- a/Windows Community Toolkit.sln
+++ b/Windows Community Toolkit.sln
@@ -132,6 +132,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITests.Tests.TAEF", "UITes
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "UITests.Tests.Shared", "UITests\UITests.Tests.Shared\UITests.Tests.Shared.shproj", "{1D8B0260-5C17-41DA-9C38-1E37441B3925}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Expressions", "Microsoft.Toolkit.Uwp.UI.Expressions\Microsoft.Toolkit.Uwp.UI.Expressions.csproj", "{A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}"
+EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{1d8b0260-5c17-41da-9c38-1e37441b3925}*SharedItemsImports = 13
@@ -948,6 +950,26 @@ Global
{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|x64.Build.0 = Release|Any CPU
{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|x86.ActiveCfg = Release|Any CPU
{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|x86.Build.0 = Release|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Debug|ARM.Build.0 = Debug|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Debug|ARM64.Build.0 = Debug|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Debug|x64.Build.0 = Debug|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Debug|x86.Build.0 = Debug|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Release|ARM.ActiveCfg = Release|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Release|ARM.Build.0 = Release|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Release|ARM64.ActiveCfg = Release|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Release|ARM64.Build.0 = Release|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Release|x64.ActiveCfg = Release|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Release|x64.Build.0 = Release|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Release|x86.ActiveCfg = Release|Any CPU
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -989,6 +1011,7 @@ Global
{5F720475-E263-4A5A-8C88-2B805B45B5BC} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}
{C8182EF0-77FB-4B43-A588-C71748A309C7} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}
{1D8B0260-5C17-41DA-9C38-1E37441B3925} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}
+ {A20E48BC-CEA8-4C6E-A89E-8ABE8BF75525} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345}