summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaurav Khanna <gkhanna@microsoft.com>2017-02-14 12:04:14 -0800
committerGitHub <noreply@github.com>2017-02-14 12:04:14 -0800
commitc0ef1323ec3db4b49e00cdb3a4d631000eeb1ea3 (patch)
tree0c97096f5ff89817a7b8e617cf82fb9b41dfce33
parent8cb07cf09c31c0ac54e1a9248642e544d351e05b (diff)
parent277d4bab4a1f82bf84ac2ec90c23a06055cec38f (diff)
downloadcoreclr-c0ef1323ec3db4b49e00cdb3a4d631000eeb1ea3.tar.gz
coreclr-c0ef1323ec3db4b49e00cdb3a4d631000eeb1ea3.tar.bz2
coreclr-c0ef1323ec3db4b49e00cdb3a4d631000eeb1ea3.zip
Merge pull request #9579 from dotnet-bot/master-UpdateDependencies
Update CoreClr to beta-25014-03 (master)
-rw-r--r--dependencies.props4
-rw-r--r--tests/src/Common/build_against_pkg_dependencies/project.json10
-rw-r--r--tests/src/Common/targeting_pack_ref/project.json2
3 files changed, 8 insertions, 8 deletions
diff --git a/dependencies.props b/dependencies.props
index 3f3999dae3..ab66054935 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -2,7 +2,7 @@
<!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
<PropertyGroup>
<CoreFxCurrentRef>a96b46a6ea52965b20667fff5295a13ad73d5d7a</CoreFxCurrentRef>
- <CoreClrCurrentRef>a96b46a6ea52965b20667fff5295a13ad73d5d7a</CoreClrCurrentRef>
+ <CoreClrCurrentRef>b8e5a047fe78c6f48cffac117fd6c6c901c06d72</CoreClrCurrentRef>
</PropertyGroup>
<!-- Auto-upgraded properties for each build info dependency. -->
@@ -12,7 +12,7 @@
<!-- Full package version strings that are used in other parts of the build. -->
<PropertyGroup>
- <CoreClrPackageVersion>2.0.0-beta-25014-02</CoreClrPackageVersion>
+ <CoreClrPackageVersion>2.0.0-beta-25014-03</CoreClrPackageVersion>
<XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion>
</PropertyGroup>
diff --git a/tests/src/Common/build_against_pkg_dependencies/project.json b/tests/src/Common/build_against_pkg_dependencies/project.json
index 27acaf896d..501a57f4a5 100644
--- a/tests/src/Common/build_against_pkg_dependencies/project.json
+++ b/tests/src/Common/build_against_pkg_dependencies/project.json
@@ -1,10 +1,10 @@
{
"dependencies": {
- "Microsoft.NETCore.ILAsm": "2.0.0-beta-25014-02",
- "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25014-02",
- "Microsoft.NETCore.Jit": "2.0.0-beta-25014-02",
- "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25014-02",
- "Microsoft.NETCore.TestHost": "2.0.0-beta-25014-02"
+ "Microsoft.NETCore.ILAsm": "2.0.0-beta-25014-03",
+ "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25014-03",
+ "Microsoft.NETCore.Jit": "2.0.0-beta-25014-03",
+ "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25014-03",
+ "Microsoft.NETCore.TestHost": "2.0.0-beta-25014-03"
},
"frameworks": {
"netcoreapp1.1": {
diff --git a/tests/src/Common/targeting_pack_ref/project.json b/tests/src/Common/targeting_pack_ref/project.json
index e07323bf6f..58943de7fd 100644
--- a/tests/src/Common/targeting_pack_ref/project.json
+++ b/tests/src/Common/targeting_pack_ref/project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-beta-25014-02"
+ "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-beta-25014-03"
},
"frameworks": {
"netcoreapp1.1": {