Merge pull request #6 from xamarin/fsharp-cleanup

Fsharp cleanup

Author: nosami

vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj

@@ -25,7 +25,7 @@
     <WarningLevel>3</WarningLevel>
     <DocumentationFile>..\..\..\..\..\build\AddIns\FSharp.Editor\FSharp.Editor.XML</DocumentationFile>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <OtherFlags> --warnon:11111182 --subsystemversion:6.00 --simpleresolution</OtherFlags> 
+    <OtherFlags> --warnon:11111182 --subsystemversion:6.00 --simpleresolution</OtherFlags>
     <SignAssembly>true</SignAssembly>
     <OtherFlags>--publicsign</OtherFlags>
     <AssemblyOriginatorKeyFile>..\..\..\src\buildtools\keys\MSFT.snk</AssemblyOriginatorKeyFile>
@@ -76,11 +76,6 @@
       <HintPath>..\..\..\..\Xamarin.Mac.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="ExtCore">
-      <HintPath>..\..\..\..\fsharpbinding\packages\ExtCore\lib\net45\ExtCore.dll</HintPath>
-      <Private>True</Private>
-      <Paket>True</Paket>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\src\fsharp\FSharp.Compiler.LanguageServer\JsonOptionConverter.fs" />
@@ -223,7 +218,7 @@
       <Private>False</Private>
     </ProjectReference>
     <PackageReference Include="Microsoft.CodeAnalysis" Version="$(NuGetVersionRoslyn)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
-    <PackageReference Include="FSharp.Core" Version="4.7.0" />
+    <PackageReference Include="FSharp.Core" Version="$(NuGetFSharpCore)" />
     <PackageReference Include="Microsoft.CodeAnalysis.Features" Version="$(NuGetVersionRoslyn)" />
     <ProjectReference Include="..\..\..\..\..\src\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj">
       <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project>
@@ -233,7 +228,7 @@
     </ProjectReference>
     <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="$(NuGetVersionRoslyn)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(NuGetVersionRoslyn)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
-    <PackageReference Include="FSharp.Compiler.Service" Version="34.1.0" />
+    <PackageReference Include="FSharp.Compiler.Service" Version="$(NuGetFSharpCompilerService)" />
     <ProjectReference Include="..\..\..\..\..\src\addins\MonoDevelop.TextEditor\MonoDevelop.TextEditor\MonoDevelop.TextEditor.csproj">
       <Project>{3F5B5BDA-69D5-441A-8142-AA25C998A997}</Project>
       <Name>MonoDevelop.TextEditor</Name>
@@ -292,4 +287,4 @@
       </Properties>
     </MonoDevelop>
   </ProjectExtensions>
-</Project>
+</Project>

vsintegration/src/FSharp.Editor/FSharp.addin.xml

@@ -3,7 +3,6 @@
     <Runtime>
         <Import assembly="FSharp.Editor.dll" />
         <Import assembly="FSharpBinding.Gui.dll" />
-        <Import assembly="ExtCore.dll" />
 
         <Import file = "VSMac/templates/EmptyFSharpSource.xft.xml" />
         <Import file = "VSMac/templates/EmptyFSharpScript.xft.xml" />
@@ -21,7 +20,6 @@
         <!-- Code VSMac/templates -->
         <Import file = "VSMac/templates/FSharp-templates.xml" />
 
-        <ScanExclude path="ExtCore.dll" />
         <ScanExclude path="FSharp.Compiler.CodeDom.dll" />
         <ScanExclude path="FSharp.Compiler.Interactive.Settings.dll" />
         <ScanExclude path="FSharp.Core.dll" />

vsintegration/src/FSharp.Editor/VSMac/FSharpSymbolHelper.fs

@@ -4,6 +4,7 @@ open System.Collections.Generic
 open System.Text
 open FSharp.Compiler
 open FSharp.Compiler.SourceCodeServices
+open Microsoft.VisualStudio.FSharp.Editor.Symbols
 
 module Symbols =
     let getLocationFromSymbolUse (s: FSharpSymbolUse) =