actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-19 08:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Windows] Update WDK,SDK to latest version on windows 22 image and AzCli signature. (#10945)

Browse Source 
* Update WDK and SDK to latest version

* update comment on bisual studio script

* Fix Azcli signature mismatch

* Removed VS Components
This commit is contained in:
kishorekumar-anchala
2024-11-13 20:09:50 +00:00
committed by GitHub
parent e96b8f37d5
commit 918263378c
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
images/windows/scripts/build/Install-VisualStudio.ps1
View File

@@ -48,6 +48,11 @@ if (Test-IsWin22) {
-Url 'https://go.microsoft.com/fwlink/p/?LinkID=2033908' ` -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") ` -InstallArgs @("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") `
-ExpectedSignature '7535269B94C1FEA4A5EF6D808E371DA242F27936' -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" Invoke-PesterTests -TestFile "VisualStudio"

12
images/windows/scripts/build/Install-WDK.ps1
View File

@@ -16,9 +16,8 @@ if (Test-IsWin19) {
$wdkExtensionPath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix" $wdkExtensionPath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix"
} elseif (Test-IsWin22) { } elseif (Test-IsWin22) {
# SDK is available through Visual Studio # SDK is available through Visual Studio
$wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2249371" $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2294834"
$wdkSignatureThumbprint = "7C94971221A799907BB45665663BBFD587BAC9F8" $wdkSignatureThumbprint = "7920AC8FB05E0FFFE21E8FF4B4F03093BA6AC16E"
$wdkExtensionPath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2022\*\WDK.vsix"
} else { } else {
throw "Invalid version of Visual Studio is found. Either 2019 or 2022 are required" 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") ` -InstallArgs @("/features", "+", "/quiet") `
-ExpectedSignature $wdkSignatureThumbprint -ExpectedSignature $wdkSignatureThumbprint
# Need to install the VSIX to get the build targets when running VSBuild if (Test-IsWin19){
Install-VSIXFromFile (Resolve-Path -Path $wdkExtensionPath) # Need to install the VSIX to get the build targets when running VSBuild
Install-VSIXFromFile (Resolve-Path -Path $wdkExtensionPath)
}
Invoke-PesterTests -TestFile "WDK" Invoke-PesterTests -TestFile "WDK"

6
images/windows/scripts/tests/VisualStudio.Tests.ps1
View File

@@ -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 "${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
}
}

4
images/windows/toolsets/toolset-2022.json
View File

@@ -264,7 +264,9 @@
"Component.MDD.Linux", "Component.MDD.Linux",
"Component.MDD.Linux.GCC.arm", "Component.MDD.Linux.GCC.arm",
"Component.Microsoft.Windows.DriverKit", "Component.Microsoft.Windows.DriverKit",
"wasm.tools" "wasm.tools",
"Microsoft.Component.MSBuild"
], ],
"vsix": [ "vsix": [
"SSIS.MicrosoftDataToolsIntegrationServices", "SSIS.MicrosoftDataToolsIntegrationServices",