From 20dec36811fecf5d129aa18f91eeedb47d78f797 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Thu, 18 Nov 2021 11:56:57 -0800
Subject: [PATCH 1/3] Bump .NET SDK again - remove Microsoft.NET.Test.Sdk
 version override - new vstest.console.dll in the .NET SDK is again compatible
 w/ older testhost.dll in the Test SDK

---
 eng/Versions.props | 5 -----
 global.json        | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 0433f1aefae9..100fa0952f31 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -184,11 +184,6 @@
     <MicrosoftBuildUtilitiesCoreVersion>16.9.0</MicrosoftBuildUtilitiesCoreVersion>
     <MicrosoftBuildLocatorVersion>1.2.6</MicrosoftBuildLocatorVersion>
     <MicrosoftBuildUtilitiesCoreVersion>16.9.0</MicrosoftBuildUtilitiesCoreVersion>
-    <!--
-      Temporarily override the Microsoft.NET.Test.Sdk version Arcade defaults to. That's incompatible w/ test
-      framework in current .NET SDKs.
-    -->
-    <MicrosoftNETTestSdkVersion>17.1.0-preview-20211109-03</MicrosoftNETTestSdkVersion>
     <!--
       Versions of Microsoft.CodeAnalysis packages referenced by analyzers shipped in the SDK.
       This need to be pinned since they're used in 3.1 apps and need to be loadable in VS 2019.
diff --git a/global.json b/global.json
index f57fecad2ff0..0c5feca2eefa 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "7.0.100-alpha.1.21558.2"
+    "version": "7.0.100-alpha.1.21574.8"
   },
   "tools": {
-    "dotnet": "7.0.100-alpha.1.21558.2",
+    "dotnet": "7.0.100-alpha.1.21574.8",
     "runtimes": {
       "dotnet/x64": [
         "2.1.30",

From 4673ba2d4a0e06e06bad6d74c4467324610b03f5 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Mon, 6 Dec 2021 10:01:11 -0800
Subject: [PATCH 2/3] Update global.json

---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index 0c5feca2eefa..973a6c9e663b 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "7.0.100-alpha.1.21574.8"
+    "version": "7.0.100-alpha.1.21568.2"
   },
   "tools": {
-    "dotnet": "7.0.100-alpha.1.21574.8",
+    "dotnet": "7.0.100-alpha.1.21568.2",
     "runtimes": {
       "dotnet/x64": [
         "2.1.30",

From 0f2a8e716e12b3de8a950ed6857b7f9026e18424 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Mon, 6 Dec 2021 11:27:21 -0800
Subject: [PATCH 3/3] Update global.json

---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index 973a6c9e663b..d4c57a8a762d 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "7.0.100-alpha.1.21568.2"
+    "version": "7.0.100-alpha.1.21606.3"
   },
   "tools": {
-    "dotnet": "7.0.100-alpha.1.21568.2",
+    "dotnet": "7.0.100-alpha.1.21606.3",
     "runtimes": {
       "dotnet/x64": [
         "2.1.30",