From 9a2e87f0d9173cfae54fdceaae230fc6a72ebd9c Mon Sep 17 00:00:00 2001
From: Shyam-Gupta <Shyam-Gupta@users.noreply.github.com>
Date: Mon, 9 Oct 2017 17:46:08 +0530
Subject: [PATCH 01/24] Updated version of TestPlatform to
 15.5.0-preview-20170923-02

refer commit: https://github.com/dotnet/cli/pull/7709/commits/fa876f5b90d853df78de1942e596346aeb0cfaa9
---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 5f02dd04b..1f120943b 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -18,7 +18,7 @@
     <CLI_NuGet_Version>4.4.0-preview3-4475</CLI_NuGet_Version>
     <CLI_NETStandardLibraryNETFrameworkVersion>2.0.0-preview3-25514-04</CLI_NETStandardLibraryNETFrameworkVersion>
     <CLI_WEBSDK_Version>2.0.0-rel-20170908-653</CLI_WEBSDK_Version>
-    <CLI_TestPlatform_Version>15.3.0-preview-20170628-02</CLI_TestPlatform_Version>
+    <CLI_TestPlatform_Version>15.5.0-preview-20170923-02</CLI_TestPlatform_Version>
     <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
     <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
     <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>

From b5d9f6f3e62dd2134fb16f7988c4ef8f84cab10b Mon Sep 17 00:00:00 2001
From: Shyam-Gupta <Shyam-Gupta@users.noreply.github.com>
Date: Tue, 10 Oct 2017 16:50:09 +0530
Subject: [PATCH 02/24] Update DependencyVersions.props

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 1f120943b..1ce1131d0 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -18,7 +18,7 @@
     <CLI_NuGet_Version>4.4.0-preview3-4475</CLI_NuGet_Version>
     <CLI_NETStandardLibraryNETFrameworkVersion>2.0.0-preview3-25514-04</CLI_NETStandardLibraryNETFrameworkVersion>
     <CLI_WEBSDK_Version>2.0.0-rel-20170908-653</CLI_WEBSDK_Version>
-    <CLI_TestPlatform_Version>15.5.0-preview-20170923-02</CLI_TestPlatform_Version>
+    <CLI_TestPlatform_Version>15.5.0-preview-20171009-10</CLI_TestPlatform_Version>
     <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
     <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
     <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>

From a084153c1567330a17b21287a7bfebdd5eedfc3c Mon Sep 17 00:00:00 2001
From: NuGet Team Bot <support@nuget.org>
Date: Tue, 10 Oct 2017 15:08:33 -0700
Subject: [PATCH 03/24] Insert NuGet Build 4.5.0-preview1-4526 into cli

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 5f02dd04b..880df4900 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -15,7 +15,7 @@
     <CLI_NETSDK_Version>2.0.1-servicing-20170926-1</CLI_NETSDK_Version>
     <CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
 
-    <CLI_NuGet_Version>4.4.0-preview3-4475</CLI_NuGet_Version>
+    <CLI_NuGet_Version>4.5.0-preview1-4526</CLI_NuGet_Version>
     <CLI_NETStandardLibraryNETFrameworkVersion>2.0.0-preview3-25514-04</CLI_NETStandardLibraryNETFrameworkVersion>
     <CLI_WEBSDK_Version>2.0.0-rel-20170908-653</CLI_WEBSDK_Version>
     <CLI_TestPlatform_Version>15.3.0-preview-20170628-02</CLI_TestPlatform_Version>

From 6a116d4b94685374af7b457533de055af4f80efc Mon Sep 17 00:00:00 2001
From: Vijay Ramakrishnan <vramak@microsoft.com>
Date: Tue, 10 Oct 2017 16:38:32 -0700
Subject: [PATCH 04/24] Updating the websdk version to 2.0.0-rel-20171010-665

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 5f02dd04b..9629ab151 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -17,7 +17,7 @@
 
     <CLI_NuGet_Version>4.4.0-preview3-4475</CLI_NuGet_Version>
     <CLI_NETStandardLibraryNETFrameworkVersion>2.0.0-preview3-25514-04</CLI_NETStandardLibraryNETFrameworkVersion>
-    <CLI_WEBSDK_Version>2.0.0-rel-20170908-653</CLI_WEBSDK_Version>
+    <CLI_WEBSDK_Version>2.0.0-rel-20171010-665</CLI_WEBSDK_Version>
     <CLI_TestPlatform_Version>15.3.0-preview-20170628-02</CLI_TestPlatform_Version>
     <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
     <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>

From 857c7e3e5612f246eff41239b61d6f5428b3fd40 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Tue, 10 Oct 2017 22:11:00 -0700
Subject: [PATCH 05/24] Update branch info to release/15.5

---
 README.md              | 62 +++++++++++++++++++++---------------------
 build/BranchInfo.props |  4 +--
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/README.md b/README.md
index b7981d26c..e6d7174b4 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Looking for V1 of the .NET Core tooling?
 
 If you are looking for the v1.0.1 release of the .NET Core tools (CLI, MSBuild and the new csproj), see https://dot.net/core.
 
-> **Note:** the release/2.0.0 branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the
+> **Note:** the release/15.5 branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the
 > released version of the tools available at https://dot.net/core
 
 Found an issue?
@@ -64,7 +64,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/
 > **Note:** Be aware that the following installers are the **latest bits**. If you
 > want to install the latest released versions, check out the [preceding section](#looking-for-v1-of-the-net-core-tooling).
 
-| Platform | Latest Daily Build<br>*release/2.0.0*<br>[![][version-badge]][version] |
+| Platform | Latest Daily Build<br>*release/15.5*<br>[![][version-badge]][version] |
 | -------- | :-------------------------------------: |
 | **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]<br>[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] |
 | **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]<br>[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] |
@@ -80,7 +80,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/
 | **OpenSUSE 42.1** | tar.gz - See **Linux x64** |
 
 
-| Latest Coherent Build<sup>2</sup><br>*release/2.0.0* |
+| Latest Coherent Build<sup>2</sup><br>*release/15.5* |
 |:------:|
 | [![][coherent-version-badge]][coherent-version] |
 
@@ -89,43 +89,43 @@ Reference notes:
 > <br><br>**2**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.*
 
 [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.)
-[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/latest.version
-[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg
-[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/latest.coherent.version
-[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x86_Release_coherent_badge.svg
+[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/latest.version
+[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/win_x64_Release_version_badge.svg
+[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/latest.coherent.version
+[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/win_x86_Release_coherent_badge.svg
 
-[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.exe
-[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.exe.sha
-[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.zip
-[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.zip.sha
+[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x64.exe
+[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x64.exe.sha
+[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x64.zip
+[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x64.zip.sha
 
-[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.exe
-[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.exe.sha
-[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.zip
-[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.zip.sha
+[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x86.exe
+[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x86.exe.sha
+[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x86.zip
+[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x86.zip.sha
 
-[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.pkg
-[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.pkg.sha
-[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.tar.gz
-[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.tar.gz.sha
+[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-osx-x64.pkg
+[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-osx-x64.pkg.sha
+[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-osx-x64.tar.gz
+[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-osx-x64.tar.gz.sha
 
-[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-linux-x64.tar.gz
-[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-linux-x64.tar.gz.sha
+[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-linux-x64.tar.gz
+[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-linux-x64.tar.gz.sha
 
-[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb
-[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb.sha
+[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-ubuntu-x64.deb
+[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-ubuntu-x64.deb.sha
 
-[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.04-x64.deb
-[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.04-x64.deb.sha
+[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-ubuntu.16.04-x64.deb
+[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-ubuntu.16.04-x64.deb.sha
 
-[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.10-x64.deb
-[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.10-x64.deb.sha
+[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-ubuntu.16.10-x64.deb
+[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-ubuntu.16.10-x64.deb.sha
 
-[debian-8-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-debian-x64.deb
-[debian-8-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-debian-x64.deb.sha
+[debian-8-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-debian-x64.deb
+[debian-8-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-debian-x64.deb.sha
 
-[rhel-7-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-rhel-x64.rpm
-[rhel-7-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-rhel-x64.rpm.sha
+[rhel-7-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-rhel-x64.rpm
+[rhel-7-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-rhel-x64.rpm.sha
 
 # Debian daily feed
 
diff --git a/build/BranchInfo.props b/build/BranchInfo.props
index 0d146ab2a..f048a677e 100644
--- a/build/BranchInfo.props
+++ b/build/BranchInfo.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Channel>release/2.0.0</Channel>
-    <BranchName>release/2.0.0</BranchName>
+    <Channel>release/15.5</Channel>
+    <BranchName>release/15.5</BranchName>
   </PropertyGroup>
 </Project>

From 273f4bc4a566b0e339d41274e9b159799e5dfd45 Mon Sep 17 00:00:00 2001
From: faahmad <faahmad@FAAHMAD-DEV32>
Date: Wed, 11 Oct 2017 12:21:59 +0530
Subject: [PATCH 06/24] Fixed tests

---
 ...tTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs |  4 ++--
 .../GivenDotnetTestBuildsAndRunsTestfromCsproj.cs    | 12 ++++++------
 test/dotnet-vstest.Tests/VSTestTests.cs              |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs
index adfc7b0d4..0a6e2e0fd 100644
--- a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs
+++ b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs
@@ -39,9 +39,9 @@ namespace Microsoft.DotNet.Cli.Test.Tests
             {
                 result.StdOut
                     .Should().Contain("Total tests: 3. Passed: 2. Failed: 1. Skipped: 0.", "because .NET 4.6 tests will pass")
-                         .And.Contain("Passed   TestNamespace.VSTestTests.VSTestPassTestDesktop", "because .NET 4.6 tests will pass")
+                         .And.Contain("Passed   VSTestPassTestDesktop", "because .NET 4.6 tests will pass")
                          .And.Contain("Total tests: 3. Passed: 1. Failed: 2. Skipped: 0.", "because netcoreapp2.0 tests will fail")
-                         .And.Contain("Failed   TestNamespace.VSTestTests.VSTestFailTestNetCoreApp", "because netcoreapp2.0 tests will fail");
+                         .And.Contain("Failed   VSTestFailTestNetCoreApp", "because netcoreapp2.0 tests will fail");
             }
             result.ExitCode.Should().Be(1);
         }
diff --git a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
index 807688463..050b547e1 100644
--- a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
+++ b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
@@ -28,8 +28,8 @@ namespace Microsoft.DotNet.Cli.Test.Tests
             if (!DotnetUnderTest.IsLocalized())
             {
                 result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.");
-                result.StdOut.Should().Contain("Passed   TestNamespace.VSTestTests.VSTestPassTest");
-                result.StdOut.Should().Contain("Failed   TestNamespace.VSTestTests.VSTestFailTest");
+                result.StdOut.Should().Contain("Passed   VSTestPassTest");
+                result.StdOut.Should().Contain("Failed   VSTestFailTest");
             }
 
             result.ExitCode.Should().Be(1);
@@ -52,8 +52,8 @@ namespace Microsoft.DotNet.Cli.Test.Tests
             if (!DotnetUnderTest.IsLocalized())
             {
                 result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.");
-                result.StdOut.Should().Contain("Passed   TestNamespace.VSTestTests.VSTestPassTest");
-                result.StdOut.Should().Contain("Failed   TestNamespace.VSTestTests.VSTestFailTest");
+                result.StdOut.Should().Contain("Passed   VSTestPassTest");
+                result.StdOut.Should().Contain("Failed   VSTestFailTest");
             }
 
             result.ExitCode.Should().Be(1);
@@ -227,8 +227,8 @@ namespace Microsoft.DotNet.Cli.Test.Tests
             if (!DotnetUnderTest.IsLocalized())
             {
                 result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.");
-                result.StdOut.Should().Contain("Passed   TestNamespace.VSTestTests.VSTestPassTest");
-                result.StdOut.Should().Contain("Failed   TestNamespace.VSTestTests.VSTestFailTest");
+                result.StdOut.Should().Contain("Passed   VSTestPassTest");
+                result.StdOut.Should().Contain("Failed   VSTestFailTest");
             }
 
             result.ExitCode.Should().Be(1);
diff --git a/test/dotnet-vstest.Tests/VSTestTests.cs b/test/dotnet-vstest.Tests/VSTestTests.cs
index 47eae7e89..d1de1e8e8 100644
--- a/test/dotnet-vstest.Tests/VSTestTests.cs
+++ b/test/dotnet-vstest.Tests/VSTestTests.cs
@@ -42,8 +42,8 @@ namespace Microsoft.DotNet.Cli.VSTest.Tests
             {
                 result.StdOut
                     .Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.")
-                    .And.Contain("Passed   TestNamespace.VSTestTests.VSTestPassTest")
-                    .And.Contain("Failed   TestNamespace.VSTestTests.VSTestFailTest");
+                    .And.Contain("Passed   VSTestPassTest")
+                    .And.Contain("Failed   VSTestFailTest");
             }
 
             result.ExitCode.Should().Be(1);

From c6139adcc96ad1ec9db4515360beb38c0280618d Mon Sep 17 00:00:00 2001
From: seancpeters <sepeters@microsoft.com>
Date: Wed, 11 Oct 2017 16:22:03 -0700
Subject: [PATCH 07/24] added a way to specify the asp.net template versions

---
 build/BundledTemplates.props   | 10 ++++++++--
 build/DependencyVersions.props |  7 ++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props
index 549508206..c0c286421 100644
--- a/build/BundledTemplates.props
+++ b/build/BundledTemplates.props
@@ -1,10 +1,16 @@
 <Project ToolsVersion="15.0">
   <ItemGroup>
     <BundledTemplate Include="Microsoft.DotNet.Common.ItemTemplates" Version="$(TemplateEngineTemplateVersion)" />
-    <BundledTemplate Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(TemplateEngineTemplateVersion)" />
     <BundledTemplate Include="Microsoft.DotNet.Common.ProjectTemplates.2.0" Version="$(TemplateEngineTemplate2_0Version)" />
     <BundledTemplate Include="Microsoft.DotNet.Test.ProjectTemplates.2.0" Version="$(TemplateEngineTemplateVersion)" />
-    <BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.2.0" Version="$(TemplateEngineTemplateVersion)" />
+
     <BundledTemplate Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="$(SpaTemplateVersion)" />
+
+    <BundledTemplate Include="Microsoft.DotNet.Web.Client.ItemTemplates" Version="$(AspnetTemplateVersion)" />
+    <BundledTemplate Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(AspnetTemplateVersion)" />
+    <BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.2.0" Version="$(AspnetTemplateVersion)" />
+	<!--
+    <BundledTemplate Include="Microsoft.AspNetCore.SpaTemplates" Version="$(AspnetTemplateVersion)" />
+	-->
   </ItemGroup>
 </Project>
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 6cc04f3bd..83ae30c72 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -22,9 +22,10 @@
     <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
     <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
     <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
-    <TemplateEngineVersion>1.0.0-beta2-20170810-304</TemplateEngineVersion>
-    <TemplateEngineTemplateVersion>1.0.0-beta2-20170810-304</TemplateEngineTemplateVersion>
-    <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170810-304</TemplateEngineTemplate2_0Version>
+    <TemplateEngineVersion>1.0.0-beta2-20171004-309</TemplateEngineVersion>
+    <TemplateEngineTemplateVersion>1.0.0-beta2-20171004-309</TemplateEngineTemplateVersion>
+    <TemplateEngineTemplate2_0Version>1.0.0-beta2-20171004-309</TemplateEngineTemplate2_0Version>
+    <AspnetTemplateVersion>1.0.0-beta2-20171004-309</AspnetTemplateVersion>
     <PlatformAbstractionsVersion>2.0.0</PlatformAbstractionsVersion>
     <DependencyModelVersion>2.0.0</DependencyModelVersion>
     <CliCommandLineParserVersion>0.1.1-alpha-167</CliCommandLineParserVersion>

From 2d6314e78f5c16ed65c98321fd1f1611339a560c Mon Sep 17 00:00:00 2001
From: seancpeters <sepeters@microsoft.com>
Date: Wed, 11 Oct 2017 16:37:49 -0700
Subject: [PATCH 08/24] removed commented out config I'd meant to remove

---
 build/BundledTemplates.props | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props
index c0c286421..76dd56562 100644
--- a/build/BundledTemplates.props
+++ b/build/BundledTemplates.props
@@ -9,8 +9,5 @@
     <BundledTemplate Include="Microsoft.DotNet.Web.Client.ItemTemplates" Version="$(AspnetTemplateVersion)" />
     <BundledTemplate Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(AspnetTemplateVersion)" />
     <BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.2.0" Version="$(AspnetTemplateVersion)" />
-	<!--
-    <BundledTemplate Include="Microsoft.AspNetCore.SpaTemplates" Version="$(AspnetTemplateVersion)" />
-	-->
   </ItemGroup>
 </Project>

From 3b09db3f9eb4c23aa3811e04a557c7d78547eb29 Mon Sep 17 00:00:00 2001
From: Andy Gerlicher <angerlic@microsoft.com>
Date: Wed, 11 Oct 2017 17:26:43 -0700
Subject: [PATCH 09/24] MSBuild 15.5.153

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 6cc04f3bd..f35479912 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <CLI_SharedFrameworkVersion>2.0.0</CLI_SharedFrameworkVersion>
-    <CLI_MSBuild_Version>15.5.0-preview-000113-1032064</CLI_MSBuild_Version>
+    <CLI_MSBuild_Version>15.5.0-preview-000153-1054696</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.6.0-beta1-62126-01</CLI_Roslyn_Version>
     <CLI_Roslyn_Satellites_Version>2.6.0-pre-20171003-1</CLI_Roslyn_Satellites_Version>
     <CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>

From 97f4a01869e406221d2f14e7ecfe518dad3513f1 Mon Sep 17 00:00:00 2001
From: Andy Gerlicher <angerlic@microsoft.com>
Date: Wed, 11 Oct 2017 17:27:36 -0700
Subject: [PATCH 10/24] MSBuild 15.5.154

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 6cc04f3bd..9f955e997 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <CLI_SharedFrameworkVersion>2.0.0</CLI_SharedFrameworkVersion>
-    <CLI_MSBuild_Version>15.5.0-preview-000113-1032064</CLI_MSBuild_Version>
+    <CLI_MSBuild_Version>15.5.0-preview-000154-1054573</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.6.0-beta1-62126-01</CLI_Roslyn_Version>
     <CLI_Roslyn_Satellites_Version>2.6.0-pre-20171003-1</CLI_Roslyn_Satellites_Version>
     <CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>

From d15d4483329bfa376f45b9d889ed4896f9a55a3f Mon Sep 17 00:00:00 2001
From: Andy Gerlicher <angerlic@microsoft.com>
Date: Wed, 11 Oct 2017 18:30:57 -0700
Subject: [PATCH 11/24] Update NuGet to 4529 (signed)

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 9f955e997..8d466e1fe 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -15,7 +15,7 @@
     <CLI_NETSDK_Version>2.0.1-servicing-20170926-1</CLI_NETSDK_Version>
     <CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
 
-    <CLI_NuGet_Version>4.5.0-preview1-4526</CLI_NuGet_Version>
+    <CLI_NuGet_Version>4.5.0-preview2-4529</CLI_NuGet_Version>
     <CLI_NETStandardLibraryNETFrameworkVersion>2.0.0-preview3-25514-04</CLI_NETStandardLibraryNETFrameworkVersion>
     <CLI_WEBSDK_Version>2.0.0-rel-20171010-665</CLI_WEBSDK_Version>
     <CLI_TestPlatform_Version>15.5.0-preview-20171009-10</CLI_TestPlatform_Version>

From 15ee853d4945ed1c07b18a20d4b62738d1d8fe26 Mon Sep 17 00:00:00 2001
From: NuGet Team Bot <support@nuget.org>
Date: Wed, 11 Oct 2017 18:44:34 -0700
Subject: [PATCH 12/24] Insert NuGet Build 4.5.0-preview2-4529 into cli

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index e183f7850..989e82616 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -15,7 +15,7 @@
     <CLI_NETSDK_Version>2.0.1-servicing-20170926-1</CLI_NETSDK_Version>
     <CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
 
-    <CLI_NuGet_Version>4.5.0-preview1-4526</CLI_NuGet_Version>
+    <CLI_NuGet_Version>4.5.0-preview2-4529</CLI_NuGet_Version>
     <CLI_NETStandardLibraryNETFrameworkVersion>2.0.0-preview3-25514-04</CLI_NETStandardLibraryNETFrameworkVersion>
     <CLI_WEBSDK_Version>2.0.0-rel-20171010-665</CLI_WEBSDK_Version>
     <CLI_TestPlatform_Version>15.5.0-preview-20171009-10</CLI_TestPlatform_Version>

From 821a413dd6a3372e1dee5aa86b3c70579fb77658 Mon Sep 17 00:00:00 2001
From: Livar <licavalc@microsoft.com>
Date: Wed, 11 Oct 2017 22:29:40 -0700
Subject: [PATCH 13/24] Updating Roslyn satellites and SDK versions

---
 build/DependencyVersions.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index e183f7850..4e4a6e385 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -4,7 +4,7 @@
     <CLI_SharedFrameworkVersion>2.0.0</CLI_SharedFrameworkVersion>
     <CLI_MSBuild_Version>15.5.0-preview-000153-1054696</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.6.0-beta1-62126-01</CLI_Roslyn_Version>
-    <CLI_Roslyn_Satellites_Version>2.6.0-pre-20171003-1</CLI_Roslyn_Satellites_Version>
+    <CLI_Roslyn_Satellites_Version>2.6.0-pre-20171012-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_Satellites_Version>4.4.1-pre-20171003-1</CLI_FSharp_Satellites_Version>
@@ -12,7 +12,7 @@
     <!-- We'll usually want to keep these versions in sync, but we may want to diverge in some
          cases, so use separate properties but derive one from the other unless we want to
          explicitly use different versions. -->
-    <CLI_NETSDK_Version>2.0.1-servicing-20170926-1</CLI_NETSDK_Version>
+    <CLI_NETSDK_Version>15.5.0-preview-20171012-6</CLI_NETSDK_Version>
     <CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
 
     <CLI_NuGet_Version>4.5.0-preview1-4526</CLI_NuGet_Version>

From 7b558111ae5d1eb8173288bc533dda1b319dc0ec Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Thu, 12 Oct 2017 16:17:27 -0700
Subject: [PATCH 14/24] Use same build number for roslyn and F# satellites

---
 build/DependencyVersions.props | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 2d8fc4aee..d9ade5d20 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -4,10 +4,12 @@
     <CLI_SharedFrameworkVersion>2.0.0</CLI_SharedFrameworkVersion>
     <CLI_MSBuild_Version>15.5.0-preview-000154-1054573</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.6.0-beta1-62126-01</CLI_Roslyn_Version>
-    <CLI_Roslyn_Satellites_Version>2.6.0-pre-20171012-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_Satellites_Version>4.4.1-pre-20171003-1</CLI_FSharp_Satellites_Version>
+
+    <CLI_Deps_Satellites_Build>pre-20171012-1</CLI_Deps_Satellites_Build>
+    <CLI_Roslyn_Satellites_Version>2.6.0-$(CLI_Deps_Satellites_Build)</CLI_Roslyn_Satellites_Version>
+    <CLI_FSharp_Satellites_Version>4.4.1-$(CLI_Deps_Satellites_Build)</CLI_FSharp_Satellites_Version>
 
     <!-- We'll usually want to keep these versions in sync, but we may want to diverge in some
          cases, so use separate properties but derive one from the other unless we want to

From 41d1f6ad6df7d89714029dd9cd4d8aa7670a28b4 Mon Sep 17 00:00:00 2001
From: Harsh Jain <harjain@microsoft.com>
Date: Fri, 13 Oct 2017 14:09:32 +0530
Subject: [PATCH 15/24] Updated version of TPv2

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 2d8fc4aee..365aa7dfa 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -18,7 +18,7 @@
     <CLI_NuGet_Version>4.5.0-preview2-4529</CLI_NuGet_Version>
     <CLI_NETStandardLibraryNETFrameworkVersion>2.0.0-preview3-25514-04</CLI_NETStandardLibraryNETFrameworkVersion>
     <CLI_WEBSDK_Version>2.0.0-rel-20171010-665</CLI_WEBSDK_Version>
-    <CLI_TestPlatform_Version>15.5.0-preview-20171009-10</CLI_TestPlatform_Version>
+    <CLI_TestPlatform_Version>15.5.0-preview-20171012-09</CLI_TestPlatform_Version>
     <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
     <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
     <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>

From 27aa6987103b6d0add93ac6811ac138a414c52ed Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Fri, 13 Oct 2017 09:35:44 -0700
Subject: [PATCH 16/24] Manually merging some changes that git merged wrong and
 deleted from the 15.5 branch.

---
 Microsoft.DotNet.Cli.sln                      |  27 -----
 .../MSBuildIntegration/build.proj             |   3 -
 build/Branding.props                          |   2 +-
 build/DependencyVersions.props                |   2 +-
 build/Microsoft.DotNet.Cli.tasks              |   1 +
 build/Version.props                           |   8 +-
 .../InvokeWithStage2.proj                     |   2 -
 build_projects/dotnet-cli-build/AddToDeps.cs  |  67 +++++++++++
 .../dotnet-cli-build/dotnet-cli-build.csproj  |   1 +
 .../MSBuildForwardingAppWithoutLogging.cs     |  20 +---
 .../dotnet-run/LocalizableStrings.resx        |   2 +-
 .../dotnet-run/xlf/LocalizableStrings.cs.xlf  |   4 +-
 .../dotnet-run/xlf/LocalizableStrings.de.xlf  |   4 +-
 .../dotnet-run/xlf/LocalizableStrings.es.xlf  |   4 +-
 .../dotnet-run/xlf/LocalizableStrings.fr.xlf  |   4 +-
 .../dotnet-run/xlf/LocalizableStrings.it.xlf  |   4 +-
 .../dotnet-run/xlf/LocalizableStrings.ja.xlf  |   4 +-
 .../dotnet-run/xlf/LocalizableStrings.ko.xlf  |   4 +-
 .../dotnet-run/xlf/LocalizableStrings.pl.xlf  |   4 +-
 .../xlf/LocalizableStrings.pt-BR.xlf          |   4 +-
 .../dotnet-run/xlf/LocalizableStrings.ru.xlf  |   4 +-
 .../dotnet-run/xlf/LocalizableStrings.tr.xlf  |   4 +-
 .../xlf/LocalizableStrings.zh-Hans.xlf        |   4 +-
 .../xlf/LocalizableStrings.zh-Hant.xlf        |   4 +-
 src/redist/redist.csproj                      | 107 +++++++++++++-----
 src/tool_roslyn/RunCsc.cmd                    |   6 -
 src/tool_roslyn/RunCsc.sh                     |  17 ---
 src/tool_roslyn/RunVbc.cmd                    |   6 -
 src/tool_roslyn/RunVbc.sh                     |  17 ---
 src/tool_roslyn/tool_roslyn.csproj            |  68 -----------
 .../tool_roslyn_satellites.csproj             |  35 ++++++
 .../GivenMsbuildForwardingApp.cs              |  24 ----
 32 files changed, 220 insertions(+), 247 deletions(-)
 create mode 100644 build_projects/dotnet-cli-build/AddToDeps.cs
 delete mode 100644 src/tool_roslyn/RunCsc.cmd
 delete mode 100755 src/tool_roslyn/RunCsc.sh
 delete mode 100644 src/tool_roslyn/RunVbc.cmd
 delete mode 100755 src/tool_roslyn/RunVbc.sh
 delete mode 100644 src/tool_roslyn/tool_roslyn.csproj
 create mode 100644 src/tool_roslyn_satellites/tool_roslyn_satellites.csproj

diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index 3733528eb..271579431 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -147,8 +147,6 @@ 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}"
@@ -705,30 +703,6 @@ 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
@@ -1625,7 +1599,6 @@ 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/TestAssets/TestProjects/MSBuildIntegration/build.proj b/TestAssets/TestProjects/MSBuildIntegration/build.proj
index 203f96df3..8b2a7851e 100644
--- a/TestAssets/TestProjects/MSBuildIntegration/build.proj
+++ b/TestAssets/TestProjects/MSBuildIntegration/build.proj
@@ -29,9 +29,6 @@
     <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/Branding.props b/build/Branding.props
index 9a66fdc2d..2defb3b47 100644
--- a/build/Branding.props
+++ b/build/Branding.props
@@ -1,6 +1,6 @@
 <Project ToolsVersion="14.0">
   <PropertyGroup>
-    <SdkBrandName>Microsoft .NET Core SDK - 2.0.3</SdkBrandName>
+    <SdkBrandName>Microsoft .NET Core SDK - 15.5.0</SdkBrandName>
     <MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
     <SharedFrameworkBrandName>Microsoft .NET Core Runtime - 2.0.1</SharedFrameworkBrandName>
     <SharedHostBrandName>Microsoft .NET Core Host - 2.0.1</SharedHostBrandName>
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 375201dda..875895acf 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -6,7 +6,7 @@
     <CLI_Roslyn_Version>2.6.0-beta1-62126-01</CLI_Roslyn_Version>
     <CLI_Roslyn_Satellites_Version>2.6.0-pre-20171012-1</CLI_Roslyn_Satellites_Version>
     <CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>
-    <CLI_FSharp_Version>4.2.0-rc-170630-0</CLI_FSharp_Version>
+    <CLI_FSharp_Version>4.2.0-rtm-170926-0</CLI_FSharp_Version>
     <CLI_FSharp_Satellites_Version>4.4.1-pre-20171012-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/Microsoft.DotNet.Cli.tasks b/build/Microsoft.DotNet.Cli.tasks
index 901a48f84..1c846d8b0 100644
--- a/build/Microsoft.DotNet.Cli.tasks
+++ b/build/Microsoft.DotNet.Cli.tasks
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Test" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <UsingTask TaskName="AddMetadataIsPE" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="AddToDeps" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="ChangeEntryPointLibraryName" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="CheckIfAllBuildsHavePublished" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="ChMod" AssemblyFile="$(CLIBuildDll)" />
diff --git a/build/Version.props b/build/Version.props
index 2f7ba1395..8e40233c3 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -1,9 +1,9 @@
 <Project>
   <PropertyGroup>
-    <VersionMajor>2</VersionMajor>
-    <VersionMinor>0</VersionMinor>
-    <VersionPatch>3</VersionPatch>
-    <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">servicing</ReleaseSuffix>
+    <VersionMajor>15</VersionMajor>
+    <VersionMinor>5</VersionMinor>
+    <VersionPatch>0</VersionPatch>
+    <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview</ReleaseSuffix>
 
     <CliVersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)</CliVersionPrefix>
     <SimpleVersion Condition=" '$(DropSuffix)' == '' ">$(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount)</SimpleVersion> 
diff --git a/build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage2.proj b/build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage2.proj
index 1493128e7..cb833d480 100644
--- a/build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage2.proj
+++ b/build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage2.proj
@@ -7,8 +7,6 @@
     <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/build_projects/dotnet-cli-build/AddToDeps.cs b/build_projects/dotnet-cli-build/AddToDeps.cs
new file mode 100644
index 000000000..ca02cd474
--- /dev/null
+++ b/build_projects/dotnet-cli-build/AddToDeps.cs
@@ -0,0 +1,67 @@
+// 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.
+
+using System.IO;
+using System.Linq;
+
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Microsoft.Extensions.DependencyModel;
+
+namespace Microsoft.DotNet.Cli.Build
+{
+    /// <summary>
+    /// Merges additional .deps.json files into target .deps.json files.
+    /// </summary>
+    public class AddToDeps : Task
+    {
+        /// <summary>
+        /// Paths to target .deps.json files, into which <see cref="AdditionalDeps" /> will be merged.
+        /// These files will be overwritten with the merge result.
+        /// </summary>
+        [Required]
+        public string[] TargetDeps { get; set; }
+
+        /// <summary>
+        /// Paths to additional .deps.json files to merge into <see cref="TargetDeps" />.
+        /// </summary>
+        [Required]
+        public string[] AdditionalDeps { get; set; }
+
+        public override bool Execute()
+        {
+            DependencyContext additionalContext = Read(AdditionalDeps.First());
+
+            foreach (string additionalPath in AdditionalDeps.Skip(1))
+            {
+                additionalContext = additionalContext.Merge(Read(additionalPath));
+            }
+
+            foreach (string targetPath in TargetDeps)
+            {
+                DependencyContext targetContext = Read(targetPath).Merge(additionalContext);
+                Write(targetContext, targetPath);
+            }
+
+            return true;
+        }
+
+        private static DependencyContext Read(string path)
+        {
+            using (FileStream stream = File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read))
+            using (var reader = new DependencyContextJsonReader())
+            {
+                return reader.Read(stream);
+            }
+        }
+
+        private static void Write(DependencyContext context, string path)
+        {
+            using (FileStream stream = File.Open(path, FileMode.Create, FileAccess.Write, FileShare.Read))
+            {
+                var writer = new DependencyContextWriter(); // unlike reader, writer is not disposable
+                writer.Write(context, stream);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
index 872cae995..2db08aaa8 100644
--- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
+++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
@@ -29,5 +29,6 @@
     <PackageReference Include="Microsoft.Build.Framework" Version="$(CLI_MSBuild_Version)" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(PlatformAbstractionsVersion)" />
     <PackageReference Include="Microsoft.DotNet.VersionTools" Version="$(VersionToolsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.0" />
  </ItemGroup>
 </Project>
diff --git a/src/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs b/src/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs
index 500ab7b30..39c7fb2df 100644
--- a/src/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs
+++ b/src/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs
@@ -23,9 +23,8 @@ namespace Microsoft.DotNet.Cli.Utils
             new Dictionary<string, string>
             {
                 { "MSBuildExtensionsPath", AppContext.BaseDirectory },
-                { "CscToolExe", GetRunCscPath() },
-                { "VbcToolExe", GetRunVbcPath() },
-                { "MSBuildSDKsPath", GetMSBuildSDKsPath() }
+                { "MSBuildSDKsPath", GetMSBuildSDKsPath() },
+                { "DOTNET_HOST_PATH", GetDotnetPath() },
             };
 
         private readonly IEnumerable<string> _msbuildRequiredParameters =
@@ -78,20 +77,9 @@ namespace Microsoft.DotNet.Cli.Utils
                 SdksDirectoryName);
         }
 
-        private static string GetRunVbcPath()
+        private static string GetDotnetPath()
         {
-            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}");
+            return new Muxer().MuxerPath;
         }
     }
 }
diff --git a/src/dotnet/commands/dotnet-run/LocalizableStrings.resx b/src/dotnet/commands/dotnet-run/LocalizableStrings.resx
index 8cab1941e..a939d42a8 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>Launch profile is not a JSON object.</value>
+    <value>A profile with the specified name could not be found or is not a valid 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 60ce2ef7b..8ea09aff9 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>Launch profile is not a JSON object.</source>
-        <target state="translated">Profil spuštění není objektem JSON.</target>
+        <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>
         <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 2349aafdc..c4888a85d 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>Launch profile is not a JSON object.</source>
-        <target state="translated">Das Startprofil ist kein JSON-Objekt.</target>
+        <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>
         <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 4c05cc144..f22075f6b 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>Launch profile is not a JSON object.</source>
-        <target state="translated">El perfil de inicio no es un objeto JSON.</target>
+        <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>
         <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 f62af586a..cb25dab6b 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>Launch profile is not a JSON object.</source>
-        <target state="translated">Le profil de lancement n'est pas un objet JSON.</target>
+        <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>
         <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 ba7512823..13ca40c66 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>Launch profile is not a JSON object.</source>
-        <target state="translated">Il profilo di avvio non è un oggetto JSON.</target>
+        <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>
         <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 fa08955ee..8f52f732c 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>Launch profile is not a JSON object.</source>
-        <target state="translated">起動プロファイルが JSON オブジェクトではありません。</target>
+        <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>
         <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 41a2ec94e..86ff5d88f 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>Launch profile is not a JSON object.</source>
-        <target state="translated">시작 프로필이 JSON 개체가 아닙니다.</target>
+        <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>
         <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 aab3a4913..b07a84d33 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>Launch profile is not a JSON object.</source>
-        <target state="translated">Profil uruchamiania nie jest obiektem JSON.</target>
+        <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>
         <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 2843c82ef..1e19ebcf8 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>Launch profile is not a JSON object.</source>
-        <target state="translated">O perfil de inicialização não é um objeto JSON.</target>
+        <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>
         <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 95b1e0400..cf00bd460 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>Launch profile is not a JSON object.</source>
-        <target state="translated">Профиль запуска не является объектом JSON.</target>
+        <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>
         <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 a3a9211fb..9a21b7da4 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>Launch profile is not a JSON object.</source>
-        <target state="translated">Başlatma profili bir JSON nesnesi değil.</target>
+        <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>
         <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 a4b5c43c2..4ac5ce35e 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>Launch profile is not a JSON object.</source>
-        <target state="translated">启动配置文件不是 JSON 对象。</target>
+        <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>
         <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 b9bd6e9c3..05567e529 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>Launch profile is not a JSON object.</source>
-        <target state="translated">啟動設定檔並非 JSON 物件。</target>
+        <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>
         <note />
       </trans-unit>
       <trans-unit id="LaunchProfileHandlerCannotBeLocated">
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index c45cd6bdf..b88f25af4 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -17,15 +17,13 @@
 
   <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)" />
-    <!-- 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)" />
+    <PackageReference Include="Microsoft.NETCore.Compilers" Version="$(CLI_Roslyn_Version)">
+      <ExcludeAssets>All</ExcludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
@@ -74,9 +72,33 @@
   <Target Name="PublishRoslyn"
           BeforeTargets="Publish">
           
-    <DotNetPublish ToolPath="$(Stage0Directory)"
-                   Configuration="$(Configuration)"
-                   ProjectPath="$(SrcDirectory)/tool_roslyn/tool_roslyn.csproj" />
+    <ItemGroup>
+      <RoslynBits Include="$(NuGetPackagesDir)/microsoft.netcore.compilers/$(CLI_Roslyn_Version)/tools/**/*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(RoslynBits)" DestinationFiles="@(RoslynBits->'$(RoslynDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Copy SourceFiles="@(RoslynSatelliteBits)" DestinationFiles="@(RoslynSatelliteBits->'$(RoslynDirectory)/bincore/%(RecursiveDir)%(Filename)%(Extension)')" />
+    <ItemGroup>
+      <RoslynRuntimeConfigs Include="$(RoslynDirectory)/bincore/csc.runtimeconfig.json" />
+      <RoslynRuntimeConfigs Include="$(RoslynDirectory)/bincore/vbc.runtimeconfig.json" />
+      <RoslynDeps Include="$(RoslynDirectory)/bincore/csc.deps.json" />
+      <RoslynDeps Include="$(RoslynDirectory)/bincore/vbc.deps.json" />
+      <RoslynSatelliteDeps Include="$(RoslynDirectory)/bincore/tool_roslyn_satellites.deps.json" />
+    </ItemGroup>
+    <PropertyGroup>
+      <ReplacementPattern>"version": ".*"</ReplacementPattern>
+      <ReplacementString>"version": "$(CLI_SharedFrameworkVersion)"</ReplacementString>
+    </PropertyGroup>
+    <ReplaceFileContents
+      InputFile="%(RoslynRuntimeConfigs.Identity)"
+      DestinationFile="%(RoslynRuntimeConfigs.Identity)"
+      ReplacementPatterns="$(ReplacementPattern)"
+      ReplacementStrings="$(ReplacementString)" />
+    <DotNetPublish
+      ToolPath="$(Stage0Directory)"
+      Configuration="$(Configuration)"
+      ProjectPath="$(SrcDirectory)/tool_roslyn_satellites/tool_roslyn_satellites.csproj" />
+    <AddToDeps TargetDeps="@(RoslynDeps)" AdditionalDeps="@(RoslynSatelliteDeps)" />
+    <Delete Files="@(RoslynSatelliteDeps)" />
   </Target>
 
   <Target Name="PublishFSharp"
@@ -200,41 +222,72 @@
           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 -->
-      <SdkFiles Include="$(PublishDir)/**/*" Exclude="$(PublishDir)/TestHost*/**/*;$(PublishDir)/Sdks/**/*" />
+      <RemainingFiles Remove="$(PublishDir)TestHost*\**\*" />
+      <RemainingFiles Remove="$(PublishDir)Sdks\**\*" />
 
       <!-- Don't try to CrossGen .NET Framework support assemblies for .NET Standard -->
-      <SdkFiles Remove="$(PublishDir)/Microsoft\Microsoft.NET.Build.Extensions\net*\**\*" />
+      <RemainingFiles Remove="$(PublishDir)Microsoft\Microsoft.NET.Build.Extensions\net*\**\*" />
 
       <!-- Don't try to CrossGen tasks and supporting DLLs compiled for .NET Framework -->
-      <SdkFiles Remove="$(PublishDir)/Microsoft\Microsoft.NET.Build.Extensions\tools\net*\**\*" />
+      <RemainingFiles Remove="$(PublishDir)Microsoft\Microsoft.NET.Build.Extensions\tools\net*\**\*" />
     </ItemGroup>
 
-    <AddMetadataIsPE Items="@(SdkFiles)">
-      <Output TaskParameter="ResultItems" ItemName="SdkFilesWithPEMarker" />
+    <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>
 
     <ItemGroup>
-      <CrossgenTargets Include="%(SdkFilesWithPEMarker.FullPath)" Condition=" '%(SdkFilesWithPEMarker.IsPE)' == 'True' " />
+      <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\**\*" />
     </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="%(CrossgenTargets.FullPath)"
-              DestinationPath="%(CrossgenTargets.FullPath)"
-              JITPath="$(LibCLRJitPath)"
-              CrossgenPath="$(CrossgenPath)"
-              ReadyToRun="True"
-              PlatformAssemblyPaths="@(PlatformAssemblies);
-                                     @(PublishDirSubDirectories);
-                                     $(SharedFrameworkNameVersionPath)" />
+    <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)" />
   </Target>
 
   <Target Name="ChmodPublishDir"
@@ -243,8 +296,6 @@
     
     <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
deleted file mode 100644
index 7398082b2..000000000
--- a/src/tool_roslyn/RunCsc.cmd
+++ /dev/null
@@ -1,6 +0,0 @@
-@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
deleted file mode 100755
index 47aed63d1..000000000
--- a/src/tool_roslyn/RunCsc.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/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
deleted file mode 100644
index e891b1bf5..000000000
--- a/src/tool_roslyn/RunVbc.cmd
+++ /dev/null
@@ -1,6 +0,0 @@
-@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
deleted file mode 100755
index 3dda886a0..000000000
--- a/src/tool_roslyn/RunVbc.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/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
deleted file mode 100644
index bd702ca7c..000000000
--- a/src/tool_roslyn/tool_roslyn.csproj
+++ /dev/null
@@ -1,68 +0,0 @@
-<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/src/tool_roslyn_satellites/tool_roslyn_satellites.csproj b/src/tool_roslyn_satellites/tool_roslyn_satellites.csproj
new file mode 100644
index 000000000..d42c632b0
--- /dev/null
+++ b/src/tool_roslyn_satellites/tool_roslyn_satellites.csproj
@@ -0,0 +1,35 @@
+<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>$(CliTargetFramework)</TargetFramework>
+    <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
+    <PublishDir>$(RoslynDirectory)/bincore</PublishDir>
+    <VersionSuffix>$(CommitCount)</VersionSuffix>
+    <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
+    <CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
+    <CopyOutputSymbolsToPublishDirectory>false</CopyOutputSymbolsToPublishDirectory>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NetCore.App" Version="$(CLI_SharedFrameworkVersion)" />
+    <PackageReference Include="CliDeps.Satellites.Roslyn" Version="$(CLI_Roslyn_Satellites_Version)" />
+  </ItemGroup>
+
+  <Target Name="MoveBuildTasksSatellitesAndRemoveBuildOutputAsset"
+        AfterTargets="Publish">
+
+    <RemoveAssetFromDepsPackages DepsFile="$(PublishDir)/$(TargetName).deps.json"
+                                 SectionName="runtime"
+                                 AssetPath="$(TargetFileName)" />
+
+    <ItemGroup>
+      <BuildTaskSatellites Include="$(PublishDir)/**/Microsoft.Build.Tasks.CodeAnalysis.resources.dll" />
+    </ItemGroup>
+
+    <Move SourceFiles="@(BuildTaskSatellites)"
+          DestinationFiles="@(BuildTaskSatellites->'$(PublishDir)/../%(RecursiveDir)/%(Filename)%(Extension)')" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/test/dotnet-msbuild.Tests/GivenMsbuildForwardingApp.cs b/test/dotnet-msbuild.Tests/GivenMsbuildForwardingApp.cs
index 4450258ee..a40e23b5a 100644
--- a/test/dotnet-msbuild.Tests/GivenMsbuildForwardingApp.cs
+++ b/test/dotnet-msbuild.Tests/GivenMsbuildForwardingApp.cs
@@ -31,8 +31,6 @@ 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)
@@ -66,28 +64,6 @@ 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()
         {

From 88bcf0ffb3eeccc24462675c021e202aed397e3a Mon Sep 17 00:00:00 2001
From: Andy Gerlicher <angerlic@microsoft.com>
Date: Mon, 16 Oct 2017 14:40:46 -0700
Subject: [PATCH 17/24] MSBuild 15.5.160

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index fd4d8c474..d35a4da0b 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <CLI_SharedFrameworkVersion>2.0.0</CLI_SharedFrameworkVersion>
-    <CLI_MSBuild_Version>15.5.0-preview-000154-1054573</CLI_MSBuild_Version>
+    <CLI_MSBuild_Version>15.5.0-preview-000160-1065475</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.6.0-beta1-62126-01</CLI_Roslyn_Version>
     <CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>
     <CLI_FSharp_Version>4.2.0-rtm-170926-0</CLI_FSharp_Version>

From 2a3a5be07d5019487896f0a1b5784886a66eb92d Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Mon, 16 Oct 2017 17:23:12 -0700
Subject: [PATCH 18/24] Insert SDK 15.5.0-preview-20171017-1

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 07508caff..637aaa3af 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -13,7 +13,7 @@
     <!-- We'll usually want to keep these versions in sync, but we may want to diverge in some
          cases, so use separate properties but derive one from the other unless we want to
          explicitly use different versions. -->
-    <CLI_NETSDK_Version>15.5.0-preview-20171012-6</CLI_NETSDK_Version>
+    <CLI_NETSDK_Version>15.5.0-preview-20171017-1</CLI_NETSDK_Version>
     <CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
 
     <CLI_NuGet_Version>4.5.0-preview2-4529</CLI_NuGet_Version>

From ea158bb68606e071ad2a6bde8d8acac8b48349c4 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Tue, 17 Oct 2017 09:48:16 -0700
Subject: [PATCH 19/24] Update the roslyn version to 2.6.0-beta2-62210-01.

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 637aaa3af..e4ab1f20d 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <CLI_SharedFrameworkVersion>2.0.0</CLI_SharedFrameworkVersion>
     <CLI_MSBuild_Version>15.5.0-preview-000154-1054573</CLI_MSBuild_Version>
-    <CLI_Roslyn_Version>2.6.0-beta1-62126-01</CLI_Roslyn_Version>
+    <CLI_Roslyn_Version>2.6.0-beta2-62210-01</CLI_Roslyn_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_Deps_Satellites_Build>pre-20171012-1</CLI_Deps_Satellites_Build>

From bfb045e31183c4a12e46eaf05bb32089282e3ce5 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Mon, 16 Oct 2017 18:19:34 -0700
Subject: [PATCH 20/24] Updating the brand to 2.1.1.

---
 build/Branding.props | 2 +-
 build/Version.props  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/Branding.props b/build/Branding.props
index 2defb3b47..02463e2c5 100644
--- a/build/Branding.props
+++ b/build/Branding.props
@@ -1,6 +1,6 @@
 <Project ToolsVersion="14.0">
   <PropertyGroup>
-    <SdkBrandName>Microsoft .NET Core SDK - 15.5.0</SdkBrandName>
+    <SdkBrandName>Microsoft .NET Core SDK - 2.1.1</SdkBrandName>
     <MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
     <SharedFrameworkBrandName>Microsoft .NET Core Runtime - 2.0.1</SharedFrameworkBrandName>
     <SharedHostBrandName>Microsoft .NET Core Host - 2.0.1</SharedHostBrandName>
diff --git a/build/Version.props b/build/Version.props
index 8e40233c3..4c47fdeba 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
-    <VersionMajor>15</VersionMajor>
-    <VersionMinor>5</VersionMinor>
-    <VersionPatch>0</VersionPatch>
+    <VersionMajor>2</VersionMajor>
+    <VersionMinor>1</VersionMinor>
+    <VersionPatch>1</VersionPatch>
     <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview</ReleaseSuffix>
 
     <CliVersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)</CliVersionPrefix>

From 9bd976f5ece0c0aa11e57052d25cfcf49124c8b9 Mon Sep 17 00:00:00 2001
From: Livar <licavalc@microsoft.com>
Date: Tue, 17 Oct 2017 16:52:20 -0700
Subject: [PATCH 21/24] Updating ASP.NET templates to 1.0.0-beta2-20170810-304

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index f601e9a3f..25243a29f 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -26,7 +26,7 @@
     <TemplateEngineVersion>1.0.0-beta2-20171004-309</TemplateEngineVersion>
     <TemplateEngineTemplateVersion>1.0.0-beta2-20171004-309</TemplateEngineTemplateVersion>
     <TemplateEngineTemplate2_0Version>1.0.0-beta2-20171004-309</TemplateEngineTemplate2_0Version>
-    <AspnetTemplateVersion>1.0.0-beta2-20171004-309</AspnetTemplateVersion>
+    <AspnetTemplateVersion>1.0.0-beta2-20170810-304</AspnetTemplateVersion>
     <PlatformAbstractionsVersion>2.0.0</PlatformAbstractionsVersion>
     <DependencyModelVersion>2.0.0</DependencyModelVersion>
     <CliCommandLineParserVersion>0.1.1-alpha-167</CliCommandLineParserVersion>

From 8e2b99dae17ad1a066c7282ef68eb6846fc69f44 Mon Sep 17 00:00:00 2001
From: Livar <licavalc@microsoft.com>
Date: Tue, 17 Oct 2017 17:53:18 -0700
Subject: [PATCH 22/24] Removing a bundled template that should not be here.

Microsoft.DotNet.Web.Client.ItemTemplates should not be here yet.
---
 build/BundledTemplates.props | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props
index 76dd56562..397ed4f0f 100644
--- a/build/BundledTemplates.props
+++ b/build/BundledTemplates.props
@@ -6,7 +6,6 @@
 
     <BundledTemplate Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="$(SpaTemplateVersion)" />
 
-    <BundledTemplate Include="Microsoft.DotNet.Web.Client.ItemTemplates" Version="$(AspnetTemplateVersion)" />
     <BundledTemplate Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(AspnetTemplateVersion)" />
     <BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.2.0" Version="$(AspnetTemplateVersion)" />
   </ItemGroup>

From d3098e7fcd4f9735f9d22e13141bdd30b02ec986 Mon Sep 17 00:00:00 2001
From: Livar <licavalc@microsoft.com>
Date: Wed, 18 Oct 2017 10:40:15 -0700
Subject: [PATCH 23/24] Update SDK to 15.5.0-preview-20171018-2

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 25243a29f..cff56573d 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -13,7 +13,7 @@
     <!-- We'll usually want to keep these versions in sync, but we may want to diverge in some
          cases, so use separate properties but derive one from the other unless we want to
          explicitly use different versions. -->
-    <CLI_NETSDK_Version>15.5.0-preview-20171017-1</CLI_NETSDK_Version>
+    <CLI_NETSDK_Version>15.5.0-preview-20171018-2</CLI_NETSDK_Version>
     <CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
 
     <CLI_NuGet_Version>4.5.0-preview2-4529</CLI_NuGet_Version>

From f81c0fc1d758a3a958581dbe64b187560c307020 Mon Sep 17 00:00:00 2001
From: Andy Gerlicher <angerlic@microsoft.com>
Date: Mon, 23 Oct 2017 14:59:24 -0700
Subject: [PATCH 24/24] MSBuild 15.5.165

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index cff56573d..e4ddf2ecf 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <CLI_SharedFrameworkVersion>2.0.0</CLI_SharedFrameworkVersion>
-    <CLI_MSBuild_Version>15.5.0-preview-000160-1065475</CLI_MSBuild_Version>
+    <CLI_MSBuild_Version>15.5.0-preview-000165-1081473</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.6.0-beta2-62210-01</CLI_Roslyn_Version>
     <CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>
     <CLI_FSharp_Version>4.2.0-rtm-170926-0</CLI_FSharp_Version>