From 17ceb4d4edebfcc6cd31f77c85d07e2cccc685b6 Mon Sep 17 00:00:00 2001
From: Damian Edwards <damian@damianedwards.com>
Date: Mon, 27 Jun 2022 14:52:07 -0700
Subject: [PATCH 1/6] Updated VS workload manifests to Windows SDK 19041

---
 eng/scripts/vs.17.preview.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/scripts/vs.17.preview.json b/eng/scripts/vs.17.preview.json
index 943b5697c110..39f8297f1f96 100644
--- a/eng/scripts/vs.17.preview.json
+++ b/eng/scripts/vs.17.preview.json
@@ -17,7 +17,7 @@
         "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64",
         "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64",
         "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL",
-        "Microsoft.VisualStudio.Component.Windows10SDK.18362",
+        "Microsoft.VisualStudio.Component.Windows10SDK.19041",
         "Microsoft.VisualStudio.Workload.ManagedDesktop",
         "Microsoft.VisualStudio.Workload.NativeDesktop",
         "Microsoft.VisualStudio.Workload.NetWeb",

From 41f41b75c4bc71622a06e265d09d28ca17ba15fc Mon Sep 17 00:00:00 2001
From: Damian Edwards <damian@damianedwards.com>
Date: Mon, 27 Jun 2022 14:53:11 -0700
Subject: [PATCH 2/6] Update rest of the VS manifest files

---
 eng/scripts/vs.17.buildtools.intpreview.json | 2 +-
 eng/scripts/vs.17.buildtools.json            | 2 +-
 eng/scripts/vs.17.buildtools.preview.json    | 2 +-
 eng/scripts/vs.17.intpreview.json            | 2 +-
 eng/scripts/vs.17.json                       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eng/scripts/vs.17.buildtools.intpreview.json b/eng/scripts/vs.17.buildtools.intpreview.json
index e1fe46fad991..8a7c5ac445cb 100644
--- a/eng/scripts/vs.17.buildtools.intpreview.json
+++ b/eng/scripts/vs.17.buildtools.intpreview.json
@@ -20,7 +20,7 @@
         "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64",
         "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64",
         "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL",
-        "Microsoft.VisualStudio.Component.Windows10SDK.18362",
+        "Microsoft.VisualStudio.Component.Windows10SDK.19041",
         "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools",
         "Microsoft.VisualStudio.Workload.MSBuildTools",
         "Microsoft.VisualStudio.Workload.NetCoreBuildTools",
diff --git a/eng/scripts/vs.17.buildtools.json b/eng/scripts/vs.17.buildtools.json
index ead9add6d62e..3a125c9d35eb 100644
--- a/eng/scripts/vs.17.buildtools.json
+++ b/eng/scripts/vs.17.buildtools.json
@@ -20,7 +20,7 @@
         "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64",
         "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64",
         "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL",
-        "Microsoft.VisualStudio.Component.Windows10SDK.18362",
+        "Microsoft.VisualStudio.Component.Windows10SDK.19041",
         "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools",
         "Microsoft.VisualStudio.Workload.MSBuildTools",
         "Microsoft.VisualStudio.Workload.NetCoreBuildTools",
diff --git a/eng/scripts/vs.17.buildtools.preview.json b/eng/scripts/vs.17.buildtools.preview.json
index c200518a1541..571a49978103 100644
--- a/eng/scripts/vs.17.buildtools.preview.json
+++ b/eng/scripts/vs.17.buildtools.preview.json
@@ -20,7 +20,7 @@
         "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64",
         "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64",
         "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL",
-        "Microsoft.VisualStudio.Component.Windows10SDK.18362",
+        "Microsoft.VisualStudio.Component.Windows10SDK.19041",
         "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools",
         "Microsoft.VisualStudio.Workload.MSBuildTools",
         "Microsoft.VisualStudio.Workload.NetCoreBuildTools",
diff --git a/eng/scripts/vs.17.intpreview.json b/eng/scripts/vs.17.intpreview.json
index bdf5c862b90b..67b7a1f8e90d 100644
--- a/eng/scripts/vs.17.intpreview.json
+++ b/eng/scripts/vs.17.intpreview.json
@@ -17,7 +17,7 @@
         "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64",
         "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64",
         "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL",
-        "Microsoft.VisualStudio.Component.Windows10SDK.18362",
+        "Microsoft.VisualStudio.Component.Windows10SDK.19041",
         "Microsoft.VisualStudio.Workload.ManagedDesktop",
         "Microsoft.VisualStudio.Workload.NativeDesktop",
         "Microsoft.VisualStudio.Workload.NetWeb",
diff --git a/eng/scripts/vs.17.json b/eng/scripts/vs.17.json
index a626179c32ee..86acfd28fdbe 100644
--- a/eng/scripts/vs.17.json
+++ b/eng/scripts/vs.17.json
@@ -17,7 +17,7 @@
         "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64",
         "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64",
         "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL",
-        "Microsoft.VisualStudio.Component.Windows10SDK.18362",
+        "Microsoft.VisualStudio.Component.Windows10SDK.19041",
         "Microsoft.VisualStudio.Workload.ManagedDesktop",
         "Microsoft.VisualStudio.Workload.NativeDesktop",
         "Microsoft.VisualStudio.Workload.NetWeb",

From f5f69e75985a0e25bac2805befdc03886bdc0ad5 Mon Sep 17 00:00:00 2001
From: Damian Edwards <damian@damianedwards.com>
Date: Mon, 27 Jun 2022 14:54:51 -0700
Subject: [PATCH 3/6] Add comment to props file

---
 eng/targets/Cpp.Common.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/targets/Cpp.Common.props b/eng/targets/Cpp.Common.props
index aaf44c428347..cd616e0210d9 100644
--- a/eng/targets/Cpp.Common.props
+++ b/eng/targets/Cpp.Common.props
@@ -22,6 +22,7 @@
     <Platform Condition="'$(Platform)' == ''">x64</Platform>
     <PlatformToolsetVersion>v143</PlatformToolsetVersion>
     <PlatformToolset>$(PlatformToolsetVersion)</PlatformToolset>
+    <!-- If the following line is updated ensure that the /eng/scripts/vs.17.*.json files are updated to point to the same version component too. -->
     <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
 

From d0c34cc0c8023aca2ba6c86c95cbbd3d3cd61253 Mon Sep 17 00:00:00 2001
From: Damian Edwards <damian@damianedwards.com>
Date: Mon, 27 Jun 2022 15:53:46 -0700
Subject: [PATCH 4/6] Update comments

---
 eng/targets/Cpp.Common.props                                    | 2 +-
 .../Windows/AspNetCoreModule-Setup/build/settings/common.props  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/eng/targets/Cpp.Common.props b/eng/targets/Cpp.Common.props
index cd616e0210d9..c824b87caa9a 100644
--- a/eng/targets/Cpp.Common.props
+++ b/eng/targets/Cpp.Common.props
@@ -22,7 +22,7 @@
     <Platform Condition="'$(Platform)' == ''">x64</Platform>
     <PlatformToolsetVersion>v143</PlatformToolsetVersion>
     <PlatformToolset>$(PlatformToolsetVersion)</PlatformToolset>
-    <!-- If the following line is updated ensure that the /eng/scripts/vs.17.*.json files are updated to point to the same version component too. -->
+    <!-- If the following line is updated ensure that the /eng/scripts/vs.17.*.json files are updated to include the same version component too. -->
     <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
 
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props
index 43b3f6b7e4b8..253134d4fc32 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props
@@ -14,6 +14,7 @@
   <!-- General properties -->
 
   <PropertyGroup>
+    <!-- If the following line is updated ensure that the /eng/scripts/vs.17.*.json files are updated to include the same version component too. -->
     <IisOobWinSdkVersion Condition="'$(IisOobWinSdkVersion)' == ''">10.0.18362.0</IisOobWinSdkVersion>
     <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">$(IisOobWinSdkVersion)</WindowsTargetPlatformVersion>
     <CharacterSet>Unicode</CharacterSet>

From afefa5c20617a939542d6b89b4756998e2fbfa44 Mon Sep 17 00:00:00 2001
From: Damian Edwards <damian@damianedwards.com>
Date: Mon, 27 Jun 2022 16:53:30 -0700
Subject: [PATCH 5/6] Updated root .vsconfig

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

diff --git a/.vsconfig b/.vsconfig
index 3dff770c107b..e0fa83eab980 100644
--- a/.vsconfig
+++ b/.vsconfig
@@ -12,7 +12,7 @@
     "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64",
     "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64",
     "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL",
-    "Microsoft.VisualStudio.Component.Windows10SDK.18362",
+    "Microsoft.VisualStudio.Component.Windows10SDK.19041",
     "Microsoft.VisualStudio.Workload.ManagedDesktop",
     "Microsoft.VisualStudio.Workload.NativeDesktop",
     "Microsoft.VisualStudio.Workload.NetWeb",

From 723b7cc47cb7734560bb672ca9e25f248c05bec2 Mon Sep 17 00:00:00 2001
From: Damian Edwards <damian@damianedwards.com>
Date: Mon, 27 Jun 2022 16:56:16 -0700
Subject: [PATCH 6/6] Add comment to CommonLibTests.vcxproj

---
 .../IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj
index 905f462db915..9dbd0edb016e 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj
@@ -40,6 +40,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1eac8125-1765-4e2d-8cbe-56dc98a1c8c1}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
+    <!-- If the following line is updated ensure that the /eng/scripts/vs.17.*.json files are updated to include the same version component too. -->
     <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.19041.0</WindowsTargetPlatformVersion>
     <PlatformToolsetVersion Condition=" '$(PlatformToolsetVersion)' == '' ">v143</PlatformToolsetVersion>
     <ConfigurationType>Application</ConfigurationType>