Merge pull request #8223 from mono/pr-abock-useful-consolidation

Editor: add new Imaging defs project

4 files changed, 24 insertions, 1 deletions

diff --git a/main/Main.sln b/main/Main.sln
index 1a1647f98d..6a83b28481 100644
--- a/main/Main.sln
+++ b/main/Main.sln
@@ -466,6 +466,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUICocoa", "external\vs-
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.PerfTests", "src\addins\MonoDevelop.Debugger\MonoDevelop.Debugger.PerfTests\MonoDevelop.Debugger.PerfTests.csproj", "{785F775C-9CA0-4411-86E6-B89D89F3E2ED}"

 EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Imaging", "Imaging", "{8E19F797-D714-4C07-903F-97C76E247A03}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Def", "Def", "{F16C4445-2277-4A08-9511-5BE611756CDA}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Imaging", "external\vs-editor-api\src\Editor\Imaging\Def\Imaging.csproj", "{1AE8E07F-E8B7-4179-8055-11D3AE404E01}"

+EndProject

 Global

 	GlobalSection(SharedMSBuildProjectFiles) = preSolution

 		src\core\Mono.TextEditor.Shared\Mono.TextEditor.Shared.projitems*{f8f92aa4-a376-4679-a9d4-60e7b7fbf477}*SharedItemsImports = 4

@@ -2703,6 +2709,16 @@ Global
 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{1AE8E07F-E8B7-4179-8055-11D3AE404E01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{1AE8E07F-E8B7-4179-8055-11D3AE404E01}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

+		{1AE8E07F-E8B7-4179-8055-11D3AE404E01}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{1AE8E07F-E8B7-4179-8055-11D3AE404E01}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{1AE8E07F-E8B7-4179-8055-11D3AE404E01}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{1AE8E07F-E8B7-4179-8055-11D3AE404E01}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{1AE8E07F-E8B7-4179-8055-11D3AE404E01}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

+		{1AE8E07F-E8B7-4179-8055-11D3AE404E01}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

+		{1AE8E07F-E8B7-4179-8055-11D3AE404E01}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{1AE8E07F-E8B7-4179-8055-11D3AE404E01}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

@@ -2916,6 +2932,9 @@ Global
 		{FC412405-B907-473F-864A-657D8E98BB53} = {AA56E3AE-8E61-4101-B01A-2646DC1B0D7B}

 		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D} = {0E8F5B35-CB3C-4B83-B09C-0D5A66B38A6B}

 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED} = {776872D9-76FA-407B-BA69-08E25A24E5CE}

+		{8E19F797-D714-4C07-903F-97C76E247A03} = {5A92B792-BF17-4748-B29E-34C99B2E8722}

+		{F16C4445-2277-4A08-9511-5BE611756CDA} = {8E19F797-D714-4C07-903F-97C76E247A03}

+		{1AE8E07F-E8B7-4179-8055-11D3AE404E01} = {F16C4445-2277-4A08-9511-5BE611756CDA}

 	EndGlobalSection

 	GlobalSection(ExtensibilityGlobals) = postSolution

 		SolutionGuid = {856CF524-E2A7-4DB0-B80F-8F1B080A2E25}

diff --git a/main/msbuild/ReferencesVSEditor.Mac.props b/main/msbuild/ReferencesVSEditor.Mac.props
index 441d50ac8e..67ff2d19fa 100644
--- a/main/msbuild/ReferencesVSEditor.Mac.props
+++ b/main/msbuild/ReferencesVSEditor.Mac.props
@@ -10,6 +10,7 @@
 

   <ItemGroup Condition=" '$(ReferencesVSEditorCopyToOutput)' == 'true' ">

     <IncludeCopyLocal Include="Microsoft.VisualStudio.CoreUtilityImplementation.dll" />

+    <IncludeCopyLocal Include="Microsoft.VisualStudio.Editor.Imaging.dll" />

     <IncludeCopyLocal Include="Microsoft.VisualStudio.Language.Implementation.dll" />

     <IncludeCopyLocal Include="Microsoft.VisualStudio.Language.Utilities.dll" />

     <IncludeCopyLocal Include="Microsoft.VisualStudio.Language.StandardClassification.dll" />

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 4afbc5b846..49668b7ccb 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,6 +1,7 @@
 <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" />
@@ -51,6 +52,7 @@
 		<Assembly file="MonoDevelop.TextEditor.Cocoa.dll" />
 		<!-- these are coming from vs-editor-core (Cocoa implementations) -->
 		<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" />
@@ -89,7 +91,7 @@
 	</Extension>
 	<Extension path = "/MonoDevelop/TextEditor/CommandMapping">
 	<!--
-		Don't re-add this! See bug 937834 for more details. Basically let native editor handle this. 
+		Don't re-add this! See bug 937834 for more details. Basically let native editor handle this.
 		<Map id="MonoDevelop.Ide.Commands.EditCommands.DeleteKey" argsType="Microsoft.VisualStudio.Text.Editor.Commanding.Commands.BackspaceKeyCommandArgs" />
 	-->
 		<Map id="MonoDevelop.Ide.Commands.SearchCommands.Find" argsType="Microsoft.VisualStudio.Text.Editor.Commanding.Commands.FindCommandArgs" />
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 b170f100d4..33d8819118 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,6 +19,7 @@
     <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="..\..\..\..\external\vs-editor-api\src\Editor\Imaging\Def\Imaging.csproj" />
     <ProjectReference Include="..\..\..\..\external\vs-editor-api\src\Editor\Text\Def\Extras\Extras.csproj" />
     <ProjectReference Include="..\..\..\..\external\xwt\Xwt\Xwt.csproj" Private="False" />
     <Reference Include="PresentationCore" />