Merge from future into features/patterns

MattWindsor91 · Apr 1, 2016 · de43988 · de43988
1 parent 024ad0a
commit de43988
Show file tree

Hide file tree

Showing 118 changed files with 6,037 additions and 632 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,9 +21,6 @@ x64/
 # NuGet restore semaphore
 build/ToolsetPackages/toolsetpackages.semaphore
 
-# Toolset project lock json
-build/MSBuildToolset/project.lock.json
-
 # NuGet package
 src/Tools/UploadNugetZip/*.zip
 
@@ -36,6 +33,7 @@ UnitTestResults.html
 *-packages.config
 *.nuget.props
 *.nuget.targets
+project.lock.json
 
 *_i.c
 *_p.c

diff --git a/BuildAndTest.proj b/BuildAndTest.proj
@@ -94,9 +94,36 @@
         Text="Found test assemblies outside a well-known test directory: 
 @(MisplacedTestAssemblies, '%0a')" />
 
-    <Exec Command="$(CoreClrTestDirectory)\CoreRun.exe $(CoreClrTestDirectory)\xunit.console.netcore.exe @(CoreTestAssemblies, ' ') -parallel all -xml $(CoreClrTestDirectory)\xUnitResults\TestResults.xml" />
-
-    <Exec Command="Binaries\$(Configuration)\RunTests\RunTests.exe &quot;$(NuGetPackageRoot)\xunit.runner.console\$(XunitVersion)\tools&quot; $(RunTestArgs) @(TestAssemblies, ' ')" />
+    <PropertyGroup>
+      <CoreRunExe>$(CoreClrTestDirectory)\CoreRun.exe</CoreRunExe>
+      <CoreRunArgs>$(CoreClrTestDirectory)\xunit.console.netcore.exe @(CoreTestAssemblies, ' ') -parallel all -xml $(CoreClrTestDirectory)\xUnitResults\TestResults.xml</CoreRunArgs>
+      <RunTestsExe>Binaries\$(Configuration)\RunTests\RunTests.exe</RunTestsExe>
+      <RunTestsArgs>$(NuGetPackageRoot)\xunit.runner.console\$(XunitVersion)\tools $(RunTestArgs) @(TestAssemblies, ' ')</RunTestsArgs>
+    </PropertyGroup>
+
+    <Exec Condition="'$(RunProcessWatchdog)' != 'true'" Command="&quot;$(CoreRunExe)&quot; $(CoreRunArgs)" />
+
+    <Exec Condition="'$(RunProcessWatchdog)' != 'true'" Command="&quot;$(RunTestsExe)&quot; $(RunTestsArgs)" />
+
+    <PropertyGroup Condition="'$(RunProcessWatchdog)' == 'true'">
+      <ProcessWatchDogExe>$(OutputDirectory)\ProcessWatchdog\ProcessWatchdog.exe</ProcessWatchDogExe>
+      <ProcessWatchdogOutputDirectory Condition="'$(ProcessWatchdogOutputDirectory)' == ''">$(OutputDirectory)\ProcessWatchdogOutput</ProcessWatchdogOutputDirectory>
+      <ProcDumpExe Condition="'$(ProcDumpExe)' == ''">C:\Sysinternals\Procdump.exe</ProcDumpExe>
+
+      <!--
+      The time reserved for the process watchdog to kill all test processes and obtain crash
+      dumps from them, measure in seconds.
+      -->
+      <BufferTime>300</BufferTime>
+
+      <!--
+      The fully constructed command line which runs a PowerShell script that runs both the
+      Core CLR unit tests and the desktop unit tests under the control of the process watchdog.
+      -->
+      <RunProcessWatchdogScriptCommand>PowerShell.exe -ExecutionPolicy RemoteSigned -NoProfile .\build\scripts\Run-TestsWithProcessWatchdog.ps1 -ProcessWatchDogExe $(ProcessWatchDogExe) -ProcessWatchdogOutputDirectory $(ProcessWatchdogOutputDirectory) -ProcDumpExe $(ProcDumpExe) -CoreRunExe '$(CoreRunExe)' -CoreRunArgs '$(CoreRunArgs)' -RunTestsExe '$(RunTestsExe)' -RunTestsArgs '$(RunTestsArgs)' -BuildStartTime $(BuildStartTime) -BuildTimeLimit $(BuildTimeLimit) -BufferTime $(BufferTime)</RunProcessWatchdogScriptCommand>
+    </PropertyGroup>
+
+    <Exec Condition="'$(RunProcessWatchdog)' == 'true'" Command="$(RunProcessWatchdogScriptCommand)" />
 
   </Target>
 

diff --git a/CrossPlatform.sln b/CrossPlatform.sln
@@ -75,6 +75,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptingTest", "src\Script
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeployCompilerGeneratorToolsRuntime", "src\Tools\Source\CompilerGeneratorTools\DeployCompilerGeneratorToolsRuntime\DeployCompilerGeneratorToolsRuntime.csproj", "{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scripting", "src\Scripting\Core\Scripting.csproj", "{12A68549-4E8C-42D6-8703-A09335F97997}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpScripting", "src\Scripting\CSharp\CSharpScripting.csproj", "{066F0DBD-C46C-4C20-AFEC-99829A172625}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BasicScripting", "src\Scripting\VisualBasic\BasicScripting.vbproj", "{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpScriptingTest", "src\Scripting\CSharpTest\CSharpScriptingTest.csproj", "{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BasicScriptingTest", "src\Scripting\VisualBasicTest\BasicScriptingTest.vbproj", "{ABC7262E-1053-49F3-B846-E3091BB92E8C}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Test\Utilities\Shared\TestUtilities.projitems*{ccbd3438-3e84-40a9-83ad-533f23bcfca5}*SharedItemsImports = 4
@@ -84,8 +94,8 @@ Global
 		src\Compilers\Core\CommandLine\CommandLine.projitems*{ad6f474e-e6d4-4217-91f3-b7af1be31ccc}*SharedItemsImports = 13
 		src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34}*SharedItemsImports = 13
 		src\Compilers\Core\SharedCollections\SharedCollections.projitems*{afde6bea-5038-4a4a-a88e-dbd2e4088eed}*SharedItemsImports = 4
-		src\Compilers\Core\SharedCollections\SharedCollections.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
 		src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
+		src\Compilers\Core\SharedCollections\SharedCollections.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
 		src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{b501a547-c911-4a05-ac6e-274a50dff30e}*SharedItemsImports = 4
 		src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}*SharedItemsImports = 4
 		src\Compilers\Core\SharedCollections\SharedCollections.projitems*{c1930979-c824-496b-a630-70f5369a636f}*SharedItemsImports = 13
@@ -552,6 +562,106 @@ Global
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|x64.Build.0 = Release|Any CPU
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|x86.ActiveCfg = Release|Any CPU
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|x86.Build.0 = Release|Any CPU
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Debug|ARM.ActiveCfg = Debug|ARM
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Debug|ARM.Build.0 = Debug|ARM
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Debug|x64.Build.0 = Debug|Any CPU
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Debug|x86.Build.0 = Debug|Any CPU
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Release|ARM.ActiveCfg = Release|ARM
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Release|ARM.Build.0 = Release|ARM
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Release|x64.ActiveCfg = Release|Any CPU
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Release|x64.Build.0 = Release|Any CPU
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Release|x86.ActiveCfg = Release|Any CPU
+		{12A68549-4E8C-42D6-8703-A09335F97997}.Release|x86.Build.0 = Release|Any CPU
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Debug|ARM.ActiveCfg = Debug|ARM
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Debug|ARM.Build.0 = Debug|ARM
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Debug|x64.Build.0 = Debug|Any CPU
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Debug|x86.Build.0 = Debug|Any CPU
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Release|Any CPU.Build.0 = Release|Any CPU
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Release|ARM.ActiveCfg = Release|ARM
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Release|ARM.Build.0 = Release|ARM
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Release|x64.ActiveCfg = Release|Any CPU
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Release|x64.Build.0 = Release|Any CPU
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Release|x86.ActiveCfg = Release|Any CPU
+		{066F0DBD-C46C-4C20-AFEC-99829A172625}.Release|x86.Build.0 = Release|Any CPU
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Debug|ARM.ActiveCfg = Debug|ARM
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Debug|ARM.Build.0 = Debug|ARM
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Debug|x64.Build.0 = Debug|Any CPU
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Debug|x86.Build.0 = Debug|Any CPU
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Release|ARM.ActiveCfg = Release|ARM
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Release|ARM.Build.0 = Release|ARM
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Release|x64.ActiveCfg = Release|Any CPU
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Release|x64.Build.0 = Release|Any CPU
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Release|x86.ActiveCfg = Release|Any CPU
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}.Release|x86.Build.0 = Release|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Debug|ARM.Build.0 = Debug|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Debug|x64.Build.0 = Debug|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Debug|x86.Build.0 = Debug|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Release|ARM.ActiveCfg = Release|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Release|ARM.Build.0 = Release|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Release|x64.ActiveCfg = Release|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Release|x64.Build.0 = Release|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Release|x86.ActiveCfg = Release|Any CPU
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE}.Release|x86.Build.0 = Release|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|ARM.Build.0 = Debug|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|x64.Build.0 = Debug|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Debug|x86.Build.0 = Debug|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|ARM.Build.0 = Release|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|x64.ActiveCfg = Release|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|x64.Build.0 = Release|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|x86.ActiveCfg = Release|Any CPU
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -587,5 +697,10 @@ Global
 		{B5A6057A-EB4C-49FB-987D-943137E72E47} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
 		{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE} = {A6F70573-57FE-49F9-A26C-75B8D202B795}
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
+		{12A68549-4E8C-42D6-8703-A09335F97997} = {A6F70573-57FE-49F9-A26C-75B8D202B795}
+		{066F0DBD-C46C-4C20-AFEC-99829A172625} = {A6F70573-57FE-49F9-A26C-75B8D202B795}
+		{3E7DEA65-317B-4F43-A25D-62F18D96CFD7} = {A6F70573-57FE-49F9-A26C-75B8D202B795}
+		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE} = {A6F70573-57FE-49F9-A26C-75B8D202B795}
+		{ABC7262E-1053-49F3-B846-E3091BB92E8C} = {A6F70573-57FE-49F9-A26C-75B8D202B795}
 	EndGlobalSection
 EndGlobal
diff --git a/Makefile b/Makefile
@@ -3,7 +3,8 @@ OS_NAME = $(shell uname -s)
 NUGET_PACKAGE_NAME = nuget.future.70
 BUILD_CONFIGURATION = Debug
 BINARIES_PATH = $(shell pwd)/Binaries
-TOOLSET_TMP_PATH = $(BINARIES_PATH)/toolset
+TOOLSET_PATH = $(BINARIES_PATH)/toolset
+RESTORE_SEMAPHORE_PATH = $(TOOLSET_PATH)/restore.semaphore
 BOOTSTRAP_PATH = $(BINARIES_PATH)/Bootstrap
 BUILD_LOG_PATH =
 XUNIT_VERSION = 2.1.0
@@ -13,17 +14,17 @@ MSBUILD_ADDITIONALARGS := /v:m /fl /fileloggerparameters:Verbosity=normal /p:Con
 
 ifeq ($(OS_NAME),Linux)
 	MSBUILD_ADDITIONALARGS := $(MSBUILD_ADDITIONALARGS) /p:BaseNuGetRuntimeIdentifier=ubuntu.14.04
-	ROSLYN_TOOLSET_NAME = roslyn.linux.5
+	ROSLYN_TOOLSET_NAME = roslyn.linux.6
 else ifeq ($(OS_NAME),Darwin)
 	MSBUILD_ADDITIONALARGS := $(MSBUILD_ADDITIONALARGS) /p:BaseNuGetRuntimeIdentifier=osx.10.10
-	ROSLYN_TOOLSET_NAME = roslyn.mac.4
+	ROSLYN_TOOLSET_NAME = roslyn.mac.5
 endif
 
 ifneq ($(BUILD_LOG_PATH),)
 	MSBUILD_ADDITIONALARGS := $(MSBUILD_ADDITIONALARGS) /fileloggerparameters:LogFile=$(BUILD_LOG_PATH)
 endif
 
-ROSLYN_TOOLSET_PATH = $(TOOLSET_TMP_PATH)/$(ROSLYN_TOOLSET_NAME)
+ROSLYN_TOOLSET_PATH = $(TOOLSET_PATH)/$(ROSLYN_TOOLSET_NAME)
 
 ifeq ($(BOOTSTRAP),true)
 	MSBUILD_ARGS = $(MSBUILD_ADDITIONALARGS) /p:CscToolPath=$(BOOTSTRAP_PATH) /p:CscToolExe=csc /p:VbcToolPath=$(BOOTSTRAP_PATH) /p:VbcToolExe=vbc
@@ -33,12 +34,14 @@ endif
 
 MSBUILD_CMD = $(ROSLYN_TOOLSET_PATH)/corerun $(ROSLYN_TOOLSET_PATH)/MSBuild.exe $(MSBUILD_ARGS)
 
-all: toolset
+.PHONY: all bootstrap test restore toolset
+
+all: $(ROSLYN_TOOLSET_PATH) $(RESTORE_SEMAPHORE_PATH)
 	export ReferenceAssemblyRoot=$(ROSLYN_TOOLSET_PATH)/reference-assemblies/Framework ; \
 	export HOME=$(HOME_DIR) ; \
 	$(MSBUILD_CMD) CrossPlatform.sln
 
-bootstrap: toolset
+bootstrap: $(ROSLYN_TOOLSET_PATH) $(RESTORE_SEMAPHORE_PATH)
 	export ReferenceAssemblyRoot=$(ROSLYN_TOOLSET_PATH)/reference-assemblies/Framework ; \
 	export HOME=$(HOME_DIR) ; \
 	$(MSBUILD_CMD) src/Compilers/CSharp/CscCore/CscCore.csproj && \
@@ -52,25 +55,26 @@ bootstrap: toolset
 test:
 	build/scripts/tests.sh $(BUILD_CONFIGURATION)
 
+restore: $(RESTORE_SEMAPHORE_PATH)
+
+$(RESTORE_SEMAPHORE_PATH): $(ROSLYN_TOOLSET_PATH)
+	@build/scripts/restore.sh $(ROSLYN_TOOLSET_PATH) && \
+	touch $(RESTORE_SEMAPHORE_PATH)
+
 clean:
 	@rm -rf Binaries
 
 clean_toolset:
-	@rm -rf $(TOOLSET_TMP_PATH)
+	@rm -rf $(TOOLSET_PATH)
 
-toolset: $(TOOLSET_TMP_PATH)/$(ROSLYN_TOOLSET_NAME) $(TOOLSET_TMP_PATH)/$(NUGET_PACKAGE_NAME).zip
+toolset: $(ROSLYN_TOOLSET_PATH)
 
-$(TOOLSET_TMP_PATH)/$(ROSLYN_TOOLSET_NAME): | $(TOOLSET_TMP_PATH)
-	@pushd $(TOOLSET_TMP_PATH) ; \
+$(ROSLYN_TOOLSET_PATH): | $(TOOLSET_PATH)
+	@pushd $(TOOLSET_PATH) ; \
 	curl -O https://dotnetci.blob.core.windows.net/roslyn/$(ROSLYN_TOOLSET_NAME).tar.bz2 && \
 	tar -jxf $(ROSLYN_TOOLSET_NAME).tar.bz2 && \
 	chmod +x $(ROSLYN_TOOLSET_NAME)/corerun
 
-$(TOOLSET_TMP_PATH)/$(NUGET_PACKAGE_NAME).zip: | $(TOOLSET_TMP_PATH)
-	@pushd $(TOOLSET_TMP_PATH) && \
-	curl -O https://dotnetci.blob.core.windows.net/roslyn/$(NUGET_PACKAGE_NAME).zip && \
-	unzip -uoq $(NUGET_PACKAGE_NAME).zip -d ~/
-
-$(TOOLSET_TMP_PATH):
-	mkdir -p $(TOOLSET_TMP_PATH)
+$(TOOLSET_PATH):
+	mkdir -p $(TOOLSET_PATH)