From 5200c93aece1599c88958cb68a37eb0114766a9d Mon Sep 17 00:00:00 2001 From: tincann Date: Wed, 30 May 2018 18:51:17 +0200 Subject: [PATCH] Remove references to ILAsmVersion.txt from build script --- init-tools.cmd | 2 -- init-tools.sh | 2 -- 2 files changed, 4 deletions(-) diff --git a/init-tools.cmd b/init-tools.cmd index fa0e44b991..cdb91cf357 100644 --- a/init-tools.cmd +++ b/init-tools.cmd @@ -73,8 +73,6 @@ if NOT exist "%BUILD_TOOLS_PATH%init-tools.cmd" ( :afterbuildtoolsrestore -:: Ask init-tools to also restore ILAsm -set /p ILASMCOMPILER_VERSION=< "%~dp0tools-local\ILAsmVersion.txt" echo Initializing BuildTools... echo Running: "%BUILD_TOOLS_PATH%init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> "%INIT_TOOLS_LOG%" diff --git a/init-tools.sh b/init-tools.sh index f45f492e4d..2745258b46 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -10,7 +10,6 @@ if [ -z "$__BUILDTOOLS_SOURCE" ]; then __BUILDTOOLS_SOURCE=https://dotnet.myget. export __BUILDTOOLS_USE_CSPROJ=true __BUILD_TOOLS_PACKAGE_VERSION=$(cat "$__scriptpath/BuildToolsVersion.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive __DOTNET_TOOLS_VERSION=$(cat "$__scriptpath/DotnetCLIVersion.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive -__ILASM_VERSION=$(cat "$__scriptpath/tools-local/ILAsmVersion.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive __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 @@ -154,7 +153,6 @@ fi echo "Using RID $__ILASM_RID for BuildTools native tools" -export ILASMCOMPILER_VERSION=$__ILASM_VERSION export NATIVE_TOOLS_RID=$__ILASM_RID echo "Initializing BuildTools..."