From d56a02ac01bf3edb12d410bfb1f3d80d251290f6 Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Mon, 7 Jun 2021 16:02:52 -0700
Subject: [PATCH] Update the SDK to Preview 4 and remove workaround for SDK bug

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

diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
index 54b4c44f5b4..1db2f681448 100644
--- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
+++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
@@ -9,11 +9,6 @@
     <!-- 17134 is Windows 10 v1903 (19H1) SDK -->
     <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
 
-    <!-- This should be removed when .NET 6 Preview 4 becomes available. P4 contains the SDK fix. --> 
-    <!--    https://github.com/dotnet/core/issues/6066 -->
-    <!--    https://github.com/dotnet/sdk/issues/16725 -->
-    <ILLinkTasksAssembly>DummyPropertyValueForILLinkTasksAssembly</ILLinkTasksAssembly>
-    
     <ConfigurationType Condition="'$(ConfigurationType)'==''">DynamicLibrary</ConfigurationType>
     
     <!-- Windows 10 installation location is often not reliably set in msbuild -->
diff --git a/global.json b/global.json
index 8e28dae3a3e..c266cdc91ff 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "6.0.100-preview.3.21202.5",
+    "dotnet": "6.0.100-preview.4.21255.9",
     "runtimes": {
       "dotnet": [
         "2.1.7",
@@ -16,7 +16,7 @@
     "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21304.1"
   },
   "sdk": {
-    "version": "6.0.100-preview.3.21202.5"
+    "version": "6.0.100-preview.4.21255.9"
   },
   "native-tools": {
     "strawberry-perl": "5.28.1.1-1",