Browse Source

Updated VS workload manifests to Windows SDK 19041 (#42457)

* Updated VS workload manifests to Windows SDK 19041
* Add comment to props file
* Add comment to CommonLibTests.vcxproj
* Updated root .vsconfig
Damian Edwards 3 years ago
parent
commit
fb1b3a1ff7

+ 1 - 1
.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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 0
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 include the same version component too. -->
     <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
 

+ 1 - 0
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>

+ 1 - 0
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>