Merge Behaviors.Animations component back into Behaviors

CommunityToolkit · Jul 10, 2023 · 98dd1a4 · 98dd1a4
1 parent 18aa4b8
commit 98dd1a4
Show file tree

Hide file tree

Showing 24 changed files with 16 additions and 151 deletions.
diff --git a/components/Animations/src/CommunityToolkit.WinUI.Animations.csproj b/components/Animations/src/CommunityToolkit.WinUI.Animations.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="CommunityToolkit.WinUI.Behaviors.Animations" />
+    <InternalsVisibleTo Include="CommunityToolkit.WinUI.Behaviors" />
     <PackageReference Include="PolySharp" Version="1.13.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/components/Behaviors.Animations/OpenSolution.bat b/components/Behaviors.Animations/OpenSolution.bat
diff --git a/components/Behaviors.Animations/samples/Behaviors.Animations.Samples.csproj b/components/Behaviors.Animations/samples/Behaviors.Animations.Samples.csproj
diff --git a/components/Behaviors.Animations/samples/Dependencies.props b/components/Behaviors.Animations/samples/Dependencies.props
diff --git a/components/Behaviors.Animations/src/AdditionalAssemblyInfo.cs b/components/Behaviors.Animations/src/AdditionalAssemblyInfo.cs
diff --git a/components/Behaviors.Animations/src/CommunityToolkit.WinUI.Behaviors.Animations.csproj b/components/Behaviors.Animations/src/CommunityToolkit.WinUI.Behaviors.Animations.csproj
diff --git a/components/Behaviors.Animations/src/Dependencies.props b/components/Behaviors.Animations/src/Dependencies.props
diff --git a/components/Behaviors.Animations/src/MultiTarget.props b/components/Behaviors.Animations/src/MultiTarget.props
diff --git a/components/Behaviors.Animations/tests/Behaviors.Animations.Tests.projitems b/components/Behaviors.Animations/tests/Behaviors.Animations.Tests.projitems
diff --git a/components/Behaviors.Animations/tests/Behaviors.Animations.Tests.shproj b/components/Behaviors.Animations/tests/Behaviors.Animations.Tests.shproj
diff --git a/...nimations/samples/Assets/AnimationSet.png → ...Behaviors/samples/Assets/AnimationSet.png b/...nimations/samples/Assets/AnimationSet.png → ...Behaviors/samples/Assets/AnimationSet.png
diff --git a/...Animations/samples/Assets/ToolkitIcon.png → .../Behaviors/samples/Assets/ToolkitIcon.png b/...Animations/samples/Assets/ToolkitIcon.png → .../Behaviors/samples/Assets/ToolkitIcon.png
diff --git a/...nimations/samples/Behaviors.Animations.md → ...Behaviors/samples/Behaviors.Animations.md b/...nimations/samples/Behaviors.Animations.md → ...Behaviors/samples/Behaviors.Animations.md
diff --git a/components/Behaviors/samples/Behaviors.Samples.csproj b/components/Behaviors/samples/Behaviors.Samples.csproj
@@ -5,4 +5,12 @@
 
   <!-- Sets this up as a toolkit component's sample project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
+  <ItemGroup>
+    <None Remove="Assets\ToolkitIcon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Assets\ToolkitIcon.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 </Project>
diff --git a/...imations/samples/InvokeActionsSample.xaml → ...ehaviors/samples/InvokeActionsSample.xaml b/...imations/samples/InvokeActionsSample.xaml → ...ehaviors/samples/InvokeActionsSample.xaml
@@ -1,13 +1,13 @@
 <!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
-<Page x:Class="Behaviors.AnimationsExperiment.Samples.InvokeActionsActivitySample"
+<Page x:Class="BehaviorsExperiment.Samples.InvokeActionsActivitySample"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:ani="using:CommunityToolkit.WinUI.Animations"
       xmlns:behaviors="using:CommunityToolkit.WinUI.Behaviors"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:interactions="using:Microsoft.Xaml.Interactions.Core"
       xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
-      xmlns:local="using:Behaviors.AnimationsExperiment.Samples"
+      xmlns:local="using:BehaviorsExperiment.Samples"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 

diff --git a/...tions/samples/InvokeActionsSample.xaml.cs → ...viors/samples/InvokeActionsSample.xaml.cs b/...tions/samples/InvokeActionsSample.xaml.cs → ...viors/samples/InvokeActionsSample.xaml.cs
@@ -4,7 +4,7 @@
 
 using CommunityToolkit.WinUI.Animations;
 
-namespace Behaviors.AnimationsExperiment.Samples;
+namespace BehaviorsExperiment.Samples;
 
 [ToolkitSample(id: nameof(InvokeActionsActivitySample), "InvokeActionsActivity", description: $"A sample for showing how to create and use a {nameof(StartAnimationActivity)} behavior.")]
 public sealed partial class InvokeActionsActivitySample : Page

diff --git a/...samples/StartAnimationActivitySample.xaml → ...samples/StartAnimationActivitySample.xaml b/...samples/StartAnimationActivitySample.xaml → ...samples/StartAnimationActivitySample.xaml
@@ -1,13 +1,13 @@
 <!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
-<Page x:Class="Behaviors.AnimationsExperiment.Samples.StartAnimationActivitySample"
+<Page x:Class="BehaviorsExperiment.Samples.StartAnimationActivitySample"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:ani="using:CommunityToolkit.WinUI.Animations"
       xmlns:behaviors="using:CommunityToolkit.WinUI.Behaviors"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:interactions="using:Microsoft.Xaml.Interactions.Core"
       xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
-      xmlns:local="using:Behaviors.AnimationsExperiment.Samples"
+      xmlns:local="using:BehaviorsExperiment.Samples"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 

diff --git a/...ples/StartAnimationActivitySample.xaml.cs → ...ples/StartAnimationActivitySample.xaml.cs b/...ples/StartAnimationActivitySample.xaml.cs → ...ples/StartAnimationActivitySample.xaml.cs
@@ -4,7 +4,7 @@
 
 using CommunityToolkit.WinUI.Animations;
 
-namespace Behaviors.AnimationsExperiment.Samples;
+namespace BehaviorsExperiment.Samples;
 
 [ToolkitSample(id: nameof(StartAnimationActivitySample), "StartAnimationActivity", description: $"A sample for showing how to create and use a {nameof(InvokeActionsActivity)} behavior.")]
 public sealed partial class StartAnimationActivitySample : Page

diff --git a/.../src/AnimationCompletedTriggerBehavior.cs → ...ions/AnimationCompletedTriggerBehavior.cs b/.../src/AnimationCompletedTriggerBehavior.cs → ...ions/AnimationCompletedTriggerBehavior.cs
diff --git a/...ns/src/AnimationStartedTriggerBehavior.cs → ...ations/AnimationStartedTriggerBehavior.cs b/...ns/src/AnimationStartedTriggerBehavior.cs → ...ations/AnimationStartedTriggerBehavior.cs
diff --git a/...s.Animations/src/InvokeActionsActivity.cs → ...s/src/Animations/InvokeActionsActivity.cs b/...s.Animations/src/InvokeActionsActivity.cs → ...s/src/Animations/InvokeActionsActivity.cs
diff --git a/...rs.Animations/src/StartAnimationAction.cs → ...rs/src/Animations/StartAnimationAction.cs b/...rs.Animations/src/StartAnimationAction.cs → ...rs/src/Animations/StartAnimationAction.cs
diff --git a/...ors.Animations/src/StopAnimationAction.cs → ...ors/src/Animations/StopAnimationAction.cs b/...ors.Animations/src/StopAnimationAction.cs → ...ors/src/Animations/StopAnimationAction.cs
diff --git a/components/Behaviors/src/CommunityToolkit.WinUI.Behaviors.csproj b/components/Behaviors/src/CommunityToolkit.WinUI.Behaviors.csproj
@@ -12,6 +12,7 @@
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 
   <ItemGroup>
+    <ProjectReference Include="$(ToolkitAnimationSourceProject)" />
     <ProjectReference Include="$(ToolkitExtensionSourceProject)" />
   </ItemGroup>
 </Project>