Merge pull request #9438 from mono/moveThingsAround

Sync with vs-editor-core changes

5 files changed, 6 insertions, 19 deletions

diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj
index bc20959aa8..43dfde632b 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj
@@ -49,8 +49,7 @@
       <Name>Xwt</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="$(VSEditorCoreDirectory)src\Roslyn\EditorFeatures\Cocoa\Microsoft.CodeAnalysis.EditorFeatures.Cocoa.csproj" Private="True" />
-    <ProjectReference Include="$(VSEditorCoreDirectory)src\CocoaControls\CocoaControls.csproj" Private="True" />
+    <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Roslyn\EditorFeatures\Cocoa\Microsoft.CodeAnalysis.EditorFeatures.Cocoa.csproj" Private="True" />
     <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Text\Impl\CocoaView\CocoaViewImpl.csproj" Private="True" />
     <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Text\Impl\Find\Find.csproj" Private="True" />
     <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Language\Impl\StandardClassification\StandardClassificationImpl.csproj" Private="True" />
@@ -67,7 +66,7 @@
     <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Text\Impl\UrlTagger\UrlTagger.csproj" Private="true" />
     <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Text\Impl\DragDrop\DragDropImpl.csproj" Private="True" />
     <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Text\Impl\ChangeTagger\ChangeTagger.csproj" Private="True" />
-    <ProjectReference Include="$(VSEditorCoreDirectory)src\TextMate\Core\Core.csproj" Private="True" />
+    <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\TextMate\Core\Core.csproj" Private="True" />
     <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Text\Impl\DifferenceViewer\DifferenceViewerImpl.csproj" Private="True" />
     <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Text\Impl\DifferenceBuffer\DifferenceBufferImpl.csproj" Private="True" />
     <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Text\Impl\XPlat\IndentationManagerImpl\IndentationManagerImpl.csproj" Private="True" />
@@ -80,7 +79,7 @@
     <None Include="$(VSEditorCoreDirectory)bin\TextMate\Onig\libonig.dylib">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="$(VSEditorCoreDirectory)src\TextMate\VSWindows\Setup\**\*">
+    <None Include="$(VSEditorCoreDirectory)src\Editor\TextMate\VSWindows\Setup\**\*">
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -89,7 +88,6 @@
     <IncludeCopyLocal Include="Microsoft.CodeAnalysis.EditorFeatures.Cocoa.dll" />
     <IncludeCopyLocal Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces.dll" />
     <IncludeCopyLocal Include="Microsoft.VisualStudio.Logic.Text.Navigation.NavigationProviders.dll" />
-    <IncludeCopyLocal Include="Microsoft.VisualStudio.UI.Controls.macOS.dll" />
     <IncludeCopyLocal Include="Microsoft.VisualStudio.Text.Find.Implementation.dll" />
     <IncludeCopyLocal Include="Microsoft.VisualStudio.Text.IndentationManager.Implementation.dll" />
     <IncludeCopyLocal Include="Microsoft.VisualStudio.Language.StandardClassification.Implementation.dll" />
@@ -163,9 +161,9 @@
     <EmbeddedResource Include="icons\go-down-16~contrast%402x.png" />
   </ItemGroup>
   <Target Name="BuildTextMate" BeforeTargets="Compile">
-    <MSBuild Projects="$(VSEditorCoreDirectory)src\TextMate\TMRegEx\TMRegEx.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
+    <MSBuild Projects="$(VSEditorCoreDirectory)src\Editor\TextMate\TMRegEx\TMRegEx.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
   <Target Name="CleanTextMate" BeforeTargets="Clean">
-    <MSBuild Projects="$(VSEditorCoreDirectory)src\TextMate\TMRegEx\TMRegEx.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
+    <MSBuild Projects="$(VSEditorCoreDirectory)src\Editor\TextMate\TMRegEx\TMRegEx.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
   </Target>
 </Project>
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/Properties/MonoDevelop.TextEditor.Cocoa.addin.xml b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/Properties/MonoDevelop.TextEditor.Cocoa.addin.xml
index 1a10d85df5..35bf47e860 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/Properties/MonoDevelop.TextEditor.Cocoa.addin.xml
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/Properties/MonoDevelop.TextEditor.Cocoa.addin.xml
@@ -1,7 +1,6 @@
 <ExtensionModel>
 	<Runtime>
 		<Import assembly="../../../bin/Microsoft.VisualStudio.CoreUtilityImplementation.dll" />
-		<Import assembly="../../../bin/Microsoft.VisualStudio.Editor.Imaging.dll" />
 		<Import assembly="../../../bin/Microsoft.VisualStudio.Language.Implementation.dll" />
 		<Import assembly="../../../bin/Microsoft.VisualStudio.Language.Utilities.dll" />
 		<Import assembly="../../../bin/Microsoft.VisualStudio.Logic.Text.BufferUndoManager.Implementation.dll" />
@@ -14,7 +13,6 @@
 		<Import assembly="../../../bin/Microsoft.VisualStudio.Text.Data.Utilities.dll" />
 		<Import assembly="../../../bin/Microsoft.VisualStudio.Text.Differencing.Implementation.dll" />
 		<Import assembly="../../../bin/Microsoft.VisualStudio.Text.EditorOptions.Implementation.dll" />
-		<Import assembly="../../../bin/Microsoft.VisualStudio.Text.Extras.dll" />
 		<Import assembly="../../../bin/Microsoft.VisualStudio.Text.Implementation.StandaloneUndo.dll" />
 		<Import assembly="../../../bin/Microsoft.VisualStudio.Text.Internal.dll" />
 		<Import assembly="../../../bin/Microsoft.VisualStudio.Text.Logic.Utilities.dll" />
@@ -30,7 +28,6 @@
 		<Import assembly="../../../bin/Microsoft.VisualStudio.UI.Text.EditorPrimitives.Implementation.dll" />
 		<Import assembly="Microsoft.VisualStudio.Text.IndentationManager.Implementation.dll" />
 		<Import assembly="Microsoft.VisualStudio.Text.Find.Implementation.dll" />
-		<Import assembly="Microsoft.VisualStudio.UI.Controls.macOS.dll" />
 	</Runtime>
 	<Extension path="/MonoDevelop/Ide/Composition">
 		<!-- these are coming from vs-editor-core (Cocoa implementations) -->
@@ -57,7 +54,6 @@
 		<Assembly file="MonoDevelop.TextEditor.Cocoa.dll" />
 		<!-- These are coming from vs-editor-api (no Cocoa dependency) -->
 		<Assembly file="../../../bin/Microsoft.VisualStudio.CoreUtilityImplementation.dll" />
-		<Assembly file="../../../bin/Microsoft.VisualStudio.Editor.Imaging.dll" />
 		<Assembly file="../../../bin/Microsoft.VisualStudio.Language.Implementation.dll" />
 		<Assembly file="../../../bin/Microsoft.VisualStudio.Language.Utilities.dll" />
 		<Assembly file="../../../bin/Microsoft.VisualStudio.Logic.Text.BufferUndoManager.Implementation.dll" />
@@ -70,7 +66,6 @@
 		<Assembly file="../../../bin/Microsoft.VisualStudio.Text.Data.Utilities.dll" />
 		<Assembly file="../../../bin/Microsoft.VisualStudio.Text.Differencing.Implementation.dll" />
 		<Assembly file="../../../bin/Microsoft.VisualStudio.Text.EditorOptions.Implementation.dll" />
-		<Assembly file="../../../bin/Microsoft.VisualStudio.Text.Extras.dll" />
 		<Assembly file="../../../bin/Microsoft.VisualStudio.Text.Implementation.StandaloneUndo.dll" />
 		<Assembly file="../../../bin/Microsoft.VisualStudio.Text.Internal.dll" />
 		<Assembly file="../../../bin/Microsoft.VisualStudio.Text.Logic.Utilities.dll" />
@@ -80,6 +75,7 @@
 		<Assembly file="../../../bin/Microsoft.VisualStudio.Text.PatternMatching.Implementation.dll" />
 		<Assembly file="../../../bin/Microsoft.VisualStudio.Text.UI.Utilities.dll" />
 		<Assembly file="../../../bin/Microsoft.VisualStudio.Text.UI.Wpf.dll" />
+		<Assembly file="../../../bin/Microsoft.VisualStudio.Text.UI.Cocoa.dll" />
 		<Assembly file="../../../bin/Microsoft.VisualStudio.UI.Text.Commanding.Implementation.dll" />
 		<Assembly file="../../../bin/Microsoft.VisualStudio.UI.Text.EditorOperations.Implementation.dll" />
 		<Assembly file="../../../bin/Microsoft.VisualStudio.UI.Text.EditorPrimitives.Implementation.dll" />
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/MonoDevelop.TextEditor.Wpf.csproj b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/MonoDevelop.TextEditor.Wpf.csproj
index 30a7e8f7df..74173a6644 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/MonoDevelop.TextEditor.Wpf.csproj
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/MonoDevelop.TextEditor.Wpf.csproj
@@ -19,8 +19,6 @@
     <PackageReference Include="Microsoft.VisualStudio.Language" Version="$(NuGetVersionVSEditor)" PrivateAssets="all" ExcludeAssets="runtime" />
     <PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="$(NuGetVersionVSEditor)" PrivateAssets="all" ExcludeAssets="runtime" />
     <ProjectReference Include="..\MonoDevelop.TextEditor\MonoDevelop.TextEditor.csproj" Private="False" />
-    <ProjectReference Include="$(VSEditorApiDirectory)src\Editor\Imaging\Def\Imaging.csproj" />
-    <ProjectReference Include="$(VSEditorApiDirectory)src\Editor\Text\Def\Extras\Extras.csproj" />
     <ProjectReference Include="..\..\..\..\external\xwt\Xwt\Xwt.csproj" Private="False" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -30,7 +28,6 @@
   </ItemGroup>
   <ItemGroup>
     <IncludeCopyLocal Include="DiagnosticMargin.dll" />
-    <IncludeCopyLocal Include="Microsoft.VisualStudio.Text.Extras.dll" />
     <IncludeCopyLocal Include="Microsoft.VisualStudio.InteractiveWindow.dll" />
   </ItemGroup>
   <ItemGroup>
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Properties/MonoDevelop.TextEditor.Wpf.addin.xml b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Properties/MonoDevelop.TextEditor.Wpf.addin.xml
index 0d5f5e5df1..1c3c298df3 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Properties/MonoDevelop.TextEditor.Wpf.addin.xml
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Properties/MonoDevelop.TextEditor.Wpf.addin.xml
@@ -4,7 +4,6 @@
 		<Import assembly="../../../bin/Microsoft.VisualStudio.InteractiveWindow.dll" />
 		<Import assembly="../../../bin/Microsoft.VisualStudio.Language.NavigateTo.Interfaces.dll" />
 		<Import assembly="../../../bin/Microsoft.VisualStudio.Text.Internal.dll" />
-		<Import assembly="Microsoft.VisualStudio.Text.Extras.dll" />
 	</Runtime>
 	<Extension path="/MonoDevelop/Ide/Composition">
 		<Assembly file="../../../bin/Microsoft.CodeAnalysis.EditorFeatures.Wpf.dll"/>
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/MonoDevelop.TextEditor.csproj b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/MonoDevelop.TextEditor.csproj
index 3edbd5e600..75dbc230fd 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/MonoDevelop.TextEditor.csproj
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/MonoDevelop.TextEditor.csproj
@@ -10,9 +10,6 @@
     <DefineConstants Condition="$(OS) == 'Windows_NT'">$(DefineConstants);WINDOWS;WIN32</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="$(VSEditorApiDirectory)src\Editor\Text\Def\Extras\Extras.csproj" />
-  </ItemGroup>
-  <ItemGroup>
     <InternalsVisibleTo Include="MonoDevelop.TextEditor.Cocoa" />
     <InternalsVisibleTo Include="MonoDevelop.TextEditor.Wpf" />
     <Reference Include="PresentationFramework" />