From fd112f45a04a599362e3390ffa4bc7a294648c73 Mon Sep 17 00:00:00 2001
From: dotnet-bot <dotnet-bot@microsoft.com>
Date: Wed, 26 Apr 2017 03:16:03 +0000
Subject: [PATCH 1/3] Update CoreSetup to preview1-002088

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

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index b2a603cdc..a7d916df4 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <CLI_SharedFrameworkVersion>2.0.0-preview1-002061-00</CLI_SharedFrameworkVersion>
+    <CLI_SharedFrameworkVersion>2.0.0-preview1-002088-00</CLI_SharedFrameworkVersion>
     <CLI_MSBuild_Version>15.2.0-preview-000093-02</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
     <CLI_NETSDK_Version>2.0.0-alpha-20170420-1</CLI_NETSDK_Version>
@@ -14,8 +14,8 @@
     <TemplateEngineVersion>1.0.0-beta2-20170421-198</TemplateEngineVersion>
     <TemplateEngineTemplateVersion>1.0.0-beta2-20170421-198</TemplateEngineTemplateVersion>
     <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170421-198</TemplateEngineTemplate2_0Version>
-    <PlatformAbstractionsVersion>2.0.0-preview1-001960</PlatformAbstractionsVersion>
-    <DependencyModelVersion>2.0.0-preview1-002022</DependencyModelVersion>
+    <PlatformAbstractionsVersion>2.0.0-preview1-002088</PlatformAbstractionsVersion>
+    <DependencyModelVersion>2.0.0-preview1-002088</DependencyModelVersion>
     <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
 
   </PropertyGroup>

From de139a3bf895e5180fe72de666e88c6814bde5f4 Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Tue, 25 Apr 2017 22:29:50 -0500
Subject: [PATCH 2/3] Update core-setup channel to release/2.0.0

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

diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
index 0821f4f2c..6d3430d39 100644
--- a/build/BundledRuntimes.props
+++ b/build/BundledRuntimes.props
@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <CoreSetupChannel>master</CoreSetupChannel>
+    <CoreSetupChannel>release/2.0.0</CoreSetupChannel>
     <CoreSetupBlobRootUrl Condition="'$(CoreSetupBlobRootUrl)' == ''">https://dotnetcli.azureedge.net/dotnet/</CoreSetupBlobRootUrl>
     <CoreSetupBlobRootUrlWithChannel>$(CoreSetupBlobRootUrl)$(CoreSetupChannel)</CoreSetupBlobRootUrlWithChannel>
     <SharedFrameworkArchiveBlobRootUrl>$(CoreSetupBlobRootUrlWithChannel)/Binaries/$(SharedFrameworkVersion)</SharedFrameworkArchiveBlobRootUrl>

From 126c42050d588d0d038a175ab762d06b25c3ff9f Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Fri, 21 Apr 2017 21:54:35 -0500
Subject: [PATCH 3/3] Fixing crossgen to use the correct RID for OSX and Win
 now that only portable packages are being produced.

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

diff --git a/build/Stage0.props b/build/Stage0.props
index 8cd6892f0..b337b34b3 100644
--- a/build/Stage0.props
+++ b/build/Stage0.props
@@ -5,8 +5,8 @@
       <DotnetStage0>$(Stage0Directory)/dotnet$(ExeExtension)</DotnetStage0>
       <IsDesktopAvailable>False</IsDesktopAvailable>
       <IsDesktopAvailable Condition=" '$(OSName)' == 'win' ">True</IsDesktopAvailable>
-      <CoreCLRRid Condition=" '$(OSName)' == 'win' ">win7-$(Architecture)</CoreCLRRid>
-      <CoreCLRRid Condition=" '$(OSName)' == 'osx' ">osx.10.12-x64</CoreCLRRid>
+      <CoreCLRRid Condition=" '$(OSName)' == 'win' ">win-$(Architecture)</CoreCLRRid>
+      <CoreCLRRid Condition=" '$(OSName)' == 'osx' ">osx-x64</CoreCLRRid>
       <CoreCLRRid Condition=" '$(CoreCLRRid)' == '' ">linux-x64</CoreCLRRid>
     </PropertyGroup>
 </Project>