diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index 271579431..3733528eb 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -147,6 +147,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.TestFramew
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist", "src\redist\redist.csproj", "{098D9321-1201-4974-A75E-F58EBCD98ACF}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_roslyn", "src\tool_roslyn\tool_roslyn.csproj", "{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_msbuild", "src\tool_msbuild\tool_msbuild.csproj", "{D82A3246-9831-4024-A9B2-1932EEF3D56F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_nuget", "src\tool_nuget\tool_nuget.csproj", "{BE4C655A-DC54-4408-B739-743456D34111}"
@@ -703,6 +705,30 @@ Global
 		{098D9321-1201-4974-A75E-F58EBCD98ACF}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
 		{098D9321-1201-4974-A75E-F58EBCD98ACF}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
 		{098D9321-1201-4974-A75E-F58EBCD98ACF}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Debug|x64.ActiveCfg = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Debug|x64.Build.0 = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Debug|x86.ActiveCfg = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Debug|x86.Build.0 = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.MinSizeRel|x64.ActiveCfg = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.MinSizeRel|x64.Build.0 = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.MinSizeRel|x86.ActiveCfg = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.MinSizeRel|x86.Build.0 = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Release|x64.ActiveCfg = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Release|x64.Build.0 = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Release|x86.ActiveCfg = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Release|x86.Build.0 = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
 		{D82A3246-9831-4024-A9B2-1932EEF3D56F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D82A3246-9831-4024-A9B2-1932EEF3D56F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D82A3246-9831-4024-A9B2-1932EEF3D56F}.Debug|x64.ActiveCfg = Release|Any CPU
@@ -1599,6 +1625,7 @@ Global
 		{570950AD-A080-4F32-980C-F50E312910DF} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
 		{6592A22C-2386-4E83-A4D3-FC08075C723A} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
 		{098D9321-1201-4974-A75E-F58EBCD98ACF} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
+		{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
 		{D82A3246-9831-4024-A9B2-1932EEF3D56F} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
 		{BE4C655A-DC54-4408-B739-743456D34111} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
 		{2DFCC95F-75F7-46E1-8F56-256DB4CA98B2} = {0722D325-24C8-4E83-B5AF-0A083E7F0749}
diff --git a/NuGet.Config b/NuGet.Config
index 11723f1b5..9c645c984 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -3,6 +3,7 @@
   <packageSources>
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
+    <add key="TransportFeed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/packages/index.json" />
     <add key="templating" value="https://dotnet.myget.org/F/templating/api/v3/index.json" />
     <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="aspnet" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
diff --git a/NuGet.master.config b/NuGet.master.config
deleted file mode 100644
index b004e5cc7..000000000
--- a/NuGet.master.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <clear />
-    <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
-  </packageSources>
-</configuration>
\ No newline at end of file
diff --git a/TestAssets/TestProjects/MSBuildIntegration/build.proj b/TestAssets/TestProjects/MSBuildIntegration/build.proj
index 8b2a7851e..203f96df3 100644
--- a/TestAssets/TestProjects/MSBuildIntegration/build.proj
+++ b/TestAssets/TestProjects/MSBuildIntegration/build.proj
@@ -29,6 +29,9 @@
     <Error Condition=" '$(MSBuildExtensionsPath)' == '' " 
            Text="Expected MSBuildExtensionsPath to be set, but it is not." />
     
+    <Error Condition=" '$(CscToolExe)' == '' " 
+           Text="Expected CscToolExe to be set, but it is not." />
+
     <Error Condition=" '$(MSBuildSDKsPath)' == '' " 
            Text="Expected MSBuildSDKsPath to be set, but it is not." />
 
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 50c72e3c6..e0ea69874 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -2,11 +2,11 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <CLI_SharedFrameworkVersion>2.0.3-servicing-25808-01</CLI_SharedFrameworkVersion>
-    <CLI_MSBuild_Version>15.5.0-preview-000113-1032064</CLI_MSBuild_Version>
-    <CLI_Roslyn_Version>2.6.0-beta1-62126-01</CLI_Roslyn_Version>
+    <CLI_MSBuild_Version>15.4.7</CLI_MSBuild_Version>
+    <CLI_Roslyn_Version>2.3.2-beta1-61921-05</CLI_Roslyn_Version>
     <CLI_Roslyn_Satellites_Version>2.3.0-pre-20170727-1</CLI_Roslyn_Satellites_Version>
     <CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>
-    <CLI_FSharp_Version>4.2.0-rtm-170926-0</CLI_FSharp_Version>
+    <CLI_FSharp_Version>4.2.0-rc-170630-0</CLI_FSharp_Version>
     <CLI_FSharp_Satellites_Version>4.4.1-pre-20170727-1</CLI_FSharp_Satellites_Version>
 
     <!-- We'll usually want to keep these versions in sync, but we may want to diverge in some
diff --git a/build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage2.proj b/build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage2.proj
index cb833d480..1493128e7 100644
--- a/build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage2.proj
+++ b/build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage2.proj
@@ -7,6 +7,8 @@
     <PropertyGroup>
         <MSBuildExtensionsPathInToolPath>false</MSBuildExtensionsPathInToolPath>
         <MSBuildExtensionsPathInToolPath Condition="$(MSBuildExtensionsPath.StartsWith('$(NormalizedToolPath)'))">true</MSBuildExtensionsPathInToolPath>
+        <CscToolExeInToolPath>false</CscToolExeInToolPath>
+        <CscToolExeInToolPath Condition="$(CscToolExe.StartsWith('$(NormalizedToolPath)'))">true</CscToolExeInToolPath>
         <MSBuildSDKsPathInToolPath>false</MSBuildSDKsPathInToolPath>
         <MSBuildSDKsPathInToolPath Condition="$(MSBuildSDKsPath.StartsWith('$(NormalizedToolPath)'))">true</MSBuildSDKsPathInToolPath>
     </PropertyGroup>
diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh
index a3a7b6ed8..1db273f24 100755
--- a/scripts/obtain/dotnet-install.sh
+++ b/scripts/obtain/dotnet-install.sh
@@ -240,7 +240,7 @@ to_lowercase() {
 remove_trailing_slash() {
     #eval $invocation
     
-    local input=${1:-}
+    local input="${1:-}"
     echo "${input%/}"
     return 0
 }
@@ -250,7 +250,7 @@ remove_trailing_slash() {
 remove_beginning_slash() {
     #eval $invocation
     
-    local input=${1:-}
+    local input="${1:-}"
     echo "${input#/}"
     return 0
 }
@@ -267,8 +267,8 @@ combine_paths() {
         return 1
     fi
     
-    local root_path=$(remove_trailing_slash $1)
-    local child_path=$(remove_beginning_slash ${2:-})
+    local root_path="$(remove_trailing_slash "$1")"
+    local child_path="$(remove_beginning_slash "${2:-}")"
     say_verbose "combine_paths: root_path=$root_path"
     say_verbose "combine_paths: child_path=$child_path"
     echo "$root_path/$child_path"
@@ -288,10 +288,10 @@ get_machine_architecture() {
 get_normalized_architecture_from_architecture() {
     eval $invocation
     
-    local architecture=$(to_lowercase $1)
-    case $architecture in
+    local architecture="$(to_lowercase "$1")"
+    case "$architecture" in
         \<auto\>)
-            echo "$(get_normalized_architecture_from_architecture $(get_machine_architecture))"
+            echo "$(get_normalized_architecture_from_architecture "$(get_machine_architecture)")"
             return 0
             ;;
         amd64|x64)
@@ -338,11 +338,11 @@ get_commit_hash_from_version_info() {
 is_dotnet_package_installed() {
     eval $invocation
     
-    local install_root=$1
-    local relative_path_to_package=$2
-    local specific_version=${3//[$'\t\r\n']}
+    local install_root="$1"
+    local relative_path_to_package="$2"
+    local specific_version="${3//[$'\t\r\n']}"
     
-    local dotnet_package_path=$(combine_paths $(combine_paths $install_root $relative_path_to_package) $specific_version)
+    local dotnet_package_path="$(combine_paths "$(combine_paths "$install_root" "$relative_path_to_package")" "$specific_version")"
     say_verbose "is_dotnet_package_installed: dotnet_package_path=$dotnet_package_path"
     
     if [ -d "$dotnet_package_path" ]; then
@@ -360,10 +360,10 @@ is_dotnet_package_installed() {
 get_latest_version_info() {
     eval $invocation
     
-    local azure_feed=$1
-    local channel=$2
-    local normalized_architecture=$3
-    local coherent=$4
+    local azure_feed="$1"
+    local channel="$2"
+    local normalized_architecture="$3"
+    local coherent="$4"
 
     local version_file_url=null
     if [ "$shared_runtime" = true ]; then
@@ -377,7 +377,7 @@ get_latest_version_info() {
     fi
     say_verbose "get_latest_version_info: latest url: $version_file_url"
     
-    download $version_file_url
+    download "$version_file_url"
     return $?
 }
 
@@ -389,28 +389,28 @@ get_latest_version_info() {
 get_specific_version_from_version() {
     eval $invocation
     
-    local azure_feed=$1
-    local channel=$2
-    local normalized_architecture=$3
-    local version=$(to_lowercase $4)
+    local azure_feed="$1"
+    local channel="$2"
+    local normalized_architecture="$3"
+    local version="$(to_lowercase "$4")"
 
-    case $version in
+    case "$version" in
         latest)
             local version_info
-            version_info="$(get_latest_version_info $azure_feed $channel $normalized_architecture false)" || return 1
+            version_info="$(get_latest_version_info "$azure_feed" "$channel" "$normalized_architecture" false)" || return 1
             say_verbose "get_specific_version_from_version: version_info=$version_info"
             echo "$version_info" | get_version_from_version_info
             return 0
             ;;
         coherent)
             local version_info
-            version_info="$(get_latest_version_info $azure_feed $channel $normalized_architecture true)" || return 1
+            version_info="$(get_latest_version_info "$azure_feed" "$channel" "$normalized_architecture" true)" || return 1
             say_verbose "get_specific_version_from_version: version_info=$version_info"
             echo "$version_info" | get_version_from_version_info
             return 0
             ;;
         *)
-            echo $version
+            echo "$version"
             return 0
             ;;
     esac
@@ -424,13 +424,13 @@ get_specific_version_from_version() {
 construct_download_link() {
     eval $invocation
     
-    local azure_feed=$1
-    local channel=$2
-    local normalized_architecture=$3
-    local specific_version=${4//[$'\t\r\n']}
+    local azure_feed="$1"
+    local channel="$2"
+    local normalized_architecture="$3"
+    local specific_version="${4//[$'\t\r\n']}"
     
     local osname
-    osname=$(get_current_os_name) || return 1
+    osname="$(get_current_os_name)" || return 1
 
     local download_link=null
     if [ "$shared_runtime" = true ]; then
@@ -451,13 +451,13 @@ construct_download_link() {
 construct_legacy_download_link() {
     eval $invocation
     
-    local azure_feed=$1
-    local channel=$2
-    local normalized_architecture=$3
-    local specific_version=${4//[$'\t\r\n']}
+    local azure_feed="$1"
+    local channel="$2"
+    local normalized_architecture="$3"
+    local specific_version="${4//[$'\t\r\n']}"
 
     local distro_specific_osname
-    distro_specific_osname=$(get_distro_specific_os_name) || return 1
+    distro_specific_osname="$(get_distro_specific_os_name)" || return 1
 
     local legacy_download_link=null
     if [ "$shared_runtime" = true ]; then
@@ -474,7 +474,7 @@ get_user_install_path() {
     eval $invocation
     
     if [ ! -z "${DOTNET_INSTALL_DIR:-}" ]; then
-        echo $DOTNET_INSTALL_DIR
+        echo "$DOTNET_INSTALL_DIR"
     else
         echo "$HOME/.dotnet"
     fi
@@ -488,7 +488,7 @@ resolve_installation_path() {
     
     local install_dir=$1
     if [ "$install_dir" = "<auto>" ]; then
-        local user_install_path=$(get_user_install_path)
+        local user_install_path="$(get_user_install_path)"
         say_verbose "resolve_installation_path: user_install_path=$user_install_path"
         echo "$user_install_path"
         return 0
@@ -503,11 +503,11 @@ resolve_installation_path() {
 get_installed_version_info() {
     eval $invocation
     
-    local install_root=$1
-    local version_file=$(combine_paths "$install_root" "$local_version_file_relative_path")
+    local install_root="$1"
+    local version_file="$(combine_paths "$install_root" "$local_version_file_relative_path")"
     say_verbose "Local version file: $version_file"
     if [ ! -z "$version_file" ] | [ -r "$version_file" ]; then
-        local version_info="$(cat $version_file)"
+        local version_info="$(cat "$version_file")"
         echo "$version_info"
         return 0
     fi
@@ -522,7 +522,7 @@ get_absolute_path() {
     eval $invocation
     
     local relative_or_absolute_path=$1
-    echo $(cd $(dirname "$1") && pwd -P)/$(basename "$1")
+    echo "$(cd "$(dirname "$1")" && pwd -P)/$(basename "$1")"
     return 0
 }
 
@@ -534,17 +534,17 @@ get_absolute_path() {
 copy_files_or_dirs_from_list() {
     eval $invocation
 
-    local root_path=$(remove_trailing_slash $1)
-    local out_path=$(remove_trailing_slash $2)
-    local override=$3
+    local root_path="$(remove_trailing_slash "$1")"
+    local out_path="$(remove_trailing_slash "$2")"
+    local override="$3"
     local override_switch=$(if [ "$override" = false ]; then printf -- "-n"; fi)
     
     cat | uniq | while read -r file_path; do
-        local path=$(remove_beginning_slash ${file_path#$root_path})
-        local target=$out_path/$path
+        local path="$(remove_beginning_slash "${file_path#$root_path}")"
+        local target="$out_path/$path"
         if [ "$override" = true ] || (! ([ -d "$target" ] || [ -e "$target" ])); then
-            mkdir -p $out_path/$(dirname $path)
-            cp -R $override_switch $root_path/$path $target
+            mkdir -p "$out_path/$(dirname "$path")"
+            cp -R $override_switch "$root_path/$path" "$target"
         fi
     done
 }
@@ -555,19 +555,19 @@ copy_files_or_dirs_from_list() {
 extract_dotnet_package() {
     eval $invocation
     
-    local zip_path=$1
-    local out_path=$2
+    local zip_path="$1"
+    local out_path="$2"
     
-    local temp_out_path=$(mktemp -d $temporary_file_template)
+    local temp_out_path="$(mktemp -d "$temporary_file_template")"
     
     local failed=false
     tar -xzf "$zip_path" -C "$temp_out_path" > /dev/null || failed=true
     
     local folders_with_version_regex='^.*/[0-9]+\.[0-9]+[^/]+/'
-    find $temp_out_path -type f | grep -Eo $folders_with_version_regex | copy_files_or_dirs_from_list $temp_out_path $out_path false
-    find $temp_out_path -type f | grep -Ev $folders_with_version_regex | copy_files_or_dirs_from_list $temp_out_path $out_path $override_non_versioned_files
+    find "$temp_out_path" -type f | grep -Eo "$folders_with_version_regex" | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" false
+    find "$temp_out_path" -type f | grep -Ev "$folders_with_version_regex" | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" "$override_non_versioned_files"
     
-    rm -rf $temp_out_path
+    rm -rf "$temp_out_path"
     
     if [ "$failed" = true ]; then
         say_err "Extraction failed"
@@ -581,14 +581,14 @@ extract_dotnet_package() {
 download() {
     eval $invocation
 
-    local remote_path=$1
-    local out_path=${2:-}
+    local remote_path="$1"
+    local out_path="${2:-}"
 
     local failed=false
     if machine_has "curl"; then
-        downloadcurl $remote_path $out_path || failed=true
+        downloadcurl "$remote_path" "$out_path" || failed=true
     elif machine_has "wget"; then
-        downloadwget $remote_path $out_path || failed=true
+        downloadwget "$remote_path" "$out_path" || failed=true
     else
         failed=true
     fi
@@ -601,14 +601,14 @@ download() {
 
 downloadcurl() {
     eval $invocation
-    local remote_path=$1
-    local out_path=${2:-}
+    local remote_path="$1"
+    local out_path="${2:-}"
 
     local failed=false
     if [ -z "$out_path" ]; then
-        curl --retry 10 -sSL -f --create-dirs $remote_path || failed=true
+        curl --retry 10 -sSL -f --create-dirs "$remote_path" || failed=true
     else
-        curl --retry 10 -sSL -f --create-dirs -o $out_path $remote_path || failed=true
+        curl --retry 10 -sSL -f --create-dirs -o "$out_path" "$remote_path" || failed=true
     fi
     if [ "$failed" = true ]; then
         say_verbose "Curl download failed"
@@ -619,14 +619,14 @@ downloadcurl() {
 
 downloadwget() {
     eval $invocation
-    local remote_path=$1
-    local out_path=${2:-}
+    local remote_path="$1"
+    local out_path="${2:-}"
 
     local failed=false
     if [ -z "$out_path" ]; then
-        wget -q --tries 10 -O - $remote_path || failed=true
+        wget -q --tries 10 -O - "$remote_path" || failed=true
     else
-        wget -v --tries 10 -O $out_path $remote_path || failed=true
+        wget -v --tries 10 -O "$out_path" "$remote_path" || failed=true
     fi
     if [ "$failed" = true ]; then
         say_verbose "Wget download failed"
@@ -639,20 +639,20 @@ calculate_vars() {
     eval $invocation
     valid_legacy_download_link=true
 
-    normalized_architecture=$(get_normalized_architecture_from_architecture "$architecture")
+    normalized_architecture="$(get_normalized_architecture_from_architecture "$architecture")"
     say_verbose "normalized_architecture=$normalized_architecture"
     
-    specific_version=$(get_specific_version_from_version $azure_feed $channel $normalized_architecture $version)
+    specific_version="$(get_specific_version_from_version "$azure_feed" "$channel" "$normalized_architecture" "$version")"
     say_verbose "specific_version=$specific_version"
     if [ -z "$specific_version" ]; then
         say_err "Could not get version information."
         return 1
     fi
     
-    download_link=$(construct_download_link $azure_feed $channel $normalized_architecture $specific_version)
+    download_link="$(construct_download_link "$azure_feed" "$channel" "$normalized_architecture" "$specific_version")"
     say_verbose "download_link=$download_link"
 
-    legacy_download_link=$(construct_legacy_download_link $azure_feed $channel $normalized_architecture $specific_version) || valid_legacy_download_link=false
+    legacy_download_link="$(construct_legacy_download_link "$azure_feed" "$channel" "$normalized_architecture" "$specific_version")" || valid_legacy_download_link=false
 
     if [ "$valid_legacy_download_link" = true ]; then
         say_verbose "legacy_download_link=$legacy_download_link"
@@ -660,7 +660,7 @@ calculate_vars() {
         say_verbose "Cound not construct a legacy_download_link; omitting..."
     fi
 
-    install_root=$(resolve_installation_path $install_dir)
+    install_root="$(resolve_installation_path "$install_dir")"
     say_verbose "install_root=$install_root"
 }
 
@@ -668,32 +668,33 @@ install_dotnet() {
     eval $invocation
     local download_failed=false
 
-    if is_dotnet_package_installed $install_root "sdk" $specific_version; then
+    if is_dotnet_package_installed "$install_root" "sdk" "$specific_version"; then
         say ".NET SDK version $specific_version is already installed."
         return 0
     fi
     
-    mkdir -p $install_root
-    zip_path=$(mktemp $temporary_file_template)
+    mkdir -p "$install_root"
+    zip_path="$(mktemp "$temporary_file_template")"
     say_verbose "Zip path: $zip_path"
 
     say "Downloading link: $download_link"
+    
     # Failures are normal in the non-legacy case for ultimately legacy downloads.
     # Do not output to stderr, since output to stderr is considered an error.
-    download "$download_link" $zip_path 2>&1 || download_failed=true
+    download "$download_link" "$zip_path" 2>&1 || download_failed=true
 
     #  if the download fails, download the legacy_download_link
     if [ "$download_failed" = true ] && [ "$valid_legacy_download_link" = true ]; then
         say "Cannot download: $download_link"
-        download_link=$legacy_download_link
-        zip_path=$(mktemp $temporary_file_template)
+        download_link="$legacy_download_link"
+        zip_path="$(mktemp "$temporary_file_template")"
         say_verbose "Legacy zip path: $zip_path"
         say "Downloading legacy link: $download_link"
-        download "$download_link" $zip_path
+        download "$download_link" "$zip_path"
     fi
     
     say "Extracting zip from $download_link"
-    extract_dotnet_package $zip_path $install_root
+    extract_dotnet_package "$zip_path" "$install_root"
     
     return 0
 }
@@ -717,11 +718,11 @@ override_non_versioned_files=true
 
 while [ $# -ne 0 ]
 do
-    name=$1
-    case $name in
+    name="$1"
+    case "$name" in
         -c|--channel|-[Cc]hannel)
             shift
-            channel=$1
+            channel="$1"
             ;;
         -v|--version|-[Vv]ersion)
             shift
@@ -764,7 +765,7 @@ do
             override_non_versioned_files=false
             ;;
         -?|--?|-h|--help|-[Hh]elp)
-            script_name="$(basename $0)"
+            script_name="$(basename "$0")"
             echo ".NET Tools Installer"
             echo "Usage: $script_name [-c|--channel <CHANNEL>] [-v|--version <VERSION>] [-p|--prefix <DESTINATION>]"
             echo "       $script_name -h|-?|--help"
@@ -830,17 +831,17 @@ if [ "$dry_run" = true ]; then
     if [ "$valid_legacy_download_link" = true ]; then
         say "Legacy payload URL: $legacy_download_link"
     fi
-    say "Repeatable invocation: ./$(basename $0) --version $specific_version --channel $channel --install-dir $install_dir"
+    say "Repeatable invocation: ./$(basename "$0") --version $specific_version --channel $channel --install-dir $install_dir"
     exit 0
 fi
 
 check_pre_reqs
 install_dotnet
 
-bin_path=$(get_absolute_path $(combine_paths $install_root $bin_folder_relative_path))
+bin_path="$(get_absolute_path "$(combine_paths "$install_root" "$bin_folder_relative_path")")"
 if [ "$no_path" = false ]; then
     say "Adding to current process PATH: \`$bin_path\`. Note: This change will be visible only when sourcing script."
-    export PATH=$bin_path:$PATH
+    export PATH="$bin_path":"$PATH"
 else
     say "Binaries of dotnet can be found in $bin_path"
 fi
diff --git a/src/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs b/src/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs
index 39c7fb2df..500ab7b30 100644
--- a/src/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs
+++ b/src/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs
@@ -23,8 +23,9 @@ namespace Microsoft.DotNet.Cli.Utils
             new Dictionary<string, string>
             {
                 { "MSBuildExtensionsPath", AppContext.BaseDirectory },
-                { "MSBuildSDKsPath", GetMSBuildSDKsPath() },
-                { "DOTNET_HOST_PATH", GetDotnetPath() },
+                { "CscToolExe", GetRunCscPath() },
+                { "VbcToolExe", GetRunVbcPath() },
+                { "MSBuildSDKsPath", GetMSBuildSDKsPath() }
             };
 
         private readonly IEnumerable<string> _msbuildRequiredParameters =
@@ -77,9 +78,20 @@ namespace Microsoft.DotNet.Cli.Utils
                 SdksDirectoryName);
         }
 
-        private static string GetDotnetPath()
+        private static string GetRunVbcPath()
         {
-            return new Muxer().MuxerPath;
+            return GetRunToolPath("Vbc");
+        }        
+
+        private static string GetRunCscPath()
+        {
+            return GetRunToolPath("Csc");
+        }
+
+        private static string GetRunToolPath(string compilerName)
+        {
+            var scriptExtension = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".cmd" : ".sh";
+            return Path.Combine(AppContext.BaseDirectory, "Roslyn", $"Run{compilerName}{scriptExtension}");
         }
     }
 }
diff --git a/src/dotnet/commands/dotnet-run/LocalizableStrings.resx b/src/dotnet/commands/dotnet-run/LocalizableStrings.resx
index a939d42a8..8cab1941e 100644
--- a/src/dotnet/commands/dotnet-run/LocalizableStrings.resx
+++ b/src/dotnet/commands/dotnet-run/LocalizableStrings.resx
@@ -177,7 +177,7 @@ The current {1} is '{2}'.</value>
     <value>Using launch settings from {0}...</value>
   </data>
   <data name="LaunchProfileIsNotAJsonObject" xml:space="preserve">
-    <value>A profile with the specified name could not be found or is not a valid JSON object.</value>
+    <value>Launch profile is not a JSON object.</value>
   </data>
   <data name="LaunchProfileHandlerCannotBeLocated" xml:space="preserve">
     <value>The launch profile type '{0}' is not supported.</value>
diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf
index 8ea09aff9..60ce2ef7b 100644
--- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf
+++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf
@@ -103,8 +103,8 @@ Aktuální {1} je {2}.</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileIsNotAJsonObject">
-        <source>A profile with the specified name could not be found or is not a valid JSON object.</source>
-        <target state="needs-review-translation">Profil spuštění není objektem JSON.</target>
+        <source>Launch profile is not a JSON object.</source>
+        <target state="translated">Profil spuštění není objektem JSON.</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileHandlerCannotBeLocated">
diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.de.xlf
index c4888a85d..2349aafdc 100644
--- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.de.xlf
+++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.de.xlf
@@ -103,8 +103,8 @@ Ein ausführbares Projekt sollte ein ausführbares TFM (z.B. netcoreapp2.0) verw
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileIsNotAJsonObject">
-        <source>A profile with the specified name could not be found or is not a valid JSON object.</source>
-        <target state="needs-review-translation">Das Startprofil ist kein JSON-Objekt.</target>
+        <source>Launch profile is not a JSON object.</source>
+        <target state="translated">Das Startprofil ist kein JSON-Objekt.</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileHandlerCannotBeLocated">
diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.es.xlf
index f22075f6b..4c05cc144 100644
--- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.es.xlf
+++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.es.xlf
@@ -103,8 +103,8 @@ El actual {1} es "{2}".</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileIsNotAJsonObject">
-        <source>A profile with the specified name could not be found or is not a valid JSON object.</source>
-        <target state="needs-review-translation">El perfil de inicio no es un objeto JSON.</target>
+        <source>Launch profile is not a JSON object.</source>
+        <target state="translated">El perfil de inicio no es un objeto JSON.</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileHandlerCannotBeLocated">
diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf
index cb25dab6b..f62af586a 100644
--- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf
+++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf
@@ -103,8 +103,8 @@ Le {1} actuel est '{2}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileIsNotAJsonObject">
-        <source>A profile with the specified name could not be found or is not a valid JSON object.</source>
-        <target state="needs-review-translation">Le profil de lancement n'est pas un objet JSON.</target>
+        <source>Launch profile is not a JSON object.</source>
+        <target state="translated">Le profil de lancement n'est pas un objet JSON.</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileHandlerCannotBeLocated">
diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.it.xlf
index 13ca40c66..ba7512823 100644
--- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.it.xlf
+++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.it.xlf
@@ -103,8 +103,8 @@ Il valore corrente di {1} è '{2}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileIsNotAJsonObject">
-        <source>A profile with the specified name could not be found or is not a valid JSON object.</source>
-        <target state="needs-review-translation">Il profilo di avvio non è un oggetto JSON.</target>
+        <source>Launch profile is not a JSON object.</source>
+        <target state="translated">Il profilo di avvio non è un oggetto JSON.</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileHandlerCannotBeLocated">
diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ja.xlf
index 8f52f732c..fa08955ee 100644
--- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ja.xlf
+++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ja.xlf
@@ -103,8 +103,8 @@ The current {1} is '{2}'.</source>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileIsNotAJsonObject">
-        <source>A profile with the specified name could not be found or is not a valid JSON object.</source>
-        <target state="needs-review-translation">起動プロファイルが JSON オブジェクトではありません。</target>
+        <source>Launch profile is not a JSON object.</source>
+        <target state="translated">起動プロファイルが JSON オブジェクトではありません。</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileHandlerCannotBeLocated">
diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ko.xlf
index 86ff5d88f..41a2ec94e 100644
--- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ko.xlf
+++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ko.xlf
@@ -103,8 +103,8 @@ The current {1} is '{2}'.</source>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileIsNotAJsonObject">
-        <source>A profile with the specified name could not be found or is not a valid JSON object.</source>
-        <target state="needs-review-translation">시작 프로필이 JSON 개체가 아닙니다.</target>
+        <source>Launch profile is not a JSON object.</source>
+        <target state="translated">시작 프로필이 JSON 개체가 아닙니다.</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileHandlerCannotBeLocated">
diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pl.xlf
index b07a84d33..aab3a4913 100644
--- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pl.xlf
+++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pl.xlf
@@ -103,8 +103,8 @@ Bieżący element {1}: „{2}”.</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileIsNotAJsonObject">
-        <source>A profile with the specified name could not be found or is not a valid JSON object.</source>
-        <target state="needs-review-translation">Profil uruchamiania nie jest obiektem JSON.</target>
+        <source>Launch profile is not a JSON object.</source>
+        <target state="translated">Profil uruchamiania nie jest obiektem JSON.</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileHandlerCannotBeLocated">
diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pt-BR.xlf
index 1e19ebcf8..2843c82ef 100644
--- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pt-BR.xlf
+++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pt-BR.xlf
@@ -103,8 +103,8 @@ O {1} atual é '{2}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileIsNotAJsonObject">
-        <source>A profile with the specified name could not be found or is not a valid JSON object.</source>
-        <target state="needs-review-translation">O perfil de inicialização não é um objeto JSON.</target>
+        <source>Launch profile is not a JSON object.</source>
+        <target state="translated">O perfil de inicialização não é um objeto JSON.</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileHandlerCannotBeLocated">
diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ru.xlf
index cf00bd460..95b1e0400 100644
--- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ru.xlf
+++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ru.xlf
@@ -103,8 +103,8 @@ The current {1} is '{2}'.</source>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileIsNotAJsonObject">
-        <source>A profile with the specified name could not be found or is not a valid JSON object.</source>
-        <target state="needs-review-translation">Профиль запуска не является объектом JSON.</target>
+        <source>Launch profile is not a JSON object.</source>
+        <target state="translated">Профиль запуска не является объектом JSON.</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileHandlerCannotBeLocated">
diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.tr.xlf
index 9a21b7da4..a3a9211fb 100644
--- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.tr.xlf
+++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.tr.xlf
@@ -103,8 +103,8 @@ Geçerli {1}: '{2}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileIsNotAJsonObject">
-        <source>A profile with the specified name could not be found or is not a valid JSON object.</source>
-        <target state="needs-review-translation">Başlatma profili bir JSON nesnesi değil.</target>
+        <source>Launch profile is not a JSON object.</source>
+        <target state="translated">Başlatma profili bir JSON nesnesi değil.</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileHandlerCannotBeLocated">
diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hans.xlf
index 4ac5ce35e..a4b5c43c2 100644
--- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hans.xlf
+++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hans.xlf
@@ -103,8 +103,8 @@ The current {1} is '{2}'.</source>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileIsNotAJsonObject">
-        <source>A profile with the specified name could not be found or is not a valid JSON object.</source>
-        <target state="needs-review-translation">启动配置文件不是 JSON 对象。</target>
+        <source>Launch profile is not a JSON object.</source>
+        <target state="translated">启动配置文件不是 JSON 对象。</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileHandlerCannotBeLocated">
diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hant.xlf
index 05567e529..b9bd6e9c3 100644
--- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hant.xlf
+++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hant.xlf
@@ -103,8 +103,8 @@ The current {1} is '{2}'.</source>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileIsNotAJsonObject">
-        <source>A profile with the specified name could not be found or is not a valid JSON object.</source>
-        <target state="needs-review-translation">啟動設定檔並非 JSON 物件。</target>
+        <source>Launch profile is not a JSON object.</source>
+        <target state="translated">啟動設定檔並非 JSON 物件。</target>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileHandlerCannotBeLocated">
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 4dbd46f5d..c45cd6bdf 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -17,16 +17,15 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.App" Version="$(CLI_SharedFrameworkVersion)" />
+    <PackageReference Include="Microsoft.Build.Runtime" Version="$(CLI_MSBuild_Version)" />
     <PackageReference Include="NuGet.Build.Tasks" Version="$(CLI_NuGet_Version)" />
     <PackageReference Include="Microsoft.TestPlatform.CLI" Version="$(CLI_TestPlatform_Version)" />
     <PackageReference Include="Microsoft.TestPlatform.Build" Version="$(CLI_TestPlatform_Version)" />
     <PackageReference Include="NuGet.ProjectModel" Version="$(CLI_NuGet_Version)" />
-    <PackageReference Include="Microsoft.NETCore.Compilers" Version="$(CLI_Roslyn_Version)">
-      <ExcludeAssets>All</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="CliDeps.Satellites.Roslyn" Version="$(CLI_Roslyn_Satellites_Version)">
-      <ExcludeAssets>All</ExcludeAssets>
-    </PackageReference>
+    <!-- The project json migration commands depend on an older version of Roslyn.
+         Lift the version here to match what tool_roslyn depends on (otherwise an older version will
+         be added to the TPA when we crossgen and we won't be able to crossgen tool_roslyn -->
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(CLI_Roslyn_Version)" />
   </ItemGroup>
 
   <ItemGroup>
@@ -75,25 +74,9 @@
   <Target Name="PublishRoslyn"
           BeforeTargets="Publish">
           
-    <ItemGroup>
-      <RoslynBits Include="$(NuGetPackagesDir)/microsoft.netcore.compilers/$(CLI_Roslyn_Version)/tools/**/*" />
-      <RoslynSatelliteBits Include="$(NuGetPackagesDir)/clideps.satellites.roslyn/$(CLI_Roslyn_Satellites_Version)/lib/netstandard1.0/**/*" />
-    </ItemGroup>
-    <Copy SourceFiles="@(RoslynBits)" DestinationFiles="@(RoslynBits->'$(RoslynDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
-    <Copy SourceFiles="@(RoslynSatelliteBits)" DestinationFiles="@(RoslynSatelliteBits->'$(RoslynDirectory)/bincore/%(RecursiveDir)%(Filename)%(Extension)')" />
-    <ItemGroup>
-      <RetargetRuntimeConfigPaths Include="$(RoslynDirectory)/bincore/csc.runtimeconfig.json" />
-      <RetargetRuntimeConfigPaths Include="$(RoslynDirectory)/bincore/vbc.runtimeconfig.json" />
-    </ItemGroup>
-    <PropertyGroup>
-      <ReplacementPattern>"version": ".*"</ReplacementPattern>
-      <ReplacementString>"version": "$(CLI_SharedFrameworkVersion)"</ReplacementString>
-    </PropertyGroup>
-    <ReplaceFileContents
-      InputFile="%(RetargetRuntimeConfigPaths.Identity)"
-      DestinationFile="%(RetargetRuntimeConfigPaths.Identity)"
-      ReplacementPatterns="$(ReplacementPattern)"
-      ReplacementStrings="$(ReplacementString)" />
+    <DotNetPublish ToolPath="$(Stage0Directory)"
+                   Configuration="$(Configuration)"
+                   ProjectPath="$(SrcDirectory)/tool_roslyn/tool_roslyn.csproj" />
   </Target>
 
   <Target Name="PublishFSharp"
@@ -217,72 +200,41 @@
           Condition=" '$(DISABLE_CROSSGEN)' == '' "
           AfterTargets="PublishMSBuildExtensions">
     <ItemGroup>
-      <RoslynFiles Include="$(PublishDir)Roslyn\bincore\**\*" />
-      <FSharpFiles Include="$(PublishDir)FSharp\**\*" Exclude="$(PublishDir)FSharp\FSharp.Build.dll" />
-      <RemainingFiles Include="$(PublishDir)**\*" Exclude="@(RoslynFiles);@(FSharpFiles)" />
-
       <!-- Removing Full CLR built TestHost assemblies from getting Crossgen as it is throwing error -->
-      <RemainingFiles Remove="$(PublishDir)TestHost*\**\*" />
-      <RemainingFiles Remove="$(PublishDir)Sdks\**\*" />
+      <SdkFiles Include="$(PublishDir)/**/*" Exclude="$(PublishDir)/TestHost*/**/*;$(PublishDir)/Sdks/**/*" />
 
       <!-- Don't try to CrossGen .NET Framework support assemblies for .NET Standard -->
-      <RemainingFiles Remove="$(PublishDir)Microsoft\Microsoft.NET.Build.Extensions\net*\**\*" />
+      <SdkFiles Remove="$(PublishDir)/Microsoft\Microsoft.NET.Build.Extensions\net*\**\*" />
 
       <!-- Don't try to CrossGen tasks and supporting DLLs compiled for .NET Framework -->
-      <RemainingFiles Remove="$(PublishDir)Microsoft\Microsoft.NET.Build.Extensions\tools\net*\**\*" />
+      <SdkFiles Remove="$(PublishDir)/Microsoft\Microsoft.NET.Build.Extensions\tools\net*\**\*" />
     </ItemGroup>
 
-    <AddMetadataIsPE Items="@(RoslynFiles)">
-      <Output TaskParameter="ResultItems" ItemName="RoslynFilesWithPEMarker" />
-    </AddMetadataIsPE>
-    <AddMetadataIsPE Items="@(FSharpFiles)">
-      <Output TaskParameter="ResultItems" ItemName="FSharpFilesWithPEMarker" />
-    </AddMetadataIsPE>
-    <AddMetadataIsPE Items="@(RemainingFiles)">
-      <Output TaskParameter="ResultItems" ItemName="RemainingFilesWithPEMarker" />
+    <AddMetadataIsPE Items="@(SdkFiles)">
+      <Output TaskParameter="ResultItems" ItemName="SdkFilesWithPEMarker" />
     </AddMetadataIsPE>
 
     <ItemGroup>
-      <RoslynTargets Include="%(RoslynFilesWithPEMarker.FullPath)" Condition=" '%(RoslynFilesWithPEMarker.IsPE)' == 'True' " />
-      <FSharpTargets Include="%(FSharpFilesWithPEMarker.FullPath)" Condition=" '%(FSharpFilesWithPEMarker.IsPE)' == 'True' " />
-      <RemainingTargets Include="%(RemainingFilesWithPEMarker.FullPath)" Condition=" '%(RemainingFilesWithPEMarker.IsPE)' == 'True' " />
-
-      <RoslynFolders Include="@(RoslynTargets-&gt;DirectoryName()-&gt;Distinct())" />
-      <FSharpFolders Include="@(FSharpTargets-&gt;DirectoryName()-&gt;Distinct())" />
-      <RemainingFolders Include="@(RemainingTargets-&gt;DirectoryName()-&gt;Distinct())" />
-
-      <!-- FSharp.Build.dll causes the FSharp folder to be included. Remove it, as we don't want other FSharp dlls being included in the crossgen. -->
-      <RemainingFolders Remove="$(PublishDir)FSharp\**\*" />
+      <CrossgenTargets Include="%(SdkFilesWithPEMarker.FullPath)" Condition=" '%(SdkFilesWithPEMarker.IsPE)' == 'True' " />
     </ItemGroup>
 
+    <RemoveDuplicates Inputs="@(SdkFiles->'%(RootDir)%(Directory)')">
+      <Output TaskParameter="Filtered" ItemName="PublishDirSubDirectories" />
+    </RemoveDuplicates>
+
     <!-- Ensure crossgen tool is executable.  See https://github.com/NuGet/Home/issues/4424 -->
     <Chmod Condition=" '$(OSName)' != 'win' "
            Glob="$(CrossgenPath)"
            Mode="u+x" />
 
-    <Crossgen
-        SourceAssembly="%(RoslynTargets.FullPath)"
-        DestinationPath="%(RoslynTargets.FullPath)"
-        JITPath="$(LibCLRJitPath)"
-        CrossgenPath="$(CrossgenPath)"
-        ReadyToRun="True"
-        PlatformAssemblyPaths="@(PlatformAssemblies);@(RoslynFolders);$(SharedFrameworkNameVersionPath)" />
-
-    <Crossgen
-        SourceAssembly="%(FSharpTargets.FullPath)"
-        DestinationPath="%(FSharpTargets.FullPath)"
-        JITPath="$(LibCLRJitPath)"
-        CrossgenPath="$(CrossgenPath)"
-        ReadyToRun="True"
-        PlatformAssemblyPaths="@(PlatformAssemblies);@(FSharpFolders);$(SharedFrameworkNameVersionPath)" />
-
-    <Crossgen
-        SourceAssembly="%(RemainingTargets.FullPath)"
-        DestinationPath="%(RemainingTargets.FullPath)"
-        JITPath="$(LibCLRJitPath)"
-        CrossgenPath="$(CrossgenPath)"
-        ReadyToRun="True"
-        PlatformAssemblyPaths="@(PlatformAssemblies);@(RemainingFolders);$(SharedFrameworkNameVersionPath)" />
+    <Crossgen SourceAssembly="%(CrossgenTargets.FullPath)"
+              DestinationPath="%(CrossgenTargets.FullPath)"
+              JITPath="$(LibCLRJitPath)"
+              CrossgenPath="$(CrossgenPath)"
+              ReadyToRun="True"
+              PlatformAssemblyPaths="@(PlatformAssemblies);
+                                     @(PublishDirSubDirectories);
+                                     $(SharedFrameworkNameVersionPath)" />
   </Target>
 
   <Target Name="ChmodPublishDir"
@@ -291,6 +243,8 @@
     
     <Exec Command="find $(SdkOutputDirectory) -type d -exec chmod 755 {} \;" />
     <Exec Command="find $(SdkOutputDirectory) -type f -exec chmod 644 {} \;" />
+    <Chmod Mode="755" Glob="$(SdkOutputDirectory)/Roslyn/RunCsc.sh" />
+    <Chmod Mode="755" Glob="$(SdkOutputDirectory)/Roslyn/RunVbc.sh" />
     <Chmod Mode="755" Glob="$(SdkOutputDirectory)/FSharp/RunFsc.sh" />
   </Target>
 
diff --git a/src/tool_roslyn/RunCsc.cmd b/src/tool_roslyn/RunCsc.cmd
new file mode 100644
index 000000000..7398082b2
--- /dev/null
+++ b/src/tool_roslyn/RunCsc.cmd
@@ -0,0 +1,6 @@
+@echo off
+
+REM Copyright (c) .NET Foundation and contributors. All rights reserved.
+REM Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+"%~dp0..\..\..\dotnet" "%~dp0csc.exe" %*
diff --git a/src/tool_roslyn/RunCsc.sh b/src/tool_roslyn/RunCsc.sh
new file mode 100755
index 000000000..47aed63d1
--- /dev/null
+++ b/src/tool_roslyn/RunCsc.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) .NET Foundation and contributors. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#
+
+set -e
+
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+  DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+  SOURCE="$(readlink "$SOURCE")"
+  [[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+done
+DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+
+"$DIR/../../../dotnet" "$DIR/csc.exe" "$@"
diff --git a/src/tool_roslyn/RunVbc.cmd b/src/tool_roslyn/RunVbc.cmd
new file mode 100644
index 000000000..e891b1bf5
--- /dev/null
+++ b/src/tool_roslyn/RunVbc.cmd
@@ -0,0 +1,6 @@
+@echo off
+
+REM Copyright (c) .NET Foundation and contributors. All rights reserved.
+REM Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+"%~dp0..\..\..\dotnet" "%~dp0vbc.exe" %*
diff --git a/src/tool_roslyn/RunVbc.sh b/src/tool_roslyn/RunVbc.sh
new file mode 100755
index 000000000..3dda886a0
--- /dev/null
+++ b/src/tool_roslyn/RunVbc.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) .NET Foundation and contributors. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#
+
+set -e
+
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+  DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+  SOURCE="$(readlink "$SOURCE")"
+  [[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+done
+DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+
+"$DIR/../../../dotnet" "$DIR/vbc.exe" "$@"
diff --git a/src/tool_roslyn/tool_roslyn.csproj b/src/tool_roslyn/tool_roslyn.csproj
new file mode 100644
index 000000000..bd702ca7c
--- /dev/null
+++ b/src/tool_roslyn/tool_roslyn.csproj
@@ -0,0 +1,68 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.tasks" />
+
+  <PropertyGroup>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <PublishDir>$(RoslynDirectory)</PublishDir>
+    <VersionSuffix>$(CommitCount)</VersionSuffix>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NetCore.App" Version="$(CLI_SharedFrameworkVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(CLI_Roslyn_Version)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Build.Tasks" Version="$(CLI_Roslyn_Version)" />
+    <PackageReference Include="Microsoft.Net.Compilers.netcore" Version="$(CLI_Roslyn_Version)" />
+    <PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(CLI_DiaSymNative_Version)" Condition="'$(OSName)' == 'win'" />
+    <PackageReference Include="CliDeps.Satellites.Roslyn" Version="$(CLI_Roslyn_Satellites_Version)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="RunCsc.sh;RunCsc.cmd;RunVbc.sh;RunVbc.cmd">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+
+  <Target Name="MakeCscAndVbcRunnableAndMoveToPublishDir"
+          AfterTargets="Publish"
+          BeforeTargets="RemoveFilesAfterPublish">
+    <ItemGroup>
+      <AssetsToRemoveFromDeps Include="runtimes/any/native/csc.dll" 
+                              SectionName="runtimeTargets" />
+      <AssetsToRemoveFromDeps Include="runtimes/any/native/vbc.dll" 
+                              SectionName="runtimeTargets" />
+      <AssetsToRemoveFromDeps Include="tool_roslyn.dll" 
+                              SectionName="runtime"/>
+    </ItemGroup>
+    
+    <RemoveAssetFromDepsPackages DepsFile="$(PublishDir)/$(TargetName).deps.json"
+                                 SectionName="%(AssetsToRemoveFromDeps.SectionName)"
+                                 AssetPath="%(AssetsToRemoveFromDeps.Identity)" />
+   
+    <Copy SourceFiles="$(PublishDir)/runtimes/any/native/csc.dll;
+                       $(PublishDir)/$(TargetName).runtimeconfig.json;
+                       $(PublishDir)/$(TargetName).deps.json;"
+          DestinationFiles="$(PublishDir)/csc.exe;
+                            $(PublishDir)/csc.runtimeconfig.json;
+                            $(PublishDir)/csc.deps.json;" />
+
+    <Copy SourceFiles="$(PublishDir)/runtimes/any/native/vbc.dll;
+                       $(PublishDir)/$(TargetName).runtimeconfig.json;
+                       $(PublishDir)/$(TargetName).deps.json;"
+          DestinationFiles="$(PublishDir)/vbc.exe;
+                            $(PublishDir)/vbc.runtimeconfig.json;
+                            $(PublishDir)/vbc.deps.json;" />
+  </Target>
+
+  <Target Name="RemoveFilesAfterPublish"
+          AfterTargets="Publish">
+    <Delete Files="$(PublishDir)/$(TargetName).dll" />
+    <Delete Files="$(PublishDir)/$(TargetName).pdb" />
+    <Delete Files="$(PublishDir)/$(TargetName).runtimeconfig.json" />
+    <Delete Files="$(PublishDir)/$(TargetName).deps.json" />
+  </Target>
+</Project>
diff --git a/test/dotnet-msbuild.Tests/GivenMsbuildForwardingApp.cs b/test/dotnet-msbuild.Tests/GivenMsbuildForwardingApp.cs
index 4dad315e3..4450258ee 100644
--- a/test/dotnet-msbuild.Tests/GivenMsbuildForwardingApp.cs
+++ b/test/dotnet-msbuild.Tests/GivenMsbuildForwardingApp.cs
@@ -31,6 +31,8 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
 
         [Theory]
         [InlineData("MSBuildExtensionsPath")]
+        [InlineData("CscToolExe")]
+        [InlineData("VbcToolExe")]
         [InlineData("MSBuildSDKsPath")]
         [InlineData("DOTNET_CLI_TELEMETRY_SESSIONID")]
         public void ItSetsEnvironmentalVariables(string envVarName)
@@ -64,6 +66,27 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
                 .Exist();
         }
 
+        [Fact]
+        public void ItSetsCscToolExePathToValidPath()
+        {
+            var msbuildPath = "<msbuildpath>";
+            var envVar = "CscToolExe";
+            new FileInfo(new MSBuildForwardingApp(new string[0], msbuildPath)
+                                .GetProcessStartInfo()
+                                .Environment[envVar])
+                .Should().NotBeNull("constructor will throw on invalid path");
+        }
+
+        [Fact]
+        public void ItSetsVbcToolExePathToValidPath()
+        {
+            var msbuildPath = "<msbuildpath>";
+            var envVar = "VbcToolExe";
+            new FileInfo(new MSBuildForwardingApp(new string[0], msbuildPath)
+                                .GetProcessStartInfo()
+                                .Environment[envVar])
+                .Should().NotBeNull("constructor will throw on invalid path");
+        }
 
         [Fact]
         public void ItSetsOrIgnoresTelemetrySessionId()