diff options
Diffstat (limited to 'main')
9 files changed, 119 insertions, 279 deletions
diff --git a/main/Main.sln b/main/Main.sln index fd9e52a93b..605e04f7a9 100644 --- a/main/Main.sln +++ b/main/Main.sln @@ -344,9 +344,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.TextEditor", "M EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoDevelop.TextEditor.Wpf", "src\addins\MonoDevelop.TextEditor\MonoDevelop.TextEditor.Wpf\MonoDevelop.TextEditor.Wpf.csproj", "{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vs-editor-api", "vs-editor-api", "{669BD438-1BDC-40C6-83CA-CEC133D036A0}"
+EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoDevelop.TextEditor", "src\addins\MonoDevelop.TextEditor\MonoDevelop.TextEditor\MonoDevelop.TextEditor.csproj", "{3F5B5BDA-69D5-441A-8142-AA25C998A997}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vs-editor-core", "vs-editor-core", "{669BD438-1BDC-40C6-83CA-CEC133D036A0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Editor", "Editor", "{5A92B792-BF17-4748-B29E-34C99B2E8722}"
EndProject
@@ -356,85 +357,69 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Text", "Text", "{697A93E1-E EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Impl", "Impl", "{32539734-6484-4451-9EF3-61610CA25BBF}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CocoaViewImpl", "external\vs-editor-core\src\Editor\Text\Impl\CocoaView\CocoaViewImpl.csproj", "{E397B9E6-BFF5-4BBB-B465-7CFE2AC96BF6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CocoaControls", "external\vs-editor-core\src\CocoaControls\CocoaControls.csproj", "{893316B6-9C74-4333-A04C-BDBD09DD6E0C}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "BaseViewImpl", "external\vs-editor-core\src\Editor\Text\Impl\BaseViewImpl\BaseViewImpl.shproj", "{47D57F5A-0693-4768-A970-5491D4F5574C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BraceCompletionImpl", "external\vs-editor-core\src\Editor\Text\Impl\BraceCompletion\BraceCompletionImpl.csproj", "{2471CB49-9952-43D4-A7AD-7C01BCEDC461}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BraceCompletionImpl", "external\vs-editor-api\src\Editor\Text\Impl\BraceCompletion\BraceCompletionImpl.csproj", "{2471CB49-9952-43D4-A7AD-7C01BCEDC461}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Def", "Def", "{AA56E3AE-8E61-4101-B01A-2646DC1B0D7B}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextData", "external\vs-editor-core\src\Editor\Text\Def\TextData\TextData.csproj", "{44A7579B-2E53-451E-8F6B-946AD04DED3F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUIWpf", "external\vs-editor-core\src\Editor\Text\Def\TextUIWpf\TextUIWpf.csproj", "{AB85D313-77D7-4F3D-B3F3-56864A1253DC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUI", "external\vs-editor-core\src\Editor\Text\Def\TextUI\TextUI.csproj", "{C0943335-A94F-4DF4-91D0-2129D45C666C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextData", "external\vs-editor-api\src\Editor\Text\Def\TextData\TextData.csproj", "{44A7579B-2E53-451E-8F6B-946AD04DED3F}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextLogic", "external\vs-editor-core\src\Editor\Text\Def\TextLogic\TextLogic.csproj", "{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUIWpf", "external\vs-editor-api\src\Editor\Text\Def\TextUIWpf\TextUIWpf.csproj", "{AB85D313-77D7-4F3D-B3F3-56864A1253DC}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Internal", "external\vs-editor-core\src\Editor\Text\Def\Internal\Internal.csproj", "{D53A102A-8B6B-4838-BC65-FE36527E7018}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUI", "external\vs-editor-api\src\Editor\Text\Def\TextUI\TextUI.csproj", "{C0943335-A94F-4DF4-91D0-2129D45C666C}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InfoBar", "external\vs-editor-core\src\Editor\Text\Def\InfoBar\InfoBar.csproj", "{D8BA17BF-5D1E-44C9-A73B-DA5F56053959}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextLogic", "external\vs-editor-api\src\Editor\Text\Def\TextLogic\TextLogic.csproj", "{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassificationAggregatorImpl", "external\vs-editor-core\src\Editor\Text\Impl\ClassificationAggregator\ClassificationAggregatorImpl.csproj", "{33DAC448-FBCB-4030-9939-01FA4B3EAE76}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Internal", "external\vs-editor-api\src\Editor\Text\Def\Internal\Internal.csproj", "{D53A102A-8B6B-4838-BC65-FE36527E7018}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassificationFormatMapImpl", "external\vs-editor-core\src\Editor\Text\Impl\ClassificationFormat\ClassificationFormatMapImpl.csproj", "{98330A6F-B813-4917-B324-BF8C381572FC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassificationAggregatorImpl", "external\vs-editor-api\src\Editor\Text\Impl\ClassificationAggregator\ClassificationAggregatorImpl.csproj", "{33DAC448-FBCB-4030-9939-01FA4B3EAE76}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassificationTypeImpl", "external\vs-editor-core\src\Editor\Text\Impl\ClassificationType\ClassificationTypeImpl.csproj", "{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassificationTypeImpl", "external\vs-editor-api\src\Editor\Text\Impl\ClassificationType\ClassificationTypeImpl.csproj", "{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandingImpl", "external\vs-editor-core\src\Editor\Text\Impl\Commanding\CommandingImpl.csproj", "{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandingImpl", "external\vs-editor-api\src\Editor\Text\Impl\Commanding\CommandingImpl.csproj", "{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DifferenceAlgorithmImpl", "external\vs-editor-core\src\Editor\Text\Impl\DifferenceAlgorithm\DifferenceAlgorithmImpl.csproj", "{6154E851-B914-47D5-9CC0-3E7433047574}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DifferenceAlgorithmImpl", "external\vs-editor-api\src\Editor\Text\Impl\DifferenceAlgorithm\DifferenceAlgorithmImpl.csproj", "{6154E851-B914-47D5-9CC0-3E7433047574}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EditorOperationsImpl", "external\vs-editor-core\src\Editor\Text\Impl\EditorOperations\EditorOperationsImpl.csproj", "{E0561832-1C54-41A8-A30A-97E8E81DBCA7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EditorOperationsImpl", "external\vs-editor-api\src\Editor\Text\Impl\EditorOperations\EditorOperationsImpl.csproj", "{E0561832-1C54-41A8-A30A-97E8E81DBCA7}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EditorOptionsImpl", "external\vs-editor-core\src\Editor\Text\Impl\EditorOptions\EditorOptionsImpl.csproj", "{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EditorOptionsImpl", "external\vs-editor-api\src\Editor\Text\Impl\EditorOptions\EditorOptionsImpl.csproj", "{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EditorPrimitivesImpl", "external\vs-editor-core\src\Editor\Text\Impl\EditorPrimitives\EditorPrimitivesImpl.csproj", "{9B8B470A-5455-45B5-A5D1-8619ED174257}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EditorPrimitivesImpl", "external\vs-editor-api\src\Editor\Text\Impl\EditorPrimitives\EditorPrimitivesImpl.csproj", "{9B8B470A-5455-45B5-A5D1-8619ED174257}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Find", "external\vs-editor-core\src\Editor\Text\Impl\Find\Find.csproj", "{645985FC-FDD7-4D6F-9A90-79E9F96AF0FB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NavigationImpl", "external\vs-editor-api\src\Editor\Text\Impl\Navigation\NavigationImpl.csproj", "{726E446E-2E8D-4B48-A47B-923C6CEC4556}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NavigationImpl", "external\vs-editor-core\src\Editor\Text\Impl\Navigation\NavigationImpl.csproj", "{726E446E-2E8D-4B48-A47B-923C6CEC4556}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextSearchImpl", "external\vs-editor-api\src\Editor\Text\Impl\TextSearch\TextSearchImpl.csproj", "{F713D37D-70A4-49BB-ADAE-B7007C880E57}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextSearchImpl", "external\vs-editor-core\src\Editor\Text\Impl\TextSearch\TextSearchImpl.csproj", "{F713D37D-70A4-49BB-ADAE-B7007C880E57}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextModelImpl", "external\vs-editor-api\src\Editor\Text\Impl\TextModel\TextModelImpl.csproj", "{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextModelImpl", "external\vs-editor-core\src\Editor\Text\Impl\TextModel\TextModelImpl.csproj", "{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextBufferUndoManagerImpl", "external\vs-editor-api\src\Editor\Text\Impl\TextBufferUndoManager\TextBufferUndoManagerImpl.csproj", "{72987C64-502B-4BBB-B9C9-B09F54C7B552}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextBufferUndoManagerImpl", "external\vs-editor-core\src\Editor\Text\Impl\TextBufferUndoManager\TextBufferUndoManagerImpl.csproj", "{72987C64-502B-4BBB-B9C9-B09F54C7B552}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagAggregatorImpl", "external\vs-editor-api\src\Editor\Text\Impl\TagAggregator\TagAggregatorImpl.csproj", "{3C354DFC-8768-4023-9977-B9C3B9FF81ED}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextAndAdornmentSequencerImpl", "external\vs-editor-core\src\Editor\Text\Impl\TextAndAdornmentSequencer\TextAndAdornmentSequencerImpl.csproj", "{EBDD3015-F38D-470F-8C55-82FD46019495}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandaloneUndoImpl", "external\vs-editor-api\src\Editor\Text\Impl\StandaloneUndo\StandaloneUndoImpl.csproj", "{29E74860-17B2-47D3-B3D4-7BC7E77900CE}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagAggregatorImpl", "external\vs-editor-core\src\Editor\Text\Impl\TagAggregator\TagAggregatorImpl.csproj", "{3C354DFC-8768-4023-9977-B9C3B9FF81ED}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandaloneUndoImpl", "external\vs-editor-core\src\Editor\Text\Impl\StandaloneUndo\StandaloneUndoImpl.csproj", "{29E74860-17B2-47D3-B3D4-7BC7E77900CE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RtfBuilderServiceImpl", "external\vs-editor-core\src\Editor\Text\Impl\RTF\RtfBuilderServiceImpl.csproj", "{6B5B877B-102F-493E-B4A5-C5BA1A2D517C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Outlining", "external\vs-editor-core\src\Editor\Text\Impl\Outlining\Outlining.csproj", "{135FD888-1648-4721-A861-4F7503C44A3D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Outlining", "external\vs-editor-api\src\Editor\Text\Impl\Outlining\Outlining.csproj", "{135FD888-1648-4721-A861-4F7503C44A3D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XPlat", "XPlat", "{0CEAC5F6-B155-404B-B81A-76F6EFF3AD5F}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiCaretImpl", "external\vs-editor-core\src\Editor\Text\Impl\XPlat\MultiCaretImpl\MultiCaretImpl.csproj", "{547C3D7B-7DFF-4169-88A7-56245170FDB3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiCaretImpl", "external\vs-editor-api\src\Editor\Text\Impl\XPlat\MultiCaretImpl\MultiCaretImpl.csproj", "{547C3D7B-7DFF-4169-88A7-56245170FDB3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Util", "Util", "{745BF6CA-BC7C-4863-B1B4-C423A828820A}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextDataUtil", "external\vs-editor-core\src\Editor\Text\Util\TextDataUtil\TextDataUtil.csproj", "{1206D585-670F-4951-A6BF-493C79C950E4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextDataUtil", "external\vs-editor-api\src\Editor\Text\Util\TextDataUtil\TextDataUtil.csproj", "{1206D585-670F-4951-A6BF-493C79C950E4}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextLogicUtil", "external\vs-editor-core\src\Editor\Text\Util\TextLogicUtil\TextLogicUtil.csproj", "{69F195E1-A8C9-43B3-AE91-A8FC79393163}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextLogicUtil", "external\vs-editor-api\src\Editor\Text\Util\TextLogicUtil\TextLogicUtil.csproj", "{69F195E1-A8C9-43B3-AE91-A8FC79393163}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUIUtil", "external\vs-editor-core\src\Editor\Text\Util\TextUIUtil\TextUIUtil.csproj", "{B2B41590-92EF-4120-B9B8-E861F3903FDD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUIUtil", "external\vs-editor-api\src\Editor\Text\Util\TextUIUtil\TextUIUtil.csproj", "{B2B41590-92EF-4120-B9B8-E861F3903FDD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{10D43FCD-8287-47D2-A8DD-7BDC77CFBDE7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Def", "Def", "{1EA941BE-66DE-4D0E-B840-FC556F5BA803}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreUtility", "external\vs-editor-core\src\Editor\Core\Def\CoreUtility.csproj", "{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreUtility", "external\vs-editor-api\src\Editor\Core\Def\CoreUtility.csproj", "{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Impl", "Impl", "{AE6FAE39-A6DE-4809-85CB-16321D9A708C}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreUtilityImpl", "external\vs-editor-core\src\Editor\Core\Impl\CoreUtilityImpl.csproj", "{063241E2-CBDA-4A95-9B8E-914AD6D6D242}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreUtilityImpl", "external\vs-editor-api\src\Editor\Core\Impl\CoreUtilityImpl.csproj", "{063241E2-CBDA-4A95-9B8E-914AD6D6D242}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Language", "Language", "{9507EE28-0855-4790-88A7-A5D9FA58AB6D}"
EndProject
@@ -444,43 +429,27 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Def", "Def", "{0E8F5B35-CB3 EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Impl", "Impl", "{8CE76FA8-18EA-4016-8E1F-3D31650BC223}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntellisenseDef", "external\vs-editor-core\src\Editor\Language\Def\Intellisense\IntellisenseDef.csproj", "{C00336B8-0DC9-4F05-A030-C6BD2A018746}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageDef", "external\vs-editor-core\src\Editor\Language\Def\Language\LanguageDef.csproj", "{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandardClassification", "external\vs-editor-core\src\Editor\Language\Def\StandardClassification\StandardClassification.csproj", "{D8CED26E-4BB7-47EE-9F20-D3EEAF14F047}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntellisenseDef", "external\vs-editor-api\src\Editor\Language\Def\Intellisense\IntellisenseDef.csproj", "{C00336B8-0DC9-4F05-A030-C6BD2A018746}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageImpl", "external\vs-editor-core\src\Editor\Language\Impl\Language\LanguageImpl.csproj", "{C90CEE76-1A52-43EC-A28D-ABD25F95646B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageDef", "external\vs-editor-api\src\Editor\Language\Def\Language\LanguageDef.csproj", "{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandardClassificationImpl", "external\vs-editor-core\src\Editor\Language\Impl\StandardClassification\StandardClassificationImpl.csproj", "{0F03F84B-580B-4710-A5B9-616A66552A4F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageImpl", "external\vs-editor-api\src\Editor\Language\Impl\Language\LanguageImpl.csproj", "{C90CEE76-1A52-43EC-A28D-ABD25F95646B}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageUtil", "external\vs-editor-core\src\Editor\Language\Util\LanguageUtil\LanguageUtil.csproj", "{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageUtil", "external\vs-editor-api\src\Editor\Language\Util\LanguageUtil\LanguageUtil.csproj", "{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsBase", "external\vs-editor-core\src\FPF\WindowsBase\WindowsBase.csproj", "{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsBase", "external\vs-editor-api\src\FPF\WindowsBase\WindowsBase.csproj", "{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PresentationCore", "external\vs-editor-core\src\FPF\PresentationCore\PresentationCore.csproj", "{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PresentationCore", "external\vs-editor-api\src\FPF\PresentationCore\PresentationCore.csproj", "{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PresentationFramework", "external\vs-editor-core\src\FPF\PresentationFramework\PresentationFramework.csproj", "{FDE5334A-70B5-41AE-9445-A0C77725A63D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PresentationFramework", "external\vs-editor-api\src\FPF\PresentationFramework\PresentationFramework.csproj", "{FDE5334A-70B5-41AE-9445-A0C77725A63D}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIAutomationClient", "external\vs-editor-core\src\FPF\UIAutomationClient\UIAutomationClient.csproj", "{8858E6B0-8398-46A9-9022-358D10E5E394}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIAutomationClient", "external\vs-editor-api\src\FPF\UIAutomationClient\UIAutomationClient.csproj", "{8858E6B0-8398-46A9-9022-358D10E5E394}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIAutomationProvider", "external\vs-editor-core\src\FPF\UIAutomationProvider\UIAutomationProvider.csproj", "{8EC74798-FED7-4F3C-A01B-25013317A90B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIAutomationProvider", "external\vs-editor-api\src\FPF\UIAutomationProvider\UIAutomationProvider.csproj", "{8EC74798-FED7-4F3C-A01B-25013317A90B}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIAutomationTypes", "external\vs-editor-core\src\FPF\UIAutomationTypes\UIAutomationTypes.csproj", "{52BF10FD-66DF-430F-8A30-E5E63A93AE91}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIAutomationTypes", "external\vs-editor-api\src\FPF\UIAutomationTypes\UIAutomationTypes.csproj", "{52BF10FD-66DF-430F-8A30-E5E63A93AE91}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoDevelop.TextEditor.Cocoa", "src\addins\MonoDevelop.TextEditor\MonoDevelop.TextEditor.Cocoa\MonoDevelop.TextEditor.Cocoa.csproj", "{5FEEDF49-0493-411C-B4F3-FAB7543499D2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PatternMatchingImpl", "external\vs-editor-core\src\Editor\Text\Impl\PatternMatching\PatternMatchingImpl.csproj", "{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToolTipAdornmentImpl", "external\vs-editor-core\src\Editor\Text\Impl\ToolTipAdornment\ToolTipAdornmentImpl.csproj", "{1339C301-982F-4A37-BD71-1F104FCCE65D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GlyphMarginImpl", "external\vs-editor-core\src\Editor\Text\Impl\GlyphMargin\GlyphMarginImpl.csproj", "{EDC59664-4D54-473E-82E6-BB83FBD1C254}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StructureImpl", "external\vs-editor-core\src\Editor\Text\Impl\Structure\StructureImpl.csproj", "{6C7ADE4D-2544-581E-918B-659243920781}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "RoslynIntegration", "external\vs-editor-core\src\RoslynIntegration\RoslynIntegration.shproj", "{A10C6E18-A872-4D43-9BB2-2B28C70C7BF7}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NavigationProvidersImpl", "external\vs-editor-core\src\Editor\Text\Impl\NavigationProviders\NavigationProvidersImpl.csproj", "{3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PatternMatchingImpl", "external\vs-editor-api\src\Editor\Text\Impl\PatternMatching\PatternMatchingImpl.csproj", "{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExtensionTools", "src\tools\ExtensionTools\ExtensionTools.csproj", "{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}"
EndProject
@@ -492,14 +461,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.PropertyEditing.Mac EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MDBuildTasks", "msbuild\MDBuildTasks\MDBuildTasks.csproj", "{37E01D0B-8C44-441F-9F5D-56C36AB0B918}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisibleWhitespaceImpl", "external\vs-editor-core\src\Editor\Text\Impl\VisibleWhitespace\VisibleWhitespaceImpl.csproj", "{F8C8C557-8143-4EA2-95D1-AC3AAAC08902}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Extras", "external\vs-editor-api\src\Editor\Text\Def\Extras\Extras.csproj", "{FC412405-B907-473F-864A-657D8E98BB53}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CurrentLineHighlighterImpl", "external\vs-editor-core\src\Editor\Text\Impl\CurrentLineHighlighter\CurrentLineHighlighterImpl.csproj", "{F0C265B2-1D92-4F7A-8B3A-D6A83C6DBFE6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandardClassification", "external\vs-editor-api\src\Editor\Language\Def\StandardClassification\StandardClassification.csproj", "{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
- external\vs-editor-core\src\Editor\Text\Impl\BaseViewImpl\BaseViewImpl.projitems*{47d57f5a-0693-4768-a970-5491d4f5574c}*SharedItemsImports = 13
- external\vs-editor-core\src\RoslynIntegration\RoslynIntegration.projitems*{a10c6e18-a872-4d43-9bb2-2b28c70c7bf7}*SharedItemsImports = 13
src\core\Mono.TextEditor.Shared\Mono.TextEditor.Shared.projitems*{f8f92aa4-a376-4679-a9d4-60e7b7fbf477}*SharedItemsImports = 4
src\core\Mono.TextEditor.Shared\Mono.TextEditor.Shared.projitems*{fbaad910-f29b-4ac5-9fc0-27f6eb36c495}*SharedItemsImports = 13
EndGlobalSection
@@ -2245,6 +2212,10 @@ Global {29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+ {44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Debug|x86.Build.0 = Debug|Any CPU
+ {44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Release|x86.ActiveCfg = Release|Any CPU
+ {44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Release|x86.Build.0 = Release|Any CPU
{3F5B5BDA-69D5-441A-8142-AA25C998A997}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3F5B5BDA-69D5-441A-8142-AA25C998A997}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3F5B5BDA-69D5-441A-8142-AA25C998A997}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2261,26 +2232,6 @@ Global {3F5B5BDA-69D5-441A-8142-AA25C998A997}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{3F5B5BDA-69D5-441A-8142-AA25C998A997}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{3F5B5BDA-69D5-441A-8142-AA25C998A997}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
- {E397B9E6-BFF5-4BBB-B465-7CFE2AC96BF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E397B9E6-BFF5-4BBB-B465-7CFE2AC96BF6}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
- {E397B9E6-BFF5-4BBB-B465-7CFE2AC96BF6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {E397B9E6-BFF5-4BBB-B465-7CFE2AC96BF6}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {E397B9E6-BFF5-4BBB-B465-7CFE2AC96BF6}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {E397B9E6-BFF5-4BBB-B465-7CFE2AC96BF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E397B9E6-BFF5-4BBB-B465-7CFE2AC96BF6}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
- {E397B9E6-BFF5-4BBB-B465-7CFE2AC96BF6}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {E397B9E6-BFF5-4BBB-B465-7CFE2AC96BF6}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {E397B9E6-BFF5-4BBB-B465-7CFE2AC96BF6}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {893316B6-9C74-4333-A04C-BDBD09DD6E0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {893316B6-9C74-4333-A04C-BDBD09DD6E0C}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
- {893316B6-9C74-4333-A04C-BDBD09DD6E0C}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {893316B6-9C74-4333-A04C-BDBD09DD6E0C}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {893316B6-9C74-4333-A04C-BDBD09DD6E0C}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {893316B6-9C74-4333-A04C-BDBD09DD6E0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {893316B6-9C74-4333-A04C-BDBD09DD6E0C}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
- {893316B6-9C74-4333-A04C-BDBD09DD6E0C}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {893316B6-9C74-4333-A04C-BDBD09DD6E0C}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {893316B6-9C74-4333-A04C-BDBD09DD6E0C}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2341,18 +2292,6 @@ Global {D53A102A-8B6B-4838-BC65-FE36527E7018}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{D53A102A-8B6B-4838-BC65-FE36527E7018}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{D53A102A-8B6B-4838-BC65-FE36527E7018}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {D8BA17BF-5D1E-44C9-A73B-DA5F56053959}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D8BA17BF-5D1E-44C9-A73B-DA5F56053959}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
- {D8BA17BF-5D1E-44C9-A73B-DA5F56053959}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {D8BA17BF-5D1E-44C9-A73B-DA5F56053959}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {D8BA17BF-5D1E-44C9-A73B-DA5F56053959}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {D8BA17BF-5D1E-44C9-A73B-DA5F56053959}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
- {D8BA17BF-5D1E-44C9-A73B-DA5F56053959}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D8BA17BF-5D1E-44C9-A73B-DA5F56053959}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
- {D8BA17BF-5D1E-44C9-A73B-DA5F56053959}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {D8BA17BF-5D1E-44C9-A73B-DA5F56053959}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {D8BA17BF-5D1E-44C9-A73B-DA5F56053959}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {D8BA17BF-5D1E-44C9-A73B-DA5F56053959}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2363,16 +2302,6 @@ Global {33DAC448-FBCB-4030-9939-01FA4B3EAE76}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {98330A6F-B813-4917-B324-BF8C381572FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {98330A6F-B813-4917-B324-BF8C381572FC}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
- {98330A6F-B813-4917-B324-BF8C381572FC}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {98330A6F-B813-4917-B324-BF8C381572FC}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {98330A6F-B813-4917-B324-BF8C381572FC}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {98330A6F-B813-4917-B324-BF8C381572FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {98330A6F-B813-4917-B324-BF8C381572FC}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
- {98330A6F-B813-4917-B324-BF8C381572FC}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {98330A6F-B813-4917-B324-BF8C381572FC}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {98330A6F-B813-4917-B324-BF8C381572FC}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2433,18 +2362,6 @@ Global {9B8B470A-5455-45B5-A5D1-8619ED174257}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{9B8B470A-5455-45B5-A5D1-8619ED174257}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{9B8B470A-5455-45B5-A5D1-8619ED174257}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {645985FC-FDD7-4D6F-9A90-79E9F96AF0FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {645985FC-FDD7-4D6F-9A90-79E9F96AF0FB}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
- {645985FC-FDD7-4D6F-9A90-79E9F96AF0FB}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {645985FC-FDD7-4D6F-9A90-79E9F96AF0FB}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {645985FC-FDD7-4D6F-9A90-79E9F96AF0FB}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {645985FC-FDD7-4D6F-9A90-79E9F96AF0FB}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
- {645985FC-FDD7-4D6F-9A90-79E9F96AF0FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {645985FC-FDD7-4D6F-9A90-79E9F96AF0FB}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
- {645985FC-FDD7-4D6F-9A90-79E9F96AF0FB}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {645985FC-FDD7-4D6F-9A90-79E9F96AF0FB}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {645985FC-FDD7-4D6F-9A90-79E9F96AF0FB}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {645985FC-FDD7-4D6F-9A90-79E9F96AF0FB}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
{726E446E-2E8D-4B48-A47B-923C6CEC4556}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{726E446E-2E8D-4B48-A47B-923C6CEC4556}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
{726E446E-2E8D-4B48-A47B-923C6CEC4556}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2485,16 +2402,6 @@ Global {72987C64-502B-4BBB-B9C9-B09F54C7B552}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{72987C64-502B-4BBB-B9C9-B09F54C7B552}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{72987C64-502B-4BBB-B9C9-B09F54C7B552}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {EBDD3015-F38D-470F-8C55-82FD46019495}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EBDD3015-F38D-470F-8C55-82FD46019495}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
- {EBDD3015-F38D-470F-8C55-82FD46019495}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {EBDD3015-F38D-470F-8C55-82FD46019495}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {EBDD3015-F38D-470F-8C55-82FD46019495}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {EBDD3015-F38D-470F-8C55-82FD46019495}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EBDD3015-F38D-470F-8C55-82FD46019495}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
- {EBDD3015-F38D-470F-8C55-82FD46019495}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {EBDD3015-F38D-470F-8C55-82FD46019495}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {EBDD3015-F38D-470F-8C55-82FD46019495}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2515,16 +2422,6 @@ Global {29E74860-17B2-47D3-B3D4-7BC7E77900CE}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {6B5B877B-102F-493E-B4A5-C5BA1A2D517C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6B5B877B-102F-493E-B4A5-C5BA1A2D517C}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
- {6B5B877B-102F-493E-B4A5-C5BA1A2D517C}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {6B5B877B-102F-493E-B4A5-C5BA1A2D517C}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {6B5B877B-102F-493E-B4A5-C5BA1A2D517C}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {6B5B877B-102F-493E-B4A5-C5BA1A2D517C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6B5B877B-102F-493E-B4A5-C5BA1A2D517C}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
- {6B5B877B-102F-493E-B4A5-C5BA1A2D517C}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {6B5B877B-102F-493E-B4A5-C5BA1A2D517C}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {6B5B877B-102F-493E-B4A5-C5BA1A2D517C}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{135FD888-1648-4721-A861-4F7503C44A3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{135FD888-1648-4721-A861-4F7503C44A3D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
{135FD888-1648-4721-A861-4F7503C44A3D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2615,16 +2512,6 @@ Global {1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {D8CED26E-4BB7-47EE-9F20-D3EEAF14F047}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D8CED26E-4BB7-47EE-9F20-D3EEAF14F047}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
- {D8CED26E-4BB7-47EE-9F20-D3EEAF14F047}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {D8CED26E-4BB7-47EE-9F20-D3EEAF14F047}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {D8CED26E-4BB7-47EE-9F20-D3EEAF14F047}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {D8CED26E-4BB7-47EE-9F20-D3EEAF14F047}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D8CED26E-4BB7-47EE-9F20-D3EEAF14F047}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
- {D8CED26E-4BB7-47EE-9F20-D3EEAF14F047}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {D8CED26E-4BB7-47EE-9F20-D3EEAF14F047}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {D8CED26E-4BB7-47EE-9F20-D3EEAF14F047}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2635,16 +2522,6 @@ Global {C90CEE76-1A52-43EC-A28D-ABD25F95646B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {0F03F84B-580B-4710-A5B9-616A66552A4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0F03F84B-580B-4710-A5B9-616A66552A4F}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
- {0F03F84B-580B-4710-A5B9-616A66552A4F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {0F03F84B-580B-4710-A5B9-616A66552A4F}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {0F03F84B-580B-4710-A5B9-616A66552A4F}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {0F03F84B-580B-4710-A5B9-616A66552A4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0F03F84B-580B-4710-A5B9-616A66552A4F}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
- {0F03F84B-580B-4710-A5B9-616A66552A4F}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {0F03F84B-580B-4710-A5B9-616A66552A4F}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {0F03F84B-580B-4710-A5B9-616A66552A4F}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2715,16 +2592,6 @@ Global {52BF10FD-66DF-430F-8A30-E5E63A93AE91}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {5FEEDF49-0493-411C-B4F3-FAB7543499D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5FEEDF49-0493-411C-B4F3-FAB7543499D2}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
- {5FEEDF49-0493-411C-B4F3-FAB7543499D2}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {5FEEDF49-0493-411C-B4F3-FAB7543499D2}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {5FEEDF49-0493-411C-B4F3-FAB7543499D2}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {5FEEDF49-0493-411C-B4F3-FAB7543499D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5FEEDF49-0493-411C-B4F3-FAB7543499D2}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
- {5FEEDF49-0493-411C-B4F3-FAB7543499D2}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {5FEEDF49-0493-411C-B4F3-FAB7543499D2}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {5FEEDF49-0493-411C-B4F3-FAB7543499D2}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2739,47 +2606,6 @@ Global {C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {1339C301-982F-4A37-BD71-1F104FCCE65D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1339C301-982F-4A37-BD71-1F104FCCE65D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
- {1339C301-982F-4A37-BD71-1F104FCCE65D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {1339C301-982F-4A37-BD71-1F104FCCE65D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {1339C301-982F-4A37-BD71-1F104FCCE65D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {1339C301-982F-4A37-BD71-1F104FCCE65D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1339C301-982F-4A37-BD71-1F104FCCE65D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
- {1339C301-982F-4A37-BD71-1F104FCCE65D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {1339C301-982F-4A37-BD71-1F104FCCE65D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {1339C301-982F-4A37-BD71-1F104FCCE65D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {EDC59664-4D54-473E-82E6-BB83FBD1C254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EDC59664-4D54-473E-82E6-BB83FBD1C254}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
- {EDC59664-4D54-473E-82E6-BB83FBD1C254}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {EDC59664-4D54-473E-82E6-BB83FBD1C254}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {EDC59664-4D54-473E-82E6-BB83FBD1C254}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {EDC59664-4D54-473E-82E6-BB83FBD1C254}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EDC59664-4D54-473E-82E6-BB83FBD1C254}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
- {EDC59664-4D54-473E-82E6-BB83FBD1C254}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {EDC59664-4D54-473E-82E6-BB83FBD1C254}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {EDC59664-4D54-473E-82E6-BB83FBD1C254}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {6C7ADE4D-2544-581E-918B-659243920781}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6C7ADE4D-2544-581E-918B-659243920781}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
- {6C7ADE4D-2544-581E-918B-659243920781}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {6C7ADE4D-2544-581E-918B-659243920781}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {6C7ADE4D-2544-581E-918B-659243920781}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {6C7ADE4D-2544-581E-918B-659243920781}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6C7ADE4D-2544-581E-918B-659243920781}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
- {6C7ADE4D-2544-581E-918B-659243920781}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {6C7ADE4D-2544-581E-918B-659243920781}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {6C7ADE4D-2544-581E-918B-659243920781}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
- {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
- {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Debug|x86.ActiveCfg = Debug|Any CPU
{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Debug|x86.Build.0 = Debug|Any CPU
{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Release|x86.ActiveCfg = Release|Any CPU
@@ -2828,14 +2654,46 @@ Global {37E01D0B-8C44-441F-9F5D-56C36AB0B918}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
- {F8C8C557-8143-4EA2-95D1-AC3AAAC08902}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {F8C8C557-8143-4EA2-95D1-AC3AAAC08902}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {F8C8C557-8143-4EA2-95D1-AC3AAAC08902}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {F8C8C557-8143-4EA2-95D1-AC3AAAC08902}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {F0C265B2-1D92-4F7A-8B3A-D6A83C6DBFE6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {F0C265B2-1D92-4F7A-8B3A-D6A83C6DBFE6}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {F0C265B2-1D92-4F7A-8B3A-D6A83C6DBFE6}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {F0C265B2-1D92-4F7A-8B3A-D6A83C6DBFE6}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.Debug|x86.Build.0 = Debug|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.Release|x86.ActiveCfg = Release|Any CPU
+ {FC412405-B907-473F-864A-657D8E98BB53}.Release|x86.Build.0 = Release|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Debug|x86.Build.0 = Debug|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Release|x86.ActiveCfg = Release|Any CPU
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -2995,9 +2853,6 @@ Global {378D061D-D16E-408F-8E01-68B04D77258A} = {669BD438-1BDC-40C6-83CA-CEC133D036A0}
{697A93E1-E591-41A6-8D95-B4B92C3DD4E5} = {5A92B792-BF17-4748-B29E-34C99B2E8722}
{32539734-6484-4451-9EF3-61610CA25BBF} = {697A93E1-E591-41A6-8D95-B4B92C3DD4E5}
- {E397B9E6-BFF5-4BBB-B465-7CFE2AC96BF6} = {32539734-6484-4451-9EF3-61610CA25BBF}
- {893316B6-9C74-4333-A04C-BDBD09DD6E0C} = {32539734-6484-4451-9EF3-61610CA25BBF}
- {47D57F5A-0693-4768-A970-5491D4F5574C} = {32539734-6484-4451-9EF3-61610CA25BBF}
{2471CB49-9952-43D4-A7AD-7C01BCEDC461} = {32539734-6484-4451-9EF3-61610CA25BBF}
{AA56E3AE-8E61-4101-B01A-2646DC1B0D7B} = {697A93E1-E591-41A6-8D95-B4B92C3DD4E5}
{44A7579B-2E53-451E-8F6B-946AD04DED3F} = {AA56E3AE-8E61-4101-B01A-2646DC1B0D7B}
@@ -3005,24 +2860,19 @@ Global {C0943335-A94F-4DF4-91D0-2129D45C666C} = {AA56E3AE-8E61-4101-B01A-2646DC1B0D7B}
{E20390B6-25C8-4DDC-B3E3-9E0560FC4336} = {AA56E3AE-8E61-4101-B01A-2646DC1B0D7B}
{D53A102A-8B6B-4838-BC65-FE36527E7018} = {AA56E3AE-8E61-4101-B01A-2646DC1B0D7B}
- {D8BA17BF-5D1E-44C9-A73B-DA5F56053959} = {AA56E3AE-8E61-4101-B01A-2646DC1B0D7B}
{33DAC448-FBCB-4030-9939-01FA4B3EAE76} = {32539734-6484-4451-9EF3-61610CA25BBF}
- {98330A6F-B813-4917-B324-BF8C381572FC} = {32539734-6484-4451-9EF3-61610CA25BBF}
{FB46DD61-12E4-42D0-A99C-0A79C412FDD5} = {32539734-6484-4451-9EF3-61610CA25BBF}
{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06} = {32539734-6484-4451-9EF3-61610CA25BBF}
{6154E851-B914-47D5-9CC0-3E7433047574} = {32539734-6484-4451-9EF3-61610CA25BBF}
{E0561832-1C54-41A8-A30A-97E8E81DBCA7} = {32539734-6484-4451-9EF3-61610CA25BBF}
{CB978906-1945-4BB6-AAA5-1FA2E60C22EF} = {32539734-6484-4451-9EF3-61610CA25BBF}
{9B8B470A-5455-45B5-A5D1-8619ED174257} = {32539734-6484-4451-9EF3-61610CA25BBF}
- {645985FC-FDD7-4D6F-9A90-79E9F96AF0FB} = {32539734-6484-4451-9EF3-61610CA25BBF}
{726E446E-2E8D-4B48-A47B-923C6CEC4556} = {32539734-6484-4451-9EF3-61610CA25BBF}
{F713D37D-70A4-49BB-ADAE-B7007C880E57} = {32539734-6484-4451-9EF3-61610CA25BBF}
{B5C85F1D-38B8-4A57-A763-F390D58BD4D5} = {32539734-6484-4451-9EF3-61610CA25BBF}
{72987C64-502B-4BBB-B9C9-B09F54C7B552} = {32539734-6484-4451-9EF3-61610CA25BBF}
- {EBDD3015-F38D-470F-8C55-82FD46019495} = {32539734-6484-4451-9EF3-61610CA25BBF}
{3C354DFC-8768-4023-9977-B9C3B9FF81ED} = {32539734-6484-4451-9EF3-61610CA25BBF}
{29E74860-17B2-47D3-B3D4-7BC7E77900CE} = {32539734-6484-4451-9EF3-61610CA25BBF}
- {6B5B877B-102F-493E-B4A5-C5BA1A2D517C} = {32539734-6484-4451-9EF3-61610CA25BBF}
{135FD888-1648-4721-A861-4F7503C44A3D} = {32539734-6484-4451-9EF3-61610CA25BBF}
{0CEAC5F6-B155-404B-B81A-76F6EFF3AD5F} = {32539734-6484-4451-9EF3-61610CA25BBF}
{547C3D7B-7DFF-4169-88A7-56245170FDB3} = {0CEAC5F6-B155-404B-B81A-76F6EFF3AD5F}
@@ -3041,9 +2891,7 @@ Global {8CE76FA8-18EA-4016-8E1F-3D31650BC223} = {9507EE28-0855-4790-88A7-A5D9FA58AB6D}
{C00336B8-0DC9-4F05-A030-C6BD2A018746} = {0E8F5B35-CB3C-4B83-B09C-0D5A66B38A6B}
{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07} = {0E8F5B35-CB3C-4B83-B09C-0D5A66B38A6B}
- {D8CED26E-4BB7-47EE-9F20-D3EEAF14F047} = {0E8F5B35-CB3C-4B83-B09C-0D5A66B38A6B}
{C90CEE76-1A52-43EC-A28D-ABD25F95646B} = {8CE76FA8-18EA-4016-8E1F-3D31650BC223}
- {0F03F84B-580B-4710-A5B9-616A66552A4F} = {8CE76FA8-18EA-4016-8E1F-3D31650BC223}
{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5} = {F9FE43E4-1420-4C86-8C28-3F396A55B97E}
{A8F39368-ECD9-41A5-A562-CC7C82B3CC86} = {378D061D-D16E-408F-8E01-68B04D77258A}
{6CFF32E7-9621-4F17-8D31-732F93F0C1A6} = {378D061D-D16E-408F-8E01-68B04D77258A}
@@ -3051,19 +2899,13 @@ Global {8858E6B0-8398-46A9-9022-358D10E5E394} = {378D061D-D16E-408F-8E01-68B04D77258A}
{8EC74798-FED7-4F3C-A01B-25013317A90B} = {378D061D-D16E-408F-8E01-68B04D77258A}
{52BF10FD-66DF-430F-8A30-E5E63A93AE91} = {378D061D-D16E-408F-8E01-68B04D77258A}
- {5FEEDF49-0493-411C-B4F3-FAB7543499D2} = {C14B06AC-905A-47AB-BAD9-652E3499CFE0}
{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F} = {32539734-6484-4451-9EF3-61610CA25BBF}
- {1339C301-982F-4A37-BD71-1F104FCCE65D} = {32539734-6484-4451-9EF3-61610CA25BBF}
- {EDC59664-4D54-473E-82E6-BB83FBD1C254} = {32539734-6484-4451-9EF3-61610CA25BBF}
- {6C7ADE4D-2544-581E-918B-659243920781} = {32539734-6484-4451-9EF3-61610CA25BBF}
- {A10C6E18-A872-4D43-9BB2-2B28C70C7BF7} = {5A92B792-BF17-4748-B29E-34C99B2E8722}
- {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A} = {32539734-6484-4451-9EF3-61610CA25BBF}
{E33F7901-AA45-4C25-9868-DBB6CC8DC40C} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}
{A0B6FE73-D046-4E1C-BA9D-F20683889C5A} = {48087117-8851-402C-B8EA-38681EEF48ED}
{48087117-8851-402C-B8EA-38681EEF48ED} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
{E8F4F0EB-C2B1-4116-8459-E076E0E0E485} = {48087117-8851-402C-B8EA-38681EEF48ED}
- {F8C8C557-8143-4EA2-95D1-AC3AAAC08902} = {32539734-6484-4451-9EF3-61610CA25BBF}
- {F0C265B2-1D92-4F7A-8B3A-D6A83C6DBFE6} = {32539734-6484-4451-9EF3-61610CA25BBF}
+ {FC412405-B907-473F-864A-657D8E98BB53} = {AA56E3AE-8E61-4101-B01A-2646DC1B0D7B}
+ {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D} = {0E8F5B35-CB3C-4B83-B09C-0D5A66B38A6B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {856CF524-E2A7-4DB0-B80F-8F1B080A2E25}
diff --git a/main/external/vs-editor-api b/main/external/vs-editor-api new file mode 160000 +Subproject dcca642652154312f3525ba1cb826597ac0a7fb diff --git a/main/external/vs-editor-core b/main/external/vs-editor-core deleted file mode 160000 -Subproject f066692ee5cb21fb7d5ac6bd5dff41cb9fae77c diff --git a/main/msbuild/ReferencesVSEditor.Mac.props b/main/msbuild/ReferencesVSEditor.Mac.props index 16e7a61e87..a5db4e15ee 100644 --- a/main/msbuild/ReferencesVSEditor.Mac.props +++ b/main/msbuild/ReferencesVSEditor.Mac.props @@ -12,6 +12,7 @@ <IncludeCopyLocal Include="Microsoft.VisualStudio.CoreUtilityImplementation.dll" />
<IncludeCopyLocal Include="Microsoft.VisualStudio.Language.Implementation.dll" />
<IncludeCopyLocal Include="Microsoft.VisualStudio.Language.Utilities.dll" />
+ <IncludeCopyLocal Include="Microsoft.VisualStudio.Language.StandardClassification.dll" />
<IncludeCopyLocal Include="Microsoft.VisualStudio.Text.Data.Utilities.dll" />
<IncludeCopyLocal Include="Microsoft.VisualStudio.Text.UI.Utilities.dll" />
<IncludeCopyLocal Include="Microsoft.VisualStudio.UI.Controls.macOS.dll" />
@@ -42,21 +43,21 @@ <IncludeCopyLocal Include="Microsoft.VisualStudio.Logic.Text.Classification.LookUp.Implementation.dll" />
<IncludeCopyLocal Include="Microsoft.VisualStudio.Logic.Text.Classification.Aggregator.Implementation.dll" />
<IncludeCopyLocal Include="Microsoft.VisualStudio.UI.Text.Wpf.GlyphMargin.Implementation.dll" />
- <IncludeCopyLocal Include="Microsoft.VisualStudio.Text.InfoBar.dll" />
+ <IncludeCopyLocal Include="Microsoft.VisualStudio.Text.Extras.dll" />
<IncludeCopyLocal Include="Microsoft.VisualStudio.Text.Structure.dll" />
<IncludeCopyLocal Include="Microsoft.VisualStudio.UI.Text.AdornmentLibrary.VisibleWhitespace.Implementation.dll" />
<IncludeCopyLocal Include="Microsoft.VisualStudio.UI.Text.CurrentLineHighlighter.Implementation.dll" />
</ItemGroup>
- <Import Project="$(RootDirectory)external\vs-editor-core\build\Environment.props" />
- <Import Project="$(RootDirectory)external\vs-editor-core\src\Editor\Consolidated\Consolidated.projitems" />
+ <Import Project="$(RootDirectory)external\vs-editor-api\build\Environment.props" />
+ <Import Project="$(RootDirectory)external\vs-editor-api\ProjectReferences.projitems" />
<!-- MSBuild doesn't copy the FPF references as they match BCL assembly names -->
<Target Name="CopyFPFAssemblies" AfterTargets="_CopyFilesMarkedCopyLocal" Condition="'$(ReferencesVSEditorCopyToOutput)'=='true'">
<PropertyGroup>
<FPFConfiguration>Release</FPFConfiguration>
<FPFConfiguration Condition="$(Configuration.Contains('Debug'))">Debug</FPFConfiguration>
- <FPFOutputPath>$(RootDirectory)external\vs-editor-core\bin\FPF\$(FPFConfiguration)\net472\</FPFOutputPath>
+ <FPFOutputPath>$(RootDirectory)external\vs-editor-api\bin\FPF\$(FPFConfiguration)\net472\</FPFOutputPath>
</PropertyGroup>
<ItemGroup>
<FPFOutputFiles Include="$(FPFOutputPath)PresentationCore.*" />
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml index 4701419458..8eec78ee69 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml @@ -136,7 +136,7 @@ _label = "Remove Breakpoint" /> <Command id = "MonoDevelop.Debugger.DebugCommands.ShowBreakpointProperties" defaultHandler = "MonoDevelop.Debugger.ShowBreakpointPropertiesHandler" - _label = "Edit Breakpoint…" + _label = "Edit Breakpoint…" _displayName = "Edit Breakpoint Properties" /> <Command id = "MonoDevelop.Debugger.DebugCommands.ToggleBreakpoint" _label = "Toggle Breakpoint" @@ -231,15 +231,15 @@ <CommandItem id = "MonoDevelop.Debugger.DebugCommands.DebugEntry" insertafter="MonoDevelop.Ide.Commands.ProjectCommands.RunEntry" /> </Condition> </Extension> - - <Extension path = "/MonoDevelop/TextEditor/ContextMenu/Editor"> + + <!-- <Extension path = "/MonoDevelop/TextEditor/ContextMenu/Editor"> <SeparatorItem id = "DebuggerSectionStart" insertafter="Separator1" /> <CommandItem id = "MonoDevelop.Debugger.DebugCommands.SetNextStatement" /> <CommandItem id = "MonoDevelop.Debugger.DebugCommands.ShowNextStatement" /> <CommandItem id = "MonoDevelop.Debugger.DebugCommands.RunToCursor" /> <CommandItem id = "MonoDevelop.Debugger.DebugCommands.ExpressionEvaluator" /> <SeparatorItem id = "DebuggerSectionEnd" /> - </Extension> + </Extension> --> <Extension path = "/MonoDevelop/Core/ExecutionModes/Debug"> <ModeSetType id="MonoDevelop.Debugger" class="MonoDevelop.Debugger.DebugExecutionModeSet"/> @@ -284,7 +284,7 @@ <Extension path = "/MonoDevelop/Ide/TextEditorExtensions"> <Class class="MonoDevelop.Debugger.ExceptionCaughtTextEditorExtension" /> </Extension> - + <ConditionType id="SolutionHasDebugSourceFiles" type="MonoDevelop.Debugger.SolutionHasDebugSourceFilesCondition" /> <Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels/Common"> diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj index 891e421ed9..4ba658e73d 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj @@ -25,7 +25,7 @@ <Reference Include="System.Core" /> <Reference Include="System.Drawing" /> <Reference Include="System.ComponentModel.Composition" /> - <Reference Include="Xamarin.Mac" Condition=" '$(Configuration)' == 'DebugMac' OR '$(Configuration)' == 'ReleaseMac' "> + <Reference Include="Xamarin.Mac" Condition="$(HaveXamarinMac)"> <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath> <Private>False</Private> </Reference> @@ -66,10 +66,6 @@ <Name>Mono.Debugging</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="../../../external/vs-editor-core/src/CocoaControls/CocoaControls.csproj" Condition=" '$(Configuration)' == 'DebugMac' OR '$(Configuration)' == 'ReleaseMac' "> - <Name>CocoaControls</Name> - <Private>False</Private> - </ProjectReference> </ItemGroup> <ItemGroup> <Compile Include="AssemblyInfo.cs" /> @@ -132,7 +128,11 @@ <Compile Include="Gui\MonoDevelop.Debugger.ExpressionEvaluatorDialog.cs" /> <Compile Include="Gui\MonoDevelop.Debugger.Viewers.ValueVisualizerDialog.cs" /> <Compile Include="MonoDevelop.Debugger\IDebuggerCompletionProvider.cs" /> - <Compile Include="MonoDevelop.Debugger.VSTextView\Glyphs\ReturnStatementGlyphTaggerProvider.cs" /> + <Compile Include="MonoDevelop.Debugger\DebugValueWindow.cs" /> + <Compile Include="MonoDevelop.Debugger\TextViewExtensions.cs" /> + + + <!--<Compile Include="MonoDevelop.Debugger.VSTextView\Glyphs\ReturnStatementGlyphTaggerProvider.cs" /> <Compile Include="MonoDevelop.Debugger.VSTextView\Glyphs\ReturnStatementGlyphTagger.cs" /> <Compile Include="MonoDevelop.Debugger.VSTextView\Glyphs\ReturnStatementGlyphTag.cs" /> <Compile Include="MonoDevelop.Debugger.VSTextView\Glyphs\IInteractiveGlyph.cs" /> @@ -145,7 +145,7 @@ <Compile Include="MonoDevelop.Debugger.VSTextView\Glyphs\BreakpointGlyphTagger.cs" /> <Compile Include="MonoDevelop.Debugger.VSTextView\Glyphs\BreakpointGlyphTag.cs" /> <Compile Include="MonoDevelop.Debugger.VSTextView\Glyphs\BreakpointGlyphMouseProcessorProvider.cs" /> - <Compile Include="MonoDevelop.Debugger.VSTextView\Glyphs\BreakpointGlyphMouseProcessor.cs" /> + <Compile Include="MonoDevelop.Debugger.VSTextView\Glyphs\BreakpointGlyphMouseProcessor.cs" />--> <Compile Include="MonoDevelop.Debugger.VSTextView\Tags\AbstractCurrentStatementTagger.cs" /> <Compile Include="MonoDevelop.Debugger.VSTextView\Tags\ReturnStatementTaggerProvider.cs" /> <Compile Include="MonoDevelop.Debugger.VSTextView\Tags\ReturnStatementTagger.cs" /> @@ -166,22 +166,22 @@ <Compile Include="MonoDevelop.Debugger.VSTextView\Tags\BreakpointForegroundTaggerProvider.cs" /> <Compile Include="MonoDevelop.Debugger.VSTextView\Tags\BreakpointForegroundTagger.cs" /> <Compile Include="MonoDevelop.Debugger.VSTextView\Tags\AbstractBreakpointTagger.cs" /> - <Compile Include="MonoDevelop.Debugger.VSTextView\QuickInfo\DebuggerQuickInfoSourceProvider.cs" /> - <Compile Include="MonoDevelop.Debugger.VSTextView\QuickInfo\DebuggerQuickInfoSource.cs" /> + <!-- <Compile Include="MonoDevelop.Debugger.VSTextView\QuickInfo\DebuggerQuickInfoSourceProvider.cs" /> + <Compile Include="MonoDevelop.Debugger.VSTextView\QuickInfo\DebuggerQuickInfoSource.cs" /> --> <Compile Include="MonoDevelop.Debugger.VSTextView\QuickInfo\IDebugInfoProvider.cs" /> - <Compile Include="MonoDevelop.Debugger\DebugValueWindow.cs" /> - <Compile Include="MonoDevelop.Debugger\TextViewExtensions.cs" /> <Compile Include="MonoDevelop.Debugger.VSTextView\BreakpointManagerService.cs" /> <Compile Include="MonoDevelop.Debugger.VSTextView\BreakpointManager.cs" /> + <!-- <Compile Include="MonoDevelop.Debugger.VSTextView\ExceptionCaught\ExceptionCaughtProvider.cs" /> - <Compile Include="MonoDevelop.Debugger.VSTextView\ExceptionCaught\ExceptionCaughtAdornmentManager.cs" /> + <Compile Include="MonoDevelop.Debugger.VSTextView\ExceptionCaught\ExceptionCaughtAdornmentManager.cs" />--> </ItemGroup> + <!-- <ItemGroup Condition="$(OS) != 'Windows_NT'"> <Compile Include="MonoDevelop.Debugger.VSTextView\Glyphs\BreakpointGlyphFactoryProvider.cs" /> <Compile Include="MonoDevelop.Debugger.VSTextView\Glyphs\CurrentStatementGlyphFactoryProvider.cs" /> <Compile Include="MonoDevelop.Debugger.VSTextView\Glyphs\ImageSourceGlyphFactory.cs" /> <Compile Include="MonoDevelop.Debugger.VSTextView\Glyphs\ReturnStatementGlyphFactoryProvider.cs" /> - </ItemGroup> + </ItemGroup>--> <ItemGroup> <EmbeddedResource Include="MonoDevelop.Debugger.addin.xml" /> <EmbeddedResource Include="icons\breakpoint-16.png" /> diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj index dc45edbac1..89261ffc5e 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj @@ -84,8 +84,9 @@ </Reference> </ItemGroup> <ItemGroup> - <Compile Include="..\..\..\external\vs-editor-core\src\Editor\Text\Impl\BaseViewImpl\VacuousTextDataModel.cs" Link="Util\VacuousTextDataModel.cs" /> - <Compile Include="..\..\..\external\vs-editor-core\src\Editor\Text\Util\TextUIUtil\VacuousTextViewModel.cs" Link="Util\VacuousTextViewModel.cs" /> + <Compile Include="..\..\..\external\vs-editor-api\src\Editor\Text\Util\TextUIUtil\VacuousTextDataModel.cs" Link="Util\VacuousTextDataModel.cs" /> + <Compile Include="..\..\..\external\vs-editor-api\src\Editor\Text\Util\TextUIUtil\VacuousTextViewModel.cs" Link="Util\VacuousTextViewModel.cs" /> + <Compile Include="..\..\..\external\vs-editor-api\src\Editor\Text\Util\TextUIUtil\UIExtensionSelector.cs" Link="Util\UIExtensionSelector.cs" /> <None Include="MonoDevelop.SourceEditor.dll.config"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> @@ -274,7 +275,6 @@ <Compile Include="Mono.TextEditor\Gui\CodePreviewWindow.cs" /> <Compile Include="MonoDevelop.SourceEditor\TextMarker\SmartTagMarginMarker.cs" /> <Compile Include="Mono.TextEditor\Gui\QuickFixMargin.cs" /> - <Compile Include="..\..\..\external\vs-editor-core\src\Editor\Text\Util\TextUIUtil\UIExtensionSelector.cs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="MonoDevelop.SourceEditor.addin.xml" /> 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 c728874351..179f76e3b6 100644 --- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/MonoDevelop.TextEditor.csproj +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/MonoDevelop.TextEditor.csproj @@ -10,8 +10,7 @@ <DefineConstants Condition="$(OS) == 'Windows_NT'">$(DefineConstants);WINDOWS;WIN32</DefineConstants> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\..\..\..\external\vs-editor-core\src\Editor\Text\Impl\Find\Find.csproj" /> - <ProjectReference Include="..\..\..\..\external\vs-editor-core\src\Editor\Text\Def\InfoBar\InfoBar.csproj" /> + <ProjectReference Include="..\..\..\..\external\vs-editor-api\src\Editor\Text\Def\Extras\Extras.csproj" /> </ItemGroup> <ItemGroup> <InternalsVisibleTo Include="MonoDevelop.TextEditor.Cocoa" /> @@ -21,8 +20,8 @@ <ProjectReference Include="..\..\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj" Private="false" /> </ItemGroup> <ItemGroup> - <Compile Include="..\..\..\..\external\vs-editor-core\src\Editor\Text\Impl\BaseViewImpl\VacuousTextDataModel.cs" Link="Util\VacuousTextDataModel.cs" /> - <Compile Include="..\..\..\..\external\vs-editor-core\src\Editor\Text\Util\TextUIUtil\UIExtensionSelector.cs" Link="Util\UIExtensionSelector.cs" /> - <Compile Include="..\..\..\..\external\vs-editor-core\src\Editor\Text\Util\TextUIUtil\VacuousTextViewModel.cs" Link="Util\VacuousTextViewModel.cs" /> + <Compile Include="..\..\..\..\external\vs-editor-api\src\Editor\Text\Util\TextUIUtil\VacuousTextDataModel.cs" Link="Util\VacuousTextDataModel.cs" /> + <Compile Include="..\..\..\..\external\vs-editor-api\src\Editor\Text\Util\TextUIUtil\UIExtensionSelector.cs" Link="Util\UIExtensionSelector.cs" /> + <Compile Include="..\..\..\..\external\vs-editor-api\src\Editor\Text\Util\TextUIUtil\VacuousTextViewModel.cs" Link="Util\VacuousTextViewModel.cs" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj index dccfcdba1b..2793e69518 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj @@ -1,6 +1,4 @@ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> - <Import Project="..\..\..\external\vs-editor-core\src\RoslynIntegration\RoslynIntegration.projitems" Label="Shared Mac" - Condition="Exists('..\..\..\external\vs-editor-core\src\RoslynIntegration\RoslynIntegration.projitems') And ('$(Configuration)' == 'DebugMac' OR '$(Configuration)' == 'ReleaseMac')" /> <Import Project="..\..\..\MonoDevelop.props" /> <Import Project="$(ReferencesGtk)" /> <Import Project="$(ReferencesVSEditor)" /> @@ -4187,8 +4185,8 @@ <Compile Include="MonoDevelop.Ide.Composition\VisualStudioMefHostServices.cs" /> <Compile Include="MonoDevelop.Ide.Projects\NewSolutionRunConfigurationDialog.cs" /> <Compile Include="MonoDevelop.Ide.TypeSystem\WorkspaceFilesCache.cs" /> - <Compile Include="..\..\..\external\vs-editor-core\src\Editor\Text\Impl\BaseViewImpl\VacuousTextDataModel.cs" Link="DeleteAfterWebToolsFixesDep\VacuousTextDataModel.cs" /> - <Compile Include="..\..\..\external\vs-editor-core\src\Editor\Text\Util\TextUIUtil\VacuousTextViewModel.cs" Link="DeleteAfterWebToolsFixesDep\VacuousTextViewModel.cs" /> + <Compile Include="..\..\..\external\vs-editor-api\src\Editor\Text\Util\TextUIUtil\VacuousTextDataModel.cs" Link="Util\VacuousTextDataModel.cs" /> + <Compile Include="..\..\..\external\vs-editor-api\src\Editor\Text\Util\TextUIUtil\VacuousTextViewModel.cs" Link="Util\VacuousTextViewModel.cs" /> <Compile Include="MonoDevelop.Ide.Editor\EditorPreferences.cs" /> <Compile Include="MonoDevelop.Ide.Gui.Dialogs\NewFolderDialog.cs" /> <Compile Include="MonoDevelop.Components.PropertyGrid\IPropertyGrid.cs" /> |