From 9ff76f18b9ce6a12bf5e813d82ff4b4c911c9730 Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com>
Date: Wed, 6 Oct 2021 18:47:15 +0300
Subject: [PATCH] [Windows] wdk: remove iso installer (#4232)

---
 images/win/scripts/Installers/Install-WDK.ps1 | 23 +++----------------
 images/win/toolsets/toolset-2019.json         |  1 +
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/images/win/scripts/Installers/Install-WDK.ps1 b/images/win/scripts/Installers/Install-WDK.ps1
index 052245b6..139f50c1 100644
--- a/images/win/scripts/Installers/Install-WDK.ps1
+++ b/images/win/scripts/Installers/Install-WDK.ps1
@@ -6,7 +6,7 @@
 # Requires Windows SDK with the same version number as the WDK
 if (Test-IsWin19)
 {
-    $winSdkUrl = "https://go.microsoft.com/fwlink/?linkid=2166460"
+    $winSdkUrl = "https://go.microsoft.com/fwlink/?linkid=2173743"
     $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2166289"
     $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix"
     $VSver = "2019"
@@ -25,25 +25,8 @@ else
 
 $argumentList = ("/features", "+", "/quiet")
 
-if (Test-IsWin19)
-{
-    # Download WDK ISO file
-    $isoPath = Start-DownloadWithRetry -Url $winSdkUrl -Name winsdk.iso
-    $diskImage = Mount-DiskImage -ImagePath $isoPath
-    $driveLetter = ($diskImage | Get-Volume).DriveLetter
-    $sdkPath = Join-Path "${driveLetter}:\" "winsdksetup.exe"
-
-    # `winsdksetup.exe /features + /quiet` installs all features without showing the GUI
-    Install-Binary -FilePath $sdkPath -ArgumentList $argumentList
-
-    # Dismount ISO
-    Dismount-DiskImage -DevicePath $diskImage.DevicePath | Out-Null
-}
-else
-{
-    # `winsdksetup.exe /features + /quiet` installs all features without showing the GUI
-    Install-Binary -Url $winSdkUrl -Name "winsdksetup.exe" -ArgumentList $argumentList
-}
+# `winsdksetup.exe /features + /quiet` installs all features without showing the GUI
+Install-Binary -Url $winSdkUrl -Name "winsdksetup.exe" -ArgumentList $argumentList
 
 # `wdksetup.exe /features + /quiet` installs all features without showing the GUI
 Install-Binary -Url $wdkUrl -Name "wdksetup.exe" -ArgumentList $argumentList
diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json
index 4383cfc7..dd245b14 100644
--- a/images/win/toolsets/toolset-2019.json
+++ b/images/win/toolsets/toolset-2019.json
@@ -339,6 +339,7 @@
             "Microsoft.VisualStudio.Component.Windows10SDK.18362",
             "Microsoft.VisualStudio.Component.Windows10SDK.19041",
             "Microsoft.VisualStudio.Component.Windows10SDK.20348",
+            "Microsoft.VisualStudio.Component.Windows11SDK.22000",
             "Microsoft.VisualStudio.Component.WinXP",
             "Microsoft.VisualStudio.Component.Workflow",
             "Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices",