Merge pull request #870 from dsyme/i15

Integrate visualfsharp master and bump version

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>

fcs/README.md

@@ -60,9 +60,9 @@ which does things like:
 You can push the packages if you have permissions, either automatically using ``build Release`` or manually
 
     set APIKEY=...
-    ..\fsharp\.nuget\nuget.exe push %HOMEDRIVE%%HOMEPATH%\Downloads\FSharp.Compiler.Service.23.0.3.nupkg %APIKEY% -Source https://nuget.org 
-    ..\fsharp\.nuget\nuget.exe push %HOMEDRIVE%%HOMEPATH%\Downloads\FSharp.Compiler.Service.MSBuild.v12.23.0.3.nupkg %APIKEY%  -Source https://nuget.org
-    ..\fsharp\.nuget\nuget.exe push %HOMEDRIVE%%HOMEPATH%\Downloads\FSharp.Compiler.Service.ProjectCracker.23.0.3.nupkg %APIKEY%  -Source https://nuget.org
+    ..\fsharp\.nuget\nuget.exe push %HOMEDRIVE%%HOMEPATH%\Downloads\FSharp.Compiler.Service.24.0.1.nupkg %APIKEY% -Source https://nuget.org 
+    ..\fsharp\.nuget\nuget.exe push %HOMEDRIVE%%HOMEPATH%\Downloads\FSharp.Compiler.Service.MSBuild.v12.24.0.1.nupkg %APIKEY%  -Source https://nuget.org
+    ..\fsharp\.nuget\nuget.exe push %HOMEDRIVE%%HOMEPATH%\Downloads\FSharp.Compiler.Service.ProjectCracker.24.0.1.nupkg %APIKEY%  -Source https://nuget.org
 
 
 ### Use of Paket and FAKE

fcs/RELEASE_NOTES.md

@@ -1,3 +1,6 @@
+#### 24.0.1
+  * Integrate visualfsharp master to 59156db2d0a744233d1baffee7088ca2d9f959c7
+
 #### 23.0.3
   * Clarify package authors
 

fcs/fcs.props

@@ -3,7 +3,7 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
 
-    <VersionPrefix>23.0.3</VersionPrefix>
+    <VersionPrefix>24.0.1</VersionPrefix>
     <OtherFlags>--version:$(VersionPrefix)</OtherFlags>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>    
     <!-- FSharp.Compiler.Tools is currently only used to get a working FSI.EXE to execute some scripts during the build -->