integrate visualfsharp master

Author: dsyme

.gitignore

@@ -184,7 +184,6 @@ tests/fsharpqa/Source/*FSharpQA_Failures.lst
 *.csproj.user
 *.fsproj.user
 *.sln.DotSettings.user
-*.ide
 *.log
 *.jrs
 *.chk

fcs/FSharp.Compiler.Service.ProjectCrackerTool/Program.fs

@@ -10,8 +10,8 @@ module Program =
     let addMSBuildv14BackupResolution () =
         let onResolveEvent = new ResolveEventHandler(fun sender evArgs ->
             let requestedAssembly = AssemblyName(evArgs.Name)
-            if requestedAssembly.Name.StartsWith("Microsoft.Build") &&
-                not (requestedAssembly.Name.EndsWith(".resources")) && 
+            if requestedAssembly.Name.StartsWith("Microsoft.Build", StringComparison.Ordinal) &&
+                not (requestedAssembly.Name.EndsWith(".resources", StringComparison.Ordinal)) && 
                 not (requestedAssembly.Version.ToString().Contains("12.0.0.0")) 
             then
                 // If the version of MSBuild that we're using wasn't present on the machine, then 

fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\src</FSharpSourcesRoot>
   </PropertyGroup>
@@ -29,6 +29,9 @@
     <Compile Include="$(FSharpSourcesRoot)\..\tests\service\Common.fs">
       <Link>Common.fs</Link>
     </Compile>
+    <Compile Include="$(FSharpSourcesRoot)\..\tests\service\AssemblyReaderShim.fs">
+      <Link>AssemblyReaderShim.fs</Link>
+    </Compile>
     <Compile Include="$(FSharpSourcesRoot)\..\tests\service\EditorTests.fs">
       <Link>EditorTests.fs</Link>
     </Compile>

packages.config

@@ -27,6 +27,24 @@
   <package id="BenchmarkDotNet" version="0.9.8"/>
   <package id="BenchmarkDotNet.Diagnostics.Windows" version="0.9.8"/>
   <package id="Newtonsoft.Json" version="9.0.1"/>
+<<<<<<< HEAD
+=======
+  <package id="Microsoft.VisualFSharp.Type.Providers.Redist" version="1.0.0" />
+  <package id="Microsoft.FSharp.TupleSample" version="1.0.0-alpha-161121"/>
+  <package id="Microsoft.VSSDK.BuildTools" version="15.1.192" />
+
+  <!-- Testing Span -->
+  <package id="System.Memory" version="4.5.0-rc1" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0-rc1" />
+  <package id="NETStandard.Library.NETFramework" version="2.0.0-preview2-25405-01" />
+
+  <!-- Annoyingly the build of FSharp.Compiler.Server.Shared references a Visual Studio-specific attribute -->
+  <!-- That DLL is logically part of the F# Compiler and F# Interactive but is shipped as part of the Visual F# IDE Tools -->
+  <package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.15.0" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+
+>>>>>>> 59156db2d0a744233d1baffee7088ca2d9f959c7
   <!-- FSharp.Compiler.Tools is only used to get a working FSI.EXE to execute some scripts during the build -->
   <!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful -->
   <package id="FSharp.Compiler.Tools" version="4.1.27"/>