From 776690aad2bf8f5ecf69ea7b26c66bcd17489637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?=
 <MichalStrehovsky@users.noreply.github.com>
Date: Wed, 22 Nov 2017 16:38:19 +0100
Subject: Ask buildtools to also restore ILAsm (#15103)

We should start with having this restored before we start using it to make sure that nobody has tools downloaded/initialized without ILAsm.
---
 init-tools.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'init-tools.sh')

diff --git a/init-tools.sh b/init-tools.sh
index 98a3ce30fd..387499d832 100755
--- a/init-tools.sh
+++ b/init-tools.sh
@@ -10,6 +10,7 @@ if [ -z "$__BUILDTOOLS_SOURCE" ]; then __BUILDTOOLS_SOURCE=https://dotnet.myget.
 export __BUILDTOOLS_USE_CSPROJ=true
 __BUILD_TOOLS_PACKAGE_VERSION=$(cat $__scriptpath/BuildToolsVersion.txt)
 __DOTNET_TOOLS_VERSION=$(cat $__scriptpath/DotnetCLIVersion.txt)
+__ILASM_VERSION=$(cat $__scriptpath/ILAsmVersion.txt)
 __BUILD_TOOLS_PATH=$__PACKAGES_DIR/microsoft.dotnet.buildtools/$__BUILD_TOOLS_PACKAGE_VERSION/lib
 __INIT_TOOLS_RESTORE_PROJECT=$__scriptpath/init-tools.msbuild
 __BUILD_TOOLS_SEMAPHORE=$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION/init-tools.complete
@@ -146,6 +147,15 @@ if [ ! -e $__BUILD_TOOLS_PATH ]; then
     fi
 fi
 
+if [ -z "$__ILASM_RID" ]; then
+    __ILASM_RID=$__PKG_RID-$__PKG_ARCH
+fi
+
+echo "Using RID $__ILASM_RID for BuildTools native tools"
+
+export ILASMCOMPILER_VERSION=$__ILASM_VERSION
+export NATIVE_TOOLS_RID=$__ILASM_RID
+
 echo "Initializing BuildTools..."
 echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR" >> $__init_tools_log
 
-- 
cgit v1.2.3