integrate visualfsharp master

NuGet.Config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
 
   <solution>
@@ -10,4 +10,4 @@
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 
-</configuration>
+</configuration>

PublishToBlob.proj

@@ -10,7 +10,7 @@
   <PropertyGroup>
     <FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
     <!-- This version should be kept in sync with `packages.config` -->
-    <FeedTasksPackageVersion>1.0.0-prerelease-02219-01</FeedTasksPackageVersion>
+    <FeedTasksPackageVersion>2.1.0-prerelease-02419-02</FeedTasksPackageVersion>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)packages\$(FeedTasksPackage).$(FeedTasksPackageVersion)\build\$(FeedTasksPackage).targets" />

fcs/.gitignore

@@ -0,0 +1,10 @@
+FSharp.Compiler.Service.netstandard/illex.fs
+FSharp.Compiler.Service.netstandard/ilpars.fs
+FSharp.Compiler.Service.netstandard/ilpars.fsi
+FSharp.Compiler.Service.netstandard/lex.fs
+FSharp.Compiler.Service.netstandard/pars.fs
+FSharp.Compiler.Service.netstandard/pars.fsi
+FSharp.Compiler.Service.netstandard/pplex.fs
+FSharp.Compiler.Service.netstandard/pppars.fs
+FSharp.Compiler.Service.netstandard/pppars.fsi
+

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

@@ -651,7 +651,7 @@
     <Reference Include="System.IO, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <Reference Include="System.ValueTuple">
-      <HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+      <HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(FSharpSourcesRoot)\scripts\fssrgen.targets" Condition="'$(TargetFramework)' != ''" />

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\fcs\FSharp.Compiler.Service.21.0.1.nupkg %APIKEY% -Source https://nuget.org 
-    .nuget\nuget.exe push release\fcs\FSharp.Compiler.Service.MSBuild.v12.21.0.1.nupkg %APIKEY%  -Source https://nuget.org
-    .nuget\nuget.exe push release\fcs\FSharp.Compiler.Service.ProjectCracker.21.0.1.nupkg %APIKEY%  -Source https://nuget.org
+    .nuget\nuget.exe push release\fcs\FSharp.Compiler.Service.22.0.1.nupkg %APIKEY% -Source https://nuget.org 
+    .nuget\nuget.exe push release\fcs\FSharp.Compiler.Service.MSBuild.v12.22.0.1.nupkg %APIKEY%  -Source https://nuget.org
+    .nuget\nuget.exe push release\fcs\FSharp.Compiler.Service.ProjectCracker.22.0.1.nupkg %APIKEY%  -Source https://nuget.org
 
 
 ### Use of Paket and FAKE

fcs/RELEASE_NOTES.md

@@ -1,3 +1,7 @@
+#### 22.0.1
+  * Integrate visualfsharp master
+  * Includes recent memory usage reduction work for ByteFile and ILAttributes
+
 #### 21.0.1
   * Use new .NET SDK project files
   * FSharp.Compiler.Service nuget now uses net45 and netstandard2.0

fcs/build.fsx

@@ -20,7 +20,8 @@ let isMono = true
 let isMono = false
 #endif
 
-let dotnetExePath = DotNetCli.InstallDotNetSDK "2.1.4"
+
+let dotnetExePath = DotNetCli.InstallDotNetSDK "2.1.102"
 
 let runDotnet workingDir args =
     let result =

fcs/fcs.props

@@ -3,7 +3,7 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
 
-    <VersionPrefix>21.0.1</VersionPrefix>
+    <VersionPrefix>22.0.1</VersionPrefix>
     <!-- FSharp.Compiler.Tools is currently 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 -->
     <FsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools</FsiToolPath>

packages.config

@@ -13,6 +13,7 @@
   <package id="Microsoft.DiaSymReader.PortablePdb" version="1.2.0"  />
   <package id="Microsoft.DiaSymReader" version="1.1.0" />
   <package id="System.ValueTuple" version="4.3.1" />
+  <package id="System.ValueTuple" version="4.4.0" />
   <package id="Microsoft.VisualFSharp.Msbuild.15.0" version="1.0.1" />
   <package id="Microsoft.Build" version="14.3.0" />
   <package id="Microsoft.Build.Framework" version="14.3.0" />
@@ -27,13 +28,13 @@
   <package id="NUnit3TestAdapter" version="3.0.8-ctp-8" targetFramework="net45" />
   <package id="BenchmarkDotNet" version="0.9.8"/>
   <package id="BenchmarkDotNet.Diagnostics.Windows" version="0.9.8"/>
-  <package id="Newtonsoft.Json" version="8.0.1"/>
+  <package id="Newtonsoft.Json" version="9.0.1"/>
   <!-- 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"/>
 
   <!-- Frozen portable library versions of FSharp.Core.dll (simply a renamed fsharp.core.4.1.18-->
-  <package id="Microsoft.Portable.FSharp.Core" version="4.1.20"/>
+  <package id="Microsoft.Portable.FSharp.Core" version="10.1.0"/>
 
   <!-- FSharp.Core is used to get back versions of FSharp.Core -->
   <package id="FSharp.Core" version="4.1.17"/>