diff --git a/.gitignore b/.gitignore
index 581afbfa7919c..672538284bce3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 x64/
 [Bb]in/
 [Oo]bj/
+.dotnet/
 
 # Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
 !packages/*/build/
diff --git a/build/Targets/Imports.targets b/build/Targets/Imports.targets
index 3e9f282b48d22..ed70d10b6ab43 100644
--- a/build/Targets/Imports.targets
+++ b/build/Targets/Imports.targets
@@ -118,17 +118,16 @@
           DestinationFolder="$(OutDir)" />
   </Target>
 
-  <!-- Guard against MSBuild picking the wrong SDK version. Its resolver does not always properly enforce
-       the SDK specified in global.json 
-       
-       https://github.com/dotnet/core-setup/issues/3805
-       -->
-  <Target Name="BeforeBuild" Condition="'$(MSBuildRuntimeType)' != 'Core'">
-    <ValidateBuildEnvironment
-      MSBuildBinPath="$(MSBuildBinPath)"
-      MSBuildMinimumFileVersion="15.7.0"
-      MSBuildMinimumDisplayVersion="MSBuild 15.7"
-      />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.CompareVersions" AssemblyFile="$(RoslynToolsBuildTasksAssembly)" />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.SingleError" AssemblyFile="$(RoslynToolsBuildTasksAssembly)" />
+
+  <Target Name="_CheckRequiredMSBuildVersion" BeforeTargets="BeforeBuild">
+    <CompareVersions Left="$(MSBuildVersion)" Right="$(MinimumMSBuildVersion)">
+      <Output TaskParameter="Result" PropertyName="_VersionComparisonResult"/>
+    </CompareVersions>
+  
+    <SingleError Text="The msbuild version $(MSBuildVersion) is below the minimum required version $(MinimumMSBuildVersion)"
+                 Condition="$(_VersionComparisonResult) &lt; 0"/>
   </Target> 
 
   <Target Name="DisableAnalyzers"
diff --git a/build/Targets/Packages.props b/build/Targets/Packages.props
index facb6dd1be015..b7617021c2ed0 100644
--- a/build/Targets/Packages.props
+++ b/build/Targets/Packages.props
@@ -162,16 +162,15 @@
     <NuGetVisualStudioVersion>4.0.0-rc-2048</NuGetVisualStudioVersion>
     <MicrosoftDiaSymReaderPdb2PdbVersion>1.1.0-beta1-62506-02</MicrosoftDiaSymReaderPdb2PdbVersion>
     <RestSharpVersion>105.2.3</RestSharpVersion>
-    <RoslynBuildUtilVersion>0.9.8-beta</RoslynBuildUtilVersion>
     <RoslynDependenciesOptimizationDataVersion>2.11.0-beta1-63312-06</RoslynDependenciesOptimizationDataVersion>
     <RoslynDiagnosticsAnalyzersVersion>$(RoslynDiagnosticsNugetPackageVersion)</RoslynDiagnosticsAnalyzersVersion>
     <RoslynToolsMicrosoftLocateVSVersion>0.2.4-beta</RoslynToolsMicrosoftLocateVSVersion>
     <RoslynToolsVSIXExpInstallerVersion>1.0.0-beta2-63222-01</RoslynToolsVSIXExpInstallerVersion>
     <RoslynToolsModifyVsixManifestVersion>1.0.0-beta2-63222-01</RoslynToolsModifyVsixManifestVersion>
     <RoslynToolsMSBuildVersion>0.5.0-alpha</RoslynToolsMSBuildVersion>
-    <RoslynToolsNuGetRepackVersion>1.0.0-beta2-63223-01</RoslynToolsNuGetRepackVersion>
+    <RoslynToolsNuGetRepackVersion>1.0.0-beta3.18523.2</RoslynToolsNuGetRepackVersion>
     <RoslynToolsReferenceAssembliesVersion>0.1.3</RoslynToolsReferenceAssembliesVersion>
-    <RoslynToolsBuildTasksVersion>1.0.0-beta3.18513.2</RoslynToolsBuildTasksVersion>
+    <RoslynToolsBuildTasksVersion>1.0.0-beta3.18525.2</RoslynToolsBuildTasksVersion>
     <RoslynToolsLightUpSystemRuntimeLoaderFixedVersion>4.3.0</RoslynToolsLightUpSystemRuntimeLoaderFixedVersion>
     <RoslynMicrosoftVisualStudioExtensionManagerVersion>0.0.4</RoslynMicrosoftVisualStudioExtensionManagerVersion>
     <StreamJsonRpcVersion>1.3.23</StreamJsonRpcVersion>
diff --git a/build/Targets/RepoToolset/BuildReleasePackages.targets b/build/Targets/RepoToolset/BuildReleasePackages.targets
index c3258c73103fa..30c1acf043307 100644
--- a/build/Targets/RepoToolset/BuildReleasePackages.targets
+++ b/build/Targets/RepoToolset/BuildReleasePackages.targets
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <_NuGetRepackAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(NuGetPackageRoot)roslyntools.nugetrepack.buildtasks\$(RoslynToolsNuGetRepackVersion)\tools\net461\RoslynTools.NuGetRepack.BuildTasks.dll</_NuGetRepackAssembly>
-    <_NuGetRepackAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)roslyntools.nugetrepack.buildtasks\$(RoslynToolsNuGetRepackVersion)\tools\netcoreapp2.0\RoslynTools.NuGetRepack.BuildTasks.dll</_NuGetRepackAssembly>
+    <_NuGetRepackAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(NuGetPackageRoot)roslyntools.nugetrepack.buildtasks\$(RoslynToolsNuGetRepackVersion)\tools\net472\RoslynTools.NuGetRepack.BuildTasks.dll</_NuGetRepackAssembly>
+    <_NuGetRepackAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)roslyntools.nugetrepack.buildtasks\$(RoslynToolsNuGetRepackVersion)\tools\netcoreapp2.1\RoslynTools.NuGetRepack.BuildTasks.dll</_NuGetRepackAssembly>
   </PropertyGroup>
 
   <UsingTask TaskName="Roslyn.Tools.UpdatePackageVersionTask" AssemblyFile="$(_NuGetRepackAssembly)" />
diff --git a/build/Targets/RepoToolset/BuildTasks.props b/build/Targets/RepoToolset/BuildTasks.props
index 67497365ea3d3..d8927ecaacb41 100644
--- a/build/Targets/RepoToolset/BuildTasks.props
+++ b/build/Targets/RepoToolset/BuildTasks.props
@@ -5,7 +5,7 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
   <PropertyGroup>
-    <RoslynToolsBuildTasksAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(NuGetPackageRoot)roslyntools.buildtasks\$(RoslynToolsBuildTasksVersion)\tools\net461\RoslynTools.BuildTasks.dll</RoslynToolsBuildTasksAssembly>
-    <RoslynToolsBuildTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)roslyntools.buildtasks\$(RoslynToolsBuildTasksVersion)\tools\netcoreapp2.0\RoslynTools.BuildTasks.dll</RoslynToolsBuildTasksAssembly>
+    <RoslynToolsBuildTasksAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(NuGetPackageRoot)roslyntools.buildtasks\$(RoslynToolsBuildTasksVersion)\tools\net472\RoslynTools.BuildTasks.dll</RoslynToolsBuildTasksAssembly>
+    <RoslynToolsBuildTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)roslyntools.buildtasks\$(RoslynToolsBuildTasksVersion)\tools\netcoreapp2.1\RoslynTools.BuildTasks.dll</RoslynToolsBuildTasksAssembly>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/build/Targets/RepoToolset/RepoLayout.props b/build/Targets/RepoToolset/RepoLayout.props
index 886def152d5e0..ded43eb983271 100644
--- a/build/Targets/RepoToolset/RepoLayout.props
+++ b/build/Targets/RepoToolset/RepoLayout.props
@@ -19,7 +19,22 @@
   
   <PropertyGroup>
     <RepoRoot Condition="'$(RepoRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'global.json'))\</RepoRoot>
-   
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Respect environment variable for the .NET install directory if set; otherwise, use the repo default location -->
+    <_DotNetRoot>$(DOTNET_INSTALL_DIR)</_DotNetRoot>
+    <_DotNetRoot Condition="'$(_DotNetRoot)' == ''">$(RepoRoot).dotnet\</_DotNetRoot>
+    <_DotNetRoot Condition="!HasTrailingSlash('$(_DotNetRoot)')">$(_DotNetRoot)\</_DotNetRoot>
+
+    <!-- Let the exec task find dotnet on PATH -->
+    <_DotNetRoot Condition="!Exists($(_DotNetRoot))"/>
+
+    <DotNetTool Condition="'$(OS)' == 'Windows_NT'">$(_DotNetRoot)dotnet.exe</DotNetTool>
+    <DotNetTool Condition="'$(OS)' != 'Windows_NT'">$(_DotNetRoot)dotnet</DotNetTool>
+  </PropertyGroup>
+
+  <PropertyGroup>
     <!--
       TODO: values differ from RepoToolset 
     -->
diff --git a/build/Targets/RepoToolset/Version.targets b/build/Targets/RepoToolset/Version.targets
index c39351f7a2253..d984749cdbf08 100644
--- a/build/Targets/RepoToolset/Version.targets
+++ b/build/Targets/RepoToolset/Version.targets
@@ -37,4 +37,11 @@
       <AssemblyVersion Condition="'$(AssemblyVersion)' == ''">42.42.42.42</AssemblyVersion>
     </PropertyGroup>
   </Target>
+
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.CheckRequiredDotNetVersion" AssemblyFile="$(RoslynToolsBuildTasksAssembly)" />
+
+  <Target Name="_CheckRequiredDotNetVersion" BeforeTargets="BeforeBuild">
+    <Microsoft.DotNet.Arcade.Sdk.CheckRequiredDotNetVersion RepositoryRoot="$(RepoRoot)" SdkVersion="$(NETCoreSdkVersion)" />
+  </Target>
+
 </Project>
diff --git a/build/Targets/Settings.props b/build/Targets/Settings.props
index 066bc78694b03..34170d109e7a8 100644
--- a/build/Targets/Settings.props
+++ b/build/Targets/Settings.props
@@ -18,6 +18,7 @@
   <Import Project="RepoToolset\ProjectLayout.props" />
   <Import Project="RepoToolset\DefaultVersions.props"/>
   <Import Project="RepoToolset\ProjectDefaults.props" />
+  <Import Project="RepoToolset\BuildTasks.props" />
   <Import Project="RepoToolset\StrongName.props" />
   <Import Project="RepoToolset\VisualStudio.props"/>
   <Import Project="Tools.props" />
@@ -46,6 +47,7 @@
     <VisualStudioReferenceMajorVersion Condition="'$(VisualStudioReferenceMajorVersion)' == ''">$(VisualStudioVersion.Substring($([System.Convert]::ToInt32(0)), $(VisualStudioVersion.IndexOf('.'))))</VisualStudioReferenceMajorVersion>
     <VisualStudioReferenceAssemblyVersion Condition="'$(VisualStudioReferenceAssemblyVersion)' == ''">$(VisualStudioReferenceMajorVersion).0.0.0</VisualStudioReferenceAssemblyVersion>
     <MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
+    <MinimumMSBuildVersion>15.7.0</MinimumMSBuildVersion>
 
     <!-- Disable AppX packaging for the Roslyn source. Not setting this to false has the side effect
          that any builds of portable projects end up in a sub folder of $(OutputPath). Search for this flag in
@@ -137,12 +139,6 @@
   <UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.ValidateBootstrap"
              AssemblyFile="$(RoslynToolsetDirectory)tools\Microsoft.Build.Tasks.CodeAnalysis.dll"
              Condition="'$(BootstrapBuildPath)' != ''" />
-  <UsingTask TaskName="Roslyn.MSBuild.Util.FindNuGetAssetsForVsix"
-             AssemblyFile="$(NuGetPackageRoot)Roslyn.Build.Util\$(RoslynBuildUtilVersion)\lib\net46\Roslyn.MSBuild.Util.dll"
-             Condition="'$(OS)' == 'Windows_NT'" />
-  <UsingTask TaskName="Roslyn.MSBuild.Util.ValidateBuildEnvironment"
-             AssemblyFile="$(NuGetPackageRoot)Roslyn.Build.Util\$(RoslynBuildUtilVersion)\lib\net46\Roslyn.MSBuild.Util.dll"
-             Condition="'$(OS)' == 'Windows_NT'" />
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeQuality.Analyzers" Version="$(MicrosoftCodeQualityAnalyzersVersion)" PrivateAssets="all" />
diff --git a/build/ToolsetPackages/RoslynToolset.csproj b/build/ToolsetPackages/RoslynToolset.csproj
index 7cb4897297bd2..f754ace6d13f0 100644
--- a/build/ToolsetPackages/RoslynToolset.csproj
+++ b/build/ToolsetPackages/RoslynToolset.csproj
@@ -27,7 +27,6 @@
     <PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativeVersion)" ExcludeAssets="all" />
     <PackageReference Include="Microsoft.Net.Compilers" Version="$(MicrosoftNetCompilersVersion)" ExcludeAssets="all" />
     <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="$(MicrosoftVSSDKBuildToolsVersion)" ExcludeAssets="all" />
-    <PackageReference Include="Roslyn.Build.Util" Version="$(RoslynBuildUtilVersion)" ExcludeAssets="all" />
     <PackageReference Include="RoslynDependencies.OptimizationData" Version="$(RoslynDependenciesOptimizationDataVersion)" ExcludeAssets="all" />
     <PackageReference Include="RoslynTools.Microsoft.LocateVS" Version="$(RoslynToolsMicrosoftLocateVSVersion)" ExcludeAssets="all" />
     <PackageReference Include="RoslynTools.VSIXExpInstaller" Version="$(RoslynToolsVSIXExpInstallerVersion)" ExcludeAssets="all" />
diff --git a/build/scripts/build-utils.ps1 b/build/scripts/build-utils.ps1
index fdaebd4f72ae5..53ff9e9186973 100644
--- a/build/scripts/build-utils.ps1
+++ b/build/scripts/build-utils.ps1
@@ -3,9 +3,10 @@
 Set-StrictMode -version 2.0
 $ErrorActionPreference="Stop"
 
-# Declare a number of useful variables for other scripts to use
-[string]$repoDir = Resolve-Path (Join-Path $PSScriptRoot "..\..")
-[string]$binariesDir = Join-Path $repoDir "Binaries"
+# Import Arcade functions
+. (Join-Path $PSScriptRoot "tools.ps1")
+
+[string]$binariesDir = Join-Path $RepoRoot "Binaries"
 
 # Handy function for executing a command in powershell and throwing if it 
 # fails.  
@@ -62,7 +63,7 @@ function Exec-CommandCore([string]$command, [string]$commandArgs, [switch]$useCo
     if ($useConsole) {
         $exitCode = Exec-Process $command $commandArgs
         if ($exitCode -ne 0) { 
-            throw "Command failed to execute with exit code $($process.ExitCode): $command $commandArgs" 
+            throw "Command failed to execute with exit code $($exitCode): $command $commandArgs" 
         }
         return
     }
@@ -144,57 +145,12 @@ function Exec-Script([string]$script, [string]$scriptArgs = "") {
 # Ensure the proper SDK in installed in our %PATH%. This is how MSBuild locates the 
 # SDK. Returns the location to the dotnet exe
 function Ensure-DotnetSdk() {
-    # Check to see if the specified dotnet installations meets our build requirements
-    function Test-DotnetDir([string]$dotnetDir, [string]$runtimeVersion, [string]$sdkVersion) {
-        $sdkPath = Join-Path $dotnetDir "sdk\$sdkVersion"
-        $runtimePath = Join-Path $dotnetDir "shared\Microsoft.NETCore.App\$runtimeVersion"
-        return (Test-Path $sdkPath) -and (Test-Path $runtimePath)
-    }
-
-    $sdkVersion = Get-ToolVersion "dotnetSdk"
-    $runtimeVersion = Get-ToolVersion "dotnetRuntime"
-
-    # Get the path to dotnet.exe. This is the first path on %PATH% that contains the 
-    # dotnet.exe instance. Many SDK tools use this to locate items like the SDK.
-    function Get-DotnetDir() { 
-        foreach ($part in ${env:PATH}.Split(';', [System.StringSplitOptions]::RemoveEmptyEntries)) {
-            $dotnetExe = Join-Path $part "dotnet.exe"
-            if (Test-Path $dotnetExe) {
-                return $part
-            }
-        }
-
-        return $null
-    }
+  if (-not (Test-Path global:_dotNetExe)) {
+    $global:_dotNetExe = Join-Path (InitializeDotNetCli -install:$true) "dotnet.exe"
+  }
 
-    # First check that dotnet is already on the path with the correct SDK version
-    $dotnetDir = Get-DotnetDir
-    if (($dotnetDir -ne $null) -and (Test-DotnetDir $dotnetDir $runtimeVersion $sdkVersion)) { 
-        return (Join-Path $dotnetDir "dotnet.exe")
-    }
-
-    # Ensure the downloaded dotnet of the appropriate version is located in the 
-    # Binaries\Tools directory
-    $toolsDir = Join-Path $binariesDir "Tools"
-    $cliDir = Join-Path $toolsDir "dotnet"
-    if (-not (Test-DotnetDir $cliDir $runtimeVersion $sdkVersion)) {
-        Write-Host "Downloading CLI $sdkVersion"
-        Create-Directory $cliDir
-        Create-Directory $toolsDir
-        $destFile = Join-Path $toolsDir "dotnet-install.ps1"
-        [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-        $webClient = New-Object -TypeName "System.Net.WebClient"
-        $webClient.DownloadFile("https://dot.net/v1/dotnet-install.ps1", $destFile)
-        Exec-Block { & $destFile -Version $sdkVersion -InstallDir $cliDir } | Out-Null
-        Exec-Block { & $destFile -Version $runtimeVersion -SharedRuntime -InstallDir $cliDir } | Out-Null
-    }
-    else {
-        ${env:PATH} = "$cliDir;${env:PATH}"
-    }
-
-    return (Join-Path $cliDir "dotnet.exe")
+  return $global:_dotNetExe
 }
-
 # Ensure a basic tool used for building our Repo is installed and 
 # return the path to it.
 function Ensure-BasicTool([string]$name, [string]$version = "") {
@@ -204,10 +160,9 @@ function Ensure-BasicTool([string]$name, [string]$version = "") {
 
     $p = Join-Path (Get-PackagesDir) "$($name)\$($version)"
     if (-not (Test-Path $p)) {
-        $toolsetProject = Join-Path $repoDir "build\ToolsetPackages\RoslynToolset.csproj"
-        $dotnet = Ensure-DotnetSdk
+        $toolsetProject = Join-Path $RepoRoot "build\ToolsetPackages\RoslynToolset.csproj"
         Write-Host "Downloading $name"
-        Restore-Project $dotnet $toolsetProject
+        Restore-Project $toolsetProject
     }
     
     return $p
@@ -227,9 +182,7 @@ function Ensure-MSBuild([switch]$xcopy = $false) {
         }
     }
 
-    $p = Join-Path $msbuildDir "msbuild.exe"
-    $dotnetExe = Ensure-DotnetSdk
-    return $p
+    return Join-Path $msbuildDir "msbuild.exe"
 }
 
 # Returns the msbuild exe path and directory as a single return. This makes it easy 
@@ -267,12 +220,12 @@ function Get-VersionCore([string]$name, [string]$versionFile) {
 
 # Return the version of the NuGet package as used in this repo
 function Get-PackageVersion([string]$name) {
-    return Get-VersionCore $name (Join-Path $repoDir "build\Targets\Packages.props")
+    return Get-VersionCore $name (Join-Path $RepoRoot "build\Targets\Packages.props")
 }
 
 # Return the version of the specified tool
 function Get-ToolVersion([string]$name) {
-    return Get-VersionCore $name (Join-Path $repoDir "build\Targets\Tools.props")
+    return Get-VersionCore $name (Join-Path $RepoRoot "build\Targets\Tools.props")
 }
 
 # Locate the directory where our NuGet packages will be deployed.  Needs to be kept in sync
@@ -425,10 +378,10 @@ function Clear-PackageCache() {
 }
 
 # Restore a single project
-function Restore-Project([string]$dotnetExe, [string]$projectFileName, [string]$logFilePath = "") {
+function Restore-Project([string]$projectFileName, [string]$logFilePath = "") {
     $projectFilePath = $projectFileName
     if (-not (Test-Path $projectFilePath)) {
-        $projectFilePath = Join-Path $repoDir $projectFileName
+        $projectFilePath = Join-Path $RepoRoot $projectFileName
     }
 
     $logArg = ""
@@ -436,7 +389,7 @@ function Restore-Project([string]$dotnetExe, [string]$projectFileName, [string]$
         $logArg = " /bl:$logFilePath"
     }
 
-    Exec-Console $dotnet "restore --verbosity quiet $projectFilePath $logArg"
+    Exec-Console (Ensure-DotNetSdk) "restore --verbosity quiet $projectFilePath $logArg"
 }
 
 function Unzip-File([string]$zipFilePath, [string]$outputDir) {
diff --git a/build/scripts/build.ps1 b/build/scripts/build.ps1
index 60b94a4e3c256..27892d6a7b62b 100644
--- a/build/scripts/build.ps1
+++ b/build/scripts/build.ps1
@@ -186,7 +186,7 @@ function Restore-Packages() {
 
     Write-Host "Restoring Roslyn Toolset"
     $logFilePath = if ($binaryLog) { Join-Path $logsDir "Restore-RoslynToolset.binlog" } else { "" }
-    Restore-Project $dotnet "build\ToolsetPackages\RoslynToolset.csproj" $logFilePath
+    Restore-Project "build\ToolsetPackages\RoslynToolset.csproj" $logFilePath
 
     Write-Host "Restoring RepoToolset"
     $logFilePath = if ($binaryLog) { Join-Path $logsDir "Restore-RepoToolset.binlog" } else { "" }
@@ -194,7 +194,7 @@ function Restore-Packages() {
 
     Write-Host "Restoring Roslyn"
     $logFilePath = if ($binaryLog) { Join-Path $logsDir "Restore-Roslyn.binlog" } else { "" }
-    Restore-Project $dotnet "Roslyn.sln" $logFilePath
+    Restore-Project "Roslyn.sln" $logFilePath
 }
 
 # Create a bootstrap build of the compiler.  Returns the directory where the bootstrap build
@@ -262,7 +262,7 @@ function Build-Artifacts() {
 
 function Build-InsertionItems() {
 
-    $setupDir = Join-Path $repoDir "src\Setup"
+    $setupDir = Join-Path $RepoRoot "src\Setup"
     Push-Location $setupDir
     try {
         Write-Host "Building VS Insertion artifacts"
@@ -490,11 +490,11 @@ function Ensure-ProcDump() {
 function Redirect-Temp() {
     $temp = Join-Path $binariesDir "Temp"
     Create-Directory $temp
-    Copy-Item (Join-Path $repoDir "src\Workspaces\CoreTestUtilities\Resources\.editorconfig") $temp
-    Copy-Item (Join-Path $repoDir "src\Workspaces\CoreTestUtilities\Resources\Directory.Build.props") $temp
-    Copy-Item (Join-Path $repoDir "src\Workspaces\CoreTestUtilities\Resources\Directory.Build.targets") $temp
-    Copy-Item (Join-Path $repoDir "src\Workspaces\CoreTestUtilities\Resources\Directory.Build.rsp") $temp
-    Copy-Item (Join-Path $repoDir "src\Workspaces\CoreTestUtilities\Resources\NuGet.Config") $temp
+    Copy-Item (Join-Path $RepoRoot "src\Workspaces\CoreTestUtilities\Resources\.editorconfig") $temp
+    Copy-Item (Join-Path $RepoRoot "src\Workspaces\CoreTestUtilities\Resources\Directory.Build.props") $temp
+    Copy-Item (Join-Path $RepoRoot "src\Workspaces\CoreTestUtilities\Resources\Directory.Build.targets") $temp
+    Copy-Item (Join-Path $RepoRoot "src\Workspaces\CoreTestUtilities\Resources\Directory.Build.rsp") $temp
+    Copy-Item (Join-Path $RepoRoot "src\Workspaces\CoreTestUtilities\Resources\NuGet.Config") $temp
     ${env:TEMP} = $temp
     ${env:TMP} = $temp
 }
@@ -531,13 +531,14 @@ function Stop-VSProcesses() {
 }
 
 try {
-    . (Join-Path $PSScriptRoot "build-utils.ps1")
-    Push-Location $repoDir
+    Process-Arguments
 
-    Write-Host "Repo Dir $repoDir"
-    Write-Host "Binaries Dir $binariesDir"
+   . (Join-Path $PSScriptRoot "build-utils.ps1")
 
-    Process-Arguments
+    Push-Location $RepoRoot
+
+    Write-Host "Repo Dir $RepoRoot"
+    Write-Host "Binaries Dir $binariesDir"
 
     $msbuild = Ensure-MSBuild
     $dotnet = Ensure-DotnetSdk
diff --git a/build/scripts/build.sh b/build/scripts/build.sh
index 90231a63251b4..062c21ddb52fa 100755
--- a/build/scripts/build.sh
+++ b/build/scripts/build.sh
@@ -142,7 +142,12 @@ then
     exit
 fi
 
-source "${scriptroot}"/obtain_dotnet.sh
+# Import Arcade functions
+. $scriptroot/tools.sh
+
+InitializeDotNetCli $restore
+
+export PATH="$DOTNET_INSTALL_DIR:$PATH"
 
 if [[ "$restore" == true ]]
 then
@@ -225,5 +230,6 @@ then
     else
         test_runtime=dotnet
     fi
+
     "${scriptroot}"/tests.sh "${build_configuration}" "${test_runtime}"
 fi
diff --git a/build/scripts/check-for-loc-changes.ps1 b/build/scripts/check-for-loc-changes.ps1
index 8040ea0db9398..1c359913dee68 100644
--- a/build/scripts/check-for-loc-changes.ps1
+++ b/build/scripts/check-for-loc-changes.ps1
@@ -34,7 +34,7 @@ $ErrorActionPreference="Stop"
 
 try {
     . (Join-Path $PSScriptRoot "build-utils.ps1")
-    Push-Location $repoDir
+    Push-Location $RepoRoot
 
     # Find the merge base, then the list of files that changed since then.
     $mergeBase = & git merge-base $base $head
diff --git a/build/scripts/edit-designers.ps1 b/build/scripts/edit-designers.ps1
index 57c7759dc1a68..ec6efcf19d171 100644
--- a/build/scripts/edit-designers.ps1
+++ b/build/scripts/edit-designers.ps1
@@ -25,7 +25,7 @@ $projectList = @(
 # causes the selector to use the new project system. 
 function Change-ProjectFiles() { 
     foreach ($proj in $projectList) {
-        $proj = Join-Path $repoDir $proj
+        $proj = Join-Path $RepoRoot $proj
         $lines = Get-Content $proj
         for ($i = 0; $i -lt $lines.Length; $i++) { 
             $line = $lines[$i]
@@ -40,7 +40,7 @@ function Change-ProjectFiles() {
 
 # Change the solution file to use the legacy project system GUID.
 function Change-Solution() {
-    $solution = Join-Path $repoDir "Roslyn.sln"
+    $solution = Join-Path $RepoRoot "Roslyn.sln"
     $lines = Get-Content $solution
     for ($i = 0; $i -lt $lines.Length; $i++) { 
         $line = $lines[$i]
@@ -68,7 +68,7 @@ function Change-Solution() {
 
 try {
     . (Join-Path $PSScriptRoot "build-utils.ps1")
-    Push-Location $repoDir
+    Push-Location $RepoRoot
 
     Change-ProjectFiles
     Change-Solution
diff --git a/build/scripts/generate-compiler-code.ps1 b/build/scripts/generate-compiler-code.ps1
index 45b81bda392c6..fe81b0f5a9106 100644
--- a/build/scripts/generate-compiler-code.ps1
+++ b/build/scripts/generate-compiler-code.ps1
@@ -72,7 +72,7 @@ function Run-GetTextCore($generatedDir) {
 }
 
 function Run-GetText() {
-    $generatedDir = Join-Path $repoDir "src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\Generated"
+    $generatedDir = Join-Path $RepoRoot "src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\Generated"
     if (-not $test) { 
         Run-GetTextCore $generatedDir
     }
@@ -86,7 +86,6 @@ function Run-GetText() {
 # Build all of the tools that we need to generate the syntax trees and ensure
 # they are in a published / runnable state.
 function Build-Tools() {
-    $dotnet = Ensure-DotnetSdk
     $list = @(
         'boundTreeGenerator;BoundTreeGenerator;BoundTreeGenerator\CompilersBoundTreeGenerator.csproj',
         'csharpErrorFactsGenerator;CSharpErrorFactsGenerator;CSharpErrorFactsGenerator\CSharpErrorFactsGenerator.csproj',
@@ -94,7 +93,7 @@ function Build-Tools() {
         'basicErrorFactsGenerator;VBErrorFactsGenerator;VisualBasicErrorFactsGenerator\VisualBasicErrorFactsGenerator.vbproj',
         'basicSyntaxGenerator;VBSyntaxGenerator;VisualBasicSyntaxGenerator\VisualBasicSyntaxGenerator.vbproj')
 
-    Push-Location (Join-Path $repoDir 'src\Tools\Source\CompilerGeneratorTools\Source')
+    Push-Location (Join-Path $RepoRoot 'src\Tools\Source\CompilerGeneratorTools\Source')
     try {
         foreach ($item in $list) { 
             $all = $item.Split(';')
@@ -103,8 +102,8 @@ function Build-Tools() {
             $proj = $all[2]
             $fileName = [IO.Path]::GetFileNameWithoutExtension($proj)
             Write-Host "Building $fileName"
-            Restore-Project $dotnet $proj
-            Exec-Command $dotnet "publish /p:Configuration=Debug /p:RuntimeIdentifier=win-x64 /v:m $proj" | Out-Null
+            Restore-Project $proj
+            Exec-Command (Ensure-DotnetSdk) "publish /p:Configuration=Debug /p:RuntimeIdentifier=win-x64 /v:m $proj" | Out-Null
 
             $exePath = Join-Path $binariesDir "Debug\Exes\$fileName\win-x64\publish\$($exeName).exe"
             if (-not (Test-Path $exePath)) { 
@@ -126,10 +125,10 @@ try {
     Build-Tools
 
     $compilerToolsDir = Join-Path $binariesDir "Debug\Exes\DeployCompilerGeneratorToolsRuntime"
-    $csharpDir = Join-Path $repoDir "src\Compilers\CSharp\Portable"
-    $csharpTestDir = Join-Path $repoDir "src\Compilers\CSharp\Test\Syntax"
-    $basicDir = Join-Path $repoDir "src\Compilers\VisualBasic\Portable"
-    $basicTestDir = Join-Path $repoDir "src\Compilers\VisualBasic\Test\Syntax"
+    $csharpDir = Join-Path $RepoRoot "src\Compilers\CSharp\Portable"
+    $csharpTestDir = Join-Path $RepoRoot "src\Compilers\CSharp\Test\Syntax"
+    $basicDir = Join-Path $RepoRoot "src\Compilers\VisualBasic\Portable"
+    $basicTestDir = Join-Path $RepoRoot "src\Compilers\VisualBasic\Test\Syntax"
 
     Run-Language "CSharp" "cs" $csharpDir $csharpTestDir $csharpSyntaxGenerator $csharpErrorFactsGenerator
     Run-Language "VB" "vb" $basicDir $basicTestDir $basicSyntaxGenerator $basicErrorFactsGenerator
diff --git a/build/scripts/obtain_dotnet.sh b/build/scripts/obtain_dotnet.sh
deleted file mode 100755
index d0504691a6428..0000000000000
--- a/build/scripts/obtain_dotnet.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-# Source this script to ensure dotnet is installed and on the path.
-# If the FORCE_DOWNLOAD environment variable is set to "true", the system's dotnet install is ignored,
-# and dotnet is downloaded and installed locally.
-set -e
-set -u
-
-# This is a function to keep variable assignments out of the parent script (that is sourcing this file)
-install_dotnet () {
-    # Download and install `dotnet` locally
-    local THIS_DIR="$(cd -P "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-    source "${THIS_DIR}"/build-utils.sh
-
-    local DOTNET_SDK_VERSION="$(get_tool_version dotnetSdk)"
-    local DOTNET_RUNTIME_VERSION="$(get_tool_version dotnetRuntime)"
-    local DOTNET_PATH="${THIS_DIR}"/../../Binaries/Tools/dotnet
-
-    # check if the correct `dotnet` is already on the PATH
-    if command -v dotnet >/dev/null 2>&1
-    then
-        if [[ "${FORCE_DOWNLOAD:-false}" != true && "$(dotnet --version)" = "${DOTNET_SDK_VERSION}" ]]
-        then
-            return 0
-        fi
-    fi
-
-    if [[ ! -x "${DOTNET_PATH}/dotnet" || "$(${DOTNET_PATH}/dotnet --version)" != "${DOTNET_SDK_VERSION}" ]]
-    then
-        echo "Downloading and installing .NET CLI version ${DOTNET_SDK_VERSION} to ${DOTNET_PATH}"
-        curl https://dot.net/v1/dotnet-install.sh | \
-            /usr/bin/env bash -s -- --version "${DOTNET_SDK_VERSION}" --install-dir "${DOTNET_PATH}"
-
-        curl https://dot.net/v1/dotnet-install.sh | \
-            /usr/bin/env bash -s -- --version "${DOTNET_RUNTIME_VERSION}" --shared-runtime --install-dir "${DOTNET_PATH}"
-    fi
-
-    export PATH="${DOTNET_PATH}:${PATH}"
-}
-install_dotnet
diff --git a/build/scripts/publish-assets.ps1 b/build/scripts/publish-assets.ps1
index 3c9e4790a7ac2..136e2672dd8a2 100644
--- a/build/scripts/publish-assets.ps1
+++ b/build/scripts/publish-assets.ps1
@@ -60,7 +60,7 @@ function Publish-NuGet([string]$packageDir, [string]$uploadUrl) {
 function Publish-Vsix([string]$uploadUrl) {
     Write-Host "Publishing VSIX to $uploadUrl"
     $apiKey = Get-PublishKey $uploadUrl
-    $extensions = [xml](Get-Content (Join-Path $repoDir "build\config\myget_org-extensions.config"))
+    $extensions = [xml](Get-Content (Join-Path $RepoRoot "build\config\myget_org-extensions.config"))
     foreach ($extension in $extensions.extensions.extension) {
         $vsix = Join-Path $vsSetupDir ($extension.id + ".vsix")
         if (-not (Test-Path $vsix)) {
diff --git a/build/scripts/test-build-correctness.ps1 b/build/scripts/test-build-correctness.ps1
index f62dd4c6393a0..3dbd8a9531d30 100644
--- a/build/scripts/test-build-correctness.ps1
+++ b/build/scripts/test-build-correctness.ps1
@@ -19,7 +19,7 @@ $ErrorActionPreference="Stop"
 
 try {
     . (Join-Path $PSScriptRoot "build-utils.ps1")
-    Push-Location $repoDir
+    Push-Location $RepoRoot
     $releaseArg = if ($configuration -eq "Release") { "-release" } else { "" }
     $configDir = Join-Path $binariesDir $configuration
 
@@ -30,7 +30,7 @@ try {
     # Verify the state of our various build artifacts
     Write-Host "Running BuildBoss"
     $buildBossPath = Join-Path $configDir "Exes\BuildBoss\BuildBoss.exe"
-    Exec-Console $buildBossPath "Roslyn.sln Compilers.sln SourceBuild.sln -r $repoDir $releaseArg"
+    Exec-Console $buildBossPath "Roslyn.sln Compilers.sln SourceBuild.sln -r $RepoRoot $releaseArg"
     Write-Host ""
 
     # Verify the state of our generated syntax files
diff --git a/build/scripts/test-determinism.ps1 b/build/scripts/test-determinism.ps1
index 3c3a3509b73c8..f037eef7e9993 100644
--- a/build/scripts/test-determinism.ps1
+++ b/build/scripts/test-determinism.ps1
@@ -35,7 +35,7 @@ function Run-Build([string]$rootDir, [string]$logFile = $null) {
         Remove-Item -Recurse (Get-ObjDir $rootDir) 
 
         Write-Host "Restoring the packages"
-        Restore-Project $dotnet "Roslyn.sln"
+        Restore-Project "Roslyn.sln"
 
         $args = "/nologo /v:m /nodeReuse:false /m /p:DebugDeterminism=true /p:ContinuousIntegrationBuild=true /p:BootstrapBuildPath=$script:bootstrapDir /p:Features=`"debug-determinism`" /p:UseRoslynAnalyzers=false /p:DeployExtension=false Roslyn.sln"
         if ($logFile -ne $null) {
@@ -201,23 +201,23 @@ function Test-Build([string]$rootDir, $dataMap, [string]$logFile) {
 }
 
 function Run-Test() {
-    $rootDir = $repoDir
+    $rootDir = $RepoRoot
 
     # Run the initial build so that we can populate the maps
-    Run-Build $repoDir -logFile "initial.binlog"
-    $dataMap = Record-Binaries $repoDir
+    Run-Build $RepoRoot -logFile "initial.binlog"
+    $dataMap = Record-Binaries $RepoRoot
     Test-MapContents $dataMap
 
     # Run a test against the source in the same directory location
-    Test-Build -rootDir $repoDir -dataMap $dataMap -logFile "test1.binlog"
+    Test-Build -rootDir $RepoRoot -dataMap $dataMap -logFile "test1.binlog"
 
     # Run another build in a different source location and verify that path mapping 
     # allows the build to be identical.  To do this we'll copy the entire source 
     # tree under the Binaries\q directory and run a build from there.
     Write-Host "Building in a different directory"
-    Exec-Command "subst" "$altRootDrive $(Split-Path -parent $repoDir)"
+    Exec-Command "subst" "$altRootDrive $(Split-Path -parent $RepoRoot)"
     try {
-        $altRootDir = Join-Path "$($altRootDrive)\" (Split-Path -leaf $repoDir)
+        $altRootDir = Join-Path "$($altRootDrive)\" (Split-Path -leaf $RepoRoot)
         Test-Build -rootDir $altRootDir -dataMap $dataMap -logFile "test2.binlog"
     }
     finally {
@@ -230,7 +230,7 @@ try {
 
     # Create all of the logging directories
     $buildConfiguration = if ($release) { "Release" } else { "Debug" }
-    $logDir = Join-Path (Get-ConfigDir $repoDir) "Logs"
+    $logDir = Join-Path (Get-ConfigDir $RepoRoot) "Logs"
     $errorDir = Join-Path $binariesDir "Determinism"
     $errorDirLeft = Join-Path $errorDir "Left"
     $errorDirRight = Join-Path $errorDir "Right"
diff --git a/build/scripts/tools.ps1 b/build/scripts/tools.ps1
new file mode 100644
index 0000000000000..105aff1778c3c
--- /dev/null
+++ b/build/scripts/tools.ps1
@@ -0,0 +1,82 @@
+# 
+# TODO: This file is currently a subset of Arcade's tools.ps1.
+# 
+$useInstalledDotNetCli = if (Test-Path variable:useInstalledCli) { $useInstalledDotNetCli } else { $true }
+
+set-strictmode -version 2.0
+$ErrorActionPreference = "Stop"
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+function InitializeDotNetCli([bool]$install) {
+  # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
+  $env:DOTNET_MULTILEVEL_LOOKUP=0
+
+  # Disable first run since we do not need all ASP.NET packages restored.
+  $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+
+  # Source Build uses DotNetCoreSdkDir variable
+  if ($env:DotNetCoreSdkDir -ne $null) {
+    $env:DOTNET_INSTALL_DIR = $env:DotNetCoreSdkDir
+  }
+
+  # Find the first path on %PATH% that contains the dotnet.exe
+  if ($useInstalledDotNetCli -and ($env:DOTNET_INSTALL_DIR -eq $null)) {
+    $env:DOTNET_INSTALL_DIR = ${env:PATH}.Split(';') | where { ($_ -ne "") -and (Test-Path (Join-Path $_ "dotnet.exe")) }
+  }
+
+  $dotnetSdkVersion = $GlobalJson.tools.dotnet
+
+  # Use dotnet installation specified in DOTNET_INSTALL_DIR if it contains the required SDK version,
+  # otherwise install the dotnet CLI and SDK to repo local .dotnet directory to avoid potential permission issues.
+  if (($env:DOTNET_INSTALL_DIR -ne $null) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) {
+    $dotnetRoot = $env:DOTNET_INSTALL_DIR
+  } else {
+    $dotnetRoot = Join-Path $RepoRoot ".dotnet"
+    $env:DOTNET_INSTALL_DIR = $dotnetRoot
+
+    if (-not (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) {
+      if ($install) {
+        InstallDotNetSdk $dotnetRoot $dotnetSdkVersion
+      } else {
+        Write-Host "Unable to find dotnet with SDK version '$dotnetSdkVersion'" -ForegroundColor Red
+        ExitWithExitCode 1
+      }
+    }
+  }
+
+  return $dotnetRoot
+}
+
+function GetDotNetInstallScript([string] $dotnetRoot) {
+  $installScript = "$dotnetRoot\dotnet-install.ps1"
+  if (!(Test-Path $installScript)) {
+    Create-Directory $dotnetRoot
+    Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile $installScript
+  }
+
+  return $installScript
+}
+
+function InstallDotNetSdk([string] $dotnetRoot, [string] $version) {
+  $installScript = GetDotNetInstallScript $dotnetRoot
+  & $installScript -Version $version -InstallDir $dotnetRoot
+  if ($lastExitCode -ne 0) {
+    Write-Host "Failed to install dotnet cli (exit code '$lastExitCode')." -ForegroundColor Red
+    ExitWithExitCode $lastExitCode
+  }
+}
+
+function ExitWithExitCode([int] $exitCode) {
+  exit $exitCode
+}
+
+try {
+  [string]$RepoRoot = Resolve-Path (Join-Path $PSScriptRoot "..\..")
+  $GlobalJson = Get-Content -Raw -Path (Join-Path $RepoRoot "global.json") | ConvertFrom-Json
+}
+catch {
+  Write-Host $_
+  Write-Host $_.Exception
+  Write-Host $_.ScriptStackTrace
+  ExitWithExitCode 1
+}
\ No newline at end of file
diff --git a/build/scripts/tools.sh b/build/scripts/tools.sh
new file mode 100644
index 0000000000000..15d002adf7767
--- /dev/null
+++ b/build/scripts/tools.sh
@@ -0,0 +1,136 @@
+#!/usr/bin/env bash
+
+# 
+# TODO: This file is currently a subset of Arcade's init-tools.ps1.
+# 
+# Stop script if unbound variable found (use ${var:-} if intentional)
+set -u
+
+useInstalledDotNetCli=${useInstalledDotNetCli:-true}
+
+repo_root="$scriptroot/../.."
+global_json_file="$repo_root/global.json"
+
+function ResolvePath {
+  local path=$1
+
+  # resolve $path until the file is no longer a symlink
+  while [[ -h $path ]]; do
+    local dir="$( cd -P "$( dirname "$path" )" && pwd )"
+    path="$(readlink "$path")"
+
+    # if $path was a relative symlink, we need to resolve it relative to the path where the
+    # symlink file was located
+    [[ $path != /* ]] && path="$dir/$path"
+  done
+
+  # return value
+  _ResolvePath="$path"
+}
+
+# ReadVersionFromJson [json key]
+function ReadGlobalVersion {
+  local key=$1
+
+  local line=`grep -m 1 "$key" "$global_json_file"`
+  local pattern="\"$key\" *: *\"(.*)\""
+
+  if [[ ! $line =~ $pattern ]]; then
+    echo "Error: Cannot find \"$key\" in $global_json_file" >&2
+    ExitWithExitCode 1
+  fi
+
+  # return value
+  _ReadGlobalVersion=${BASH_REMATCH[1]}
+}
+
+function InitializeDotNetCli {
+  local install=$1
+
+  # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
+  export DOTNET_MULTILEVEL_LOOKUP=0
+
+  # Disable first run since we want to control all package sources
+  export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+
+  # Source Build uses DotNetCoreSdkDir variable
+  if [[ -n "${DotNetCoreSdkDir:-}" ]]; then
+    export DOTNET_INSTALL_DIR="$DotNetCoreSdkDir"
+  fi
+
+  # Find the first path on $PATH that contains the dotnet.exe
+  if [[ "$useInstalledDotNetCli" == true && -z "${DOTNET_INSTALL_DIR:-}" ]]; then
+    local dotnet_path=`command -v dotnet`
+    if [[ -n "$dotnet_path" ]]; then
+      ResolvePath "$dotnet_path"
+      export DOTNET_INSTALL_DIR=`dirname "$_ResolvePath"`
+    fi
+  fi
+
+  ReadGlobalVersion "dotnet"
+  local dotnet_sdk_version=$_ReadGlobalVersion
+  local dotnet_root=""
+
+  # Use dotnet installation specified in DOTNET_INSTALL_DIR if it contains the required SDK version,
+  # otherwise install the dotnet CLI and SDK to repo local .dotnet directory to avoid potential permission issues.
+  if [[ -n "${DOTNET_INSTALL_DIR:-}" && -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then
+    dotnet_root="$DOTNET_INSTALL_DIR"
+  else
+    dotnet_root="$repo_root/.dotnet"
+    export DOTNET_INSTALL_DIR="$dotnet_root"
+
+    if [[ ! -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then
+      if [[ "$install" == true ]]; then
+        InstallDotNetSdk "$dotnet_root" "$dotnet_sdk_version"
+      else
+        echo "Unable to find dotnet with SDK version '$dotnet_sdk_version'" >&2
+        ExitWithExitCode 1
+      fi
+    fi
+  fi
+
+  # return value
+  _InitializeDotNetCli="$dotnet_root"
+}
+
+function InstallDotNetSdk {
+  local root=$1
+  local version=$2
+
+  GetDotNetInstallScript "$root"
+  local install_script=$_GetDotNetInstallScript
+
+  bash "$install_script" --version $version --install-dir "$root"
+  local lastexitcode=$?
+
+  if [[ $lastexitcode != 0 ]]; then
+    echo "Failed to install dotnet SDK (exit code '$lastexitcode')." >&2
+    ExitWithExitCode $lastexitcode
+  fi
+}
+
+function GetDotNetInstallScript {
+  local root=$1
+  local install_script="$root/dotnet-install.sh"
+  local install_script_url="https://dot.net/v1/dotnet-install.sh"
+
+  if [[ ! -a "$install_script" ]]; then
+    mkdir -p "$root"
+
+    echo "Downloading '$install_script_url'"
+
+    # Use curl if available, otherwise use wget
+    if command -v curl > /dev/null; then
+      curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script"
+    else
+      wget -q -O "$install_script" "$install_script_url"
+    fi
+  fi
+
+  # return value
+  _GetDotNetInstallScript="$install_script"
+}
+
+function ExitWithExitCode {
+  exit $1
+}
\ No newline at end of file
diff --git a/global.json b/global.json
index 079ebc941599e..5012bc96c2ade 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
-  "sdk": {
-    "version": "2.1.401"
+  "tools": {
+    "dotnet": "2.1.401"
   }
 }
diff --git a/src/NuGet/VisualStudio/VS.Tools.Roslyn.Package.csproj b/src/NuGet/VisualStudio/VS.Tools.Roslyn.Package.csproj
index 217116d333177..0b56f572de5b2 100644
--- a/src/NuGet/VisualStudio/VS.Tools.Roslyn.Package.csproj
+++ b/src/NuGet/VisualStudio/VS.Tools.Roslyn.Package.csproj
@@ -45,7 +45,6 @@
   <!-- 
     Workaround for https://github.com/dotnet/roslyn/issues/17864.
   -->
-  <Import Project="..\..\..\build\Targets\RepoToolset\BuildTasks.props"/>
   <UsingTask TaskName="RoslynTools.SetCorFlags" AssemblyFile="$(RoslynToolsBuildTasksAssembly)" />
 
   <Target Name="_Generate32BitCsc" 
diff --git a/src/Setup/Installer/Installer.Package.csproj b/src/Setup/Installer/Installer.Package.csproj
index 525fac64aebf8..f97c157167773 100644
--- a/src/Setup/Installer/Installer.Package.csproj
+++ b/src/Setup/Installer/Installer.Package.csproj
@@ -21,7 +21,6 @@
   </Target>
 
   <!-- TODO: remove, once we upgrade to 15.8 -->
-  <Import Project="..\..\..\build\Targets\RepoToolset\BuildTasks.props"/>
   <UsingTask TaskName="RoslynTools.ZipDirectory" AssemblyFile="$(RoslynToolsBuildTasksAssembly)" />
 
   <Target Name="_GenerateZip"