From 4f7826d80bbebb8836e2eaea8e5722fcc46ab074 Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Tue, 17 Aug 2021 13:23:18 -0400
Subject: [PATCH 1/3] Update pinned compiler version

The version that flows in automatically appears to still be old.  We need to fix that, but in the meantime, we're a month out of date on the compiler.
---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 77ca34e1f663ee..736346f348620b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -19,7 +19,7 @@
     <!-- Opt-in/out repo features -->
     <UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
     <!-- TODO: Upgrade compiler version to enable Static Abstracts in Interfaces, interpolated string handlers, and caller arg expressions; remove this once the employed SDK uses a new enough version. -->
-    <MicrosoftNetCompilersToolsetVersion>4.0.0-3.21376.12</MicrosoftNetCompilersToolsetVersion>
+    <MicrosoftNetCompilersToolsetVersion>4.0.0-4.21416.10</MicrosoftNetCompilersToolsetVersion>
     <UsingToolMicrosoftNetILLinkTasks>true</UsingToolMicrosoftNetILLinkTasks>
     <UsingToolIbcOptimization>false</UsingToolIbcOptimization>
     <UsingToolXliff>false</UsingToolXliff>

From e55e9e5832fbfda12b1291f04b3383f5c424564f Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Tue, 17 Aug 2021 16:17:37 -0400
Subject: [PATCH 2/3] Suppress CS8969 warnings

---
 Directory.Build.props                                      | 2 ++
 src/libraries/System.Text.Json/src/System.Text.Json.csproj | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 0f46a5053dd3e4..58787d332b2b45 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -270,6 +270,8 @@
     <!-- Enables Strict mode for Roslyn compiler -->
     <Features>strict;nullablePublicOnly</Features>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <!-- Warnings to always disable -->
+    <NoWarn>$(NoWarn),CS8969</NoWarn>
     <!-- Always pass portable to override arcade sdk which uses embedded for local builds -->
     <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/libraries/System.Text.Json/src/System.Text.Json.csproj b/src/libraries/System.Text.Json/src/System.Text.Json.csproj
index 3a363de469a909..d18d2c01221d37 100644
--- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj
+++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj
@@ -5,7 +5,7 @@
     <!-- Workaround for overriding the XML comments related warnings that are being supressed repo wide (within arcade): -->
     <!-- https://github.com/dotnet/arcade/blob/ea6addfdc65e5df1b2c036f11614a5f922e36267/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.props#L90 -->
     <!-- For this project, we want warnings if there are public APIs/types without properly formatted XML comments (particularly CS1591). -->
-    <NoWarn />
+    <NoWarn>CS8969</NoWarn>
     <Nullable>enable</Nullable>
     <IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute>
     <IsPackable>true</IsPackable>

From 64dfda69eaf71a86ddc42e3e1c802803453d011c Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Wed, 18 Aug 2021 06:59:04 -0400
Subject: [PATCH 3/3] Change several dynamic tests to use typeof(object[])

---
 .../Conformance.dynamic.dynamicType.basic.cs                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.basic.cs b/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.basic.cs
index 480f6200208d30..9c4eb3000ae8b6 100644
--- a/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.basic.cs
+++ b/src/libraries/System.Dynamic.Runtime/tests/Dynamic.DynamicType/Conformance.dynamic.dynamicType.basic.cs
@@ -3392,7 +3392,7 @@ public static int MainMethod(string[] args)
             }
 
             ;
-            if (d.GetType() != typeof(dynamic[]))
+            if (d.GetType() != typeof(object[]))
                 return 1;
             return 0;
         }
@@ -3420,7 +3420,7 @@ public static int MainMethod(string[] args)
             }
 
             ;
-            if (d.GetType() != typeof(dynamic[]))
+            if (d.GetType() != typeof(object[]))
                 return 1;
             return 0;
         }
@@ -3456,7 +3456,7 @@ public static int MainMethod(string[] args)
             }
 
             ;
-            if (d.GetType() != typeof(dynamic[]))
+            if (d.GetType() != typeof(object[]))
                 return 1;
             return 0;
         }