Merge pull request #814 from dsyme/i13

Integrate latest from visualfsharp

Author: dsyme

.gitignore

@@ -35,15 +35,6 @@ scripts/*.patch
 /src/fsharp/FSharp.Compiler.Private/*.sln
 /src/fsharp/FSharp.Compiler.Private/*.userprefs
 /src/*.log
-/src/fsharp/FSharp.Compiler.Private/illex.fs
-/src/fsharp/FSharp.Compiler.Private/ilpars.fs
-/src/fsharp/FSharp.Compiler.Private/ilpars.fsi
-/src/fsharp/FSharp.Compiler.Private/lex.fs
-/src/fsharp/FSharp.Compiler.Private/pars.fs
-/src/fsharp/FSharp.Compiler.Private/pars.fsi
-/src/fsharp/FSharp.Compiler.Private/pplex.fs
-/src/fsharp/FSharp.Compiler.Private/pppars.fs
-/src/fsharp/FSharp.Compiler.Private/pppars.fsi
 /src/fsharp/Fsc-proto/illex.fs
 /src/fsharp/Fsc-proto/ilpars.fs
 /src/fsharp/Fsc-proto/ilpars.fsi
@@ -187,6 +178,7 @@ FSharp.Core.Nuget/*.nupkg
 tests/fsharpqa/Source/*FSharpQA_Failures.env
 tests/fsharpqa/Source/*FSharpQA_Failures.lst
 *.csproj.user
+*.fsproj.user
 *.sln.DotSettings.user
 *.ide
 *.log

README.md

@@ -51,6 +51,12 @@ All AppVeyor builds are available using the NuGet feed: https://ci.appveyor.com/
 
 If using Paket, add the source at the top of `paket.dependencies`.
 
+
+License
+-----------
+
+This project is subject to the MIT License. A copy of this license can be found in [License.txt](License.txt) at the root of this repo.
+
 Maintainers
 -----------
 

fcs/FSharp.Compiler.Service.Tests/App.config

@@ -7,6 +7,10 @@
         <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="2.0.0.0-4.4.0.0" newVersion="4.4.1.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-1.2.0.0" newVersion="1.2.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <startup>

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

@@ -100,7 +100,7 @@
 
   <ItemGroup>
     <Reference Include="System.Collections.Immutable">
-      <HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nunit.framework">

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -626,7 +626,7 @@
       <HintPath>$(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable">
-      <HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ValueTuple">
       <HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>

fcs/README.md

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

fcs/RELEASE_NOTES.md

@@ -1,4 +1,8 @@
-#### 14.0.2
+#### 15.0.1
+  * Integrate latest changes from visualfsharp
+  * Add implementation file contents to CheckFileResults
+
+#### 15.0.1
   * Fix non-public API in .NET Standard 1.6 version
 
 #### 14.0.1

fcs/docsrc/content/corelib.fsx

@@ -19,19 +19,25 @@ an FSharp.Core.optdata and FSharp.Core.sigdata, see below for guidance.
 Binding redirects for your application
 --------------------------------------
 
-The FSharp.Compiler.Service.dll component depends on FSharp.Core 4.3.0.0.  Normally your application will target
+The FSharp.Compiler.Service.dll component depends on FSharp.Core 4.4.0.0.  Normally your application will target
 a later version of FSharp.Core, and you will need a [binding redirect](http://msdn.microsoft.com/en-us/library/7wd6ex19(v=vs.110).aspx) to ensure
-that FSharp.Core 4.3.0.0 forwards to which the final version of FSharp.Core.dll your application uses.
+that other versions of FSharp.Core forward to the final version of FSharp.Core.dll your application uses.
 Binding redirect files are normally generated automatically by build tools. If not, you can use one like this
 (if your tool is called ``HostedCompiler.exe``, the binding redirect file is called ``HostedCompiler.exe.config``)
 
+Some other dependencies may also need to be reconciled and forwarded.
+
     <?xml version="1.0" encoding="utf-8" ?>
     <configuration>
         <runtime>
           <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
               <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-              <bindingRedirect oldVersion="2.0.0.0-4.3.0.0" newVersion="4.3.1.0"/>
+              <bindingRedirect oldVersion="2.0.0.0-4.4.0.0" newVersion="4.4.1.0"/>
+            </dependentAssembly>
+            <dependentAssembly>
+              <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+              <bindingRedirect oldVersion="1.0.0.0-1.2.0.0" newVersion="1.2.1.0" />
             </dependentAssembly>
           </assemblyBinding>
         </runtime>	

fcs/docsrc/content/fsharp-readme.md

@@ -6,7 +6,7 @@ source code ([github.com/fsharp/fsharp](https://github.com/fsharp/fsharp)). This
 source, with several minor changes that expose certain services. The readme is included
 here for reference.
 
-This is the F# compiler, core library and core tools (open source edition). It uses the Apache 2.0 license.
+This is the F# compiler, core library and core tools (open source edition).
 The `master` branch is for the latest version of F# (currently F# 3.0).
 To bootstrap the compiler, binaries built from an earlier version of this project are used.
 

fcs/docsrc/content/index.md

@@ -87,5 +87,4 @@ modified to expose additional internals useful for creating editors and F# tools
 embedding F# interactive.
 
 The F# source code is copyright by Microsoft Corporation and contributors, the extensions have been
-implemented by Dave Thomas, Anh-Dung Phan, Tomas Petricek and other contributors. The source code
-is available under the [Apache 2.0 license](https://github.com/fsharp/FSharp.Compiler.Service/blob/master/LICENSE).
+implemented by Dave Thomas, Anh-Dung Phan, Tomas Petricek and other contributors.