Merge pull request #742 from dsyme/i4.1.5

Integrate fsharp master
fsharp · Mar 29, 2017 · 0892b3c · 0892b3c
2 parents 1e32402 + f397491
commit 0892b3c
Show file tree

Hide file tree

Showing 129 changed files with 4,387 additions and 2,921 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,12 @@
+# Downloaded packages and build tools.
+/lkg
 /packages
 /Tools
+
+# Patches that may have been generated by scripts.
+# (These aren't generally useful to commit directly; if anything, they should be applied.)
+scripts/*.patch
+
 /src/*.userprefs
 /src/fsharp/FSStrings.resources
 /src/fsharp/FSharp.Build/*.resx

diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
@@ -0,0 +1,42 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!-- Mark that this target file has been loaded.  -->
+    <IsPaketRestoreTargetsFileLoaded>true</IsPaketRestoreTargetsFileLoaded>
+    <PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
+    <MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
+    <MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath> 
+    <!-- Paket command -->
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe')">$(PaketRootPath)paket.exe</PaketExePath>
+    <PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
+    <PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
+    <PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
+  </PropertyGroup>    
+
+  <Target Name="PaketRestore" BeforeTargets="_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" >
+
+      <Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)" ' />
+
+      <PropertyGroup>
+        <PaketReferencesFilePath>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).references</PaketReferencesFilePath>
+      </PropertyGroup>
+
+      <ReadLinesFromFile File="$(PaketReferencesFilePath)" >
+        <Output TaskParameter="Lines" ItemName="PaketReferencesFileLines"/>
+      </ReadLinesFromFile>
+
+      <ItemGroup Condition=" '@(PaketReferencesFileLines)' != '' " >
+        <PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" >
+          <PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
+          <PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
+        </PaketReferencesFileLinesInfo>
+        <PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
+          <Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
+        </PackageReference>
+      </ItemGroup>
+
+      <PropertyGroup>
+        <RestoreConfigFile>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).NuGet.Config</RestoreConfigFile>
+      </PropertyGroup>
+
+   </Target>
+</Project>
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -30,7 +30,7 @@ Provide any related information
 * Branch
 * .NET Runtime, CoreCLR or Mono Version
 * Editing Tools (e.g. Visual Studio Version)
-* Links to F# RFCs or entries on http://fslang.uservoice.com
+* Links to F# RFCs or entries on https://github.com/fsharp/fslang-suggestions
 * Links to performance testing scripts
 * Indications of severity
 

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 12.0.1
+  * [Integrate visualfsharp and fsharp](https://github.com/fsharp/fsharp/pull/696)
+
 #### 11.0.10
   * [Fix F# Interactive on Mono 4.0.9+](https://github.com/fsharp/fsharp/pull/696)
 

diff --git a/nuget/FSharp.Compiler.Service.template b/nuget/FSharp.Compiler.Service.template
@@ -21,5 +21,6 @@ files
     ../bin/v4.5/FSharp.Compiler.Service.dll.?db ==> lib/net45
     ../bin/v4.5/FSharp.Compiler.Service.MSBuild.v12.dll ==> lib/net45
 dependencies
+	System.ValueTuple >= LOCKEDVERSION
 	System.Collections.Immutable >= LOCKEDVERSION
 	System.Reflection.Metadata >= LOCKEDVERSION
diff --git a/paket.dependencies b/paket.dependencies
@@ -14,11 +14,12 @@ nuget FSharp.Formatting
 nuget SourceLink.Fake
 nuget FsLexYacc
 nuget FSharp.Core 4.0.0.1
-nuget FSharp.Compiler.Tools 4.0.1.21
+nuget FSharp.Compiler.Tools 4.1.5
+nuget System.ValueTuple 4.3.0
 
-nuget System.Collections.Immutable 1.2.0
-nuget System.Reflection.Metadata 1.4.1-beta-24227-04
-nuget Microsoft.DiaSymReader.PortablePdb 1.1.0
-nuget Microsoft.DiaSymReader 1.0.8
+nuget System.Collections.Immutable 1.3.1
+nuget System.Reflection.Metadata 1.4.2
+nuget Microsoft.DiaSymReader.PortablePdb 1.2.0
+nuget Microsoft.DiaSymReader 1.1.0
 
 github fsharp/FAKE modules/Octokit/Octokit.fsx
diff --git a/paket.lock b/paket.lock
@@ -1,9 +1,9 @@
 FRAMEWORK: NET45, NETSTANDARD16, NETCORE10
 NUGET
   remote: https://www.nuget.org/api/v2
-    FAKE (4.50.1)
+    FAKE (4.57.4)
     FSharp.Compiler.Service (2.0.0.6)
-    FSharp.Compiler.Tools (4.0.1.21)
+    FSharp.Compiler.Tools (4.1.5)
     FSharp.Core (4.0.0.1)
     FSharp.Formatting (2.14.4)
       FSharp.Compiler.Service (2.0.0.6)
@@ -14,54 +14,65 @@ NUGET
       FsLexYacc.Runtime (>= 7.0.5 < 7.1)
     FsLexYacc.Runtime (7.0.5)
       FSharp.Core (>= 3.1.2.5)
-    Microsoft.DiaSymReader (1.0.8)
+    Microsoft.DiaSymReader (1.1)
       System.Diagnostics.Debug (>= 4.0.11) - framework: net45, netstandard16
       System.Runtime (>= 4.1) - framework: net45, netstandard16
       System.Runtime.InteropServices (>= 4.1) - framework: net45, netstandard16
-    Microsoft.DiaSymReader.PortablePdb (1.1)
-      Microsoft.DiaSymReader (>= 1.0.8) - framework: net45, netstandard16
-      System.Collections (>= 4.0.11) - framework: net45, netstandard16
-      System.Collections.Immutable (>= 1.2) - framework: net45, netstandard16
-      System.Diagnostics.Debug (>= 4.0.11) - framework: net45, netstandard16
-      System.Globalization (>= 4.0) - framework: net45, netstandard16
-      System.IO (>= 4.1) - framework: net45, netstandard16
-      System.Linq (>= 4.1) - framework: net45, netstandard16
-      System.Reflection (>= 4.1) - framework: net45, netstandard16
-      System.Reflection.Metadata (>= 1.3) - framework: net45, netstandard16
-      System.Reflection.Primitives (>= 4.0.1) - framework: net45, netstandard16
-      System.Runtime (>= 4.1) - framework: net45, netstandard16
-      System.Runtime.Extensions (>= 4.1) - framework: net45, netstandard16
-      System.Runtime.InteropServices (>= 4.1) - framework: net45, netstandard16
-      System.Text.Encoding (>= 4.0.11) - framework: net45, netstandard16
-      System.Threading (>= 4.0.11) - framework: net45, netstandard16
-      System.Xml.XDocument (>= 4.0.11) - framework: net45, netstandard16
+    Microsoft.DiaSymReader.PortablePdb (1.2)
+      Microsoft.DiaSymReader (>= 1.1) - framework: net45, netstandard16
+      System.Collections (>= 4.3) - framework: net45, netstandard16
+      System.Collections.Immutable (>= 1.3.1) - framework: net45, netstandard16
+      System.Diagnostics.Debug (>= 4.3) - framework: net45, netstandard16
+      System.Globalization (>= 4.3) - framework: net45, netstandard16
+      System.IO (>= 4.3) - framework: net45, netstandard16
+      System.Linq (>= 4.3) - framework: net45, netstandard16
+      System.Reflection (>= 4.3) - framework: net45, netstandard16
+      System.Reflection.Metadata (>= 1.4.2) - framework: net45, netstandard16
+      System.Reflection.Primitives (>= 4.3) - framework: net45, netstandard16
+      System.Runtime (>= 4.3) - framework: net45, netstandard16
+      System.Runtime.Extensions (>= 4.3) - framework: net45, netstandard16
+      System.Runtime.InteropServices (>= 4.3) - framework: net45, netstandard16
+      System.Text.Encoding (>= 4.3) - framework: net45, netstandard16
+      System.Threading (>= 4.3) - framework: net45, netstandard16
     Microsoft.NETCore.Platforms (1.1)
     Microsoft.NETCore.Targets (1.1)
     NUnit (2.6.3)
     NUnit.Runners (2.6.3)
     Octokit (0.24)
+    runtime.native.System (4.3) - framework: net45, netstandard16
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+    runtime.native.System.IO.Compression (4.3) - framework: net45, netstandard16
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
     SourceLink.Fake (1.1)
     SQLite.Net-PCL (3.0.5)
     SQLite.Net.Platform.Generic (2.4.1)
       SQLite.Net-PCL
+    System.Buffers (4.3) - framework: net45, netstandard16
+      System.Diagnostics.Debug (>= 4.3) - framework: netstandard16
+      System.Diagnostics.Tracing (>= 4.3) - framework: netstandard16
+      System.Resources.ResourceManager (>= 4.3) - framework: netstandard16
+      System.Runtime (>= 4.3) - framework: netstandard16
+      System.Threading (>= 4.3) - framework: netstandard16
     System.Collections (4.3)
       Microsoft.NETCore.Platforms (>= 1.1) - framework: netstandard16
       Microsoft.NETCore.Targets (>= 1.1) - framework: netstandard16
       System.Runtime (>= 4.3) - framework: netstandard16
-    System.Collections.Immutable (1.2)
-      System.Collections (>= 4.0.11) - framework: netstandard16
-      System.Diagnostics.Debug (>= 4.0.11) - framework: netstandard16
-      System.Globalization (>= 4.0.11) - framework: netstandard16
-      System.Linq (>= 4.1) - framework: netstandard16
-      System.Resources.ResourceManager (>= 4.0.1) - framework: netstandard16
-      System.Runtime (>= 4.1) - framework: netstandard16
-      System.Runtime.Extensions (>= 4.1) - framework: netstandard16
-      System.Threading (>= 4.0.11) - framework: netstandard16
+    System.Collections.Immutable (1.3.1)
+      System.Collections (>= 4.3) - framework: netstandard16
+      System.Diagnostics.Debug (>= 4.3) - framework: netstandard16
+      System.Globalization (>= 4.3) - framework: netstandard16
+      System.Linq (>= 4.3) - framework: netstandard16
+      System.Resources.ResourceManager (>= 4.3) - framework: netstandard16
+      System.Runtime (>= 4.3) - framework: netstandard16
+      System.Runtime.Extensions (>= 4.3) - framework: netstandard16
+      System.Threading (>= 4.3) - framework: netstandard16
     System.Diagnostics.Debug (4.3)
       Microsoft.NETCore.Platforms (>= 1.1) - framework: netstandard16
       Microsoft.NETCore.Targets (>= 1.1) - framework: netstandard16
       System.Runtime (>= 4.3) - framework: netstandard16
-    System.Diagnostics.Tools (4.3) - framework: net45, netstandard16
+    System.Diagnostics.Tracing (4.3) - framework: net45, netstandard16
       Microsoft.NETCore.Platforms (>= 1.1) - framework: netstandard16
       Microsoft.NETCore.Targets (>= 1.1) - framework: netstandard16
       System.Runtime (>= 4.3) - framework: netstandard16
@@ -75,17 +86,22 @@ NUGET
       System.Runtime (>= 4.3) - framework: netstandard16
       System.Text.Encoding (>= 4.3) - framework: netstandard16
       System.Threading.Tasks (>= 4.3) - framework: netstandard16
-    System.IO.FileSystem (4.3) - framework: net45, netstandard16
+    System.IO.Compression (4.3) - framework: net45, netstandard16
       Microsoft.NETCore.Platforms (>= 1.1) - framework: netstandard16
-      Microsoft.NETCore.Targets (>= 1.1) - framework: netstandard16
+      runtime.native.System (>= 4.3) - framework: netstandard16
+      runtime.native.System.IO.Compression (>= 4.3) - framework: netstandard16
+      System.Buffers (>= 4.3) - framework: netstandard16
+      System.Collections (>= 4.3) - framework: netstandard16
+      System.Diagnostics.Debug (>= 4.3) - framework: netstandard16
       System.IO (>= 4.3) - framework: netstandard16
-      System.IO.FileSystem.Primitives (>= 4.3) - framework: net45, >= net46, netstandard16
+      System.Resources.ResourceManager (>= 4.3) - framework: netstandard16
       System.Runtime (>= 4.3) - framework: netstandard16
+      System.Runtime.Extensions (>= 4.3) - framework: netstandard16
       System.Runtime.Handles (>= 4.3) - framework: netstandard16
+      System.Runtime.InteropServices (>= 4.3) - framework: netstandard16
       System.Text.Encoding (>= 4.3) - framework: netstandard16
+      System.Threading (>= 4.3) - framework: netstandard16
       System.Threading.Tasks (>= 4.3) - framework: netstandard16
-    System.IO.FileSystem.Primitives (4.3)
-      System.Runtime (>= 4.3) - framework: netstandard16
     System.Linq (4.3)
       System.Collections (>= 4.3) - framework: netstandard16
       System.Diagnostics.Debug (>= 4.3) - framework: netstandard16
@@ -103,22 +119,23 @@ NUGET
       Microsoft.NETCore.Targets (>= 1.1) - framework: netstandard16
       System.Reflection (>= 4.3) - framework: netstandard16
       System.Runtime (>= 4.3) - framework: netstandard16
-    System.Reflection.Metadata (1.4.1-beta-24227-04)
-      System.Collections (>= 4.0.11) - framework: netstandard16
-      System.Collections.Immutable (>= 1.2) - framework: net45, netstandard16
-      System.Diagnostics.Debug (>= 4.0.11) - framework: netstandard16
-      System.IO (>= 4.1) - framework: netstandard16
-      System.Linq (>= 4.1) - framework: netstandard16
-      System.Reflection (>= 4.1) - framework: netstandard16
-      System.Reflection.Extensions (>= 4.0.1) - framework: netstandard16
-      System.Reflection.Primitives (>= 4.0.1) - framework: netstandard16
-      System.Resources.ResourceManager (>= 4.0.1) - framework: netstandard16
-      System.Runtime (>= 4.1) - framework: netstandard16
-      System.Runtime.Extensions (>= 4.1) - framework: netstandard16
-      System.Runtime.InteropServices (>= 4.1) - framework: netstandard16
-      System.Text.Encoding (>= 4.0.11) - framework: netstandard16
-      System.Text.Encoding.Extensions (>= 4.0.11) - framework: netstandard16
-      System.Threading (>= 4.0.11) - framework: netstandard16
+    System.Reflection.Metadata (1.4.2)
+      System.Collections (>= 4.3) - framework: netstandard16
+      System.Collections.Immutable (>= 1.3.1) - framework: net45, netstandard16
+      System.Diagnostics.Debug (>= 4.3) - framework: netstandard16
+      System.IO (>= 4.3) - framework: netstandard16
+      System.IO.Compression (>= 4.3) - framework: netstandard16
+      System.Linq (>= 4.3) - framework: netstandard16
+      System.Reflection (>= 4.3) - framework: netstandard16
+      System.Reflection.Extensions (>= 4.3) - framework: netstandard16
+      System.Reflection.Primitives (>= 4.3) - framework: netstandard16
+      System.Resources.ResourceManager (>= 4.3) - framework: netstandard16
+      System.Runtime (>= 4.3) - framework: netstandard16
+      System.Runtime.Extensions (>= 4.3) - framework: netstandard16
+      System.Runtime.InteropServices (>= 4.3) - framework: netstandard16
+      System.Text.Encoding (>= 4.3) - framework: netstandard16
+      System.Text.Encoding.Extensions (>= 4.3) - framework: netstandard16
+      System.Threading (>= 4.3) - framework: netstandard16
     System.Reflection.Primitives (4.3)
       Microsoft.NETCore.Platforms (>= 1.1) - framework: netstandard16
       Microsoft.NETCore.Targets (>= 1.1) - framework: netstandard16
@@ -136,7 +153,7 @@ NUGET
       Microsoft.NETCore.Platforms (>= 1.1) - framework: netstandard16
       Microsoft.NETCore.Targets (>= 1.1) - framework: netstandard16
       System.Runtime (>= 4.3) - framework: netstandard16
-    System.Runtime.Handles (4.3) - framework: net45, netstandard16
+    System.Runtime.Handles (4.3)
       Microsoft.NETCore.Platforms (>= 1.1) - framework: netstandard16
       Microsoft.NETCore.Targets (>= 1.1) - framework: netstandard16
       System.Runtime (>= 4.3) - framework: netstandard16
@@ -151,59 +168,23 @@ NUGET
       Microsoft.NETCore.Platforms (>= 1.1) - framework: netstandard16
       Microsoft.NETCore.Targets (>= 1.1) - framework: netstandard16
       System.Runtime (>= 4.3) - framework: netstandard16
-    System.Text.Encoding.Extensions (4.3)
+    System.Text.Encoding.Extensions (4.3) - framework: net45, netstandard16
       Microsoft.NETCore.Platforms (>= 1.1) - framework: netstandard16
       Microsoft.NETCore.Targets (>= 1.1) - framework: netstandard16
       System.Runtime (>= 4.3) - framework: netstandard16
       System.Text.Encoding (>= 4.3) - framework: netstandard16
-    System.Text.RegularExpressions (4.3) - framework: net45, netstandard16
-      System.Collections (>= 4.3) - framework: netstandard16
-      System.Globalization (>= 4.3) - framework: netstandard16
-      System.Resources.ResourceManager (>= 4.3) - framework: netstandard16
-      System.Runtime (>= 4.3) - framework: netstandard16
-      System.Runtime.Extensions (>= 4.3) - framework: netstandard16
-      System.Threading (>= 4.3) - framework: netstandard16
     System.Threading (4.3)
       System.Runtime (>= 4.3) - framework: netstandard16
       System.Threading.Tasks (>= 4.3) - framework: netstandard16
     System.Threading.Tasks (4.3)
       Microsoft.NETCore.Platforms (>= 1.1) - framework: netstandard16
       Microsoft.NETCore.Targets (>= 1.1) - framework: netstandard16
       System.Runtime (>= 4.3) - framework: netstandard16
-    System.Threading.Tasks.Extensions (4.3) - framework: net45, netstandard16
-      System.Collections (>= 4.3) - framework: netstandard16
-      System.Runtime (>= 4.3) - framework: netstandard16
-      System.Threading.Tasks (>= 4.3) - framework: netstandard16
-    System.Xml.ReaderWriter (4.3) - framework: net45, netstandard16
-      System.Collections (>= 4.3) - framework: netstandard16
-      System.Diagnostics.Debug (>= 4.3) - framework: netstandard16
-      System.Globalization (>= 4.3) - framework: netstandard16
-      System.IO (>= 4.3) - framework: netstandard16
-      System.IO.FileSystem (>= 4.3) - framework: netstandard16
-      System.IO.FileSystem.Primitives (>= 4.3) - framework: netstandard16
-      System.Resources.ResourceManager (>= 4.3) - framework: netstandard16
-      System.Runtime (>= 4.3) - framework: netstandard16
-      System.Runtime.Extensions (>= 4.3) - framework: netstandard16
-      System.Runtime.InteropServices (>= 4.3) - framework: netstandard16
-      System.Text.Encoding (>= 4.3) - framework: netstandard16
-      System.Text.Encoding.Extensions (>= 4.3) - framework: netstandard16
-      System.Text.RegularExpressions (>= 4.3) - framework: netstandard16
-      System.Threading.Tasks (>= 4.3) - framework: netstandard16
-      System.Threading.Tasks.Extensions (>= 4.3) - framework: netstandard16
-    System.Xml.XDocument (4.3) - framework: net45, netstandard16
+    System.ValueTuple (4.3)
       System.Collections (>= 4.3) - framework: netstandard16
-      System.Diagnostics.Debug (>= 4.3) - framework: netstandard16
-      System.Diagnostics.Tools (>= 4.3) - framework: netstandard16
-      System.Globalization (>= 4.3) - framework: netstandard16
-      System.IO (>= 4.3) - framework: netstandard16
-      System.Reflection (>= 4.3) - framework: netstandard16
       System.Resources.ResourceManager (>= 4.3) - framework: netstandard16
       System.Runtime (>= 4.3) - framework: netstandard16
-      System.Runtime.Extensions (>= 4.3) - framework: netstandard16
-      System.Text.Encoding (>= 4.3) - framework: netstandard16
-      System.Threading (>= 4.3) - framework: netstandard16
-      System.Xml.ReaderWriter (>= 4.3) - framework: netstandard16
 GITHUB
   remote: fsharp/FAKE
-    modules/Octokit/Octokit.fsx (199528dc8aac0ca31094283c8834b136aa52e395)
+    modules/Octokit/Octokit.fsx (8a0082b3cea5849e1ba1fbdb014f4197aa62d09a)
       Octokit (>= 0.20)
diff --git a/prepare-mono.sh b/prepare-mono.sh
@@ -54,10 +54,10 @@ fi)
 fi)
 
 #TODO: work out how to avoid the need for this
-echo "chmod u+x packages/FSharp.Compiler.Tools.4.0.1.21/tools/fsi.exe"
+echo "chmod u+x packages/FSharp.Compiler.Tools.4.1.5/tools/fsi.exe"
 echo "chmod u+x packages/FsLexYacc.7.0.4/build/fslex.exe"
 echo "chmod u+x packages/FsLexYacc.7.0.4/build/fsyacc.exe"
-chmod u+x packages/FSharp.Compiler.Tools.4.0.1.21/tools/fsi.exe 
+chmod u+x packages/FSharp.Compiler.Tools.4.1.5/tools/fsi.exe 
 chmod u+x packages/FsLexYacc.7.0.4/build/fslex.exe
 chmod u+x packages/FsLexYacc.7.0.4/build/fsyacc.exe