From 647bf39d9266357ca5985dcd6c2ac0386308b652 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 9 Nov 2023 19:06:38 +0100 Subject: [PATCH] Sync changes to macos-new-folder-structure branch (#8765) * New folder structure * Update packer templates * Update refs in scripts * Updating readme file for macOS-12 version 20231029.1 (#8695) Co-authored-by: Image generation service account Co-authored-by: Actions service account * [Windows] Remove Android SDK Patch applier v4 (#8750) * remove ndk 23 from macos images (#8747) * [Mac OS] Remove 'LTS' suffix from OpenJDK version (#8751) * [windows] split docker install into 3 scripts (#8688) * [windows] split docker install into 3 scripts the idea is to end with 1 script per 1 component for better observability * Update images/win/scripts/Installers/Install-Docker-Compose.ps1 Co-authored-by: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> * Update images/win/scripts/Installers/Install-Docker-WinCred.ps1 Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> * fix test --------- Co-authored-by: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> * remove ndk 23 from ubuntu images (#8745) * [macos] add android SDK to SW report on Ventura ARM64 (#8715) * Fix utils path in templates * Sync changes * [Mac OS] Update Anka Helpers to build Mac OS 14 ARM image (#8757) * Update Anka Helpers to build Mac OS 14 ARM image * Drop Powershell 5 support * [Mac OS] Add missing macOS Sonoma selector (#8759) * remove ndk23 from windows images (#8746) * Updating readme file for macos-13 version 20231025.2 (#8672) Co-authored-by: Image generation service account * Fix macOS-12.anka template with assets path --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Image generation service account Co-authored-by: Actions service account Co-authored-by: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Co-authored-by: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Co-authored-by: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> --- images.CI/macos/anka/Service.Helpers.psm1 | 49 +++--- images/linux/scripts/tests/Android.Tests.ps1 | 3 +- images/linux/toolsets/toolset-2004.json | 2 +- images/linux/toolsets/toolset-2204.json | 2 +- images/macos/macos-13-Readme.md | 146 +++++++++--------- images/macos/scripts/build/openjdk.sh | 3 + .../docs-gen/SoftwareReport.Generator.ps1 | 14 +- images/macos/scripts/tests/Android.Tests.ps1 | 8 +- images/macos/templates/macOS-12.anka.pkr.hcl | 4 +- .../templates/macOS-13.arm64.anka.pkr.hcl | 1 + images/macos/toolsets/toolset-11.json | 2 +- images/macos/toolsets/toolset-12.json | 2 +- .../Installers/Install-Docker-Compose.ps1 | 17 ++ .../Installers/Install-Docker-WinCred.ps1 | 35 +++++ .../win/scripts/Installers/Install-Docker.ps1 | 44 +----- images/win/scripts/Tests/Docker.Tests.ps1 | 30 ++-- images/win/toolsets/toolset-2019.json | 5 +- images/win/toolsets/toolset-2022.json | 5 +- images/win/windows2019.json | 2 + images/win/windows2022.json | 2 + 20 files changed, 203 insertions(+), 173 deletions(-) create mode 100644 images/win/scripts/Installers/Install-Docker-Compose.ps1 create mode 100644 images/win/scripts/Installers/Install-Docker-WinCred.ps1 diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index 9d1e62239682..3aef16813ba7 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -63,24 +63,24 @@ function Get-AvailableIPSWVersions { ) if ($IsBeta) { - $command = { mist list firmware "$MacOSCodeNameOrVersion" --include-betas --latest --export "/Applications/export.json"} + $command = { mist list firmware "$MacOSCodeNameOrVersion" --compatible --include-betas --latest --export "/Applications/export.json" } } elseif ($IsLatest) { - $command = { mist list firmware "$MacOSCodeNameOrVersion" --latest --export "/Applications/export.json" } + $command = { mist list firmware "$MacOSCodeNameOrVersion" --compatible --latest --export "/Applications/export.json" } } else { - $command = { mist list firmware "$MacOSCodeNameOrVersion" --export "/Applications/export.json" } + $command = { mist list firmware "$MacOSCodeNameOrVersion" --compatible --export "/Applications/export.json" } } $condition = { $LASTEXITCODE -eq 0 } Invoke-WithRetry -Command $command -BreakCondition $condition | Out-Null $softwareList = get-content -Path "/Applications/export.json" - $turgetVersion = ($softwareList | ConvertFrom-Json).version - if ($null -eq $turgetVersion) { + $availableBuilds = ($softwareList | ConvertFrom-Json).build + if ($null -eq $availableBuilds) { Write-Host "Requested macOS '$MacOSCodeNameOrVersion' version not found in the list of available installers." $command = { mist list firmware "$($MacOSCodeNameOrVersion.split('.')[0])" } Invoke-WithRetry -Command $command -BreakCondition $condition exit 1 } - return $turgetVersion + return $availableBuilds } function Get-MacOSIPSWInstaller { @@ -96,21 +96,26 @@ function Get-MacOSIPSWInstaller { $MacOSName = "macOS Monterey" } elseif ($MacOSVersion -eq [version] "13.0") { $MacOSName = "macOS Ventura" + } elseif ($MacOSVersion -eq [version] "14.0") { + $MacOSName = "macOS Sonoma" } else { $MacOSName = $MacOSVersion.ToString() } - Write-Host "`t[*] Finding available full installers" if ($DownloadLatestVersion -eq $true) { - $targetVersion = Get-AvailableIPSWVersions -IsLatest $true -MacOSCodeNameOrVersion $MacOSName - Write-host "`t[*] The 'DownloadLatestVersion' flag is set to true. Latest macOS version is '$MacOSName' - '$targetVersion' now" + $targetBuild = Get-AvailableIPSWVersions -IsLatest $true -MacOSCodeNameOrVersion $MacOSName + Write-Host "`t[*] The 'DownloadLatestVersion' flag is set to true. Latest compatible macOS build of '$MacOSName' is '$targetBuild'" } elseif ($BetaSearch -eq $true) { - $targetVersion = Get-AvailableIPSWVersions -IsBeta $true -MacOSCodeNameOrVersion $MacOSName - Write-host "`t[*] The 'BetaSearch' flag is set to true. Latestbeta macOS version is '$MacOSName' - '$targetVersion' now" + $targetBuild = Get-AvailableIPSWVersions -IsBeta $true -MacOSCodeNameOrVersion $MacOSName + Write-Host "`t[*] The 'BetaSearch' flag is set to true. Latest compatible beta macOS build of '$MacOSName' is '$targetBuild'" } else { - $targetVersion = Get-AvailableIPSWVersions -MacOSCodeNameOrVersion $MacOSName -IsLatest $false - Write-host "`t[*] The exact version was specified - '$MacOSName' " + $targetBuild = Get-AvailableIPSWVersions -MacOSCodeNameOrVersion $MacOSName -IsLatest $false + Write-Host "`t[*] Available compatible macOS builds of '$MacOSName' are: $($targetBuild -join ', ')" + if ($targetBuild.Count -gt 1) { + Write-Error "`t[*] Please specify the exact build number of macOS you want to install" + exit 1 + } } $installerPathPattern = "/Applications/Install ${macOSName}*.ipsw" @@ -123,12 +128,12 @@ function Get-MacOSIPSWInstaller { # Download macOS installer $installerDir = "/Applications/" $installerName = "Install ${macOSName}.ipsw" - Write-Host "`t[*] Requested macOS '$targetVersion' version installer found, fetching it from mist database" - Invoke-WithRetry { mist download firmware "$targetVersion" --output-directory $installerDir --firmware-name "$installerName" } {$LASTEXITCODE -eq 0} | Out-Null + Write-Host "`t[*] Requested macOS '$targetBuild' version installer found, fetching it from mist database" + Invoke-WithRetry { mist download firmware "$targetBuild" --output-directory $installerDir --firmware-name "$installerName" } { $LASTEXITCODE -eq 0 } | Out-Null if (Test-Path "$installerDir$installerName") { $result = "$installerDir$installerName" } else { - Write-host "`t[*] Requested macOS '$targetVersion' version installer failed to download" + Write-Error "`t[*] Requested macOS '$targetBuild' version installer failed to download" exit 1 } return $result @@ -169,7 +174,7 @@ function Get-MacOSInstaller { exit 1 } Show-StringWithFormat $filteredVersions - $osVersions = $filteredVersions.OSVersion | Sort-Object {[version]$_} + $osVersions = $filteredVersions.OSVersion | Sort-Object { [version]$_ } $MacOSVersion = $osVersions | Select-Object -Last 1 Write-Host "`t[*] The 'DownloadLatestVersion' flag is set. Latest macOS version is '$MacOSVersion' now" } @@ -248,7 +253,7 @@ function Install-SoftwareUpdate { $command = "sw_vers" $guestMacosVersion = Invoke-SSHPassCommand -HostName $HostName -Command $command if ($guestMacosVersion[1] -match "12") { - foreach ($update in $listOfUpdates){ + foreach ($update in $listOfUpdates) { # Filtering updates that contain "Ventura" word if ($update -notmatch "Ventura") { $command = "sudo /usr/sbin/softwareupdate --restart --verbose --install '$($update.trim())'" @@ -256,7 +261,7 @@ function Install-SoftwareUpdate { } } } elseif ($guestMacosVersion[1] -match "13") { - foreach ($update in $listOfUpdates){ + foreach ($update in $listOfUpdates) { # Filtering updates that contain "Sonoma" word if ($update -notmatch "Sonoma") { $command = "sudo /usr/sbin/softwareupdate --restart --verbose --install '$($update.trim())'" @@ -302,7 +307,11 @@ function Invoke-SSHPassCommand { "${env:SSHUSER}@${HostName}" ) $sshPassOptions = $sshArg -join " " - $result = bash -c "$sshPassOptions \""$Command\"" 2>&1" + if ($PSVersionTable.PSVersion.Major -eq 7 -and $PSVersionTable.PSVersion.Minor -le 2) { + $result = bash -c "$sshPassOptions \""$Command\"" 2>&1" + } else { + $result = bash -c "$sshPassOptions `"$Command`" 2>&1" + } if ($LASTEXITCODE -ne 0) { Write-Error "There is an error during command execution:`n$result" exit 1 diff --git a/images/linux/scripts/tests/Android.Tests.ps1 b/images/linux/scripts/tests/Android.Tests.ps1 index 4c0b29964330..0ed6847e5a6d 100644 --- a/images/linux/scripts/tests/Android.Tests.ps1 +++ b/images/linux/scripts/tests/Android.Tests.ps1 @@ -33,7 +33,6 @@ Describe "Android" { # Convert 'm2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1' -> # 'm2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1' # 'cmake;3.6.4111459' -> 'cmake/3.6.4111459' - # 'patcher;v4' -> 'patcher/v4' $PackageName = $PackageName.Replace(";", "/") $targetPath = Join-Path $env:ANDROID_HOME $PackageName $targetPath | Should -Exist @@ -65,4 +64,4 @@ Describe "Android" { Validate-AndroidPackage $PackageName } } -} \ No newline at end of file +} diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 11ae990f75e8..5bf9da70db22 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -97,7 +97,7 @@ "ndk": { "default": "25", "versions": [ - "23", "24", "25", "26" + "24", "25", "26" ] } }, diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 5c6c82abe5ff..f0817d329435 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -91,7 +91,7 @@ "ndk": { "default": "25", "versions": [ - "23", "24", "25", "26" + "24", "25", "26" ] } }, diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 9c0e99087d96..0ad49ccd6877 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,29 +1,28 @@ -| Announcements | -|-| -| [[All OS] Android NDK r23 will be removed from images on October 9](https://github.com/actions/runner-images/issues/8383) | -*** # macOS 13 - OS Version: macOS 13.6 (22G120) - Kernel Version: Darwin 22.6.0 -- Image Version: 20231018.14 +- Image Version: 20231025.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.402 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.403 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias +- GCC 13 (Homebrew GCC 13.2.0) - available by `gcc-13` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias +- GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Julia 1.9.3 - Kotlin 1.9.10-release-459 - Mono 6.12.0.188 +- Node.js 18.18.2 - Perl 5.38.0 - PHP 8.2.11 -- Python3 3.11.6 +- Python3 3.12.0 - R 4.3.1 - Ruby 3.0.6p216 @@ -32,13 +31,13 @@ - Carthage 0.39.1 - CocoaPods 1.13.0 - Composer 2.6.5 -- Homebrew 4.1.16 +- Homebrew 4.1.17 - NPM 9.8.1 - NuGet 6.3.1.1 -- Pip3 23.3 (python 3.11) -- Pipx 1.2.0 +- Pip3 23.3.1 (python 3.12) +- Pipx 1.2.1 - RubyGems 3.4.21 -- Vcpkg 2023 (build from commit a9794606a) +- Vcpkg 2023 (build from commit 213c01f87) - Yarn 1.22.19 ### Project Management @@ -49,8 +48,8 @@ ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.21.0 -- bazel 6.3.2 +- azcopy 10.21.1 +- bazel 6.4.0 - bazelisk 1.18.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.4.0 @@ -68,20 +67,20 @@ - zstd 1.5.5 ### Tools -- AWS CLI 2.13.26 -- AWS SAM CLI 1.98.0 +- AWS CLI 2.13.29 +- AWS SAM CLI 1.99.0 - AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.53.0 +- Azure CLI 2.53.1 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.22.6 - Cabal 3.6.2.0 - Cmake 3.27.7 -- CodeQL Action Bundle 2.15.0 +- CodeQL Action Bundle 2.15.1 - Fastlane 2.216.0 - GHC 9.8.1 - GHCup 0.1.19.4 - Stack 2.13.1 -- SwiftFormat 0.52.7 +- SwiftFormat 0.52.8 - Xcode Command Line Tools 15.0.0.0.1.1694021235 ### Linters @@ -90,12 +89,12 @@ ### Browsers - Safari 17.0 (18616.1.27.111.22) - SafariDriver 17.0 (18616.1.27.111.22) -- Google Chrome 118.0.5993.88 +- Google Chrome 118.0.5993.117 - Google Chrome for Testing 118.0.5993.70 - ChromeDriver 118.0.5993.70 -- Microsoft Edge 118.0.2088.46 -- Microsoft Edge WebDriver 118.0.2088.46 -- Mozilla Firefox 118.0.2 +- Microsoft Edge 118.0.2088.69 +- Microsoft Edge WebDriver 118.0.2088.69 +- Mozilla Firefox 119.0 - geckodriver 0.33.0 - Selenium server 4.14.1 @@ -107,12 +106,12 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Environment Variable | -| -------------------- | -------------------- | -| 8.0.382+5 | JAVA_HOME_8_X64 | -| 11.0.21+9 | JAVA_HOME_11_X64 | -| 17.0.8+101 (default) | JAVA_HOME_17_X64 | -| 21.0.0+35.0.LTS | JAVA_HOME_21_X64 | +| Version | Environment Variable | +| ------------------ | -------------------- | +| 8.0.392+8 | JAVA_HOME_8_X64 | +| 11.0.21+9 | JAVA_HOME_11_X64 | +| 17.0.9+9 (default) | JAVA_HOME_17_X64 | +| 21.0.1+12.0.LTS | JAVA_HOME_21_X64 | ### Cached Tools @@ -120,12 +119,6 @@ - 3.0.6 - 3.1.4 -#### Python -- 3.8.18 -- 3.9.18 -- 3.10.13 -- 3.11.6 - #### PyPy - 2.7.18 [PyPy 7.3.13] - 3.7.13 [PyPy 7.3.9] @@ -133,10 +126,17 @@ - 3.9.18 [PyPy 7.3.13] - 3.10.13 [PyPy 7.3.13] +#### Python +- 3.8.18 +- 3.9.18 +- 3.10.13 +- 3.11.6 +- 3.12.0 + #### Node.js - 16.20.2 - 18.18.2 -- 20.8.1 +- 20.9.0 #### Go - 1.19.13 @@ -151,7 +151,7 @@ #### Packages - Bindgen 0.68.1 -- Cargo-audit 0.18.2 +- Cargo-audit 0.18.3 - Cargo-outdated 0.13.1 - Cbindgen 0.26.0 - Clippy 0.1.73 @@ -169,7 +169,6 @@ | Version | Build | Path | | ---------------- | ------- | ------------------------------ | | 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | -| 15.0 | 15A240d | /Applications/Xcode_15.0.app | | 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | | 14.2 | 14C18 | /Applications/Xcode_14.2.app | | 14.1 | 14B47b | /Applications/Xcode_14.1.app | @@ -183,71 +182,70 @@ | macOS 13.0 | macosx13.0 | 14.1 | | macOS 13.1 | macosx13.1 | 14.2 | | macOS 13.3 | macosx13.3 | 14.3.1 | -| macOS 14.0 | macosx14.0 | 15.0, 15.0.1 | +| macOS 14.0 | macosx14.0 | 15.0.1 | | iOS 16.1 | iphoneos16.1 | 14.1 | | iOS 16.2 | iphoneos16.2 | 14.2 | | iOS 16.4 | iphoneos16.4 | 14.3.1 | -| iOS 17.0 | iphoneos17.0 | 15.0, 15.0.1 | +| iOS 17.0 | iphoneos17.0 | 15.0.1 | | Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | | Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | -| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0, 15.0.1 | +| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | | tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | | tvOS 16.4 | appletvos16.4 | 14.3.1 | -| tvOS 17.0 | appletvos17.0 | 15.0, 15.0.1 | +| tvOS 17.0 | appletvos17.0 | 15.0.1 | | Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | -| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0, 15.0.1 | +| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | | watchOS 9.1 | watchos9.1 | 14.1, 14.2 | | watchOS 9.4 | watchos9.4 | 14.3.1 | -| watchOS 10.0 | watchos10.0 | 15.0, 15.0.1 | +| watchOS 10.0 | watchos10.0 | 15.0.1 | | Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | -| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0, 15.0.1 | +| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | -| DriverKit 23.0 | driverkit23.0 | 15.0, 15.0.1 | +| DriverKit 23.0 | driverkit23.0 | 15.0.1 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.1 | 14.1 | iPhone 14
iPhone 14 Plus
iPhone 14 Pro
iPhone 14 Pro Max
iPhone SE (3rd generation)
iPad (10th generation)
iPad Air (5th generation)
iPad mini (6th generation)
iPad Pro (11-inch) (4th generation)
iPad Pro (12.9-inch) (6th generation) | -| iOS 16.2 | 14.2 | iPhone 14
iPhone 14 Plus
iPhone 14 Pro
iPhone 14 Pro Max
iPhone SE (3rd generation)
iPad (10th generation)
iPad Air (5th generation)
iPad mini (6th generation)
iPad Pro (11-inch) (4th generation)
iPad Pro (12.9-inch) (6th generation) | -| iOS 16.4 | 14.3.1 | iPhone 14
iPhone 14 Plus
iPhone 14 Pro
iPhone 14 Pro Max
iPhone SE (3rd generation)
iPad (10th generation)
iPad Air (5th generation)
iPad mini (6th generation)
iPad Pro (11-inch) (4th generation)
iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.1
14.2
14.3.1
15.0
15.0.1 | iPhone 14
iPhone 14 Plus
iPhone 14 Pro
iPhone 14 Pro Max
iPhone 15
iPhone 15 Plus
iPhone 15 Pro
iPhone 15 Pro Max
iPhone SE (3rd generation)
iPad (10th generation)
iPad Air (5th generation)
iPad mini (6th generation)
iPad Pro (11-inch) (4th generation)
iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.1 | 14.1
14.2
14.3.1
15.0
15.0.1 | Apple TV
Apple TV 4K (3rd generation)
Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 16.4 | 14.1
14.2
14.3.1
15.0
15.0.1 | Apple TV
Apple TV 4K (3rd generation)
Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.1
14.2
14.3.1
15.0
15.0.1 | Apple TV
Apple TV 4K (3rd generation)
Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.1 | 14.1
14.2
14.3.1
15.0
15.0.1 | Apple Watch SE (40mm) (2nd generation)
Apple Watch SE (44mm) (2nd generation)
Apple Watch Series 5 (40mm)
Apple Watch Series 5 (44mm)
Apple Watch Series 6 (40mm)
Apple Watch Series 6 (44mm)
Apple Watch Series 7 (41mm)
Apple Watch Series 7 (45mm)
Apple Watch Series 8 (41mm)
Apple Watch Series 8 (45mm)
Apple Watch Ultra (49mm) | -| watchOS 9.4 | 14.1
14.2
14.3.1
15.0
15.0.1 | Apple Watch SE (40mm) (2nd generation)
Apple Watch SE (44mm) (2nd generation)
Apple Watch Series 5 (40mm)
Apple Watch Series 5 (44mm)
Apple Watch Series 6 (40mm)
Apple Watch Series 6 (44mm)
Apple Watch Series 7 (41mm)
Apple Watch Series 7 (45mm)
Apple Watch Series 8 (41mm)
Apple Watch Series 8 (45mm)
Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.1
14.2
14.3.1
15.0
15.0.1 | Apple Watch SE (40mm) (2nd generation)
Apple Watch SE (44mm) (2nd generation)
Apple Watch Series 5 (40mm)
Apple Watch Series 5 (44mm)
Apple Watch Series 6 (40mm)
Apple Watch Series 6 (44mm)
Apple Watch Series 7 (41mm)
Apple Watch Series 7 (45mm)
Apple Watch Series 8 (41mm)
Apple Watch Series 8 (45mm)
Apple Watch Series 9 (41mm)
Apple Watch Series 9 (45mm)
Apple Watch Ultra (49mm)
Apple Watch Ultra 2 (49mm) | +| OS | Xcode Version | Simulators | +| ------------ | -------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.1 | 14.1 | iPhone 14
iPhone 14 Plus
iPhone 14 Pro
iPhone 14 Pro Max
iPhone SE (3rd generation)
iPad (10th generation)
iPad Air (5th generation)
iPad mini (6th generation)
iPad Pro (11-inch) (4th generation)
iPad Pro (12.9-inch) (6th generation) | +| iOS 16.2 | 14.2 | iPhone 14
iPhone 14 Plus
iPhone 14 Pro
iPhone 14 Pro Max
iPhone SE (3rd generation)
iPad (10th generation)
iPad Air (5th generation)
iPad mini (6th generation)
iPad Pro (11-inch) (4th generation)
iPad Pro (12.9-inch) (6th generation) | +| iOS 16.4 | 14.3.1 | iPhone 14
iPhone 14 Plus
iPhone 14 Pro
iPhone 14 Pro Max
iPhone SE (3rd generation)
iPad (10th generation)
iPad Air (5th generation)
iPad mini (6th generation)
iPad Pro (11-inch) (4th generation)
iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.1
14.2
14.3.1
15.0.1 | iPhone 14
iPhone 14 Plus
iPhone 14 Pro
iPhone 14 Pro Max
iPhone 15
iPhone 15 Plus
iPhone 15 Pro
iPhone 15 Pro Max
iPhone SE (3rd generation)
iPad (10th generation)
iPad Air (5th generation)
iPad mini (6th generation)
iPad Pro (11-inch) (4th generation)
iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.1 | 14.1
14.2
14.3.1
15.0.1 | Apple TV
Apple TV 4K (3rd generation)
Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 16.4 | 14.1
14.2
14.3.1
15.0.1 | Apple TV
Apple TV 4K (3rd generation)
Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.1
14.2
14.3.1
15.0.1 | Apple TV
Apple TV 4K (3rd generation)
Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.1 | 14.1
14.2
14.3.1
15.0.1 | Apple Watch SE (40mm) (2nd generation)
Apple Watch SE (44mm) (2nd generation)
Apple Watch Series 5 (40mm)
Apple Watch Series 5 (44mm)
Apple Watch Series 6 (40mm)
Apple Watch Series 6 (44mm)
Apple Watch Series 7 (41mm)
Apple Watch Series 7 (45mm)
Apple Watch Series 8 (41mm)
Apple Watch Series 8 (45mm)
Apple Watch Ultra (49mm) | +| watchOS 9.4 | 14.1
14.2
14.3.1
15.0.1 | Apple Watch SE (40mm) (2nd generation)
Apple Watch SE (44mm) (2nd generation)
Apple Watch Series 5 (40mm)
Apple Watch Series 5 (44mm)
Apple Watch Series 6 (40mm)
Apple Watch Series 6 (44mm)
Apple Watch Series 7 (41mm)
Apple Watch Series 7 (45mm)
Apple Watch Series 8 (41mm)
Apple Watch Series 8 (45mm)
Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.1
14.2
14.3.1
15.0.1 | Apple Watch SE (40mm) (2nd generation)
Apple Watch SE (44mm) (2nd generation)
Apple Watch Series 5 (40mm)
Apple Watch Series 5 (44mm)
Apple Watch Series 6 (40mm)
Apple Watch Series 6 (44mm)
Apple Watch Series 7 (41mm)
Apple Watch Series 7 (45mm)
Apple Watch Series 8 (41mm)
Apple Watch Series 8 (45mm)
Apple Watch Series 9 (41mm)
Apple Watch Series 9 (45mm)
Apple Watch Ultra (49mm)
Apple Watch Ultra 2 (49mm) | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.15 | -| Android SDK Build-tools | 34.0.0
33.0.0 33.0.1 33.0.2
32.0.0
31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)
android-34 (rev 2)
android-33-ext5 (rev 1)
android-33-ext4 (rev 1)
android-33 (rev 3)
android-32 (rev 1)
android-31 (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.5 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1
3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313
24.0.8215888
25.2.9519653 (default)
26.1.10909125 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 11.0 | +| Android Emulator | 32.1.15 | +| Android SDK Build-tools | 34.0.0
33.0.2 | +| Android SDK Platforms | android-34-ext8 (rev 1)
android-34 (rev 2)
android-33-ext5 (rev 1)
android-33-ext4 (rev 1)
android-33 (rev 3) | +| Android SDK Platform-Tools | 34.0.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888
25.2.9519653
26.1.10909125 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | --------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | - diff --git a/images/macos/scripts/build/openjdk.sh b/images/macos/scripts/build/openjdk.sh index bf55493ce6f7..496abd0780cf 100644 --- a/images/macos/scripts/build/openjdk.sh +++ b/images/macos/scripts/build/openjdk.sh @@ -40,6 +40,9 @@ installOpenJDK() { archivePath=$(echo ${asset} | jq -r '.binary.package.link') fullVersion=$(echo ${asset} | jq -r '.version.semver' | tr '+' '-') + # Remove 'LTS' suffix from the version if present + fullVersion="${fullVersion//.LTS/}" + JAVA_TOOLCACHE_PATH=${AGENT_TOOLSDIRECTORY}/Java_Temurin-Hotspot_jdk javaToolcacheVersionPath=$JAVA_TOOLCACHE_PATH/${fullVersion} diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 b/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 index b60c9ae4d04d..3b0235c1c017 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 @@ -280,15 +280,15 @@ $installedSdks.AddTable($(Build-XcodeSDKTable $xcodeInfo)) $installedSimulators = $xcode.AddHeader("Installed Simulators") $installedSimulators.AddTable($(Build-XcodeSimulatorsTable $xcodeInfo)) -if (-not $os.IsVenturaArm64) { + # Android section - $android = $installedSoftware.AddHeader("Android") - $androidTable = Build-AndroidTable - $android.AddTable($androidTable) +$android = $installedSoftware.AddHeader("Android") +$androidTable = Build-AndroidTable +$android.AddTable($androidTable) + +$androidEnv = $android.AddHeader("Environment variables") +$androidEnv.AddTable($(Build-AndroidEnvironmentTable)) - $androidEnv = $android.AddHeader("Environment variables") - $androidEnv.AddTable($(Build-AndroidEnvironmentTable)) -} if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $miscellaneous = $installedSoftware.AddHeader("Miscellaneous") $miscellaneous.AddToolVersion("libXext", $(Get-LibXextVersion)) diff --git a/images/macos/scripts/tests/Android.Tests.ps1 b/images/macos/scripts/tests/Android.Tests.ps1 index ca591bad8b05..c6e3de4cd7b1 100644 --- a/images/macos/scripts/tests/Android.Tests.ps1 +++ b/images/macos/scripts/tests/Android.Tests.ps1 @@ -4,7 +4,7 @@ Import-Module "$PSScriptRoot/../software-report/SoftwareReport.Android.psm1" -Di $os = Get-OSVersion -Describe "Android" -Skip:($os.IsVenturaArm64) { +Describe "Android" { $androidSdkManagerPackages = Get-AndroidPackages [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version" [version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version" @@ -50,7 +50,7 @@ Describe "Android" -Skip:($os.IsVenturaArm64) { } } - Context "SDKManagers" -Skip:($os.IsVenturaArm64) { + Context "SDKManagers" { if (-not $os.IsVentura -and -not $os.IsVenturaArm64) { $testCases = @( @{ @@ -76,7 +76,7 @@ Describe "Android" -Skip:($os.IsVenturaArm64) { } } - Context "Packages" -Skip:($os.IsVenturaArm64) { + Context "Packages" { $testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } } It "" -TestCases $testCases { @@ -84,4 +84,4 @@ Describe "Android" -Skip:($os.IsVenturaArm64) { Validate-AndroidPackage $PackageName } } -} \ No newline at end of file +} diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index bdd8b17e550f..1850c957c214 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -96,11 +96,11 @@ build { } provisioner "file" { destination = ".bashrc" - source = "./asset/bashrc" + source = "./assets/bashrc" } provisioner "file" { destination = ".bash_profile" - source = "./asset/bashprofile" + source = "./assets/bashprofile" } provisioner "shell" { inline = [ diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 66e7c664d999..e991579b6139 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -209,6 +209,7 @@ build { "./scripts/build/rust.sh", "./scripts/build/gcc.sh", "./scripts/build/cocoapods.sh", + "./scripts/build/android-toolsets.sh", "./scripts/build/safari.sh", "./scripts/build/chrome.sh", "./scripts/build/bicep.sh", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 0b7c7a7f2a0b..20220cb92cdb 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -174,7 +174,7 @@ "ndk": { "default": "25", "versions": [ - "23", "24", "25", "26" + "24", "25", "26" ] } }, diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 75a2aff6eb3f..b5f3d8f7f6ad 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -160,7 +160,7 @@ "ndk": { "default": "25", "versions": [ - "23", "24", "25", "26" + "24", "25", "26" ] } }, diff --git a/images/win/scripts/Installers/Install-Docker-Compose.ps1 b/images/win/scripts/Installers/Install-Docker-Compose.ps1 new file mode 100644 index 000000000000..3cbbd3a15859 --- /dev/null +++ b/images/win/scripts/Installers/Install-Docker-Compose.ps1 @@ -0,0 +1,17 @@ +################################################################################ +## File: Install-Docker-Compose.ps1 +## Desc: Install Docker Compose. +## Supply chain security: Docker Compose v1 - by package manager +################################################################################ + +Write-Host "Install-Package Docker-Compose v1" +$versionToInstall = Get-LatestChocoPackageVersion -TargetVersion "1.29" -PackageName "docker-compose" +Choco-Install -PackageName docker-compose -ArgumentList "--version=$versionToInstall" + +Write-Host "Install-Package Docker-Compose v2" +$dockerComposev2Url = "https://github.com/docker/compose/releases/latest/download/docker-compose-windows-x86_64.exe" +$cliPluginsDir = "C:\ProgramData\docker\cli-plugins" +New-Item -Path $cliPluginsDir -ItemType Directory +Start-DownloadWithRetry -Url $dockerComposev2Url -Name docker-compose.exe -DownloadPath $cliPluginsDir + +Invoke-PesterTests -TestFile "Docker" -TestName "DockerCompose" diff --git a/images/win/scripts/Installers/Install-Docker-WinCred.ps1 b/images/win/scripts/Installers/Install-Docker-WinCred.ps1 new file mode 100644 index 000000000000..a1d764becc4e --- /dev/null +++ b/images/win/scripts/Installers/Install-Docker-WinCred.ps1 @@ -0,0 +1,35 @@ +################################################################################ +## File: Install-Docker-WinCred.ps1 +## Desc: Install Docker credential helper. +## Supply chain security: checksum validation +################################################################################ + +#region functions +function Get-DockerWincredHash { + Param ( + [Parameter(Mandatory = $True)] + [string] $Release + ) + + $hashURL = "https://github.com/docker/docker-credential-helpers/releases/download/${Release}/checksums.txt" + (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*docker-credential-wincred-${Release}.windows-amd64.exe*" }).Split(' ')[0] +} +#endregion + +Write-Host "Install docker-wincred" +$dockerCredLatestRelease = Invoke-RestMethod -Uri "https://api.github.com/repos/docker/docker-credential-helpers/releases/latest" +$dockerCredDownloadUrl = $dockerCredLatestRelease.assets.browser_download_url -match "docker-credential-wincred-.+\.exe" | Select-Object -First 1 +Start-DownloadWithRetry -Url $dockerCredDownloadUrl -DownloadPath "C:\Windows\System32" -Name "docker-credential-wincred.exe" + +#region Supply chain security +$distributor_file_hash = Get-DockerWincredHash -Release $dockerCredLatestRelease.name +$local_file_hash = (Get-FileHash -Path 'C:\Windows\System32\docker-credential-wincred.exe' -Algorithm SHA256).Hash + +if ($local_file_hash -ne $distributor_file_hash) { + Write-Host "hash must be equal to: ${distributor_file_hash}" + Write-Host "actual hash is: ${local_file_hash}" + throw 'Checksum verification failed, please rerun install' +} +#endregion + +Invoke-PesterTests -TestFile "Docker" -TestName "DockerWinCred" diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/win/scripts/Installers/Install-Docker.ps1 index add81b01b8e1..5b2c9e734ab8 100644 --- a/images/win/scripts/Installers/Install-Docker.ps1 +++ b/images/win/scripts/Installers/Install-Docker.ps1 @@ -3,23 +3,8 @@ ## Desc: Install Docker. ## Must be an independent step because it requires a restart before we ## can continue. -## Supply chain security: (docker-wincred) checksum validation ################################################################################ -#region functions -Function Get-DockerWincredHash -{ - Param ( - [Parameter(Mandatory = $True)] - [string] $Release -) - - $hashURL = "https://github.com/docker/docker-credential-helpers/releases/download/${Release}/checksums.txt " - (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*docker-credential-wincred-${Release}.windows-amd64.exe*" }).Split(' ')[0] - -} -#endregion - Write-Host "Get latest Moby release" $mobyLatestReleaseVersion = (Invoke-RestMethod -Uri "https://api.github.com/repos/moby/moby/releases/latest").tag_name.Trim("v") $dockerceUrl = "https://download.docker.com/win/static/stable/x86_64/" @@ -55,32 +40,6 @@ if ($LastExitCode -ne 0) { # https://github.com/Azure/azure-cli/issues/18766 New-Item -ItemType SymbolicLink -Path "C:\Windows\SysWOW64\docker.exe" -Target "C:\Windows\System32\docker.exe" -Write-Host "Install-Package Docker-Compose v1" -$versionToInstall = Get-LatestChocoPackageVersion -TargetVersion "1.29" -PackageName "docker-compose" -Choco-Install -PackageName docker-compose -ArgumentList "--version=$versionToInstall" - -Write-Host "Install-Package Docker-Compose v2" -$dockerComposev2Url = "https://github.com/docker/compose/releases/latest/download/docker-compose-windows-x86_64.exe" -$cliPluginsDir = "C:\ProgramData\docker\cli-plugins" -New-Item -Path $cliPluginsDir -ItemType Directory -Start-DownloadWithRetry -Url $dockerComposev2Url -Name docker-compose.exe -DownloadPath $cliPluginsDir - -Write-Host "Install docker-wincred" -$dockerCredLatestRelease = Invoke-RestMethod -Uri "https://api.github.com/repos/docker/docker-credential-helpers/releases/latest" -$dockerCredDownloadUrl = $dockerCredLatestRelease.assets.browser_download_url -match "docker-credential-wincred-.+\.exe" | Select-Object -First 1 -Start-DownloadWithRetry -Url $dockerCredDownloadUrl -DownloadPath "C:\Windows\System32" -Name "docker-credential-wincred.exe" - -#region Supply chain security -$distributor_file_hash = Get-DockerWincredHash -Release $dockerCredLatestRelease.name -$local_file_hash = (Get-FileHash -Path 'C:\Windows\System32\docker-credential-wincred.exe' -Algorithm SHA256).Hash - -if ($local_file_hash -ne $distributor_file_hash) { - Write-Host "hash must be equal to: ${distributor_file_hash}" - Write-Host "actual hash is: ${local_file_hash}" - throw 'Checksum verification failed, please rerun install' -} -#endregion - Write-Host "Download docker images" $dockerImages = (Get-ToolsetContent).docker.images foreach ($dockerImage in $dockerImages) { @@ -93,4 +52,5 @@ foreach ($dockerImage in $dockerImages) { } } -Invoke-PesterTests -TestFile "Docker" +Invoke-PesterTests -TestFile "Docker" -TestName "Docker" +Invoke-PesterTests -TestFile "Docker" -TestName "DockerImages" diff --git a/images/win/scripts/Tests/Docker.Tests.ps1 b/images/win/scripts/Tests/Docker.Tests.ps1 index 4b4b2a36dde0..d5a325ef8169 100644 --- a/images/win/scripts/Tests/Docker.Tests.ps1 +++ b/images/win/scripts/Tests/Docker.Tests.ps1 @@ -1,25 +1,31 @@ Describe "Docker" { - It "" -TestCases @( - @{ ToolName = "docker" } - @{ ToolName = "docker-compose" } - ) { - "$ToolName --version" | Should -ReturnZeroExitCode + It "docker is installed" { + "docker --version" | Should -ReturnZeroExitCode } - It "docker-wincred" { - "docker-credential-wincred version" | Should -ReturnZeroExitCode + It "docker service is up" { + "docker images" | Should -ReturnZeroExitCode + } + + It "docker symlink" { + "C:\Windows\SysWOW64\docker.exe ps" | Should -ReturnZeroExitCode + } +} + +Describe "DockerCompose" { + It "docker-compose is installed" { + "docker-compose --version" | Should -ReturnZeroExitCode } It "docker compose v2" { "docker compose version" | Should -ReturnZeroExitCode } - It "docker service is up" { - "docker images" | Should -ReturnZeroExitCode - } +} - It "docker symlink" { - "C:\Windows\SysWOW64\docker.exe ps" | Should -ReturnZeroExitCode +Describe "DockerWinCred" { + It "docker-wincred" { + "docker-credential-wincred version" | Should -ReturnZeroExitCode } } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index b15f5d5ac3f2..353aed4d082a 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -170,13 +170,12 @@ "additional_tools": [ "cmake;3.10.2.4988404", "cmake;3.18.1", - "cmake;3.22.1", - "patcher;v4" + "cmake;3.22.1" ], "ndk": { "default": "25", "versions": [ - "23", "24", "25", "26" + "24", "25", "26" ] } }, diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 812d5fedf5e5..a954ad94a49d 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -144,13 +144,12 @@ "addon_list": [], "additional_tools": [ "cmake;3.18.1", - "cmake;3.22.1", - "patcher;v4" + "cmake;3.22.1" ], "ndk": { "default": "25", "versions": [ - "23", "24", "25", "26" + "24", "25", "26" ] } }, diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 834a0c3c5cbc..c00ac5d58147 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -170,6 +170,8 @@ "scripts": [ "{{ template_dir }}/scripts/Installers/Install-VCRedist.ps1", "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", + "{{ template_dir }}/scripts/Installers/Install-Docker-WinCred.ps1", + "{{ template_dir }}/scripts/Installers/Install-Docker-Compose.ps1", "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1", "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" ] diff --git a/images/win/windows2022.json b/images/win/windows2022.json index bccf2df30c7e..74d2092e734e 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -155,6 +155,8 @@ "type": "powershell", "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", + "{{ template_dir }}/scripts/Installers/Install-Docker-WinCred.ps1", + "{{ template_dir }}/scripts/Installers/Install-Docker-Compose.ps1", "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1", "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" ]