Sync with vs-editor-core@d160aa851

191 files changed, 9 insertions, 74 deletions

diff --git a/build/Project.targets b/build/Project.targets
index cc9b081..3ab745b 100644
--- a/build/Project.targets
+++ b/build/Project.targets
@@ -36,7 +36,7 @@
   </Target>
 
   <PropertyGroup>
-    <FPFRootPath>$(RepoRootPath)src\FPF\</FPFRootPath>
+    <FPFRootPath>$(RepoRootPath)src\Editor\FPF\</FPFRootPath>
     <FPFOutputPath>$(RepoBinPath)FPF\$(Configuration)\$(TargetFramework)\</FPFOutputPath>
   </PropertyGroup>
 
@@ -83,7 +83,7 @@
 
   <Target Name="Test" Condition="$(HasEditorUnitTests)">
     <PropertyGroup>
-      <StandaloneMacEditor>$(RepoBinPath)StandaloneMacEditor\$(Configuration)\$(TargetFramework)\MonoDevelop.Ide.app\Contents\MacOS\MonoDevelop.Ide</StandaloneMacEditor>
+      <StandaloneMacEditor>$(RepoBinPath)Editor\Text\Test\Util\StandaloneMacEditor\$(Configuration)\$(TargetFramework)\MonoDevelop.Ide.app\Contents\MacOS\MonoDevelop.Ide</StandaloneMacEditor>
     </PropertyGroup>
     <Exec Command="&quot;$(StandaloneMacEditor)&quot; xunit &quot;$(TargetPath)&quot; -xml &quot;$(RepoArtifactsPath)TestResults\$(TargetName).xml&quot;" />
   </Target>
diff --git a/src/FPF/Directory.Build.props b/src/Editor/FPF/Directory.Build.props
index 548aff7..194189d 100644
--- a/src/FPF/Directory.Build.props
+++ b/src/Editor/FPF/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\.., Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
 
diff --git a/src/FPF/Directory.Build.targets b/src/Editor/FPF/Directory.Build.targets
index b3d5603..b3d5603 100644
--- a/src/FPF/Directory.Build.targets
+++ b/src/Editor/FPF/Directory.Build.targets
diff --git a/src/FPF/PresentationCore/PresentationCore.csproj b/src/Editor/FPF/PresentationCore/PresentationCore.csproj
index e8cefc0..e8cefc0 100644
--- a/src/FPF/PresentationCore/PresentationCore.csproj
+++ b/src/Editor/FPF/PresentationCore/PresentationCore.csproj
diff --git a/src/FPF/PresentationCore/Properties/AssemblyInfo.cs b/src/Editor/FPF/PresentationCore/Properties/AssemblyInfo.cs
index 8341535..8341535 100644
--- a/src/FPF/PresentationCore/Properties/AssemblyInfo.cs
+++ b/src/Editor/FPF/PresentationCore/Properties/AssemblyInfo.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Clipboard.cs b/src/Editor/FPF/PresentationCore/System.Windows.Clipboard.cs
index f45967c..f45967c 100644
--- a/src/FPF/PresentationCore/System.Windows.Clipboard.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Clipboard.cs
diff --git a/src/FPF/PresentationCore/System.Windows.DataFormats.cs b/src/Editor/FPF/PresentationCore/System.Windows.DataFormats.cs
index 3ca9ae2..3ca9ae2 100644
--- a/src/FPF/PresentationCore/System.Windows.DataFormats.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.DataFormats.cs
diff --git a/src/FPF/PresentationCore/System.Windows.DataObject.cs b/src/Editor/FPF/PresentationCore/System.Windows.DataObject.cs
index 6dc13dc..6dc13dc 100644
--- a/src/FPF/PresentationCore/System.Windows.DataObject.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.DataObject.cs
diff --git a/src/FPF/PresentationCore/System.Windows.DragEventArgs.cs b/src/Editor/FPF/PresentationCore/System.Windows.DragEventArgs.cs
index dcd7938..dcd7938 100644
--- a/src/FPF/PresentationCore/System.Windows.DragEventArgs.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.DragEventArgs.cs
diff --git a/src/FPF/PresentationCore/System.Windows.FontStyle.cs b/src/Editor/FPF/PresentationCore/System.Windows.FontStyle.cs
index 6558730..6558730 100644
--- a/src/FPF/PresentationCore/System.Windows.FontStyle.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.FontStyle.cs
diff --git a/src/FPF/PresentationCore/System.Windows.FontStyles.cs b/src/Editor/FPF/PresentationCore/System.Windows.FontStyles.cs
index 46c28ec..46c28ec 100644
--- a/src/FPF/PresentationCore/System.Windows.FontStyles.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.FontStyles.cs
diff --git a/src/FPF/PresentationCore/System.Windows.FontWeight.cs b/src/Editor/FPF/PresentationCore/System.Windows.FontWeight.cs
index 0d094c9..0d094c9 100644
--- a/src/FPF/PresentationCore/System.Windows.FontWeight.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.FontWeight.cs
diff --git a/src/FPF/PresentationCore/System.Windows.FontWeights.cs b/src/Editor/FPF/PresentationCore/System.Windows.FontWeights.cs
index dca1e0f..dca1e0f 100644
--- a/src/FPF/PresentationCore/System.Windows.FontWeights.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.FontWeights.cs
diff --git a/src/FPF/PresentationCore/System.Windows.GiveFeedbackEventArgs.cs b/src/Editor/FPF/PresentationCore/System.Windows.GiveFeedbackEventArgs.cs
index 776c7da..776c7da 100644
--- a/src/FPF/PresentationCore/System.Windows.GiveFeedbackEventArgs.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.GiveFeedbackEventArgs.cs
diff --git a/src/FPF/PresentationCore/System.Windows.IInputElement.cs b/src/Editor/FPF/PresentationCore/System.Windows.IInputElement.cs
index e7fe80c..e7fe80c 100644
--- a/src/FPF/PresentationCore/System.Windows.IInputElement.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.IInputElement.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Input.InputEventArgs.cs b/src/Editor/FPF/PresentationCore/System.Windows.Input.InputEventArgs.cs
index 3ff7fe5..3ff7fe5 100644
--- a/src/FPF/PresentationCore/System.Windows.Input.InputEventArgs.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Input.InputEventArgs.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Input.InputLanguageEventArgs.cs b/src/Editor/FPF/PresentationCore/System.Windows.Input.InputLanguageEventArgs.cs
index 09061c6..09061c6 100644
--- a/src/FPF/PresentationCore/System.Windows.Input.InputLanguageEventArgs.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Input.InputLanguageEventArgs.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Input.MouseButton.cs b/src/Editor/FPF/PresentationCore/System.Windows.Input.MouseButton.cs
index e22e8c0..e22e8c0 100644
--- a/src/FPF/PresentationCore/System.Windows.Input.MouseButton.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Input.MouseButton.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Input.MouseButtonEventArgs.cs b/src/Editor/FPF/PresentationCore/System.Windows.Input.MouseButtonEventArgs.cs
index 3709e5f..3709e5f 100644
--- a/src/FPF/PresentationCore/System.Windows.Input.MouseButtonEventArgs.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Input.MouseButtonEventArgs.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Input.MouseButtonState.cs b/src/Editor/FPF/PresentationCore/System.Windows.Input.MouseButtonState.cs
index a4d6b09..a4d6b09 100644
--- a/src/FPF/PresentationCore/System.Windows.Input.MouseButtonState.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Input.MouseButtonState.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Input.MouseEventArgs.cs b/src/Editor/FPF/PresentationCore/System.Windows.Input.MouseEventArgs.cs
index cef60a9..cef60a9 100644
--- a/src/FPF/PresentationCore/System.Windows.Input.MouseEventArgs.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Input.MouseEventArgs.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Input.MouseWheelEventArgs.cs b/src/Editor/FPF/PresentationCore/System.Windows.Input.MouseWheelEventArgs.cs
index 10cee09..10cee09 100644
--- a/src/FPF/PresentationCore/System.Windows.Input.MouseWheelEventArgs.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Input.MouseWheelEventArgs.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Input.TouchEventArgs.cs b/src/Editor/FPF/PresentationCore/System.Windows.Input.TouchEventArgs.cs
index 9a2df37..9a2df37 100644
--- a/src/FPF/PresentationCore/System.Windows.Input.TouchEventArgs.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Input.TouchEventArgs.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.Animation.Animatable.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.Animation.Animatable.cs
index 52cc7b1..52cc7b1 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.Animation.Animatable.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.Animation.Animatable.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.Animation.AnimationTimeline.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.Animation.AnimationTimeline.cs
index adbae0e..adbae0e 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.Animation.AnimationTimeline.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.Animation.AnimationTimeline.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.Animation.RepeatBehavior.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.Animation.RepeatBehavior.cs
index 2246d6b..2246d6b 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.Animation.RepeatBehavior.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.Animation.RepeatBehavior.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.Animation.Timeline.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.Animation.Timeline.cs
index 1c7aaf4..1c7aaf4 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.Animation.Timeline.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.Animation.Timeline.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.BitmapScalingMode.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.BitmapScalingMode.cs
index 83b709c..83b709c 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.BitmapScalingMode.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.BitmapScalingMode.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.Brush.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.Brush.cs
index 677e0a4..677e0a4 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.Brush.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.Brush.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.Brushes.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.Brushes.cs
index dc99d71..dc99d71 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.Brushes.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.Brushes.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.Color.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.Color.cs
index 1af2af3..1af2af3 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.Color.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.Color.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.Colors.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.Colors.cs
index fc3e487..fc3e487 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.Colors.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.Colors.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.DashStyle.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.DashStyle.cs
index cb0ef52..cb0ef52 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.DashStyle.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.DashStyle.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.FillRule.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.FillRule.cs
index 3c65882..3c65882 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.FillRule.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.FillRule.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.GeneralTransform.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.GeneralTransform.cs
index 57ead83..57ead83 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.GeneralTransform.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.GeneralTransform.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.Geometry.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.Geometry.cs
index 0cd52b8..0cd52b8 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.Geometry.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.Geometry.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.GeometryCollection.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.GeometryCollection.cs
index c7698b7..c7698b7 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.GeometryCollection.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.GeometryCollection.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.GeometryGroup.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.GeometryGroup.cs
index 3bfc123..3bfc123 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.GeometryGroup.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.GeometryGroup.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.ImageSource.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.ImageSource.cs
index 6db3b26..6db3b26 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.ImageSource.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.ImageSource.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.Imaging.BitmapImage.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.Imaging.BitmapImage.cs
index 2e0796b..2e0796b 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.Imaging.BitmapImage.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.Imaging.BitmapImage.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.Imaging.BitmapSource.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.Imaging.BitmapSource.cs
index 5ea7a9e..5ea7a9e 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.Imaging.BitmapSource.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.Imaging.BitmapSource.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.IntersectionDetail.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.IntersectionDetail.cs
index ecf2468..ecf2468 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.IntersectionDetail.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.IntersectionDetail.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.PathFigure.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.PathFigure.cs
index 2fa79a9..2fa79a9 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.PathFigure.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.PathFigure.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.PathFigureCollection.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.PathFigureCollection.cs
index 670519d..670519d 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.PathFigureCollection.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.PathFigureCollection.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.PathGeometry.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.PathGeometry.cs
index e60c849..e60c849 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.PathGeometry.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.PathGeometry.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.PathSegment.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.PathSegment.cs
index b23eabe..b23eabe 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.PathSegment.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.PathSegment.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.PathSegmentCollection.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.PathSegmentCollection.cs
index 07af3b2..07af3b2 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.PathSegmentCollection.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.PathSegmentCollection.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.Pen.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.Pen.cs
index 48df6cc..48df6cc 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.Pen.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.Pen.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.PenLineCap.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.PenLineCap.cs
index 301aec5..301aec5 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.PenLineCap.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.PenLineCap.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.PenLineJoin.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.PenLineJoin.cs
index 6ee6427..6ee6427 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.PenLineJoin.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.PenLineJoin.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.RectangleGeometry.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.RectangleGeometry.cs
index cbd4481..cbd4481 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.RectangleGeometry.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.RectangleGeometry.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.SolidColorBrush.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.SolidColorBrush.cs
index b26bfa4..b26bfa4 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.SolidColorBrush.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.SolidColorBrush.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.TextEffectCollection.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.TextEffectCollection.cs
index 732e3bb..732e3bb 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.TextEffectCollection.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.TextEffectCollection.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.TextFormatting.TextRunProperties.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.TextFormatting.TextRunProperties.cs
index da49466..da49466 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.TextFormatting.TextRunProperties.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.TextFormatting.TextRunProperties.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.Transform.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.Transform.cs
index 3cc4852..3cc4852 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.Transform.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.Transform.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Media.Typeface.cs b/src/Editor/FPF/PresentationCore/System.Windows.Media.Typeface.cs
index e1a3eef..e1a3eef 100644
--- a/src/FPF/PresentationCore/System.Windows.Media.Typeface.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Media.Typeface.cs
diff --git a/src/FPF/PresentationCore/System.Windows.QueryContinueDragEventArgs.cs b/src/Editor/FPF/PresentationCore/System.Windows.QueryContinueDragEventArgs.cs
index bd90c9c..bd90c9c 100644
--- a/src/FPF/PresentationCore/System.Windows.QueryContinueDragEventArgs.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.QueryContinueDragEventArgs.cs
diff --git a/src/FPF/PresentationCore/System.Windows.RoutedEvent.cs b/src/Editor/FPF/PresentationCore/System.Windows.RoutedEvent.cs
index a685cc5..a685cc5 100644
--- a/src/FPF/PresentationCore/System.Windows.RoutedEvent.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.RoutedEvent.cs
diff --git a/src/FPF/PresentationCore/System.Windows.RoutedEventArgs.cs b/src/Editor/FPF/PresentationCore/System.Windows.RoutedEventArgs.cs
index 8325f4e..8325f4e 100644
--- a/src/FPF/PresentationCore/System.Windows.RoutedEventArgs.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.RoutedEventArgs.cs
diff --git a/src/FPF/PresentationCore/System.Windows.TextDataFormat.cs b/src/Editor/FPF/PresentationCore/System.Windows.TextDataFormat.cs
index f7313e2..f7313e2 100644
--- a/src/FPF/PresentationCore/System.Windows.TextDataFormat.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.TextDataFormat.cs
diff --git a/src/FPF/PresentationCore/System.Windows.TextDecorationCollection.cs b/src/Editor/FPF/PresentationCore/System.Windows.TextDecorationCollection.cs
index 8eab60f..8eab60f 100644
--- a/src/FPF/PresentationCore/System.Windows.TextDecorationCollection.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.TextDecorationCollection.cs
diff --git a/src/FPF/PresentationCore/System.Windows.Visibility.cs b/src/Editor/FPF/PresentationCore/System.Windows.Visibility.cs
index bb4de51..bb4de51 100644
--- a/src/FPF/PresentationCore/System.Windows.Visibility.cs
+++ b/src/Editor/FPF/PresentationCore/System.Windows.Visibility.cs
diff --git a/src/FPF/PresentationFramework/PresentationFramework.csproj b/src/Editor/FPF/PresentationFramework/PresentationFramework.csproj
index 10e9077..10e9077 100644
--- a/src/FPF/PresentationFramework/PresentationFramework.csproj
+++ b/src/Editor/FPF/PresentationFramework/PresentationFramework.csproj
diff --git a/src/FPF/PresentationFramework/Properties/AssemblyInfo.cs b/src/Editor/FPF/PresentationFramework/Properties/AssemblyInfo.cs
index ca0bd7d..ca0bd7d 100644
--- a/src/FPF/PresentationFramework/Properties/AssemblyInfo.cs
+++ b/src/Editor/FPF/PresentationFramework/Properties/AssemblyInfo.cs
diff --git a/src/FPF/PresentationFramework/System.Windows.ResourceDictionary.cs b/src/Editor/FPF/PresentationFramework/System.Windows.ResourceDictionary.cs
index 6444913..6444913 100644
--- a/src/FPF/PresentationFramework/System.Windows.ResourceDictionary.cs
+++ b/src/Editor/FPF/PresentationFramework/System.Windows.ResourceDictionary.cs
diff --git a/src/FPF/PresentationFramework/System.Windows.ResourceDictionaryLocation.cs b/src/Editor/FPF/PresentationFramework/System.Windows.ResourceDictionaryLocation.cs
index b471f0d..b471f0d 100644
--- a/src/FPF/PresentationFramework/System.Windows.ResourceDictionaryLocation.cs
+++ b/src/Editor/FPF/PresentationFramework/System.Windows.ResourceDictionaryLocation.cs
diff --git a/src/FPF/PresentationFramework/System.Windows.SystemColors.cs b/src/Editor/FPF/PresentationFramework/System.Windows.SystemColors.cs
index a6adb3d..a6adb3d 100644
--- a/src/FPF/PresentationFramework/System.Windows.SystemColors.cs
+++ b/src/Editor/FPF/PresentationFramework/System.Windows.SystemColors.cs
diff --git a/src/FPF/PresentationFramework/System.Windows.SystemParameters.cs b/src/Editor/FPF/PresentationFramework/System.Windows.SystemParameters.cs
index f24e07b..f24e07b 100644
--- a/src/FPF/PresentationFramework/System.Windows.SystemParameters.cs
+++ b/src/Editor/FPF/PresentationFramework/System.Windows.SystemParameters.cs
diff --git a/src/FPF/PresentationFramework/System.Windows.ThemeInfoAttribute.cs b/src/Editor/FPF/PresentationFramework/System.Windows.ThemeInfoAttribute.cs
index 2b6a550..2b6a550 100644
--- a/src/FPF/PresentationFramework/System.Windows.ThemeInfoAttribute.cs
+++ b/src/Editor/FPF/PresentationFramework/System.Windows.ThemeInfoAttribute.cs
diff --git a/src/FPF/PresentationFramework/System.Windows.Thickness.cs b/src/Editor/FPF/PresentationFramework/System.Windows.Thickness.cs
index bd7be9b..bd7be9b 100644
--- a/src/FPF/PresentationFramework/System.Windows.Thickness.cs
+++ b/src/Editor/FPF/PresentationFramework/System.Windows.Thickness.cs
diff --git a/src/FPF/README.md b/src/Editor/FPF/README.md
index 0ea55f0..0ea55f0 100644
--- a/src/FPF/README.md
+++ b/src/Editor/FPF/README.md
diff --git a/src/FPF/UIAutomationClient/Properties/AssemblyInfo.cs b/src/Editor/FPF/UIAutomationClient/Properties/AssemblyInfo.cs
index ca0bd7d..ca0bd7d 100644
--- a/src/FPF/UIAutomationClient/Properties/AssemblyInfo.cs
+++ b/src/Editor/FPF/UIAutomationClient/Properties/AssemblyInfo.cs
diff --git a/src/FPF/UIAutomationClient/System.Windows.Automation.AutomationElement.cs b/src/Editor/FPF/UIAutomationClient/System.Windows.Automation.AutomationElement.cs
index 83e0cfc..83e0cfc 100644
--- a/src/FPF/UIAutomationClient/System.Windows.Automation.AutomationElement.cs
+++ b/src/Editor/FPF/UIAutomationClient/System.Windows.Automation.AutomationElement.cs
diff --git a/src/FPF/UIAutomationClient/System.Windows.Automation.TextPattern.cs b/src/Editor/FPF/UIAutomationClient/System.Windows.Automation.TextPattern.cs
index 624a50a..624a50a 100644
--- a/src/FPF/UIAutomationClient/System.Windows.Automation.TextPattern.cs
+++ b/src/Editor/FPF/UIAutomationClient/System.Windows.Automation.TextPattern.cs
diff --git a/src/FPF/UIAutomationClient/UIAutomationClient.csproj b/src/Editor/FPF/UIAutomationClient/UIAutomationClient.csproj
index e179f75..e179f75 100644
--- a/src/FPF/UIAutomationClient/UIAutomationClient.csproj
+++ b/src/Editor/FPF/UIAutomationClient/UIAutomationClient.csproj
diff --git a/src/FPF/UIAutomationProvider/Properties/AssemblyInfo.cs b/src/Editor/FPF/UIAutomationProvider/Properties/AssemblyInfo.cs
index ca0bd7d..ca0bd7d 100644
--- a/src/FPF/UIAutomationProvider/Properties/AssemblyInfo.cs
+++ b/src/Editor/FPF/UIAutomationProvider/Properties/AssemblyInfo.cs
diff --git a/src/FPF/UIAutomationProvider/System.Windows.Automation.Provider.AutomationInteropProvider.cs b/src/Editor/FPF/UIAutomationProvider/System.Windows.Automation.Provider.AutomationInteropProvider.cs
index 399ba9d..399ba9d 100644
--- a/src/FPF/UIAutomationProvider/System.Windows.Automation.Provider.AutomationInteropProvider.cs
+++ b/src/Editor/FPF/UIAutomationProvider/System.Windows.Automation.Provider.AutomationInteropProvider.cs
diff --git a/src/FPF/UIAutomationProvider/System.Windows.Automation.Provider.IRawElementProviderSimple.cs b/src/Editor/FPF/UIAutomationProvider/System.Windows.Automation.Provider.IRawElementProviderSimple.cs
index 2292ca2..2292ca2 100644
--- a/src/FPF/UIAutomationProvider/System.Windows.Automation.Provider.IRawElementProviderSimple.cs
+++ b/src/Editor/FPF/UIAutomationProvider/System.Windows.Automation.Provider.IRawElementProviderSimple.cs
diff --git a/src/FPF/UIAutomationProvider/System.Windows.Automation.Provider.ISelectionItemProvider.cs b/src/Editor/FPF/UIAutomationProvider/System.Windows.Automation.Provider.ISelectionItemProvider.cs
index 12bc0e0..12bc0e0 100644
--- a/src/FPF/UIAutomationProvider/System.Windows.Automation.Provider.ISelectionItemProvider.cs
+++ b/src/Editor/FPF/UIAutomationProvider/System.Windows.Automation.Provider.ISelectionItemProvider.cs
diff --git a/src/FPF/UIAutomationProvider/System.Windows.Automation.Provider.ISelectionProvider.cs b/src/Editor/FPF/UIAutomationProvider/System.Windows.Automation.Provider.ISelectionProvider.cs
index 0ecbb29..0ecbb29 100644
--- a/src/FPF/UIAutomationProvider/System.Windows.Automation.Provider.ISelectionProvider.cs
+++ b/src/Editor/FPF/UIAutomationProvider/System.Windows.Automation.Provider.ISelectionProvider.cs
diff --git a/src/FPF/UIAutomationProvider/System.Windows.Automation.Provider.ITextProvider.cs b/src/Editor/FPF/UIAutomationProvider/System.Windows.Automation.Provider.ITextProvider.cs
index 2e8068b..2e8068b 100644
--- a/src/FPF/UIAutomationProvider/System.Windows.Automation.Provider.ITextProvider.cs
+++ b/src/Editor/FPF/UIAutomationProvider/System.Windows.Automation.Provider.ITextProvider.cs
diff --git a/src/FPF/UIAutomationProvider/System.Windows.Automation.Provider.ITextRangeProvider.cs b/src/Editor/FPF/UIAutomationProvider/System.Windows.Automation.Provider.ITextRangeProvider.cs
index 869918b..869918b 100644
--- a/src/FPF/UIAutomationProvider/System.Windows.Automation.Provider.ITextRangeProvider.cs
+++ b/src/Editor/FPF/UIAutomationProvider/System.Windows.Automation.Provider.ITextRangeProvider.cs
diff --git a/src/FPF/UIAutomationProvider/System.Windows.Automation.Provider.IValueProvider.cs b/src/Editor/FPF/UIAutomationProvider/System.Windows.Automation.Provider.IValueProvider.cs
index e31790e..e31790e 100644
--- a/src/FPF/UIAutomationProvider/System.Windows.Automation.Provider.IValueProvider.cs
+++ b/src/Editor/FPF/UIAutomationProvider/System.Windows.Automation.Provider.IValueProvider.cs
diff --git a/src/FPF/UIAutomationProvider/UIAutomationProvider.csproj b/src/Editor/FPF/UIAutomationProvider/UIAutomationProvider.csproj
index e6e8e6b..e6e8e6b 100644
--- a/src/FPF/UIAutomationProvider/UIAutomationProvider.csproj
+++ b/src/Editor/FPF/UIAutomationProvider/UIAutomationProvider.csproj
diff --git a/src/FPF/UIAutomationTypes/Properties/AssemblyInfo.cs b/src/Editor/FPF/UIAutomationTypes/Properties/AssemblyInfo.cs
index ca0bd7d..ca0bd7d 100644
--- a/src/FPF/UIAutomationTypes/Properties/AssemblyInfo.cs
+++ b/src/Editor/FPF/UIAutomationTypes/Properties/AssemblyInfo.cs
diff --git a/src/FPF/UIAutomationTypes/System.Windows.Automation.AutomationElementIdentifiers.cs b/src/Editor/FPF/UIAutomationTypes/System.Windows.Automation.AutomationElementIdentifiers.cs
index d55027f..d55027f 100644
--- a/src/FPF/UIAutomationTypes/System.Windows.Automation.AutomationElementIdentifiers.cs
+++ b/src/Editor/FPF/UIAutomationTypes/System.Windows.Automation.AutomationElementIdentifiers.cs
diff --git a/src/FPF/UIAutomationTypes/System.Windows.Automation.AutomationIdentifier.cs b/src/Editor/FPF/UIAutomationTypes/System.Windows.Automation.AutomationIdentifier.cs
index c5e2017..c5e2017 100644
--- a/src/FPF/UIAutomationTypes/System.Windows.Automation.AutomationIdentifier.cs
+++ b/src/Editor/FPF/UIAutomationTypes/System.Windows.Automation.AutomationIdentifier.cs
diff --git a/src/FPF/UIAutomationTypes/System.Windows.Automation.AutomationProperty.cs b/src/Editor/FPF/UIAutomationTypes/System.Windows.Automation.AutomationProperty.cs
index e477d8e..e477d8e 100644
--- a/src/FPF/UIAutomationTypes/System.Windows.Automation.AutomationProperty.cs
+++ b/src/Editor/FPF/UIAutomationTypes/System.Windows.Automation.AutomationProperty.cs
diff --git a/src/FPF/UIAutomationTypes/System.Windows.Automation.AutomationTextAttribute.cs b/src/Editor/FPF/UIAutomationTypes/System.Windows.Automation.AutomationTextAttribute.cs
index 6aaa162..6aaa162 100644
--- a/src/FPF/UIAutomationTypes/System.Windows.Automation.AutomationTextAttribute.cs
+++ b/src/Editor/FPF/UIAutomationTypes/System.Windows.Automation.AutomationTextAttribute.cs
diff --git a/src/FPF/UIAutomationTypes/System.Windows.Automation.SelectionItemPatternIdentifiers.cs b/src/Editor/FPF/UIAutomationTypes/System.Windows.Automation.SelectionItemPatternIdentifiers.cs
index b12dd05..b12dd05 100644
--- a/src/FPF/UIAutomationTypes/System.Windows.Automation.SelectionItemPatternIdentifiers.cs
+++ b/src/Editor/FPF/UIAutomationTypes/System.Windows.Automation.SelectionItemPatternIdentifiers.cs
diff --git a/src/FPF/UIAutomationTypes/System.Windows.Automation.SupportedTextSelection.cs b/src/Editor/FPF/UIAutomationTypes/System.Windows.Automation.SupportedTextSelection.cs
index d2c7bd7..d2c7bd7 100644
--- a/src/FPF/UIAutomationTypes/System.Windows.Automation.SupportedTextSelection.cs
+++ b/src/Editor/FPF/UIAutomationTypes/System.Windows.Automation.SupportedTextSelection.cs
diff --git a/src/FPF/UIAutomationTypes/System.Windows.Automation.Text.TextPatternRangeEndpoint.cs b/src/Editor/FPF/UIAutomationTypes/System.Windows.Automation.Text.TextPatternRangeEndpoint.cs
index 81745f2..81745f2 100644
--- a/src/FPF/UIAutomationTypes/System.Windows.Automation.Text.TextPatternRangeEndpoint.cs
+++ b/src/Editor/FPF/UIAutomationTypes/System.Windows.Automation.Text.TextPatternRangeEndpoint.cs
diff --git a/src/FPF/UIAutomationTypes/System.Windows.Automation.Text.TextUnit.cs b/src/Editor/FPF/UIAutomationTypes/System.Windows.Automation.Text.TextUnit.cs
index b3ac854..b3ac854 100644
--- a/src/FPF/UIAutomationTypes/System.Windows.Automation.Text.TextUnit.cs
+++ b/src/Editor/FPF/UIAutomationTypes/System.Windows.Automation.Text.TextUnit.cs
diff --git a/src/FPF/UIAutomationTypes/UIAutomationTypes.csproj b/src/Editor/FPF/UIAutomationTypes/UIAutomationTypes.csproj
index e6e8e6b..e6e8e6b 100644
--- a/src/FPF/UIAutomationTypes/UIAutomationTypes.csproj
+++ b/src/Editor/FPF/UIAutomationTypes/UIAutomationTypes.csproj
diff --git a/src/FPF/WindowsBase/Assembly/AssemblyInfo.cs b/src/Editor/FPF/WindowsBase/Assembly/AssemblyInfo.cs
index 0e831d2..0e831d2 100644
--- a/src/FPF/WindowsBase/Assembly/AssemblyInfo.cs
+++ b/src/Editor/FPF/WindowsBase/Assembly/AssemblyInfo.cs
diff --git a/src/FPF/WindowsBase/Consts.cs b/src/Editor/FPF/WindowsBase/Consts.cs
index c901887..c901887 100644
--- a/src/FPF/WindowsBase/Consts.cs
+++ b/src/Editor/FPF/WindowsBase/Consts.cs
diff --git a/src/FPF/WindowsBase/MonoTODOAttribute.cs b/src/Editor/FPF/WindowsBase/MonoTODOAttribute.cs
index 33bf695..33bf695 100644
--- a/src/FPF/WindowsBase/MonoTODOAttribute.cs
+++ b/src/Editor/FPF/WindowsBase/MonoTODOAttribute.cs
diff --git a/src/FPF/WindowsBase/System.Collections.Specialized/CollectionChangedEventManager.cs b/src/Editor/FPF/WindowsBase/System.Collections.Specialized/CollectionChangedEventManager.cs
index 5cdf2f8..5cdf2f8 100644
--- a/src/FPF/WindowsBase/System.Collections.Specialized/CollectionChangedEventManager.cs
+++ b/src/Editor/FPF/WindowsBase/System.Collections.Specialized/CollectionChangedEventManager.cs
diff --git a/src/FPF/WindowsBase/System.Collections.Specialized/INotifyCollectionChanged.cs b/src/Editor/FPF/WindowsBase/System.Collections.Specialized/INotifyCollectionChanged.cs
index a6a2e57..a6a2e57 100644
--- a/src/FPF/WindowsBase/System.Collections.Specialized/INotifyCollectionChanged.cs
+++ b/src/Editor/FPF/WindowsBase/System.Collections.Specialized/INotifyCollectionChanged.cs
diff --git a/src/FPF/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedAction.cs b/src/Editor/FPF/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedAction.cs
index f9a24bb..f9a24bb 100644
--- a/src/FPF/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedAction.cs
+++ b/src/Editor/FPF/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedAction.cs
diff --git a/src/FPF/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedEventArgs.cs b/src/Editor/FPF/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedEventArgs.cs
index 993f547..993f547 100644
--- a/src/FPF/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedEventArgs.cs
+++ b/src/Editor/FPF/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedEventArgs.cs
diff --git a/src/FPF/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedEventHandler.cs b/src/Editor/FPF/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedEventHandler.cs
index 8fa9fb0..8fa9fb0 100644
--- a/src/FPF/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedEventHandler.cs
+++ b/src/Editor/FPF/WindowsBase/System.Collections.Specialized/NotifyCollectionChangedEventHandler.cs
diff --git a/src/FPF/WindowsBase/System.ComponentModel/DependencyPropertyDescriptor.cs b/src/Editor/FPF/WindowsBase/System.ComponentModel/DependencyPropertyDescriptor.cs
index 2a0f5cc..2a0f5cc 100644
--- a/src/FPF/WindowsBase/System.ComponentModel/DependencyPropertyDescriptor.cs
+++ b/src/Editor/FPF/WindowsBase/System.ComponentModel/DependencyPropertyDescriptor.cs
diff --git a/src/FPF/WindowsBase/System.IO/FileFormatException.cs b/src/Editor/FPF/WindowsBase/System.IO/FileFormatException.cs
index 38ae5d5..38ae5d5 100644
--- a/src/FPF/WindowsBase/System.IO/FileFormatException.cs
+++ b/src/Editor/FPF/WindowsBase/System.IO/FileFormatException.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Converters/Int32RectValueSerializer.cs b/src/Editor/FPF/WindowsBase/System.Windows.Converters/Int32RectValueSerializer.cs
index acaa7b2..acaa7b2 100644
--- a/src/FPF/WindowsBase/System.Windows.Converters/Int32RectValueSerializer.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Converters/Int32RectValueSerializer.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Converters/PointValueSerializer.cs b/src/Editor/FPF/WindowsBase/System.Windows.Converters/PointValueSerializer.cs
index 150c2e8..150c2e8 100644
--- a/src/FPF/WindowsBase/System.Windows.Converters/PointValueSerializer.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Converters/PointValueSerializer.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Converters/RectValueSerializer.cs b/src/Editor/FPF/WindowsBase/System.Windows.Converters/RectValueSerializer.cs
index 623c0d6..623c0d6 100644
--- a/src/FPF/WindowsBase/System.Windows.Converters/RectValueSerializer.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Converters/RectValueSerializer.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Converters/SizeValueSerializer.cs b/src/Editor/FPF/WindowsBase/System.Windows.Converters/SizeValueSerializer.cs
index 2765b73..2765b73 100644
--- a/src/FPF/WindowsBase/System.Windows.Converters/SizeValueSerializer.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Converters/SizeValueSerializer.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Converters/VectorValueSerializer.cs b/src/Editor/FPF/WindowsBase/System.Windows.Converters/VectorValueSerializer.cs
index 6ec7ae6..6ec7ae6 100644
--- a/src/FPF/WindowsBase/System.Windows.Converters/VectorValueSerializer.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Converters/VectorValueSerializer.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Data/DataSourceProvider.cs b/src/Editor/FPF/WindowsBase/System.Windows.Data/DataSourceProvider.cs
index 2f0c66e..2f0c66e 100644
--- a/src/FPF/WindowsBase/System.Windows.Data/DataSourceProvider.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Data/DataSourceProvider.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Input/FocusNavigationDirection.cs b/src/Editor/FPF/WindowsBase/System.Windows.Input/FocusNavigationDirection.cs
index 45e22bf..45e22bf 100644
--- a/src/FPF/WindowsBase/System.Windows.Input/FocusNavigationDirection.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Input/FocusNavigationDirection.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Input/Key.cs b/src/Editor/FPF/WindowsBase/System.Windows.Input/Key.cs
index 40f1a93..40f1a93 100644
--- a/src/FPF/WindowsBase/System.Windows.Input/Key.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Input/Key.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Input/KeyConverter.cs b/src/Editor/FPF/WindowsBase/System.Windows.Input/KeyConverter.cs
index 4855371..4855371 100644
--- a/src/FPF/WindowsBase/System.Windows.Input/KeyConverter.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Input/KeyConverter.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Input/KeyInterop.cs b/src/Editor/FPF/WindowsBase/System.Windows.Input/KeyInterop.cs
index b69e13d..b69e13d 100644
--- a/src/FPF/WindowsBase/System.Windows.Input/KeyInterop.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Input/KeyInterop.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Input/KeyValueSerializer.cs b/src/Editor/FPF/WindowsBase/System.Windows.Input/KeyValueSerializer.cs
index d7b3d07..d7b3d07 100644
--- a/src/FPF/WindowsBase/System.Windows.Input/KeyValueSerializer.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Input/KeyValueSerializer.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Input/ModifierKeys.cs b/src/Editor/FPF/WindowsBase/System.Windows.Input/ModifierKeys.cs
index cd78943..cd78943 100644
--- a/src/FPF/WindowsBase/System.Windows.Input/ModifierKeys.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Input/ModifierKeys.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Input/ModifierKeysConverter.cs b/src/Editor/FPF/WindowsBase/System.Windows.Input/ModifierKeysConverter.cs
index 3752b9d..3752b9d 100644
--- a/src/FPF/WindowsBase/System.Windows.Input/ModifierKeysConverter.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Input/ModifierKeysConverter.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Input/ModifierKeysValueSerializer.cs b/src/Editor/FPF/WindowsBase/System.Windows.Input/ModifierKeysValueSerializer.cs
index 11310ad..11310ad 100644
--- a/src/FPF/WindowsBase/System.Windows.Input/ModifierKeysValueSerializer.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Input/ModifierKeysValueSerializer.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Input/TraversalRequest.cs b/src/Editor/FPF/WindowsBase/System.Windows.Input/TraversalRequest.cs
index a132971..a132971 100644
--- a/src/FPF/WindowsBase/System.Windows.Input/TraversalRequest.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Input/TraversalRequest.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Interop/ComponentDispatcher.cs b/src/Editor/FPF/WindowsBase/System.Windows.Interop/ComponentDispatcher.cs
index 0665b4d..0665b4d 100644
--- a/src/FPF/WindowsBase/System.Windows.Interop/ComponentDispatcher.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Interop/ComponentDispatcher.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Interop/IKeyboardInputSink.cs b/src/Editor/FPF/WindowsBase/System.Windows.Interop/IKeyboardInputSink.cs
index fa8f4fe..fa8f4fe 100644
--- a/src/FPF/WindowsBase/System.Windows.Interop/IKeyboardInputSink.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Interop/IKeyboardInputSink.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Interop/IKeyboardInputSite.cs b/src/Editor/FPF/WindowsBase/System.Windows.Interop/IKeyboardInputSite.cs
index 8ffa1e0..8ffa1e0 100644
--- a/src/FPF/WindowsBase/System.Windows.Interop/IKeyboardInputSite.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Interop/IKeyboardInputSite.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Interop/MSG.cs b/src/Editor/FPF/WindowsBase/System.Windows.Interop/MSG.cs
index abcbd52..abcbd52 100644
--- a/src/FPF/WindowsBase/System.Windows.Interop/MSG.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Interop/MSG.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Interop/ThreadMessageEventHandler.cs b/src/Editor/FPF/WindowsBase/System.Windows.Interop/ThreadMessageEventHandler.cs
index 638c8e3..638c8e3 100644
--- a/src/FPF/WindowsBase/System.Windows.Interop/ThreadMessageEventHandler.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Interop/ThreadMessageEventHandler.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Media.Converters/MatrixValueSerializer.cs b/src/Editor/FPF/WindowsBase/System.Windows.Media.Converters/MatrixValueSerializer.cs
index 5a7b951..5a7b951 100644
--- a/src/FPF/WindowsBase/System.Windows.Media.Converters/MatrixValueSerializer.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Media.Converters/MatrixValueSerializer.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Media/DisableDpiAwarenessAttribute.cs b/src/Editor/FPF/WindowsBase/System.Windows.Media/DisableDpiAwarenessAttribute.cs
index 00c2be5..00c2be5 100644
--- a/src/FPF/WindowsBase/System.Windows.Media/DisableDpiAwarenessAttribute.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Media/DisableDpiAwarenessAttribute.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Media/Matrix.cs b/src/Editor/FPF/WindowsBase/System.Windows.Media/Matrix.cs
index 49e0548..49e0548 100644
--- a/src/FPF/WindowsBase/System.Windows.Media/Matrix.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Media/Matrix.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Media/MatrixConverter.cs b/src/Editor/FPF/WindowsBase/System.Windows.Media/MatrixConverter.cs
index 596d211..596d211 100644
--- a/src/FPF/WindowsBase/System.Windows.Media/MatrixConverter.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Media/MatrixConverter.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Threading/Dispatcher.cs b/src/Editor/FPF/WindowsBase/System.Windows.Threading/Dispatcher.cs
index 6a92f34..6a92f34 100644
--- a/src/FPF/WindowsBase/System.Windows.Threading/Dispatcher.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Threading/Dispatcher.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Threading/DispatcherEventArgs.cs b/src/Editor/FPF/WindowsBase/System.Windows.Threading/DispatcherEventArgs.cs
index 02347c5..02347c5 100644
--- a/src/FPF/WindowsBase/System.Windows.Threading/DispatcherEventArgs.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Threading/DispatcherEventArgs.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Threading/DispatcherObject.cs b/src/Editor/FPF/WindowsBase/System.Windows.Threading/DispatcherObject.cs
index 3782345..3782345 100644
--- a/src/FPF/WindowsBase/System.Windows.Threading/DispatcherObject.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Threading/DispatcherObject.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Threading/DispatcherOperation.cs b/src/Editor/FPF/WindowsBase/System.Windows.Threading/DispatcherOperation.cs
index 256ccb8..256ccb8 100644
--- a/src/FPF/WindowsBase/System.Windows.Threading/DispatcherOperation.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Threading/DispatcherOperation.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Threading/DispatcherOperationTaskSource.cs b/src/Editor/FPF/WindowsBase/System.Windows.Threading/DispatcherOperationTaskSource.cs
index 627be8d..627be8d 100644
--- a/src/FPF/WindowsBase/System.Windows.Threading/DispatcherOperationTaskSource.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Threading/DispatcherOperationTaskSource.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Threading/DispatcherPriority.cs b/src/Editor/FPF/WindowsBase/System.Windows.Threading/DispatcherPriority.cs
index d15c798..d15c798 100644
--- a/src/FPF/WindowsBase/System.Windows.Threading/DispatcherPriority.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Threading/DispatcherPriority.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Threading/DispatcherSynchronizationContext.cs b/src/Editor/FPF/WindowsBase/System.Windows.Threading/DispatcherSynchronizationContext.cs
index 687c786..687c786 100644
--- a/src/FPF/WindowsBase/System.Windows.Threading/DispatcherSynchronizationContext.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Threading/DispatcherSynchronizationContext.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Threading/DispatcherTimer.cs b/src/Editor/FPF/WindowsBase/System.Windows.Threading/DispatcherTimer.cs
index bef8f76..bef8f76 100644
--- a/src/FPF/WindowsBase/System.Windows.Threading/DispatcherTimer.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Threading/DispatcherTimer.cs
diff --git a/src/FPF/WindowsBase/System.Windows.Threading/DispatcherUnhandledExceptionEventArgs.cs b/src/Editor/FPF/WindowsBase/System.Windows.Threading/DispatcherUnhandledExceptionEventArgs.cs
index 43f0f2a..43f0f2a 100644
--- a/src/FPF/WindowsBase/System.Windows.Threading/DispatcherUnhandledExceptionEventArgs.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows.Threading/DispatcherUnhandledExceptionEventArgs.cs
diff --git a/src/FPF/WindowsBase/System.Windows/AttachedPropertyBrowsableAttribute.cs b/src/Editor/FPF/WindowsBase/System.Windows/AttachedPropertyBrowsableAttribute.cs
index e78ac8c..e78ac8c 100644
--- a/src/FPF/WindowsBase/System.Windows/AttachedPropertyBrowsableAttribute.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/AttachedPropertyBrowsableAttribute.cs
diff --git a/src/FPF/WindowsBase/System.Windows/AttachedPropertyBrowsableForTypeAttribute.cs b/src/Editor/FPF/WindowsBase/System.Windows/AttachedPropertyBrowsableForTypeAttribute.cs
index d1f77f6..d1f77f6 100644
--- a/src/FPF/WindowsBase/System.Windows/AttachedPropertyBrowsableForTypeAttribute.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/AttachedPropertyBrowsableForTypeAttribute.cs
diff --git a/src/FPF/WindowsBase/System.Windows/AttachedPropertyBrowsableWhenAttributePresentAttribute.cs b/src/Editor/FPF/WindowsBase/System.Windows/AttachedPropertyBrowsableWhenAttributePresentAttribute.cs
index 6796520..6796520 100644
--- a/src/FPF/WindowsBase/System.Windows/AttachedPropertyBrowsableWhenAttributePresentAttribute.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/AttachedPropertyBrowsableWhenAttributePresentAttribute.cs
diff --git a/src/FPF/WindowsBase/System.Windows/CoerceValueCallback.cs b/src/Editor/FPF/WindowsBase/System.Windows/CoerceValueCallback.cs
index 33eee8c..33eee8c 100644
--- a/src/FPF/WindowsBase/System.Windows/CoerceValueCallback.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/CoerceValueCallback.cs
diff --git a/src/FPF/WindowsBase/System.Windows/DependencyObject.cs b/src/Editor/FPF/WindowsBase/System.Windows/DependencyObject.cs
index 8eb923a..8eb923a 100644
--- a/src/FPF/WindowsBase/System.Windows/DependencyObject.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/DependencyObject.cs
diff --git a/src/FPF/WindowsBase/System.Windows/DependencyObjectType.cs b/src/Editor/FPF/WindowsBase/System.Windows/DependencyObjectType.cs
index 53ec8ab..53ec8ab 100644
--- a/src/FPF/WindowsBase/System.Windows/DependencyObjectType.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/DependencyObjectType.cs
diff --git a/src/FPF/WindowsBase/System.Windows/DependencyProperty.cs b/src/Editor/FPF/WindowsBase/System.Windows/DependencyProperty.cs
index 71a1ead..71a1ead 100644
--- a/src/FPF/WindowsBase/System.Windows/DependencyProperty.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/DependencyProperty.cs
diff --git a/src/FPF/WindowsBase/System.Windows/DependencyPropertyChangedEventArgs.cs b/src/Editor/FPF/WindowsBase/System.Windows/DependencyPropertyChangedEventArgs.cs
index 782e881..782e881 100644
--- a/src/FPF/WindowsBase/System.Windows/DependencyPropertyChangedEventArgs.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/DependencyPropertyChangedEventArgs.cs
diff --git a/src/FPF/WindowsBase/System.Windows/DependencyPropertyChangedEventHandler.cs b/src/Editor/FPF/WindowsBase/System.Windows/DependencyPropertyChangedEventHandler.cs
index 7673af4..7673af4 100644
--- a/src/FPF/WindowsBase/System.Windows/DependencyPropertyChangedEventHandler.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/DependencyPropertyChangedEventHandler.cs
diff --git a/src/FPF/WindowsBase/System.Windows/DependencyPropertyKey.cs b/src/Editor/FPF/WindowsBase/System.Windows/DependencyPropertyKey.cs
index 7f530ed..7f530ed 100644
--- a/src/FPF/WindowsBase/System.Windows/DependencyPropertyKey.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/DependencyPropertyKey.cs
diff --git a/src/FPF/WindowsBase/System.Windows/Expression.cs b/src/Editor/FPF/WindowsBase/System.Windows/Expression.cs
index d3a02f0..d3a02f0 100644
--- a/src/FPF/WindowsBase/System.Windows/Expression.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/Expression.cs
diff --git a/src/FPF/WindowsBase/System.Windows/ExpressionConverter.cs b/src/Editor/FPF/WindowsBase/System.Windows/ExpressionConverter.cs
index 480424e..480424e 100644
--- a/src/FPF/WindowsBase/System.Windows/ExpressionConverter.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/ExpressionConverter.cs
diff --git a/src/FPF/WindowsBase/System.Windows/Freezable.cs b/src/Editor/FPF/WindowsBase/System.Windows/Freezable.cs
index f11dac2..f11dac2 100644
--- a/src/FPF/WindowsBase/System.Windows/Freezable.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/Freezable.cs
diff --git a/src/FPF/WindowsBase/System.Windows/IWeakEventListener.cs b/src/Editor/FPF/WindowsBase/System.Windows/IWeakEventListener.cs
index 95c2365..95c2365 100644
--- a/src/FPF/WindowsBase/System.Windows/IWeakEventListener.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/IWeakEventListener.cs
diff --git a/src/FPF/WindowsBase/System.Windows/Int32Rect.cs b/src/Editor/FPF/WindowsBase/System.Windows/Int32Rect.cs
index 815fee0..815fee0 100644
--- a/src/FPF/WindowsBase/System.Windows/Int32Rect.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/Int32Rect.cs
diff --git a/src/FPF/WindowsBase/System.Windows/Int32RectConverter.cs b/src/Editor/FPF/WindowsBase/System.Windows/Int32RectConverter.cs
index 990b385..990b385 100644
--- a/src/FPF/WindowsBase/System.Windows/Int32RectConverter.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/Int32RectConverter.cs
diff --git a/src/FPF/WindowsBase/System.Windows/LocalValueEntry.cs b/src/Editor/FPF/WindowsBase/System.Windows/LocalValueEntry.cs
index 8ef695a..8ef695a 100644
--- a/src/FPF/WindowsBase/System.Windows/LocalValueEntry.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/LocalValueEntry.cs
diff --git a/src/FPF/WindowsBase/System.Windows/LocalValueEnumerator.cs b/src/Editor/FPF/WindowsBase/System.Windows/LocalValueEnumerator.cs
index bbabfca..bbabfca 100644
--- a/src/FPF/WindowsBase/System.Windows/LocalValueEnumerator.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/LocalValueEnumerator.cs
diff --git a/src/FPF/WindowsBase/System.Windows/NumericListTokenizer.cs b/src/Editor/FPF/WindowsBase/System.Windows/NumericListTokenizer.cs
index 81905ec..81905ec 100644
--- a/src/FPF/WindowsBase/System.Windows/NumericListTokenizer.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/NumericListTokenizer.cs
diff --git a/src/FPF/WindowsBase/System.Windows/Point.cs b/src/Editor/FPF/WindowsBase/System.Windows/Point.cs
index af57f92..af57f92 100644
--- a/src/FPF/WindowsBase/System.Windows/Point.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/Point.cs
diff --git a/src/FPF/WindowsBase/System.Windows/PointConverter.cs b/src/Editor/FPF/WindowsBase/System.Windows/PointConverter.cs
index eef6c52..eef6c52 100644
--- a/src/FPF/WindowsBase/System.Windows/PointConverter.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/PointConverter.cs
diff --git a/src/FPF/WindowsBase/System.Windows/PropertyChangedCallback.cs b/src/Editor/FPF/WindowsBase/System.Windows/PropertyChangedCallback.cs
index dfcfee2..dfcfee2 100644
--- a/src/FPF/WindowsBase/System.Windows/PropertyChangedCallback.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/PropertyChangedCallback.cs
diff --git a/src/FPF/WindowsBase/System.Windows/PropertyMetadata.cs b/src/Editor/FPF/WindowsBase/System.Windows/PropertyMetadata.cs
index 1432b0b..1432b0b 100644
--- a/src/FPF/WindowsBase/System.Windows/PropertyMetadata.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/PropertyMetadata.cs
diff --git a/src/FPF/WindowsBase/System.Windows/Rect.cs b/src/Editor/FPF/WindowsBase/System.Windows/Rect.cs
index 6e2e3d9..6e2e3d9 100644
--- a/src/FPF/WindowsBase/System.Windows/Rect.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/Rect.cs
diff --git a/src/FPF/WindowsBase/System.Windows/RectConverter.cs b/src/Editor/FPF/WindowsBase/System.Windows/RectConverter.cs
index 07fe262..07fe262 100644
--- a/src/FPF/WindowsBase/System.Windows/RectConverter.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/RectConverter.cs
diff --git a/src/FPF/WindowsBase/System.Windows/Size.cs b/src/Editor/FPF/WindowsBase/System.Windows/Size.cs
index c1095ab..c1095ab 100644
--- a/src/FPF/WindowsBase/System.Windows/Size.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/Size.cs
diff --git a/src/FPF/WindowsBase/System.Windows/SizeConverter.cs b/src/Editor/FPF/WindowsBase/System.Windows/SizeConverter.cs
index 59a2c0d..59a2c0d 100644
--- a/src/FPF/WindowsBase/System.Windows/SizeConverter.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/SizeConverter.cs
diff --git a/src/FPF/WindowsBase/System.Windows/SplashScreen.cs b/src/Editor/FPF/WindowsBase/System.Windows/SplashScreen.cs
index 16b2ecc..16b2ecc 100644
--- a/src/FPF/WindowsBase/System.Windows/SplashScreen.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/SplashScreen.cs
diff --git a/src/FPF/WindowsBase/System.Windows/ValidateValueCallback.cs b/src/Editor/FPF/WindowsBase/System.Windows/ValidateValueCallback.cs
index 30be3df..30be3df 100644
--- a/src/FPF/WindowsBase/System.Windows/ValidateValueCallback.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/ValidateValueCallback.cs
diff --git a/src/FPF/WindowsBase/System.Windows/Vector.cs b/src/Editor/FPF/WindowsBase/System.Windows/Vector.cs
index 88b2305..88b2305 100644
--- a/src/FPF/WindowsBase/System.Windows/Vector.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/Vector.cs
diff --git a/src/FPF/WindowsBase/System.Windows/VectorConverter.cs b/src/Editor/FPF/WindowsBase/System.Windows/VectorConverter.cs
index 69823c1..69823c1 100644
--- a/src/FPF/WindowsBase/System.Windows/VectorConverter.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/VectorConverter.cs
diff --git a/src/FPF/WindowsBase/System.Windows/WeakEventManager.cs b/src/Editor/FPF/WindowsBase/System.Windows/WeakEventManager.cs
index ff5c29c..ff5c29c 100644
--- a/src/FPF/WindowsBase/System.Windows/WeakEventManager.cs
+++ b/src/Editor/FPF/WindowsBase/System.Windows/WeakEventManager.cs
diff --git a/src/FPF/WindowsBase/WindowsBase.csproj b/src/Editor/FPF/WindowsBase/WindowsBase.csproj
index dcd2c2d..dcd2c2d 100644
--- a/src/FPF/WindowsBase/WindowsBase.csproj
+++ b/src/Editor/FPF/WindowsBase/WindowsBase.csproj
diff --git a/src/FPF/winfx3.pub b/src/Editor/FPF/winfx3.pub
index 695f1b3..695f1b3 100644
--- a/src/FPF/winfx3.pub
+++ b/src/Editor/FPF/winfx3.pub
diff --git a/src/Editor/Imaging/Def/Imaging.csproj b/src/Editor/Imaging/Def/Imaging.csproj
deleted file mode 100644
index 06606e4..0000000
--- a/src/Editor/Imaging/Def/Imaging.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AssemblyName>Microsoft.VisualStudio.Editor.Imaging</AssemblyName>
-    <RootNamespace>Microsoft.VisualStudio.Imaging</RootNamespace>
-    <PushToPublicFeed>true</PushToPublicFeed>
-    <NoWarn>649;436;$(NoWarn)</NoWarn>
-    <AssemblyAttributeClsCompliant>true</AssemblyAttributeClsCompliant>
-    <LocalizationEnabled>false</LocalizationEnabled>
-    <InsertNuget>true</InsertNuget>
-    <IncludeInOptProf>true</IncludeInOptProf>
-    <TargetFramework>$(TargetFramework)</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Core\Def\CoreUtility.csproj" />
-  </ItemGroup>
-</Project>
diff --git a/src/Editor/Text/Def/Extras/Extras.csproj b/src/Editor/Text/Def/Extras/Extras.csproj
deleted file mode 100644
index 01dd776..0000000
--- a/src/Editor/Text/Def/Extras/Extras.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AssemblyName>Microsoft.VisualStudio.Text.Extras</AssemblyName>
-    <RootNamespace>$(AssemblyName)</RootNamespace>
-    <NoWarn>649;436;$(NoWarn)</NoWarn>
-    <AssemblyAttributeClsCompliant>true</AssemblyAttributeClsCompliant>
-    <TargetFramework>$(TargetFramework)</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup Condition="$(UsePlatformEditorBinaries) != 'true'">
-    <ProjectReference Include="..\..\Def\TextUI\TextUI.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="$(UsePlatformEditorBinaries) == 'true'">
-    <PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="$(NuGetVersionVSEditor)" PrivateAssets="all" ExcludeAssets="runtime" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Editor/Text/Def/Extras/PreviewEditorCommandArgs.cs b/src/Editor/Text/Def/Extras/PreviewEditorCommandArgs.cs
deleted file mode 100644
index dcb173d..0000000
--- a/src/Editor/Text/Def/Extras/PreviewEditorCommandArgs.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Microsoft.VisualStudio.Text.Editor.Commanding.Commands
-{
-    public sealed class ProvideEditorFeedbackCommandArgs : EditorCommandArgs
-    {
-        public ProvideEditorFeedbackCommandArgs(ITextView textView, ITextBuffer subjectBuffer) : base(textView, subjectBuffer)
-        {
-        }
-    }
-
-    public sealed class DisableEditorPreviewCommandArgs : EditorCommandArgs
-    {
-        public DisableEditorPreviewCommandArgs(ITextView textView, ITextBuffer subjectBuffer) : base(textView, subjectBuffer)
-        {
-        }
-    }
-
-    public sealed class LearnAboutTheEditorCommandArgs : EditorCommandArgs
-    {
-        public LearnAboutTheEditorCommandArgs(ITextView textView, ITextBuffer subjectBuffer) : base(textView, subjectBuffer)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Editor/Text/Def/Extras/Find/FindCommandArgs.cs b/src/Editor/Text/Def/TextUICocoa/Extras/Find/FindCommandArgs.cs
index e605417..e605417 100644
--- a/src/Editor/Text/Def/Extras/Find/FindCommandArgs.cs
+++ b/src/Editor/Text/Def/TextUICocoa/Extras/Find/FindCommandArgs.cs
diff --git a/src/Editor/Text/Def/Extras/Find/IFindPresenter.cs b/src/Editor/Text/Def/TextUICocoa/Extras/Find/IFindPresenter.cs
index a399c43..a399c43 100644
--- a/src/Editor/Text/Def/Extras/Find/IFindPresenter.cs
+++ b/src/Editor/Text/Def/TextUICocoa/Extras/Find/IFindPresenter.cs
diff --git a/src/Editor/Text/Def/Extras/Find/IFindPresenterFactory.cs b/src/Editor/Text/Def/TextUICocoa/Extras/Find/IFindPresenterFactory.cs
index 2997be2..2997be2 100644
--- a/src/Editor/Text/Def/Extras/Find/IFindPresenterFactory.cs
+++ b/src/Editor/Text/Def/TextUICocoa/Extras/Find/IFindPresenterFactory.cs
diff --git a/src/Editor/Text/Def/Extras/GoToLine/GoToLineCommandArgs.cs b/src/Editor/Text/Def/TextUICocoa/Extras/GoToLine/GoToLineCommandArgs.cs
index e3c0727..e3c0727 100644
--- a/src/Editor/Text/Def/Extras/GoToLine/GoToLineCommandArgs.cs
+++ b/src/Editor/Text/Def/TextUICocoa/Extras/GoToLine/GoToLineCommandArgs.cs
diff --git a/src/Editor/Text/Def/Extras/GoToLine/IGoToLinePresenter.cs b/src/Editor/Text/Def/TextUICocoa/Extras/GoToLine/IGoToLinePresenter.cs
index ccf427e..ccf427e 100644
--- a/src/Editor/Text/Def/Extras/GoToLine/IGoToLinePresenter.cs
+++ b/src/Editor/Text/Def/TextUICocoa/Extras/GoToLine/IGoToLinePresenter.cs
diff --git a/src/Editor/Text/Def/Extras/GoToLine/IGoToLinePresenterFactory.cs b/src/Editor/Text/Def/TextUICocoa/Extras/GoToLine/IGoToLinePresenterFactory.cs
index f64ad6f..f64ad6f 100644
--- a/src/Editor/Text/Def/Extras/GoToLine/IGoToLinePresenterFactory.cs
+++ b/src/Editor/Text/Def/TextUICocoa/Extras/GoToLine/IGoToLinePresenterFactory.cs
diff --git a/src/Editor/Text/Def/Extras/InfoBar/IInfoBarPresenter.cs b/src/Editor/Text/Def/TextUICocoa/Extras/InfoBar/IInfoBarPresenter.cs
index b56232d..b56232d 100644
--- a/src/Editor/Text/Def/Extras/InfoBar/IInfoBarPresenter.cs
+++ b/src/Editor/Text/Def/TextUICocoa/Extras/InfoBar/IInfoBarPresenter.cs
diff --git a/src/Editor/Text/Def/Extras/InfoBar/IInfoBarPresenterFactory.cs b/src/Editor/Text/Def/TextUICocoa/Extras/InfoBar/IInfoBarPresenterFactory.cs
index 12df913..12df913 100644
--- a/src/Editor/Text/Def/Extras/InfoBar/IInfoBarPresenterFactory.cs
+++ b/src/Editor/Text/Def/TextUICocoa/Extras/InfoBar/IInfoBarPresenterFactory.cs
diff --git a/src/Editor/Text/Def/Extras/InfoBar/InfoBarViewModel.cs b/src/Editor/Text/Def/TextUICocoa/Extras/InfoBar/InfoBarViewModel.cs
index 4913e40..4913e40 100644
--- a/src/Editor/Text/Def/Extras/InfoBar/InfoBarViewModel.cs
+++ b/src/Editor/Text/Def/TextUICocoa/Extras/InfoBar/InfoBarViewModel.cs
diff --git a/src/Editor/Imaging/Def/Catalogs/LightBulbImageCatalog.cs b/src/Editor/Text/Def/TextUICocoa/Imaging/Catalogs/LightBulbImageCatalog.cs
index 09b0f47..09b0f47 100644
--- a/src/Editor/Imaging/Def/Catalogs/LightBulbImageCatalog.cs
+++ b/src/Editor/Text/Def/TextUICocoa/Imaging/Catalogs/LightBulbImageCatalog.cs
diff --git a/src/Editor/Imaging/Def/Catalogs/OverviewMarginCatalog.cs b/src/Editor/Text/Def/TextUICocoa/Imaging/Catalogs/OverviewMarginCatalog.cs
index c177e17..c177e17 100644
--- a/src/Editor/Imaging/Def/Catalogs/OverviewMarginCatalog.cs
+++ b/src/Editor/Text/Def/TextUICocoa/Imaging/Catalogs/OverviewMarginCatalog.cs
diff --git a/src/Editor/Imaging/Def/Catalogs/SignatureHelpImageCatalog.cs b/src/Editor/Text/Def/TextUICocoa/Imaging/Catalogs/SignatureHelpImageCatalog.cs
index 857b0fd..857b0fd 100644
--- a/src/Editor/Imaging/Def/Catalogs/SignatureHelpImageCatalog.cs
+++ b/src/Editor/Text/Def/TextUICocoa/Imaging/Catalogs/SignatureHelpImageCatalog.cs
diff --git a/src/Editor/Imaging/Def/IImageService.cs b/src/Editor/Text/Def/TextUICocoa/Imaging/IImageService.cs
index cecb445..cecb445 100644
--- a/src/Editor/Imaging/Def/IImageService.cs
+++ b/src/Editor/Text/Def/TextUICocoa/Imaging/IImageService.cs
diff --git a/src/Editor/Imaging/Def/ImageDescription.cs b/src/Editor/Text/Def/TextUICocoa/Imaging/ImageDescription.cs
index 33f89b3..33f89b3 100644
--- a/src/Editor/Imaging/Def/ImageDescription.cs
+++ b/src/Editor/Text/Def/TextUICocoa/Imaging/ImageDescription.cs
diff --git a/src/Editor/Imaging/Def/ImageTags.cs b/src/Editor/Text/Def/TextUICocoa/Imaging/ImageTags.cs
index 6e2163d..6e2163d 100644
--- a/src/Editor/Imaging/Def/ImageTags.cs
+++ b/src/Editor/Text/Def/TextUICocoa/Imaging/ImageTags.cs
diff --git a/src/OpenSource.Def.projitems b/src/OpenSource.Def.projitems
index 8e38981..f8fee42 100644
--- a/src/OpenSource.Def.projitems
+++ b/src/OpenSource.Def.projitems
@@ -5,9 +5,6 @@
     <ProjectReference Include="$(MSBuildThisFileDirectory)Editor\Core\Def\CoreUtility.csproj">
       <Private>$(ReferencesVSEditorCopyToOutput)</Private>
     </ProjectReference>
-    <ProjectReference Include="$(MSBuildThisFileDirectory)Editor\Imaging\Def\Imaging.csproj">
-      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
-    </ProjectReference>
     <ProjectReference Include="$(MSBuildThisFileDirectory)Editor\Text\Def\TextData\TextData.csproj">
       <Private>$(ReferencesVSEditorCopyToOutput)</Private>
     </ProjectReference>
@@ -29,9 +26,6 @@
     <ProjectReference Include="$(MSBuildThisFileDirectory)Editor\Text\Def\Internal\Internal.csproj">
       <Private>$(ReferencesVSEditorCopyToOutput)</Private>
     </ProjectReference>
-    <ProjectReference Include="$(MSBuildThisFileDirectory)Editor\Text\Def\Extras\Extras.csproj">
-      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
-    </ProjectReference>
     <ProjectReference Include="$(MSBuildThisFileDirectory)Editor\Language\Def\StandardClassification\StandardClassification.csproj">
       <Private>$(ReferencesVSEditorCopyToOutput)</Private>
     </ProjectReference>
diff --git a/src/OpenSource.Impl.projitems b/src/OpenSource.Impl.projitems
index e8a3ffa..edc92a9 100644
--- a/src/OpenSource.Impl.projitems
+++ b/src/OpenSource.Impl.projitems
@@ -2,27 +2,27 @@
 <Project>
   <!-- Fake Presentation Foundation for Cocoa -->
   <ItemGroup Condition="$(HaveXamarinMac)">
-    <ProjectReference Include="$(MSBuildThisFileDirectory)FPF\WindowsBase\WindowsBase.csproj">
+    <ProjectReference Include="$(MSBuildThisFileDirectory)Editor\FPF\WindowsBase\WindowsBase.csproj">
       <SolutionFolder>FPF</SolutionFolder>
       <Private>$(ReferencesVSEditorCopyToOutput)</Private>
     </ProjectReference>
-    <ProjectReference Include="$(MSBuildThisFileDirectory)FPF\PresentationCore\PresentationCore.csproj">
+    <ProjectReference Include="$(MSBuildThisFileDirectory)Editor\FPF\PresentationCore\PresentationCore.csproj">
       <SolutionFolder>FPF</SolutionFolder>
       <Private>$(ReferencesVSEditorCopyToOutput)</Private>
     </ProjectReference>
-    <ProjectReference Include="$(MSBuildThisFileDirectory)FPF\PresentationFramework\PresentationFramework.csproj">
+    <ProjectReference Include="$(MSBuildThisFileDirectory)Editor\FPF\PresentationFramework\PresentationFramework.csproj">
       <SolutionFolder>FPF</SolutionFolder>
       <Private>$(ReferencesVSEditorCopyToOutput)</Private>
     </ProjectReference>
-    <ProjectReference Include="$(MSBuildThisFileDirectory)FPF\UIAutomationTypes\UIAutomationTypes.csproj">
+    <ProjectReference Include="$(MSBuildThisFileDirectory)Editor\FPF\UIAutomationTypes\UIAutomationTypes.csproj">
       <SolutionFolder>FPF</SolutionFolder>
       <Private>$(ReferencesVSEditorCopyToOutput)</Private>
     </ProjectReference>
-    <ProjectReference Include="$(MSBuildThisFileDirectory)FPF\UIAutomationProvider\UIAutomationProvider.csproj">
+    <ProjectReference Include="$(MSBuildThisFileDirectory)Editor\FPF\UIAutomationProvider\UIAutomationProvider.csproj">
       <SolutionFolder>FPF</SolutionFolder>
       <Private>$(ReferencesVSEditorCopyToOutput)</Private>
     </ProjectReference>
-    <ProjectReference Include="$(MSBuildThisFileDirectory)FPF\UIAutomationClient\UIAutomationClient.csproj">
+    <ProjectReference Include="$(MSBuildThisFileDirectory)Editor\FPF\UIAutomationClient\UIAutomationClient.csproj">
       <SolutionFolder>FPF</SolutionFolder>
       <Private>$(ReferencesVSEditorCopyToOutput)</Private>
     </ProjectReference>