From 11110096d7d7ff077e594c8c64470777b5805350 Mon Sep 17 00:00:00 2001
From: Dan Seefeldt <dseefeld@microsoft.com>
Date: Wed, 28 Jul 2021 11:18:39 -0500
Subject: [PATCH 1/2] Remove installation of runtime 2.1.0 from build.sh

Installation of another runtime in build.sh doesn't work for source-build
when building offline.
---
 build.sh    | 3 ---
 global.json | 7 ++++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build.sh b/build.sh
index d511e95b..acc0e31d 100755
--- a/build.sh
+++ b/build.sh
@@ -8,7 +8,4 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
 done
 ScriptRoot="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
-# install the 2.1.0 runtime for running tests
-"$ScriptRoot/eng/common/dotnet-install.sh"  -runtime dotnet -version 2.1.0
-
 . "$ScriptRoot/eng/common/build.sh" --build --restore $@
diff --git a/global.json b/global.json
index e276e304..347e455f 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,11 @@
 {
   "tools": {
-    "dotnet": "5.0.201"
+    "dotnet": "5.0.201",
+    "runtimes": {
+      "dotnet": [
+        "2.1.0"
+      ]
+    }
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21256.3"

From 1351778fa8fd69c612b7f120df8b8841e4c343e0 Mon Sep 17 00:00:00 2001
From: Dan Seefeldt <dseefeld@microsoft.com>
Date: Wed, 28 Jul 2021 15:57:30 -0500
Subject: [PATCH 2/2] Update docker image location

---
 .vsts-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 0a261b64..2a2ba4a2 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -65,7 +65,7 @@ jobs:
             _BuildConfig: Release
             _PublishType: none
             _SignType: test
-      _PREVIEW_VSTS_DOCKER_IMAGE: microsoft/dotnet-buildtools-prereqs:ubuntu-14.04-cross-0cd4667-20170319080304
+      _PREVIEW_VSTS_DOCKER_IMAGE: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-cross-0cd4667-20170319080304
 
   - template: /eng/build.yml
     parameters: