From d0f40917bcf481945cf7b84bff7fadbf1a98f748 Mon Sep 17 00:00:00 2001
From: Andrew Stanton-Nurse <andrew@andrewnurse.net>
Date: Mon, 16 Nov 2015 10:20:47 -0800
Subject: [PATCH] fix Windows VSO build

---
 scripts/ci_build.cmd |  4 +++-
 scripts/compile.ps1  | 20 +++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/scripts/ci_build.cmd b/scripts/ci_build.cmd
index 450abcb75203..477a82231b33 100644
--- a/scripts/ci_build.cmd
+++ b/scripts/ci_build.cmd
@@ -1,6 +1,8 @@
 @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 %*
 
 exit /b %errorlevel%
diff --git a/scripts/compile.ps1 b/scripts/compile.ps1
index 3780a961ef6e..d91a7bbe360f 100644
--- a/scripts/compile.ps1
+++ b/scripts/compile.ps1
@@ -23,14 +23,20 @@ Download it from https://www.cmake.org
     & "$PSScriptRoot\install.ps1"
 
     # Put stage 0 on the path
-    $DotNetTools = "$($env:LOCALAPPDATA)\Microsoft\dotnet\cli"
-    if (Test-Path "$DotNetTools\dotnet.exe") {
+    $DotNetTools = $env:DOTNET_INSTALL_DIR
+    if (!$DotNetTools) {
+        $DotNetTools = "$($env:LOCALAPPDATA)\Microsoft\dotnet"
+    }
+
+    if (Test-Path "$DotNetTools\cli\dotnet.exe") {
         Write-Warning "Your stage0 is using the old layout"
-        $DnxDir = "$DotNetTools\dnx"
-        $env:PATH = "$DotNetTools;$StartPath"
-    } elseif (Test-Path "$DotNetTools\bin\dotnet.exe") {
-        $DnxDir = "$DotNetTools\bin\dnx"
-        $env:PATH = "$DotNetTools\bin;$StartPath"
+        $DnxDir = "$DotNetTools\cli\dnx"
+        $env:PATH = "$DotNetTools\cli;$StartPath"
+    } elseif (Test-Path "$DotNetTools\cli\bin\dotnet.exe") {
+        $DnxDir = "$DotNetTools\cli\bin\dnx"
+        $env:PATH = "$DotNetTools\cli\bin;$StartPath"
+    } else {
+        throw "Couldn't find stage0 dotnet tools!"
     }
 
     # Restore packages