From 9c7d90a9cf837639c337f884c09fdefdcccbba66 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Sun, 30 Dec 2018 00:14:04 -0800
Subject: [PATCH] Fix build environment script

See https://github.com/dotnet/cli/issues/10513
---
 eng/restore-toolset.ps1 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eng/restore-toolset.ps1 b/eng/restore-toolset.ps1
index 319669ee1..f8e541c82 100644
--- a/eng/restore-toolset.ps1
+++ b/eng/restore-toolset.ps1
@@ -18,6 +18,8 @@ function InitializeCustomSDKToolset {
 
 function CreateBuildEnvScript()
 {
+  InitializeBuildTool | Out-Null # Make sure DOTNET_INSTALL_DIR is set
+
   Create-Directory $ArtifactsDir
   $scriptPath = Join-Path $ArtifactsDir "core-sdk-build-env.bat"
   $scriptContents = @"