From 71b0593515c9666df9286a2bc4ac1f652dc19b79 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 3 May 2021 19:29:58 +0200
Subject: [PATCH 1/3] Update the SDK to 6.0 Preview 3

Updating the minimum and target version of the SDK to 6.0 Preview 3.

Contributes to https://github.com/dotnet/runtime/issues/51716
---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index f1d09921257f3..48c085e5b85d0 100644
--- a/global.json
+++ b/global.json
@@ -1,11 +1,11 @@
 {
   "sdk": {
-    "version": "6.0.100-preview.2.21155.3",
+    "version": "6.0.100-preview.3.21202.5",
     "allowPrerelease": true,
     "rollForward": "major"
   },
   "tools": {
-    "dotnet": "6.0.100-preview.2.21155.3"
+    "dotnet": "6.0.100-preview.3.21202.5"
   },
   "native-tools": {
     "cmake": "3.16.4",

From 4730d287d0bc0a17849f0dc70c3b4a0f0e14ed4b Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Mon, 3 May 2021 15:21:52 -0700
Subject: [PATCH 2/3] Fix Linker Trimming tests

---
 eng/testing/linker/SupportFiles/Directory.Build.props | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eng/testing/linker/SupportFiles/Directory.Build.props b/eng/testing/linker/SupportFiles/Directory.Build.props
index ad6c9dbb6916d..35cbc94439050 100644
--- a/eng/testing/linker/SupportFiles/Directory.Build.props
+++ b/eng/testing/linker/SupportFiles/Directory.Build.props
@@ -15,6 +15,9 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <!-- Enable NuGet static graph evaluation to optimize incremental restore -->
     <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
+    <!-- Suppress analyzer and linker warnings as these are tests -->
+    <EnableTrimAnalyzer>false</EnableTrimAnalyzer>
+    <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
   </PropertyGroup>
 
   <ItemGroup>

From fdbe52ab0b45c2a5811ce9f2c157a3e32ec7517b Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Tue, 4 May 2021 09:40:39 -0500
Subject: [PATCH 3/3] Fix ILLink warnings for latest SDK

- Remove ILLink.Descriptors entry for non-existant method
- Suppress ILLink warnings in mobile tests
---
 eng/testing/tests.mobile.targets                            | 2 ++
 .../src/ILLink/ILLink.Descriptors.xml                       | 6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index aea51ddee8c28..7e54173d00333 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -36,6 +36,8 @@
 
   <PropertyGroup Condition="'$(EnableAggressiveTrimming)' == 'true'">
     <PublishTrimmed>true</PublishTrimmed>
+    <!-- Suppress linker warnings as these are tests -->
+    <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/mono/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.xml b/src/mono/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.xml
index 34104c679208b..f332a9d01cb80 100644
--- a/src/mono/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.xml
+++ b/src/mono/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.xml
@@ -644,12 +644,6 @@
 			<method signature="System.Void .ctor()" />
 		</type>
 
-    <!-- Used by metadata update -->
-    <!-- TODO: Remove this and add a debugger-libs command to invoke updates, see https://github.com/dotnet/runtime/issues/48458 -->
-		<type fullname="System.Reflection.Metadata.AssemblyExtensions">
-			<method name="ApplyUpdateSdb" />
-		</type>
-
 		<type fullname="System.ValueType">
 			<!-- https://github.com/dotnet/runtime/issues/47909 -->
 			<method signature="System.Void .ctor()" />