Merge branch 'dotnet/master' into future

e342f624 · Jason Malinowski · f044dea2 · e83302d3 · e342f624 · e342f624
50 changed file
--- a/Compilers.sln
+++ b/Compilers.sln

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+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
@@ -123,6 +123,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "src\Test\U
 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}") = "CommonCoreClrRuntime", "src\Tools\CommonCoreClrRuntime\CommonCoreClrRuntime.csproj", "{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Test\Utilities\Shared\TestUtilities.projitems*{76c6f005-c89d-4348-bb4a-391898dbeb52}*SharedItemsImports = 4
@@ -139,16 +141,16 @@ Global
 		src\Compilers\Server\ServerShared\ServerShared.projitems*{9508f118-f62e-4c16-a6f4-7c3b56e166ad}*SharedItemsImports = 4
 		src\Compilers\Core\CommandLine\CommandLine.projitems*{9508f118-f62e-4c16-a6f4-7c3b56e166ad}*SharedItemsImports = 4
 		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\CommandLine\CommandLine.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*SharedItemsImports = 4
+		src\Compilers\Core\SharedCollections\SharedCollections.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
 		src\Compilers\Core\MSBuildTask\Shared\MSBuildTask.Shared.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*SharedItemsImports = 4
+		src\Compilers\Core\CommandLine\CommandLine.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*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\CommandLine\CommandLine.projitems*{4b45ca0c-03a0-400f-b454-3d4bcb16af38}*SharedItemsImports = 4
 		src\Compilers\Core\SharedCollections\SharedCollections.projitems*{c1930979-c824-496b-a630-70f5369a636f}*SharedItemsImports = 13
-		src\Compilers\Core\CommandLine\CommandLine.projitems*{d874349c-8bb3-4bdc-8535-2d52ccca1198}*SharedItemsImports = 4
 		src\Compilers\Core\MSBuildTask\Shared\MSBuildTask.Shared.projitems*{d874349c-8bb3-4bdc-8535-2d52ccca1198}*SharedItemsImports = 4
+		src\Compilers\Core\CommandLine\CommandLine.projitems*{d874349c-8bb3-4bdc-8535-2d52ccca1198}*SharedItemsImports = 4
 		src\Compilers\Core\CommandLine\CommandLine.projitems*{e3cd2895-76a8-4d11-a316-ea67cb5ea42c}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1081,6 +1083,20 @@ 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
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|ARM.ActiveCfg = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|Mixed Platforms.Build.0 = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|x64.ActiveCfg = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|x64.Build.0 = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|x86.ActiveCfg = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|Any CPU.ActiveCfg = Release|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|ARM.ActiveCfg = Release|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|Mixed Platforms.ActiveCfg = Release|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|Mixed Platforms.Build.0 = Release|x64
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1139,5 +1155,6 @@ Global
 		{23683607-168A-4189-955E-908F0E80E60D} = {6F016299-BA96-45BA-9BFF-6C0793979177}
 		{CCBD3438-3E84-40A9-83AD-533F23BCFCA5} = {6F016299-BA96-45BA-9BFF-6C0793979177}
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
 	EndGlobalSection
 EndGlobal
--- a/CrossPlatform.sln
+++ b/CrossPlatform.sln

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "src\Compilers\Core\Portable\CodeAnalysis.csproj", "{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}"
 EndProject
@@ -85,6 +85,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpScriptingTest", "src\
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BasicScriptingTest", "src\Scripting\VisualBasicTest\BasicScriptingTest.vbproj", "{ABC7262E-1053-49F3-B846-E3091BB92E8C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonCoreClrRuntime", "src\Tools\CommonCoreClrRuntime\CommonCoreClrRuntime.csproj", "{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Test\Utilities\Shared\TestUtilities.projitems*{ccbd3438-3e84-40a9-83ad-533f23bcfca5}*SharedItemsImports = 4
@@ -94,8 +96,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\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\Core\AnalyzerDriver\AnalyzerDriver.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
@@ -662,6 +664,20 @@ Global
 		{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
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|ARM.ActiveCfg = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|Mixed Platforms.Build.0 = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|x64.ActiveCfg = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|x64.Build.0 = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|x86.ActiveCfg = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|Any CPU.ActiveCfg = Release|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|ARM.ActiveCfg = Release|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|Mixed Platforms.ActiveCfg = Release|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|Mixed Platforms.Build.0 = Release|x64
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -702,5 +718,6 @@ Global
 		{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}
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
 	EndGlobalSection
 EndGlobal
--- a/Roslyn.sln
+++ b/Roslyn.sln

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+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
@@ -362,6 +362,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProcessWatchdog", "src\Tool
 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}") = "CommonCoreClrRuntime", "src\Tools\CommonCoreClrRuntime\CommonCoreClrRuntime.csproj", "{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Test\Utilities\Shared\TestUtilities.projitems*{76c6f005-c89d-4348-bb4a-391898dbeb52}*SharedItemsImports = 4
@@ -396,16 +398,16 @@ Global
 		src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{fa0e905d-ec46-466d-b7b2-3b5557f9428c}*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\Core\CommandLine\CommandLine.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*SharedItemsImports = 4
 		src\Compilers\Core\MSBuildTask\Shared\MSBuildTask.Shared.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*SharedItemsImports = 4
+		src\Compilers\Core\CommandLine\CommandLine.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*SharedItemsImports = 4
 		src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{3973b09a-4fbf-44a5-8359-3d22ceb71f71}*SharedItemsImports = 4
 		src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{bedc5a4a-809e-4017-9cfd-6c8d4e1847f0}*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\CommandLine\CommandLine.projitems*{4b45ca0c-03a0-400f-b454-3d4bcb16af38}*SharedItemsImports = 4
 		src\Compilers\Core\SharedCollections\SharedCollections.projitems*{c1930979-c824-496b-a630-70f5369a636f}*SharedItemsImports = 13
-		src\Compilers\Core\CommandLine\CommandLine.projitems*{d874349c-8bb3-4bdc-8535-2d52ccca1198}*SharedItemsImports = 4
 		src\Compilers\Core\MSBuildTask\Shared\MSBuildTask.Shared.projitems*{d874349c-8bb3-4bdc-8535-2d52ccca1198}*SharedItemsImports = 4
+		src\Compilers\Core\CommandLine\CommandLine.projitems*{d874349c-8bb3-4bdc-8535-2d52ccca1198}*SharedItemsImports = 4
 		src\Compilers\Core\CommandLine\CommandLine.projitems*{e3cd2895-76a8-4d11-a316-ea67cb5ea42c}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -3155,6 +3157,20 @@ 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
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|ARM.ActiveCfg = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|Mixed Platforms.Build.0 = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|x64.ActiveCfg = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|x64.Build.0 = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|x86.ActiveCfg = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|Any CPU.ActiveCfg = Release|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|ARM.ActiveCfg = Release|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|Mixed Platforms.ActiveCfg = Release|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|Mixed Platforms.Build.0 = Release|x64
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3323,5 +3339,6 @@ Global
 		{23683607-168A-4189-955E-908F0E80E60D} = {CAD2965A-19AB-489F-BE2E-7649957F914A}
 		{1553DE60-A2B0-4FAF-B1B8-C0A7313781CC} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
 	EndGlobalSection
 EndGlobal
--- a/build/BuildNuGets.csx
+++ b/build/BuildNuGets.csx
@@ -20,7 +20,6 @@ var SolutionRoot = Path.GetFullPath(Path.Combine(ScriptRoot(), "../"));

 string ScriptRoot([CallerFilePath]string path = "") => Path.GetDirectoryName(path);

-
 #region Config Variables

 // Strip trailing '\' characters because if the path is later passed on the
@@ -39,23 +38,27 @@ var Authors = @"Microsoft";
 var ProjectURL = @"http://msdn.com/roslyn";
 var Tags = @"Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics";

-string SystemCollectionsImmutableVersion;
-string SystemReflectionMetadataVersion;
-string CodeAnalysisAnalyzersVersion;
-
 // Read preceding variables from MSBuild file
 var doc = XDocument.Load(Path.Combine(SolutionRoot, "build/Targets/VSL.Versions.targets"));
 XNamespace ns = @"http://schemas.microsoft.com/developer/msbuild/2003";
-SystemCollectionsImmutableVersion = doc.Descendants(ns + nameof(SystemCollectionsImmutableVersion)).Single().Value;
-SystemReflectionMetadataVersion = doc.Descendants(ns + nameof(SystemReflectionMetadataVersion)).Single().Value;
-CodeAnalysisAnalyzersVersion = doc.Descendants(ns + nameof(CodeAnalysisAnalyzersVersion)).Single().Value;
+string SystemCollectionsImmutableVersion = doc.Descendants(ns + nameof(SystemCollectionsImmutableVersion)).Single().Value;
+string SystemReflectionMetadataVersion = doc.Descendants(ns + nameof(SystemReflectionMetadataVersion)).Single().Value;
+string CodeAnalysisAnalyzersVersion = doc.Descendants(ns + nameof(CodeAnalysisAnalyzersVersion)).Single().Value;
+
+string MicrosoftDiaSymReaderVersion = GetExistingPackageVersion("Microsoft.DiaSymReader");
+string MicrosoftDiaSymReaderPortablePdbVersion = GetExistingPackageVersion("Microsoft.DiaSymReader.PortablePdb");
+
+string GetExistingPackageVersion(string name)
+{
+    string path = Directory.Exists(OutDir) ? Directory.GetFiles(OutDir, name + ".*.nupkg").SingleOrDefault() : null;
+    return (path == null) ? null : Path.GetFileNameWithoutExtension(path).Substring(name.Length + 1);
+}

 #endregion

 var NuGetAdditionalFilesPath = Path.Combine(SolutionRoot, "build/NuGetAdditionalFiles");
 var ThirdPartyNoticesPath = Path.Combine(NuGetAdditionalFilesPath, "ThirdPartyNotices.rtf");
 var NetCompilersPropsPath = Path.Combine(NuGetAdditionalFilesPath, "Microsoft.Net.Compilers.props");
-var IsReleaseVersion = !BuildVersion.Contains('-');

 string[] RedistPackageNames = {
    "Microsoft.CodeAnalysis.BuildTask.Portable",
@@ -98,6 +101,11 @@ var PreReleaseOnlyPackages = new HashSet<string>
    "Microsoft.Net.CSharp.Interactive.netcore",
 };

+// Create an empty directory to be used in NuGet pack
+var emptyDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+var dirInfo = Directory.CreateDirectory(emptyDir);
+File.Create(Path.Combine(emptyDir, "_._")).Close();
+
 int PackFiles(string[] packageNames, string licenseUrl)
 {
    int exit = 0;
@@ -107,7 +115,6 @@ int PackFiles(string[] packageNames, string licenseUrl)
        var nugetArgs = $@"pack {file} " +
            $"-BasePath \"{BinDir}\" " +
            $"-OutputDirectory \"{OutDir}\" " +
-            "-ExcludeEmptyDirectories " +
            $"-prop licenseUrl=\"{licenseUrl}\" " +
            $"-prop version=\"{BuildVersion}\" " +
            $"-prop authors={Authors} " +
@@ -117,7 +124,8 @@ int PackFiles(string[] packageNames, string licenseUrl)
            $"-prop systemReflectionMetadataVersion=\"{SystemReflectionMetadataVersion}\" " +
            $"-prop codeAnalysisAnalyzersVersion=\"{CodeAnalysisAnalyzersVersion}\" " +
            $"-prop thirdPartyNoticesPath=\"{ThirdPartyNoticesPath}\" " +
-            $"-prop netCompilersPropsPath=\"{NetCompilersPropsPath}\"";
+            $"-prop netCompilersPropsPath=\"{NetCompilersPropsPath}\" " +
+            $"-prop emptyDirPath=\"{emptyDir}\"";;

        var nugetExePath = Path.GetFullPath(Path.Combine(SolutionRoot, "nuget.exe"));
        var p = new Process();
@@ -138,31 +146,61 @@ int PackFiles(string[] packageNames, string licenseUrl)
    return exit;
 }

-XDocument CreatePublishingConfigDoc(IEnumerable<string> packageNames)
+XElement MakePackageElement(string packageName, string version)
+{
+    return new XElement("package", new XAttribute("id", packageName), new XAttribute("version", version));
+}
+
+IEnumerable<XElement> MakeRoslynPackageElements(bool isRelease)
+{
+    var packageNames = RedistPackageNames.Concat(NonRedistPackageNames);
+
+    if (isRelease)
+    {
+        packageNames = packageNames.Where(pn => !PreReleaseOnlyPackages.Contains(pn));
+    }
+
+    return packageNames.Select(packageName => MakePackageElement(packageName, BuildVersion));
+}
+
+void GeneratePublishingConfig(string fileName, IEnumerable<XElement> packages)
+{
+    var doc = new XDocument(new XElement("packages", packages.ToArray()));
+    doc.Save(Path.Combine(OutDir, fileName));
+}
+
+// Currently we publish some of the Roslyn dependencies. Remove this once they are moved to a separate repo.
+IEnumerable<XElement> MakePackageElementsForPublishedDependencies(bool isRelease)
 {
-    var packages =
-        packageNames.Select(packageName =>
-            new XElement("package", new XAttribute("id", packageName), new XAttribute("version", BuildVersion.ToString())));
+    if (MicrosoftDiaSymReaderVersion != null && isRelease == IsReleaseVersion(MicrosoftDiaSymReaderVersion))
+    {
+        yield return MakePackageElement("Microsoft.DiaSymReader", MicrosoftDiaSymReaderVersion);
+    }

-    return new XDocument(new XElement("packages", packages.ToArray()));
+    if (MicrosoftDiaSymReaderPortablePdbVersion != null && isRelease == IsReleaseVersion(MicrosoftDiaSymReaderPortablePdbVersion))
+    {
+        yield return MakePackageElement("Microsoft.DiaSymReader.PortablePdb", MicrosoftDiaSymReaderPortablePdbVersion);
+    }
 }

 void GeneratePublishingConfig()
 {
-    if (IsReleaseVersion)
+    if (IsReleaseVersion(BuildVersion))
    {
        // nuget:
-        var nuget = CreatePublishingConfigDoc(RedistPackageNames.Concat(NonRedistPackageNames).Where(pn => !PreReleaseOnlyPackages.Contains(pn)));
-        nuget.Save(Path.Combine(OutDir, "nuget_org-packages.config"));
+        var packages = MakeRoslynPackageElements(isRelease: true).Concat(MakePackageElementsForPublishedDependencies(isRelease: true));
+        GeneratePublishingConfig("nuget_org-packages.config", packages);
    }
    else
    {
        // myget:
-        var myget = CreatePublishingConfigDoc(RedistPackageNames.Concat(NonRedistPackageNames));
-        myget.Save(Path.Combine(OutDir, "myget_org-packages.config"));
+        var packages = MakeRoslynPackageElements(isRelease: false).Concat(MakePackageElementsForPublishedDependencies(isRelease: false));
+        GeneratePublishingConfig("myget_org-packages.config", packages);
    }
 }

+bool IsReleaseVersion(string version) => !version.Contains('-');
+
 Directory.CreateDirectory(OutDir);

 GeneratePublishingConfig();
@@ -171,4 +209,13 @@ int exit = PackFiles(RedistPackageNames, LicenseUrlRedist);
 if (exit == 0) exit = PackFiles(NonRedistPackageNames, LicenseUrlNonRedist);
 if (exit == 0) exit = PackFiles(TestPackageNames, LicenseUrlTest);

+try
+{
+    dirInfo.Delete(recursive: true);
+}
+catch
+{
+    // Ignore errors
+}
+
 Environment.Exit(exit);
--- a/build/Targets/VSL.Imports.targets
+++ b/build/Targets/VSL.Imports.targets
@@ -113,9 +113,9 @@
        <BaseNuGetRuntimeIdentifier Condition="'$(OS)' == 'Windows_NT'">win7</BaseNuGetRuntimeIdentifier>
      </PropertyGroup>

-      <!-- Upgrade portable DLLs to v5.4 -->
+      <!-- Upgrade portable projects to .NETStandard 1.3 -->
      <PropertyGroup Condition="'$(OutputType)' == 'Library'">
-        <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+        <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
      </PropertyGroup>
    </When>
  </Choose>

--- a/build/scripts/crossgen.sh
+++ b/build/scripts/crossgen.sh
@@ -24,7 +24,7 @@ if [ -z "$RID" ]; then
 fi

 # Replace with a robust method for finding the right crossgen.exe
-CROSSGEN_UTIL=~/.nuget/packages/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.1-beta-23504/tools/crossgen
+CROSSGEN_UTIL=~/.nuget/packages/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.2-rc2-23931/tools/crossgen

 cd $BIN_DIR


--- a/docs/Language Feature Status.md
+++ b/docs/Language Feature Status.md
+# Language Feature Status
+
+This document reflects the status, and planned work, for the compiler team.  It is a live document and will be updated as work progresses, features are added / removed, and as work on feature progresses.  
+
+## C# 7.0 and VB 15
+
+| Feature | Branch | State | Owners | LDM Champ |
+| ------- | ------ | ----- | ------ | ----- | ----- |
+| Async Main | none  | Feature Specification | [tyoverby](https://github.com/tyoverby), [agocke](https://github.com/agocke) | [stephentoub](https://github.com/stephentoub) |
+| Address of Static | none | Feature Specification | | [jaredpar](https://github.com/jaredpar) |
+| Binary Literals | [future](https://github.com/dotnet/roslyn/tree/future)  | Finishing | | [gafter](https://github.com/gafter) |
+| Digit Separators | [future](https://github.com/dotnet/roslyn/tree/future)  | Finishing | | [gafter](https://github.com/gafter) |
+| [Local Functions](https://github.com/dotnet/roslyn/blob/future/docs/features/local-functions.md) | [future](https://github.com/dotnet/roslyn/tree/future)  | Finishing | [agocke](https://github.com/agocke), [jaredpar](https://github.com/jaredpar), [vsadov](https://github.com/vsadov) | [gafter](https://github.com/gafter) |
+| [Pattern Matching](https://github.com/dotnet/roslyn/blob/future/docs/features/patterns.md) | [features/patterns](https://github.com/dotnet/roslyn/tree/features/patterns) | Prototyping | [gafter](https://github.com/gafter), [alekseyts](https://github.com/alekseyts), [agocke](https://github.com/agocke) | [gafter](https://github.com/gafter) |
+| Records | none | Feature Specification | [jcouv](https://github.com/jcouv) | [gafter](https://github.com/gafter) |
+| Ref Returns | [future](https://github.com/dotnet/roslyn/tree/future) | Finishing | [vsadov](https://github.com/vsadov), [agocke](https://github.com/agocke), [jaredpar](https://github.com/jaredpar) | [vsadov](https://github.com/vsadov) |
+| Source Generation | [future](https://github.com/dotnet/roslyn/tree/features/generators) | Prototyping | [cston](https://github.com/cston), [vsadov](https://github.com/vsadov) | [mattwar](https://github.com/mattwar) |
+| Throw Expr | [features/patterns](https://github.com/dotnet/roslyn/tree/features/patterns) | Prototyping | [agocke](https://github.com/agocke), [tyoverby](https://github.com/tyoverby), [gafter](https://github.com/gafter) | [gafter](https://github.com/gafter) |
+| Tuples | [features/tuples](https://github.com/dotnet/roslyn/tree/features/tuples) | Prototyping | [vsadov](https://github.com/vsadov), [jcouv](https://github.com/jcouv) | [madstorgerson](https://github.com/MadsTorgersen) |
+| Out var | none | Feature Specification | [alekseyts](https://github.com/alekseyts) | [gafter](https://github.com/gafter) |
+| With Exprs | none | Feature Specification | [gafter](https://github.com/gafter) | [gafter](https://github.com/gafter) |
+
+## (C# 7.0 and VB 15) + 1
+
+| Feature | Branch | State | Owners | LDM |
+| ------- | ------ | ----- | ------ | ----- |
+| Protected Private | [features/privateprotected](https://github.com/dotnet/roslyn/tree/features/privateprotected) | Prototyping | | [gafter](https://github.com/gafter) |
+| [Non-null Ref Types](https://github.com/dotnet/roslyn/blob/features/NullableReferenceTypes/docs/features/NullableReferenceTypes/Nullable%20reference%20types.md) | [features/NullableReferenceTypes](https://github.com/dotnet/roslyn/tree/features/NullableReferenceTypes) | Prototyping | [alekseyts](https://github.com/alekseyts) | [mattwar](https://github.com/mattwar) |
+| Better Betterness | | Feature Specification | | [gafter](https://github.com/gafter) |
+
+# FAQ
+
+- **Is target version a guarantee?**: No.  It's explicitly not a guarantee.  This is just the planned and on going work to the best of our knowledge at this time.
+- **Where are these State values defined?**: Take a look at the [Developing a Language Feature](contributing/Developing a Language Feature.md) document.
--- a/netci.groovy
+++ b/netci.groovy
@@ -2,8 +2,15 @@
 // Jenkins DSL: https://github.com/jenkinsci/job-dsl-plugin/wiki

 import jobs.generation.Utilities;
+import static Constants.*;
+
 def project = GithubProject

+class Constants {
+    // Number of minutes a build job is given to complete.
+    static final BuildTimeLimit = 120;
+}
+
 static void addLogRotator(def myJob) {
  myJob.with {
    logRotator {
@@ -50,7 +57,7 @@ static void addWrappers(def myJob) {
  myJob.with {
    wrappers {
      timeout {
-        absolute(120)
+        absolute(BuildTimeLimit)
        abortBuild()
      }
      timestamps()
@@ -225,7 +232,7 @@ def branchNames = []
                    batchFile("""set TEMP=%WORKSPACE%\\Binaries\\Temp
 mkdir %TEMP%
 set TMP=%TEMP%
-.\\cibuild.cmd ${(configuration == 'dbg') ? '/debug' : '/release'} ${(buildTarget == 'unit32') ? '/test32' : '/test64'}""")
+.\\cibuild.cmd ${(configuration == 'dbg') ? '/debug' : '/release'} ${(buildTarget == 'unit32') ? '/test32' : '/test64'} /buildTimeLimit ${BuildTimeLimit}""")
                  }
                }
                Utilities.setMachineAffinity(myJob, 'Windows_NT', 'latest-or-auto')

--- a/src/Compilers/CSharp/Test/Emit/PDB/PDBTests.cs
+++ b/src/Compilers/CSharp/Test/Emit/PDB/PDBTests.cs
@@ -151,6 +151,70 @@ public void SymWriterErrors()
            }
        }

+        [Fact]
+        public void SymWriterErrors2()
+        {
+            var source0 =
+@"class C
+{
+}";
+            var compilation = CreateCompilationWithMscorlib(source0, options: TestOptions.DebugDll);
+
+            // Verify full metadata contains expected rows.
+            using (MemoryStream peStream = new MemoryStream(), pdbStream = new MemoryStream())
+            {
+                var result = compilation.Emit(
+                    peStream: peStream,
+                    pdbStream: pdbStream,
+                    xmlDocumentationStream: null,
+                    cancellationToken: default(CancellationToken),
+                    win32Resources: null,
+                    manifestResources: null,
+                    options: null,
+                    debugEntryPoint: null,
+                    getHostDiagnostics: null,
+                    testData: new CompilationTestData() { SymWriterFactory = () => new object() });
+
+                result.Diagnostics.Verify(
+                    // error CS0041: Unexpected error writing debug information -- 'Windows PDB writer is not available -- could not find Microsoft.DiaSymReader.Native.{0}.dll'
+                    Diagnostic(ErrorCode.FTL_DebugEmitFailure).WithArguments(string.Format(CodeAnalysisResources.SymWriterNotAvailable, (IntPtr.Size == 4) ? "x86" : "amd64")));
+
+                Assert.False(result.Success);
+            }
+        }
+
+        [Fact]
+        public void SymWriterErrors3()
+        {
+            var source0 =
+@"class C
+{
+}";
+            var compilation = CreateCompilationWithMscorlib(source0, options: TestOptions.DebugDll.WithDeterministic(true));
+
+            // Verify full metadata contains expected rows.
+            using (MemoryStream peStream = new MemoryStream(), pdbStream = new MemoryStream())
+            {
+                var result = compilation.Emit(
+                    peStream: peStream,
+                    pdbStream: pdbStream,
+                    xmlDocumentationStream: null,
+                    cancellationToken: default(CancellationToken),
+                    win32Resources: null,
+                    manifestResources: null,
+                    options: null,
+                    debugEntryPoint: null,
+                    getHostDiagnostics: null,
+                    testData: new CompilationTestData() { SymWriterFactory = () => new MockSymUnmanagedWriter() });
+
+                result.Diagnostics.Verify(
+                    // error CS0041: Unexpected error writing debug information -- 'Windows PDB writer doesn't support deterministic compilation -- could not find Microsoft.DiaSymReader.Native.{0}.dll'
+                    Diagnostic(ErrorCode.FTL_DebugEmitFailure).WithArguments(string.Format(CodeAnalysisResources.SymWriterNotDeterministic, (IntPtr.Size == 4) ? "x86" : "amd64")));
+
+                Assert.False(result.Success);
+            }
+        }
+
        [Fact]
        public void ExtendedCustomDebugInformation()
        {

--- a/src/Compilers/CSharp/Test/Syntax/project.json
+++ b/src/Compilers/CSharp/Test/Syntax/project.json
 {
  "dependencies": { },
  "frameworks": {
-    "dotnet5.4": {
-      "imports": "portable-net452"
+    "netstandard1.3": {
+      "imports": [ "portable-net452", "dotnet5.4" ]
    }
  }
 }
--- a/src/Compilers/Core/MSBuildTask/Portable/MSBuildTask.csproj
+++ b/src/Compilers/Core/MSBuildTask/Portable/MSBuildTask.csproj
@@ -18,7 +18,6 @@
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
-    <TargetFrameworkProfile />
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <DefineConstants>$(DefineConstants);PORTABLE50</DefineConstants>
    <!-- Remove when the Microsoft.Build.Framework package is updated. See issue #6986. -->
@@ -50,7 +49,4 @@
  <ImportGroup Label="Targets">
    <Import Project="..\..\..\..\..\build\Targets\VSL.Imports.targets" />
  </ImportGroup>
-  <PropertyGroup>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
--- a/src/Compilers/Core/MSBuildTask/Portable/project.json
+++ b/src/Compilers/Core/MSBuildTask/Portable/project.json
 {
  "dependencies": {
-    "Microsoft.NETCore.Portable.Compatibility": "1.0.1-beta-23504",
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
    "Microsoft.NETCore.Platforms": "1.0.0",
    "Microsoft.Build.Tasks.Core": "0.1.0-preview-00005",
    "Microsoft.Build.Utilities.Core": "0.1.0-preview-00005",
-    "Microsoft.Win32.Primitives": "4.0.1-beta-23504",
-    "System.Console": "4.0.0-beta-23504",
-    "System.Diagnostics.Tools": "4.0.1-beta-23504",
-    "System.Diagnostics.Process": "4.1.0-beta-23504",
-    "System.IO.Pipes": "4.0.0-beta-23504",
-    "System.Runtime": "4.0.21-beta-23504",
-    "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23504",
-    "System.IO.FileSystem": "4.0.1-beta-23504",
-    "System.IO.FileSystem.DriveInfo": "4.0.0-beta-23504"
+    "Microsoft.Win32.Primitives": "4.0.0",
+    "System.Console": "4.0.0-rc2-23931",
+    "System.Diagnostics.Tools": "4.0.0",
+    "System.Diagnostics.Process": "4.1.0-rc2-23931",
+    "System.IO.Pipes": "4.0.0-rc2-23931",
+    "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-23931",
+    "System.IO.FileSystem.DriveInfo": "4.0.0-rc2-23931"
  },
  "frameworks": {
-    "dotnet5.4": {
-      "imports": "portable-net452"
+    "netstandard1.3": {
+      "imports": [ "portable-net452", "dotnet5.4" ]
    }
  }
-}
\ No newline at end of file
+}
--- a/src/Compilers/Core/Portable/CodeAnalysisResources.Designer.cs
+++ b/src/Compilers/Core/Portable/CodeAnalysisResources.Designer.cs
@@ -1073,7 +1073,7 @@ internal class CodeAnalysisResources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Then span does not include the end of a line..
+        ///   Looks up a localized string similar to The span does not include the end of a line..
        /// </summary>
        internal static string SpanDoesNotIncludeEndOfLine {
            get {
@@ -1127,7 +1127,16 @@ internal class CodeAnalysisResources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to SymWriter doesn&apos;t support deterministic compilation.
+        ///   Looks up a localized string similar to Windows PDB writer is not available -- could not find Microsoft.DiaSymReader.Native.{0}.dll.
+        /// </summary>
+        internal static string SymWriterNotAvailable {
+            get {
+                return ResourceManager.GetString("SymWriterNotAvailable", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Windows PDB writer doesn&apos;t support deterministic compilation -- could not find Microsoft.DiaSymReader.Native.{0}.dll.
        /// </summary>
        internal static string SymWriterNotDeterministic {
            get {

--- a/src/Compilers/Core/Portable/CodeAnalysisResources.resx
+++ b/src/Compilers/Core/Portable/CodeAnalysisResources.resx
@@ -453,7 +453,10 @@
    <value>Invalid data at offset {0}: {1}{2}*{3}{4}</value>
  </data>
  <data name="SymWriterNotDeterministic" xml:space="preserve">
-    <value>SymWriter doesn't support deterministic compilation</value>
+    <value>Windows PDB writer doesn't support deterministic compilation -- could not find Microsoft.DiaSymReader.Native.{0}.dll</value>
+  </data>
+  <data name="SymWriterNotAvailable" xml:space="preserve">
+    <value>Windows PDB writer is not available -- could not find Microsoft.DiaSymReader.Native.{0}.dll</value>
  </data>
  <data name="RuleSetBadAttributeValue" xml:space="preserve">
    <value>The attribute {0} has an invalid value of {1}.</value>

--- a/src/Compilers/Core/Portable/NativePdbWriter/PdbWriter.cs
+++ b/src/Compilers/Core/Portable/NativePdbWriter/PdbWriter.cs
@@ -765,6 +765,8 @@ private void DefineScopeLocals(LocalScope currentScope, uint localSignatureToken
        [DllImport("Microsoft.DiaSymReader.Native.amd64.dll", EntryPoint = "CreateSymWriter")]
        private extern static void CreateSymWriter64(ref Guid id, [MarshalAs(UnmanagedType.IUnknown)]out object symWriter);

+        private static string PlatformId => (IntPtr.Size == 4) ? "x86" : "amd64";
+
        private static Type GetCorSymWriterSxSType()
        {
            if (s_lazyCorSymWriterSxSType == null)
@@ -815,7 +817,16 @@ public void SetMetadataEmitter(MetadataWriter metadataWriter)
        {
            try
            {
-                var symWriter = (ISymUnmanagedWriter5)(_symWriterFactory != null ? _symWriterFactory() : CreateSymWriterWorker());
+                ISymUnmanagedWriter5 symWriter;
+
+                try
+                {
+                    symWriter = (ISymUnmanagedWriter5)(_symWriterFactory != null ? _symWriterFactory() : CreateSymWriterWorker());
+                }
+                catch (Exception)
+                {
+                    throw new NotSupportedException(string.Format(CodeAnalysisResources.SymWriterNotAvailable, PlatformId));
+                }

                // Correctness: If the stream is not specified or if it is non-empty the SymWriter appends data to it (provided it contains valid PDB)
                // and the resulting PDB has Age = existing_age + 1.
@@ -825,7 +836,7 @@ public void SetMetadataEmitter(MetadataWriter metadataWriter)
                {
                    if (!(symWriter is ISymUnmanagedWriter7))
                    {
-                        throw new NotSupportedException(CodeAnalysisResources.SymWriterNotDeterministic);
+                        throw new NotSupportedException(string.Format(CodeAnalysisResources.SymWriterNotDeterministic, PlatformId));
                    }

                    ((ISymUnmanagedWriter7)symWriter).InitializeDeterministic(new PdbMetadataWrapper(metadataWriter), _pdbStream);

--- a/src/Compilers/Test/Utilities/CSharp/CSharpCompilerTestUtilities.csproj
+++ b/src/Compilers/Test/Utilities/CSharp/CSharpCompilerTestUtilities.csproj
@@ -83,4 +83,9 @@
    <Import Project="..\..\..\..\..\build\Targets\VSL.Imports.targets" />
    <Import Project="..\..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
  </ImportGroup>
-</Project>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties project_1json__JSONSchema="http://json.schemastore.org/launchsettings" />
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
--- a/src/Compilers/Test/Utilities/CSharp/project.json
+++ b/src/Compilers/Test/Utilities/CSharp/project.json
@@ -3,8 +3,8 @@
    "System.Reflection.TypeExtensions": "4.0.0"
  },
  "frameworks": {
-    "dotnet5.4": {
-      "imports": "portable-net452"
+    "netstandard1.3": {
+      "imports": [ "portable-net452", "dotnet5.4" ]
    }
  }
 }
\ No newline at end of file
--- a/src/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/project.json
+++ b/src/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/project.json
 {
  "dependencies": {
-    "Microsoft.NETCore.Portable.Compatibility": "1.0.1-beta-23504",
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
    "System.Collections": "4.0.10",
    "System.Diagnostics.Debug": "4.0.10",
    "System.Runtime": "4.0.20",
@@ -11,8 +11,8 @@
    "xunit": "2.1.0"
  },
  "frameworks": {
-    "dotnet5.4": {
-      "imports": "portable-net452"
+    "netstandard1.3": {
+      "imports": [ "portable-net452", "dotnet5.4" ]
    }
  }
 }
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Controller.Session_SetModelSelectedItem.cs
+++ b/src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Controller.Session_SetModelSelectedItem.cs
@@ -21,6 +21,13 @@ private void SetModelSelectedItem(Func<Model, CompletionItem> selector)
                    updateController: false);
            }

+            public void SetModelIsHardSelection(bool isHardSelection)
+            {
+                AssertIsForeground();
+
+                Computation.ChainTaskAndNotifyControllerWhenFinished(model => model?.WithHardSelection(isHardSelection));
+            }
+
            private Model SetModelSelectedItemInBackground(
                Model model,
                Func<Model, CompletionItem> selector)

--- a/src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Controller_CaretPositionChanged.cs
+++ b/src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Controller_CaretPositionChanged.cs
@@ -28,9 +28,33 @@ internal override void OnCaretPositionChanged(object sender, EventArgs args)
            if (model == null ||
                this.IsCaretOutsideAllItemBounds(model, caretPoint))
            {
-                // Completions hadn't even been computed yet or the caret is out of bounds.  
+                // Completions hadn't even been computed yet or the caret is out of bounds.
                // Just cancel everything we're doing.
                this.StopModelComputation();
+                return;
+            }
+
+            // TODO(cyrusn): Find a way to allow the user to cancel out of this.
+            model = sessionOpt.WaitForModel();
+            if (model == null)
+            {
+                return;
+            }
+
+            if (model.SelectedItem != null && model.IsHardSelection)
+            {
+                // Switch to soft selection, if user moved caret to the start of a non-empty filter span.
+                // This prevents commiting if user types a commit character at this position later, but still has the list if user types filter character
+                // i.e. blah| -> |blah -> !|blah
+                // We want the filter span non-empty because we still want completion in the following case:
+                // A a = new | -> A a = new (|
+
+                var selectedItem = Controller.GetExternallyUsableCompletionItem(model.SelectedItem);
+                var currentSpan = model.GetSubjectBufferFilterSpanInViewBuffer(selectedItem.FilterSpan).TextSpan;
+                if (caretPoint == currentSpan.Start && currentSpan.Length > 0)
+                {
+                    sessionOpt.SetModelIsHardSelection(false);
+                }
            }
        }


--- a/src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests.vb
+++ b/src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests.vb
@@ -987,6 +987,34 @@ class C
            End Using
        End Function

+        <WorkItem(5487, "https://github.com/dotnet/roslyn/issues/5487")>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.Completion)>
+        Public Async Function TestCommitCharTypedAtTheBeginingOfTheFilterSpan() As Task
+            Using state = TestState.CreateCSharpTestState(
+                  <Document><![CDATA[
+class C
+{
+    public bool Method()
+    {
+        if ($$
+    }
+}
+            ]]></Document>)
+
+                state.SendTypeChars("Met")
+                Await state.AssertCompletionSession()
+                state.SendLeftKey()
+                state.SendLeftKey()
+                state.SendLeftKey()
+                Await state.AssertSelectedCompletionItem(isSoftSelected:=True)
+                state.SendTypeChars("!")
+                Await state.AssertNoCompletionSession()
+                Await state.WaitForAsynchronousOperationsAsync()
+                Assert.Equal("if (!Met", state.GetLineTextFromCaretPosition().Trim())
+                Assert.Equal("M", state.GetCaretPoint().BufferPosition.GetChar())
+            End Using
+        End Function
+
        <WorkItem(622957, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/622957")>
        <WpfFact, Trait(Traits.Feature, Traits.Features.Completion)>
        Public Async Function TestBangFiltersInDocComment() As Task

--- a/src/EditorFeatures/Test2/IntelliSense/VisualBasicCompletionCommandHandlerTests.vb
+++ b/src/EditorFeatures/Test2/IntelliSense/VisualBasicCompletionCommandHandlerTests.vb
@@ -138,6 +138,31 @@ End Module
            End Using
        End Sub

+        <WorkItem(5487, "https://github.com/dotnet/roslyn/issues/5487")>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.Completion)>
+        Public Async Function TestCommitCharTypedAtTheBeginingOfTheFilterSpan() As Task
+            Using state = TestState.CreateVisualBasicTestState(
+                  <Document><![CDATA[
+Class C
+    Public Fuction F() As Boolean
+        If $$
+    End Function
+End Class
+            ]]></Document>)
+
+                state.SendTypeChars("tru")
+                Await state.AssertCompletionSession()
+                state.SendLeftKey()
+                state.SendLeftKey()
+                state.SendLeftKey()
+                Await state.AssertSelectedCompletionItem(isSoftSelected:=True)
+                state.SendTypeChars("(")
+                Await state.WaitForAsynchronousOperationsAsync()
+                Assert.Equal("If (tru", state.GetLineTextFromCaretPosition().Trim())
+                Assert.Equal("t", state.GetCaretPoint().BufferPosition.GetChar())
+            End Using
+        End Function
+
        <WpfFact, Trait(Traits.Feature, Traits.Features.Completion)>
        Public Async Function CompletionAdjustInsertionText_CommitsOnOpenParens2() As Task
            Using state = TestState.CreateVisualBasicTestState(

--- a/src/Interactive/csi/project.json
+++ b/src/Interactive/csi/project.json
 {
-  "dependencies": {
-    "System.Runtime": "4.0.21-beta-23504"
-  },
+  "dependencies": { },
  "frameworks": {
    "net46": { }
  },

--- a/src/NuGet/Microsoft.CodeAnalysis.Common.nuspec
+++ b/src/NuGet/Microsoft.CodeAnalysis.Common.nuspec
@@ -23,41 +23,42 @@ Supported Platforms:
            <dependency id="System.Reflection.Metadata" version="$systemReflectionMetadataVersion$" />
            <dependency id="Microsoft.CodeAnalysis.Analyzers" version="$codeAnalysisAnalyzersVersion$" />

-            <dependency id="System.AppContext" version="4.1.0-rc2-23910" />
-            <dependency id="System.Collections" version="4.0.11-rc2-23910" />
-            <dependency id="System.Collections.Concurrent" version="4.0.12-rc2-23910" />
-            <dependency id="System.Console" version="4.0.0-rc2-23910" />
-            <dependency id="System.Diagnostics.Debug" version="4.0.11-rc2-23910" />
-            <dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0-rc2-23910" exclude="Compile" />
-            <dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc2-23910" exclude="Compile" />
-            <dependency id="System.Diagnostics.Tools" version="4.0.1-rc2-23910" />
-            <dependency id="System.Dynamic.Runtime" version="4.0.11-rc2-23910" />
-            <dependency id="System.Globalization" version="4.0.11-rc2-23910" />
-            <dependency id="System.IO.FileSystem" version="4.0.1-rc2-23910" />
-            <dependency id="System.Linq" version="4.0.1-rc2-23910" />
-            <dependency id="System.Linq.Expressions" version="4.0.11-rc2-23910" />
-            <dependency id="System.Reflection" version="4.1.0-rc2-23910" />
-            <dependency id="System.Reflection.Primitives" version="4.0.1-rc2-23910" />
-            <dependency id="System.Resources.ResourceManager" version="4.0.1-rc2-23910" />
-            <dependency id="System.Runtime" version="4.0.21-rc2-23910" />
-            <dependency id="System.Runtime.Extensions" version="4.0.11-rc2-23910" />
-            <dependency id="System.Runtime.Handles" version="4.0.1-rc2-23910" />
-            <dependency id="System.Runtime.InteropServices" version="4.0.21-rc2-23910" />
-            <dependency id="System.Runtime.Numerics" version="4.0.1-rc2-23910" />
-            <dependency id="System.Security.Cryptography.Algorithms" version="4.0.0-rc2-23910" />
-            <dependency id="System.Security.Cryptography.Encoding" version="4.0.0-rc2-23910" />
-            <dependency id="System.Security.Cryptography.X509Certificates" version="4.0.0-rc2-23910" />
-            <dependency id="System.Text.Encoding" version="4.0.11-rc2-23910" />
-            <dependency id="System.Text.Encoding.CodePages" version="4.0.1-rc2-23910" exclude="Compile" />
-            <dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc2-23910" />
-            <dependency id="System.Threading" version="4.0.11-rc2-23910" exclude="Compile" />
-            <dependency id="System.Threading.Tasks" version="4.0.11-rc2-23910" />
-            <dependency id="System.Threading.Tasks.Parallel" version="4.0.1-rc2-23910" />
-            <dependency id="System.Threading.Thread" version="4.0.0-rc2-23910" exclude="Compile" />
-            <dependency id="System.Xml.ReaderWriter" version="4.0.11-rc2-23910" />
-            <dependency id="System.Xml.XDocument" version="4.0.11-rc2-23910" />
-            <dependency id="System.Xml.XmlDocument" version="4.0.1-rc2-23910" exclude="Compile" />
-            <dependency id="System.Xml.XPath.XDocument" version="4.0.1-rc2-23910" exclude="Compile" />
+            <dependency id="System.AppContext" version="4.1.0-rc2-23931" />
+            <dependency id="System.Collections" version="4.0.11-rc2-23931" />
+            <dependency id="System.Collections.Concurrent" version="4.0.12-rc2-23931" />
+            <dependency id="System.Console" version="4.0.0-rc2-23931" />
+            <dependency id="System.Diagnostics.Debug" version="4.0.11-rc2-23931" />
+            <dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0-rc2-23931" exclude="Compile" />
+            <dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc2-23931" exclude="Compile" />
+            <dependency id="System.Diagnostics.Tools" version="4.0.1-rc2-23931" />
+            <dependency id="System.Dynamic.Runtime" version="4.0.11-rc2-23931" />
+            <dependency id="System.Globalization" version="4.0.11-rc2-23931" />
+            <dependency id="System.IO.FileSystem" version="4.0.1-rc2-23931" />
+            <dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc2-23931" />
+            <dependency id="System.Linq" version="4.1.0-rc2-23931" />
+            <dependency id="System.Linq.Expressions" version="4.0.11-rc2-23931" />
+            <dependency id="System.Reflection" version="4.1.0-rc2-23931" />
+            <dependency id="System.Reflection.Primitives" version="4.0.1-rc2-23931" />
+            <dependency id="System.Resources.ResourceManager" version="4.0.1-rc2-23931" />
+            <dependency id="System.Runtime" version="4.1.0-rc2-23931" />
+            <dependency id="System.Runtime.Extensions" version="4.1.0-rc2-23931" />
+            <dependency id="System.Runtime.Handles" version="4.0.1-rc2-23931" />
+            <dependency id="System.Runtime.InteropServices" version="4.1.0-rc2-23931" />
+            <dependency id="System.Runtime.Numerics" version="4.0.1-rc2-23931" />
+            <dependency id="System.Security.Cryptography.Algorithms" version="4.1.0-rc2-23931" />
+            <dependency id="System.Security.Cryptography.Encoding" version="4.0.0-rc2-23931" />
+            <dependency id="System.Security.Cryptography.X509Certificates" version="4.1.0-rc2-23931" />
+            <dependency id="System.Text.Encoding" version="4.0.11-rc2-23931" />
+            <dependency id="System.Text.Encoding.CodePages" version="4.0.1-rc2-23931" exclude="Compile" />
+            <dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc2-23931" />
+            <dependency id="System.Threading" version="4.0.11-rc2-23931" exclude="Compile" />
+            <dependency id="System.Threading.Tasks" version="4.0.11-rc2-23931" />
+            <dependency id="System.Threading.Tasks.Parallel" version="4.0.1-rc2-23931" />
+            <dependency id="System.Threading.Thread" version="4.0.0-rc2-23931" exclude="Compile" />
+            <dependency id="System.Xml.ReaderWriter" version="4.0.11-rc2-23931" />
+            <dependency id="System.Xml.XDocument" version="4.0.11-rc2-23931" />
+            <dependency id="System.Xml.XmlDocument" version="4.0.1-rc2-23931" exclude="Compile" />
+            <dependency id="System.Xml.XPath.XDocument" version="4.0.1-rc2-23931" exclude="Compile" />
        </group>
    </dependencies>


--- a/src/NuGet/Microsoft.Net.Compilers.netcore.nuspec
+++ b/src/NuGet/Microsoft.Net.Compilers.netcore.nuspec
@@ -18,50 +18,50 @@
        <dependencies>
            <group targetFramework="dnxcore50">
                <dependency id="Microsoft.CodeAnalysis.Compilers" version="[$version$]" />
-                <dependency id="System.AppContext" version="4.0.1-beta-23504" />
-                <dependency id="System.Collections" version="4.0.11-beta-23504" />
-                <dependency id="System.Collections.Immutable" version="1.1.38-beta-23504" />
-                <dependency id="System.Console" version="4.0.0-beta-23504" />
-                <dependency id="System.Diagnostics.Debug" version="4.0.11-beta-23504" />
-                <dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0-beta-23504" />
-                <dependency id="System.Diagnostics.Process" version="4.1.0-beta-23504" />
-                <dependency id="System.Diagnostics.StackTrace" version="4.0.1-beta-23504" />
-                <dependency id="System.Diagnostics.Tools" version="4.0.1-beta-23504" />
-                <dependency id="System.Dynamic.Runtime" version="4.0.11-beta-23504" />
-                <dependency id="System.IO.FileSystem" version="4.0.1-beta-23504" />
-                <dependency id="System.IO.FileSystem.Watcher" version="4.0.0-beta-23504" />
-                <dependency id="System.IO.Pipes" version="4.0.0-beta-23504" />
-                <dependency id="System.Linq" version="4.0.1-beta-23504" />
-                <dependency id="System.Net.NameResolution" version="4.0.0-beta-23504" />
-                <dependency id="System.Net.Sockets" version="4.1.0-beta-23504" />
-                <dependency id="System.Private.Uri" version="4.0.1-beta-23504" />
-                <dependency id="System.Reflection" version="4.1.0-beta-23504" />
-                <dependency id="System.Reflection.Primitives" version="4.0.1-beta-23504" />
-                <dependency id="System.Resources.ResourceManager" version="4.0.1-beta-23504" />
-                <dependency id="System.Runtime" version="4.0.21-beta-23504" />
-                <dependency id="System.Runtime.Extensions" version="4.0.11-beta-23504" />
-                <dependency id="System.Runtime.Handles" version="4.0.1-beta-23504" />
-                <dependency id="System.Runtime.InteropServices" version="4.0.21-beta-23504" />
-                <dependency id="System.Runtime.Loader" version="4.0.0-beta-23504" />
-                <dependency id="System.Runtime.Numerics" version="4.0.1-beta-23504" />
-                <dependency id="System.Runtime.Serialization.Json" version="4.0.1-beta-23504" />
-                <dependency id="System.Security.Cryptography.Algorithms" version="4.0.0-beta-23504" />
-                <dependency id="System.Security.Cryptography.Encoding" version="4.0.0-beta-23504" />
-                <dependency id="System.Security.Cryptography.X509Certificates" version="4.0.0-beta-23504" />
-                <dependency id="System.Text.Encoding" version="4.0.11-beta-23504" />
-                <dependency id="System.Text.Encoding.CodePages" version="4.0.1-beta-23504" />
-                <dependency id="System.Text.Encoding.Extensions" version="4.0.11-beta-23504" />
-                <dependency id="System.Threading" version="4.0.11-beta-23504" />
-                <dependency id="System.Threading.Tasks" version="4.0.11-beta-23504" />
-                <dependency id="System.Threading.Tasks.Parallel" version="4.0.1-beta-23504" />
-                <dependency id="System.Threading.Thread" version="4.0.0-beta-23504" />
-                <dependency id="System.Xml.XDocument" version="4.0.11-beta-23504" />
-                <dependency id="System.Xml.XmlDocument" version="4.0.1-beta-23504" />
-                <dependency id="System.Xml.XPath.XDocument" version="4.0.1-beta-23504" />
+                <dependency id="System.AppContext" version="4.1.0-rc2-23931" />
+                <dependency id="System.Collections" version="4.0.11-rc2-23931" />
+                <dependency id="System.Collections.Concurrent" version="4.0.12-rc2-23931" />
+                <dependency id="System.Collections.Immutable" version="1.2.0-rc2-23931" />
+                <dependency id="System.Console" version="4.0.0-rc2-23931" />
+                <dependency id="System.Diagnostics.Debug" version="4.0.11-rc2-23931" />
+                <dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0-rc2-23931" />
+                <dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc2-23931" />
+                <dependency id="System.Diagnostics.Tools" version="4.0.1-rc2-23931" />
+                <dependency id="System.Dynamic.Runtime" version="4.0.11-rc2-23931" />
+                <dependency id="System.Globalization" version="4.0.11-rc2-23931" />
+                <dependency id="System.IO.FileSystem" version="4.0.1-rc2-23931" />
+                <dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc2-23931" />
+                <dependency id="System.Linq" version="4.1.0-rc2-23931" />
+                <dependency id="System.Linq.Expressions" version="4.0.11-rc2-23931" />
+                <dependency id="System.Reflection" version="4.1.0-rc2-23931" />
+                <dependency id="System.Reflection.Primitives" version="4.0.1-rc2-23931" />
+                <dependency id="System.Resources.ResourceManager" version="4.0.1-rc2-23931" />
+                <dependency id="System.Runtime" version="4.1.0-rc2-23931" />
+                <dependency id="System.Runtime.Extensions" version="4.1.0-rc2-23931" />
+                <dependency id="System.Runtime.Handles" version="4.0.1-rc2-23931" />
+                <dependency id="System.Runtime.InteropServices" version="4.1.0-rc2-23931" />
+                <dependency id="System.Runtime.Loader" version="4.0.0-rc2-23931" />
+                <dependency id="System.Runtime.Numerics" version="4.0.1-rc2-23931" />
+                <dependency id="System.Security.Cryptography.Algorithms" version="4.1.0-rc2-23931" />
+                <dependency id="System.Security.Cryptography.Encoding" version="4.0.0-rc2-23931" />
+                <dependency id="System.Security.Cryptography.X509Certificates" version="4.1.0-rc2-23931" />
+                <dependency id="System.Text.Encoding" version="4.0.11-rc2-23931" />
+                <dependency id="System.Text.Encoding.CodePages" version="4.0.1-rc2-23931" />
+                <dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc2-23931" />
+                <dependency id="System.Threading" version="4.0.11-rc2-23931" />
+                <dependency id="System.Threading.Tasks" version="4.0.11-rc2-23931" />
+                <dependency id="System.Threading.Tasks.Parallel" version="4.0.1-rc2-23931" />
+                <dependency id="System.Threading.Thread" version="4.0.0-rc2-23931" />
+                <dependency id="System.Xml.ReaderWriter" version="4.0.11-rc2-23931" />
+                <dependency id="System.Xml.XDocument" version="4.0.11-rc2-23931" />
+                <dependency id="System.Xml.XmlDocument" version="4.0.1-rc2-23931" />
+                <dependency id="System.Xml.XPath.XDocument" version="4.0.1-rc2-23931" />
            </group>
        </dependencies>
    </metadata>
    <files>
+        <file src="$emptyDirPath$/_._" target="ref/dotnet" />
+        <file src="$emptyDirPath$/_._" target="ref/dnxcore50" />
        <file src="csccore/csc.exe" target="runtimes/any/native" />
        <file src="vbccore/vbc.exe" target="runtimes/any/native" />
    </files>

--- a/src/Scripting/CSharp/project.json
+++ b/src/Scripting/CSharp/project.json
@@ -5,8 +5,8 @@
    "System.Dynamic.Runtime": "4.0.10"
  },
  "frameworks": {
-    "dotnet5.4": {
-      "imports": "portable-net452"
+    "netstandard1.3": {
+      "imports": [ "portable-net452", "dotnet5.4" ]
    }
  }
 }
--- a/src/Scripting/CSharpTest.Desktop/project.json
+++ b/src/Scripting/CSharpTest.Desktop/project.json
 {
  "dependencies": {
-    "System.Diagnostics.Process": "4.1.0-beta-23504"
+    "System.Diagnostics.Process": "4.1.0-rc2-23931"
  },
  "frameworks": {
    "net46": {}

--- a/src/Scripting/CSharpTest/project.json
+++ b/src/Scripting/CSharpTest/project.json
 {
  "dependencies": { },
  "frameworks": {
-    "dotnet5.4": {
-      "imports": "portable-net452"
+    "netstandard1.3": {
+      "imports": [ "portable-net452", "dotnet5.4" ]
    }
  }
 }
\ No newline at end of file
--- a/src/Scripting/Core/Scripting.csproj
+++ b/src/Scripting/Core/Scripting.csproj
@@ -12,7 +12,6 @@
    <AssemblyName>Microsoft.CodeAnalysis.Scripting</AssemblyName>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
  </PropertyGroup>
@@ -40,7 +39,7 @@
  </PropertyGroup>
  <ItemGroup>
    <!-- Workaround for https://github.com/NuGet/Home/issues/1471 -->
-    <Reference Include="$(NuGetPackageRoot)\System.Runtime.Loader\4.0.0-beta-23504\ref\dotnet5.1\System.Runtime.Loader.dll">
+    <Reference Include="$(NuGetPackageRoot)\System.Runtime.Loader\4.0.0-rc2-23931\ref\netstandard1.5\System.Runtime.Loader.dll">
      <Private>False</Private>
    </Reference>
  </ItemGroup>
@@ -161,4 +160,4 @@
  <ImportGroup Label="Targets">
    <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
  </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
--- a/src/Scripting/Core/project.json
+++ b/src/Scripting/Core/project.json
 {
  "dependencies": {
-    "Microsoft.NETCore.Portable.Compatibility": "1.0.1-beta-23504",
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
    "System.AppContext": "4.0.0",
    "System.Collections": "4.0.10",
    "System.Collections.Immutable": "1.1.37",
@@ -22,8 +22,8 @@
    "System.Threading.Tasks": "4.0.10"
  },
  "frameworks": {
-    "dotnet5.4": {
-      "imports": "portable-net452"
+    "netstandard1.3": {
+      "imports": [ "portable-net452", "dotnet5.4" ]
    }
  }
 }
--- a/src/Scripting/CoreTest/project.json
+++ b/src/Scripting/CoreTest/project.json
 {
  "dependencies": { },
  "frameworks": {
-    "dotnet5.4": {
-      "imports": "portable-net452"
+    "netstandard1.3": {
+      "imports": [ "portable-net452", "dotnet5.4" ]
    }
  }
 }
--- a/src/Scripting/VisualBasic/project.json
+++ b/src/Scripting/VisualBasic/project.json
@@ -4,8 +4,8 @@
    "System.AppContext": "4.0.0"
  },
  "frameworks": {
-    "dotnet5.4": {
-      "imports": "portable-net452"
+    "netstandard1.3": {
+      "imports": [ "portable-net452", "dotnet5.4" ]
    }
  }
-}
\ No newline at end of file
+}
--- a/src/Scripting/VisualBasicTest/BasicScriptingTest.vbproj
+++ b/src/Scripting/VisualBasicTest/BasicScriptingTest.vbproj
@@ -15,8 +15,6 @@
    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
    <RestorePackages>true</RestorePackages>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <ProjectTypeGuids>{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
  </PropertyGroup>
@@ -74,9 +72,4 @@
    <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
    <Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
  </ImportGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties project_1json__JSONSchema="http://json.schemastore.org/launchsettings" />
-    </VisualStudio>
-  </ProjectExtensions>
 </Project>
\ No newline at end of file
--- a/src/Scripting/VisualBasicTest/project.json
+++ b/src/Scripting/VisualBasicTest/project.json
 {
  "dependencies": { },
  "frameworks": {
-    "dotnet5.4": {
-      "imports": "portable-net452"
+    "netstandard1.3": {
+      "imports": [ "portable-net452", "dotnet5.4" ]
    }
  }
 }
--- a/src/Test/DeployCoreClrTestRuntime/project.json
+++ b/src/Test/DeployCoreClrTestRuntime/project.json
 {
  "dependencies": {
-    "Microsoft.NETCore.TestHost": "1.0.0-beta-23504",
-    "System.Runtime": "4.0.21-beta-23504",
    "xunit.console.netcore": "1.0.2-prerelease-00104"
  },
  "frameworks": {

--- a/src/Test/DeployDesktopTestRuntime/project.json
+++ b/src/Test/DeployDesktopTestRuntime/project.json
 {
-  "dependencies": {
-    "Microsoft.NETCore.Portable.Compatibility": "1.0.1-beta-23504",
-    "System.Runtime": "4.0.21-beta-23504"
-  },
+  "dependencies": { },
  "frameworks": {
    "net46": { }
  },

--- a/src/Test/Utilities/Portable/TestUtilities.csproj
+++ b/src/Test/Utilities/Portable/TestUtilities.csproj
@@ -136,9 +136,5 @@
    <Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" />
    <Import Project="..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
  </ImportGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties project_1json__JSONSchema="http://json.schemastore.org/launchsettings" />
-    </VisualStudio>
-  </ProjectExtensions>
+  <ProjectExtensions />
 </Project>
\ No newline at end of file
--- a/src/Test/Utilities/Portable/project.json
+++ b/src/Test/Utilities/Portable/project.json
 {
  "dependencies": {
    "Microsoft.CSharp": "4.0.0",
-    "Microsoft.NETCore.Platforms": "1.0.0",
-    "Microsoft.NETCore.Portable.Compatibility": "1.0.1-beta-23504",
+    "Microsoft.NETCore.Platforms": "1.0.1-rc2-23931",
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
    "System.Collections.Concurrent": "4.0.10",
-    "System.Collections.Immutable": "[1.1.37]",
-    "System.Console": "4.0.0-beta-23504",
+    "System.Collections.Immutable": "1.1.37",
+    "System.Console": "4.0.0-rc2-23931",
    "System.Diagnostics.Debug": "4.0.10",
    "System.Diagnostics.Tools": "4.0.0",
    "System.IO.FileSystem": "4.0.0",
    "System.Reflection.TypeExtensions": "4.0.0",
-    "System.Threading.Thread": "4.0.0-beta-23504",
+    "System.Threading.Thread": "4.0.0-rc2-23931",
    "System.Xml.XDocument": "4.0.10",
    "System.Xml.XmlDocument": "4.0.0",
    "xunit": "2.1.0",
    "xunit.extensibility.execution": "2.1.0"
  },
  "frameworks": {
-    "dotnet5.4": {
-      "imports": "portable-net452"
+    "netstandard1.3": {
+      "imports": [
+        "portable-net452",
+        "dotnet"
+      ]
    }
  }
 }
--- a/src/Tools/CommonCoreClrRuntime/Class1.cs
+++ b/src/Tools/CommonCoreClrRuntime/Class1.cs
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+namespace DoNotUse
+{
+    public class Class1
+    {
+        public static int Main() => 1;
+    }
+}
--- a/src/Tools/CommonCoreClrRuntime/CommonCoreClrRuntime.csproj
+++ b/src/Tools/CommonCoreClrRuntime/CommonCoreClrRuntime.csproj
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\build\Targets\VSL.Settings.targets" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+    <ProjectGuid>{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AssemblyName>CommonCoreClrRuntime_DoNotUse</AssemblyName>
+    <Prefer32Bit>false</Prefer32Bit>
+    <LargeAddressAware>true</LargeAddressAware>
+    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
+    <OutDir>$(OutDir)\CoreClr</OutDir>
+    <RestorePackages>true</RestorePackages>
+    <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
+    <NoStdLib>true</NoStdLib>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" />
+  <ItemGroup>
+    <Compile Include="Class1.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="project.json" />
+  </ItemGroup>
+  <ImportGroup Label="Targets">
+    <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
+  </ImportGroup>
+  <!-- Override the defaults and make this dnxcore50 -->
+  <PropertyGroup>
+    <NuGetTargetMoniker>DNXCore,Version=v5.0</NuGetTargetMoniker>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
--- a/src/Tools/CommonCoreClrRuntime/project.json
+++ b/src/Tools/CommonCoreClrRuntime/project.json
+{
+  "dependencies": {
+    "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc2-23931",
+    "Microsoft.NETCore.TestHost": "1.0.0-rc2-23931",
+    "System.Runtime": "4.0.20"
+  },
+  "frameworks": {
+    "dnxcore50": {
+      "imports": "portable-net452"
+    }
+  }
+}
\ No newline at end of file
--- a/src/Tools/CommonNetCoreReferences/CommonNetCoreReferences.csproj
+++ b/src/Tools/CommonNetCoreReferences/CommonNetCoreReferences.csproj
@@ -27,6 +27,12 @@
  <ItemGroup>
    <None Include="project.json" />
  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\CommonCoreClrRuntime\CommonCoreClrRuntime.csproj">
+      <Project>{1b665337-9d6a-451a-aeac-f7bf1af95ffb}</Project>
+      <Name>CommonCoreClrRuntime</Name>
+    </ProjectReference>
+  </ItemGroup>
  <ImportGroup Label="Targets">
    <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
  </ImportGroup>

--- a/src/Tools/CommonNetCoreReferences/project.json
+++ b/src/Tools/CommonNetCoreReferences/project.json
 {
  "dependencies": {
-    "Microsoft.NETCore.Portable.Compatibility": "1.0.1-beta-23504",
-    "Microsoft.NETCore.Platforms": "1.0.1-beta-23504",
-    "Microsoft.NETCore.Runtime.CoreCLR": "1.0.1-beta-23504",
-    "Microsoft.NETCore.TestHost": "1.0.0-beta-23504",
-    "System.AppContext": "4.0.1-beta-23504",
-    "System.Collections": "4.0.11-beta-23504",
-    "System.Collections.Immutable": "[1.1.37]",
-    "System.Console": "4.0.0-beta-23504",
-    "System.Diagnostics.Debug": "4.0.11-beta-23504",
-    "System.Diagnostics.FileVersionInfo": "4.0.0-beta-23504",
-    "System.Diagnostics.Process": "4.1.0-beta-23504",
-    "System.Diagnostics.StackTrace": "4.0.1-beta-23504",
-    "System.Diagnostics.Tools": "4.0.1-beta-23504",
-    "System.Dynamic.Runtime": "4.0.11-beta-23504",
-    "System.IO.FileSystem": "4.0.1-beta-23504",
-    "System.IO.FileSystem.Primitives": "4.0.1-beta-23504",
-    "System.IO.FileSystem.Watcher": "4.0.0-beta-23504",
-    "System.IO.Pipes": "4.0.0-beta-23504",
-    "System.Linq": "4.0.1-beta-23504",
-    "System.Net.NameResolution": "4.0.0-beta-23504",
-    "System.Net.Sockets": "4.1.0-beta-23504",
-    "System.Private.Uri": "4.0.1-beta-23504",
-    "System.Reflection": "4.1.0-beta-23504",
-    "System.Reflection.Primitives": "4.0.1-beta-23504",
-    "System.Resources.ResourceManager": "4.0.1-beta-23504",
-    "System.Runtime": "4.0.21-beta-23504",
-    "System.Runtime.Extensions": "4.0.11-beta-23504",
-    "System.Runtime.Handles": "4.0.1-beta-23504",
-    "System.Runtime.InteropServices": "4.0.21-beta-23504",
-    "System.Runtime.Loader": "4.0.0-beta-23504",
-    "System.Runtime.Numerics": "4.0.1-beta-23504",
-    "System.Runtime.Serialization.Json": "4.0.1-beta-23504",
-    "System.Security.Cryptography.Algorithms": "4.0.0-beta-23504",
-    "System.Security.Cryptography.Encoding": "4.0.0-beta-23504",
-    "System.Security.Cryptography.X509Certificates": "4.0.0-beta-23504",
-    "System.Text.Encoding": "4.0.11-beta-23504",
-    "System.Text.Encoding.CodePages": "4.0.1-beta-23504",
-    "System.Text.Encoding.Extensions": "4.0.11-beta-23504",
-    "System.Threading": "4.0.11-beta-23504",
-    "System.Threading.Tasks": "4.0.11-beta-23504",
-    "System.Threading.Tasks.Parallel": "4.0.1-beta-23504",
-    "System.Threading.Thread": "4.0.0-beta-23504",
-    "System.Xml.XDocument": "4.0.11-beta-23504",
-    "System.Xml.XmlDocument": "4.0.1-beta-23504",
-    "System.Xml.XPath.XDocument": "4.0.1-beta-23504"
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc2-23931",
+    "Microsoft.NETCore.Platforms": "1.0.1-rc2-23931",
+    "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc2-23931",
+    "Microsoft.NETCore.TestHost": "1.0.0-rc2-23931",
+    "System.AppContext": "4.1.0-rc2-23931",
+    "System.Collections": "4.0.11-rc2-23931",
+    "System.Collections.Concurrent": "4.0.12-rc2-23931",
+    "System.Collections.Immutable": "1.2.0-rc2-23931",
+    "System.Console": "4.0.0-rc2-23931",
+    "System.Diagnostics.Debug": "4.0.11-rc2-23931",
+    "System.Diagnostics.FileVersionInfo": "4.0.0-rc2-23931",
+    "System.Diagnostics.Process": "4.1.0-rc2-23931",
+    "System.Diagnostics.StackTrace": "4.0.1-rc2-23931",
+    "System.Diagnostics.Tools": "4.0.1-rc2-23931",
+    "System.Dynamic.Runtime": "4.0.11-rc2-23931",
+    "System.Globalization": "4.0.11-rc2-23931",
+    "System.IO.FileSystem": "4.0.1-rc2-23931",
+    "System.IO.FileSystem.Primitives": "4.0.1-rc2-23931",
+    "System.IO.FileSystem.Watcher": "4.0.0-rc2-23931",
+    "System.IO.Pipes": "4.0.0-rc2-23931",
+    "System.Linq": "4.1.0-rc2-23931",
+    "System.Linq.Expressions": "4.0.11-rc2-23931",
+    "System.Net.NameResolution": "4.0.0-rc2-23931",
+    "System.Net.Sockets": "4.1.0-rc2-23931",
+    "System.Reflection": "4.1.0-rc2-23931",
+    "System.Reflection.Primitives": "4.0.1-rc2-23931",
+    "System.Resources.ResourceManager": "4.0.1-rc2-23931",
+    "System.Runtime": "4.1.0-rc2-23931",
+    "System.Runtime.Extensions": "4.1.0-rc2-23931",
+    "System.Runtime.Handles": "4.0.1-rc2-23931",
+    "System.Runtime.InteropServices": "4.1.0-rc2-23931",
+    "System.Runtime.Loader": "4.0.0-rc2-23931",
+    "System.Runtime.Numerics": "4.0.1-rc2-23931",
+    "System.Security.Cryptography.Algorithms": "4.1.0-rc2-23931",
+    "System.Security.Cryptography.Encoding": "4.0.0-rc2-23931",
+    "System.Security.Cryptography.X509Certificates": "4.1.0-rc2-23931",
+    "System.Text.Encoding": "4.0.11-rc2-23931",
+    "System.Text.Encoding.CodePages": "4.0.1-rc2-23931",
+    "System.Text.Encoding.Extensions": "4.0.11-rc2-23931",
+    "System.Threading": "4.0.11-rc2-23931",
+    "System.Threading.Tasks": "4.0.11-rc2-23931",
+    "System.Threading.Tasks.Parallel": "4.0.1-rc2-23931",
+    "System.Threading.Thread": "4.0.0-rc2-23931",
+    "System.Xml.ReaderWriter": "4.0.11-rc2-23931",
+    "System.Xml.XDocument": "4.0.11-rc2-23931",
+    "System.Xml.XmlDocument": "4.0.1-rc2-23931",
+    "System.Xml.XPath.XDocument": "4.0.1-rc2-23931"
  },
  "frameworks": {
    "dnxcore50": {

--- a/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/DeployCompilerGeneratorToolsRuntime.csproj
+++ b/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/DeployCompilerGeneratorToolsRuntime.csproj
@@ -30,6 +30,10 @@
    <Compile Include="Class1.cs" />
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\..\..\CommonCoreClrRuntime\CommonCoreClrRuntime.csproj">
+      <Project>{1b665337-9d6a-451a-aeac-f7bf1af95ffb}</Project>
+      <Name>CommonCoreClrRuntime</Name>
+    </ProjectReference>
    <ProjectReference Include="..\Source\BoundTreeGenerator\CompilersBoundTreeGenerator.csproj">
      <Project>{02459936-cd2c-4f61-b671-5c518f2a3ddc}</Project>
      <Name>CompilersBoundTreeGenerator</Name>

--- a/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/project.json
 {
  "dependencies": {
-    "Microsoft.NETCore.Portable.Compatibility": "1.0.1-beta-23504",
-    "Microsoft.NETCore.Platforms": "1.0.1-beta-23504",
-    "Microsoft.NETCore.Runtime.CoreCLR": "1.0.1-beta-23504",
-    "Microsoft.NETCore.TestHost": "1.0.0-beta-23504"
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc2-23931",
+    "Microsoft.NETCore.Platforms": "1.0.1-rc2-23931",
+    "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc2-23931",
+    "Microsoft.NETCore.TestHost": "1.0.0-rc2-23931"
  },
  "frameworks": {
    "dnxcore50": {

--- a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json
 {
  "dependencies": {
-    "Microsoft.NETCore.Portable.Compatibility": "1.0.1-beta-23504",
-    "Microsoft.NETCore": "5.0.1-beta-23504",
-    "System.Console": "4.0.0-beta-23504",
-    "System.Xml.XmlDocument": "4.0.1-beta-23504",
-    "System.Xml.XmlSerializer": "4.0.11-beta-23504"
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
+    "NETStandard.Library": "1.5.0-rc2-23931",
+    "System.Xml.XmlDocument": "4.0.0",
+    "System.Xml.XmlSerializer": "4.0.10"
  },
  "frameworks": {
    "dnxcore50": { }

--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/project.json
 {
  "dependencies": {
-    "Microsoft.NETCore.Portable.Compatibility": "1.0.1-beta-23504",
-    "Microsoft.NETCore": "5.0.1-beta-23504",
-    "System.Console": "4.0.0-beta-23504"
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
+    "NETStandard.Library": "1.5.0-rc2-23931",
  },
  "frameworks": {
    "dnxcore50": {}

--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json
 {
  "dependencies": {
-    "Microsoft.NETCore.Portable.Compatibility": "1.0.1-beta-23504",
-    "Microsoft.NETCore": "5.0.1-beta-23504",
-    "System.Console": "4.0.0-beta-23504",
-    "System.Xml.ReaderWriter": "4.0.11-beta-23504",
-    "System.Xml.XmlDocument": "4.0.1-beta-23504",
-    "System.Xml.XmlSerializer": "4.0.11-beta-23504"
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
+    "NETStandard.Library": "1.5.0-rc2-23931",
+    "System.Xml.XmlDocument": "4.0.0",
+    "System.Xml.XmlSerializer": "4.0.10"
  },
  "frameworks": {
    "dnxcore50": {}

--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/project.json
 {
  "dependencies": {
-    "Microsoft.NETCore.Portable.Compatibility": "1.0.1-beta-23504",
-    "Microsoft.NETCore": "5.0.1-beta-23504",
-    "System.Console": "4.0.0-beta-23504"
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
+    "NETStandard.Library": "1.5.0-rc2-23931"
  },
  "frameworks": {
    "dnxcore50": { }

--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/project.json
 {
  "dependencies": {
-    "Microsoft.NETCore.Portable.Compatibility": "1.0.1-beta-23504",
-    "Microsoft.NETCore": "5.0.1-beta-23504",
-    "System.Console": "4.0.0-beta-23504",
-    "System.Reflection": "4.1.0-beta-23504",
-    "System.Security.Cryptography.Algorithms": "4.0.0-beta-23504"
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
+    "NETStandard.Library": "1.5.0-rc2-23931",
+    "System.Console": "4.0.0-rc2-23931",
+    "System.Security.Cryptography.Algorithms": "4.1.0-rc2-23931"
  },
  "frameworks": {
    "dnxcore50": {}