Update CoreClr, CoreFx to beta-24918-03, beta-24918-07, respectively

Commit migrated from https://github.com/dotnet/coreclr/commit/e6f21d790a137f083489a44cd421b569a41ced21

diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props
index 1ae7d03..8ec3f49 100644 (file)
--- a/src/coreclr/dependencies.props
+++ b/src/coreclr/dependencies.props
@@ -1,18 +1,18 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
   <PropertyGroup>
-    <CoreFxCurrentRef>672d0a712539e1903a903424edad85fd649b456c</CoreFxCurrentRef>
-    <CoreClrCurrentRef>672d0a712539e1903a903424edad85fd649b456c</CoreClrCurrentRef>
+    <CoreFxCurrentRef>85b3661411d85b6b22b1796768df0b5d968d090f</CoreFxCurrentRef>
+    <CoreClrCurrentRef>85b3661411d85b6b22b1796768df0b5d968d090f</CoreClrCurrentRef>
   </PropertyGroup>
 
   <!-- Auto-upgraded properties for each build info dependency. -->
   <PropertyGroup>
-    <CoreFxExpectedPrerelease>beta-24917-02</CoreFxExpectedPrerelease>
+    <CoreFxExpectedPrerelease>beta-24918-07</CoreFxExpectedPrerelease>
   </PropertyGroup>
 
   <!-- Full package version strings that are used in other parts of the build. -->
   <PropertyGroup>
-    <CoreClrPackageVersion>1.2.0-beta-24917-03</CoreClrPackageVersion>
+    <CoreClrPackageVersion>1.2.0-beta-24918-03</CoreClrPackageVersion>
     <XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion>
   </PropertyGroup>
 

diff --git a/src/coreclr/tests/src/Common/build_against_pkg_dependencies/project.json b/src/coreclr/tests/src/Common/build_against_pkg_dependencies/project.json
index b7899e9..e23a600 100644 (file)
--- a/src/coreclr/tests/src/Common/build_against_pkg_dependencies/project.json
+++ b/src/coreclr/tests/src/Common/build_against_pkg_dependencies/project.json
@@ -1,10 +1,10 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.ILAsm": "1.2.0-beta-24917-03",
-    "Microsoft.NETCore.ILDAsm": "1.2.0-beta-24917-03",
-    "Microsoft.NETCore.Jit": "1.2.0-beta-24917-03",
-    "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24917-03",
-    "Microsoft.NETCore.TestHost": "1.2.0-beta-24917-03"
+    "Microsoft.NETCore.ILAsm": "1.2.0-beta-24918-03",
+    "Microsoft.NETCore.ILDAsm": "1.2.0-beta-24918-03",
+    "Microsoft.NETCore.Jit": "1.2.0-beta-24918-03",
+    "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24918-03",
+    "Microsoft.NETCore.TestHost": "1.2.0-beta-24918-03"
   },
   "frameworks": {
     "netcoreapp1.1": {

diff --git a/src/coreclr/tests/src/Common/netcoreapp/project.json b/src/coreclr/tests/src/Common/netcoreapp/project.json
index 186d255..2cc87dc 100644 (file)
--- a/src/coreclr/tests/src/Common/netcoreapp/project.json
+++ b/src/coreclr/tests/src/Common/netcoreapp/project.json
@@ -5,7 +5,7 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-24917-02",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-24918-07",
     "Microsoft.NETCore.Targets": "1.2.0-beta-24913-02",
     "System.Threading.Thread": "4.4.0-beta-24913-02",
     "System.Collections": "4.4.0-beta-24913-02",
@@ -64,7 +64,7 @@
   "frameworks": {
     "netcoreapp1.1": {
       "dependencies": {
-        "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24917-03"
+        "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24918-03"
       }
     }
   },

diff --git a/src/coreclr/tests/src/Common/targeting_pack_ref/project.json b/src/coreclr/tests/src/Common/targeting_pack_ref/project.json
index a2f687d..2539b35 100644 (file)
--- a/src/coreclr/tests/src/Common/targeting_pack_ref/project.json
+++ b/src/coreclr/tests/src/Common/targeting_pack_ref/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24917-03"
+    "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24918-03"
   },
   "frameworks": {
     "netcoreapp1.1": {

diff --git a/src/coreclr/tests/src/Common/test_dependencies/project.json b/src/coreclr/tests/src/Common/test_dependencies/project.json
index 124f4dc..8479ff7 100644 (file)
--- a/src/coreclr/tests/src/Common/test_dependencies/project.json
+++ b/src/coreclr/tests/src/Common/test_dependencies/project.json
@@ -9,7 +9,7 @@
     "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
     "Microsoft.Win32.Primitives": "4.4.0-beta-24913-02",
     "Newtonsoft.Json": "8.0.3",
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-24917-02",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-24918-07",
     "Microsoft.NETCore.Targets": "1.2.0-beta-24913-02",
     "System.Collections.Immutable": "1.4.0-beta-24913-02",
     "System.Threading.Thread": "4.4.0-beta-24913-02",

diff --git a/src/coreclr/tests/src/JIT/config/benchmark+roslyn/project.json b/src/coreclr/tests/src/JIT/config/benchmark+roslyn/project.json
index a69a663..4f2d216 100644 (file)
--- a/src/coreclr/tests/src/JIT/config/benchmark+roslyn/project.json
+++ b/src/coreclr/tests/src/JIT/config/benchmark+roslyn/project.json
@@ -4,7 +4,7 @@
     "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040",
     "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040",
     "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-24917-02",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-24918-07",
     "System.Console": "4.4.0-beta-24913-02",
     "System.Dynamic.Runtime": "4.4.0-beta-24913-02",
     "System.Linq": "4.4.0-beta-24913-02",

diff --git a/src/coreclr/tests/src/JIT/config/benchmark+serialize/project.json b/src/coreclr/tests/src/JIT/config/benchmark+serialize/project.json
index 89592d4..8a945a3 100644 (file)
--- a/src/coreclr/tests/src/JIT/config/benchmark+serialize/project.json
+++ b/src/coreclr/tests/src/JIT/config/benchmark+serialize/project.json
@@ -3,7 +3,7 @@
     "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040",
     "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040",
     "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-24917-02",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-24918-07",
     "Newtonsoft.Json": "7.0.1",
     "System.Console": "4.4.0-beta-24913-02",
     "System.IO": "4.4.0-beta-24913-02",

diff --git a/src/coreclr/tests/src/JIT/config/benchmark/project.json b/src/coreclr/tests/src/JIT/config/benchmark/project.json
index 3c969e8..82f0914 100644 (file)
--- a/src/coreclr/tests/src/JIT/config/benchmark/project.json
+++ b/src/coreclr/tests/src/JIT/config/benchmark/project.json
@@ -3,7 +3,7 @@
     "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040",
     "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040",
     "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-24917-02",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-24918-07",
     "System.Collections.NonGeneric": "4.4.0-beta-24913-02",
     "System.Console": "4.4.0-beta-24913-02",
     "System.IO.FileSystem": "4.4.0-beta-24913-02",

diff --git a/src/coreclr/tests/src/JIT/config/extra/project.json b/src/coreclr/tests/src/JIT/config/extra/project.json
index 3db6c1c..b8d832d 100644 (file)
--- a/src/coreclr/tests/src/JIT/config/extra/project.json
+++ b/src/coreclr/tests/src/JIT/config/extra/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-24917-02",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-24918-07",
     "System.Collections": "4.4.0-beta-24913-02",
     "System.Console": "4.4.0-beta-24913-02",
     "System.Diagnostics.Debug": "4.4.0-beta-24913-02",

diff --git a/src/coreclr/tests/src/JIT/config/minimal/project.json b/src/coreclr/tests/src/JIT/config/minimal/project.json
index 85d97be..daaf5ae 100644 (file)
--- a/src/coreclr/tests/src/JIT/config/minimal/project.json
+++ b/src/coreclr/tests/src/JIT/config/minimal/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-24917-02",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-24918-07",
     "System.Console": "4.4.0-beta-24913-02",
     "System.Runtime": "4.4.0-beta-24913-02",
     "System.Runtime.Extensions": "4.4.0-beta-24913-02",

diff --git a/src/coreclr/tests/src/JIT/config/threading+thread/project.json b/src/coreclr/tests/src/JIT/config/threading+thread/project.json
index 5ea64bb..a46ac11 100644 (file)
--- a/src/coreclr/tests/src/JIT/config/threading+thread/project.json
+++ b/src/coreclr/tests/src/JIT/config/threading+thread/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-24917-02",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-24918-07",
     "System.Console": "4.4.0-beta-24913-02",
     "System.Numerics.Vectors": "4.4.0-beta-24913-02",
     "System.Runtime": "4.4.0-beta-24913-02",

diff --git a/src/coreclr/tests/src/JIT/config/threading/project.json b/src/coreclr/tests/src/JIT/config/threading/project.json
index 69064f1..d80a622 100644 (file)
--- a/src/coreclr/tests/src/JIT/config/threading/project.json
+++ b/src/coreclr/tests/src/JIT/config/threading/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-24917-02",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-24918-07",
     "System.Console": "4.4.0-beta-24913-02",
     "System.Runtime": "4.4.0-beta-24913-02",
     "System.Runtime.Extensions": "4.4.0-beta-24913-02",

diff --git a/src/coreclr/tests/src/performance/project.json b/src/coreclr/tests/src/performance/project.json
index 3c969e8..82f0914 100644 (file)
--- a/src/coreclr/tests/src/performance/project.json
+++ b/src/coreclr/tests/src/performance/project.json
@@ -3,7 +3,7 @@
     "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040",
     "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040",
     "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-24917-02",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-24918-07",
     "System.Collections.NonGeneric": "4.4.0-beta-24913-02",
     "System.Console": "4.4.0-beta-24913-02",
     "System.IO.FileSystem": "4.4.0-beta-24913-02",