From 918263378c472623f0e156cd610c5f2c22b00312 Mon Sep 17 00:00:00 2001
From: kishorekumar-anchala
 <168699259+kishorekumar-anchala@users.noreply.github.com>
Date: Wed, 13 Nov 2024 20:09:50 +0000
Subject: [PATCH] [Windows] Update WDK,SDK to latest version on windows 22
 image and AzCli signature. (#10945)

* Update WDK and SDK to latest version

* update comment on bisual studio script

* Fix Azcli signature mismatch

* Removed VS Components
---
 .../windows/scripts/build/Install-VisualStudio.ps1   |  5 +++++
 images/windows/scripts/build/Install-WDK.ps1         | 12 ++++++------
 images/windows/scripts/tests/VisualStudio.Tests.ps1  |  6 ++++++
 images/windows/toolsets/toolset-2022.json            |  4 +++-
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/images/windows/scripts/build/Install-VisualStudio.ps1 b/images/windows/scripts/build/Install-VisualStudio.ps1
index 73b97ddf7..559b6c705 100644
--- a/images/windows/scripts/build/Install-VisualStudio.ps1
+++ b/images/windows/scripts/build/Install-VisualStudio.ps1
@@ -48,6 +48,11 @@ if (Test-IsWin22) {
         -Url 'https://go.microsoft.com/fwlink/p/?LinkID=2033908' `
         -InstallArgs @("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") `
         -ExpectedSignature '7535269B94C1FEA4A5EF6D808E371DA242F27936'
+     # Install Windows 11 SDK version 10.0.26100
+     Install-Binary -Type EXE `
+        -Url 'https://go.microsoft.com/fwlink/?linkid=2286561' `
+        -InstallArgs @("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") `
+        -ExpectedSignature '573EF451A68C33FB904346D44551BEF3BB5BBF68'
 }
 
 Invoke-PesterTests -TestFile "VisualStudio"
diff --git a/images/windows/scripts/build/Install-WDK.ps1 b/images/windows/scripts/build/Install-WDK.ps1
index a8cc89b73..51660a07c 100644
--- a/images/windows/scripts/build/Install-WDK.ps1
+++ b/images/windows/scripts/build/Install-WDK.ps1
@@ -16,9 +16,8 @@ if (Test-IsWin19) {
     $wdkExtensionPath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix"
 } elseif (Test-IsWin22) {
     # SDK is available through Visual Studio
-    $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2249371"
-    $wdkSignatureThumbprint = "7C94971221A799907BB45665663BBFD587BAC9F8"
-    $wdkExtensionPath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2022\*\WDK.vsix"
+    $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2294834"
+    $wdkSignatureThumbprint = "7920AC8FB05E0FFFE21E8FF4B4F03093BA6AC16E"
 } else {
     throw "Invalid version of Visual Studio is found. Either 2019 or 2022 are required"
 }
@@ -29,7 +28,8 @@ Install-Binary -Type EXE `
     -InstallArgs @("/features", "+", "/quiet") `
     -ExpectedSignature $wdkSignatureThumbprint
 
-# Need to install the VSIX to get the build targets when running VSBuild
-Install-VSIXFromFile (Resolve-Path -Path $wdkExtensionPath)
-
+if (Test-IsWin19){
+    # Need to install the VSIX to get the build targets when running VSBuild
+    Install-VSIXFromFile (Resolve-Path -Path $wdkExtensionPath)
+}
 Invoke-PesterTests -TestFile "WDK"
diff --git a/images/windows/scripts/tests/VisualStudio.Tests.ps1 b/images/windows/scripts/tests/VisualStudio.Tests.ps1
index 47b34b17a..b89729311 100644
--- a/images/windows/scripts/tests/VisualStudio.Tests.ps1
+++ b/images/windows/scripts/tests/VisualStudio.Tests.ps1
@@ -36,3 +36,9 @@ Describe "Windows 11 SDK" {
         "${env:ProgramFiles(x86)}\Windows Kits\10\DesignTime\CommonConfiguration\Neutral\UAP\10.0.22621.0\UAP.props" | Should -Exist
     }
 }
+
+Describe "Windows 11 SDK" {
+    It "Verifies 26100 SDK is installed" -Skip:(Test-IsWin19) {
+        "${env:ProgramFiles(x86)}\Windows Kits\10\DesignTime\CommonConfiguration\Neutral\UAP\10.0.26100.0\UAP.props" | Should -Exist
+    }
+}
diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json
index 47d9fe86a..f8cd856f2 100644
--- a/images/windows/toolsets/toolset-2022.json
+++ b/images/windows/toolsets/toolset-2022.json
@@ -264,7 +264,9 @@
             "Component.MDD.Linux",
             "Component.MDD.Linux.GCC.arm",
             "Component.Microsoft.Windows.DriverKit",
-            "wasm.tools"
+            "wasm.tools",
+            "Microsoft.Component.MSBuild"
+            
         ],
         "vsix": [
             "SSIS.MicrosoftDataToolsIntegrationServices",