Update FCS to latest

.gitignore

@@ -7,6 +7,15 @@
 # (These aren't generally useful to commit directly; if anything, they should be applied.)
 scripts/*.patch
 
+/fcs/FSharp.Compiler.Service/illex.fs
+/fcs/FSharp.Compiler.Service/ilpars.fs
+/fcs/FSharp.Compiler.Service/ilpars.fsi
+/fcs/FSharp.Compiler.Service/lex.fs
+/fcs/FSharp.Compiler.Service/pars.fs
+/fcs/FSharp.Compiler.Service/pars.fsi
+/fcs/FSharp.Compiler.Service/pplex.fs
+/fcs/FSharp.Compiler.Service/pppars.fs
+/fcs/FSharp.Compiler.Service/pppars.fsi
 /src/*.userprefs
 /src/fsharp/FSStrings.resources
 /src/fsharp/FSharp.Build/*.resx
@@ -21,29 +30,29 @@ scripts/*.patch
 /src/fsharp/FSharp.Compiler.Server.Shared/*.resx
 /src/fsharp/fsi/Fsi.sln
 /src/fsharp/FSharp.Build/*.resources
-/src/fsharp/FSharp.Compiler/*.resx
-/src/fsharp/FSharp.Compiler/*.resources
-/src/fsharp/FSharp.Compiler/*.sln
-/src/fsharp/FSharp.Compiler/*.userprefs
+/src/fsharp/FSharp.Compiler.Private/*.resx
+/src/fsharp/FSharp.Compiler.Private/*.resources
+/src/fsharp/FSharp.Compiler.Private/*.sln
+/src/fsharp/FSharp.Compiler.Private/*.userprefs
 /src/*.log
-/src/fsharp/FSharp.Compiler/illex.fs
-/src/fsharp/FSharp.Compiler/ilpars.fs
-/src/fsharp/FSharp.Compiler/ilpars.fsi
-/src/fsharp/FSharp.Compiler/lex.fs
-/src/fsharp/FSharp.Compiler/pars.fs
-/src/fsharp/FSharp.Compiler/pars.fsi
-/src/fsharp/FSharp.Compiler/pplex.fs
-/src/fsharp/FSharp.Compiler/pppars.fs
-/src/fsharp/FSharp.Compiler/pppars.fsi
-/src/fsharp/FSharp.Compiler-proto/illex.fs
-/src/fsharp/FSharp.Compiler-proto/ilpars.fs
-/src/fsharp/FSharp.Compiler-proto/ilpars.fsi
-/src/fsharp/FSharp.Compiler-proto/lex.fs
-/src/fsharp/FSharp.Compiler-proto/pars.fs
-/src/fsharp/FSharp.Compiler-proto/pars.fsi
-/src/fsharp/FSharp.Compiler-proto/pplex.fs
-/src/fsharp/FSharp.Compiler-proto/pppars.fs
-/src/fsharp/FSharp.Compiler-proto/pppars.fsi
+/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
+/src/fsharp/Fsc-proto/lex.fs
+/src/fsharp/Fsc-proto/pars.fs
+/src/fsharp/Fsc-proto/pars.fsi
+/src/fsharp/Fsc-proto/pplex.fs
+/src/fsharp/Fsc-proto/pppars.fs
+/src/fsharp/Fsc-proto/pppars.fsi
 /src/fsharp/FSharp.LanguageService.Compiler/illex.*
 /src/fsharp/FSharp.LanguageService.Compiler/ilpars.*
 /src/fsharp/FSharp.LanguageService.Compiler/lex.*
@@ -65,6 +74,8 @@ scripts/*.patch
 /tests/fsharpqa/Source/*net40-fsharpqa-suite-failures.env
 /tests/fsharpqa/Source/*net40-fsharpqa-suite-failures.lst
 /tests/**/FSharp.Core.dll
+/tests/fsharp/optimize/stats/FSharpOptimizationInfo.FSharp.Core
+/tests/fsharp/optimize/stats/FSharpSignatureInfo.FSharp.Core
 lib/debug
 lib/release
 lib/proto

.nuget/NuGet.Config

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+
+  <solution>
+    <add key="disableSourceControlIntegration" value="true" />
+  </solution>
+  <packageSources>  
+    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
+    <clear />
+    <add key="artifacts" value="../artifacts" />
+    <add key="artifacts" value="../artifacts/4.2" />
+    <add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
+    <add key="myget.org roslyn-master-nightly" value="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json" />
+    <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
+    <add key="myget.org dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
+    <add key="myget.org roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
+    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="myget.org roslyn tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
+    <add key="myget.org roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
+  </packageSources>
+
+</configuration>

.nuget/NuGet.targets

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+
+        <!-- Enable the restore command to run before builds -->
+        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
+
+        <!-- Property that enables building a package from a project -->
+        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
+
+        <!-- Determines if package restore consent is required to restore packages -->
+        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
+
+        <!-- Download NuGet.exe if it does not already exist -->
+        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
+    </PropertyGroup>
+
+    <ItemGroup Condition=" '$(PackageSources)' == '' ">
+        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
+        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
+        <!--
+            <PackageSource Include="https://www.nuget.org/api/v2/" />
+            <PackageSource Include="https://my-nuget-source/nuget/" />
+        -->
+    </ItemGroup>
+
+    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
+        <!-- Windows specific commands -->
+        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
+        <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
+        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
+        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
+        <PackagesConfig>packages.config</PackagesConfig>
+        <MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
+        <MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <!-- NuGet command -->
+        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
+        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
+
+        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
+        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
+
+        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+
+        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
+        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
+
+        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
+        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
+
+        <!-- Commands -->
+        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
+        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
+
+        <!-- We need to ensure packages are restored prior to assembly resolve -->
+        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
+            RestorePackages;
+            $(BuildDependsOn);
+        </BuildDependsOn>
+
+        <!-- Make the build depend on restore packages -->
+        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
+            $(BuildDependsOn);
+            BuildPackage;
+        </BuildDependsOn>
+    </PropertyGroup>
+
+    <Target Name="CheckPrerequisites">
+        <!-- Raise an error if we're unable to locate nuget.exe  -->
+        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
+        <!--
+        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
+        This effectively acts as a lock that makes sure that the download operation will only happen once and all
+        parallel builds will have to wait for it to complete.
+        -->
+        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
+    </Target>
+
+    <Target Name="_DownloadNuGet">
+        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
+    </Target>
+
+    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
+        <Exec Command="$(RestoreCommand)"
+              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
+
+        <Exec Command="$(RestoreCommand)"
+              LogStandardErrorAsError="true"
+              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
+    </Target>
+
+    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
+        <Exec Command="$(BuildCommand)" 
+              Condition=" '$(OS)' != 'Windows_NT' " />
+
+        <Exec Command="$(BuildCommand)"
+              LogStandardErrorAsError="true"
+              Condition=" '$(OS)' == 'Windows_NT' " />
+    </Target>
+
+    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+        <ParameterGroup>
+            <OutputFilename ParameterType="System.String" Required="true" />
+        </ParameterGroup>
+        <Task>
+            <Reference Include="System.Core" />
+            <Using Namespace="System" />
+            <Using Namespace="System.IO" />
+            <Using Namespace="System.Net" />
+            <Using Namespace="Microsoft.Build.Framework" />
+            <Using Namespace="Microsoft.Build.Utilities" />
+            <Code Type="Fragment" Language="cs">
+                <![CDATA[
+                try {
+                    OutputFilename = Path.GetFullPath(OutputFilename);
+
+                    Log.LogMessage("Downloading latest version of NuGet.exe...");
+                    WebClient webClient = new WebClient();
+                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
+
+                    return true;
+                }
+                catch (Exception ex) {
+                    Log.LogErrorFromException(ex);
+                    return false;
+                }
+            ]]>
+            </Code>
+        </Task>
+    </UsingTask>
+</Project>

.travis.yml

@@ -16,7 +16,7 @@ sudo: false
 install:
 
 script: 
-  - ./build.sh NuGet
+  - ./fcs/build.sh NuGet
 
 # Fails on Travis OSX too often because there are network outages on that configuration getting the Mono MDK