From d95f5990284349ec353746fe69ff9ba1165dba0b Mon Sep 17 00:00:00 2001
From: Satya Madala <samadala@microsoft.com>
Date: Thu, 16 Mar 2017 21:58:49 +0530
Subject: [PATCH 1/4] Remove unavailable netcore10 assemblies

---
 src/redist/redist.csproj | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 95aa96d4a..c62ab4b37 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -153,18 +153,6 @@
   <Target Name="CrossgenPublishDir"
           Condition=" '$(DISABLE_CROSSGEN)' == '' "
           AfterTargets="PublishMSBuildExtensions">
-    <ItemGroup>
-      <NETCore10Assemblies Include="$(PublishDir)/System.ComponentModel.Primitives.dll;
-                                    $(PublishDir)/System.Collections.Specialized.dll;
-                                    $(PublishDir)/System.Collections.NonGeneric.dll;
-                                    $(PublishDir)/System.Private.DataContractSerialization.dll" />
-    </ItemGroup>
-
-    <!-- Move these "1.0" assemblies that TestPlatform lays down out of the way so crossgen doesn't pick them up.
-          We need https://github.com/dotnet/cli/issues/5464 fixed, so test platform is in a separate directory -->
-    <Move SourceFiles="@(NETCore10Assemblies)"
-          DestinationFiles="@(NETCore10Assemblies->'$(PublishDir)/%(Filename)%(Extension).bak')" />
-
     <ItemGroup>
       <!-- Removing Full CLR built TestHost assemblies from getting Crossgen as it is throwing error -->
       <SdkFiles Include="$(PublishDir)/**/*" Exclude="$(PublishDir)/TestHost*/**/*;$(PublishDir)/Sdks/**/*" />

From d42602e3774149136d6fb2866225764f88ad0db6 Mon Sep 17 00:00:00 2001
From: Satya Madala <samadala@microsoft.com>
Date: Thu, 16 Mar 2017 23:19:12 +0530
Subject: [PATCH 2/4] add Testplatform netcore2.0 targetted and vstest myget
 feed

---
 NuGet.Config                   | 1 +
 build/DependencyVersions.props | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/NuGet.Config b/NuGet.Config
index 556ee5919..50974735c 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -10,5 +10,6 @@
     <add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="AspNetCurrent" value="https://dotnet.myget.org/F/aspnet-feb2017-patch/api/v3/index.json" /> 
+    <add key="vstest" value="https://dotnet.myget.org/F/vstest/auth/967ad631-d24c-4c0e-bece-922de3064956/api/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 995fc7103..8b8040fdd 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -7,7 +7,7 @@
     <CLI_NETSDK_Version>1.1.0-alpha-20170306-2</CLI_NETSDK_Version>
     <CLI_NuGet_Version>4.3.0-beta1-2342</CLI_NuGet_Version>
     <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
-    <CLI_TestPlatform_Version>15.0.0</CLI_TestPlatform_Version>
+    <CLI_TestPlatform_Version>15.1.0-preview-20170316-05</CLI_TestPlatform_Version>
     <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
     <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
     <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>

From 21ae26afb7c4fabf2a4b4c51a108f29fdf98eab4 Mon Sep 17 00:00:00 2001
From: Satya Madala <samadala@microsoft.com>
Date: Fri, 17 Mar 2017 00:14:45 +0530
Subject: [PATCH 3/4] Update vstest public feed

---
 NuGet.Config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NuGet.Config b/NuGet.Config
index 50974735c..f14a56c99 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -10,6 +10,6 @@
     <add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="AspNetCurrent" value="https://dotnet.myget.org/F/aspnet-feb2017-patch/api/v3/index.json" /> 
-    <add key="vstest" value="https://dotnet.myget.org/F/vstest/auth/967ad631-d24c-4c0e-bece-922de3064956/api/v3/index.json" />
+    <add key="vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
   </packageSources>
 </configuration>

From 1f886632f2ffdec5272a0b873ad178d30bdcadcc Mon Sep 17 00:00:00 2001
From: Satya Madala <samadala@microsoft.com>
Date: Fri, 17 Mar 2017 00:20:40 +0530
Subject: [PATCH 4/4] remove NetCore10Assemblies renaming back

---
 src/redist/redist.csproj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index c62ab4b37..7c7ef6569 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -183,10 +183,6 @@
               PlatformAssemblyPaths="@(PlatformAssemblies);
                                      @(PublishDirSubDirectories);
                                      $(SharedFrameworkNameVersionPath)" />
-
-    <!-- Move the "1.0" assemblies back -->
-    <Move SourceFiles="@(NETCore10Assemblies->'$(PublishDir)/%(Filename)%(Extension).bak')"
-          DestinationFiles="@(NETCore10Assemblies)" />
   </Target>
 
   <Target Name="RemoveVbc"