diff options
| author | Gaurav Khanna <gkhanna@microsoft.com> | 2016-12-16 13:52:33 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-16 13:52:33 -0800 |
| commit | f2b4281070615d2a0dcd9fa06784c89ee6b8b710 (patch) | |
| tree | 33fe61ca8bbe9cbc3605e839692865dfc0722b66 | |
| parent | a03946c9dfe90118e75110cd10f6369fc6cd90d4 (diff) | |
| parent | 06df8647a337f29dbb7f8e3b6afa3dce357d52cf (diff) | |
| download | coreclr-f2b4281070615d2a0dcd9fa06784c89ee6b8b710.tar.gz coreclr-f2b4281070615d2a0dcd9fa06784c89ee6b8b710.tar.bz2 coreclr-f2b4281070615d2a0dcd9fa06784c89ee6b8b710.zip | |
Merge pull request #8664 from dotnet-bot/master-UpdateDependencies
Update CoreClr to beta-24816-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/netcoreapp/project.json | 2 | ||||
| -rw-r--r-- | tests/src/Common/targeting_pack_ref/project.json | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/dependencies.props b/dependencies.props index 85ee97889e..d4e7665a7d 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>412d4d830db9a28f525e37c05babcd38daa87a45</CoreFxCurrentRef> - <CoreClrCurrentRef>6970490f631ed176d761438e87f5978b7555b636</CoreClrCurrentRef> + <CoreClrCurrentRef>d4945ed18203cf0cae77dc89de2cf208baeb9d41</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>1.2.0-beta-24815-03</CoreClrPackageVersion> + <CoreClrPackageVersion>1.2.0-beta-24816-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 026abdcf97..30c35fdb3c 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": "1.2.0-beta-24815-03", - "Microsoft.NETCore.ILDAsm": "1.2.0-beta-24815-03", - "Microsoft.NETCore.Jit": "1.2.0-beta-24815-03", - "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24815-03", - "Microsoft.NETCore.TestHost": "1.2.0-beta-24815-03" + "Microsoft.NETCore.ILAsm": "1.2.0-beta-24816-04", + "Microsoft.NETCore.ILDAsm": "1.2.0-beta-24816-04", + "Microsoft.NETCore.Jit": "1.2.0-beta-24816-04", + "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24816-04", + "Microsoft.NETCore.TestHost": "1.2.0-beta-24816-04" }, "frameworks": { "netcoreapp1.1": { diff --git a/tests/src/Common/netcoreapp/project.json b/tests/src/Common/netcoreapp/project.json index 29bed71e4b..02afe44513 100644 --- a/tests/src/Common/netcoreapp/project.json +++ b/tests/src/Common/netcoreapp/project.json @@ -64,7 +64,7 @@ "frameworks": { "netcoreapp1.1": { "dependencies": { - "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24815-03" + "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24816-04" } } }, diff --git a/tests/src/Common/targeting_pack_ref/project.json b/tests/src/Common/targeting_pack_ref/project.json index 4986757ee9..f094f0992d 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": "1.2.0-beta-24815-03" + "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24816-04" }, "frameworks": { "netcoreapp1.1": { |