Port compiler generator tools to run on CoreCLR

Ports the compiler generator tools (syntax generator, bound tree generator, et al.) to .NET core and runs the exes on CoreCLR instead of the desktop framework. Fixes #7136

Port compiler generator tools to run on CoreCLR
Ports the compiler generator tools (syntax generator, bound tree generator, et al.) to .NET core and runs the exes on CoreCLR instead of the desktop framework. Fixes #7136
ec011bdc · Andy Gocke · 039409a7 · ec011bdc · ec011bdc · ec011bdc
33 changed file
--- a/Compilers.sln
+++ b/Compilers.sln
@@ -121,6 +121,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeployDesktopTestRuntime",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "src\Test\Utilities\Portable\TestUtilities.csproj", "{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeployCompilerGeneratorToolsRuntime", "src\Tools\Source\CompilerGeneratorTools\DeployCompilerGeneratorToolsRuntime\DeployCompilerGeneratorToolsRuntime.csproj", "{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Test\Utilities\Shared\TestUtilities.projitems*{76c6f005-c89d-4348-bb4a-391898dbeb52}*SharedItemsImports = 4
@@ -131,11 +133,11 @@ Global
 		src\Test\Utilities\Shared\TestUtilities.projitems*{6ff42825-5464-4151-ac55-ed828168c192}*SharedItemsImports = 13
 		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\CommandLine\CommandLine.projitems*{06b26dcb-7a12-48ef-ae50-708593abd05f}*SharedItemsImports = 4
 		src\Compilers\Server\ServerShared\ServerShared.projitems*{06b26dcb-7a12-48ef-ae50-708593abd05f}*SharedItemsImports = 4
+		src\Compilers\Core\CommandLine\CommandLine.projitems*{06b26dcb-7a12-48ef-ae50-708593abd05f}*SharedItemsImports = 4
 		src\Compilers\Core\CommandLine\CommandLine.projitems*{e58ee9d7-1239-4961-a0c1-f9ec3952c4c1}*SharedItemsImports = 4
-		src\Compilers\Core\CommandLine\CommandLine.projitems*{9508f118-f62e-4c16-a6f4-7c3b56e166ad}*SharedItemsImports = 4
 		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
@@ -1059,6 +1061,26 @@ Global
 		{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|x64.Build.0 = Release|x64
 		{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|x86.ActiveCfg = Release|Any CPU
 		{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|x86.Build.0 = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|ARM.Build.0 = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|x64.Build.0 = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|x86.Build.0 = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|ARM.Build.0 = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|x64.ActiveCfg = Release|Any CPU
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1116,5 +1138,6 @@ Global
 		{7A4B2176-7BFD-4B75-A61A-E25A1FDD0A1E} = {32A48625-F0AD-419D-828B-A50BDABA38EA}
 		{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}
 	EndGlobalSection
 EndGlobal
--- a/CrossPlatform.sln
+++ b/CrossPlatform.sln
@@ -73,6 +73,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripting", "Scripting", "{
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptingTest", "src\Scripting\CoreTest\ScriptingTest.csproj", "{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeployCompilerGeneratorToolsRuntime", "src\Tools\Source\CompilerGeneratorTools\DeployCompilerGeneratorToolsRuntime\DeployCompilerGeneratorToolsRuntime.csproj", "{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Test\Utilities\Shared\TestUtilities.projitems*{ccbd3438-3e84-40a9-83ad-533f23bcfca5}*SharedItemsImports = 4
@@ -82,8 +84,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
@@ -422,34 +424,46 @@ Global
 		{F83343BA-B4EA-451C-B6DB-5D645E6171BC}.Release|x64.Build.0 = Release|Any CPU
 		{F83343BA-B4EA-451C-B6DB-5D645E6171BC}.Release|x86.ActiveCfg = Release|Any CPU
 		{F83343BA-B4EA-451C-B6DB-5D645E6171BC}.Release|x86.Build.0 = Release|Any CPU
-		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|ARM.ActiveCfg = Debug|x64
+		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|ARM.Build.0 = Debug|Any CPU
 		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|x64.ActiveCfg = Debug|x64
+		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|x64.Build.0 = Debug|x64
+		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|x64.Build.0 = Debug|Any CPU
-		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|x86.ActiveCfg = Debug|x64
+		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|Any CPU.ActiveCfg = Release|x64
+		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|x86.Build.0 = Debug|Any CPU
-		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|ARM.ActiveCfg = Release|x64
+		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|ARM.Build.0 = Release|Any CPU
 		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|x64.ActiveCfg = Release|x64
+		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|x64.ActiveCfg = Release|Any CPU
-		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|x64.Build.0 = Release|x64
+		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|x64.Build.0 = Release|Any CPU
-		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|x86.ActiveCfg = Release|x64
+		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|x86.ActiveCfg = Release|Any CPU
-		{8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|x86.Build.0 = Release|Any CPU
-		{8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|ARM.ActiveCfg = Debug|x64
+		{8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|ARM.Build.0 = Debug|Any CPU
 		{8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|x64.ActiveCfg = Debug|x64
+		{8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|x64.Build.0 = Debug|x64
+		{8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|x64.Build.0 = Debug|Any CPU
-		{8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|x86.ActiveCfg = Debug|x64
+		{8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|Any CPU.ActiveCfg = Release|x64
+		{8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|x86.Build.0 = Debug|Any CPU
-		{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|ARM.ActiveCfg = Release|x64
+		{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|ARM.Build.0 = Release|Any CPU
 		{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x64.ActiveCfg = Release|x64
+		{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x64.ActiveCfg = Release|Any CPU
-		{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x64.Build.0 = Release|x64
+		{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x64.Build.0 = Release|Any CPU
-		{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x86.ActiveCfg = Release|x64
+		{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x86.ActiveCfg = Release|Any CPU
+		{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x86.Build.0 = Release|Any CPU
 		{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|ARM.ActiveCfg = Debug|ARM
@@ -518,6 +532,26 @@ Global
 		{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}.Release|x64.Build.0 = Release|Any CPU
 		{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}.Release|x86.ActiveCfg = Release|Any CPU
 		{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}.Release|x86.Build.0 = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|ARM.Build.0 = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|x64.Build.0 = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|x86.Build.0 = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|ARM.Build.0 = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|x64.ActiveCfg = Release|Any CPU
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -552,5 +586,6 @@ Global
 		{59BABFC3-C19B-4472-A93D-3DD3835BC219} = {50509463-6012-4061-99BF-6C5C8262E643}
 		{B5A6057A-EB4C-49FB-987D-943137E72E47} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
 		{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE} = {A6F70573-57FE-49F9-A26C-75B8D202B795}
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
 	EndGlobalSection
 EndGlobal
--- a/Roslyn.sln
+++ b/Roslyn.sln
@@ -328,6 +328,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpCompilerTestUtilities
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeployDesktopTestRuntime", "src\Test\DeployDesktopTestRuntime\DeployDesktopTestRuntime.csproj", "{23683607-168A-4189-955E-908F0E80E60D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeployCompilerGeneratorToolsRuntime", "src\Tools\Source\CompilerGeneratorTools\DeployCompilerGeneratorToolsRuntime\DeployCompilerGeneratorToolsRuntime.csproj", "{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Test\Utilities\Shared\TestUtilities.projitems*{76c6f005-c89d-4348-bb4a-391898dbeb52}*SharedItemsImports = 4
@@ -350,30 +352,28 @@ Global
 		src\Compilers\Core\CommandLine\CommandLine.projitems*{ad6f474e-e6d4-4217-91f3-b7af1be31ccc}*SharedItemsImports = 13
 		src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{e8f0baa5-7327-43d1-9a51-644e81ae55f1}*SharedItemsImports = 13
 		src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34}*SharedItemsImports = 13
-		src\Compilers\Server\ServerShared\ServerShared.projitems*{06b26dcb-7a12-48ef-ae50-708593abd05f}*SharedItemsImports = 4
 		src\Compilers\Core\CommandLine\CommandLine.projitems*{06b26dcb-7a12-48ef-ae50-708593abd05f}*SharedItemsImports = 4
+		src\Compilers\Server\ServerShared\ServerShared.projitems*{06b26dcb-7a12-48ef-ae50-708593abd05f}*SharedItemsImports = 4
 		src\Compilers\Core\CommandLine\CommandLine.projitems*{e58ee9d7-1239-4961-a0c1-f9ec3952c4c1}*SharedItemsImports = 4
 		src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{a1bcd0ce-6c2f-4f8c-9a48-d9d93928e26d}*SharedItemsImports = 4
-		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\Server\ServerShared\ServerShared.projitems*{9508f118-f62e-4c16-a6f4-7c3b56e166ad}*SharedItemsImports = 4
 		src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{bf9dac1e-3a5e-4dc3-bb44-9a64e0d4e9d4}*SharedItemsImports = 4
 		src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{bf9dac1e-3a5e-4dc3-bb44-9a64e0d4e9d3}*SharedItemsImports = 4
 		src\Compilers\Core\SharedCollections\SharedCollections.projitems*{afde6bea-5038-4a4a-a88e-dbd2e4088eed}*SharedItemsImports = 4
 		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\Core\MSBuildTask\Shared\MSBuildTask.Shared.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
@@ -2803,6 +2803,26 @@ Global
 		{23683607-168A-4189-955E-908F0E80E60D}.Release|x64.Build.0 = Release|Any CPU
 		{23683607-168A-4189-955E-908F0E80E60D}.Release|x86.ActiveCfg = Release|Any CPU
 		{23683607-168A-4189-955E-908F0E80E60D}.Release|x86.Build.0 = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|ARM.Build.0 = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|x64.Build.0 = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|x86.Build.0 = Debug|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|ARM.Build.0 = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|x64.ActiveCfg = Release|Any CPU
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2955,5 +2975,6 @@ Global
 		{B5A6057A-EB4C-49FB-987D-943137E72E47} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
 		{7A4B2176-7BFD-4B75-A61A-E25A1FDD0A1E} = {32A48625-F0AD-419D-828B-A50BDABA38EA}
 		{23683607-168A-4189-955E-908F0E80E60D} = {CAD2965A-19AB-489F-BE2E-7649957F914A}
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
 	EndGlobalSection
 EndGlobal
--- a/build/Targets/GenerateCompilerInternals.targets
+++ b/build/Targets/GenerateCompilerInternals.targets
@@ -14,6 +14,7 @@
  <PropertyGroup>
    <CompileDependsOn>
+      MarkCoreRunExecutable;
      GenerateSyntaxModel;
      GenerateSyntaxModelGetText;
      GenerateSyntaxModelTests;
@@ -35,9 +36,19 @@
  </PropertyGroup>
  <PropertyGroup>
-      <MonoPrefix Condition="'$(OS)' != 'Windows_NT'">mono</MonoPrefix>
+      <CoreRunExe Condition="'$(OS)' == 'Windows_NT'">$(CompilerGeneratorToolsDir)CoreRun.exe</CoreRunExe>
+      <CoreRunExe Condition="'$(OS)' != 'Windows_NT'">$(CompilerGeneratorToolsDir)corerun</CoreRunExe>
+      <CSharpSyntaxGeneratorToolPath>$(CompilerGeneratorToolsDir)CSharpSyntaxGenerator.exe</CSharpSyntaxGeneratorToolPath>
+      <CSharpErrorFactsGeneratorToolPath>$(CompilerGeneratorToolsDir)CSharpErrorFactsGenerator.exe</CSharpErrorFactsGeneratorToolPath>
+      <VBErrorFactsGeneratorToolPath>$(CompilerGeneratorToolsDir)VBErrorFactsGenerator.exe</VBErrorFactsGeneratorToolPath>
+      <VBSyntaxGeneratorToolPath>$(CompilerGeneratorToolsDir)VBSyntaxGenerator.exe</VBSyntaxGeneratorToolPath>
+      <BoundTreeGeneratorToolPath>$(CompilerGeneratorToolsDir)BoundTreeGenerator.exe</BoundTreeGeneratorToolPath>
  </PropertyGroup>
+  <Target Name="MarkCoreRunExecutable" Condition="'$(OS)' != 'Windows_NT' And Exists('$(CoreRunExe)')">
+    <Exec Command='chmod +x "$(CoreRunExe)"' />
+  </Target>
  <Target
    Name="GenerateSyntaxModel"
    Inputs="@(SyntaxDefinition);$(VBSyntaxGeneratorToolPath);$(CSharpSyntaxGeneratorToolPath)"
@@ -45,15 +56,14 @@
    Condition="'$(BuildingProject)' == 'true' AND ('$(Language)' == 'VB' or '$(Language)' == 'C#')"
  >
    <PropertyGroup>
-      <SyntaxGenerator Condition="'$(Language)' == 'VB'">$(MonoPrefix) "$(VBSyntaxGeneratorToolPath)"</SyntaxGenerator>
+      <SyntaxGenerator Condition="'$(Language)' == 'VB'">"$(CoreRunExe)" "$(VBSyntaxGeneratorToolPath)"</SyntaxGenerator>
-      <SyntaxGenerator Condition="'$(Language)' == 'C#'">$(MonoPrefix) "$(CSharpSyntaxGeneratorToolPath)"</SyntaxGenerator>
+      <SyntaxGenerator Condition="'$(Language)' == 'C#'">"$(CoreRunExe)" "$(CSharpSyntaxGeneratorToolPath)"</SyntaxGenerator>
      <GeneratedSyntaxModel>@(SyntaxDefinition -> '$(IntermediateOutputPath)%(Filename)%(Extension).Generated$(DefaultLanguageSourceExtension)')</GeneratedSyntaxModel>
    </PropertyGroup>
    <Exec
      Command='$(SyntaxGenerator) "@(SyntaxDefinition)" "$(GeneratedSyntaxModel)"'
-      Outputs="$(GeneratedSyntaxModel)"
+      Outputs="$(GeneratedSyntaxModel)">
-    >
      <Output TaskParameter="Outputs" ItemName="FileWrites" />
    </Exec>
@@ -76,7 +86,7 @@
    Condition="'$(BuildingProject)' == 'true' AND '$(Language)' == 'VB'"
  >
    <PropertyGroup>
-      <SyntaxGenerator>"$(VBSyntaxGeneratorToolPath)"</SyntaxGenerator>
+      <SyntaxGenerator>"$(CoreRunExe)" "$(VBSyntaxGeneratorToolPath)"</SyntaxGenerator>
      <GeneratedSyntaxModelGetText>@(SyntaxGetTextDefinition -> '$(IntermediateOutputPath)\%(FileName)%(Extension).Generated$(DefaultLanguageSourceExtension)')</GeneratedSyntaxModelGetText>
    </PropertyGroup>
@@ -107,8 +117,8 @@
    Condition="'$(BuildingProject)' == 'true' AND ('$(Language)' == 'VB' or '$(Language)' == 'C#')"
  >
    <PropertyGroup>
-      <SyntaxGenerator Condition="'$(Language)' == 'VB'">$(MonoPrefix) "$(VBSyntaxGeneratorToolPath)"</SyntaxGenerator>
+      <SyntaxGenerator Condition="'$(Language)' == 'VB'">"$(CoreRunExe)" "$(VBSyntaxGeneratorToolPath)"</SyntaxGenerator>
-      <SyntaxGenerator Condition="'$(Language)' == 'C#'">$(MonoPrefix) "$(CSharpSyntaxGeneratorToolPath)"</SyntaxGenerator>
+      <SyntaxGenerator Condition="'$(Language)' == 'C#'">"$(CoreRunExe)" "$(CSharpSyntaxGeneratorToolPath)"</SyntaxGenerator>
      <GeneratedSyntaxModelTests>@(SyntaxTestDefinition -> '$(IntermediateOutputPath)\%(FileName)%(Extension).Generated$(DefaultLanguageSourceExtension)')</GeneratedSyntaxModelTests>
    </PropertyGroup>
@@ -139,7 +149,7 @@
    Condition="'$(BuildingProject)' == 'true' AND ('$(Language)' == 'VB' or '$(Language)' == 'C#')"
  >
    <PropertyGroup>
-      <BoundTreeGenerator>$(MonoPrefix) "$(BoundTreeGeneratorToolPath)"</BoundTreeGenerator>
+      <BoundTreeGenerator>"$(CoreRunExe)" "$(BoundTreeGeneratorToolPath)"</BoundTreeGenerator>
      <GeneratedBoundTree>@(BoundTreeDefinition -> '$(IntermediateOutputPath)%(Filename)%(Extension).Generated$(DefaultLanguageSourceExtension)')</GeneratedBoundTree>
    </PropertyGroup>
@@ -175,8 +185,8 @@
    Condition="'$(BuildingProject)' == 'true' AND ('$(Language)' == 'VB' or '$(Language)' == 'C#')"
  >
    <PropertyGroup>
-      <ErrorFactsGenerator Condition="'$(Language)' == 'VB'">$(MonoPrefix) "$(VBErrorFactsGeneratorToolPath)"</ErrorFactsGenerator>
+      <ErrorFactsGenerator Condition="'$(Language)' == 'VB'">"$(CoreRunExe)" "$(VBErrorFactsGeneratorToolPath)"</ErrorFactsGenerator>
-      <ErrorFactsGenerator Condition="'$(Language)' == 'C#'">$(MonoPrefix) "$(CSharpErrorFactsGeneratorToolPath)"</ErrorFactsGenerator>
+      <ErrorFactsGenerator Condition="'$(Language)' == 'C#'">"$(CoreRunExe)" "$(CSharpErrorFactsGeneratorToolPath)"</ErrorFactsGenerator>
      <GeneratedErrorFacts>@(ErrorCode -> '$(IntermediateOutputPath)ErrorFacts.Generated$(DefaultLanguageSourceExtension)')</GeneratedErrorFacts>
    </PropertyGroup>

--- a/build/Targets/Settings.targets
+++ b/build/Targets/Settings.targets
@@ -199,6 +199,10 @@
    <VSLOutDir>$(OutDir)</VSLOutDir>
  </PropertyGroup>
+  <PropertyGroup>
+      <CompilerGeneratorToolsDir>$(OutDir)CompilerGeneratorTools\</CompilerGeneratorToolsDir>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(DeployToSamplesSubfolder)' == 'true'">
    <OutDir>$(OutDir)\Samples\$(MSBuildProjectName)</OutDir>
  </PropertyGroup>

--- a/src/Compilers/CSharp/Portable/CSharpCodeAnalysis.csproj
+++ b/src/Compilers/CSharp/Portable/CSharpCodeAnalysis.csproj
@@ -12,9 +12,6 @@
    <RootNamespace>Microsoft.CodeAnalysis.CSharp</RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.CSharp</AssemblyName>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <CSharpSyntaxGeneratorToolPath>$(OutDir)CSharpSyntaxGenerator.exe</CSharpSyntaxGeneratorToolPath>
-    <BoundTreeGeneratorToolPath>$(OutDir)BoundTreeGenerator.exe</BoundTreeGeneratorToolPath>
-    <CSharpErrorFactsGeneratorToolPath>$(OutDir)CSharpErrorFactsGenerator.exe</CSharpErrorFactsGeneratorToolPath>
    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
@@ -23,19 +20,9 @@
    <RestorePackages>true</RestorePackages>
  </PropertyGroup>
  <ItemGroup Label="Project References">
-    <ProjectReference Include="..\..\..\Tools\Source\CompilerGeneratorTools\Source\CSharpSyntaxGenerator\CSharpSyntaxGenerator.csproj">
+    <ProjectReference Include="..\..\..\Tools\Source\CompilerGeneratorTools\DeployCompilerGeneratorToolsRuntime\DeployCompilerGeneratorToolsRuntime.csproj">
-      <Project>{288089C5-8721-458E-BE3E-78990DAB5E2D}</Project>
+      <Project>{6da08f12-32f2-4dd9-bbad-982eb71a2c9b}</Project>
-      <Name>CSharpSyntaxGenerator</Name>
+      <Name>DeployCompilerGeneratorToolsRuntime</Name>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Tools\Source\CompilerGeneratorTools\Source\BoundTreeGenerator\CompilersBoundTreeGenerator.csproj">
-      <Project>{02459936-CD2C-4F61-B671-5C518F2A3DDC}</Project>
-      <Name>CompilersBoundTreeGenerator</Name>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Tools\Source\CompilerGeneratorTools\Source\CSharpErrorFactsGenerator\CSharpErrorFactsGenerator.csproj">
-      <Project>{288089C5-8721-458E-BE3E-78990DAB5E2E}</Project>
-      <Name>CSharpErrorFactsGenerator</Name>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
    <ProjectReference Include="..\..\Core\Portable\CodeAnalysis.csproj">

--- a/src/Compilers/VisualBasic/Portable/BasicCodeAnalysis.vbproj
+++ b/src/Compilers/VisualBasic/Portable/BasicCodeAnalysis.vbproj
@@ -10,9 +10,6 @@
    <ProjectGuid>{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AssemblyName>Microsoft.CodeAnalysis.VisualBasic</AssemblyName>
-    <VBSyntaxGeneratorToolPath>$(OutDir)\VBSyntaxGenerator.exe</VBSyntaxGeneratorToolPath>
-    <BoundTreeGeneratorToolPath>$(OutDir)\BoundTreeGenerator.exe</BoundTreeGeneratorToolPath>
-    <VBErrorFactsGeneratorToolPath>$(OutDir)\VBErrorFactsGenerator.exe</VBErrorFactsGeneratorToolPath>
    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
@@ -21,19 +18,9 @@
    <RestorePackages>true</RestorePackages>
  </PropertyGroup>
  <ItemGroup Label="Project References">
-    <ProjectReference Include="..\..\..\Tools\Source\CompilerGeneratorTools\Source\VisualBasicSyntaxGenerator\VisualBasicSyntaxGenerator.vbproj">
+    <ProjectReference Include="..\..\..\Tools\Source\CompilerGeneratorTools\DeployCompilerGeneratorToolsRuntime\DeployCompilerGeneratorToolsRuntime.csproj">
-      <Project>{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}</Project>
+      <Project>{6da08f12-32f2-4dd9-bbad-982eb71a2c9b}</Project>
-      <Name>VisualBasicSyntaxGenerator</Name>
+      <Name>DeployCompilerGeneratorToolsRuntime</Name>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Tools\Source\CompilerGeneratorTools\Source\BoundTreeGenerator\CompilersBoundTreeGenerator.csproj">
-      <Project>{02459936-CD2C-4F61-B671-5C518F2A3DDC}</Project>
-      <Name>CompilersBoundTreeGenerator</Name>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Tools\Source\CompilerGeneratorTools\Source\VisualBasicErrorFactsGenerator\VisualBasicErrorFactsGenerator.vbproj">
-      <Project>{909B656F-6095-4AC2-A5AB-C3F032315C45}</Project>
-      <Name>VisualBasicErrorFactsGenerator</Name>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
    <ProjectReference Include="..\..\Core\Portable\CodeAnalysis.csproj">
@@ -1008,4 +995,4 @@
  <ImportGroup Label="Targets">
    <Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" />
  </ImportGroup>
 </Project>
\ No newline at end of file
--- a/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj
+++ b/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj
@@ -18,11 +18,6 @@
    <SyntaxTestDefinition Include="..\..\Portable\Syntax\Syntax.xml" />
  </ItemGroup>
  <ItemGroup Label="Project References">
-    <ProjectReference Include="..\..\..\..\Tools\Source\CompilerGeneratorTools\Source\VisualBasicSyntaxGenerator\VisualBasicSyntaxGenerator.vbproj">
-      <Project>{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}</Project>
-      <Name>VisualBasicSyntaxGenerator</Name>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
    <ProjectReference Include="..\..\..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj">
      <Project>{76C6F005-C89D-4348-BB4A-391898DBEB52}</Project>
      <Name>TestUtilities.Desktop</Name>

--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/BasicResultProvider.NetFX20.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/BasicResultProvider.NetFX20.vbproj
@@ -39,9 +39,9 @@
      <Project>{BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}</Project>
      <Name>ResultProvider.NetFX20</Name>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\Tools\Source\CompilerGeneratorTools\Source\VisualBasicSyntaxGenerator\VisualBasicSyntaxGenerator.vbproj">
+    <ProjectReference Include="..\..\..\..\..\Tools\Source\CompilerGeneratorTools\DeployCompilerGeneratorToolsRuntime\DeployCompilerGeneratorToolsRuntime.csproj">
-      <Project>{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}</Project>
+      <Project>{6da08f12-32f2-4dd9-bbad-982eb71a2c9b}</Project>
-      <Name>VisualBasicSyntaxGenerator</Name>
+      <Name>DeployCompilerGeneratorToolsRuntime</Name>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
  </ItemGroup>

--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/BasicResultProvider.Portable.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/BasicResultProvider.Portable.vbproj
@@ -37,9 +37,9 @@
      <Project>{fa0e905d-ec46-466d-b7b2-3b5557f9428c}</Project>
      <Name>ResultProvider.Portable</Name>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\Tools\Source\CompilerGeneratorTools\Source\VisualBasicSyntaxGenerator\VisualBasicSyntaxGenerator.vbproj">
+    <ProjectReference Include="..\..\..\..\..\Tools\Source\CompilerGeneratorTools\DeployCompilerGeneratorToolsRuntime\DeployCompilerGeneratorToolsRuntime.csproj">
-      <Project>{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}</Project>
+      <Project>{6da08f12-32f2-4dd9-bbad-982eb71a2c9b}</Project>
-      <Name>VisualBasicSyntaxGenerator</Name>
+      <Name>DeployCompilerGeneratorToolsRuntime</Name>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
  </ItemGroup>

--- a/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/Class1.cs
+++ b/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/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/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/DeployCompilerGeneratorToolsRuntime.csproj
+++ b/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/DeployCompilerGeneratorToolsRuntime.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="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="Settings">
+    <Import Project="..\..\..\..\..\build\Targets\VSL.Settings.targets" />
+  </ImportGroup>
+  <PropertyGroup>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <PlatformTarget>x64</PlatformTarget>
+    <ProjectGuid>{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>DeployCompilerGeneratorToolsRuntime</RootNamespace>
+    <AssemblyName>DeployCompilerGeneratorToolsRuntime_DoNotUse</AssemblyName>
+    <OutDir>$(OutDir)CompilerGeneratorTools\</OutDir>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <FileAlignment>512</FileAlignment>
+    <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|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <ItemGroup>
+    <None Include="project.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Class1.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Source\BoundTreeGenerator\CompilersBoundTreeGenerator.csproj">
+      <Project>{02459936-cd2c-4f61-b671-5c518f2a3ddc}</Project>
+      <Name>CompilersBoundTreeGenerator</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Source\CSharpErrorFactsGenerator\CSharpErrorFactsGenerator.csproj">
+      <Project>{288089c5-8721-458e-be3e-78990dab5e2e}</Project>
+      <Name>CSharpErrorFactsGenerator</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Source\CSharpSyntaxGenerator\CSharpSyntaxGenerator.csproj">
+      <Project>{288089c5-8721-458e-be3e-78990dab5e2d}</Project>
+      <Name>CSharpSyntaxGenerator</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Source\VisualBasicErrorFactsGenerator\VisualBasicErrorFactsGenerator.vbproj">
+      <Project>{909b656f-6095-4ac2-a5ab-c3f032315c45}</Project>
+      <Name>VisualBasicErrorFactsGenerator</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Source\VisualBasicSyntaxGenerator\VisualBasicSyntaxGenerator.vbproj">
+      <Project>{6aa96934-d6b7-4cc8-990d-db6b9dd56e34}</Project>
+      <Name>VisualBasicSyntaxGenerator</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ImportGroup Label="Targets">
+    <Import Project="..\..\..\..\..\build\Targets\VSL.Imports.targets" />
+  </ImportGroup>
+</Project>
\ No newline at end of file
--- a/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/project.json
+{
+  "dependencies": {
+    "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"
+  },
+  "frameworks": {
+    "dnxcore50": {
+      "imports": "portable-net452"
+    }
+  },
+  "runtimes": {
+    "win7-x64": { },
+    "ubuntu.14.04-x64": { },
+    "osx.10.10-x64": { }
+  }
+}
\ No newline at end of file
--- a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/BoundNodeClassWriter.cs
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/BoundNodeClassWriter.cs
@@ -150,7 +150,7 @@ private void WriteFile()
                case TargetLanguage.VB:
                    WriteLine("' <auto-generated />"); break;
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
            Blank();
@@ -186,7 +186,7 @@ private void WriteUsing(string nsName)
                case TargetLanguage.VB:
                    WriteLine("Imports {0}", nsName); break;
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -211,7 +211,7 @@ private void WriteStartNamespace()
                    Indent();
                    break;
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -227,7 +227,7 @@ private void WriteEndNamespace()
                    WriteLine("End Namespace");
                    break;
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -253,7 +253,7 @@ private void WriteKinds()
                    break;
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -303,7 +303,7 @@ private void WriteClassHeader(TreeType node)
                    }
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -321,7 +321,7 @@ private void WriteClassFooter(TreeType node)
                    break;
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -365,7 +365,7 @@ private void Or<T>(IEnumerable<T> items, Func<T, string> func)
                    break;
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -526,7 +526,7 @@ private void WriteConstructorWithHasErrors(TreeType node, bool isPublic, bool ha
                    }
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -632,7 +632,7 @@ private void WriteConstructorWithoutHasErrors(TreeType node, bool isPublic)
                    }
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -761,7 +761,7 @@ private NullHandling FieldNullHandling(TreeType node, string fieldName)
                    case "":
                        break;
                    default:
-                        throw new ApplicationException(string.Format("Unexpected value for \"Null\" attribute: {0}", f.Null));
+                        throw new ArgumentException("Unexpected value", nameof(f.Null));
                }
            }
@@ -781,7 +781,7 @@ private Field GetField(TreeType node, string fieldName)
            else if (BaseType(node) != null)
                return GetField(BaseType(node), fieldName);
            else
-                throw new ApplicationException(string.Format("Field {0} not found in type {1}", fieldName, node.Name));
+                throw new InvalidOperationException($"Field {fieldName} not found in type {node.Name}");
        }
        private void WriteField(Field field)
@@ -816,7 +816,7 @@ private void WriteField(Field field)
                    break;
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -856,7 +856,7 @@ private void WriteAccept(string name)
                    break;
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -971,7 +971,7 @@ private void WriteUpdateMethod(Node node)
                    }
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -1149,7 +1149,7 @@ private void WriteVisitor()
                    break;
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -1201,7 +1201,7 @@ private void WriteWalker()
                    break;
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -1323,7 +1323,7 @@ private void WriteTreeDumperNodeProducer()
                    break;
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -1419,7 +1419,7 @@ private void WriteRewriter()
                    }
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -1442,7 +1442,7 @@ private bool IsImmutableArray(string typeName)
                case TargetLanguage.VB:
                    return typeName.StartsWith("ImmutableArray(Of", StringComparison.OrdinalIgnoreCase);
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -1457,7 +1457,7 @@ private bool IsNodeList(string typeName)
                    return typeName.StartsWith("IList(Of", StringComparison.OrdinalIgnoreCase) ||
                           typeName.StartsWith("ImmutableArray(Of", StringComparison.OrdinalIgnoreCase);
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -1489,7 +1489,7 @@ private string GetGenericType(string typeName)
                    }
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -1524,7 +1524,7 @@ private string GetElementType(string typeName)
                    }
                default:
-                    throw new ApplicationException("Unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
@@ -1602,7 +1602,7 @@ private string FixKeyword(string name)
                        return "[" + name + "]";
                    default:
-                        throw new ApplicationException("unexpected target language");
+                        throw new ArgumentException("Unexpected target language", nameof(_targetLang));
                }
            }
@@ -1620,7 +1620,7 @@ private bool IsKeyword(string name)
                    return name.IsVBKeyword();
                default:
-                    throw new ApplicationException("unexpected target language");
+                    throw new ArgumentException("Unexpected target language", nameof(_targetLang));
            }
        }
    }

--- a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj
@@ -11,21 +11,20 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <ProjectGuid>{02459936-CD2C-4F61-B671-5C518F2A3DDC}</ProjectGuid>
    <OutputType>Exe</OutputType>
+    <OutDir>$(OutDir)CompilerGeneratorTools\</OutDir>
    <RootNamespace>Roslyn.Compilers.Internal.BoundTreeGenerator</RootNamespace>
    <AssemblyName>BoundTreeGenerator</AssemblyName>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\..\..\</SolutionDir>
    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
  <ItemGroup>
    <Compile Include="BoundNodeClassWriter.cs" />
    <Compile Include="Model.cs" />
@@ -38,4 +37,4 @@
  <ImportGroup Label="Targets">
    <Import Project="..\..\..\..\..\..\build\Targets\VSL.Imports.targets" />
  </ImportGroup>
 </Project>
\ No newline at end of file
--- a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/Program.cs
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/Program.cs
@@ -19,7 +19,7 @@ private static int Main(string[] args)
            if (args.Length != 3)
            {
-                Console.Error.WriteLine("Usage: \"{0} <language> <input> <output>\", where <language> is \"VB\" or \"CSharp\"", Path.GetFileNameWithoutExtension(Environment.GetCommandLineArgs()[0]));
+                Console.Error.WriteLine("Usage: \"{0} <language> <input> <output>\", where <language> is \"VB\" or \"CSharp\"", Path.GetFileNameWithoutExtension(args[0]));
                return 1;
            }
@@ -41,14 +41,10 @@ private static int Main(string[] args)
                    return 1;
            }
-            var serializer = new XmlSerializer(typeof(Tree));
-            serializer.UnknownAttribute += new XmlAttributeEventHandler(serializer_UnknownAttribute);
-            serializer.UnknownElement += new XmlElementEventHandler(serializer_UnknownElement);
-            serializer.UnknownNode += new XmlNodeEventHandler(serializer_UnknownNode);
-            serializer.UnreferencedObject += new UnreferencedObjectEventHandler(serializer_UnreferencedObject);
            Tree tree;
-            using (var reader = new XmlTextReader(infilename) { DtdProcessing = DtdProcessing.Prohibit, XmlResolver = null })
+            var serializer = new XmlSerializer(typeof(Tree));
+            using (var reader = XmlReader.Create(infilename, new XmlReaderSettings { DtdProcessing = DtdProcessing.Prohibit }))
            {
                tree = (Tree)serializer.Deserialize(reader);
            }
@@ -60,25 +56,5 @@ private static int Main(string[] args)
            return 0;
        }
-        private static void serializer_UnreferencedObject(object sender, UnreferencedObjectEventArgs e)
-        {
-            Console.WriteLine("Unreferenced Object in XML deserialization");
-        }
-        private static void serializer_UnknownNode(object sender, XmlNodeEventArgs e)
-        {
-            Console.WriteLine("Unknown node {0} at line {1}, col {2}", e.Name, e.LineNumber, e.LinePosition);
-        }
-        private static void serializer_UnknownElement(object sender, XmlElementEventArgs e)
-        {
-            Console.WriteLine("Unknown element {0} at line {1}, col {2}", e.Element.Name, e.LineNumber, e.LinePosition);
-        }
-        private static void serializer_UnknownAttribute(object sender, XmlAttributeEventArgs e)
-        {
-            Console.WriteLine("Unknown attribute {0} at line {1}, col {2}", e.Attr.Name, e.LineNumber, e.LinePosition);
-        }
    }
 }
--- a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json
 {
-  "dependencies": {},
+  "dependencies": {
+    "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"
+  },
  "frameworks": {
-    "net45": {}
+    "dnxcore50": {}
  },
  "runtimes": {
-    "win7": { },
+    "win7": {},
-    "win7-anycpu": { },
+    "ubuntu.14.04": {},
-    "ubuntu.14.04": { },
+    "osx.10.10": {}
-    "ubuntu.14.04-anycpu": { },
-    "osx.10.10": { },
-    "osx.10.10-anycpu": { }
  }
 }
--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj
@@ -10,22 +10,21 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <ProjectGuid>{288089C5-8721-458E-BE3E-78990DAB5E2E}</ProjectGuid>
    <OutputType>Exe</OutputType>
+    <OutDir>$(OutDir)CompilerGeneratorTools\</OutDir>
    <RootNamespace>Roslyn.Compilers.CSharp.Internal.CSharpErrorFactsGenerator</RootNamespace>
    <AssemblyName>CSharpErrorFactsGenerator</AssemblyName>
    <Nonshipping>true</Nonshipping>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\..\..\</SolutionDir>
    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
  <ItemGroup>
    <Compile Include="Program.cs" />
  </ItemGroup>
@@ -35,4 +34,4 @@
  <ImportGroup Label="Targets">
    <Import Project="..\..\..\..\..\..\build\Targets\VSL.Imports.targets" />
  </ImportGroup>
 </Project>
\ No newline at end of file
--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/Program.cs
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/Program.cs
@@ -10,23 +10,20 @@ namespace Microsoft.CodeAnalysis.CSharp.Internal.CSharpErrorFactsGenerator
 {
    public static class Program
    {
-        public static void Main()
+        public static int Main(string[] args)
        {
-            var args = Environment.GetCommandLineArgs();
+            if (args.Length != 2)
-            if (args.Length != 3)
            {
                Console.WriteLine(
-@"Usage: {0} input output
+@"Usage: CSharpErrorFactsGenerator.exe input output
  input     The path to ErrorCode.cs
-  output    The path to GeneratedErrorFacts.cs",
+  output    The path to GeneratedErrorFacts.cs");
-                Path.GetFileNameWithoutExtension(args[0]));
-                Environment.Exit(-1);
+                return -1;
            }
-            string inputPath = args[1];
+            string inputPath = args[0];
-            string outputPath = args[2];
+            string outputPath = args[1];
            var outputText = new StringBuilder();
            outputText.AppendLine("namespace Microsoft.CodeAnalysis.CSharp");
@@ -132,6 +129,8 @@ public static void Main()
            outputText.AppendLine("}");
            File.WriteAllText(outputPath, outputText.ToString());
+            return 0;
        }
    }
 }
--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/project.json
 {
-  "dependencies": {},
+  "dependencies": {
+    "Microsoft.NETCore": "5.0.1-beta-23504",
+    "System.Console": "4.0.0-beta-23504"
+  },
  "frameworks": {
-    "net45": {}
+    "dnxcore50": {}
  },
  "runtimes": {
-    "win7": { },
+    "win7": {},
-    "win7-anycpu": { },
+    "ubuntu.14.04": {},
-    "ubuntu.14.04": { },
+    "osx.10.10": {}
-    "ubuntu.14.04-anycpu": { },
-    "osx.10.10": { },
-    "osx.10.10-anycpu": { }
  }
 }
--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
@@ -7,25 +7,23 @@
  <PropertyGroup>
    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
    <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
-    <PlatformTarget>AnyCPU</PlatformTarget>
    <ProjectGuid>{288089C5-8721-458E-BE3E-78990DAB5E2D}</ProjectGuid>
    <OutputType>Exe</OutputType>
+    <OutDir>$(OutDir)CompilerGeneratorTools\</OutDir>
    <RootNamespace>Roslyn.Compilers.CSharp.Internal.CSharpSyntaxGenerator</RootNamespace>
    <AssemblyName>CSharpSyntaxGenerator</AssemblyName>
    <Nonshipping>true</Nonshipping>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\..\..\</SolutionDir>
    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
  <ItemGroup>
    <Compile Include="AbstractFileWriter.cs" />
    <Compile Include="Model\AbstractNode.cs" />

--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/Program.cs
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/Program.cs
@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
@@ -60,7 +61,7 @@ public static void Main(string[] args)
                }
            }
-            var reader = new XmlTextReader(inputFile) { DtdProcessing = DtdProcessing.Prohibit, XmlResolver = null };
+            var reader = XmlReader.Create(inputFile, new XmlReaderSettings { DtdProcessing = DtdProcessing.Prohibit });
            var serializer = new XmlSerializer(typeof(Tree));
            Tree tree = (Tree)serializer.Deserialize(reader);
@@ -84,7 +85,7 @@ public static void Main(string[] args)
        private static void WriteUsage()
        {
            Console.WriteLine("Invalid usage");
-            Console.WriteLine(typeof(Program).Assembly.ManifestModule.Name + " input-file output-file [/write-test]");
+            Console.WriteLine(typeof(Program).GetTypeInfo().Assembly.ManifestModule.Name + " input-file output-file [/write-test]");
        }
        private static void WriteToFile(Tree tree, Action<TextWriter, Tree> writeAction, string outputFile)

--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json
 {
-  "dependencies": {},
+  "dependencies": {
+    "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"
+  },
  "frameworks": {
-    "net45": {}
+    "dnxcore50": {}
  },
  "runtimes": {
-    "win7": { },
+    "win7": {},
-    "win7-anycpu": { },
+    "ubuntu.14.04": {},
-    "ubuntu.14.04": { },
+    "osx.10.10": {}
-    "ubuntu.14.04-anycpu": { },
-    "osx.10.10": { },
-    "osx.10.10-anycpu": { },
  }
 }
\ No newline at end of file
--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/Program.vb
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/Program.vb
@@ -4,20 +4,17 @@ Imports System.IO
 Imports System.Text
 Friend Module Program
-    Public Sub Main()
+    Public Function Main(args As String()) As Integer
-        Dim args = Environment.GetCommandLineArgs()
+        If args.Length <> 2 Then
-        If args.Length <> 3 Then
            Console.WriteLine(
-"Usage: {0} input output
+"Usage: VBErrorFactsGenerator.exe input output
  input     The path to Errors.vb
-  output    The path to ErrorFacts.Generated.vb",
+  output    The path to ErrorFacts.Generated.vb")
-                Path.GetFileNameWithoutExtension(args(0)))
+            Return -1
-            Environment.Exit(-1)
        End If
-        Dim inputPath = args(1)
+        Dim inputPath = args(0)
-        Dim outputPath = args(2)
+        Dim outputPath = args(1)
        Dim outputText = New StringBuilder
        outputText.AppendLine("Namespace Microsoft.CodeAnalysis.VisualBasic")
@@ -47,7 +44,9 @@ Friend Module Program
        outputText.AppendLine("    End Module")
        outputText.AppendLine("End Namespace")
        File.WriteAllText(outputPath, outputText.ToString())
-    End Sub
+        Return 0
+    End Function
    Private Sub GenerateErrorFactsFunction(functionName As String, codeNames As List(Of String), outputText As StringBuilder)
        outputText.AppendLine(String.Format("        Public Function {0}(code as ERRID) As Boolean", functionName))

--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj
@@ -11,6 +11,7 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <ProjectGuid>{909B656F-6095-4AC2-A5AB-C3F032315C45}</ProjectGuid>
    <OutputType>Exe</OutputType>
+    <OutDir>$(OutDir)CompilerGeneratorTools\</OutDir>
    <StartupObject>
    </StartupObject>
    <RootNamespace>Microsoft.CodeAnalysis.VisualBasic.Internal.VBErrorFactsGenerator</RootNamespace>
@@ -22,19 +23,15 @@
    <OptionInfer>On</OptionInfer>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\..\..\</SolutionDir>
    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
+    <ProjectTypeGuids>{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
+    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
  <ItemGroup>
    <Compile Include="Program.vb" />
  </ItemGroup>

--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/project.json
 {
-  "dependencies": {},
+  "dependencies": {
+    "Microsoft.NETCore": "5.0.1-beta-23504",
+    "System.Console": "4.0.0-beta-23504"
+  },
  "frameworks": {
-    "net45": {}
+    "dnxcore50": {}
  },
  "runtimes": {
-    "win7": { },
+    "win7": {},
-    "win7-anycpu": { },
+    "ubuntu.14.04": {},
-    "ubuntu.14.04": { },
+    "osx.10.10": {}
-    "ubuntu.14.04-anycpu": { },
-    "osx.10.10": { },
-    "osx.10.10-anycpu": { }
  }
 }
--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/Program.vb
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/Program.vb
@@ -96,7 +96,7 @@ Friend Module Program
    Public Sub WriteOutput(outputFile As String, definition As ParseTree, outputKind As String, checksum As String)
-        Using output As New StreamWriter(outputFile)
+        Using output As New StreamWriter(New FileStream(outputFile, FileMode.Create, FileAccess.Write))
            output.WriteLine("' Definition of syntax model.")
            output.WriteLine("' Generated by a tool from SHA256 content {0}", checksum)
            output.WriteLine("' DO NOT HAND EDIT")

--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/Util/WriteCsvNames.vb
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/Util/WriteCsvNames.vb
@@ -22,7 +22,7 @@ Friend Class WriteCsvNames
    ' Write out the CSV with the names.
    Public Sub WriteCsv(filename As String)
-        _writer = New StreamWriter(filename)
+        _writer = New StreamWriter(New FileStream(filename, FileMode.Create, FileAccess.Write))
        Using _writer
            WriteEnums()

--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/Util/WriteDumper.vb
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/Util/WriteDumper.vb
@@ -21,7 +21,7 @@ Friend Class WriteDumper
    ' Write the dumper utility function to the given file.
    Public Sub WriteDumper(filename As String)
-        _writer = New StreamWriter(filename)
+        _writer = New StreamWriter(New FileStream(filename, FileMode.Create, FileAccess.Write))
        Using _writer
            GenerateFile()

--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/Util/WriteUtils.vb
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/Util/WriteUtils.vb
@@ -103,7 +103,7 @@ Public MustInherit Class WriteUtils
    ' If conflictName is not nothing, make sure the name doesn't conflict with that name.
    Protected Function FieldParamName(nodeField As ParseNodeField, Optional conflictName As String = Nothing) As String
        Dim name As String = nodeField.Name
-        If String.Equals(name, conflictName, StringComparison.InvariantCultureIgnoreCase) Then
+        If String.Equals(name, conflictName, StringComparison.OrdinalIgnoreCase) Then
            name += "Parameter"
        End If
        Return Ident(LowerFirstCharacter(name))
@@ -113,7 +113,7 @@ Public MustInherit Class WriteUtils
    ' If conflictName is not nothing, make sure the name doesn't conflict with that name.
    Protected Function ChildParamName(nodeChild As ParseNodeChild, Optional conflictName As String = Nothing) As String
        Dim name As String = OptionalChildName(nodeChild)
-        If String.Equals(name, conflictName, StringComparison.InvariantCultureIgnoreCase) Then
+        If String.Equals(name, conflictName, StringComparison.OrdinalIgnoreCase) Then
            name += "Parameter"
        End If
        Return Ident(LowerFirstCharacter(name))
@@ -177,7 +177,7 @@ Public MustInherit Class WriteUtils
            End If
            Return UpperFirstCharacter(nodeChild.SeparatorsName)
        Else
-            Throw New ApplicationException("Shouldn't get here")
+            Throw New InvalidOperationException("Shouldn't get here")
        End If
    End Function
@@ -425,7 +425,7 @@ Public MustInherit Class WriteUtils
            Case SimpleType.NodeKind
                Return NodeKindString
            Case Else
-                Throw New ApplicationException("Unexpected simple type")
+                Throw New InvalidOperationException("Unexpected simple type")
        End Select
    End Function
@@ -456,7 +456,7 @@ Public MustInherit Class WriteUtils
    ' Given a list of ParseNodeKinds, find the common structure that encapsulates all
    ' of them, or else return Nothing if there is no common structure.
    Protected Function GetCommonStructure(kindList As List(Of ParseNodeKind)) As ParseNodeStructure
-        Dim structList = kindList.ConvertAll(Function(kind) kind.NodeStructure) ' list of the structures.
+        Dim structList = kindList.Select(Function(kind) kind.NodeStructure).ToList() ' list of the structures.
        ' Any candidate ancestor is an ancestor (or same) of the first element
        Dim candidate As ParseNodeStructure = structList(0)

--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj
@@ -11,6 +11,7 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <ProjectGuid>{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}</ProjectGuid>
    <OutputType>Exe</OutputType>
+    <OutDir>$(OutDir)CompilerGeneratorTools\</OutDir>
    <StartupObject>Microsoft.CodeAnalysis.VisualBasic.Internal.VBSyntaxGenerator.Program</StartupObject>
    <RootNamespace>Microsoft.CodeAnalysis.VisualBasic.Internal.VBSyntaxGenerator</RootNamespace>
    <AssemblyName>VBSyntaxGenerator</AssemblyName>
@@ -19,18 +20,15 @@
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\..\..\</SolutionDir>
    <RestorePackages>true</RestorePackages>
    <VBRuntime>Embed</VBRuntime>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
+    <ProjectTypeGuids>{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
+    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
  <ItemGroup>
    <Import Include="Microsoft.VisualBasic" />
    <Import Include="System" />
@@ -76,4 +74,4 @@
  <ImportGroup Label="Targets">
    <Import Project="..\..\..\..\..\..\build\Targets\VSL.Imports.targets" />
  </ImportGroup>
 </Project>
\ No newline at end of file
--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/XML/ReadTree.vb
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/XML/ReadTree.vb
@@ -71,23 +71,11 @@ Public Module ReadTree
    Private Function GetXDocument(fileName As String, <Out> ByRef validationError As Boolean) As XDocument
        s_currentFile = fileName
-        Dim hadError = False
-        Dim onValidationError =
-            Sub(sender As Object, e As ValidationEventArgs)
-                ' A validation error occurred while reading the document. Tell the user.
-                Console.Error.WriteLine("{0}({1},{2}): Invalid input: {3}", s_currentFile, e.Exception.LineNumber, e.Exception.LinePosition, e.Exception.Message)
-                hadError = True
-            End Sub
        Dim xDoc As XDocument
-        Using schemaReader = XmlReader.Create(Assembly.GetExecutingAssembly().GetManifestResourceStream("VBSyntaxModelSchema.xsd"))
+        Using schemaReader = XmlReader.Create(GetType(ReadTree).GetTypeInfo().Assembly.GetManifestResourceStream("VBSyntaxModelSchema.xsd"))
            Dim readerSettings As New XmlReaderSettings()
            readerSettings.DtdProcessing = DtdProcessing.Prohibit
-            readerSettings.XmlResolver = Nothing
-            readerSettings.Schemas.Add(Nothing, schemaReader)
-            readerSettings.ValidationType = ValidationType.Schema
-            AddHandler readerSettings.ValidationEventHandler, onValidationError
            Dim fileStream As New FileStream(fileName, FileMode.Open, FileAccess.Read)
            Using reader = XmlReader.Create(fileStream, readerSettings)
@@ -95,7 +83,7 @@ Public Module ReadTree
            End Using
        End Using
-        validationError = hadError
+        validationError = False
        Return xDoc
    End Function

--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/project.json
 {
-  "dependencies": {},
+  "dependencies": {
+    "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"
+  },
  "frameworks": {
-    "net45": {}
+    "dnxcore50": {}
  },
  "runtimes": {
-    "win7": { },
+    "win7": {},
-    "win7-anycpu": { },
+    "ubuntu.14.04": {},
-    "ubuntu.14.04": { },
+    "osx.10.10": {}
-    "ubuntu.14.04-anycpu": { },
-    "osx.10.10": { },
-    "osx.10.10-anycpu": { },
  }
 }