From aeaaddf48d079eef0c1625fa1684c3b63704ad5d Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 11 Mar 2021 23:04:13 +0100
Subject: [PATCH 1/3] Update target version of SDK to 6.0 preview 2

Not updating the minimum required version as that's considered a breaking change that needs to go through the monthly infra rollout.
---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index 9935b33b7d66d..3e24a5950e665 100644
--- a/global.json
+++ b/global.json
@@ -5,7 +5,7 @@
     "rollForward": "major"
   },
   "tools": {
-    "dotnet": "6.0.100-preview.2.21118.7"
+    "dotnet": "6.0.100-preview.2.21155.3"
   },
   "native-tools": {
     "cmake": "3.16.4",

From 03b6bbbe91f2c6db18c4aecc118c6d5061ac5e0a Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 11 Mar 2021 23:04:56 +0100
Subject: [PATCH 2/3] Remove msbuild hack in Tools.props

---
 eng/Tools.props | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/eng/Tools.props b/eng/Tools.props
index 32ff51a560f24..1a9804dbaf692 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -18,14 +18,4 @@
     <PackageReference Include="Microsoft.DotNet.VersionTools.Tasks" Version="$(MicrosoftDotNetVersionToolsTasksVersion)" />
   </ItemGroup>
 
-  <!-- Mega hack to remove Newtonsoft.Json dependency which doesn't unify during runtime with the dependency in the SDK and causes MissingMethodExceptions. -->
-  <Target Name="RemovePackagingContentForMSBuildALC"
-          AfterTargets="Restore">
-    <PropertyGroup>
-      <_BuildTasksPackagingNewtonsoftDependency>$(NuGetPackageRoot)microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\tools\netcoreapp3.1\Newtonsoft.Json.dll</_BuildTasksPackagingNewtonsoftDependency>
-    </PropertyGroup>
-
-    <Delete Files="$(_BuildTasksPackagingNewtonsoftDependency)" Condition="Exists('$(_BuildTasksPackagingNewtonsoftDependency)')" />
-  </Target>
-
 </Project>

From 76738a347cd598d0805a61e8484b7abffdaddcd0 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 11 Mar 2021 23:05:28 +0100
Subject: [PATCH 3/3] Remove sendtohelixhelp hack with P1 SDK

---
 src/libraries/sendtohelixhelp.proj | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index 4efa7087a45cc..6cbe9331f4a5d 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -307,12 +307,4 @@
     <Message Condition="'$(TestPackages)' != 'true'" Importance="High" Text="Build TargetFramework: $(BuildTargetFramework)" />
     <Message Condition="'$(TestPackages)' == 'true'" Importance="High" Text="Doing Package Testing" />
   </Target>
-  
-  <!-- TODO: Remove after https://github.com/dotnet/arcade/pull/6975 is merged. -->
-  <Target Name="UpdateDotNetCliVersionForMobile"
-          BeforeTargets="AddDotNetSdk">
-    <PropertyGroup>
-      <DotNetCliVersion Condition="'$(DotNetCliPackageType)' == 'aspnetcore-runtime'">6.0.0-preview.1.21103.6</DotNetCliVersion>
-    </PropertyGroup>
-  </Target>
 </Project>