diff --git a/src/HandyControl.sln b/src/HandyControl.sln index e49211f0..bdeea6fc 100644 --- a/src/HandyControl.sln +++ b/src/HandyControl.sln @@ -34,12 +34,16 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Expression.Drawin EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "System.Windows.Interactivity", "Shared\System.Windows.Interactivity\System.Windows.Interactivity.shproj", "{6F0C9CFF-2269-46A7-9664-478354C582A4}" EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Expression.Interactions", "Shared\Microsoft.Expression.Interactions\Microsoft.Expression.Interactions.shproj", "{3531857C-28FC-4E0F-82D9-BFBB70740E04}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution Shared\HandyControl_Shared\HandyControl_Shared.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5 Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5 + Shared\Microsoft.Expression.Interactions\Microsoft.Expression.Interactions.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5 Shared\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5 Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5 + Shared\Microsoft.Expression.Interactions\Microsoft.Expression.Interactions.projitems*{3531857c-28fc-4e0f-82d9-bfbb70740e04}*SharedItemsImports = 13 Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems*{6f0c9cff-2269-46a7-9664-478354c582a4}*SharedItemsImports = 13 Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{9a7b52e6-94bb-4e7e-bb6a-7cf6761b79a7}*SharedItemsImports = 5 Shared\HandyControl_Shared\HandyControl_Shared.projitems*{aac11083-faca-405d-9197-5c1212d65656}*SharedItemsImports = 13 @@ -48,6 +52,7 @@ Global Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{d8ae88f8-c36b-4d10-a7f9-22ffcfba5231}*SharedItemsImports = 5 Shared\HandyControl_Shared\HandyControl_Shared.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5 Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5 + Shared\Microsoft.Expression.Interactions\Microsoft.Expression.Interactions.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5 Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5 Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{e5dc7c25-6293-4660-b5fb-186496386b90}*SharedItemsImports = 13 EndGlobalSection @@ -105,6 +110,7 @@ Global {BBE51380-8B21-49FF-9CFC-B29447A40999} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} {E5DC7C25-6293-4660-B5FB-186496386B90} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} {6F0C9CFF-2269-46A7-9664-478354C582A4} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} + {3531857C-28FC-4E0F-82D9-BFBB70740E04} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D4636382-1A18-4079-A3E7-054DD970F179} diff --git a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj index 042da097..c4f2666c 100644 --- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj +++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj @@ -82,6 +82,7 @@ + Resources\dropper.cur diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj index c10442ca..df50d316 100644 --- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj +++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj @@ -82,6 +82,7 @@ + Resources\dropper.cur diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems index ca7ddf4e..1ed903e5 100644 --- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems +++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems @@ -86,6 +86,9 @@ + + + @@ -282,21 +285,10 @@ - - - - - - - - - - - @@ -353,7 +345,6 @@ - diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehaviorEx.cs b/src/Shared/HandyControl_Shared/Interactivity/MouseDragElementBehaviorEx.cs similarity index 100% rename from src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehaviorEx.cs rename to src/Shared/HandyControl_Shared/Interactivity/MouseDragElementBehaviorEx.cs diff --git a/src/Shared/HandyControl_Shared/Interactivity/AdornerContainer.cs b/src/Shared/Microsoft.Expression.Interactions/AdornerContainer.cs similarity index 100% rename from src/Shared/HandyControl_Shared/Interactivity/AdornerContainer.cs rename to src/Shared/Microsoft.Expression.Interactions/AdornerContainer.cs diff --git a/src/Shared/HandyControl_Shared/Interactivity/ExceptionStringTable.cs b/src/Shared/Microsoft.Expression.Interactions/ExceptionStringTable.cs similarity index 100% rename from src/Shared/HandyControl_Shared/Interactivity/ExceptionStringTable.cs rename to src/Shared/Microsoft.Expression.Interactions/ExceptionStringTable.cs diff --git a/src/Shared/HandyControl_Shared/Interactivity/ExtendedVisualStateManager.cs b/src/Shared/Microsoft.Expression.Interactions/ExtendedVisualStateManager.cs similarity index 100% rename from src/Shared/HandyControl_Shared/Interactivity/ExtendedVisualStateManager.cs rename to src/Shared/Microsoft.Expression.Interactions/ExtendedVisualStateManager.cs diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehavior.cs b/src/Shared/Microsoft.Expression.Interactions/FluidMoveBehavior.cs similarity index 100% rename from src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehavior.cs rename to src/Shared/Microsoft.Expression.Interactions/FluidMoveBehavior.cs diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehaviorBase.cs b/src/Shared/Microsoft.Expression.Interactions/FluidMoveBehaviorBase.cs similarity index 100% rename from src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehaviorBase.cs rename to src/Shared/Microsoft.Expression.Interactions/FluidMoveBehaviorBase.cs diff --git a/src/Shared/HandyControl_Shared/Interactivity/FluidMoveScope.cs b/src/Shared/Microsoft.Expression.Interactions/FluidMoveScope.cs similarity index 100% rename from src/Shared/HandyControl_Shared/Interactivity/FluidMoveScope.cs rename to src/Shared/Microsoft.Expression.Interactions/FluidMoveScope.cs diff --git a/src/Shared/Microsoft.Expression.Interactions/Microsoft.Expression.Interactions.projitems b/src/Shared/Microsoft.Expression.Interactions/Microsoft.Expression.Interactions.projitems new file mode 100644 index 00000000..a1b33d6d --- /dev/null +++ b/src/Shared/Microsoft.Expression.Interactions/Microsoft.Expression.Interactions.projitems @@ -0,0 +1,22 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + 3531857c-28fc-4e0f-82d9-bfbb70740e04 + + + Microsoft.Expression.Interactions + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Shared/Microsoft.Expression.Interactions/Microsoft.Expression.Interactions.shproj b/src/Shared/Microsoft.Expression.Interactions/Microsoft.Expression.Interactions.shproj new file mode 100644 index 00000000..dfd71b72 --- /dev/null +++ b/src/Shared/Microsoft.Expression.Interactions/Microsoft.Expression.Interactions.shproj @@ -0,0 +1,13 @@ + + + + 3531857c-28fc-4e0f-82d9-bfbb70740e04 + 14.0 + + + + + + + + diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehavior.cs b/src/Shared/Microsoft.Expression.Interactions/MouseDragElementBehavior.cs similarity index 100% rename from src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehavior.cs rename to src/Shared/Microsoft.Expression.Interactions/MouseDragElementBehavior.cs diff --git a/src/Shared/HandyControl_Shared/Interactivity/TagType.cs b/src/Shared/Microsoft.Expression.Interactions/TagType.cs similarity index 100% rename from src/Shared/HandyControl_Shared/Interactivity/TagType.cs rename to src/Shared/Microsoft.Expression.Interactions/TagType.cs diff --git a/src/Shared/HandyControl_Shared/Interactivity/TransitionEffect.cs b/src/Shared/Microsoft.Expression.Interactions/TransitionEffect.cs similarity index 100% rename from src/Shared/HandyControl_Shared/Interactivity/TransitionEffect.cs rename to src/Shared/Microsoft.Expression.Interactions/TransitionEffect.cs