From b5c9dfb25f9b27bef6435a8cc0876a2cf55a0b15 Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Tue, 8 Jan 2019 17:08:07 -0800
Subject: [PATCH] Fix dogfood.sh

Various infrastructure changes or changes only to dogfood.ps1 have
left `source eng\dogfood.sh` broken.
---
 eng/dogfood.sh         | 16 +++++++++-------
 eng/restore-toolset.sh |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/eng/dogfood.sh b/eng/dogfood.sh
index 46a68a54b402..8bd1df53dcad 100644
--- a/eng/dogfood.sh
+++ b/eng/dogfood.sh
@@ -9,13 +9,15 @@ done
 scriptroot="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 . "$scriptroot/common/tools.sh"
+InitializeToolset
+. "$scriptroot/restore-toolset.sh"
 
-InitializeTools
+ReadGlobalVersion "dotnet"
+dotnet_sdk_version=$_ReadGlobalVersion
 
-export SDK_REPO_ROOT="$RepoRoot"
-export SDK_CLI_VERSION="$DotNetCliVersion"
-export MSBuildSDKsPath="$ArtifactsConfigurationDir/bin/Sdks"
+export SDK_REPO_ROOT="$repo_root"
+export SDK_CLI_VERSION="$dotnet_sdk_version"
+export MSBuildSDKsPath="$artifacts_dir/bin/$configuration/Sdks"
 export DOTNET_MSBUILD_SDK_RESOLVER_SDKS_DIR="$MSBuildSDKsPath"
-export NETCoreSdkBundledVersionsProps="$DotNetRoot/sdk/$DotNetCliVersion/Microsoft.NETCoreSdk.BundledVersions.props"
-export CustomAfterMicrosoftCommonTargets="$MSBuildSDKsPath/Microsoft.NET.Build.Extensions/msbuildExtensions-ver/Microsoft.Common.Targets/ImportAfter/Microsoft.NET.Build.Extensions.targets"
-export MicrosoftNETBuildExtensionsTargets="$CustomAfterMicrosoftCommonTargets"
+export NETCoreSdkBundledVersionsProps="$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version/Microsoft.NETCoreSdk.BundledVersions.props"
+export MicrosoftNETBuildExtensionsTargets="$MSBuildSDKsPath/Microsoft.NET.Build.Extensions/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.targets"
diff --git a/eng/restore-toolset.sh b/eng/restore-toolset.sh
index 9d8e915f0447..179f63a3286b 100644
--- a/eng/restore-toolset.sh
+++ b/eng/restore-toolset.sh
@@ -9,7 +9,7 @@ function InitializeCustomSDKToolset {
     return
   fi
   
-  InstallDotnetCli true
+  InitializeDotNetCli true
   InstallDotNetSharedFramework "1.0.5"
   InstallDotNetSharedFramework "1.1.2"
   InstallDotNetSharedFramework "2.1.0"
@@ -35,4 +35,4 @@ function InstallDotNetSharedFramework {
   fi
 }
 
-InitializeCustomSDKToolset
\ No newline at end of file
+InitializeCustomSDKToolset