diff options
author | Juan Hoyos <juan.hoyos@microsoft.com> | 2019-11-11 15:40:59 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-11 15:40:59 -0800 |
commit | fd44c0fd4d749d2ad4a57f09e6a33814d60fc2a7 (patch) | |
tree | 4efec3b7bc4acb34e216054ed08cf5b8fb6a148f /global.json | |
parent | 816d9ee684202b21c91ac1480b517022a97a39b6 (diff) | |
download | coreclr-fd44c0fd4d749d2ad4a57f09e6a33814d60fc2a7.tar.gz coreclr-fd44c0fd4d749d2ad4a57f09e6a33814d60fc2a7.tar.bz2 coreclr-fd44c0fd4d749d2ad4a57f09e6a33814d60fc2a7.zip |
[release/3.1] Fix use of ilasm during test builds when using a 3.0 SDK (#27818)
* 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
Diffstat (limited to 'global.json')
-rw-r--r-- | global.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/global.json b/global.json index ecfdff806f..8ef11e2107 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.0.100-preview6-012264" + "dotnet": "3.0.100" }, "native-tools": { "cmake": "3.11.1", |