summaryrefslogtreecommitdiff
path: root/ILAsmVersion.txt
diff options
context:
space:
mode:
authordotnet-maestro-bot <dotnet-maestro-bot@microsoft.com>2019-12-02 11:25:15 -0800
committerMatt Mitchell <mmitche@microsoft.com>2019-12-02 11:25:15 -0800
commit53826cad1db670d13c424f1afe048b3aad92f7ba (patch)
tree24bb67d520c38442723a666d23f2071a5c1138c1 /ILAsmVersion.txt
parent07e8b55f61bc729c6464961b1b8726865d4fc5de (diff)
downloadcoreclr-53826cad1db670d13c424f1afe048b3aad92f7ba.tar.gz
coreclr-53826cad1db670d13c424f1afe048b3aad92f7ba.tar.bz2
coreclr-53826cad1db670d13c424f1afe048b3aad92f7ba.zip
[automated] Merge branch 'release/3.0' => 'release/3.1' (#27922)
* Fix Segfault in PerfInfo Image Logging (#26910) * update branding for 3.0.2 (#27896) * update branding * remove stable properties from coreclr as it never stablises * [release/3.0] Fix use of ilasm during test builds when using a 3.0 SDK (#27820) * Add fix for restore of ilasm The restore logic in buildtools tried to use a netcoreapp2.1 TFM for Linux-musl. This ended up restoring Linux-x64 binaries which then broke the test build. This change works around this by saving a copy of the depproj that BuildTools used into the tree and restore it as a 3.0 app manually in init-tools on our side of the build. * Change to a 3.0 SDK for servicing * Bump test versions of ilasm and runtime package to match the RC * Move off of the old arm32 queue (#27905) * Add alpine3.10 testing to 3.0 (#27214) * Fix GetSequencePoints when profiler provides mapping via SetILInstrumentedCodeMap (#27843) Port #25802 to 3.0.2 * [release/3.0] Update dependencies from dotnet/core-setup (#27910) * Update dependencies from https://github.com/dotnet/core-setup build 20191016.12 - Microsoft.NETCore.App - 3.0.1-servicing-19516-12 * Update dependencies from https://github.com/dotnet/core-setup build 20191121.02 - Microsoft.NETCore.App - 3.0.2-servicing-19571-02
Diffstat (limited to 'ILAsmVersion.txt')
-rw-r--r--ILAsmVersion.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ILAsmVersion.txt b/ILAsmVersion.txt
index 9d451b5b66..2a6e60c71e 100644
--- a/ILAsmVersion.txt
+++ b/ILAsmVersion.txt
@@ -1 +1 @@
-3.0.0-preview6.19280.1
+3.0.0-rc2.19462.5