Skip to content

Commit 9182633

Browse files
[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
1 parent e96b8f3 commit 9182633

File tree

4 files changed

+20
-7
lines changed

4 files changed

+20
-7
lines changed

images/windows/scripts/build/Install-VisualStudio.ps1

+5
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ if (Test-IsWin22) {
4848
-Url 'https://go.microsoft.com/fwlink/p/?LinkID=2033908' `
4949
-InstallArgs @("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") `
5050
-ExpectedSignature '7535269B94C1FEA4A5EF6D808E371DA242F27936'
51+
# Install Windows 11 SDK version 10.0.26100
52+
Install-Binary -Type EXE `
53+
-Url 'https://go.microsoft.com/fwlink/?linkid=2286561' `
54+
-InstallArgs @("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") `
55+
-ExpectedSignature '573EF451A68C33FB904346D44551BEF3BB5BBF68'
5156
}
5257

5358
Invoke-PesterTests -TestFile "VisualStudio"

images/windows/scripts/build/Install-WDK.ps1

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ if (Test-IsWin19) {
1616
$wdkExtensionPath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix"
1717
} elseif (Test-IsWin22) {
1818
# SDK is available through Visual Studio
19-
$wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2249371"
20-
$wdkSignatureThumbprint = "7C94971221A799907BB45665663BBFD587BAC9F8"
21-
$wdkExtensionPath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2022\*\WDK.vsix"
19+
$wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2294834"
20+
$wdkSignatureThumbprint = "7920AC8FB05E0FFFE21E8FF4B4F03093BA6AC16E"
2221
} else {
2322
throw "Invalid version of Visual Studio is found. Either 2019 or 2022 are required"
2423
}
@@ -29,7 +28,8 @@ Install-Binary -Type EXE `
2928
-InstallArgs @("/features", "+", "/quiet") `
3029
-ExpectedSignature $wdkSignatureThumbprint
3130

32-
# Need to install the VSIX to get the build targets when running VSBuild
33-
Install-VSIXFromFile (Resolve-Path -Path $wdkExtensionPath)
34-
31+
if (Test-IsWin19){
32+
# Need to install the VSIX to get the build targets when running VSBuild
33+
Install-VSIXFromFile (Resolve-Path -Path $wdkExtensionPath)
34+
}
3535
Invoke-PesterTests -TestFile "WDK"

images/windows/scripts/tests/VisualStudio.Tests.ps1

+6
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,9 @@ Describe "Windows 11 SDK" {
3636
"${env:ProgramFiles(x86)}\Windows Kits\10\DesignTime\CommonConfiguration\Neutral\UAP\10.0.22621.0\UAP.props" | Should -Exist
3737
}
3838
}
39+
40+
Describe "Windows 11 SDK" {
41+
It "Verifies 26100 SDK is installed" -Skip:(Test-IsWin19) {
42+
"${env:ProgramFiles(x86)}\Windows Kits\10\DesignTime\CommonConfiguration\Neutral\UAP\10.0.26100.0\UAP.props" | Should -Exist
43+
}
44+
}

images/windows/toolsets/toolset-2022.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,9 @@
264264
"Component.MDD.Linux",
265265
"Component.MDD.Linux.GCC.arm",
266266
"Component.Microsoft.Windows.DriverKit",
267-
"wasm.tools"
267+
"wasm.tools",
268+
"Microsoft.Component.MSBuild"
269+
268270
],
269271
"vsix": [
270272
"SSIS.MicrosoftDataToolsIntegrationServices",

0 commit comments

Comments
 (0)