From 325618bf03e7cf24be1480e8b8f1fdb0a828ea70 Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Tue, 17 Aug 2021 13:00:27 -0700
Subject: [PATCH] Update the SDK version WPF builds against and disable module
 initializer warning

---
 global.json                                                 | 6 +++---
 .../src/PresentationCore/ModuleInitializer.cs               | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/global.json b/global.json
index 912e2c85b3f..aa62406866a 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "6.0.100-rc.1.21379.2",
+    "dotnet": "6.0.100-rc.1.21416.15",
     "runtimes": {
       "dotnet": [
         "2.1.7",
@@ -8,7 +8,7 @@
       ]
     },
     "vs": {
-      "version": "16.8"
+      "version": "16.11"
     }
   },
   "msbuild-sdks": {
@@ -16,7 +16,7 @@
     "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21413.4"
   },
   "sdk": {
-    "version": "6.0.100-rc.1.21379.2"
+    "version": "6.0.100-rc.1.21416.15"
   },
   "native-tools": {
     "strawberry-perl": "5.28.1.1-1",
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ModuleInitializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ModuleInitializer.cs
index 6644f8edb86..b783164a507 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ModuleInitializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ModuleInitializer.cs
@@ -15,9 +15,11 @@ internal static class ModuleInitializer
     /// operations are carried out.  To do this, we simply call LoadDwrite
     /// as the module constructor for DirectWriteForwarder would do this anyway.
     /// </summary>
+    #pragma warning disable CA2255 
     [ModuleInitializer]
     public static void Initialize()
     {
         MS.Internal.NativeWPFDLLLoader.LoadDwrite();
     }
+    #pragma warning restore CA2255 
 }