Merge pull request #6003 from karajas/allowBootstrapConfig

Allow bootstrap directory and nuget packages to be configured

run-build.ps1

@@ -29,7 +29,9 @@ if($Help)
 
 $env:CONFIGURATION = $Configuration;
 $RepoRoot = "$PSScriptRoot"
-$env:NUGET_PACKAGES = "$RepoRoot\.nuget\packages"
+if(!$env:NUGET_PACKAGES){
+  $env:NUGET_PACKAGES = "$RepoRoot\.nuget\packages"
+}
 
 if($NoPackage)
 {
@@ -71,6 +73,10 @@ $env:VSTEST_TRACE_BUILD=1
 
 # set the base tools directory
 $toolsLocalPath = Join-Path $PSScriptRoot "build_tools"
+if($env:BOOTSTRAP_INSTALL_DIR)
+{
+  $toolsLocalPath = $env:BOOTSTRAP_INSTALL_DIR
+}
 $bootStrapperPath = Join-Path $toolsLocalPath "bootstrap.ps1"
 # if the boot-strapper script doesn't exist then download it
 if ((Test-Path $bootStrapperPath) -eq 0)

run-build.sh

@@ -59,7 +59,7 @@ LINUX_PORTABLE_INSTALL_ARGS=
 CUSTOM_BUILD_ARGS=
 
 # Set nuget package cache under the repo
-export NUGET_PACKAGES="$REPOROOT/.nuget/packages"
+[ -z $NUGET_PACKAGES ] && export NUGET_PACKAGES="$REPOROOT/.nuget/packages"
 
 args=( "$@" )
 
@@ -147,6 +147,9 @@ export VSTEST_TRACE_BUILD=1
 
 DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 toolsLocalPath="$REPOROOT/build_tools"
+if [ ! -z $BOOTSTRAP_INSTALL_DIR]; then
+  toolsLocalPath = $BOOTSTRAP_INSTALL_DIR
+fi
 bootStrapperPath="$toolsLocalPath/bootstrap.sh"
 dotnetInstallPath="$toolsLocalPath/dotnet-install.sh"
 if [ ! -f $bootStrapperPath ]; then