From 5d8cf1a6a967f91fbb5b4814cb0b3b7cd0c366e4 Mon Sep 17 00:00:00 2001 From: jpark37 Date: Mon, 6 Sep 2021 07:08:45 -0700 Subject: [PATCH] Use 20348 SDK/WDK for windows-2019/2022 images (#3942) --- images/win/scripts/Installers/Install-WDK.ps1 | 4 ++-- images/win/toolsets/toolset-2019.json | 1 + images/win/toolsets/toolset-2022.json | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-WDK.ps1 b/images/win/scripts/Installers/Install-WDK.ps1 index dea6a468..c272da54 100644 --- a/images/win/scripts/Installers/Install-WDK.ps1 +++ b/images/win/scripts/Installers/Install-WDK.ps1 @@ -6,8 +6,8 @@ # Requires Windows SDK with the same version number as the WDK if (Test-IsWin19) { - $winSdkUrl = "https://go.microsoft.com/fwlink/p/?linkid=2120843" - $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2128854" + $winSdkUrl = "https://go.microsoft.com/fwlink/?linkid=2164145" + $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2164149" $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix" $VSver = "2019" } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 33a49e98..71630f72 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -328,6 +328,7 @@ "Microsoft.VisualStudio.Component.Windows10SDK.17763", "Microsoft.VisualStudio.Component.Windows10SDK.18362", "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.Windows10SDK.20348", "Microsoft.VisualStudio.Component.WinXP", "Microsoft.VisualStudio.Component.Workflow", "Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 10c9f18c..d21db4d7 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -175,6 +175,7 @@ "Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre", "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.Windows10SDK.20348", "Microsoft.VisualStudio.Component.Workflow", "Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices", "Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools",