FI from main

Makefile

@@ -2,20 +2,24 @@ SHELL = /usr/bin/env bash
 OS_NAME = $(shell uname -s)
 BUILD_CONFIGURATION = Debug
 BINARIES_PATH = $(shell pwd)/Binaries
+SCRIPTS_PATH = $(shell pwd)/build/scripts
 TOOLSET_PATH = $(BINARIES_PATH)/toolset
 RESTORE_SEMAPHORE_PATH = $(TOOLSET_PATH)/restore.semaphore
 BOOTSTRAP_PATH = $(BINARIES_PATH)/Bootstrap
 BUILD_LOG_PATH =
 HOME_DIR = $(shell cd ~ && pwd)
+DOTNET_VERSION = 1.0.0-preview2-002911
 
 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.7
+	ROSLYN_TOOLSET_NAME = roslyn.linux.8
+	DOTNET_PLATFORM = ubuntu-x64
 else ifeq ($(OS_NAME),Darwin)
 	MSBUILD_ADDITIONALARGS := $(MSBUILD_ADDITIONALARGS) /p:BaseNuGetRuntimeIdentifier=osx.10.10
-	ROSLYN_TOOLSET_NAME = roslyn.mac.6
+	ROSLYN_TOOLSET_NAME = roslyn.mac.8
+	DOTNET_PLATFORM = osx-x64
 endif
 
 ifneq ($(BUILD_LOG_PATH),)
@@ -69,9 +73,15 @@ toolset: $(ROSLYN_TOOLSET_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
+	curl -O https://dotnetci.blob.core.windows.net/roslyn/$(ROSLYN_TOOLSET_NAME).zip && \
+	curl -O https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/$(DOTNET_VERSION)/dotnet-dev-$(DOTNET_PLATFORM).$(DOTNET_VERSION).tar.gz && \
+	mkdir -p $(ROSLYN_TOOLSET_NAME)/dotnet-cli && \
+	$(SCRIPTS_PATH)/unzip.sh $(ROSLYN_TOOLSET_NAME).zip $(ROSLYN_TOOLSET_NAME) && \
+	tar -zxf dotnet-dev-$(DOTNET_PLATFORM).$(DOTNET_VERSION).tar.gz -C $(ROSLYN_TOOLSET_NAME)/dotnet-cli && \
+	chmod +x $(ROSLYN_TOOLSET_NAME)/corerun && \
+	chmod +x $(ROSLYN_TOOLSET_NAME)/RoslynRestore && \
+	chmod +x $(ROSLYN_TOOLSET_NAME)/csc && \
+	chmod +x $(ROSLYN_TOOLSET_NAME)/vbc
 
 $(TOOLSET_PATH):
 	mkdir -p $(TOOLSET_PATH)

README.md

@@ -5,14 +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/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/)|
+|**stabilization (1.3)**|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/stabilization/job/windows_debug_unit32/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/stabilization/job/windows_debug_unit32/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/stabilization/job/windows_debug_unit64/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/stabilization/job/windows_debug_unit64/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/stabilization/job/windows_release_unit32/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/stabilization/job/windows_release_unit32/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/stabilization/job/windows_release_unit64/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/stabilization/job/windows_release_unit64/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/stabilization/job/windows_determinism/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/stabilization/job/windows_determinism/)|
+|**master (2.0 Preview 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_unit32/)|[![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/)|
 
 ### Linux/Mac - Unit Tests
 ||Linux|Mac OSX|
 |:--:|:--:|:--:|
-|**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/)|
+|**stabilization (1.3)**|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/stabilization/job/linux_debug/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/stabilization/job/linux_debug/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/stabilization/job/mac_debug/badge/icon)](http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/stabilization/job/mac_debug/)|
+|**master (2.0 Preview 2)**|[![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/)|
 
 [//]: # (End current test results)
 

Roslyn.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.25123.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysisTest", "src\Compilers\Core\CodeAnalysisTest\CodeAnalysisTest.csproj", "{A4C99B85-765C-4C65-9C2A-BB609AAB09E6}"
 EndProject
@@ -359,14 +359,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq.net", "src\Dependencies
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Composition", "src\Dependencies\Composition\Composition.csproj", "{A57DDFE5-AB0E-4371-98E5-11B9218DF11C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PerformanceTesting", "src\Test\PerformanceTesting.csproj", "{DA0D2A70-A2F9-4654-A99A-3227EDF54FF1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perf.Tests", "src\Test\Perf\tests\Perf.Tests.csproj", "{DA0D2A70-A2F9-4654-A99A-3227EDF54FF1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Roslyn", "src\Deployment\Roslyn.csproj", "{600AF682-E097-407B-AD85-EE3CED37E680}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EditorFeatures.Next", "src\EditorFeatures\Next\EditorFeatures.Next.csproj", "{366BBCDC-B05F-4677-9B5B-78BA816A1484}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualStudioSetup.Next", "src\VisualStudio\Setup.Next\VisualStudioSetup.Next.csproj", "{143FE684-6E1C-41DF-9C60-84C7772DC49C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Perf", "Perf", "{DD13507E-D5AF-4B61-B11A-D55D6F4A73A5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perf.Utilities", "src\Test\Perf\Utilities\Perf.Utilities.csproj", "{59AD474E-2A35-4E8A-A74D-E33479977FBF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perf.Runner", "src\Test\Perf\Runner\Perf.Runner.csproj", "{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Test\Utilities\Shared\TestUtilities.projitems*{76c6f005-c89d-4348-bb4a-391898dbeb52}*SharedItemsImports = 4
@@ -3174,6 +3180,46 @@ Global
 		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Release|x64.Build.0 = Release|Any CPU
 		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Release|x86.ActiveCfg = Release|Any CPU
 		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Release|x86.Build.0 = Release|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Debug|ARM.Build.0 = Debug|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Debug|x64.Build.0 = Debug|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Debug|x86.Build.0 = Debug|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Release|ARM.ActiveCfg = Release|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Release|ARM.Build.0 = Release|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Release|x64.ActiveCfg = Release|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Release|x64.Build.0 = Release|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Release|x86.ActiveCfg = Release|Any CPU
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF}.Release|x86.Build.0 = Release|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Debug|ARM.Build.0 = Debug|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Debug|x64.Build.0 = Debug|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Debug|x86.Build.0 = Debug|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Release|ARM.ActiveCfg = Release|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Release|ARM.Build.0 = Release|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Release|x64.ActiveCfg = Release|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Release|x64.Build.0 = Release|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Release|x86.ActiveCfg = Release|Any CPU
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3339,8 +3385,11 @@ Global
 		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF} = {C2D1346B-9665-4150-B644-075CF1636BAA}
 		{A32EAB7F-691C-4D00-98C4-F50C37BB4754} = {C2D1346B-9665-4150-B644-075CF1636BAA}
 		{A57DDFE5-AB0E-4371-98E5-11B9218DF11C} = {C2D1346B-9665-4150-B644-075CF1636BAA}
-		{DA0D2A70-A2F9-4654-A99A-3227EDF54FF1} = {CAD2965A-19AB-489F-BE2E-7649957F914A}
+		{DA0D2A70-A2F9-4654-A99A-3227EDF54FF1} = {DD13507E-D5AF-4B61-B11A-D55D6F4A73A5}
 		{366BBCDC-B05F-4677-9B5B-78BA816A1484} = {EE97CB90-33BB-4F3A-9B3D-69375DEC6AC6}
 		{143FE684-6E1C-41DF-9C60-84C7772DC49C} = {8DBA5174-B0AA-4561-82B1-A46607697753}
+		{DD13507E-D5AF-4B61-B11A-D55D6F4A73A5} = {CAD2965A-19AB-489F-BE2E-7649957F914A}
+		{59AD474E-2A35-4E8A-A74D-E33479977FBF} = {DD13507E-D5AF-4B61-B11A-D55D6F4A73A5}
+		{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720} = {DD13507E-D5AF-4B61-B11A-D55D6F4A73A5}
 	EndGlobalSection
 EndGlobal