diff options
| author | Gaurav Khanna <gkhanna@microsoft.com> | 2017-03-01 17:39:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-01 17:39:18 -0800 |
| commit | c4ebfbd60672b51406630235c38469597d166880 (patch) | |
| tree | 68afba912d9b173ebc11c58951736101ed72dbea | |
| parent | c666f11b70bf12ef2e4568e71c4547e8b2176911 (diff) | |
| parent | 7c5fba17d228b3890b836b0a8cd257ea899c6213 (diff) | |
| download | coreclr-c4ebfbd60672b51406630235c38469597d166880.tar.gz coreclr-c4ebfbd60672b51406630235c38469597d166880.tar.bz2 coreclr-c4ebfbd60672b51406630235c38469597d166880.zip | |
Merge pull request #9882 from dotnet-bot/master-UpdateDependencies
Update CoreClr to beta-25101-04 (master)
| -rw-r--r-- | dependencies.props | 4 | ||||
| -rw-r--r-- | tests/src/Common/build_against_pkg_dependencies/project.json | 10 | ||||
| -rw-r--r-- | tests/src/Common/targeting_pack_ref/project.json | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/dependencies.props b/dependencies.props index 1c7b78aa3c..72a9bce345 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>3bb43ab67bc17fdf91f3ac55e4ac0750b4baa2c8</CoreFxCurrentRef> - <CoreClrCurrentRef>7534cd8a50c86ac5c2ea55651ddd5c0b3150425c</CoreClrCurrentRef> + <CoreClrCurrentRef>cb22d8ab5ca2778217db57fb16d2b2c334ccbec7</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-25101-01</CoreClrPackageVersion> + <CoreClrPackageVersion>2.0.0-beta-25101-04</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 221ba8156b..bbf60c828e 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-25101-01", - "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25101-01", - "Microsoft.NETCore.Jit": "2.0.0-beta-25101-01", - "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25101-01", - "Microsoft.NETCore.TestHost": "2.0.0-beta-25101-01" + "Microsoft.NETCore.ILAsm": "2.0.0-beta-25101-04", + "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25101-04", + "Microsoft.NETCore.Jit": "2.0.0-beta-25101-04", + "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25101-04", + "Microsoft.NETCore.TestHost": "2.0.0-beta-25101-04" }, "frameworks": { "netcoreapp1.1": { diff --git a/tests/src/Common/targeting_pack_ref/project.json b/tests/src/Common/targeting_pack_ref/project.json index bfb643e109..b8f7287936 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-25101-01" + "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-beta-25101-04" }, "frameworks": { "netcoreapp1.1": { |