From 1ddd1c672cb52964f2c8bd64d72b8e5ab2581202 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 27 Apr 2020 20:49:54 +0200
Subject: [PATCH 1/3] Update the SDK to mitigate runtime regression

This SDK includes the fix for https://github.com/dotnet/runtime/commit/a5414a2bdf5a3e45e3800530bfd35de128971ac1.
---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index 8a7cac54c4ae..3f7841af8d94 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "5.0.100-preview.4.20217.10",
+    "dotnet": "5.0.100-preview.5.20227.9",
     "runtimes": {
       "dotnet": [
         "$(MicrosoftNETCoreAppRuntimePackageVersion)"

From bec77185774358a0732ac53fc00fb7a7f6035a0b Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 29 Apr 2020 09:49:19 +0200
Subject: [PATCH 2/3] Update global.json

---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index 3f7841af8d94..6ab7822cc67c 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "5.0.100-preview.5.20227.9",
+    "dotnet": "5.0.100-preview.5.20228.8",
     "runtimes": {
       "dotnet": [
         "$(MicrosoftNETCoreAppRuntimePackageVersion)"

From ad590737e681bd132ed5364aca3841659fc8e76c Mon Sep 17 00:00:00 2001
From: William Li <wul@microsoft.com>
Date: Thu, 30 Apr 2020 15:28:15 -0700
Subject: [PATCH 3/3] Correct remove WinForms logic

---
 src/redist/targets/BundledTemplates.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets
index bdc8462e996c..b32bd497c50e 100644
--- a/src/redist/targets/BundledTemplates.targets
+++ b/src/redist/targets/BundledTemplates.targets
@@ -174,8 +174,8 @@
   <Target Name="LayoutTemplatesForSDK"
           DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions">
     <ItemGroup Condition="!$(ProductMonikerRid.StartsWith('win'))">
-      <BundledTemplate Remove="Microsoft.Dotnet.Wpf.ProjectTemplates" />
-      <BundledTemplate Remove="Microsoft.Dotnet.WinForms.ProjectTemplates" />
+      <Bundled50Templates Remove="Microsoft.Dotnet.Wpf.ProjectTemplates" />
+      <Bundled50Templates Remove="Microsoft.Dotnet.WinForms.ProjectTemplates" />
     </ItemGroup>
     <Copy SourceFiles="%(Bundled50Templates.RestoredNupkgPath)"
           DestinationFolder="$(RedistLayoutPath)templates/$(BundledTemplates50InstallPath)"/>