@@ -6,16 +6,11 @@ if [%PACKAGES_DIR%]==[] set PACKAGES_DIR=%~dp0packages\
66if [%TOOLRUNTIME_DIR% ]== [] set TOOLRUNTIME_DIR = %~dp0 Tools
77set DOTNET_PATH = %TOOLRUNTIME_DIR% \dotnetcli\
88if [%DOTNET_CMD% ]== [] set DOTNET_CMD = %DOTNET_PATH% dotnet.exe
9- set DOTNET_SDK_PATH = %TOOLRUNTIME_DIR% \dotnetclisdk\
10- if [%DOTNET_SDK_CMD% ]== [] set DOTNET_SDK_CMD = %DOTNET_SDK_PATH% dotnet.exe
119if [%BUILDTOOLS_SOURCE% ]== [] set BUILDTOOLS_SOURCE = https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json
1210set /P BUILDTOOLS_VERSION = < " %~dp0 BuildToolsVersion.txt"
1311set BUILD_TOOLS_PATH = %PACKAGES_DIR% Microsoft.DotNet.BuildTools\%BUILDTOOLS_VERSION% \lib\
14- set PROJECT_JSON_PATH = %TOOLRUNTIME_DIR% \%BUILDTOOLS_VERSION%
15- set PROJECT_JSON_FILE = %PROJECT_JSON_PATH% \project.json
16- set PROJECT_JSON_CONTENTS = { " dependencies" " Microsoft.DotNet.BuildTools" " %BUILDTOOLS_VERSION% " " frameworks" " netcoreapp1.0"
17- set BUILD_TOOLS_SEMAPHORE = %PROJECT_JSON_PATH% \init-tools.completed
18- set DUMMY_GLOBAL_JSON_PATH = %PACKAGES_DIR% global.json
12+ set INIT_TOOLS_RESTORE_PROJECT = %~dp0 init-tools.msbuild
13+ set BUILD_TOOLS_SEMAPHORE = %TOOLRUNTIME_DIR% \%BUILDTOOLS_VERSION% \init-tools.completed
1914
2015:: We do not want to run the first-time experience.
2116set DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
@@ -34,21 +29,15 @@ if exist "%BUILD_TOOLS_SEMAPHORE%" (
3429
3530if exist " %TOOLRUNTIME_DIR% " rmdir /S /Q " %TOOLRUNTIME_DIR% "
3631
37- if NOT exist " %PROJECT_JSON_PATH% " mkdir " %PROJECT_JSON_PATH% "
38- echo %PROJECT_JSON_CONTENTS% > " %PROJECT_JSON_FILE% "
3932echo Running %0 > " %INIT_TOOLS_LOG% "
4033
4134set /p DOTNET_VERSION = < " %~dp0 DotnetCLIVersion.txt"
4235if exist " %DOTNET_CMD% " goto :afterdotnetinstall
4336
44- :: core-setup repo has a global.json which causes a conflict with the init-tools publish step
45- if NOT exist " %PACKAGES_DIR% " mkdir %PACKAGES_DIR% > nul 2 >& 1
46- echo { " projects" > %DUMMY_GLOBAL_JSON_PATH%
47-
4837echo Installing dotnet cli...
4938if NOT exist " %DOTNET_PATH% " mkdir " %DOTNET_PATH% "
5039set DOTNET_ZIP_NAME = dotnet-dev-win-x64.%DOTNET_VERSION% .zip
51- set DOTNET_REMOTE_PATH = https://dotnetcli.azureedge.net/dotnet/preview/Binaries /%DOTNET_VERSION% /%DOTNET_ZIP_NAME%
40+ set DOTNET_REMOTE_PATH = https://dotnetcli.azureedge.net/dotnet/Sdk /%DOTNET_VERSION% /%DOTNET_ZIP_NAME%
5241set DOTNET_LOCAL_PATH = %DOTNET_PATH%%DOTNET_ZIP_NAME%
5342echo Installing '%DOTNET_REMOTE_PATH% ' to '%DOTNET_LOCAL_PATH% ' >> " %INIT_TOOLS_LOG% "
5443powershell -NoProfile -ExecutionPolicy unrestricted -Command " $retryCount = 0; $success = $false; do { try { (New-Object Net.WebClient).DownloadFile('%DOTNET_REMOTE_PATH% ', '%DOTNET_LOCAL_PATH% '); $success = $true; } catch { if ($retryCount -ge 6) { throw; } else { $retryCount++; Start-Sleep -Seconds (5 * $retryCount); } } } while ($success -eq $false); Add-Type -Assembly 'System.IO.Compression.FileSystem' -ErrorVariable AddTypeErrors; if ($AddTypeErrors.Count -eq 0) { [System.IO.Compression.ZipFile]::ExtractToDirectory('%DOTNET_LOCAL_PATH% ', '%DOTNET_PATH% ') } else { (New-Object -com shell.application).namespace('%DOTNET_PATH% ').CopyHere((new-object -com shell.application).namespace('%DOTNET_LOCAL_PATH% ').Items(),16) }" >> " %INIT_TOOLS_LOG% "
@@ -59,27 +48,10 @@ if NOT exist "%DOTNET_LOCAL_PATH%" (
5948
6049:afterdotnetinstall
6150
62- if exist " %DOTNET_SDK_CMD% " goto :afterdotnetsdkinstall
63-
64- echo Installing dotnet sdk...
65- set /p DOTNET_SDK_VERSION = < " %~dp0 DotnetCLISdkVersion.txt"
66- if NOT exist " %DOTNET_SDK_PATH% " mkdir " %DOTNET_SDK_PATH% "
67- set DOTNET_ZIP_NAME = dotnet-dev-win-x64.%DOTNET_SDK_VERSION% .zip
68- set DOTNET_REMOTE_PATH = https://dotnetcli.azureedge.net/dotnet/Sdk/%DOTNET_SDK_VERSION% /%DOTNET_ZIP_NAME%
69- set DOTNET_LOCAL_PATH = %DOTNET_SDK_PATH%%DOTNET_ZIP_NAME%
70- echo Installing '%DOTNET_REMOTE_PATH% ' to '%DOTNET_LOCAL_PATH% ' >> " %INIT_TOOLS_LOG% "
71- powershell -NoProfile -ExecutionPolicy unrestricted -Command " $retryCount = 0; $success = $false; do { try { (New-Object Net.WebClient).DownloadFile('%DOTNET_REMOTE_PATH% ', '%DOTNET_LOCAL_PATH% '); $success = $true; } catch { if ($retryCount -ge 6) { throw; } else { $retryCount++; Start-Sleep -Seconds (5 * $retryCount); } } } while ($success -eq $false); Add-Type -Assembly 'System.IO.Compression.FileSystem' -ErrorVariable AddTypeErrors; if ($AddTypeErrors.Count -eq 0) { [System.IO.Compression.ZipFile]::ExtractToDirectory('%DOTNET_LOCAL_PATH% ', '%DOTNET_SDK_PATH% ') } else { (New-Object -com shell.application).namespace('%DOTNET_SDK_PATH% ').CopyHere((new-object -com shell.application).namespace('%DOTNET_LOCAL_PATH% ').Items(),16) }" >> " %INIT_TOOLS_LOG% "
72- if NOT exist " %DOTNET_LOCAL_PATH% "
73- echo ERROR: Could not install dotnet cli correctly. See '%INIT_TOOLS_LOG% ' for more details. 1 >& 2
74- exit /b 1
75- )
76-
77- :afterdotnetsdkinstall
78-
7951if exist " %BUILD_TOOLS_PATH% " goto :afterbuildtoolsrestore
8052echo Restoring BuildTools version %BUILDTOOLS_VERSION% ...
81- echo Running: " %DOTNET_CMD% " " %PROJECT_JSON_FILE % " %PACKAGES_DIR% --source " %BUILDTOOLS_SOURCE% " >> " %INIT_TOOLS_LOG% "
82- call " %DOTNET_CMD% " " %PROJECT_JSON_FILE % " %PACKAGES_DIR% --source " %BUILDTOOLS_SOURCE% " >> " %INIT_TOOLS_LOG% "
53+ echo Running: " %DOTNET_CMD% " " %INIT_TOOLS_RESTORE_PROJECT % " %PACKAGES_DIR% --source " %BUILDTOOLS_SOURCE% " /p:BuildToolsPackageVersion= %BUILDTOOLS_VERSION% >> " %INIT_TOOLS_LOG% "
54+ call " %DOTNET_CMD% " " %INIT_TOOLS_RESTORE_PROJECT % " %PACKAGES_DIR% --source " %BUILDTOOLS_SOURCE% " /p:BuildToolsPackageVersion= %BUILDTOOLS_VERSION% >> " %INIT_TOOLS_LOG% "
8355if NOT exist " %BUILD_TOOLS_PATH% init-tools.cmd"
8456 echo ERROR: Could not restore build tools correctly. See '%INIT_TOOLS_LOG% ' for more details. 1 >& 2
8557 exit /b 1
@@ -96,16 +68,6 @@ if not [%INIT_TOOLS_ERRORLEVEL%]==[0] (
9668 exit /b %INIT_TOOLS_ERRORLEVEL%
9769)
9870
99- echo Updating CLI NuGet Frameworks map...
100- robocopy " %TOOLRUNTIME_DIR% " " %TOOLRUNTIME_DIR% \dotnetcli\sdk\%DOTNET_VERSION% " >> " %INIT_TOOLS_LOG% "
101- set UPDATE_CLI_ERRORLEVEL = %ERRORLEVEL%
102- if %UPDATE_CLI_ERRORLEVEL% GTR 1 (
103- echo ERROR: Failed to update Nuget for CLI {Error level %UPDATE_CLI_ERRORLEVEL% }. Please check '%INIT_TOOLS_LOG% ' for more details. 1 >& 2
104- exit /b %UPDATE_CLI_ERRORLEVEL%
105- )
106-
107- if exist %~dp0 tools-override xcopy /Y/e/s %~dp0 tools-override\* %TOOLRUNTIME_DIR%
108-
10971:: Create sempahore file
11072echo Done initializing tools.
11173echo Init-Tools.cmd completed for BuildTools Version: %BUILDTOOLS_VERSION% > " %BUILD_TOOLS_SEMAPHORE% "
0 commit comments