Fix CoreClr failures

eng/build.ps1

@@ -213,16 +213,7 @@ function BuildSolution() {
     # an arcade bug
     # https://github.com/dotnet/arcade/issues/2220
     $quietRestore = !($ci -or ($bootstrapDir -ne ""))
-
-    $testTargetFrameworks = ""
-    $testTargetFrameworks = "netcoreapp2.1" 
-    if ($testCoreClr) {
-
-        # Make sure a 2.1 runtime is installed so we can run our tests. Most of them still 
-        # target netcoreapp2.1.
-        InstallDotNetSdk ${env:DOTNET_INSTALL_DIR} "2.1.401"
-    }
-
+    $testTargetFrameworks = if ($testCoreClr) { "netcoreapp2.1" } else { "" } 
     $ibcSourceBranchName = GetIbcSourceBranchName
     $ibcDropId = if ($officialIbcDropId -ne "default") { $officialIbcDropId } else { "" }
 

eng/build.sh

@@ -248,9 +248,6 @@ function BuildSolution {
     test_runtime="/p:TestRuntime=Mono"
     mono_tool="/p:MonoTool=\"$mono_path\""
   elif [[ "$test_core_clr" == true ]]; then
-
-    # Make sure we have a 2.1 runtime available for running our tests
-    InstallDotNetSdk $DOTNET_INSTALL_DIR 2.1.401
     test=true
     test_runtime="/p:TestRuntime=Core"
     mono_tool=""
@@ -285,6 +282,9 @@ function BuildSolution {
 
 InitializeDotNetCli $restore
 
+# Make sure we have a 2.1 runtime available for running our tests
+InstallDotNetSdk $dotnet_root 2.1.401
+
 bootstrap_dir=""
 if [[ "$bootstrap" == true ]]; then
   MakeBootstrapBuild