Skip to content

Commit

Permalink
Merge pull request dotnet/coreclr#9197 from dotnet-bot/master-UpdateD…
Browse files Browse the repository at this point in the history
…ependencies

Update CoreClr to beta-24930-03 (master)

Commit migrated from dotnet/coreclr@55eec6c
  • Loading branch information
danmoseley authored Jan 30, 2017
2 parents 59375e2 + 323d026 commit 6b4633c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions src/coreclr/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>6c7aa7d5846447563f34e86529109e93239f5f59</CoreFxCurrentRef>
<CoreClrCurrentRef>6c7aa7d5846447563f34e86529109e93239f5f59</CoreClrCurrentRef>
<CoreClrCurrentRef>b0bc0a1565fac8663262ec875665da189fa71b55</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>2.0.0-beta-24930-02</CoreClrPackageVersion>
<CoreClrPackageVersion>2.0.0-beta-24930-03</CoreClrPackageVersion>
<XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"dependencies": {
"Microsoft.NETCore.ILAsm": "2.0.0-beta-24930-02",
"Microsoft.NETCore.ILDAsm": "2.0.0-beta-24930-02",
"Microsoft.NETCore.Jit": "2.0.0-beta-24930-02",
"Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-24930-02",
"Microsoft.NETCore.TestHost": "2.0.0-beta-24930-02"
"Microsoft.NETCore.ILAsm": "2.0.0-beta-24930-03",
"Microsoft.NETCore.ILDAsm": "2.0.0-beta-24930-03",
"Microsoft.NETCore.Jit": "2.0.0-beta-24930-03",
"Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-24930-03",
"Microsoft.NETCore.TestHost": "2.0.0-beta-24930-03"
},
"frameworks": {
"netcoreapp1.1": {
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/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": "2.0.0-beta-24930-02"
"Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-24930-03"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-beta-24930-02"
"Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-beta-24930-03"
},
"frameworks": {
"netcoreapp1.1": {
Expand Down

0 comments on commit 6b4633c

Please sign in to comment.