summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordotnet-maestro-bot <dotnet-maestro-bot@microsoft.com>2018-05-04 15:09:39 -0500
committerStephen Toub <stoub@microsoft.com>2018-05-04 16:09:39 -0400
commit556228c968eebbb9fce442a4974b2c3771206987 (patch)
tree1c49a79c63899a1b8c1582dd4f7ded3334b6d3ec
parent7916aa9d417eea94d7cc3a47902f6c626fd72c00 (diff)
downloadcoreclr-556228c968eebbb9fce442a4974b2c3771206987.tar.gz
coreclr-556228c968eebbb9fce442a4974b2c3771206987.tar.bz2
coreclr-556228c968eebbb9fce442a4974b2c3771206987.zip
Update CoreClr, CoreFx to rtm-26504-02, rtm-26504-02, respectively (#17883)
-rw-r--r--ILAsmVersion.txt2
-rw-r--r--dependencies.props10
2 files changed, 6 insertions, 6 deletions
diff --git a/ILAsmVersion.txt b/ILAsmVersion.txt
index 1ab8fc66b0..53e3ed468d 100644
--- a/ILAsmVersion.txt
+++ b/ILAsmVersion.txt
@@ -1 +1 @@
-2.1.0-rtm-26502-03
+2.1.0-rtm-26504-02
diff --git a/dependencies.props b/dependencies.props
index 581783b726..bbb2773ded 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -23,18 +23,18 @@
<!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
<PropertyGroup>
- <CoreFxCurrentRef>ebe9f1f8ac861bb17567a37db5bf26595a53c716</CoreFxCurrentRef>
- <CoreClrCurrentRef>ebe9f1f8ac861bb17567a37db5bf26595a53c716</CoreClrCurrentRef>
+ <CoreFxCurrentRef>cf9cb2154fe218df5e28e76fcfafc97751782313</CoreFxCurrentRef>
+ <CoreClrCurrentRef>cf9cb2154fe218df5e28e76fcfafc97751782313</CoreClrCurrentRef>
<BuildToolsCurrentRef>ebe9f1f8ac861bb17567a37db5bf26595a53c716</BuildToolsCurrentRef>
<PgoDataCurrentRef>2696080f7aff31f90447d6030c43fa4792a55fdf</PgoDataCurrentRef>
</PropertyGroup>
<!-- Tests/infrastructure dependency versions. -->
<PropertyGroup>
- <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-rtm-26502-02</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
- <MicrosoftNETCorePlatformsPackageVersion>2.1.0-rtm-26502-02</MicrosoftNETCorePlatformsPackageVersion>
+ <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-rtm-26504-02</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
+ <MicrosoftNETCorePlatformsPackageVersion>2.1.0-rtm-26504-02</MicrosoftNETCorePlatformsPackageVersion>
<PgoDataPackageVersion>2.1.0-release-20180502-0048</PgoDataPackageVersion>
- <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.0-rtm-26502-03</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
+ <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.0-rtm-26504-02</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion>
<XunitConsoleNetcorePackageVersion>1.0.2-prerelease-00177</XunitConsoleNetcorePackageVersion>
<XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>