Update CoreClr, CoreFx to preview1-25221-01, preview1-25221-01, respectively

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

diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props
index 9739380..c06c465 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>af313dccb7aff26364a85300da16d39a783c86cd</CoreFxCurrentRef>
-    <CoreClrCurrentRef>af313dccb7aff26364a85300da16d39a783c86cd</CoreClrCurrentRef>
+    <CoreFxCurrentRef>947e90b41c30a1f0a906f8d996443233c2ceedf4</CoreFxCurrentRef>
+    <CoreClrCurrentRef>947e90b41c30a1f0a906f8d996443233c2ceedf4</CoreClrCurrentRef>
   </PropertyGroup>
 
   <!-- Auto-upgraded properties for each build info dependency. -->
   <PropertyGroup>
-    <CoreFxExpectedPrerelease>preview1-25214-03</CoreFxExpectedPrerelease>
+    <CoreFxExpectedPrerelease>preview1-25221-01</CoreFxExpectedPrerelease>
   </PropertyGroup>
 
   <!-- Full package version strings that are used in other parts of the build. -->
   <PropertyGroup>
-    <CoreClrPackageVersion>2.0.0-preview1-25215-03</CoreClrPackageVersion>
+    <CoreClrPackageVersion>2.0.0-preview1-25221-01</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 1ab2dfc..327340f 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-preview1-25215-03",
-    "Microsoft.NETCore.ILDAsm": "2.0.0-preview1-25215-03",
-    "Microsoft.NETCore.Jit": "2.0.0-preview1-25215-03",
-    "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25215-03",
-    "Microsoft.NETCore.TestHost": "2.0.0-preview1-25215-03"
+    "Microsoft.NETCore.ILAsm": "2.0.0-preview1-25221-01",
+    "Microsoft.NETCore.ILDAsm": "2.0.0-preview1-25221-01",
+    "Microsoft.NETCore.Jit": "2.0.0-preview1-25221-01",
+    "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25221-01",
+    "Microsoft.NETCore.TestHost": "2.0.0-preview1-25221-01"
   },
   "frameworks": {
     "netcoreapp2.0": {

diff --git a/src/coreclr/tests/src/Common/netcoreapp/project.json b/src/coreclr/tests/src/Common/netcoreapp/project.json
index 25ae479..ca40b18 100644 (file)
--- a/src/coreclr/tests/src/Common/netcoreapp/project.json
+++ b/src/coreclr/tests/src/Common/netcoreapp/project.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "Microsoft.NETCore.App": "2.0.0-beta-001494-00",
-    "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25214-03"
+    "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25221-01"
   },
   "frameworks": {
     "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 8e22e91..0754b74 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-preview1-25215-03"
+    "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-preview1-25221-01"
   },
   "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 241a86a..4477c68 100644 (file)
--- a/src/coreclr/tests/src/Common/test_dependencies/project.json
+++ b/src/coreclr/tests/src/Common/test_dependencies/project.json
@@ -1,10 +1,10 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-preview1-25214-03",
-    "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25214-03",
-    "System.Memory": "4.4.0-preview1-25214-03",
-    "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25214-03",
-    "System.Security.Permissions": "4.4.0-preview1-25214-03"
+    "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01",
+    "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25221-01",
+    "System.Memory": "4.4.0-preview1-25221-01",
+    "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25221-01",
+    "System.Security.Permissions": "4.4.0-preview1-25221-01"
   },
   "frameworks": {
     "netcoreapp2.0": {

diff --git a/src/coreclr/tests/src/Common/test_runtime/project.json b/src/coreclr/tests/src/Common/test_runtime/project.json
index c33b3b8..575d75d 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-preview1-25214-03",
+    "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01",
     "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 272b6aa..46a043f 100644 (file)
--- a/src/coreclr/tests/src/JIT/config/benchmark+roslyn/project.json
+++ b/src/coreclr/tests/src/JIT/config/benchmark+roslyn/project.json
@@ -6,15 +6,15 @@
     "xunit.performance.execution": "1.0.0-beta-build0002",
     "xunit.performance.metrics": "1.0.0-beta-build0002",
     "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental",
-    "Microsoft.NETCore.Platforms": "2.0.0-preview1-25214-03",
+    "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01",
     "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",
     "System.IO.FileSystem": "4.4.0-beta-24913-02",
-    "System.Numerics.Vectors": "4.4.0-preview1-25214-03",
+    "System.Numerics.Vectors": "4.4.0-preview1-25221-01",
     "System.Reflection": "4.4.0-beta-24913-02",
     "System.Reflection.Extensions": "4.4.0-beta-24913-02",
-    "System.Reflection.TypeExtensions": "4.4.0-preview1-25214-03",
+    "System.Reflection.TypeExtensions": "4.4.0-preview1-25221-01",
     "System.Runtime": "4.4.0-beta-24913-02",
     "System.Runtime.Extensions": "4.4.0-beta-24913-02",
     "System.Runtime.Numerics": "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 d5cc9f5..b403559 100644 (file)
--- a/src/coreclr/tests/src/JIT/config/benchmark+serialize/project.json
+++ b/src/coreclr/tests/src/JIT/config/benchmark+serialize/project.json
@@ -5,7 +5,7 @@
     "xunit.performance.execution": "1.0.0-beta-build0002",
     "xunit.performance.metrics": "1.0.0-beta-build0002",
     "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental",
-    "Microsoft.NETCore.Platforms": "2.0.0-preview1-25214-03",
+    "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01",
     "Newtonsoft.Json": "7.0.1",
     "System.Console": "4.4.0-beta-24913-02",
     "System.IO": "4.4.0-beta-24913-02",
@@ -15,7 +15,7 @@
     "System.Dynamic.Runtime": "4.4.0-beta-24913-02",
     "System.Reflection": "4.4.0-beta-24913-02",
     "System.Reflection.Extensions": "4.4.0-beta-24913-02",
-    "System.Reflection.TypeExtensions": "4.4.0-preview1-25214-03",
+    "System.Reflection.TypeExtensions": "4.4.0-preview1-25221-01",
     "System.Runtime": "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",

diff --git a/src/coreclr/tests/src/JIT/config/benchmark/project.json b/src/coreclr/tests/src/JIT/config/benchmark/project.json
index 9ba8b5d..0c63a98 100644 (file)
--- a/src/coreclr/tests/src/JIT/config/benchmark/project.json
+++ b/src/coreclr/tests/src/JIT/config/benchmark/project.json
@@ -5,20 +5,20 @@
     "xunit.performance.execution": "1.0.0-beta-build0002",
     "xunit.performance.metrics": "1.0.0-beta-build0002",
     "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental",
-    "Microsoft.NETCore.Platforms": "2.0.0-preview1-25214-03",
+    "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01",
     "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-preview1-25214-03",
-    "System.Numerics.Vectors": "4.4.0-preview1-25214-03",
+    "System.Memory": "4.4.0-preview1-25221-01",
+    "System.Numerics.Vectors": "4.4.0-preview1-25221-01",
     "System.Reflection": "4.4.0-beta-24913-02",
     "System.Reflection.Extensions": "4.4.0-beta-24913-02",
-    "System.Reflection.TypeExtensions": "4.4.0-preview1-25214-03",
+    "System.Reflection.TypeExtensions": "4.4.0-preview1-25221-01",
     "System.Runtime": "4.4.0-beta-24913-02",
-    "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25214-03",
+    "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25221-01",
     "System.Runtime.Extensions": "4.4.0-beta-24913-02",
     "System.Runtime.Numerics": "4.4.0-beta-24913-02",
     "System.Text.RegularExpressions": "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 51d9cda..56585e1 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-preview1-25214-03",
+    "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01",
     "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 c136c19..aae764a 100644 (file)
--- a/src/coreclr/tests/src/performance/project.json
+++ b/src/coreclr/tests/src/performance/project.json
@@ -5,16 +5,16 @@
     "xunit.performance.execution": "1.0.0-beta-build0002",
     "xunit.performance.metrics": "1.0.0-beta-build0002",
     "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental",
-    "Microsoft.NETCore.Platforms": "2.0.0-preview1-25214-03",
+    "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01",
     "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.Expressions": "4.4.0-beta-24913-02",
-    "System.Numerics.Vectors": "4.4.0-preview1-25214-03",
+    "System.Numerics.Vectors": "4.4.0-preview1-25221-01",
     "System.Reflection": "4.4.0-beta-24913-02",
     "System.Reflection.Extensions": "4.4.0-beta-24913-02",
-    "System.Reflection.TypeExtensions": "4.4.0-preview1-25214-03",
+    "System.Reflection.TypeExtensions": "4.4.0-preview1-25221-01",
     "System.Runtime": "4.4.0-beta-24913-02",
     "System.Runtime.Extensions": "4.4.0-beta-24913-02",
     "System.Runtime.Loader": "4.0.0",