Merge pull request #582 from dsyme/integrate-80

Integrate all the latest from visualfsharp\master
fsharp · Jun 28, 2016 · d518f91 · d518f91
2 parents 35d22f8 + 92360da
commit d518f91
Show file tree

Hide file tree

Showing 172 changed files with 15,555 additions and 11,106 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,62 @@
+/packages
+/Tools
+/src/*.userprefs
+/src/fsharp/FSStrings.resources
+/src/fsharp/FSharp.Build/*.resx
+/src/fsharp/FSharp.Build-proto/*.resx
+/src/fsharp/FSharp.Build-proto/*.resources
+/src/fsharp/FSharp.Compiler-proto/*.resx
+/src/fsharp/FSharp.Compiler-proto/*.resources
+/src/fsharp/FSharp.Compiler-proto/*.sln
+/src/fsharp/FSharp.Compiler-proto/*.userprefs
+/src/fsharp/fsi/*.resx
+/src/fsharp/FSharp.Compiler.Interactive.Settings/*.resx
+/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/*.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.LanguageService.Compiler/illex.*
+/src/fsharp/FSharp.LanguageService.Compiler/ilpars.*
+/src/fsharp/FSharp.LanguageService.Compiler/lex.*
+/src/fsharp/FSharp.LanguageService.Compiler/pars.*
+/src/fsharp/FSharp.LanguageService.Compiler/pplex.fs
+/src/fsharp/FSharp.LanguageService.Compiler/pppars.fs
+/src/fsharp/FSharp.LanguageService.Compiler/pppars.fsi
+/vsintegration/src/unittests/Unittests.fsi
+/tests/*FSharp_Failures.env
+/tests/*FSharp_Failures.lst
+/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
+/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb
+/tests/XFSharpQA_Failures.log.*
+/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
+/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ctofiles/
+/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
+/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll
+/tests/fsharpqa/Source/*FSharpQA_Failures.env
+/tests/fsharpqa/Source/*FSharpQA_Failures.lst
+/tests/**/FSharp.Core.dll
 lib/debug
 lib/release
 lib/proto
@@ -60,8 +119,6 @@ src/fsharp/FSharp.Compiler-proto/pplex.fs
 src/fsharp/FSharp.Compiler-proto/pppars.fs
 src/fsharp/FSharp.Compiler-proto/pppars.fsi
 *~
-tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.sln
-tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.userprefs
 *.suo
 obj
 src/fsharp/FSharp.Data.TypeProviders/FSData.resx
@@ -145,6 +202,7 @@ FSharp.Core.Nuget/*.nupkg
 *.mdf
 *.ldf
 *.cto
-tests/**/FSharp.Core.dll
+*.vstman
 project.lock.json
 Tools/
+Backup/
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt
@@ -1 +1 @@
-1.0.25-prerelease-00404-01
+1.0.25-prerelease-00517-05
diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt
@@ -1 +1 @@
-1.0.0-rc2-002665
+1.0.0-preview2-003121
diff --git a/build-everything.proj b/build-everything.proj
@@ -1,49 +1,54 @@
 <!-- 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. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
 
-  <ItemGroup Condition="'$(BUILD_NET40)'=='1'">
+  <ItemGroup Condition="'$(BUILD_NET40)'=='1' or '$(BUILD_ALL)'=='1'">
     <ProjectsWithDefaultFramework Include="src/fsharp-library-build.proj" />
     <ProjectsWithDefaultFramework Include="src/fsharp-compiler-build.proj" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectsWithDefaultFramework Include="src/fsharp-library-unittests-build.proj"  Condition="'$(TEST_NET40_COREUNIT)'=='1'" />
-    <ProjectsWithDefaultFramework Include="src/fsharp-compiler-unittests-build.proj" Condition="'$(TEST_COMPILERUNIT)'=='1'" />
-    <ProjectsWithDefaultFramework Include="tests/fsharp/FSharp.Tests.fsproj"         Condition="'$(TEST_FSHARP_SUITE)'=='1'" />
+    <ProjectsWithDefaultFramework Include="src/fsharp-library-unittests-build.proj"  Condition="'$(TEST_NET40_COREUNIT)'=='1' or '$(BUILD_ALL)'=='1'" />
+    <ProjectsWithDefaultFramework Include="src/fsharp-compiler-unittests-build.proj" Condition="'$(TEST_COMPILERUNIT)'=='1' or '$(BUILD_ALL)'=='1'" />
+    <ProjectsWithDefaultFramework Include="tests/fsharp/FSharp.Tests.fsproj"         Condition="'$(TEST_FSHARP_SUITE)'=='1' or '$(BUILD_ALL)'=='1'" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectsWithPortableFramework Include="src/fsharp-library-build.proj"           Condition="'$(BUILD_PORTABLE)'=='1'"/>
-    <ProjectsWithPortableFramework Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_PORTABLE_COREUNIT)'=='1'" />
+    <ProjectsWithPortableFramework Include="src/fsharp-library-build.proj"           Condition="'$(BUILD_PORTABLE)'=='1' or '$(BUILD_ALL)'=='1'"/>
+    <ProjectsWithPortableFramework Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_PORTABLE_COREUNIT)'=='1' or '$(BUILD_ALL)'=='1'" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(BUILD_VS)'=='1'">
+  <ItemGroup Condition="'$(BUILD_VS)'=='1' or '$(BUILD_ALL)'=='1'">
     <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-src-build.proj" />
     <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-project-templates-build.proj" />
     <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-item-templates-build.proj" />
-    <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-deployment-build.proj" />
+    <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-vsix-build.proj" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-unittests-build.proj" Condition="'$(TEST_VS)'=='1'" />
+    <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-unittests-build.proj" Condition="'$(TEST_VS)'=='1' or '$(BUILD_ALL)'=='1'" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(BUILD_CORECLR)'=='1'">
+  <ItemGroup Condition="'$(BUILD_CORECLR)'=='1' or '$(BUILD_ALL)'=='1'">
     <ProjectsWithCoreClr Include="src/fsharp-library-build.proj" />
     <ProjectsWithCoreClr Include="src/fsharp-compiler-build.proj" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectsWithCoreClr Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_CORECLR)'=='1'" />
+    <ProjectsWithCoreClr Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_CORECLR)'=='1' or '$(BUILD_ALL)'=='1'" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(BUILD_SETUP)'=='1' or '$(BUILD_ALL)'=='1'">
+    <SetupProjects Include="setup/fsharp-setup-build.proj" />
+  </ItemGroup>
+
   <Target Name="Build">
     <MSBuild Projects="@(ProjectsWithDefaultFramework)"  Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration)" />
     <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable7" />
     <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable47" />
     <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable78" />
     <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable259" />
     <MSBuild Projects="@(ProjectsWithCoreClr)"           Targets="Build" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr" />
+    <MSBuild Projects="@(SetupProjects)"                 Targets="Build" BuildInParallel="false"  Properties="Configuration=$(Configuration)" />
   </Target>
 
   <Target Name="Rebuild">
@@ -53,6 +58,7 @@
     <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable78" />
     <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable259" />
     <MSBuild Projects="@(ProjectsWithCoreClr)"           Targets="Rebuild" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr" />
+    <MSBuild Projects="@(SetupProjects)"                 Targets="Rebuild" BuildInParallel="false"  Properties="Configuration=$(Configuration)" />
   </Target>
 
   <Target Name="Clean">
@@ -62,5 +68,6 @@
     <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable78" />
     <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable259" />
     <MSBuild Projects="@(ProjectsWithCoreClr)"           Targets="Clean" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr" />
+    <MSBuild Projects="@(SetupProjects)"                 Targets="Clean" BuildInParallel="false"  Properties="Configuration=$(Configuration)" />
   </Target>
 </Project>
diff --git a/init-tools.cmd b/init-tools.cmd
@@ -7,11 +7,11 @@ if [%TOOLRUNTIME_DIR%]==[] set TOOLRUNTIME_DIR=%~dp0Tools
 set DOTNET_PATH=%TOOLRUNTIME_DIR%\dotnetcli\
 if [%DOTNET_CMD%]==[] set DOTNET_CMD=%DOTNET_PATH%dotnet.exe
 if [%BUILDTOOLS_SOURCE%]==[] set BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json
-set /P BUILDTOOLS_VERSION=< %~dp0BuildToolsVersion.txt
+set /P BUILDTOOLS_VERSION=< "%~dp0BuildToolsVersion.txt"
 set BUILD_TOOLS_PATH=%PACKAGES_DIR%Microsoft.DotNet.BuildTools\%BUILDTOOLS_VERSION%\lib\
 set PROJECT_JSON_PATH=%TOOLRUNTIME_DIR%\%BUILDTOOLS_VERSION%
 set PROJECT_JSON_FILE=%PROJECT_JSON_PATH%\project.json
-set PROJECT_JSON_CONTENTS={ "dependencies": { "Microsoft.DotNet.BuildTools": "%BUILDTOOLS_VERSION%" }, "frameworks": { "dnxcore50": { } } }
+set PROJECT_JSON_CONTENTS={ "dependencies": { "Microsoft.DotNet.BuildTools": "%BUILDTOOLS_VERSION%" }, "frameworks": { "netcoreapp1.0": { } } }
 set BUILD_TOOLS_SEMAPHORE=%PROJECT_JSON_PATH%\init-tools.completed
 
 :: if force option is specified then clean the tool runtime and build tools package directory to force it to get recreated
@@ -29,40 +29,45 @@ if exist "%BUILD_TOOLS_SEMAPHORE%" (
 if exist "%TOOLRUNTIME_DIR%" rmdir /S /Q "%TOOLRUNTIME_DIR%"
 
 if NOT exist "%PROJECT_JSON_PATH%" mkdir "%PROJECT_JSON_PATH%"
-echo %PROJECT_JSON_CONTENTS% > %PROJECT_JSON_FILE%
-echo Running %0 > %INIT_TOOLS_LOG%
+echo %PROJECT_JSON_CONTENTS% > "%PROJECT_JSON_FILE%"
+echo Running %0 > "%INIT_TOOLS_LOG%"
 
 if exist "%DOTNET_CMD%" goto :afterdotnetrestore
 
 echo Installing dotnet cli...
 if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%"
-set /p DOTNET_VERSION=< %~dp0DotnetCLIVersion.txt
+set /p DOTNET_VERSION=< "%~dp0DotnetCLIVersion.txt"
 set DOTNET_ZIP_NAME=dotnet-dev-win-x64.%DOTNET_VERSION%.zip
-set DOTNET_REMOTE_PATH=https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/%DOTNET_VERSION%/%DOTNET_ZIP_NAME%
+set DOTNET_REMOTE_PATH=https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/%DOTNET_VERSION%/%DOTNET_ZIP_NAME%
 set DOTNET_LOCAL_PATH=%DOTNET_PATH%%DOTNET_ZIP_NAME%
-echo Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> %INIT_TOOLS_LOG%
-powershell -NoProfile -ExecutionPolicy unrestricted -Command "(New-Object Net.WebClient).DownloadFile('%DOTNET_REMOTE_PATH%', '%DOTNET_LOCAL_PATH%'); Add-Type -Assembly 'System.IO.Compression.FileSystem' -ErrorVariable AddTypeErrors; if ($AddTypeErrors.Count -eq 0) { [System.IO.Compression.ZipFile]::ExtractToDirectory('%DOTNET_LOCAL_PATH%', '%DOTNET_PATH%') } else { (New-Object -com shell.application).namespace('%DOTNET_PATH%').CopyHere((new-object -com shell.application).namespace('%DOTNET_LOCAL_PATH%').Items(),16) }" >> %INIT_TOOLS_LOG%
+echo Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> "%INIT_TOOLS_LOG%"
+powershell -NoProfile -ExecutionPolicy unrestricted -Command "$retryCount = 0; $success = $false; do { try { (New-Object Net.WebClient).DownloadFile('%DOTNET_REMOTE_PATH%', '%DOTNET_LOCAL_PATH%'); $success = $true; } catch { if ($retryCount -ge 6) { throw; } else { $retryCount++; Start-Sleep -Seconds (5 * $retryCount); } } } while ($success -eq $false); Add-Type -Assembly 'System.IO.Compression.FileSystem' -ErrorVariable AddTypeErrors; if ($AddTypeErrors.Count -eq 0) { [System.IO.Compression.ZipFile]::ExtractToDirectory('%DOTNET_LOCAL_PATH%', '%DOTNET_PATH%') } else { (New-Object -com shell.application).namespace('%DOTNET_PATH%').CopyHere((new-object -com shell.application).namespace('%DOTNET_LOCAL_PATH%').Items(),16) }" >> "%INIT_TOOLS_LOG%"
 if NOT exist "%DOTNET_LOCAL_PATH%" (
   echo ERROR: Could not install dotnet cli correctly. See '%INIT_TOOLS_LOG%' for more details.
-  goto :EOF
+  exit /b 1
 )
 
 :afterdotnetrestore
 
 if exist "%BUILD_TOOLS_PATH%" goto :afterbuildtoolsrestore
 echo Restoring BuildTools version %BUILDTOOLS_VERSION%...
-echo Running: "%DOTNET_CMD%" restore "%PROJECT_JSON_FILE%" --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" >> %INIT_TOOLS_LOG%
-call "%DOTNET_CMD%" restore "%PROJECT_JSON_FILE%" --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" >> %INIT_TOOLS_LOG%
+echo Running: "%DOTNET_CMD%" restore "%PROJECT_JSON_FILE%" --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" >> "%INIT_TOOLS_LOG%"
+call "%DOTNET_CMD%" restore "%PROJECT_JSON_FILE%" --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" >> "%INIT_TOOLS_LOG%"
 if NOT exist "%BUILD_TOOLS_PATH%init-tools.cmd" (
   echo ERROR: Could not restore build tools correctly. See '%INIT_TOOLS_LOG%' for more details.
-  goto :EOF
+  exit /b 1
 )
 
 :afterbuildtoolsrestore
 
 echo Initializing BuildTools ...
-echo Running: "%BUILD_TOOLS_PATH%init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> %INIT_TOOLS_LOG%
-call "%BUILD_TOOLS_PATH%init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> %INIT_TOOLS_LOG%
+echo Running: "%BUILD_TOOLS_PATH%init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> "%INIT_TOOLS_LOG%"
+call "%BUILD_TOOLS_PATH%init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> "%INIT_TOOLS_LOG%"
+set INIT_TOOLS_ERRORLEVEL=%ERRORLEVEL%
+if not [%INIT_TOOLS_ERRORLEVEL%]==[0] (
+	echo ERROR: An error occured when trying to initialize the tools. Please check '%INIT_TOOLS_LOG%' for more details.
+	exit /b %INIT_TOOLS_ERRORLEVEL%
+)
 
 :: Create sempahore file
 echo Done initializing tools.

diff --git a/init-tools.sh b/init-tools.sh
@@ -12,7 +12,7 @@ __DOTNET_TOOLS_VERSION=$(cat $__scriptpath/DotnetCLIVersion.txt)
 __BUILD_TOOLS_PATH=$__PACKAGES_DIR/Microsoft.DotNet.BuildTools/$__BUILD_TOOLS_PACKAGE_VERSION/lib
 __PROJECT_JSON_PATH=$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION
 __PROJECT_JSON_FILE=$__PROJECT_JSON_PATH/project.json
-__PROJECT_JSON_CONTENTS="{ \"dependencies\": { \"Microsoft.DotNet.BuildTools\": \"$__BUILD_TOOLS_PACKAGE_VERSION\" }, \"frameworks\": { \"dnxcore50\": { } } }"
+__PROJECT_JSON_CONTENTS="{ \"dependencies\": { \"Microsoft.DotNet.BuildTools\": \"$__BUILD_TOOLS_PACKAGE_VERSION\" }, \"frameworks\": { \"netcoreapp1.0\": { } } }"
 
 OSName=$(uname -s)
 case $OSName in
@@ -24,14 +24,12 @@ case $OSName in
 
     Linux)
         OS=Linux
-        source /etc/os-release
-        if [ "$ID" == "centos" -o "$ID" == "rhel" ]; then
-            __DOTNET_PKG=dotnet-dev-centos-x64
-        elif [ "$ID" == "ubuntu" -o "$ID" == "debian" ]; then
-            __DOTNET_PKG=dotnet-dev-ubuntu-x64
+        if [ ! -e /etc/os-release ]; then
+            echo "Cannot determine Linux distribution, asuming Ubuntu 14.04."
+            __DOTNET_PKG=dotnet-dev-ubuntu.14.04-x64
         else
-            echo "Unsupported Linux distribution '$ID' detected. Downloading ubuntu-x64 tools."
-            __DOTNET_PKG=dotnet-dev-ubuntu-x64
+            source /etc/os-release
+            __DOTNET_PKG="dotnet-dev-$ID.$VERSION_ID-x64"
         fi
         ;;
 
@@ -47,24 +45,18 @@ if [ ! -e $__PROJECT_JSON_FILE ]; then
     echo "Running: $__scriptpath/init-tools.sh" > $__init_tools_log
     if [ ! -e $__DOTNET_PATH ]; then
         echo "Installing dotnet cli..."
-        __DOTNET_LOCATION="https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz"
+        __DOTNET_LOCATION="https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz"
         # curl has HTTPS CA trust-issues less often than wget, so lets try that first.
         echo "Installing '${__DOTNET_LOCATION}' to '$__DOTNET_PATH/dotnet.tar'" >> $__init_tools_log
         which curl > /dev/null 2> /dev/null
         if [ $? -ne 0 ]; then
             mkdir -p "$__DOTNET_PATH"
             wget -q -O $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION}
         else
-            curl -sSL --create-dirs -o $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION}
+            curl --retry 10 -sSL --create-dirs -o $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION}
         fi
         cd $__DOTNET_PATH
         tar -xf $__DOTNET_PATH/dotnet.tar
-        if [ -n "$BUILDTOOLS_OVERRIDE_RUNTIME" ]; then
-            find $__DOTNET_PATH -name *.ni.* | xargs rm 2>/dev/null
-            cp -R $BUILDTOOLS_OVERRIDE_RUNTIME/* $__DOTNET_PATH/bin
-            cp -R $BUILDTOOLS_OVERRIDE_RUNTIME/* $__DOTNET_PATH/bin/dnx
-            cp -R $BUILDTOOLS_OVERRIDE_RUNTIME/* $__DOTNET_PATH/runtime/coreclr
-        fi
 
         cd $__scriptpath
     fi
@@ -82,6 +74,10 @@ if [ ! -e $__PROJECT_JSON_FILE ]; then
     echo "Initializing BuildTools..."
     echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR" >> $__init_tools_log
     $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR >> $__init_tools_log
+    if [ "$?" != "0" ]; then
+        echo "ERROR: An error occured when trying to initialize the tools. Please check '$__init_tools_log' for more details."
+        exit 1
+    fi
     echo "Done initializing tools."
 else
     echo "Tools are already initialized"

diff --git a/packages.config b/packages.config
@@ -8,10 +8,14 @@
   <package id="NUnit.Console" version="3.0.0" targetFramework="net45" />
   <package id="NUnitLite" version="3.0.0" targetFramework="net45" />
   <package id="NUnit3TestAdapter" version="3.0.8-ctp-8" targetFramework="net45" />
-  <package id="System.Collections.Immutable" version="1.2.0-rc3-23805" />
-  <package id="System.Reflection.Metadata" version="1.3.0-beta-23816" />
-  <package id="Microsoft.DiaSymReader.PortablePdb" version="1.0.0-rc-60301"  />
-  <package id="Microsoft.DiaSymReader" version="1.0.7" />
+  <package id="System.Collections.Immutable" version="1.2.0" />
+  <package id="System.Reflection.Metadata" version="1.4.1-beta-24227-04" />
+  <package id="Microsoft.DiaSymReader.PortablePdb" version="1.1.0"  />
+  <package id="Microsoft.DiaSymReader" version="1.0.8" />
   <package id="FsSrGen" version="3.0.0" targetFramework="net46" />
   <package id="FSharp.SRGen.Build.Tasks" version="3.0.0" targetFramework="net46" />
+  <package id="MicroBuild.Core" version="0.2.0" />
+  <package id="WiX.Toolset.2015" version="3.10.0.1503" />
+  <package id="Microsoft.VisualFSharp.Core.Redist" version="1.0.0" />
+  <package id="Microsoft.VisualFSharp.Type.Providers.Redist" version="1.0.0" />
 </packages>