From 544b07ab0c446dafca2526cc2f6bcc9cccf90408 Mon Sep 17 00:00:00 2001
From: dotnet-bot <dotnet-bot@microsoft.com>
Date: Mon, 22 May 2017 06:26:05 -0700
Subject: [PATCH 1/3] Update CoreClr, CoreFx, CoreSetup, External, ProjectNTfs,
 ProjectNTfsTestILC, Standard to preview1-25321-03, preview1-25322-02,
 preview1-25321-02, beta-25322-00, beta-25322-00, beta-25322-00,
 preview1-25322-01, respectively

---
 dependencies.props                  | 30 ++++++++++++++---------------
 external/test-runtime/optional.json |  6 +++---
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/dependencies.props b/dependencies.props
index 0ff735880994..cb6d6c529a79 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -9,27 +9,27 @@
        These ref versions are pulled from https://github.com/dotnet/versions.
   -->
   <PropertyGroup>
-    <CoreFxCurrentRef>3974bbe4abba2327b3b4f063331bc1b760870211</CoreFxCurrentRef>
-    <CoreClrCurrentRef>fcd99ed86a703a16698fcd0027707739c8ef3501</CoreClrCurrentRef>
-    <CoreSetupCurrentRef>88ad93f43fcab8e6fcf4ef5713b515ff634c1a5c</CoreSetupCurrentRef>
-    <ExternalCurrentRef>9be29f5804c4798d8b51bd3fed99ea076041aeb2</ExternalCurrentRef>
-    <ProjectNTfsCurrentRef>3974bbe4abba2327b3b4f063331bc1b760870211</ProjectNTfsCurrentRef>
-    <ProjectNTfsTestILCCurrentRef>3974bbe4abba2327b3b4f063331bc1b760870211</ProjectNTfsTestILCCurrentRef>
+    <CoreFxCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</CoreFxCurrentRef>
+    <CoreClrCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</CoreClrCurrentRef>
+    <CoreSetupCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</CoreSetupCurrentRef>
+    <ExternalCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</ExternalCurrentRef>
+    <ProjectNTfsCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</ProjectNTfsCurrentRef>
+    <ProjectNTfsTestILCCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</ProjectNTfsTestILCCurrentRef>
     <SniCurrentRef>97059fa979a3c8fb8b9fba127c526f15e48c9dde</SniCurrentRef>
-    <StandardCurrentRef>a10b32352e820a22d976e9df11b0e737443045e2</StandardCurrentRef>
+    <StandardCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</StandardCurrentRef>
   </PropertyGroup>
 
   <!-- Auto-upgraded properties for each build info dependency. -->
   <PropertyGroup>
-    <CoreFxExpectedPrerelease>preview2-25319-04</CoreFxExpectedPrerelease>
-    <CoreClrExpectedPrerelease>preview2-25316-03</CoreClrExpectedPrerelease>
-    <ExternalExpectedPrerelease>beta-25307-00</ExternalExpectedPrerelease>
-    <ProjectNTfsExpectedPrerelease>beta-25319-01</ProjectNTfsExpectedPrerelease>
-    <ProjectNTfsTestILCExpectedPrerelease>beta-25319-01</ProjectNTfsTestILCExpectedPrerelease>
-    <ProjectNTfsTestILCPackageVersion>1.0.0-beta-25319-01</ProjectNTfsTestILCPackageVersion>
-    <NETStandardPackageVersion>2.1.0-preview1-25319-01</NETStandardPackageVersion>
+    <CoreFxExpectedPrerelease>preview1-25322-02</CoreFxExpectedPrerelease>
+    <CoreClrExpectedPrerelease>preview1-25321-03</CoreClrExpectedPrerelease>
+    <ExternalExpectedPrerelease>beta-25322-00</ExternalExpectedPrerelease>
+    <ProjectNTfsExpectedPrerelease>beta-25322-00</ProjectNTfsExpectedPrerelease>
+    <ProjectNTfsTestILCExpectedPrerelease>beta-25322-00</ProjectNTfsTestILCExpectedPrerelease>
+    <ProjectNTfsTestILCPackageVersion>1.0.0-beta-25322-00</ProjectNTfsTestILCPackageVersion>
+    <NETStandardPackageVersion>2.1.0-preview1-25322-01</NETStandardPackageVersion>
     <NETStandardPackageId>NETStandard.Library</NETStandardPackageId>
-    <MicrosoftNETCoreAppPackageVersion>2.0.0-preview2-25319-02</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>2.1.0-preview1-25321-02</MicrosoftNETCoreAppPackageVersion>
     <!-- Use the SNI runtime package -->
     <SniPackageVersion>4.4.0-preview2-25312-01</SniPackageVersion>
   </PropertyGroup>
diff --git a/external/test-runtime/optional.json b/external/test-runtime/optional.json
index 6fbadcda490a..9c04eca2a283 100644
--- a/external/test-runtime/optional.json
+++ b/external/test-runtime/optional.json
@@ -4,9 +4,9 @@
       "dependencies": {
         "Microsoft.DotNet.IBCMerge": "4.6.0-alpha-00001",
         "Microsoft.DotNet.UAP.TestTools": "1.0.2",
-        "TestILC.amd64ret": "1.0.0-beta-25319-01",
-        "TestILC.armret": "1.0.0-beta-25319-01",
-        "TestILC.x86ret": "1.0.0-beta-25319-01"
+        "TestILC.amd64ret": "1.0.0-beta-25322-00",
+        "TestILC.armret": "1.0.0-beta-25322-00",
+        "TestILC.x86ret": "1.0.0-beta-25322-00"
       }
     }
   }

From 444ea73cdd596059f2ef5ed4ba4a46ae6819d95e Mon Sep 17 00:00:00 2001
From: Wes Haggard <Wes.Haggard@microsoft.com>
Date: Mon, 22 May 2017 14:28:33 -0700
Subject: [PATCH 2/3] Update properties used for auto-package update

Instead of only looking at the prerelease we also now get the full
package version during our update to avoid issues when major/minor/patch
version change
---
 Packaging.props                  |  1 -
 dependencies.props               | 12 +++++++++---
 external/ilasm/ilasm.depproj     |  6 +++---
 external/runtime/runtime.depproj |  8 ++++----
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Packaging.props b/Packaging.props
index bf5a5f554a0b..9b9e5d20a793 100644
--- a/Packaging.props
+++ b/Packaging.props
@@ -26,7 +26,6 @@
 
     <!-- We're currently not building a "live" baseline, instead we're using .NETCore 1.0 RTM stable versions as the baseline -->
     <SkipBaseLineCheck>true</SkipBaseLineCheck>
-    <PlatformPackageVersion Condition="'$(PlatformPackageVersion)' == ''">2.1.0</PlatformPackageVersion>
 
     <!-- by default all packages will use the same version which revs with respect to product version -->
     <PackageVersion Condition="'$(PackageVersion)' == ''">4.5.0</PackageVersion>
diff --git a/dependencies.props b/dependencies.props
index cb6d6c529a79..8df8ee9d6dde 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -21,8 +21,9 @@
 
   <!-- Auto-upgraded properties for each build info dependency. -->
   <PropertyGroup>
+    <PlatformPackageVersion>2.1.0-preview1-25322-02</PlatformPackageVersion>
     <CoreFxExpectedPrerelease>preview1-25322-02</CoreFxExpectedPrerelease>
-    <CoreClrExpectedPrerelease>preview1-25321-03</CoreClrExpectedPrerelease>
+    <CoreClrPackageVersion>2.1.0-preview1-25321-03</CoreClrPackageVersion>
     <ExternalExpectedPrerelease>beta-25322-00</ExternalExpectedPrerelease>
     <ProjectNTfsExpectedPrerelease>beta-25322-00</ProjectNTfsExpectedPrerelease>
     <ProjectNTfsTestILCExpectedPrerelease>beta-25322-00</ProjectNTfsTestILCExpectedPrerelease>
@@ -92,10 +93,15 @@
       <ElementName>CoreFxExpectedPrerelease</ElementName>
       <BuildInfoName>CoreFx</BuildInfoName>
     </XmlUpdateStep>
+    <XmlUpdateStep Include="CoreFx">
+      <Path>$(MSBuildThisFileFullPath)</Path>
+      <ElementName>PlatformPackageVersion</ElementName>
+      <PackageId>Microsoft.NETCore.Platforms</PackageId>
+    </XmlUpdateStep>
     <XmlUpdateStep Include="CoreClr">
       <Path>$(MSBuildThisFileFullPath)</Path>
-      <ElementName>CoreClrExpectedPrerelease</ElementName>
-      <BuildInfoName>CoreClr</BuildInfoName>
+      <ElementName>CoreClrPackageVersion</ElementName>
+      <PackageId>Microsoft.NETCore.Runtime.CoreCLR</PackageId>
     </XmlUpdateStep>
     <XmlUpdateStep Include="External">
       <Path>$(MSBuildThisFileFullPath)</Path>
diff --git a/external/ilasm/ilasm.depproj b/external/ilasm/ilasm.depproj
index b6a263fa8e2c..fb3e77537290 100644
--- a/external/ilasm/ilasm.depproj
+++ b/external/ilasm/ilasm.depproj
@@ -12,13 +12,13 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.Platforms">
-      <Version>2.0.0-$(CoreFxExpectedPrerelease)</Version>
+      <Version>$(PlatformPackageVersion)</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR">
-      <Version>2.0.0-$(CoreClrExpectedPrerelease)</Version>
+      <Version>$(CoreClrPackageVersion)</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.ILAsm">
-      <Version>2.0.0-$(CoreClrExpectedPrerelease)</Version>
+      <Version>$(CoreClrPackageVersion)</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/external/runtime/runtime.depproj b/external/runtime/runtime.depproj
index d277038506ce..81fbe78296fa 100644
--- a/external/runtime/runtime.depproj
+++ b/external/runtime/runtime.depproj
@@ -25,16 +25,16 @@
 
   <ItemGroup Condition="'$(TargetGroup)'!='uapaot'">
     <PackageReference Include="Microsoft.NETCore.Platforms">
-      <Version>2.0.0-$(CoreFxExpectedPrerelease)</Version>
+      <Version>$(PlatformPackageVersion)</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR">
-      <Version>2.0.0-$(CoreClrExpectedPrerelease)</Version>
+      <Version>$(CoreClrPackageVersion)</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.TestHost">
-      <Version>2.0.0-$(CoreClrExpectedPrerelease)</Version>
+      <Version>$(CoreClrPackageVersion)</Version>
     </PackageReference>
     <PackageReference Include="runtime.native.System.Data.SqlClient.sni">
-      <Version>4.4.0-$(CoreFxExpectedPrerelease)</Version>
+      <Version>$(PackageVersion)-$(CoreFxExpectedPrerelease)</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.DotNetHost">
       <Version>1.2.0-beta-001259-00</Version>

From 93016f18d54eeef1938c6bd154bdf029b06e76a3 Mon Sep 17 00:00:00 2001
From: Wes Haggard <Wes.Haggard@microsoft.com>
Date: Wed, 24 May 2017 09:07:21 -0700
Subject: [PATCH 3/3] Undo the update to CoreCLR version for now to unblock
 other updates

---
 dependencies.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dependencies.props b/dependencies.props
index 8df8ee9d6dde..3cd1d161d639 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -10,7 +10,7 @@
   -->
   <PropertyGroup>
     <CoreFxCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</CoreFxCurrentRef>
-    <CoreClrCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</CoreClrCurrentRef>
+    <CoreClrCurrentRef>fcd99ed86a703a16698fcd0027707739c8ef3501</CoreClrCurrentRef>
     <CoreSetupCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</CoreSetupCurrentRef>
     <ExternalCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</ExternalCurrentRef>
     <ProjectNTfsCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</ProjectNTfsCurrentRef>
@@ -23,7 +23,7 @@
   <PropertyGroup>
     <PlatformPackageVersion>2.1.0-preview1-25322-02</PlatformPackageVersion>
     <CoreFxExpectedPrerelease>preview1-25322-02</CoreFxExpectedPrerelease>
-    <CoreClrPackageVersion>2.1.0-preview1-25321-03</CoreClrPackageVersion>
+    <CoreClrPackageVersion>2.0.0-preview2-25316-03</CoreClrPackageVersion>
     <ExternalExpectedPrerelease>beta-25322-00</ExternalExpectedPrerelease>
     <ProjectNTfsExpectedPrerelease>beta-25322-00</ProjectNTfsExpectedPrerelease>
     <ProjectNTfsTestILCExpectedPrerelease>beta-25322-00</ProjectNTfsTestILCExpectedPrerelease>