diff --git a/patches/msbuild/0001-Add-TargetingPack-and-enable-net46-builds-for-source.patch b/patches/msbuild/0001-Add-TargetingPack-and-enable-net46-builds-for-source.patch
deleted file mode 100644
index c1fc617d77..0000000000
--- a/patches/msbuild/0001-Add-TargetingPack-and-enable-net46-builds-for-source.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9916195ba908fa5022cbc011f7dac67c5ded5a22 Mon Sep 17 00:00:00 2001
-From: Chris Rummel <crummel@microsoft.com>
-Date: Tue, 12 Jun 2018 18:09:27 -0500
-Subject: [PATCH] Add TargetingPack and enable net46 builds for source-build.
-
----
- src/Directory.Build.props | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Directory.Build.props b/src/Directory.Build.props
-index 5759f5c7..13126316 100644
---- a/src/Directory.Build.props
-+++ b/src/Directory.Build.props
-@@ -20,8 +20,7 @@
-     <Platforms>AnyCPU;x64</Platforms>
-     
-     <!-- Defaults for target frameworks and architecture -->
--    <LibraryTargetFrameworks>netstandard2.0</LibraryTargetFrameworks>
--    <LibraryTargetFrameworks Condition="'$(OsEnvironment)'=='windows'">net46;netstandard2.0</LibraryTargetFrameworks>
-+    <LibraryTargetFrameworks>net46;netstandard2.0</LibraryTargetFrameworks>
-     <PlatformTarget>AnyCPU</PlatformTarget>
- 
-     <!-- Target frameworks for Exe and unit test projects (ie projects with runtime output) -->
-@@ -62,6 +61,7 @@
-   <ItemGroup>
-     <PackageReference Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" PrivateAssets="All"/>
-     <PackageReference Condition="'$(DisableNerdbankVersioning)' != 'true'" Include="Nerdbank.GitVersioning" Version="$(GitVersioningVersion)" PrivateAssets="All" />
-+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-alpha-003" PrivateAssets="all"/>
-   </ItemGroup>
-   
-   <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
--- 
-2.14.1
-
diff --git a/patches/vstest/0001-Conditionally-remove-uap-from-TargetFramework.patch b/patches/vstest/0001-Conditionally-remove-uap-from-TargetFramework.patch
new file mode 100644
index 0000000000..f91c251b42
--- /dev/null
+++ b/patches/vstest/0001-Conditionally-remove-uap-from-TargetFramework.patch
@@ -0,0 +1,24 @@
+From 81f7e530100315ccd2d18048c45772d035bd5eee Mon Sep 17 00:00:00 2001
+From: dseefeld <dseefeld@microsoft.com>
+Date: Wed, 12 Sep 2018 18:27:49 +0000
+Subject: [PATCH] Conditionally remove uap from TargetFramework
+
+---
+ .../Microsoft.TestPlatform.PlatformAbstractions.csproj                   | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
+index b89400e..31ba348 100644
+--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
++++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
+@@ -7,6 +7,7 @@
+   <PropertyGroup>
+     <AssemblyName>Microsoft.TestPlatform.PlatformAbstractions</AssemblyName>
+     <TargetFrameworks>netstandard1.0;netcoreapp1.0;net451;uap10.0</TargetFrameworks>
++    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.0;netcoreapp1.0;net451</TargetFrameworks>
+     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+     <EnableCodeAnalysis>true</EnableCodeAnalysis>
+   </PropertyGroup>
+-- 
+1.8.3.1
+
diff --git a/patches/vstest/0001-Remove-build-for-net451-in-source-build.patch b/patches/vstest/0001-Remove-build-for-net451-in-source-build.patch
deleted file mode 100644
index 314395ea77..0000000000
--- a/patches/vstest/0001-Remove-build-for-net451-in-source-build.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-From 585b37bb0943e992d86f3eef1b0d22ab1fd7702c Mon Sep 17 00:00:00 2001
-From: dseefeld <dseefeld@microsoft.com>
-Date: Thu, 5 Apr 2018 18:02:35 +0000
-Subject: [PATCH] Remove build for net451 in source-build
-
----
- src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj   | 1 +
- src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj   | 1 +
- .../Microsoft.TestPlatform.CommunicationUtilities.csproj                 | 1 +
- .../Microsoft.TestPlatform.CoreUtilities.csproj                          | 1 +
- .../Microsoft.TestPlatform.CrossPlatEngine.csproj                        | 1 +
- .../Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj          | 1 +
- .../Microsoft.TestPlatform.Extensions.TrxLogger.csproj                   | 1 +
- .../Microsoft.TestPlatform.ObjectModel.csproj                            | 1 +
- .../Microsoft.TestPlatform.PlatformAbstractions.csproj                   | 1 +
- .../Microsoft.TestPlatform.TestHostProvider.csproj                       | 1 +
- .../Microsoft.TestPlatform.Utilities.csproj                              | 1 +
- .../Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj         | 1 +
- src/datacollector/datacollector.csproj                                   | 1 +
- src/package/package/package.csproj                                       | 1 +
- src/testhost.x86/testhost.x86.csproj                                     | 1 +
- src/testhost/testhost.csproj                                             | 1 +
- src/vstest.console/vstest.console.csproj                                 | 1 +
- 17 files changed, 17 insertions(+)
-
-diff --git a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj
-index eefd0d0..8ddddfb 100644
---- a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj
-+++ b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj
-@@ -7,6 +7,7 @@
-   <PropertyGroup>
-     <AssemblyName>Microsoft.VisualStudio.TestPlatform.Client</AssemblyName>
-     <TargetFrameworks>netstandard1.4;net451</TargetFrameworks>
-+    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.4</TargetFrameworks>
-   </PropertyGroup>
-   <ItemGroup>
-     <EmbeddedResource Include="Resources\Resources.resx" />
-diff --git a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj
-index 1729412..d243e5c 100644
---- a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj
-+++ b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj
-@@ -7,6 +7,7 @@
-   <PropertyGroup>
-     <AssemblyName>Microsoft.VisualStudio.TestPlatform.Common</AssemblyName>
-     <TargetFrameworks>netstandard1.4;net451</TargetFrameworks>
-+    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.4</TargetFrameworks>
-     <WarningsAsErrors>true</WarningsAsErrors>
-   </PropertyGroup>
-   <ItemGroup>
-diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj
-index d628ab7..7619dbf 100644
---- a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj
-+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj
-@@ -6,6 +6,7 @@
-   <PropertyGroup>
-     <AssemblyName>Microsoft.TestPlatform.CommunicationUtilities</AssemblyName>
-     <TargetFrameworks>netstandard1.4;net451</TargetFrameworks>
-+    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.4</TargetFrameworks>
-     <WarningsAsErrors>true</WarningsAsErrors>
-     <EnableCodeAnalysis>true</EnableCodeAnalysis>
-   </PropertyGroup>
-diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
-index fe47263..cfdac10 100644
---- a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
-+++ b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
-@@ -7,6 +7,7 @@
-   <PropertyGroup>
-     <AssemblyName>Microsoft.TestPlatform.CoreUtilities</AssemblyName>
-     <TargetFrameworks>netstandard1.4;net451</TargetFrameworks>
-+    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.4</TargetFrameworks>
-   </PropertyGroup>
-   <ItemGroup>
-     <EmbeddedResource Include="Resources\Resources.resx" />
-diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj
-index e90b10e..e113890 100644
---- a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj
-+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj
-@@ -7,6 +7,7 @@
-   <PropertyGroup>
-     <AssemblyName>Microsoft.TestPlatform.CrossPlatEngine</AssemblyName>
-     <TargetFrameworks>netstandard1.4;net451</TargetFrameworks>
-+    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.4</TargetFrameworks>
-     <WarningsAsErrors>true</WarningsAsErrors>
-   </PropertyGroup>
-   <ItemGroup>
-diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj
-index d9c8b56..2478edb 100644
---- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj
-+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj
-@@ -10,6 +10,7 @@
-   <PropertyGroup>
-     <AssemblyName>Microsoft.TestPlatform.Extensions.BlameDataCollector</AssemblyName>
-     <TargetFrameworks>netstandard1.5;net451</TargetFrameworks>
-+    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.5</TargetFrameworks>
-     <WarningsAsErrors>true</WarningsAsErrors>
-     <EnableCodeAnalysis>true</EnableCodeAnalysis>
-   </PropertyGroup>
-diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj
-index 783a23d..21452ae 100644
---- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj
-+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj
-@@ -8,6 +8,7 @@
-     <AssemblyName>Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger</AssemblyName>
-     <WarningsAsErrors>true</WarningsAsErrors>
-     <TargetFrameworks>netstandard1.5;net451</TargetFrameworks>
-+    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.5</TargetFrameworks>
-   </PropertyGroup>
-   <ItemGroup>
-     <EmbeddedResource Include="Resources\TrxResource.resx" />
-diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
-index 604bf05..df7317b 100644
---- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
-+++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
-@@ -7,6 +7,7 @@
-   <PropertyGroup>
-     <AssemblyName>Microsoft.VisualStudio.TestPlatform.ObjectModel</AssemblyName>
-     <TargetFrameworks>net451;netstandard1.4</TargetFrameworks>
-+    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.4</TargetFrameworks>
-     <PackageId>Microsoft.TestPlatform.ObjectModel</PackageId>
-   </PropertyGroup>
-   <ItemGroup>
-diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
-index b89400e..9b9e7cd 100644
---- a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
-+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
-@@ -7,6 +7,7 @@
-   <PropertyGroup>
-     <AssemblyName>Microsoft.TestPlatform.PlatformAbstractions</AssemblyName>
-     <TargetFrameworks>netstandard1.0;netcoreapp1.0;net451;uap10.0</TargetFrameworks>
-+    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.0;netcoreapp1.0</TargetFrameworks>
-     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-     <EnableCodeAnalysis>true</EnableCodeAnalysis>
-   </PropertyGroup>
-diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj
-index f34ce27..af0a208 100644
---- a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj
-+++ b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj
-@@ -7,6 +7,7 @@
-   <PropertyGroup>
-     <AssemblyName>Microsoft.TestPlatform.TestHostRuntimeProvider</AssemblyName>
-     <TargetFrameworks>netstandard1.5;net451</TargetFrameworks>
-+    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.5</TargetFrameworks>
-     <EnableCodeAnalysis>true</EnableCodeAnalysis>
-   </PropertyGroup>
-   <ItemGroup>
-diff --git a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj
-index 1113869..5a99162 100644
---- a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj
-+++ b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj
-@@ -7,6 +7,7 @@
-   <PropertyGroup>
-     <AssemblyName>Microsoft.TestPlatform.Utilities</AssemblyName>
-     <TargetFrameworks>netstandard1.4;net451</TargetFrameworks>
-+    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.4</TargetFrameworks>
-   </PropertyGroup>
-   <ItemGroup>
-     <EmbeddedResource Include="Resources\Resources.resx" />
-diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj
-index 67ed497..008bd7a 100644
---- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj
-+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj
-@@ -7,6 +7,7 @@
-   <PropertyGroup>
-     <AssemblyName>Microsoft.TestPlatform.VsTestConsole.TranslationLayer</AssemblyName>
-     <TargetFrameworks>netstandard1.5;net451</TargetFrameworks>
-+    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.5</TargetFrameworks>
-     <WarningsAsErrors>true</WarningsAsErrors>
-   </PropertyGroup>
-   <PropertyGroup>
-diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacollector.csproj
-index 267de80..531780c 100644
---- a/src/datacollector/datacollector.csproj
-+++ b/src/datacollector/datacollector.csproj
-@@ -10,6 +10,7 @@
-   <PropertyGroup>
-     <AssemblyName>datacollector</AssemblyName>
-     <TargetFrameworks>netcoreapp1.0;netcoreapp2.0;net451</TargetFrameworks>
-+    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp1.0;netcoreapp2.0</TargetFrameworks>
-     <WarningsAsErrors>true</WarningsAsErrors>
-     <PlatformTarget Condition="'$(TargetFramework)' == 'net451'">AnyCPU</PlatformTarget>
-     <OutputType>Exe</OutputType>
-diff --git a/src/package/package/package.csproj b/src/package/package/package.csproj
-index 76082e2..71461a9 100644
---- a/src/package/package/package.csproj
-+++ b/src/package/package/package.csproj
-@@ -6,6 +6,7 @@
-   <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-   <PropertyGroup>
-     <TargetFrameworks>net451;netcoreapp2.0</TargetFrameworks>
-+    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp2.0</TargetFrameworks>
-     <AssemblyName>package</AssemblyName>
-     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj
-index faf1138..8486dc2 100644
---- a/src/testhost.x86/testhost.x86.csproj
-+++ b/src/testhost.x86/testhost.x86.csproj
-@@ -7,6 +7,7 @@
-   <PropertyGroup>
-     <AssemblyName>testhost.x86</AssemblyName>
-     <TargetFrameworks>netstandard1.4;netcoreapp1.0;net451</TargetFrameworks>
-+    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.4;netcoreapp1.0</TargetFrameworks>
-     <WarningsAsErrors>true</WarningsAsErrors>
-     <PlatformTarget>x86</PlatformTarget>
-     <OutputType Condition="'$(TargetFramework)' != 'netstandard1.4'">Exe</OutputType>
-diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj
-index e585fc1..b73a303 100644
---- a/src/testhost/testhost.csproj
-+++ b/src/testhost/testhost.csproj
-@@ -7,6 +7,7 @@
-   <PropertyGroup>
-     <AssemblyName>testhost</AssemblyName>
-     <TargetFrameworks>netstandard1.4;netcoreapp1.0;net451</TargetFrameworks>
-+    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.4;netcoreapp1.0</TargetFrameworks>
-     <OutputType Condition="'$(TargetFramework)' != 'netstandard1.4'">Exe</OutputType>
-     <ApplicationManifest>app.manifest</ApplicationManifest>
-   </PropertyGroup>
-diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj
-index 2a319d9..9406287 100644
---- a/src/vstest.console/vstest.console.csproj
-+++ b/src/vstest.console/vstest.console.csproj
-@@ -7,6 +7,7 @@
-   <PropertyGroup>
-     <AssemblyName>vstest.console</AssemblyName>
-     <TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
-+    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp2.0</TargetFrameworks>
-     <WarningsAsErrors>true</WarningsAsErrors>
-     <OutputType>Exe</OutputType>
-     <PlatformTarget Condition="'$(TargetFramework)' == 'net451'">AnyCPU</PlatformTarget>
--- 
-1.8.3.1
-
diff --git a/patches/vstest/0002-Remove-unneccessary-projects-from-sln.patch b/patches/vstest/0002-Remove-unneccessary-projects-from-sln.patch
index 0f946bb096..107b78a5b0 100644
--- a/patches/vstest/0002-Remove-unneccessary-projects-from-sln.patch
+++ b/patches/vstest/0002-Remove-unneccessary-projects-from-sln.patch
@@ -1,14 +1,14 @@
-From a33078c78b35e2399683328487327393c0f66aa7 Mon Sep 17 00:00:00 2001
-From: karajas <karajas@microsoft.com>
-Date: Fri, 23 Feb 2018 22:03:44 -0500
+From 4cf1e6eb51a144963b848e3dc5f3d50e1db314c4 Mon Sep 17 00:00:00 2001
+From: dseefeld <dseefeld@microsoft.com>
+Date: Tue, 11 Sep 2018 15:37:27 +0000
 Subject: [PATCH] Remove unneccessary projects from sln
 
 ---
- TestPlatform.sln | 588 -------------------------------------------------------
- 1 file changed, 588 deletions(-)
+ TestPlatform.sln | 659 -------------------------------------------------------
+ 1 file changed, 659 deletions(-)
 
 diff --git a/TestPlatform.sln b/TestPlatform.sln
-index ab2597f..3b74cf9 100644
+index 3849fef..6cd7fd9 100644
 --- a/TestPlatform.sln
 +++ b/TestPlatform.sln
 @@ -7,18 +7,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED0C35EB-7F3
@@ -30,7 +30,16 @@ index ab2597f..3b74cf9 100644
  Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Common", "src\Microsoft.TestPlatform.Common\Microsoft.TestPlatform.Common.csproj", "{68ADC720-316E-4895-9F8E-C3CCADD262BE}"
  EndProject
  Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.CommunicationUtilities", "src\Microsoft.TestPlatform.CommunicationUtilities\Microsoft.TestPlatform.CommunicationUtilities.csproj", "{1621415E-7723-4F46-A589-4C4620C0751A}"
-@@ -39,126 +29,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "testhost.x86", "src\testhos
+@@ -29,8 +19,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Obje
+ EndProject
+ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Utilities", "src\Microsoft.TestPlatform.Utilities\Microsoft.TestPlatform.Utilities.csproj", "{61F7F446-9EF3-4768-B33A-4D75F60E1059}"
+ EndProject
+-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Extensions.TrxLogger", "src\Microsoft.TestPlatform.Extensions.TrxLogger\Microsoft.TestPlatform.Extensions.TrxLogger.csproj", "{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}"
+-EndProject
+ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.VsTestConsole.TranslationLayer", "src\Microsoft.TestPlatform.VsTestConsole.TranslationLayer\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj", "{790B8030-00C2-4121-B125-EDC4CE329BA3}"
+ EndProject
+ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "testhost", "src\testhost\testhost.csproj", "{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}"
+@@ -39,137 +27,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "testhost.x86", "src\testhos
  EndProject
  Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vstest.console", "src\vstest.console\vstest.console.csproj", "{10B6ADE1-F808-4612-801D-4452F5B52242}"
  EndProject
@@ -109,11 +118,12 @@ index ab2597f..3b74cf9 100644
  EndProject
 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "datacollector.PlatformTests", "test\datacollector.PlatformTests\datacollector.PlatformTests.csproj", "{FF80D706-8309-4E02-BAC0-D28B4CBCF600}"
 -EndProject
--Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform", "Platform", "{7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}"
--EndProject
+ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform", "Platform", "{7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}"
+ EndProject
 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DED1590A-ED25-413B-8590-006A4DD5B2FD}"
 -	ProjectSection(SolutionItems) = preProject
 -		scripts\build\TestPlatform.Dependencies.props = scripts\build\TestPlatform.Dependencies.props
+-		scripts\build\TestPlatform.Localization.targets = scripts\build\TestPlatform.Localization.targets
 -		scripts\build\TestPlatform.Settings.targets = scripts\build\TestPlatform.Settings.targets
 -		scripts\build\TestPlatform.targets = scripts\build\TestPlatform.targets
 -	EndProjectSection
@@ -153,11 +163,21 @@ index ab2597f..3b74cf9 100644
 -	EndProjectSection
 -EndProject
 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vstest.console.PlatformTests", "test\vstest.console.PlatformTests\vstest.console.PlatformTests.csproj", "{8C068694-23A2-47A2-A0DD-DB82D0AF0142}"
+-EndProject
+-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Common.PlatformTests", "test\Microsoft.TestPlatform.Common.PlatformTests\Microsoft.TestPlatform.Common.PlatformTests.csproj", "{24C7683D-2607-4901-B8EB-83A57E49E93D}"
+-EndProject
+-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.TraceDataCollector", "src\DataCollectors\TraceDataCollector\Microsoft.VisualStudio.TraceDataCollector.csproj", "{32BD96BD-16FB-43F0-B952-E7EEDB6DD813}"
+-EndProject
+-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.TraceDataCollector.UnitTests", "test\DataCollectors\TraceDataCollector.UnitTests\Microsoft.TestPlatform.TraceDataCollector.UnitTests.csproj", "{A7E2261B-B2E6-4CBF-983F-E3A3FF8E52E3}"
+-EndProject
+ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SettingsMigrator", "src\SettingsMigrator\SettingsMigrator.csproj", "{69F5FF81-5615-4F06-B83C-FCF979BB84CA}"
+ EndProject
+-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SettingsMigrator.UnitTests", "test\SettingsMigrator.UnitTests\SettingsMigrator.UnitTests.csproj", "{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}"
 -EndProject
  Global
  	GlobalSection(SolutionConfigurationPlatforms) = preSolution
  		Debug|Any CPU = Debug|Any CPU
-@@ -181,30 +61,6 @@ Global
+@@ -192,30 +63,6 @@ Global
  		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|x64.Build.0 = Release|Any CPU
  		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|x86.ActiveCfg = Release|Any CPU
  		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|x86.Build.0 = Release|Any CPU
@@ -188,7 +208,7 @@ index ab2597f..3b74cf9 100644
  		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
  		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|x64.ActiveCfg = Debug|Any CPU
-@@ -217,18 +73,6 @@ Global
+@@ -228,18 +75,6 @@ Global
  		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|x64.Build.0 = Release|Any CPU
  		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|x86.ActiveCfg = Release|Any CPU
  		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|x86.Build.0 = Release|Any CPU
@@ -207,7 +227,26 @@ index ab2597f..3b74cf9 100644
  		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
  		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|x64.ActiveCfg = Debug|Any CPU
-@@ -349,270 +193,6 @@ Global
+@@ -300,18 +135,6 @@ Global
+ 		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|x64.Build.0 = Release|Any CPU
+ 		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|x86.ActiveCfg = Release|Any CPU
+ 		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|x86.Build.0 = Release|Any CPU
+-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|x64.ActiveCfg = Debug|Any CPU
+-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|x64.Build.0 = Debug|Any CPU
+-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|x86.ActiveCfg = Debug|Any CPU
+-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|x86.Build.0 = Debug|Any CPU
+-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|Any CPU.Build.0 = Release|Any CPU
+-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|x64.ActiveCfg = Release|Any CPU
+-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|x64.Build.0 = Release|Any CPU
+-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|x86.ActiveCfg = Release|Any CPU
+-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|x86.Build.0 = Release|Any CPU
+ 		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ 		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ 		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|x64.ActiveCfg = Debug|Any CPU
+@@ -360,270 +183,6 @@ Global
  		{10B6ADE1-F808-4612-801D-4452F5B52242}.Release|x64.Build.0 = Release|Any CPU
  		{10B6ADE1-F808-4612-801D-4452F5B52242}.Release|x86.ActiveCfg = Release|Any CPU
  		{10B6ADE1-F808-4612-801D-4452F5B52242}.Release|x86.Build.0 = Release|Any CPU
@@ -478,7 +517,7 @@ index ab2597f..3b74cf9 100644
  		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|Any CPU.Build.0 = Debug|Any CPU
  		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|x64.ActiveCfg = Debug|Any CPU
-@@ -625,18 +205,6 @@ Global
+@@ -636,18 +195,6 @@ Global
  		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|x64.Build.0 = Release|Any CPU
  		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|x86.ActiveCfg = Release|Any CPU
  		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|x86.Build.0 = Release|Any CPU
@@ -497,7 +536,7 @@ index ab2597f..3b74cf9 100644
  		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
  		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Debug|x64.ActiveCfg = Debug|Any CPU
-@@ -649,42 +217,6 @@ Global
+@@ -660,42 +207,6 @@ Global
  		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Release|x64.Build.0 = Release|Any CPU
  		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Release|x86.ActiveCfg = Release|Any CPU
  		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Release|x86.Build.0 = Release|Any CPU
@@ -540,7 +579,7 @@ index ab2597f..3b74cf9 100644
  		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
  		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|x64.ActiveCfg = Debug|Any CPU
-@@ -709,146 +241,26 @@ Global
+@@ -720,114 +231,6 @@ Global
  		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Release|x64.Build.0 = Release|Any CPU
  		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Release|x86.ActiveCfg = Release|Any CPU
  		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Release|x86.Build.0 = Release|Any CPU
@@ -616,6 +655,61 @@ index ab2597f..3b74cf9 100644
 -		{8C068694-23A2-47A2-A0DD-DB82D0AF0142}.Release|x64.Build.0 = Release|Any CPU
 -		{8C068694-23A2-47A2-A0DD-DB82D0AF0142}.Release|x86.ActiveCfg = Release|Any CPU
 -		{8C068694-23A2-47A2-A0DD-DB82D0AF0142}.Release|x86.Build.0 = Release|Any CPU
+-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Debug|x64.ActiveCfg = Debug|Any CPU
+-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Debug|x64.Build.0 = Debug|Any CPU
+-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Debug|x86.ActiveCfg = Debug|Any CPU
+-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Debug|x86.Build.0 = Debug|Any CPU
+-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Release|Any CPU.Build.0 = Release|Any CPU
+-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Release|x64.ActiveCfg = Release|Any CPU
+-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Release|x64.Build.0 = Release|Any CPU
+-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Release|x86.ActiveCfg = Release|Any CPU
+-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Release|x86.Build.0 = Release|Any CPU
+-		{32BD96BD-16FB-43F0-B952-E7EEDB6DD813}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+-		{32BD96BD-16FB-43F0-B952-E7EEDB6DD813}.Debug|Any CPU.Build.0 = Debug|Any CPU
+-		{32BD96BD-16FB-43F0-B952-E7EEDB6DD813}.Debug|x64.ActiveCfg = Debug|Any CPU
+-		{32BD96BD-16FB-43F0-B952-E7EEDB6DD813}.Debug|x64.Build.0 = Debug|Any CPU
+-		{32BD96BD-16FB-43F0-B952-E7EEDB6DD813}.Debug|x86.ActiveCfg = Debug|Any CPU
+-		{32BD96BD-16FB-43F0-B952-E7EEDB6DD813}.Debug|x86.Build.0 = Debug|Any CPU
+-		{32BD96BD-16FB-43F0-B952-E7EEDB6DD813}.Release|Any CPU.ActiveCfg = Release|Any CPU
+-		{32BD96BD-16FB-43F0-B952-E7EEDB6DD813}.Release|Any CPU.Build.0 = Release|Any CPU
+-		{32BD96BD-16FB-43F0-B952-E7EEDB6DD813}.Release|x64.ActiveCfg = Release|Any CPU
+-		{32BD96BD-16FB-43F0-B952-E7EEDB6DD813}.Release|x64.Build.0 = Release|Any CPU
+-		{32BD96BD-16FB-43F0-B952-E7EEDB6DD813}.Release|x86.ActiveCfg = Release|Any CPU
+-		{32BD96BD-16FB-43F0-B952-E7EEDB6DD813}.Release|x86.Build.0 = Release|Any CPU
+-		{A7E2261B-B2E6-4CBF-983F-E3A3FF8E52E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+-		{A7E2261B-B2E6-4CBF-983F-E3A3FF8E52E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+-		{A7E2261B-B2E6-4CBF-983F-E3A3FF8E52E3}.Debug|x64.ActiveCfg = Debug|Any CPU
+-		{A7E2261B-B2E6-4CBF-983F-E3A3FF8E52E3}.Debug|x64.Build.0 = Debug|Any CPU
+-		{A7E2261B-B2E6-4CBF-983F-E3A3FF8E52E3}.Debug|x86.ActiveCfg = Debug|Any CPU
+-		{A7E2261B-B2E6-4CBF-983F-E3A3FF8E52E3}.Debug|x86.Build.0 = Debug|Any CPU
+-		{A7E2261B-B2E6-4CBF-983F-E3A3FF8E52E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+-		{A7E2261B-B2E6-4CBF-983F-E3A3FF8E52E3}.Release|Any CPU.Build.0 = Release|Any CPU
+-		{A7E2261B-B2E6-4CBF-983F-E3A3FF8E52E3}.Release|x64.ActiveCfg = Release|Any CPU
+-		{A7E2261B-B2E6-4CBF-983F-E3A3FF8E52E3}.Release|x64.Build.0 = Release|Any CPU
+-		{A7E2261B-B2E6-4CBF-983F-E3A3FF8E52E3}.Release|x86.ActiveCfg = Release|Any CPU
+-		{A7E2261B-B2E6-4CBF-983F-E3A3FF8E52E3}.Release|x86.Build.0 = Release|Any CPU
+ 		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ 		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ 		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|x64.ActiveCfg = Debug|Any CPU
+@@ -840,91 +243,29 @@ Global
+ 		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|x64.Build.0 = Release|Any CPU
+ 		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|x86.ActiveCfg = Release|Any CPU
+ 		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|x86.Build.0 = Release|Any CPU
+-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Debug|x64.ActiveCfg = Debug|Any CPU
+-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Debug|x64.Build.0 = Debug|Any CPU
+-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Debug|x86.ActiveCfg = Debug|Any CPU
+-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Debug|x86.Build.0 = Debug|Any CPU
+-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Release|Any CPU.Build.0 = Release|Any CPU
+-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Release|x64.ActiveCfg = Release|Any CPU
+-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Release|x64.Build.0 = Release|Any CPU
+-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Release|x86.ActiveCfg = Release|Any CPU
+-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Release|x86.Build.0 = Release|Any CPU
  	EndGlobalSection
  	GlobalSection(SolutionProperties) = preSolution
  		HideSolutionNode = FALSE
@@ -664,9 +758,9 @@ index ab2597f..3b74cf9 100644
 -		{0D85D957-6FF2-4620-B766-B708801D97F3} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A}
 -		{9549C1A4-CB57-4689-B3EB-F752F65F863F} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A}
 -		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
--		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E} = {7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}
+ 		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E} = {7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}
 -		{FF80D706-8309-4E02-BAC0-D28B4CBCF600} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
--		{7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
+ 		{7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
 -		{DED1590A-ED25-413B-8590-006A4DD5B2FD} = {EE49F5DC-5835-4AE3-B3BA-8BDE0AD56330}
  		{E141A226-CC0A-4F26-BD17-4AE427D81C3B} = {D27E1CB4-C641-4C6C-A140-EF5F6215AE29}
 -		{376C19DE-31E2-4FF6-88FC-0D0D6233C999} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
@@ -684,6 +778,11 @@ index ab2597f..3b74cf9 100644
 -		{826CD5AF-44FA-40F6-B731-3980CADED8C0} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A}
 -		{0D4DF78D-7E5F-4516-B19F-E6AA71A1DBF4} = {EE49F5DC-5835-4AE3-B3BA-8BDE0AD56330}
 -		{8C068694-23A2-47A2-A0DD-DB82D0AF0142} = {376C19DE-31E2-4FF6-88FC-0D0D6233C999}
+-		{24C7683D-2607-4901-B8EB-83A57E49E93D} = {376C19DE-31E2-4FF6-88FC-0D0D6233C999}
+-		{32BD96BD-16FB-43F0-B952-E7EEDB6DD813} = {B705537C-B82C-4A30-AFA5-6244D9A7DAEB}
+-		{A7E2261B-B2E6-4CBF-983F-E3A3FF8E52E3} = {D9A30E32-D466-4EC5-B4F2-62E17562279B}
+ 		{69F5FF81-5615-4F06-B83C-FCF979BB84CA} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
+-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
  	EndGlobalSection
  	GlobalSection(ExtensibilityGlobals) = postSolution
  		SolutionGuid = {0541B30C-FF51-4E28-B172-83F5F3934BCD}
diff --git a/patches/vstest/0003-Update-build-script-to-only-includ-netcore-for-packa.patch b/patches/vstest/0003-Update-build-script-to-only-includ-netcore-for-packa.patch
deleted file mode 100644
index 473e56214d..0000000000
--- a/patches/vstest/0003-Update-build-script-to-only-includ-netcore-for-packa.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 06801ae380e51ae94b363cdc6a4319cccff0d8d5 Mon Sep 17 00:00:00 2001
-From: dseefeld <dseefeld@microsoft.com>
-Date: Fri, 6 Apr 2018 12:55:26 +0000
-Subject: [PATCH] Update build script to only includ netcore for packaging
-
----
- scripts/build.sh | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/scripts/build.sh b/scripts/build.sh
-index 1e10ed1..a6d40e7 100755
---- a/scripts/build.sh
-+++ b/scripts/build.sh
-@@ -262,10 +262,14 @@ function publish_package()
-     local packageDir=$TP_OUT_DIR/$TPB_Configuration/$TPB_TargetFramework/$TPB_TargetRuntime
-     local coreCLRPackageDir=$TP_OUT_DIR/$TPB_Configuration/$TPB_TargetFrameworkCore
-     local frameworkPackageDirMap=( \
--        $TPB_TargetFrameworkCore:$coreCLRPackageDir \
--        $TPB_TargetFramework:$packageDir
-+        $TPB_TargetFrameworkCore:$coreCLRPackageDir
-     )
--    
-+    if [[ $DOTNET_BUILD_FROM_SOURCE = 0 ]]; then
-+        frameworkPackageDirMap+=( \
-+            $TPB_TargetFramework:$packageDir
-+        )
-+    fi
-+
-     for fxpkg in "${frameworkPackageDirMap[@]}" ;
-     do
-         local framework="${fxpkg%%:*}"
--- 
-1.8.3.1
-
diff --git a/repos/core-setup.proj b/repos/core-setup.proj
index aff6ee4dff..b89fcf5988 100644
--- a/repos/core-setup.proj
+++ b/repos/core-setup.proj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <BuildArguments>-ConfigurationGroup=$(Configuration) -PortableBuild=$(PortableBuild) -SkipTests=true </BuildArguments>
     <BuildArguments Condition="$(Platform.Contains('arm'))">$(BuildArguments) -TargetArchitecture=$(Platform) -DisableCrossgen=true -CrossBuild=true</BuildArguments>
-    <BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) -- /p:BuildDebPackage=false /p:BuildAllPackages=true</BuildCommand>
+    <BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) -- /p:BuildDebPackage=false /p:BuildAllPackages=true /p:PreReleaseLabel="preview"</BuildCommand>
     <BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
     <OfficialBuildId>20180905-02</OfficialBuildId>
 
diff --git a/repos/msbuild.proj b/repos/msbuild.proj
index e345af89af..d9df27dba3 100644
--- a/repos/msbuild.proj
+++ b/repos/msbuild.proj
@@ -4,9 +4,9 @@
 
   <PropertyGroup>
     <!-- Override value from commit to match expected build. -->
-    <OfficialBuildId>20180426.1</OfficialBuildId>
+    <OfficialBuildId>20180911.1</OfficialBuildId>
     <PackagesOutput>$(ProjectDirectory)/artifacts/$(Configuration)/packages</PackagesOutput>
-    <OutputVersionArgs>/p:VersionPrefix=15.7.179 /p:DisableNerdbankVersioning=true /p:PreReleaseVersionLabel="" /p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>
+    <OutputVersionArgs>/p:PackageVersion=15.9.0-preview-000008 /p:VersionPrefix=15.9.8 /p:DisableNerdbankVersioning=true /p:PB_VersionStamp="preview" /p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>
     <BuildCommand>$(ProjectDirectory)build/build$(ShellExtension) build -DotNetBuildFromSource -DotNetCoreSdkDir $(DotNetCliToolDir) -bootstraponly -skiptests -pack -configuration $(Configuration) /p:GitHeadSha=$(GitCommitHash) $(OutputVersionArgs)</BuildCommand>
     <SourceOverrideRepoApiImplemented>true</SourceOverrideRepoApiImplemented>
     <RepoApiImplemented>false</RepoApiImplemented>
diff --git a/repos/nuget-client.proj b/repos/nuget-client.proj
index e4e6c82b20..46fc6eefcc 100644
--- a/repos/nuget-client.proj
+++ b/repos/nuget-client.proj
@@ -6,7 +6,7 @@
     <NuGetCoreSourceDirectory>$(ProjectDirectory)src/NuGet.Core/</NuGetCoreSourceDirectory>
     <ToolsDirectory>$(ProjectDirectory)cli/</ToolsDirectory>
     <NuGetKeyFilePath>$(KeysDir)NuGet.Client.snk</NuGetKeyFilePath>
-    <NuGetClientBuildNumber>5156</NuGetClientBuildNumber>
+    <NuGetClientBuildNumber>5362</NuGetClientBuildNumber>
     <RepoApiImplemented>false</RepoApiImplemented>
     <!--
       This repo is not currently built in ProdCon
diff --git a/repos/vstest.proj b/repos/vstest.proj
index 93b69b57bb..709b70dcc4 100644
--- a/repos/vstest.proj
+++ b/repos/vstest.proj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
   <PropertyGroup>
-    <BuildCommand>$(ProjectDirectory)/build$(ShellExtension) -DotnetBuildFromSource -DotnetCoreSdkDir $(DotNetCliToolDir) -c $(Configuration) -r $(TargetRid) -v 15.3.0 -vs preview-20170628-02</BuildCommand>
+    <BuildCommand>$(ProjectDirectory)/build$(ShellExtension) -DotnetBuildFromSource -DotnetCoreSdkDir $(DotNetCliToolDir) -c $(Configuration) -r $(TargetRid) -v 15.9.0 -vs preview-20180807-05</BuildCommand>
     <PackagesOutput>$(ProjectDirectory)/artifacts/$(Configuration)/packages</PackagesOutput>
     <RepoApiImplemented>false</RepoApiImplemented>
     <OrchestratedManifestBuildName>N/A</OrchestratedManifestBuildName>
diff --git a/src/fsharp b/src/fsharp
index d3f02429a9..41296d72f1 160000
--- a/src/fsharp
+++ b/src/fsharp
@@ -1 +1 @@
-Subproject commit d3f02429a9b28c4d086fc5e2b63171b972751037
+Subproject commit 41296d72f1de1f41cc4de0da87a10f711804aff8
diff --git a/src/msbuild b/src/msbuild
index 766e041ee1..0a5001fc4d 160000
--- a/src/msbuild
+++ b/src/msbuild
@@ -1 +1 @@
-Subproject commit 766e041ee15b9a11f673c201e2a82171311063f9
+Subproject commit 0a5001fc4d1006b2b2cb4f523cb167d09baff7b4
diff --git a/src/nuget-client b/src/nuget-client
index c3240b16fc..dc0b55f597 160000
--- a/src/nuget-client
+++ b/src/nuget-client
@@ -1 +1 @@
-Subproject commit c3240b16fcf3276246fc8c610771d14ab94fdc02
+Subproject commit dc0b55f597c6224a13d64b984651b18700d3054a
diff --git a/src/roslyn b/src/roslyn
index 362ec0eec4..e595ee276d 160000
--- a/src/roslyn
+++ b/src/roslyn
@@ -1 +1 @@
-Subproject commit 362ec0eec4c1d61b122e271423840950fedf13ff
+Subproject commit e595ee276d14e14bfb3eb323fb57f2aa668bddea
diff --git a/src/standard b/src/standard
index bb2c2cb47d..e281c4fbdd 160000
--- a/src/standard
+++ b/src/standard
@@ -1 +1 @@
-Subproject commit bb2c2cb47d21d12477f5af6f68ab9d698b6e245f
+Subproject commit e281c4fbddf0ea61fcd34d8f238254557b61987b
diff --git a/src/vstest b/src/vstest
index ebef18a38a..df96f832f2 160000
--- a/src/vstest
+++ b/src/vstest
@@ -1 +1 @@
-Subproject commit ebef18a38a17e66b7c023ef3503cca353cbb72a3
+Subproject commit df96f832f28de9798bf3a1b2d6b7933439e00ae4
diff --git a/tools-local/prebuilt-baseline-offline.xml b/tools-local/prebuilt-baseline-offline.xml
index 3f1811644d..5095937215 100644
--- a/tools-local/prebuilt-baseline-offline.xml
+++ b/tools-local/prebuilt-baseline-offline.xml
@@ -126,8 +126,9 @@
     <Usage Id="Microsoft.Extensions.DependencyModel" Version="2.0.0" />
     <Usage Id="Microsoft.Extensions.DependencyModel" Version="2.1.0-preview2-26306-03" />
     <Usage Id="Microsoft.Internal.Dia" Version="14.0.0" />
-    <Usage Id="Microsoft.Internal.Intellitrace" Version="15.5.0-preview-20171207-01" />
-    <Usage Id="Microsoft.Internal.TestPlatform.Extensions" Version="15.6.0-preview-1270639" />
+    <Usage Id="Microsoft.Internal.Dia.Interop" Version="14.0.0" />
+    <Usage Id="Microsoft.Internal.Intellitrace" Version="15.8.0-preview-20180702-05" />
+    <Usage Id="Microsoft.Internal.TestPlatform.Extensions" Version="15.8.0-preview-1831095" />
     <Usage Id="Microsoft.Net.Compilers" Version="2.8.0-beta4-62824-10" />
     <Usage Id="Microsoft.Net.Compilers.netcore" Version="2.6.0-beta3-62316-02" />
     <Usage Id="Microsoft.Net.Compilers.Targets.NetCore" Version="0.1.5-dev" />
@@ -141,13 +142,11 @@
     <Usage Id="Microsoft.NETCore.App" Version="1.1.1" />
     <Usage Id="Microsoft.NETCore.App" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.App" Version="2.1.0-preview1-26116-04" />
-    <Usage Id="Microsoft.NETCore.App" Version="2.1.0-preview2-26406-04" />
     <Usage Id="Microsoft.NETCore.App" Version="2.1.0" />
     <Usage Id="Microsoft.NETCore.Compilers" Version="2.8.0-beta2-62719-08" />
     <Usage Id="Microsoft.NETCore.Compilers" Version="2.8.0-beta4-62824-10" />
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview1-26116-04" />
-    <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview2-26406-04" />
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0" />
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.2.0-preview-26820-02" />
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="3.0.0-preview1-26816-04" />
@@ -159,14 +158,12 @@
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.1.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview1-26116-04" />
-    <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview2-26406-04" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.2.0-preview-26820-02" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.0.1" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.1.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview1-26116-04" />
-    <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview2-26406-04" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.2.0-preview-26820-02" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="3.0.0-preview1-26816-04" />
@@ -179,7 +176,6 @@
     <Usage Id="Microsoft.NETCore.Platforms" Version="1.1.0" />
     <Usage Id="Microsoft.NETCore.Platforms" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0-preview1-26116-01" />
-    <Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0-preview2-26406-04" />
     <Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0" />
     <Usage Id="Microsoft.NETCore.Platforms" Version="2.1.1-servicing-26724-03" />
     <Usage Id="Microsoft.NETCore.Platforms" Version="2.2.0-preview2-26903-02" />
@@ -190,7 +186,6 @@
     <Usage Id="Microsoft.NETCore.Targets" Version="1.0.3" />
     <Usage Id="Microsoft.NETCore.Targets" Version="1.1.0" />
     <Usage Id="Microsoft.NETCore.Targets" Version="2.0.0" />
-    <Usage Id="Microsoft.NETCore.Targets" Version="2.1.0-preview2-26406-04" />
     <Usage Id="Microsoft.NETCore.Targets" Version="2.1.0" />
     <Usage Id="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
     <Usage Id="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-alpha-003" />
@@ -210,8 +205,9 @@
     <Usage Id="Microsoft.TestPlatform.TestHost" Version="15.8.0" />
     <Usage Id="Microsoft.VisualBasic" Version="10.0.1" />
     <Usage Id="Microsoft.VisualBasic" Version="10.1.0" />
-    <Usage Id="Microsoft.VisualStudio.QualityTools" Version="15.6.0-preview-1270639" />
-    <Usage Id="Microsoft.VisualStudio.QualityTools.DataCollectors" Version="15.6.0-preview-1270639" />
+    <Usage Id="Microsoft.VisualStudio.CUIT" Version="15.8.0-preview-1831095" />
+    <Usage Id="Microsoft.VisualStudio.QualityTools" Version="15.8.0-preview-1831095" />
+    <Usage Id="Microsoft.VisualStudio.QualityTools.DataCollectors" Version="15.8.0-preview-1831095" />
     <Usage Id="Microsoft.VisualStudio.RemoteControl" Version="14.0.262-masterA5CACE98" />
     <Usage Id="Microsoft.VisualStudio.Sdk.BuildTasks.14.0" Version="14.0.12-pre" />
     <Usage Id="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.15" />
@@ -234,48 +230,37 @@
     <Usage Id="Newtonsoft.Json" Version="6.0.4" />
     <Usage Id="Newtonsoft.Json" Version="10.0.3" />
     <Usage Id="NuGet.CommandLine" Version="3.4.3" />
-    <Usage Id="NuGet.Commands" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.Common" Version="4.0.0-rtm-2283" />
     <Usage Id="NuGet.Common" Version="4.3.0-preview2-4095" />
     <Usage Id="NuGet.Common" Version="4.3.0" />
     <Usage Id="NuGet.Common" Version="4.4.0" />
-    <Usage Id="NuGet.Common" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.Configuration" Version="4.3.0-preview2-4095" />
-    <Usage Id="NuGet.Configuration" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
-    <Usage Id="NuGet.Credentials" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.DependencyResolver.Core" Version="4.3.0-preview2-4095" />
-    <Usage Id="NuGet.DependencyResolver.Core" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.Frameworks" Version="4.0.0-rtm-2283" />
     <Usage Id="NuGet.Frameworks" Version="4.3.0-preview2-4095" />
     <Usage Id="NuGet.Frameworks" Version="4.3.0" />
     <Usage Id="NuGet.Frameworks" Version="4.4.0" />
-    <Usage Id="NuGet.Frameworks" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.LibraryModel" Version="4.3.0-preview2-4095" />
-    <Usage Id="NuGet.LibraryModel" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.Packaging" Version="4.0.0-rtm-2283" />
     <Usage Id="NuGet.Packaging" Version="4.3.0-preview2-4095" />
     <Usage Id="NuGet.Packaging" Version="4.3.0" />
     <Usage Id="NuGet.Packaging" Version="4.4.0" />
-    <Usage Id="NuGet.Packaging" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.Packaging.Core" Version="4.3.0-preview2-4095" />
     <Usage Id="NuGet.Packaging.Core" Version="4.3.0" />
     <Usage Id="NuGet.Packaging.Core" Version="4.4.0" />
-    <Usage Id="NuGet.Packaging.Core" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.ProjectModel" Version="4.3.0-preview2-4095" />
-    <Usage Id="NuGet.ProjectModel" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.Protocol" Version="4.3.0-preview2-4095" />
-    <Usage Id="NuGet.Protocol" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.Versioning" Version="4.0.0-rtm-2283" />
     <Usage Id="NuGet.Versioning" Version="4.3.0-preview2-4095" />
     <Usage Id="NuGet.Versioning" Version="4.3.0" />
     <Usage Id="NuGet.Versioning" Version="4.4.0" />
-    <Usage Id="NuGet.Versioning" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NUnit3.DotNetNew.Template" Version="1.5.1" />
     <Usage Id="OpenCover" Version="4.6.519" />
     <Usage Id="optimization.linux-x64.PGO.CoreCLR" Version="2.1.0-release-20180815-0105" />
     <Usage Id="optimization.PGO.CoreCLR" Version="2.1.0-release-20180815-0105" />
     <Usage Id="optimization.windows_nt-x64.PGO.CoreCLR" Version="2.1.0-release-20180815-0105" />
     <Usage Id="optimization.windows_nt-x86.PGO.CoreCLR" Version="2.1.0-release-20180815-0105" />
+    <Usage Id="Pdb2Pdb" Version="1.1.0-beta1-62316-01" />
     <Usage Id="ReportGenerator" Version="3.0.1" />
     <Usage Id="runtime.any.System.Collections" Version="4.0.11" Rid="any" />
     <Usage Id="runtime.any.System.Collections" Version="4.3.0" Rid="any" />
@@ -367,22 +352,22 @@
     <Usage Id="runtime.unix.System.Runtime.Extensions" Version="4.3.0" Rid="unix" />
     <Usage Id="runtime.win-arm64.runtime.native.System.Data.SqlClient.sni" Version="4.4.0" Rid="win-arm64" />
     <Usage Id="runtime.win-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="win-x64" />
-    <Usage Id="runtime.win-x64.Microsoft.NETCore.App" Version="2.1.0-preview2-26406-04" Rid="win-x64" />
+    <Usage Id="runtime.win-x64.Microsoft.NETCore.App" Version="2.1.0" Rid="win-x64" />
     <Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="win-x64" />
-    <Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview2-26406-04" Rid="win-x64" />
+    <Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.0" Rid="win-x64" />
     <Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="win-x64" />
-    <Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview2-26406-04" Rid="win-x64" />
+    <Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" Rid="win-x64" />
     <Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="win-x64" />
-    <Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview2-26406-04" Rid="win-x64" />
+    <Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" Rid="win-x64" />
     <Usage Id="runtime.win-x64.runtime.native.System.Data.SqlClient.sni" Version="4.4.0" Rid="win-x64" />
     <Usage Id="runtime.win-x86.Microsoft.NETCore.App" Version="2.0.0" Rid="win-x86" />
-    <Usage Id="runtime.win-x86.Microsoft.NETCore.App" Version="2.1.0-preview2-26406-04" Rid="win-x86" />
+    <Usage Id="runtime.win-x86.Microsoft.NETCore.App" Version="2.1.0" Rid="win-x86" />
     <Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="win-x86" />
-    <Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview2-26406-04" Rid="win-x86" />
+    <Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" Version="2.1.0" Rid="win-x86" />
     <Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="win-x86" />
-    <Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview2-26406-04" Rid="win-x86" />
+    <Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" Rid="win-x86" />
     <Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="win-x86" />
-    <Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview2-26406-04" Rid="win-x86" />
+    <Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" Rid="win-x86" />
     <Usage Id="runtime.win-x86.runtime.native.System.Data.SqlClient.sni" Version="4.4.0" Rid="win-x86" />
     <Usage Id="runtime.win.Microsoft.Win32.Primitives" Version="4.0.1" Rid="win" />
     <Usage Id="runtime.win.Microsoft.Win32.Primitives" Version="4.3.0" Rid="win" />
@@ -398,6 +383,12 @@
     <Usage Id="runtime.win.System.Net.Sockets" Version="4.3.0" Rid="win" />
     <Usage Id="runtime.win.System.Runtime.Extensions" Version="4.1.0" Rid="win" />
     <Usage Id="runtime.win.System.Runtime.Extensions" Version="4.3.0" Rid="win" />
+    <Usage Id="runtime.win7-x64.Microsoft.NETCore.DotNetHost" Version="1.0.1" Rid="win7-x64" />
+    <Usage Id="runtime.win7-x64.Microsoft.NETCore.DotNetHostPolicy" Version="1.0.5" Rid="win7-x64" />
+    <Usage Id="runtime.win7-x64.Microsoft.NETCore.DotNetHostResolver" Version="1.0.1" Rid="win7-x64" />
+    <Usage Id="runtime.win7-x64.Microsoft.NETCore.Jit" Version="1.0.7" Rid="win7-x64" />
+    <Usage Id="runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.7" Rid="win7-x64" />
+    <Usage Id="runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" Rid="win7-x64" />
     <Usage Id="runtime.win7-x64.runtime.native.System.IO.Compression" Version="4.0.1" Rid="win7-x64" />
     <Usage Id="runtime.win7-x64.runtime.native.System.IO.Compression" Version="4.3.0" Rid="win7-x64" />
     <Usage Id="runtime.win7-x86.Microsoft.NETCore.DotNetHost" Version="1.0.1" Rid="win7-x86" />
@@ -408,6 +399,7 @@
     <Usage Id="runtime.win7-x86.Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" Rid="win7-x86" />
     <Usage Id="runtime.win7-x86.runtime.native.System.IO.Compression" Version="4.3.0" Rid="win7-x86" />
     <Usage Id="runtime.win7.System.Private.Uri" Version="4.0.1" Rid="win7" />
+    <Usage Id="runtime.win7.System.Private.Uri" Version="4.0.2" Rid="win7" />
     <Usage Id="runtime.win7.System.Private.Uri" Version="4.3.0" Rid="win7" />
     <Usage Id="SourceLink.Create.CommandLine" Version="2.8.0" />
     <Usage Id="StyleCop.Analyzers" Version="1.0.1" />
@@ -415,6 +407,7 @@
     <Usage Id="System.AppContext" Version="4.3.0" />
     <Usage Id="System.Buffers" Version="4.0.0" />
     <Usage Id="System.Buffers" Version="4.3.0" />
+    <Usage Id="System.CodeDom" Version="4.4.0" />
     <Usage Id="System.Collections" Version="4.0.11-rc2-24027" />
     <Usage Id="System.Collections" Version="4.0.11" />
     <Usage Id="System.Collections" Version="4.3.0" />
@@ -424,6 +417,7 @@
     <Usage Id="System.Collections.Immutable" Version="1.3.0" />
     <Usage Id="System.Collections.Immutable" Version="1.3.1" />
     <Usage Id="System.Collections.Immutable" Version="1.4.0" />
+    <Usage Id="System.Collections.Immutable" Version="1.5.0" />
     <Usage Id="System.Collections.NonGeneric" Version="4.0.1" />
     <Usage Id="System.Collections.NonGeneric" Version="4.3.0" />
     <Usage Id="System.Collections.Specialized" Version="4.0.1" />
@@ -561,6 +555,7 @@
     <Usage Id="System.Reflection.Metadata" Version="1.4.1" />
     <Usage Id="System.Reflection.Metadata" Version="1.4.2" />
     <Usage Id="System.Reflection.Metadata" Version="1.5.0" />
+    <Usage Id="System.Reflection.Metadata" Version="1.6.0" />
     <Usage Id="System.Reflection.Primitives" Version="4.0.1-rc2-24027" />
     <Usage Id="System.Reflection.Primitives" Version="4.0.1" />
     <Usage Id="System.Reflection.Primitives" Version="4.3.0" />
@@ -639,6 +634,7 @@
     <Usage Id="System.Threading.Tasks" Version="4.0.11-rc2-24027" />
     <Usage Id="System.Threading.Tasks" Version="4.0.11" />
     <Usage Id="System.Threading.Tasks" Version="4.3.0" />
+    <Usage Id="System.Threading.Tasks.Dataflow" Version="4.5.24" />
     <Usage Id="System.Threading.Tasks.Dataflow" Version="4.6.0" />
     <Usage Id="System.Threading.Tasks.Dataflow" Version="4.7.0" />
     <Usage Id="System.Threading.Tasks.Extensions" Version="4.0.0" />
diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml
index ae3035db1a..c3419ff01d 100644
--- a/tools-local/prebuilt-baseline-online.xml
+++ b/tools-local/prebuilt-baseline-online.xml
@@ -117,8 +117,9 @@
     <Usage Id="Microsoft.Extensions.DependencyModel" Version="2.0.0" />
     <Usage Id="Microsoft.Extensions.DependencyModel" Version="2.1.0-preview2-26306-03" />
     <Usage Id="Microsoft.Internal.Dia" Version="14.0.0" />
-    <Usage Id="Microsoft.Internal.Intellitrace" Version="15.5.0-preview-20171207-01" />
-    <Usage Id="Microsoft.Internal.TestPlatform.Extensions" Version="15.6.0-preview-1270639" />
+    <Usage Id="Microsoft.Internal.Dia.Interop" Version="14.0.0" />
+    <Usage Id="Microsoft.Internal.Intellitrace" Version="15.8.0-preview-20180702-05" />
+    <Usage Id="Microsoft.Internal.TestPlatform.Extensions" Version="15.8.0-preview-1831095" />
     <Usage Id="Microsoft.Net.Compilers" Version="2.8.0-beta4-62824-10" />
     <Usage Id="Microsoft.Net.Compilers.netcore" Version="2.6.0-beta3-62316-02" />
     <Usage Id="Microsoft.Net.Compilers.Targets.NetCore" Version="0.1.5-dev" />
@@ -132,14 +133,12 @@
     <Usage Id="Microsoft.NETCore.App" Version="1.1.1" />
     <Usage Id="Microsoft.NETCore.App" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.App" Version="2.1.0-preview1-26116-04" />
-    <Usage Id="Microsoft.NETCore.App" Version="2.1.0-preview2-26406-04" />
     <Usage Id="Microsoft.NETCore.App" Version="2.1.0" />
     <Usage Id="Microsoft.NETCore.App" Version="2.1.1" />
     <Usage Id="Microsoft.NETCore.Compilers" Version="2.8.0-beta2-62719-08" />
     <Usage Id="Microsoft.NETCore.Compilers" Version="2.8.0-beta4-62824-10" />
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview1-26116-04" />
-    <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview2-26406-04" />
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0" />
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.2.0-preview-26820-02" />
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="3.0.0-preview1-26816-04" />
@@ -151,14 +150,12 @@
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.1.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview1-26116-04" />
-    <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview2-26406-04" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.2.0-preview-26820-02" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.0.1" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.1.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview1-26116-04" />
-    <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview2-26406-04" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.2.0-preview-26820-02" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="3.0.0-preview1-26816-04" />
@@ -171,7 +168,6 @@
     <Usage Id="Microsoft.NETCore.Platforms" Version="1.1.0" />
     <Usage Id="Microsoft.NETCore.Platforms" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0-preview1-26116-01" />
-    <Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0-preview2-26406-04" />
     <Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0" />
     <Usage Id="Microsoft.NETCore.Platforms" Version="2.1.1-servicing-26724-03" />
     <Usage Id="Microsoft.NETCore.Platforms" Version="2.2.0-preview2-26903-02" />
@@ -182,7 +178,6 @@
     <Usage Id="Microsoft.NETCore.Targets" Version="1.0.3" />
     <Usage Id="Microsoft.NETCore.Targets" Version="1.1.0" />
     <Usage Id="Microsoft.NETCore.Targets" Version="2.0.0" />
-    <Usage Id="Microsoft.NETCore.Targets" Version="2.1.0-preview2-26406-04" />
     <Usage Id="Microsoft.NETCore.Targets" Version="2.1.0" />
     <Usage Id="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
     <Usage Id="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-alpha-003" />
@@ -202,8 +197,9 @@
     <Usage Id="Microsoft.TestPlatform.TestHost" Version="15.8.0" />
     <Usage Id="Microsoft.VisualBasic" Version="10.0.1" />
     <Usage Id="Microsoft.VisualBasic" Version="10.1.0" />
-    <Usage Id="Microsoft.VisualStudio.QualityTools" Version="15.6.0-preview-1270639" />
-    <Usage Id="Microsoft.VisualStudio.QualityTools.DataCollectors" Version="15.6.0-preview-1270639" />
+    <Usage Id="Microsoft.VisualStudio.CUIT" Version="15.8.0-preview-1831095" />
+    <Usage Id="Microsoft.VisualStudio.QualityTools" Version="15.8.0-preview-1831095" />
+    <Usage Id="Microsoft.VisualStudio.QualityTools.DataCollectors" Version="15.8.0-preview-1831095" />
     <Usage Id="Microsoft.VisualStudio.RemoteControl" Version="14.0.262-masterA5CACE98" />
     <Usage Id="Microsoft.VisualStudio.Sdk.BuildTasks.14.0" Version="14.0.12-pre" />
     <Usage Id="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.15" />
@@ -226,48 +222,37 @@
     <Usage Id="Newtonsoft.Json" Version="6.0.4" />
     <Usage Id="Newtonsoft.Json" Version="10.0.3" />
     <Usage Id="NuGet.CommandLine" Version="3.4.3" />
-    <Usage Id="NuGet.Commands" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.Common" Version="4.0.0-rtm-2283" />
     <Usage Id="NuGet.Common" Version="4.3.0-preview2-4095" />
     <Usage Id="NuGet.Common" Version="4.3.0" />
     <Usage Id="NuGet.Common" Version="4.4.0" />
-    <Usage Id="NuGet.Common" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.Configuration" Version="4.3.0-preview2-4095" />
-    <Usage Id="NuGet.Configuration" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
-    <Usage Id="NuGet.Credentials" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.DependencyResolver.Core" Version="4.3.0-preview2-4095" />
-    <Usage Id="NuGet.DependencyResolver.Core" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.Frameworks" Version="4.0.0-rtm-2283" />
     <Usage Id="NuGet.Frameworks" Version="4.3.0-preview2-4095" />
     <Usage Id="NuGet.Frameworks" Version="4.3.0" />
     <Usage Id="NuGet.Frameworks" Version="4.4.0" />
-    <Usage Id="NuGet.Frameworks" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.LibraryModel" Version="4.3.0-preview2-4095" />
-    <Usage Id="NuGet.LibraryModel" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.Packaging" Version="4.0.0-rtm-2283" />
     <Usage Id="NuGet.Packaging" Version="4.3.0-preview2-4095" />
     <Usage Id="NuGet.Packaging" Version="4.3.0" />
     <Usage Id="NuGet.Packaging" Version="4.4.0" />
-    <Usage Id="NuGet.Packaging" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.Packaging.Core" Version="4.3.0-preview2-4095" />
     <Usage Id="NuGet.Packaging.Core" Version="4.3.0" />
     <Usage Id="NuGet.Packaging.Core" Version="4.4.0" />
-    <Usage Id="NuGet.Packaging.Core" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.ProjectModel" Version="4.3.0-preview2-4095" />
-    <Usage Id="NuGet.ProjectModel" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.Protocol" Version="4.3.0-preview2-4095" />
-    <Usage Id="NuGet.Protocol" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NuGet.Versioning" Version="4.0.0-rtm-2283" />
     <Usage Id="NuGet.Versioning" Version="4.3.0-preview2-4095" />
     <Usage Id="NuGet.Versioning" Version="4.3.0" />
     <Usage Id="NuGet.Versioning" Version="4.4.0" />
-    <Usage Id="NuGet.Versioning" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
     <Usage Id="NUnit3.DotNetNew.Template" Version="1.5.1" />
     <Usage Id="OpenCover" Version="4.6.519" />
     <Usage Id="optimization.linux-x64.PGO.CoreCLR" Version="2.1.0-release-20180815-0105" />
     <Usage Id="optimization.PGO.CoreCLR" Version="2.1.0-release-20180815-0105" />
     <Usage Id="optimization.windows_nt-x64.PGO.CoreCLR" Version="2.1.0-release-20180815-0105" />
     <Usage Id="optimization.windows_nt-x86.PGO.CoreCLR" Version="2.1.0-release-20180815-0105" />
+    <Usage Id="Pdb2Pdb" Version="1.1.0-beta1-62316-01" />
     <Usage Id="ReportGenerator" Version="3.0.1" />
     <Usage Id="RoslynTools.RepoToolset" Version="1.0.0-beta2-62805-03" />
     <Usage Id="runtime.any.System.Collections" Version="4.0.11" Rid="any" />
@@ -365,22 +350,22 @@
     <Usage Id="runtime.unix.System.Runtime.Extensions" Version="4.3.0" Rid="unix" />
     <Usage Id="runtime.win-arm64.runtime.native.System.Data.SqlClient.sni" Version="4.4.0" Rid="win-arm64" />
     <Usage Id="runtime.win-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="win-x64" />
-    <Usage Id="runtime.win-x64.Microsoft.NETCore.App" Version="2.1.0-preview2-26406-04" Rid="win-x64" />
+    <Usage Id="runtime.win-x64.Microsoft.NETCore.App" Version="2.1.0" Rid="win-x64" />
     <Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="win-x64" />
-    <Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview2-26406-04" Rid="win-x64" />
+    <Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.0" Rid="win-x64" />
     <Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="win-x64" />
-    <Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview2-26406-04" Rid="win-x64" />
+    <Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" Rid="win-x64" />
     <Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="win-x64" />
-    <Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview2-26406-04" Rid="win-x64" />
+    <Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" Rid="win-x64" />
     <Usage Id="runtime.win-x64.runtime.native.System.Data.SqlClient.sni" Version="4.4.0" Rid="win-x64" />
     <Usage Id="runtime.win-x86.Microsoft.NETCore.App" Version="2.0.0" Rid="win-x86" />
-    <Usage Id="runtime.win-x86.Microsoft.NETCore.App" Version="2.1.0-preview2-26406-04" Rid="win-x86" />
+    <Usage Id="runtime.win-x86.Microsoft.NETCore.App" Version="2.1.0" Rid="win-x86" />
     <Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="win-x86" />
-    <Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview2-26406-04" Rid="win-x86" />
+    <Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" Version="2.1.0" Rid="win-x86" />
     <Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="win-x86" />
-    <Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview2-26406-04" Rid="win-x86" />
+    <Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" Rid="win-x86" />
     <Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="win-x86" />
-    <Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview2-26406-04" Rid="win-x86" />
+    <Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" Rid="win-x86" />
     <Usage Id="runtime.win-x86.runtime.native.System.Data.SqlClient.sni" Version="4.4.0" Rid="win-x86" />
     <Usage Id="runtime.win.Microsoft.Win32.Primitives" Version="4.0.1" Rid="win" />
     <Usage Id="runtime.win.Microsoft.Win32.Primitives" Version="4.3.0" Rid="win" />
@@ -396,6 +381,12 @@
     <Usage Id="runtime.win.System.Net.Sockets" Version="4.3.0" Rid="win" />
     <Usage Id="runtime.win.System.Runtime.Extensions" Version="4.1.0" Rid="win" />
     <Usage Id="runtime.win.System.Runtime.Extensions" Version="4.3.0" Rid="win" />
+    <Usage Id="runtime.win7-x64.Microsoft.NETCore.DotNetHost" Version="1.0.1" Rid="win7-x64" />
+    <Usage Id="runtime.win7-x64.Microsoft.NETCore.DotNetHostPolicy" Version="1.0.5" Rid="win7-x64" />
+    <Usage Id="runtime.win7-x64.Microsoft.NETCore.DotNetHostResolver" Version="1.0.1" Rid="win7-x64" />
+    <Usage Id="runtime.win7-x64.Microsoft.NETCore.Jit" Version="1.0.7" Rid="win7-x64" />
+    <Usage Id="runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.7" Rid="win7-x64" />
+    <Usage Id="runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" Rid="win7-x64" />
     <Usage Id="runtime.win7-x64.runtime.native.System.IO.Compression" Version="4.0.1" Rid="win7-x64" />
     <Usage Id="runtime.win7-x64.runtime.native.System.IO.Compression" Version="4.3.0" Rid="win7-x64" />
     <Usage Id="runtime.win7-x86.Microsoft.NETCore.DotNetHost" Version="1.0.1" Rid="win7-x86" />
@@ -406,6 +397,7 @@
     <Usage Id="runtime.win7-x86.Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" Rid="win7-x86" />
     <Usage Id="runtime.win7-x86.runtime.native.System.IO.Compression" Version="4.3.0" Rid="win7-x86" />
     <Usage Id="runtime.win7.System.Private.Uri" Version="4.0.1" Rid="win7" />
+    <Usage Id="runtime.win7.System.Private.Uri" Version="4.0.2" Rid="win7" />
     <Usage Id="runtime.win7.System.Private.Uri" Version="4.3.0" Rid="win7" />
     <Usage Id="SourceLink.Create.CommandLine" Version="2.8.0" />
     <Usage Id="StyleCop.Analyzers" Version="1.0.1" />
@@ -413,6 +405,7 @@
     <Usage Id="System.AppContext" Version="4.3.0" />
     <Usage Id="System.Buffers" Version="4.0.0" />
     <Usage Id="System.Buffers" Version="4.3.0" />
+    <Usage Id="System.CodeDom" Version="4.4.0" />
     <Usage Id="System.Collections" Version="4.0.11-rc2-24027" />
     <Usage Id="System.Collections" Version="4.0.11" />
     <Usage Id="System.Collections" Version="4.3.0" />
@@ -422,6 +415,7 @@
     <Usage Id="System.Collections.Immutable" Version="1.3.0" />
     <Usage Id="System.Collections.Immutable" Version="1.3.1" />
     <Usage Id="System.Collections.Immutable" Version="1.4.0" />
+    <Usage Id="System.Collections.Immutable" Version="1.5.0" />
     <Usage Id="System.Collections.NonGeneric" Version="4.0.1" />
     <Usage Id="System.Collections.NonGeneric" Version="4.3.0" />
     <Usage Id="System.Collections.Specialized" Version="4.0.1" />
@@ -559,6 +553,7 @@
     <Usage Id="System.Reflection.Metadata" Version="1.4.1" />
     <Usage Id="System.Reflection.Metadata" Version="1.4.2" />
     <Usage Id="System.Reflection.Metadata" Version="1.5.0" />
+    <Usage Id="System.Reflection.Metadata" Version="1.6.0" />
     <Usage Id="System.Reflection.Primitives" Version="4.0.1-rc2-24027" />
     <Usage Id="System.Reflection.Primitives" Version="4.0.1" />
     <Usage Id="System.Reflection.Primitives" Version="4.3.0" />
@@ -637,6 +632,7 @@
     <Usage Id="System.Threading.Tasks" Version="4.0.11-rc2-24027" />
     <Usage Id="System.Threading.Tasks" Version="4.0.11" />
     <Usage Id="System.Threading.Tasks" Version="4.3.0" />
+    <Usage Id="System.Threading.Tasks.Dataflow" Version="4.5.24" />
     <Usage Id="System.Threading.Tasks.Dataflow" Version="4.6.0" />
     <Usage Id="System.Threading.Tasks.Dataflow" Version="4.7.0" />
     <Usage Id="System.Threading.Tasks.Extensions" Version="4.0.0" />