Make the solution build.dev/kirillo/dev17

5 files changed, 5 insertions, 47 deletions

diff --git a/VSEditorCore.sln b/VSEditorCore.sln
index c22021b..c9ed96f 100644
--- a/VSEditorCore.sln
+++ b/VSEditorCore.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
 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}"
@@ -21,26 +19,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntellisenseDef", "src\Edit
 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}") = "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
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUIUtil", "src\Editor\Text\Util\TextUIUtil\TextUIUtil.csproj", "{B2040CA1-C6E3-5D44-89A2-6C1BE936184D}"
@@ -140,20 +122,6 @@ Global
 		{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
@@ -247,12 +215,4 @@ Global
 		{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
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{522016EE-7098-5C37-844E-297AEDDEE1B4} = {01986EB1-3128-5838-B09A-7754A44C22CE}
-		{A1D6A6EC-B9A2-518C-8358-298CD775D2B5} = {01986EB1-3128-5838-B09A-7754A44C22CE}
-		{AE3666FC-31FA-5EBF-8ED5-0CEF50186B67} = {01986EB1-3128-5838-B09A-7754A44C22CE}
-		{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}
-	EndGlobalSection
 EndGlobal
diff --git a/src/Editor/Text/Impl/BraceCompletion/BraceCompletionAdornmentService.cs b/src/Editor/Text/Impl/BraceCompletion/BraceCompletionAdornmentService.cs
index c6a1704..f405eed 100644
--- a/src/Editor/Text/Impl/BraceCompletion/BraceCompletionAdornmentService.cs
+++ b/src/Editor/Text/Impl/BraceCompletion/BraceCompletionAdornmentService.cs
@@ -24,7 +24,7 @@ namespace Microsoft.VisualStudio.Text.BraceCompletion.Implementation
         #region Private Members
 
         private ITrackingPoint _trackingPoint;
-        private ICocoaTextView _textView;
+        private ITextView _textView;
         private IXPlatAdornmentLayer _adornmentLayer;
         private readonly IEditorFormatMap _editorFormatMap;
         private Brush _brush;
@@ -35,7 +35,7 @@ namespace Microsoft.VisualStudio.Text.BraceCompletion.Implementation
 
         public BraceCompletionAdornmentService(ITextView textView, IEditorFormatMap editorFormatMap)
         {
-            _textView = (ICocoaTextView)textView;
+            _textView = textView;
             _editorFormatMap = editorFormatMap;
 
             if (_textView == null) 
@@ -43,7 +43,7 @@ namespace Microsoft.VisualStudio.Text.BraceCompletion.Implementation
             if (_editorFormatMap == null) 
                 throw new ArgumentNullException(nameof(editorFormatMap));
 
-            _adornmentLayer = _textView.GetXPlatAdornmentLayer(PredefinedAdornmentLayers.BraceCompletion);
+            //_adornmentLayer = _textView.GetXPlatAdornmentLayer(PredefinedAdornmentLayers.BraceCompletion);
 
             SetBrush();
             RegisterEvents();
diff --git a/src/Editor/Text/Impl/BraceCompletion/BraceCompletionImpl.csproj b/src/Editor/Text/Impl/BraceCompletion/BraceCompletionImpl.csproj
index d8eb0fc..507e55e 100644
--- a/src/Editor/Text/Impl/BraceCompletion/BraceCompletionImpl.csproj
+++ b/src/Editor/Text/Impl/BraceCompletion/BraceCompletionImpl.csproj
@@ -28,7 +28,6 @@
     <ProjectReference Include="..\..\Def\TextData\TextData.csproj" />
     <ProjectReference Include="..\..\Def\TextLogic\TextLogic.csproj" />
     <ProjectReference Include="..\..\Def\TextUI\TextUI.csproj" />
-    <ProjectReference Include="..\..\Def\TextUICocoa\TextUICocoa.csproj" />
     <ProjectReference Include="..\..\Util\TextDataUtil\TextDataUtil.csproj" />
     <ProjectReference Include="..\..\Def\Internal\Internal.csproj" />
   </ItemGroup>
diff --git a/src/Editor/Text/Impl/TextSearch/TextSearchNavigator.cs b/src/Editor/Text/Impl/TextSearch/TextSearchNavigator.cs
index ccb354c..319baa8 100644
--- a/src/Editor/Text/Impl/TextSearch/TextSearchNavigator.cs
+++ b/src/Editor/Text/Impl/TextSearch/TextSearchNavigator.cs
@@ -336,7 +336,7 @@ namespace Microsoft.VisualStudio.Text.Find.Implementation
         /// <summary>
         /// Translate start point to current snapshot
         /// </summary>
-        private void UpdateStartPoint(ITextSnapshot? targetSnapshot)
+        private void UpdateStartPoint(ITextSnapshot targetSnapshot)
         {
             if (targetSnapshot != null && _startPoint.HasValue && _startPoint.Value.Snapshot != _buffer.CurrentSnapshot)
             {
@@ -528,7 +528,7 @@ namespace Microsoft.VisualStudio.Text.Find.Implementation
 
         public void Dispose()
         {
-            _buffer.Changed -= this.OnTextBufferChanged();
+            _buffer.Changed -= this.OnTextBufferChanged;
         }
     }
 }
diff --git a/src/Editor/Text/Util/TextUICocoaUtil/TextUICocoaUtil.csproj b/src/Editor/Text/Util/TextUICocoaUtil/TextUICocoaUtil.csproj
index ae46b47..b7bdd21 100644
--- a/src/Editor/Text/Util/TextUICocoaUtil/TextUICocoaUtil.csproj
+++ b/src/Editor/Text/Util/TextUICocoaUtil/TextUICocoaUtil.csproj
@@ -26,7 +26,6 @@
     <ProjectReference Include="..\..\Def\TextData\TextData.csproj" />
     <ProjectReference Include="..\..\Def\TextLogic\TextLogic.csproj" />
     <ProjectReference Include="..\..\Def\TextUI\TextUI.csproj" />
-    <ProjectReference Include="..\..\Def\TextUICocoa\TextUICocoa.csproj" />
     <ProjectReference Include="..\..\Def\Internal\Internal.csproj" />
     <ProjectReference Include="..\TextDataUtil\TextDataUtil.csproj" />
     <ProjectReference Include="..\TextLogicUtil\TextLogicUtil.csproj" />