Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Update CoreClr to beta-24816-04 (master) #8664

Merged
merged 1 commit into from
Dec 16, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -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. -->
Expand All @@ -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>

Expand Down
10 changes: 5 additions & 5 deletions tests/src/Common/build_against_pkg_dependencies/project.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion tests/src/Common/netcoreapp/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion tests/src/Common/targeting_pack_ref/project.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down