Update CoreClr, CoreFx to beta-25113-03, beta-25114-01, respectively

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

diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props
index 005c0c5..40d2c3a 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>475ad1deaae6b2f4be053ead4c3a93576171e7f4</CoreFxCurrentRef>
-    <CoreClrCurrentRef>d2fd71b2fbc3be52229fe62345d1a56caee61e7a</CoreClrCurrentRef>
+    <CoreFxCurrentRef>6309cf2ad5fd49945c44026e7bef7b11a3dedeb9</CoreFxCurrentRef>
+    <CoreClrCurrentRef>6309cf2ad5fd49945c44026e7bef7b11a3dedeb9</CoreClrCurrentRef>
   </PropertyGroup>
 
   <!-- Auto-upgraded properties for each build info dependency. -->
   <PropertyGroup>
-    <CoreFxExpectedPrerelease>beta-25110-02</CoreFxExpectedPrerelease>
+    <CoreFxExpectedPrerelease>beta-25114-01</CoreFxExpectedPrerelease>
   </PropertyGroup>
 
   <!-- Full package version strings that are used in other parts of the build. -->
   <PropertyGroup>
-    <CoreClrPackageVersion>2.0.0-beta-25113-01</CoreClrPackageVersion>
+    <CoreClrPackageVersion>2.0.0-beta-25113-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 f93557d..fa2f8b7 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-25113-01",
-    "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25113-01",
-    "Microsoft.NETCore.Jit": "2.0.0-beta-25113-01",
-    "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25113-01",
-    "Microsoft.NETCore.TestHost": "2.0.0-beta-25113-01"
+    "Microsoft.NETCore.ILAsm": "2.0.0-beta-25113-03",
+    "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25113-03",
+    "Microsoft.NETCore.Jit": "2.0.0-beta-25113-03",
+    "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25113-03",
+    "Microsoft.NETCore.TestHost": "2.0.0-beta-25113-03"
   },
   "frameworks": {
     "netcoreapp2.0": {

diff --git a/src/coreclr/tests/src/Common/netcoreapp/project.json b/src/coreclr/tests/src/Common/netcoreapp/project.json
index fa1cb96..9eb110e 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-beta-25110-02"
+    "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-25114-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 0d6f8da..66e9f5d 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-25113-01"
+    "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-beta-25113-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 7e219e3..7e59e0f 100644 (file)
--- a/src/coreclr/tests/src/Common/test_dependencies/project.json
+++ b/src/coreclr/tests/src/Common/test_dependencies/project.json
@@ -1,8 +1,8 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-25110-02",
-    "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-beta-25110-02",
-    "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-25110-02"
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25114-01",
+    "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-beta-25114-01",
+    "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-25114-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 382d332..ed408b9 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-25110-02",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25114-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 a64bce3..4c39354 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-25110-02",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25114-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",
@@ -33,4 +33,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}

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 ff76728..35dfad8 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-25110-02",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25114-01",
     "Newtonsoft.Json": "7.0.1",
     "System.Console": "4.4.0-beta-24913-02",
     "System.IO": "4.4.0-beta-24913-02",
@@ -33,4 +33,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}

diff --git a/src/coreclr/tests/src/JIT/config/benchmark/project.json b/src/coreclr/tests/src/JIT/config/benchmark/project.json
index a57d57a..4b88ed2 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-25110-02",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25114-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-beta-25110-02",
+    "System.Memory": "4.4.0-beta-25114-01",
     "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",
@@ -39,4 +39,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}

diff --git a/src/coreclr/tests/src/TestWrappersConfig/project.json b/src/coreclr/tests/src/TestWrappersConfig/project.json
index 1dbeaa8..53baeba 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-25110-02",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25114-01",
     "xunit": "2.2.0-beta2-build3300",
     "xunit.assert": "2.2.0-beta2-build3300",
     "xunit.core": "2.2.0-beta2-build3300",
@@ -29,4 +29,4 @@
     "debian.8-x64": {},
     "fedora.23-x64": {}
   }
-}
\ No newline at end of file
+}

diff --git a/src/coreclr/tests/src/performance/project.json b/src/coreclr/tests/src/performance/project.json
index dfc5f2f..fc8f0b3 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-25110-02",
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25114-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",
@@ -36,4 +36,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}