Merge pull request #11616 from panopticoncentral/merge-master-back-to…

…-stabilization

Merge master back to stabilization

.gitignore

@@ -4,6 +4,7 @@
 # User-specific files
 *.suo
 *.user
+*.userprefs
 *.sln.docstates
 .vs/
 
@@ -34,6 +35,7 @@ UnitTestResults.html
 *.nuget.props
 *.nuget.targets
 project.lock.json
+*.project.lock.json
 
 *_i.c
 *_p.c

CrossPlatform.sln

@@ -87,6 +87,18 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BasicScriptingTest", "src\S
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonCoreClrRuntime", "src\Tools\CommonCoreClrRuntime\CommonCoreClrRuntime.csproj", "{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{A18BACE1-BB66-4156-8E89-81429A5814C6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Immutable", "src\Dependencies\Immutable\Immutable.csproj", "{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xUnit.net", "src\Dependencies\xUnit.net\xUnit.net.csproj", "{8635CB8F-D210-41ED-B4FF-71502CDB475C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Metadata", "src\Dependencies\Metadata\Metadata.csproj", "{E6796B97-D5C6-45B2-AE46-351D15DCFC71}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiaSymReader", "src\Dependencies\DiaSymReader\DiaSymReader.csproj", "{D2B8B03E-A85D-48A2-818F-9177D89586A9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Composition", "src\Dependencies\Composition\Composition.csproj", "{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Test\Utilities\Shared\TestUtilities.projitems*{ccbd3438-3e84-40a9-83ad-533f23bcfca5}*SharedItemsImports = 4
@@ -678,6 +690,106 @@ Global
 		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|x64.ActiveCfg = Release|x64
 		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|x64.Build.0 = Release|x64
 		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|x86.ActiveCfg = Release|x64
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|ARM.Build.0 = Debug|Any CPU
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|x64.Build.0 = Debug|Any CPU
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|x86.Build.0 = Debug|Any CPU
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|ARM.ActiveCfg = Debug|Any CPU
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|ARM.Build.0 = Debug|Any CPU
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|x64.ActiveCfg = Debug|Any CPU
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|x64.Build.0 = Debug|Any CPU
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|x86.ActiveCfg = Debug|Any CPU
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|x86.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|ARM.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|x64.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|x86.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|ARM.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|ARM.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|x64.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|x64.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|x86.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|x86.Build.0 = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|ARM.Build.0 = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|x64.Build.0 = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|x86.Build.0 = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|ARM.ActiveCfg = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|ARM.Build.0 = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|x64.ActiveCfg = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|x64.Build.0 = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|x86.ActiveCfg = Debug|Any CPU
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|x86.Build.0 = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|ARM.Build.0 = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|x64.Build.0 = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|x86.Build.0 = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|ARM.ActiveCfg = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|ARM.Build.0 = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|x64.ActiveCfg = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|x64.Build.0 = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|x86.ActiveCfg = Debug|Any CPU
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|x86.Build.0 = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Debug|ARM.Build.0 = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Debug|x64.Build.0 = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Debug|x86.Build.0 = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Release|ARM.ActiveCfg = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Release|ARM.Build.0 = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Release|x64.ActiveCfg = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Release|x64.Build.0 = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Release|x86.ActiveCfg = Debug|Any CPU
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491}.Release|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -719,5 +831,10 @@ Global
 		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE} = {A6F70573-57FE-49F9-A26C-75B8D202B795}
 		{ABC7262E-1053-49F3-B846-E3091BB92E8C} = {A6F70573-57FE-49F9-A26C-75B8D202B795}
 		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
+		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA} = {A18BACE1-BB66-4156-8E89-81429A5814C6}
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C} = {A18BACE1-BB66-4156-8E89-81429A5814C6}
+		{E6796B97-D5C6-45B2-AE46-351D15DCFC71} = {A18BACE1-BB66-4156-8E89-81429A5814C6}
+		{D2B8B03E-A85D-48A2-818F-9177D89586A9} = {A18BACE1-BB66-4156-8E89-81429A5814C6}
+		{02ABB346-3CC8-4CC2-B6E4-72A60A3E1491} = {A18BACE1-BB66-4156-8E89-81429A5814C6}
 	EndGlobalSection
 EndGlobal

Makefile

@@ -1,23 +1,21 @@
 SHELL = /usr/bin/env bash
 OS_NAME = $(shell uname -s)
-NUGET_PACKAGE_NAME = nuget.71
 BUILD_CONFIGURATION = Debug
 BINARIES_PATH = $(shell pwd)/Binaries
 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
 HOME_DIR = $(shell cd ~ && pwd)
 
 MSBUILD_ADDITIONALARGS := /v:m /fl /fileloggerparameters:Verbosity=normal /p:Configuration=$(BUILD_CONFIGURATION)
 
 ifeq ($(OS_NAME),Linux)
 	MSBUILD_ADDITIONALARGS := $(MSBUILD_ADDITIONALARGS) /p:BaseNuGetRuntimeIdentifier=ubuntu.14.04
-	ROSLYN_TOOLSET_NAME = roslyn.linux.6
+	ROSLYN_TOOLSET_NAME = roslyn.linux.7
 else ifeq ($(OS_NAME),Darwin)
 	MSBUILD_ADDITIONALARGS := $(MSBUILD_ADDITIONALARGS) /p:BaseNuGetRuntimeIdentifier=osx.10.10
-	ROSLYN_TOOLSET_NAME = roslyn.mac.5
+	ROSLYN_TOOLSET_NAME = roslyn.mac.6
 endif
 
 ifneq ($(BUILD_LOG_PATH),)
@@ -77,4 +75,3 @@ $(ROSLYN_TOOLSET_PATH): | $(TOOLSET_PATH)
 
 $(TOOLSET_PATH):
 	mkdir -p $(TOOLSET_PATH)
-

README.md

@@ -5,16 +5,14 @@
 ### Windows - Unit Tests
 ||Debug x86|Debug x64|Release x86|Release x64|Determinism|
 |:--:|:--:|:--:|:--:|:--:|:--:|
-|**master (1.3)**|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_master_win_dbg_unit32/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_master_win_dbg_unit32/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_master_win_dbg_unit64/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_master_win_dbg_unit64/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_master_win_rel_unit32/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_master_win_rel_unit32/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_master_win_rel_unit64/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_master_win_rel_unit64/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_master_determinism/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_master_determinism/)|
-|**future (2.0 Preview 2)**|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_future_win_dbg_unit32/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_future_win_dbg_unit32/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_future_win_dbg_unit64/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_future_win_dbg_unit64/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_future_win_rel_unit32/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_future_win_rel_unit32/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_future_win_rel_unit64/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_future_win_rel_unit64/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_future_determinism/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_future_determinism/)|
-|**hotfix**|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_hotfix_win_dbg_unit32/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_hotfix_win_dbg_unit32/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_hotfix_win_dbg_unit64/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_hotfix_win_dbg_unit64/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_hotfix_win_rel_unit32/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_hotfix_win_rel_unit32/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_hotfix_win_rel_unit64/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_hotfix_win_rel_unit64/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_hotfix_determinism/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_hotfix_determinism/)|
+|**master (1.3)**|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/master/job/windows_debug_unit32/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/master/job/windows_debug_unit32/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/master/job/windows_debug_unit64/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/master/job/windows_debug_unit64/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/master/job/windows_release_unit32/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/master/job/windows_release_unit64/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/master/job/windows_release_unit64/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/master/job/windows_release_unit64/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/master/job/windows_determinism/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/master/job/windows_determinism/)|
+|**future (2.0 Preview 2)**|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/future/job/windows_debug_unit32/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/future/job/windows_debug_unit32/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/future/job/windows_debug_unit64/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/future/job/windows_debug_unit64/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/future/job/windows_release_unit32/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/future/job/windows_release_unit64/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/future/job/windows_release_unit64/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/future/job/windows_release_unit64/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/future/job/windows_determinism/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/future/job/windows_determinism/)|
 
 ### Linux/Mac - Unit Tests
 ||Linux|Mac OSX|
 |:--:|:--:|:--:|
-|**master (1.3)**|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_master_lin_dbg_unit32/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_master_lin_dbg_unit32/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_master_mac_dbg_unit32/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_master_mac_dbg_unit32/)|
-|**future (2.0 Preview 2)**|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_future_lin_dbg_unit32/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_future_lin_dbg_unit32/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_future_mac_dbg_unit32/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_future_mac_dbg_unit32/)|
-|**hotfix**|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_hotfix_lin_dbg_unit32/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_hotfix_lin_dbg_unit32/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/roslyn_hotfix_mac_dbg_unit32/badge/icon)](http://dotnet-ci.cloudapp.net/job/roslyn_hotfix_mac_dbg_unit32/)|
+|**master (1.3)**|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/master/job/linux_debug/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/master/job/linux_debug/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/master/job/mac_debug/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/master/job/mac_debug/)|
+|**future (2.0 Preview 2)**|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/future/job/linux_debug/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/future/job/linux_debug/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/future/job/mac_debug/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/future/job/mac_debug/)|
 
 [//]: # (End current test results)
 

Restore.cmd

@@ -10,9 +10,21 @@ REM internal repositories.
 set RoslynSolution=%1
 if "%RoslynSolution%" == "" set RoslynSolution=%~dp0Roslyn.sln
 
+echo Deleting project.lock.json files
+pushd "%~dp0src"
+echo "Dummy lock file to avoid error when there is no project.lock.json file" > project.lock.json
+del /s /q project.lock.json
+popd
+
 echo Restoring packages: Toolsets
 call %NugetExe% restore "%~dp0build\ToolsetPackages\project.json" %NuGetAdditionalCommandLineArgs% || goto :RestoreFailed
 
+echo Restoring packages: Toolsets (Dev14 VS SDK build tools)
+call %NugetExe% restore "%~dp0build\ToolsetPackages\dev14.project.json" %NuGetAdditionalCommandLineArgs% || goto :RestoreFailed
+
+echo Restoring packages: Toolsets (Dev15 VS SDK build tools)
+call %NugetExe% restore "%~dp0build\ToolsetPackages\dev15.project.json" %NuGetAdditionalCommandLineArgs% || goto :RestoreFailed
+
 echo Restoring packages: Samples
 call %NugetExe% restore "%~dp0src\Samples\Samples.sln" %NuGetAdditionalCommandLineArgs% || goto :RestoreFailed
 
@@ -23,4 +35,4 @@ exit /b 0
 
 :RestoreFailed
 echo Restore failed with ERRORLEVEL %ERRORLEVEL%
-exit /b 1
+exit /b 1