diff options
author | Wes Haggard <weshaggard@users.noreply.github.com> | 2018-05-29 13:24:04 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-29 13:24:04 -0700 |
commit | 0cf62eec0e0f4060855bae6dc5399e7ebc4d1977 (patch) | |
tree | ef11b25dbe82a17d25954575bbaa40cb5e07df02 | |
parent | d9d6f990a3737e221294b41a579afba0c4f7f9c4 (diff) | |
parent | f9b0c06e369cd76eebae36c39f3dfa97ffde71aa (diff) | |
download | coreclr-0cf62eec0e0f4060855bae6dc5399e7ebc4d1977.tar.gz coreclr-0cf62eec0e0f4060855bae6dc5399e7ebc4d1977.tar.bz2 coreclr-0cf62eec0e0f4060855bae6dc5399e7ebc4d1977.zip |
Merge pull request #17998 from dotnet-maestro-bot/release/2.1-UpdateDependencies
Update CoreClr, CoreFx, PgoData to rtm-26515-07, rtm, release-20180529-0037, respectively (release/2.1)
-rw-r--r-- | ILAsmVersion.txt | 2 | ||||
-rw-r--r-- | dependencies.props | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ILAsmVersion.txt b/ILAsmVersion.txt index 155f1bd323..adc37a2ed0 100644 --- a/ILAsmVersion.txt +++ b/ILAsmVersion.txt @@ -1 +1 @@ -2.1.0-rtm-26514-02 +2.1.0-rtm-26515-07 diff --git a/dependencies.props b/dependencies.props index 84f89ad547..4831990279 100644 --- a/dependencies.props +++ b/dependencies.props @@ -23,25 +23,25 @@ <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. --> <PropertyGroup> - <CoreFxCurrentRef>9f8dfcd5e5193818acd05bdca82d4b044fd767ae</CoreFxCurrentRef> - <CoreClrCurrentRef>9f8dfcd5e5193818acd05bdca82d4b044fd767ae</CoreClrCurrentRef> + <CoreFxCurrentRef>e455bb23eba181ab6c857c5117de4a14c0090bad</CoreFxCurrentRef> + <CoreClrCurrentRef>e455bb23eba181ab6c857c5117de4a14c0090bad</CoreClrCurrentRef> <BuildToolsCurrentRef>2f4e25ff2bccea64c3da62bff526f24ad3c032de</BuildToolsCurrentRef> - <PgoDataCurrentRef>9f8dfcd5e5193818acd05bdca82d4b044fd767ae</PgoDataCurrentRef> + <PgoDataCurrentRef>f48614552b7ebe6a20a413fe9b5e319c8c567304</PgoDataCurrentRef> </PropertyGroup> <!-- Tests/infrastructure dependency versions. --> <PropertyGroup> - <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-rtm-26514-02</MicrosoftPrivateCoreFxNETCoreAppPackageVersion> - <MicrosoftNETCorePlatformsPackageVersion>2.1.0-rtm-26514-02</MicrosoftNETCorePlatformsPackageVersion> - <PgoDataPackageVersion>2.1.0-release-20180514-0049</PgoDataPackageVersion> - <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.0-rtm-26514-02</MicrosoftNETCoreRuntimeCoreCLRPackageVersion> + <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-rtm</MicrosoftPrivateCoreFxNETCoreAppPackageVersion> + <MicrosoftNETCorePlatformsPackageVersion>2.1.0</MicrosoftNETCorePlatformsPackageVersion> + <PgoDataPackageVersion>2.1.0-release-20180529-0037</PgoDataPackageVersion> + <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.0-rtm-26515-07</MicrosoftNETCoreRuntimeCoreCLRPackageVersion> <XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion> <XunitConsoleNetcorePackageVersion>1.0.2-prerelease-00177</XunitConsoleNetcorePackageVersion> <XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion> <MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.4</MicrosoftDiagnosticsTracingTraceEventPackageVersion> <CommandLineParserVersion>2.1.1</CommandLineParserVersion> <VCRuntimeVersion>1.2.0</VCRuntimeVersion> - + <!-- Scenario tests install this version of Microsoft.NetCore.App, then patch coreclr binaries via xcopy. At the moment it is updated manually whenever breaking changes require it to move forward, but it would be nice if we could update it automatically as we do with many of the package versions above --> |