Update CoreClr, CoreFx to beta-25021-03, beta-25022-02, respectively

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

diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props
index e90cdf9..2cba6eb 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>3a27fdbcc1cc6dc1011ad7aaaa1d91520e9807a7</CoreFxCurrentRef>
-    <CoreClrCurrentRef>79a1fd3bc483e9b63c05510201b8687ce34ff7b9</CoreClrCurrentRef>
+    <CoreFxCurrentRef>f5099a17b1218bf7357f5980757daa69c2f36cec</CoreFxCurrentRef>
+    <CoreClrCurrentRef>f5099a17b1218bf7357f5980757daa69c2f36cec</CoreClrCurrentRef>
   </PropertyGroup>
 
   <!-- Auto-upgraded properties for each build info dependency. -->
   <PropertyGroup>
-    <CoreFxExpectedPrerelease>beta-25017-02</CoreFxExpectedPrerelease>
+    <CoreFxExpectedPrerelease>beta-25022-02</CoreFxExpectedPrerelease>
   </PropertyGroup>
 
   <!-- Full package version strings that are used in other parts of the build. -->
   <PropertyGroup>
-    <CoreClrPackageVersion>2.0.0-beta-25015-04</CoreClrPackageVersion>
+    <CoreClrPackageVersion>2.0.0-beta-25021-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 a31d5ab..726b9e1 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": "2.0.0-beta-25015-04",
-    "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25015-04",
-    "Microsoft.NETCore.Jit": "2.0.0-beta-25015-04",
-    "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25015-04",
-    "Microsoft.NETCore.TestHost": "2.0.0-beta-25015-04"
+    "Microsoft.NETCore.ILAsm": "2.0.0-beta-25021-03",
+    "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25021-03",
+    "Microsoft.NETCore.Jit": "2.0.0-beta-25021-03",
+    "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25021-03",
+    "Microsoft.NETCore.TestHost": "2.0.0-beta-25021-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 ab15282..9232803 100644 (file)
--- a/src/coreclr/tests/src/Common/netcoreapp/project.json
+++ b/src/coreclr/tests/src/Common/netcoreapp/project.json
@@ -1,9 +1,9 @@
 {
   "dependencies": {
     "Microsoft.NETCore.App": "2.0.0-beta-001494-00",
-    "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-24913-02"
+    "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-25022-02"
   },
   "frameworks": {
-    "netcoreapp2.0": { }
+    "netcoreapp2.0": {}
   }
 }

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 1d01abe..fd1794d 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": "2.0.0-beta-25015-04"
+    "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-beta-25021-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 0a2064c..82358f9 100644 (file)
--- a/src/coreclr/tests/src/Common/test_dependencies/project.json
+++ b/src/coreclr/tests/src/Common/test_dependencies/project.json
@@ -9,9 +9,9 @@
     "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-25016-03",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25022-02",
     "Microsoft.NETCore.Targets": "1.2.0-beta-24913-02",
-    "System.Collections.Immutable": "1.4.0-beta-24913-02",
+    "System.Collections.Immutable": "1.4.0-beta-25022-02",
     "System.Threading.Thread": "4.4.0-beta-24913-02",
     "System.Collections": "4.4.0-beta-24913-02",
     "System.Xml.XmlSerializer": "4.4.0-beta-24913-02",
@@ -38,16 +38,16 @@
     "System.Linq": "4.4.0-beta-24913-02",
     "System.Linq.Queryable": "4.4.0-beta-24913-02",
     "System.Linq.Expressions": "4.4.0-beta-24913-02",
-    "System.Memory": "4.4.0-beta-24913-02",
+    "System.Memory": "4.4.0-beta-25022-02",
     "System.Reflection": "4.4.0-beta-24913-02",
     "System.Reflection.Extensions": "4.4.0-beta-24913-02",
     "System.Resources.ResourceManager": "4.4.0-beta-24913-02",
     "System.Runtime": "4.4.0-beta-24913-02",
-    "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-24913-02",
+    "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-25022-02",
     "System.Runtime.Extensions": "4.4.0-beta-24913-02",
     "System.Runtime.Handles": "4.4.0-beta-24913-02",
     "System.Runtime.InteropServices": "4.4.0-beta-24913-02",
-    "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24913-02",
+    "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-25022-02",
     "System.Runtime.Loader": "4.4.0-beta-24913-02",
     "System.Runtime.Serialization.Json": "4.4.0-beta-24913-02",
     "System.Runtime.Serialization.Primitives": "4.4.0-beta-24913-02",
@@ -57,7 +57,7 @@
     "System.Text.Encoding.Extensions": "4.4.0-beta-24913-02",
     "System.Text.RegularExpressions": "4.4.0-beta-24913-02",
     "System.Threading": "4.4.0-beta-24913-02",
-    "System.Threading.AccessControl": "4.4.0-beta-24913-02",
+    "System.Threading.AccessControl": "4.4.0-beta-25022-02",
     "System.Threading.Overlapped": "4.4.0-beta-24913-02",
     "System.Threading.Tasks": "4.4.0-beta-24913-02",
     "System.Threading.Tasks.Parallel": "4.4.0-beta-24913-02",

diff --git a/src/coreclr/tests/src/Common/test_runtime/project.json b/src/coreclr/tests/src/Common/test_runtime/project.json
index 01af528..88f0151 100644 (file)
--- a/src/coreclr/tests/src/Common/test_runtime/project.json
+++ b/src/coreclr/tests/src/Common/test_runtime/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-25016-03",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25022-02",
     "Microsoft.DotNet.CoreCLR.TestDependencies": "1.0.0-prerelease",
     "jit-dasm": "0.0.1.4",
     "cijobs": "0.0.1.2",

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 168bc05..7cfabc1 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-25016-03",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25022-02",
     "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 0e60448..892d773 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-25016-03",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25022-02",
     "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 8c92040..74d8973 100644 (file)
--- a/src/coreclr/tests/src/JIT/config/benchmark/project.json
+++ b/src/coreclr/tests/src/JIT/config/benchmark/project.json
@@ -3,14 +3,14 @@
     "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-25016-03",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25022-02",
     "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",
     "System.Linq": "4.4.0-beta-24913-02",
     "System.Linq.Parallel": "4.4.0-beta-24913-02",
     "System.Linq.Expressions": "4.4.0-beta-24913-02",
-    "System.Memory": "4.4.0-beta-24913-02",
+    "System.Memory": "4.4.0-beta-25022-02",
     "System.Numerics.Vectors": "4.4.0-beta-24913-02",
     "System.Reflection": "4.4.0-beta-24913-02",
     "System.Reflection.Extensions": "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 6482f44..56515da 100644 (file)
--- a/src/coreclr/tests/src/JIT/config/extra/project.json
+++ b/src/coreclr/tests/src/JIT/config/extra/project.json
@@ -1,10 +1,10 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-25016-03",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25022-02",
     "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",
-    "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24913-02",
+    "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-25022-02",
     "System.Diagnostics.Process": "4.4.0-beta-24913-02",
     "System.Globalization": "4.4.0-beta-24913-02",
     "System.IO": "4.4.0-beta-24913-02",
@@ -14,7 +14,7 @@
     "System.Reflection.TypeExtensions": "4.4.0-beta-24913-02",
     "System.Runtime": "4.4.0-beta-24913-02",
     "System.Runtime.Extensions": "4.4.0-beta-24913-02",
-    "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-24913-02",
+    "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-25022-02",
     "System.Runtime.InteropServices": "4.4.0-beta-24913-02"
   },
   "frameworks": {

diff --git a/src/coreclr/tests/src/JIT/config/minimal/project.json b/src/coreclr/tests/src/JIT/config/minimal/project.json
index 43bc10b..d1c8def 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-25016-03",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25022-02",
     "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 973a897..62b27ff 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-25016-03",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25022-02",
     "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 8d59e22..532b9cd 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-25016-03",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25022-02",
     "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/TestWrappersConfig/project.json b/src/coreclr/tests/src/TestWrappersConfig/project.json
index 2335bb8..c321180 100644 (file)
--- a/src/coreclr/tests/src/TestWrappersConfig/project.json
+++ b/src/coreclr/tests/src/TestWrappersConfig/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-25016-03",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25022-02",
     "xunit": "2.2.0-beta2-build3300",
     "xunit.assert": "2.2.0-beta2-build3300",
     "xunit.core": "2.2.0-beta2-build3300",

diff --git a/src/coreclr/tests/src/performance/project.json b/src/coreclr/tests/src/performance/project.json
index 509b1c4..414cf82 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-25016-03",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25022-02",
     "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",