From 5ce8bdd9837ded45ed9f42d060bc44a9c575bfdc Mon Sep 17 00:00:00 2001
From: Aaron Bockover <abock@microsoft.com>
Date: Thu, 5 Sep 2019 15:15:26 -0400
Subject: Sync with vs-editor-core@1975f9d9

---
 Directory.Build.props         |   1 +
 VSEditorCore.proj             |   3 +-
 VSEditorCore.sln              | 126 ++++++++++++++++--------------------------
 build/Environment.props       |   8 ++-
 global.json                   |   4 +-
 src/OpenSource.Def.projitems  |  46 +++++++++++++++
 src/OpenSource.Impl.projitems | 125 +++++++++++++++++++++++++++++++++++++++++
 7 files changed, 230 insertions(+), 83 deletions(-)
 create mode 100644 src/OpenSource.Def.projitems
 create mode 100644 src/OpenSource.Impl.projitems

diff --git a/Directory.Build.props b/Directory.Build.props
index b5800bd..79c5052 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -13,6 +13,7 @@
     <RepoBinPath>$(RepoRootPath)bin\</RepoBinPath>
     <RepoObjPath>$(RepoRootPath)obj\</RepoObjPath>
     <RepoSrcPath>$(RepoRootPath)src\</RepoSrcPath>
+    <RepoSrcEditorPath>$(RepoSrcPath)Editor\</RepoSrcEditorPath>
     <RepoLocalNuGetFeedPath>$(RepoRootPath)build\nuget-feed\</RepoLocalNuGetFeedPath>
 
     <RepoSrcRelativeProjectDirectory Condition="$(MSBuildProjectDirectory.Length) >= $(RepoSrcPath.Length)">$(MSBuildProjectDirectory.Substring($(RepoSrcPath.Length)))\</RepoSrcRelativeProjectDirectory>
diff --git a/VSEditorCore.proj b/VSEditorCore.proj
index 5d5208c..9afa8cb 100644
--- a/VSEditorCore.proj
+++ b/VSEditorCore.proj
@@ -20,7 +20,8 @@
     <GenerateSolutionAfterBuild>true</GenerateSolutionAfterBuild>
   </PropertyGroup>
 
-  <Import Project="ProjectReferences.projitems"/>
+  <Import Project="src/OpenSource.Def.projitems"/>
+  <Import Project="src/OpenSource.Impl.projitems"/>
 
   <Target
     Name="DeepClean"
diff --git a/VSEditorCore.sln b/VSEditorCore.sln
index 3dffdb1..c22021b 100644
--- a/VSEditorCore.sln
+++ b/VSEditorCore.sln
@@ -3,24 +3,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FPF", "FPF", "{01986EB1-3128-5838-B09A-7754A44C22CE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsBase", "src\FPF\WindowsBase\WindowsBase.csproj", "{522016EE-7098-5C37-844E-297AEDDEE1B4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIAutomationProvider", "src\FPF\UIAutomationProvider\UIAutomationProvider.csproj", "{A1D6A6EC-B9A2-518C-8358-298CD775D2B5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIAutomationTypes", "src\FPF\UIAutomationTypes\UIAutomationTypes.csproj", "{AE3666FC-31FA-5EBF-8ED5-0CEF50186B67}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PresentationCore", "src\FPF\PresentationCore\PresentationCore.csproj", "{0E73055E-9DCB-554A-935B-60C223D82B83}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PresentationFramework", "src\FPF\PresentationFramework\PresentationFramework.csproj", "{1C53C421-EAB4-5104-BEA1-164D09E40C54}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIAutomationClient", "src\FPF\UIAutomationClient\UIAutomationClient.csproj", "{F26AC124-3EB5-5DA2-AE13-51904AFBFB70}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{B525706C-3E93-5FB8-A585-26B448C5AAFE}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreUtility", "src\Editor\Core\Def\CoreUtility.csproj", "{079AB40D-EBFB-556E-AC42-1FE65D0E0327}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Imaging", "src\Editor\Imaging\Def\Imaging.csproj", "{71237F94-BC7F-5AA3-A3B5-3EBB84721CE8}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextData", "src\Editor\Text\Def\TextData\TextData.csproj", "{58999311-75E2-5099-856C-CAEE5CD13240}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextLogic", "src\Editor\Text\Def\TextLogic\TextLogic.csproj", "{43DA95BB-5CAE-5E28-8DE1-64CB45E4396C}"
@@ -33,9 +19,27 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageDef", "src\Editor\L
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntellisenseDef", "src\Editor\Language\Def\Intellisense\IntellisenseDef.csproj", "{6308AAB7-9DF7-5C7B-8FF5-AA25FDFA642C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Internal", "src\Editor\Text\Def\Internal\Internal.csproj", "{B5F433E1-F4DB-5EBC-8CB7-E3F39E6628C4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Extras", "src\Editor\Text\Def\Extras\Extras.csproj", "{D7E391EB-6FB6-50EA-AE0F-B5BF16DDA6BE}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandardClassification", "src\Editor\Language\Def\StandardClassification\StandardClassification.csproj", "{9A603430-A2C1-5599-AECB-1E1A5C229DFE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Internal", "src\Editor\Text\Def\Internal\Internal.csproj", "{B5F433E1-F4DB-5EBC-8CB7-E3F39E6628C4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUICocoa", "src\Editor\Text\Def\TextUICocoa\TextUICocoa.csproj", "{E75466D3-CC61-5625-99AC-278C0049BFFD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FPF", "FPF", "{01986EB1-3128-5838-B09A-7754A44C22CE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsBase", "src\FPF\WindowsBase\WindowsBase.csproj", "{522016EE-7098-5C37-844E-297AEDDEE1B4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIAutomationProvider", "src\FPF\UIAutomationProvider\UIAutomationProvider.csproj", "{A1D6A6EC-B9A2-518C-8358-298CD775D2B5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIAutomationTypes", "src\FPF\UIAutomationTypes\UIAutomationTypes.csproj", "{AE3666FC-31FA-5EBF-8ED5-0CEF50186B67}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PresentationCore", "src\FPF\PresentationCore\PresentationCore.csproj", "{0E73055E-9DCB-554A-935B-60C223D82B83}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PresentationFramework", "src\FPF\PresentationFramework\PresentationFramework.csproj", "{1C53C421-EAB4-5104-BEA1-164D09E40C54}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIAutomationClient", "src\FPF\UIAutomationClient\UIAutomationClient.csproj", "{F26AC124-3EB5-5DA2-AE13-51904AFBFB70}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextDataUtil", "src\Editor\Text\Util\TextDataUtil\TextDataUtil.csproj", "{2A67004F-832D-5D47-AA7D-26D1548EBB88}"
 EndProject
@@ -83,12 +87,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Outlining", "src\Editor\Tex
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PatternMatchingImpl", "src\Editor\Text\Impl\PatternMatching\PatternMatchingImpl.csproj", "{E3E20ABF-9920-59BD-AA5B-96DC69D5382F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Extras", "src\Editor\Text\Def\Extras\Extras.csproj", "{D7E391EB-6FB6-50EA-AE0F-B5BF16DDA6BE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cocoa", "Cocoa", "{241B6E05-F129-5ACA-8594-3EB04CFACE1C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUICocoa", "src\Editor\Text\Def\TextUICocoa\TextUICocoa.csproj", "{E75466D3-CC61-5625-99AC-278C0049BFFD}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		macOS|Any CPU = macOS|Any CPU
@@ -98,22 +96,14 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{522016EE-7098-5C37-844E-297AEDDEE1B4}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
-		{522016EE-7098-5C37-844E-297AEDDEE1B4}.macOS|Any CPU.Build.0 = Debug|Any CPU
-		{A1D6A6EC-B9A2-518C-8358-298CD775D2B5}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1D6A6EC-B9A2-518C-8358-298CD775D2B5}.macOS|Any CPU.Build.0 = Debug|Any CPU
-		{AE3666FC-31FA-5EBF-8ED5-0CEF50186B67}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE3666FC-31FA-5EBF-8ED5-0CEF50186B67}.macOS|Any CPU.Build.0 = Debug|Any CPU
-		{0E73055E-9DCB-554A-935B-60C223D82B83}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
-		{0E73055E-9DCB-554A-935B-60C223D82B83}.macOS|Any CPU.Build.0 = Debug|Any CPU
-		{1C53C421-EAB4-5104-BEA1-164D09E40C54}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C53C421-EAB4-5104-BEA1-164D09E40C54}.macOS|Any CPU.Build.0 = Debug|Any CPU
-		{F26AC124-3EB5-5DA2-AE13-51904AFBFB70}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
-		{F26AC124-3EB5-5DA2-AE13-51904AFBFB70}.macOS|Any CPU.Build.0 = Debug|Any CPU
 		{079AB40D-EBFB-556E-AC42-1FE65D0E0327}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
 		{079AB40D-EBFB-556E-AC42-1FE65D0E0327}.macOS|Any CPU.Build.0 = Debug|Any CPU
 		{079AB40D-EBFB-556E-AC42-1FE65D0E0327}.Windows|Any CPU.ActiveCfg = Debug|Any CPU
 		{079AB40D-EBFB-556E-AC42-1FE65D0E0327}.Windows|Any CPU.Build.0 = Debug|Any CPU
+		{71237F94-BC7F-5AA3-A3B5-3EBB84721CE8}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
+		{71237F94-BC7F-5AA3-A3B5-3EBB84721CE8}.macOS|Any CPU.Build.0 = Debug|Any CPU
+		{71237F94-BC7F-5AA3-A3B5-3EBB84721CE8}.Windows|Any CPU.ActiveCfg = Debug|Any CPU
+		{71237F94-BC7F-5AA3-A3B5-3EBB84721CE8}.Windows|Any CPU.Build.0 = Debug|Any CPU
 		{58999311-75E2-5099-856C-CAEE5CD13240}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
 		{58999311-75E2-5099-856C-CAEE5CD13240}.macOS|Any CPU.Build.0 = Debug|Any CPU
 		{58999311-75E2-5099-856C-CAEE5CD13240}.Windows|Any CPU.ActiveCfg = Debug|Any CPU
@@ -138,14 +128,32 @@ Global
 		{6308AAB7-9DF7-5C7B-8FF5-AA25FDFA642C}.macOS|Any CPU.Build.0 = Debug|Any CPU
 		{6308AAB7-9DF7-5C7B-8FF5-AA25FDFA642C}.Windows|Any CPU.ActiveCfg = Debug|Any CPU
 		{6308AAB7-9DF7-5C7B-8FF5-AA25FDFA642C}.Windows|Any CPU.Build.0 = Debug|Any CPU
-		{9A603430-A2C1-5599-AECB-1E1A5C229DFE}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A603430-A2C1-5599-AECB-1E1A5C229DFE}.macOS|Any CPU.Build.0 = Debug|Any CPU
-		{9A603430-A2C1-5599-AECB-1E1A5C229DFE}.Windows|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A603430-A2C1-5599-AECB-1E1A5C229DFE}.Windows|Any CPU.Build.0 = Debug|Any CPU
 		{B5F433E1-F4DB-5EBC-8CB7-E3F39E6628C4}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
 		{B5F433E1-F4DB-5EBC-8CB7-E3F39E6628C4}.macOS|Any CPU.Build.0 = Debug|Any CPU
 		{B5F433E1-F4DB-5EBC-8CB7-E3F39E6628C4}.Windows|Any CPU.ActiveCfg = Debug|Any CPU
 		{B5F433E1-F4DB-5EBC-8CB7-E3F39E6628C4}.Windows|Any CPU.Build.0 = Debug|Any CPU
+		{D7E391EB-6FB6-50EA-AE0F-B5BF16DDA6BE}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7E391EB-6FB6-50EA-AE0F-B5BF16DDA6BE}.macOS|Any CPU.Build.0 = Debug|Any CPU
+		{D7E391EB-6FB6-50EA-AE0F-B5BF16DDA6BE}.Windows|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7E391EB-6FB6-50EA-AE0F-B5BF16DDA6BE}.Windows|Any CPU.Build.0 = Debug|Any CPU
+		{9A603430-A2C1-5599-AECB-1E1A5C229DFE}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A603430-A2C1-5599-AECB-1E1A5C229DFE}.macOS|Any CPU.Build.0 = Debug|Any CPU
+		{9A603430-A2C1-5599-AECB-1E1A5C229DFE}.Windows|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A603430-A2C1-5599-AECB-1E1A5C229DFE}.Windows|Any CPU.Build.0 = Debug|Any CPU
+		{E75466D3-CC61-5625-99AC-278C0049BFFD}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
+		{E75466D3-CC61-5625-99AC-278C0049BFFD}.macOS|Any CPU.Build.0 = Debug|Any CPU
+		{522016EE-7098-5C37-844E-297AEDDEE1B4}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
+		{522016EE-7098-5C37-844E-297AEDDEE1B4}.macOS|Any CPU.Build.0 = Debug|Any CPU
+		{A1D6A6EC-B9A2-518C-8358-298CD775D2B5}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1D6A6EC-B9A2-518C-8358-298CD775D2B5}.macOS|Any CPU.Build.0 = Debug|Any CPU
+		{AE3666FC-31FA-5EBF-8ED5-0CEF50186B67}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE3666FC-31FA-5EBF-8ED5-0CEF50186B67}.macOS|Any CPU.Build.0 = Debug|Any CPU
+		{0E73055E-9DCB-554A-935B-60C223D82B83}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E73055E-9DCB-554A-935B-60C223D82B83}.macOS|Any CPU.Build.0 = Debug|Any CPU
+		{1C53C421-EAB4-5104-BEA1-164D09E40C54}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C53C421-EAB4-5104-BEA1-164D09E40C54}.macOS|Any CPU.Build.0 = Debug|Any CPU
+		{F26AC124-3EB5-5DA2-AE13-51904AFBFB70}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
+		{F26AC124-3EB5-5DA2-AE13-51904AFBFB70}.macOS|Any CPU.Build.0 = Debug|Any CPU
 		{2A67004F-832D-5D47-AA7D-26D1548EBB88}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
 		{2A67004F-832D-5D47-AA7D-26D1548EBB88}.macOS|Any CPU.Build.0 = Debug|Any CPU
 		{2A67004F-832D-5D47-AA7D-26D1548EBB88}.Windows|Any CPU.ActiveCfg = Debug|Any CPU
@@ -238,12 +246,6 @@ Global
 		{E3E20ABF-9920-59BD-AA5B-96DC69D5382F}.macOS|Any CPU.Build.0 = Debug|Any CPU
 		{E3E20ABF-9920-59BD-AA5B-96DC69D5382F}.Windows|Any CPU.ActiveCfg = Debug|Any CPU
 		{E3E20ABF-9920-59BD-AA5B-96DC69D5382F}.Windows|Any CPU.Build.0 = Debug|Any CPU
-		{D7E391EB-6FB6-50EA-AE0F-B5BF16DDA6BE}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7E391EB-6FB6-50EA-AE0F-B5BF16DDA6BE}.macOS|Any CPU.Build.0 = Debug|Any CPU
-		{D7E391EB-6FB6-50EA-AE0F-B5BF16DDA6BE}.Windows|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7E391EB-6FB6-50EA-AE0F-B5BF16DDA6BE}.Windows|Any CPU.Build.0 = Debug|Any CPU
-		{E75466D3-CC61-5625-99AC-278C0049BFFD}.macOS|Any CPU.ActiveCfg = Debug|Any CPU
-		{E75466D3-CC61-5625-99AC-278C0049BFFD}.macOS|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{522016EE-7098-5C37-844E-297AEDDEE1B4} = {01986EB1-3128-5838-B09A-7754A44C22CE}
@@ -252,39 +254,5 @@ Global
 		{0E73055E-9DCB-554A-935B-60C223D82B83} = {01986EB1-3128-5838-B09A-7754A44C22CE}
 		{1C53C421-EAB4-5104-BEA1-164D09E40C54} = {01986EB1-3128-5838-B09A-7754A44C22CE}
 		{F26AC124-3EB5-5DA2-AE13-51904AFBFB70} = {01986EB1-3128-5838-B09A-7754A44C22CE}
-		{079AB40D-EBFB-556E-AC42-1FE65D0E0327} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{58999311-75E2-5099-856C-CAEE5CD13240} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{43DA95BB-5CAE-5E28-8DE1-64CB45E4396C} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{4A320450-5D4A-552B-9D33-4BB1FF841D95} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{930FF802-57C2-519E-B2B3-C68CF7B8672E} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{F837FA63-028D-5780-8459-B9B92894B9EA} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{6308AAB7-9DF7-5C7B-8FF5-AA25FDFA642C} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{9A603430-A2C1-5599-AECB-1E1A5C229DFE} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{B5F433E1-F4DB-5EBC-8CB7-E3F39E6628C4} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{2A67004F-832D-5D47-AA7D-26D1548EBB88} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{B2040CA1-C6E3-5D44-89A2-6C1BE936184D} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{34D4D478-647E-509E-9B2F-7E11FAE15C73} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{4F556838-7D8A-542A-A886-3AF972665C3A} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{E6518A68-6309-5458-8E15-B65A391CE8A8} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{D559AC50-50B5-5C97-8F18-CA5581B16266} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{B1374407-B888-5E5C-8413-79E4F3440D61} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{9BF90695-9B58-5D2F-96DD-57B0C43B2D5D} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{47D4821C-121E-5886-8127-A13580FE508C} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{F36E2228-0ABB-5D93-919B-F9B0A71AC186} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{FFF452E1-C88A-5481-BB60-5F2D81EA8CD0} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{A8740D4A-6C05-548D-88D9-CAD8E756B20E} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{3130DB38-F8AA-5ABD-8237-66988CA4B66B} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{1E6EA3BC-75F1-5708-97EC-7FFA1E61941E} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{8C34FEFB-06D8-5559-BFA3-514171281325} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{C9A833EC-107D-5F96-906A-DEE43518FB18} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{1E9081AB-DA57-5A98-82C6-7704040940AF} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{FA1C9CCF-BE1F-5554-AC36-E55297A07775} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{E56636D5-1E6E-52B3-BEB5-11207293AE22} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{6C8F77ED-8258-501A-B5D4-4E8F5ED378C4} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{ED3EA28C-3C37-5233-A975-721A152A109D} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{AA6E4924-8965-5007-AA82-54B1CE2B18AC} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{E3E20ABF-9920-59BD-AA5B-96DC69D5382F} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{D7E391EB-6FB6-50EA-AE0F-B5BF16DDA6BE} = {B525706C-3E93-5FB8-A585-26B448C5AAFE}
-		{E75466D3-CC61-5625-99AC-278C0049BFFD} = {241B6E05-F129-5ACA-8594-3EB04CFACE1C}
 	EndGlobalSection
 EndGlobal
diff --git a/build/Environment.props b/build/Environment.props
index 8775bbc..660e624 100644
--- a/build/Environment.props
+++ b/build/Environment.props
@@ -10,7 +10,13 @@
     <HaveMono Condition="'$(HaveMono)' == '' And '$(MonoInstallRootDirectory)' != '' And Exists('$(MonoInstallRootDirectory)VERSION')">true</HaveMono>
     <HaveMono Condition="'$(HaveMono)' == ''">false</HaveMono>
 
-    <HaveXamarinMac Condition="'$(HaveXamarinMac)' == '' And $(IsMac) And Exists('/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/Version')">true</HaveXamarinMac>
+    <!-- Mono msbuild workaround: MSBuildExtensionsPath seems to be '$(MonoInstallRootDirectory)lib/mono/xbuild' by default, which is incorrect... -->
+    <XamarinMacMSBuildExtensionsPath Condition="$(HaveMono)">$([MSBuild]::NormalizeDirectory('$(MonoInstallRootDirectory)..\..\External\xbuild'))</XamarinMacMSBuildExtensionsPath>
+
+    <XamarinMacCommonProps>$(XamarinMacMSBuildExtensionsPath)Xamarin\Mac\Xamarin.Mac.Common.props</XamarinMacCommonProps>
+    <XamarinMacCommonTargets>$(XamarinMacMSBuildExtensionsPath)Xamarin\Mac\Xamarin.Mac.Common.targets</XamarinMacCommonTargets>
+
+    <HaveXamarinMac Condition="'$(HaveXamarinMac)' == '' And $(IsMac) And Exists('$(XamarinMacCommonProps)') And Exists('$(XamarinMacCommonTargets)')">true</HaveXamarinMac>
     <HaveXamarinMac Condition="'$(HaveXamarinMac)' == ''">false</HaveXamarinMac>
   </PropertyGroup>
 
diff --git a/global.json b/global.json
index 9d9b739..7c894d9 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
 {
   "msbuild-sdks": {
     "Microsoft.Build.Traversal": "1.0.45",
-    "Xamarin.MSBuild.Sdk": "0.22.0",
-    "Xamarin.Mac.Sdk": "0.22.0"
+    "Xamarin.MSBuild.Sdk": "0.26.0",
+    "Xamarin.Mac.Sdk": "0.26.0"
   }
 }
\ No newline at end of file
diff --git a/src/OpenSource.Def.projitems b/src/OpenSource.Def.projitems
new file mode 100644
index 0000000..5919b10
--- /dev/null
+++ b/src/OpenSource.Def.projitems
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <!-- Core Xplat Editor -->
+  <ItemGroup>
+    <ProjectReference Include="$(RepoSrcEditorPath)Core\Def\CoreUtility.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Imaging\Def\Imaging.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Def\TextData\TextData.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Def\TextLogic\TextLogic.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Def\TextUI\TextUI.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Def\TextUIWpf\TextUIWpf.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Language\Def\Language\LanguageDef.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Language\Def\Intellisense\IntellisenseDef.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Def\Internal\Internal.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Def\Extras\Extras.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Language\Def\StandardClassification\StandardClassification.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+    </ProjectReference>
+  </ItemGroup>
+
+  <!-- Cocoa Projects -->
+  <ItemGroup Condition="$(HaveXamarinMac)">
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Def\TextUICocoa\TextUICocoa.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/OpenSource.Impl.projitems b/src/OpenSource.Impl.projitems
new file mode 100644
index 0000000..c48b333
--- /dev/null
+++ b/src/OpenSource.Impl.projitems
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <!-- Fake Presentation Foundation for Cocoa -->
+  <ItemGroup Condition="$(HaveXamarinMac)">
+    <ProjectReference Include="$(RepoSrcPath)FPF\WindowsBase\WindowsBase.csproj">
+      <SolutionFolder>FPF</SolutionFolder>
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcPath)FPF\PresentationCore\PresentationCore.csproj">
+      <SolutionFolder>FPF</SolutionFolder>
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcPath)FPF\PresentationFramework\PresentationFramework.csproj">
+      <SolutionFolder>FPF</SolutionFolder>
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcPath)FPF\UIAutomationTypes\UIAutomationTypes.csproj">
+      <SolutionFolder>FPF</SolutionFolder>
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcPath)FPF\UIAutomationProvider\UIAutomationProvider.csproj">
+      <SolutionFolder>FPF</SolutionFolder>
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcPath)FPF\UIAutomationClient\UIAutomationClient.csproj">
+      <SolutionFolder>FPF</SolutionFolder>
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+    </ProjectReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Util\TextDataUtil\TextDataUtil.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Util\TextUIUtil\TextUIUtil.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Core\Impl\CoreUtilityImpl.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Util\TextLogicUtil\TextLogicUtil.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Impl\BraceCompletion\BraceCompletionImpl.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Impl\TextBufferUndoManager\TextBufferUndoManagerImpl.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Impl\TextSearch\TextSearchImpl.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Impl\ClassificationAggregator\ClassificationAggregatorImpl.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Impl\TagAggregator\TagAggregatorImpl.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Impl\DifferenceAlgorithm\DifferenceAlgorithmImpl.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Impl\EditorOptions\EditorOptionsImpl.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Impl\EditorPrimitives\EditorPrimitivesImpl.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Impl\EditorOperations\EditorOperationsImpl.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Impl\ClassificationType\ClassificationTypeImpl.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Impl\Navigation\NavigationImpl.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Impl\StandaloneUndo\StandaloneUndoImpl.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Impl\TextModel\TextModelImpl.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Impl\XPlat\MultiCaretImpl\MultiCaretImpl.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Language\Impl\Language\LanguageImpl.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Language\Util\LanguageUtil\LanguageUtil.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Impl\Commanding\CommandingImpl.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Impl\Outlining\Outlining.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+    <ProjectReference Include="$(RepoSrcEditorPath)Text\Impl\PatternMatching\PatternMatchingImpl.csproj">
+      <Private>$(ReferencesVSEditorCopyToOutput)</Private>
+      <Consolidate>true</Consolidate>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
\ No newline at end of file
-- 
cgit v1.2.3