From 0da287564112921392abead8fb6aaec629851b6e Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 13 Mar 2022 21:26:27 +0800
Subject: [PATCH] chore: separated Microsoft.Expression.Drawing code

---
 src/HandyControl.sln                          | 10 ++++-
 .../HandyControl_Net_40.csproj                |  1 +
 .../HandyControl_Net_GE45.csproj              |  1 +
 .../HandyControl_Shared.projitems             | 32 -------------
 .../Drawing/BezierCurveFlattener.cs           |  0
 .../Drawing/CommonExtensions.cs               |  0
 .../Drawing/ExceptionStringTable.cs           |  0
 .../Drawing/GeometryHelper.cs                 |  0
 .../Drawing/MarchLocation.cs                  |  0
 .../Drawing/MarchStopReason.cs                |  0
 .../Drawing/MathHelper.cs                     |  0
 .../Drawing/PathFigureHelper.cs               |  0
 .../Drawing/PathGeometryHelper.cs             |  0
 .../Drawing/PathSegmentData.cs                |  0
 .../Drawing/PathSegmentHelper.cs              |  0
 .../Drawing/PolylineData.cs                   |  0
 .../Drawing/PolylineHelper.cs                 |  0
 .../Drawing/RandomEngine.cs                   |  0
 .../Drawing/SimpleSegment.cs                  |  0
 .../Media/ArcGeometrySource.cs                |  0
 .../Media/DrawingPropertyChangedEventArgs.cs  |  0
 .../Media/DrawingPropertyMetadata.cs          |  0
 .../Media/DrawingPropertyMetadataOptions.cs   |  0
 .../Media/GeometryEffect.cs                   |  0
 .../Media/GeometryEffectConverter.cs          |  0
 .../Media/GeometrySource`1.cs                 |  0
 .../Media/IArcGeometrySourceParameters.cs     |  0
 .../Media/IGeometrySource.cs                  |  0
 .../Media/IGeometrySourceExtensions.cs        |  0
 .../Media/IGeometrySourceParameters.cs        |  0
 .../Media/IShape.cs                           |  0
 .../Media/InvalidateGeometryReasons.cs        |  0
 .../Media/SketchGeometryEffect.cs             |  0
 .../Media/UnitType.cs                         |  0
 .../Microsoft.Expression.Drawing.projitems    | 45 +++++++++++++++++++
 .../Microsoft.Expression.Drawing.shproj       | 13 ++++++
 .../Shapes/Arc.cs                             |  0
 .../Shapes/PrimitiveShape.cs                  |  0
 38 files changed, 68 insertions(+), 34 deletions(-)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/BezierCurveFlattener.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/CommonExtensions.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/ExceptionStringTable.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/GeometryHelper.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/MarchLocation.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/MarchStopReason.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/MathHelper.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/PathFigureHelper.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/PathGeometryHelper.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/PathSegmentData.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/PathSegmentHelper.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/PolylineData.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/PolylineHelper.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/RandomEngine.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/SimpleSegment.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/ArcGeometrySource.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/DrawingPropertyChangedEventArgs.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/DrawingPropertyMetadata.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/DrawingPropertyMetadataOptions.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/GeometryEffect.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/GeometryEffectConverter.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/GeometrySource`1.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/IArcGeometrySourceParameters.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/IGeometrySource.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/IGeometrySourceExtensions.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/IGeometrySourceParameters.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/IShape.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/InvalidateGeometryReasons.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/SketchGeometryEffect.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/UnitType.cs (100%)
 create mode 100644 src/Shared/Microsoft.Expression.Drawing/Microsoft.Expression.Drawing.projitems
 create mode 100644 src/Shared/Microsoft.Expression.Drawing/Microsoft.Expression.Drawing.shproj
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Shapes/Arc.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Shapes/PrimitiveShape.cs (100%)

diff --git a/src/HandyControl.sln b/src/HandyControl.sln
index 1459e713..94a13bfa 100644
--- a/src/HandyControl.sln
+++ b/src/HandyControl.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28729.10
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32228.430
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Net_GE45", "Net_GE45\HandyControl_Net_GE45\HandyControl_Net_GE45.csproj", "{DC966E3D-BCFF-4652-98CF-070E5494749A}"
 EndProject
@@ -30,9 +30,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.Props = Directory.Build.Props
 	EndProjectSection
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Expression.Drawing", "Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.shproj", "{E5DC7C25-6293-4660-B5FB-186496386B90}"
+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.Windows.Shell\Microsoft.Windows.Shell.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5
 		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
@@ -40,6 +43,8 @@ Global
 		Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{c4694269-c9b8-45d5-87f8-d0088c532510}*SharedItemsImports = 13
 		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.Drawing\Microsoft.Expression.Drawing.projitems*{e5dc7c25-6293-4660-b5fb-186496386b90}*SharedItemsImports = 13
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -93,6 +98,7 @@ Global
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231} = {35E3F9C0-8924-4536-BE09-F3761FDBF066}
 		{D8A4748C-0500-4F63-BC47-3506658C68F7} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
 		{BBE51380-8B21-49FF-9CFC-B29447A40999} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
+		{E5DC7C25-6293-4660-B5FB-186496386B90} = {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 c88b6d26..3117a430 100644
--- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
+++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
@@ -80,6 +80,7 @@
   </ItemGroup>
   <Import Project="..\..\Shared\HandyControl_Shared\HandyControl_Shared.projitems" Label="Shared" />
   <Import Project="..\..\Shared\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems" Label="Shared" />
+  <Import Project="..\..\Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems" Label="Shared" />
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControl_Shared\Resources\dropper.cur">
       <Link>Resources\dropper.cur</Link>
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 1881b318..3f780096 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
@@ -80,6 +80,7 @@
     </Content>
   </ItemGroup>
   <Import Project="..\..\Shared\HandyControl_Shared\HandyControl_Shared.projitems" Label="Shared" />
+  <Import Project="..\..\Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems" Label="Shared" />
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControl_Shared\Resources\dropper.cur">
       <Link>Resources\dropper.cur</Link>
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index ecd496ef..85820b3a 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -282,38 +282,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Data\ResourceToken.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Info\SystemVersionInfo.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\ValueBoxes.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\BezierCurveFlattener.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\CommonExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\ExceptionStringTable.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\GeometryHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\MarchLocation.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\MarchStopReason.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\MathHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\PathFigureHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\PathGeometryHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\PathSegmentData.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\PathSegmentHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\PolylineData.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\PolylineHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\RandomEngine.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\SimpleSegment.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\ArcGeometrySource.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\DrawingPropertyChangedEventArgs.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\DrawingPropertyMetadata.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\DrawingPropertyMetadataOptions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\GeometryEffect.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\GeometryEffectConverter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\GeometrySource`1.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\IArcGeometrySourceParameters.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\IGeometrySource.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\IGeometrySourceExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\IGeometrySourceParameters.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\InvalidateGeometryReasons.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\IShape.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\SketchGeometryEffect.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\UnitType.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Shapes\Arc.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Shapes\PrimitiveShape.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\AdornerContainer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\AttachableCollection`1.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior\Behavior`1.cs" />
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/BezierCurveFlattener.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/BezierCurveFlattener.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/BezierCurveFlattener.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/BezierCurveFlattener.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/CommonExtensions.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/CommonExtensions.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/CommonExtensions.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/CommonExtensions.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/ExceptionStringTable.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/ExceptionStringTable.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/ExceptionStringTable.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/ExceptionStringTable.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/GeometryHelper.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/GeometryHelper.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/GeometryHelper.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/GeometryHelper.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/MarchLocation.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/MarchLocation.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/MarchLocation.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/MarchLocation.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/MarchStopReason.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/MarchStopReason.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/MarchStopReason.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/MarchStopReason.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/MathHelper.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/MathHelper.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/MathHelper.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/MathHelper.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/PathFigureHelper.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/PathFigureHelper.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/PathFigureHelper.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/PathFigureHelper.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/PathGeometryHelper.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/PathGeometryHelper.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/PathGeometryHelper.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/PathGeometryHelper.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentData.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/PathSegmentData.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentData.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/PathSegmentData.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentHelper.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/PathSegmentHelper.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentHelper.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/PathSegmentHelper.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/PolylineData.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/PolylineData.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/PolylineData.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/PolylineData.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/PolylineHelper.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/PolylineHelper.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/PolylineHelper.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/PolylineHelper.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/RandomEngine.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/RandomEngine.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/RandomEngine.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/RandomEngine.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/SimpleSegment.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/SimpleSegment.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/SimpleSegment.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/SimpleSegment.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/ArcGeometrySource.cs b/src/Shared/Microsoft.Expression.Drawing/Media/ArcGeometrySource.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/ArcGeometrySource.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/ArcGeometrySource.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyChangedEventArgs.cs b/src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyChangedEventArgs.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyChangedEventArgs.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyChangedEventArgs.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadata.cs b/src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyMetadata.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadata.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyMetadata.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadataOptions.cs b/src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyMetadataOptions.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadataOptions.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyMetadataOptions.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/GeometryEffect.cs b/src/Shared/Microsoft.Expression.Drawing/Media/GeometryEffect.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/GeometryEffect.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/GeometryEffect.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/GeometryEffectConverter.cs b/src/Shared/Microsoft.Expression.Drawing/Media/GeometryEffectConverter.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/GeometryEffectConverter.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/GeometryEffectConverter.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/GeometrySource`1.cs b/src/Shared/Microsoft.Expression.Drawing/Media/GeometrySource`1.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/GeometrySource`1.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/GeometrySource`1.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/IArcGeometrySourceParameters.cs b/src/Shared/Microsoft.Expression.Drawing/Media/IArcGeometrySourceParameters.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/IArcGeometrySourceParameters.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/IArcGeometrySourceParameters.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySource.cs b/src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySource.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/IGeometrySource.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySource.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceExtensions.cs b/src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySourceExtensions.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceExtensions.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySourceExtensions.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceParameters.cs b/src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySourceParameters.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceParameters.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySourceParameters.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/IShape.cs b/src/Shared/Microsoft.Expression.Drawing/Media/IShape.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/IShape.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/IShape.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/InvalidateGeometryReasons.cs b/src/Shared/Microsoft.Expression.Drawing/Media/InvalidateGeometryReasons.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/InvalidateGeometryReasons.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/InvalidateGeometryReasons.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/SketchGeometryEffect.cs b/src/Shared/Microsoft.Expression.Drawing/Media/SketchGeometryEffect.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/SketchGeometryEffect.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/SketchGeometryEffect.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/UnitType.cs b/src/Shared/Microsoft.Expression.Drawing/Media/UnitType.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/UnitType.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/UnitType.cs
diff --git a/src/Shared/Microsoft.Expression.Drawing/Microsoft.Expression.Drawing.projitems b/src/Shared/Microsoft.Expression.Drawing/Microsoft.Expression.Drawing.projitems
new file mode 100644
index 00000000..d00f4235
--- /dev/null
+++ b/src/Shared/Microsoft.Expression.Drawing/Microsoft.Expression.Drawing.projitems
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>e5dc7c25-6293-4660-b5fb-186496386b90</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Microsoft.Expression.Drawing</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\BezierCurveFlattener.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\CommonExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\ExceptionStringTable.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\GeometryHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\MarchLocation.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\MarchStopReason.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\MathHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\PathFigureHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\PathGeometryHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\PathSegmentData.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\PathSegmentHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\PolylineData.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\PolylineHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\RandomEngine.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\SimpleSegment.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\ArcGeometrySource.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\DrawingPropertyChangedEventArgs.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\DrawingPropertyMetadata.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\DrawingPropertyMetadataOptions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\GeometryEffect.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\GeometryEffectConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\GeometrySource`1.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\IArcGeometrySourceParameters.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\IGeometrySource.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\IGeometrySourceExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\IGeometrySourceParameters.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\InvalidateGeometryReasons.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\IShape.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\SketchGeometryEffect.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\UnitType.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Shapes\Arc.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Shapes\PrimitiveShape.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Expression.Drawing/Microsoft.Expression.Drawing.shproj b/src/Shared/Microsoft.Expression.Drawing/Microsoft.Expression.Drawing.shproj
new file mode 100644
index 00000000..32c81158
--- /dev/null
+++ b/src/Shared/Microsoft.Expression.Drawing/Microsoft.Expression.Drawing.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>e5dc7c25-6293-4660-b5fb-186496386b90</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="Microsoft.Expression.Drawing.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/src/Shared/HandyControl_Shared/Expression/Shapes/Arc.cs b/src/Shared/Microsoft.Expression.Drawing/Shapes/Arc.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Shapes/Arc.cs
rename to src/Shared/Microsoft.Expression.Drawing/Shapes/Arc.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Shapes/PrimitiveShape.cs b/src/Shared/Microsoft.Expression.Drawing/Shapes/PrimitiveShape.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Shapes/PrimitiveShape.cs
rename to src/Shared/Microsoft.Expression.Drawing/Shapes/PrimitiveShape.cs