mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix Windows VSO build

Browse source
This commit is contained in:
Andrew Stanton-Nurse 2015-11-16 10:20:47 -08:00
parent 4cc15b1246
commit d0f40917bc
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/ci_build.cmd
View file

@ -1,6 +1,8 @@
@echo off @echo off
set DOTNET_INSTALL_DIR=%~dp0..\artifacts\win7-x64\stage0 pushd %~dp0..
set DOTNET_INSTALL_DIR=%CD%\artifacts\win7-x64\stage0
popd
CALL %~dp0..\build.cmd %* CALL %~dp0..\build.cmd %*
exit /b %errorlevel% exit /b %errorlevel%

20
scripts/compile.ps1
View file

@ -23,14 +23,20 @@ Download it from https://www.cmake.org
& "$PSScriptRoot\install.ps1" & "$PSScriptRoot\install.ps1"
# Put stage 0 on the path # Put stage 0 on the path
$DotNetTools = "$($env:LOCALAPPDATA)\Microsoft\dotnet\cli" $DotNetTools = $env:DOTNET_INSTALL_DIR
if (Test-Path "$DotNetTools\dotnet.exe") { if (!$DotNetTools) {
$DotNetTools = "$($env:LOCALAPPDATA)\Microsoft\dotnet"
}
if (Test-Path "$DotNetTools\cli\dotnet.exe") {
Write-Warning "Your stage0 is using the old layout" Write-Warning "Your stage0 is using the old layout"
$DnxDir = "$DotNetTools\dnx" $DnxDir = "$DotNetTools\cli\dnx"
$env:PATH = "$DotNetTools;$StartPath" $env:PATH = "$DotNetTools\cli;$StartPath"
} elseif (Test-Path "$DotNetTools\bin\dotnet.exe") { } elseif (Test-Path "$DotNetTools\cli\bin\dotnet.exe") {
$DnxDir = "$DotNetTools\bin\dnx" $DnxDir = "$DotNetTools\cli\bin\dnx"
$env:PATH = "$DotNetTools\bin;$StartPath" $env:PATH = "$DotNetTools\cli\bin;$StartPath"
} else {
throw "Couldn't find stage0 dotnet tools!"
} }
# Restore packages # Restore packages