diff --git a/images.CI/macos/azure-pipelines/macos1014.yml b/images.CI/macos/azure-pipelines/macos1014.yml
deleted file mode 100644
index 21f7e48c1..000000000
--- a/images.CI/macos/azure-pipelines/macos1014.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: macOS-10.14_$(date:yyyyMMdd)$(rev:.r)_unstable
-schedules:
-- cron: "0 0 * * *"
- displayName: Daily
- branches:
- include:
- - main
- always: true
-
-trigger: none
-pr:
- autoCancel: true
- branches:
- include:
- - main
-
-jobs:
-- template: image-generation.yml
- parameters:
- image_label: 'macOS Mojave'
- base_image_name: 'clean-macOS-10.14-380Gb_runner'
- template_path: 'templates/macOS-10.14.json'
- target_datastore: 'ds-image'
diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1
index a84871f1b..f8d758b3b 100644
--- a/images/macos/helpers/Common.Helpers.psm1
+++ b/images/macos/helpers/Common.Helpers.psm1
@@ -34,14 +34,10 @@ function Get-OSVersion {
return [PSCustomObject]@{
Version = $osVersion.Version
Platform = $osVersion.Platform
- IsMojave = $osVersionMajorMinor -eq "10.14"
IsCatalina = $osVersionMajorMinor -eq "10.15"
IsBigSur = $osVersionMajorMinor -eq "11.0"
IsMonterey = $osMontereyVersion.Major -eq "12"
- IsLessThanCatalina = [SemVer]$osVersion.Version -lt "10.15"
- IsLessThanBigSur = [SemVer]$osVersion.Version -lt "11.0"
IsLessThanMonterey = $osMontereyVersion -lt "12.0"
- IsHigherThanMojave = [SemVer]$osVersion.Version -ge "10.15"
IsHigherThanCatalina = [SemVer]$osVersion.Version -ge "11.0"
}
}
diff --git a/images/macos/macos-10.14-Readme.md b/images/macos/macos-10.14-Readme.md
deleted file mode 100644
index 3e77c7cde..000000000
--- a/images/macos/macos-10.14-Readme.md
+++ /dev/null
@@ -1,379 +0,0 @@
-| Announcements |
-|-|
-| [[macOS] Xcode 12.5 will be removed from Big Sur on October, 18](https://github.com/actions/virtual-environments/issues/4183) |
-| [[macOS] Default Xcode on Big Sur image will be set to Xcode 13.0 on October, 18](https://github.com/actions/virtual-environments/issues/4180) |
-| [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) |
-***
-# macOS 10.14 info
-- System Version: macOS 10.14.6 (18G9323)
-- Kernel Version: Darwin 18.7.0
-- Image Version: 20211016.1
-
-## Installed Software
-### Language and Runtime
-- .NET SDK 2.1.302 2.1.403 2.1.507
-- Bash 3.2.57(1)-release
-- Clang/LLVM 11.0.0 is default
-- Clang/LLVM 13.0.0 is available on `'$(brew --prefix llvm)/bin/clang'`
-- gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias
-- gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias
-- gcc-11 (Homebrew GCC 11.2.0) 11.2.0 - available by `gcc-11` alias
-- GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias
-- GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias
-- GNU Fortran (Homebrew GCC 11.2.0) 11.2.0 - available by `gfortran-11` alias
-- Go 1.15.15
-- julia 1.6.3
-- Kotlin 1.5.31-release-548
-- MSBuild 15.7.224.30163 (from /Library/Frameworks/Mono.framework/Versions/5.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll)
-- Node.js v8.17.0
-- NVM 0.39.0
-- NVM - Cached node versions: v10.24.1 v12.22.7 v14.18.1
-- Perl 5.34.0
-- PHP 8.0.11
-- Python 2.7.18
-- Python 3.9.7
-- R 4.1.1
-- Ruby 2.7.4p191
-
-### Package Management
-- Bundler version 2.2.29
-- Carthage 0.38.0
-- CocoaPods 1.11.2
-- Composer 2.1.9
-- Homebrew 3.2.16
-- Miniconda 4.10.3
-- NPM 3.10.10
-- NuGet 4.7.0.5148
-- Pip 20.3.4 (python 2.7)
-- Pip 21.2.4 (python 3.9)
-- Pipx 0.16.4
-- RubyGems 3.2.29
-- Yarn 1.22.15
-
-#### Environment variables
-| Name | Value |
-| ----------------------- | -------------------- |
-| CONDA | /usr/local/miniconda |
-| VCPKG_INSTALLATION_ROOT | |
-
-### Project Management
-- Apache Ant(TM) 1.10.11
-- Apache Maven 3.8.3
-- Gradle 7.2
-- Sbt 1.5.5
-
-### Utilities
-- 7-Zip 17.04
-- aria2 1.36.0
-- azcopy 10.12.2
-- bazel 3.7.1
-- bazelisk 1.10.1
-- bsdtar 2.8.3 - available by 'tar' alias
-- Curl 7.79.1
-- Git LFS: 3.0.1
-- Git: 2.33.1
-- GitHub CLI: 2.1.0
-- GNU parallel 20210922
-- GNU Tar 1.34 - available by 'gtar' alias
-- GNU Wget 1.21.2
-- gpg (GnuPG) 2.3.2
-- helm v3.7.1+g1d11fcb
-- Hub CLI: 2.14.2
-- jq 1.6
-- mongo v5.0.3
-- mongod v5.0.3
-- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> /usr/local/Cellar/openssl@1.1/1.1.1l_1)`
-- Packer 1.7.6
-- PostgreSQL 14.0
-- psql (PostgreSQL) 14.0
-- Sox 14.4.2
-- Subversion (SVN) 1.14.1
-- Switchaudio-osx 1.1.0
-- Vagrant 2.2.18
-- virtualbox 6.1.26r145957
-- zstd 1.5.0
-
-
-### Tools
-- Aliyun CLI 3.0.94
-- App Center CLI 1.2.2
-- AWS CLI 2.2.46
-- AWS SAM CLI 1.33.0
-- AWS Session Manager CLI 1.2.245.0
-- Azure CLI 2.29.0
-- Bicep CLI 0.4.1008
-- Cabal 3.4.1.0
-- Cmake 3.21.3
-- Fastlane 2.196.0
-- GHC 9.0.1
-- GHCup 0.1.17.2
-- Stack 2.7.3
-- SwiftFormat 0.48.16
-- Swig 4.0.2
-- Xcode Command Line Tools 10.3.0.0.1.1562985497
-
-### Linters
-- SwiftLint 0.44.0
-- yamllint 1.26.3
-
-### Browsers
-- Safari 14.1.2 (14611.3.10.1.5)
-- SafariDriver 14.1.2 (14611.3.10.1.5)
-- Google Chrome 94.0.4606.81
-- ChromeDriver 94.0.4606.61
-- Microsoft Edge 94.0.992.50
-- MSEdgeDriver 94.0.992.50
-- Mozilla Firefox 93.0
-- geckodriver 0.30.0
-
-#### Environment variables
-| Name | Value |
-| --------------- | --------------------------------------------- |
-| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/94.0.4606.61 |
-| EDGEWEBDRIVER | /usr/local/share/edge_driver |
-| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin |
-
-### Java
-| Version | Vendor | Environment Variable |
-| ------------------- | --------------- | -------------------- |
-| 8.0.302+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 |
-| 11.0.12+7 | Eclipse Temurin | JAVA_HOME_11_X64 |
-| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 |
-| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 |
-| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 |
-| 17.0.0+35 | Eclipse Temurin | JAVA_HOME_17_X64 |
-
-### Cached Tools
-#### Ruby
-- 2.4.10
-- 2.5.9
-- 2.6.8
-- 2.7.4
-- 3.0.2
-
-#### Python
-- 2.7.18
-- 3.5.10
-- 3.6.15
-- 3.7.12
-- 3.8.12
-- 3.9.7
-- 3.10.0
-
-#### PyPy
-- 2.7.18 [PyPy 7.3.5]
-- 3.6.12 [PyPy 7.3.3]
-
-#### Node.js
-- 10.24.1
-- 12.22.7
-- 14.18.1
-
-#### Go
-| Version | Architecture | Environment Variable |
-| ------- | ------------ | -------------------- |
-| 1.13.15 | x64 | GOROOT_1_13_X64 |
-| 1.14.15 | x64 | GOROOT_1_14_X64 |
-| 1.15.15 (Default) | x64 | GOROOT_1_15_X64 |
-| 1.16.9 | x64 | GOROOT_1_16_X64 |
-| 1.17.2 | x64 | GOROOT_1_17_X64 |
-### Rust Tools
-- Cargo 1.55.0
-- Rust 1.55.0
-- Rustdoc 1.55.0
-- Rustup 1.24.3
-
-#### Packages
-- Bindgen 0.59.1
-- Cargo-audit 0.15.2
-- Cargo-outdated v0.9.17
-- Cbindgen 0.20.0
-- Clippy 0.1.55
-- Rustfmt 1.4.37-stable
-
-### PowerShell Tools
-- PowerShell 7.1.5
-
-#### PowerShell Modules
-| Module | Version |
-| ---------------- | ------- |
-| Az | 6.1.0 |
-| MarkdownPS | 1.9 |
-| Pester | 5.3.1 |
-| PSScriptAnalyzer | 1.20.0 |
-
-### Xamarin
-#### Visual Studio for Mac
-- 8.5.0.3183
-
-#### Xamarin bundles
-| symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android |
-| ---------------- | ------------ | ----------- | ----------- | --------------- |
-| 6_8_0 | 6.8 | 13.14 | 6.14 | 10.2 |
-| 6_6_1 | 6.6 | 13.10 | 6.10 | 10.1 |
-| 6_6_0 | 6.6 | 13.8 | 6.8 | 10.1 |
-| 6_4_2 | 6.4 | 13.6 | 6.6 | 10.0 |
-| 6_4_1 | 6.4 | 13.4 | 6.4 | 10.0 |
-| 6_4_0 | 6.4 | 13.2 | 6.2 | 10.0 |
-| 6_0_0 | 6.0 | 12.14 | 5.16 | 9.4 |
-| 5_18_3 | 5.18 | 12.10 | 5.10 | 9.3 |
-| 5_18_2 | 5.18 | 12.8 | 5.8 | 9.2 |
-| 5_18_1 | 5.18 | 12.6 | 5.6 | 9.2 |
-| 5_16_0_0 | 5.16 | 12.2 | 5.2 | 9.1 |
-| 5_16_0 | 5.16 | 12.2 | 5.2 | 9.1 |
-| 5_12_0_3 | 5.12 | 12.2 | 5.3 | 9.0 |
-| 5_12_0_XC10_PRE | 5.12 | 12.0 | 5.2 | 9.0 |
-| 5_12_0 (default) | 5.12 | 11.14 | 4.6 | 9.0 |
-| 5_10_1 | 5.10 | 11.12 | 4.4 | 8.3 |
-| 5_8_1 | 5.8 | 11.9 | 4.2 | 8.2 |
-| 5_8_0 | 5.8 | 11.8 | 4.2 | 8.2 |
-| 5_4_1 | 5.4 | 11.6 | 4.0 | 8.1 |
-| 5_4_0 | 5.4 | 11.2 | 3.8 | 8.0 |
-| 5_2_0 | 5.2 | 11.0 | 3.6 | 7.4 |
-| Legacy_5_0_1 | 5.0 | 10.10 | 3.4 | 7.3 |
-| Legacy_4_8_1 | 4.8 | 10.6 | 3.0 | 7.1 |
-
-#### Unit Test Framework
-- NUnit 3.6.1
-
-### Xcode
-| Version | Build | Path |
-| ---------------- | ------- | ------------------------------ |
-| 11.3.1 (default) | 11C505 | /Applications/Xcode_11.3.1.app |
-| 11.3 | 11C29 | /Applications/Xcode_11.3.app |
-| 11.2.1 | 11B500 | /Applications/Xcode_11.2.1.app |
-| 11.2 | 11B52 | /Applications/Xcode_11.2.app |
-| 11.1 | 11A1027 | /Applications/Xcode_11.1.app |
-| 11.0 | 11A420a | /Applications/Xcode_11.app |
-| 10.3 | 10G8 | /Applications/Xcode_10.3.app |
-| 10.2.1 | 10E1001 | /Applications/Xcode_10.2.1.app |
-| 10.2 | 10E125 | /Applications/Xcode_10.2.app |
-| 10.1 | 10B61 | /Applications/Xcode_10.1.app |
-| 10.0 | 10A255 | /Applications/Xcode_10.app |
-| 9.4.1 | 9F2000 | /Applications/Xcode_9.4.1.app |
-
-#### Xcode Support Tools
-- xcpretty 0.3.0
-- xcversion 2.8.0
-- Nomad CLI 0.0.2
-- Nomad shenzhen CLI 0.14.3
-- xctool 0.3.7
-
-#### Installed SDKs
-| SDK | SDK Name | Xcode Version |
-| ----------------------- | -------------------- | -------------------------------------- |
-| macOS 10.13 | macosx10.13 | 9.4.1 |
-| macOS 10.14 | macosx10.14 | 10.0, 10.1, 10.2, 10.2.1, 10.3 |
-| macOS 10.15 | macosx10.15 | 11.0, 11.1, 11.2, 11.2.1, 11.3, 11.3.1 |
-| iOS 11.4 | iphoneos11.4 | 9.4.1 |
-| iOS 12.0 | iphoneos12.0 | 10.0 |
-| iOS 12.1 | iphoneos12.1 | 10.1 |
-| iOS 12.2 | iphoneos12.2 | 10.2, 10.2.1 |
-| iOS 12.4 | iphoneos12.4 | 10.3 |
-| iOS 13.0 | iphoneos13.0 | 11.0 |
-| iOS 13.1 | iphoneos13.1 | 11.1 |
-| iOS 13.2 | iphoneos13.2 | 11.2, 11.2.1, 11.3, 11.3.1 |
-| Simulator - iOS 11.4 | iphonesimulator11.4 | 9.4.1 |
-| Simulator - iOS 12.0 | iphonesimulator12.0 | 10.0 |
-| Simulator - iOS 12.1 | iphonesimulator12.1 | 10.1 |
-| Simulator - iOS 12.2 | iphonesimulator12.2 | 10.2, 10.2.1 |
-| Simulator - iOS 12.4 | iphonesimulator12.4 | 10.3 |
-| Simulator - iOS 13.0 | iphonesimulator13.0 | 11.0 |
-| Simulator - iOS 13.1 | iphonesimulator13.1 | 11.1 |
-| Simulator - iOS 13.2 | iphonesimulator13.2 | 11.2, 11.2.1, 11.3, 11.3.1 |
-| tvOS 11.4 | appletvos11.4 | 9.4.1 |
-| tvOS 12.0 | appletvos12.0 | 10.0 |
-| tvOS 12.1 | appletvos12.1 | 10.1 |
-| tvOS 12.2 | appletvos12.2 | 10.2, 10.2.1 |
-| tvOS 12.4 | appletvos12.4 | 10.3 |
-| tvOS 13.0 | appletvos13.0 | 11.0, 11.1 |
-| tvOS 13.2 | appletvos13.2 | 11.2, 11.2.1, 11.3, 11.3.1 |
-| Simulator - tvOS 11.4 | appletvsimulator11.4 | 9.4.1 |
-| Simulator - tvOS 12.0 | appletvsimulator12.0 | 10.0 |
-| Simulator - tvOS 12.1 | appletvsimulator12.1 | 10.1 |
-| Simulator - tvOS 12.2 | appletvsimulator12.2 | 10.2, 10.2.1 |
-| Simulator - tvOS 12.4 | appletvsimulator12.4 | 10.3 |
-| Simulator - tvOS 13.0 | appletvsimulator13.0 | 11.0, 11.1 |
-| Simulator - tvOS 13.2 | appletvsimulator13.2 | 11.2, 11.2.1, 11.3, 11.3.1 |
-| watchOS 4.3 | watchos4.3 | 9.4.1 |
-| watchOS 5.0 | watchos5.0 | 10.0 |
-| watchOS 5.1 | watchos5.1 | 10.1 |
-| watchOS 5.2 | watchos5.2 | 10.2, 10.2.1 |
-| watchOS 5.3 | watchos5.3 | 10.3 |
-| watchOS 6.0 | watchos6.0 | 11.0, 11.1 |
-| watchOS 6.1 | watchos6.1 | 11.2, 11.2.1, 11.3, 11.3.1 |
-| Simulator - watchOS 4.3 | watchsimulator4.3 | 9.4.1 |
-| Simulator - watchOS 5.0 | watchsimulator5.0 | 10.0 |
-| Simulator - watchOS 5.1 | watchsimulator5.1 | 10.1 |
-| Simulator - watchOS 5.2 | watchsimulator5.2 | 10.2, 10.2.1 |
-| Simulator - watchOS 5.3 | watchsimulator5.3 | 10.3 |
-| Simulator - watchOS 6.0 | watchsimulator6.0 | 11.0, 11.1 |
-| Simulator - watchOS 6.1 | watchsimulator6.1 | 11.2, 11.2.1, 11.3, 11.3.1 |
-| DriverKit 19.0 | driverkit.macosx19.0 | 11.0, 11.1, 11.2, 11.2.1, 11.3, 11.3.1 |
-
-#### Installed Simulators
-| OS | Xcode Version | Simulators |
-| ----------- | --------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| iOS 8.4 | 9.4.1
10.0
10.1
10.2
10.2.1
10.3
11.0
11.1
11.2
11.2.1
11.3
11.3.1 | iPhone 4s
iPhone 5
iPhone 5s
iPhone 6
iPhone 6 Plus
iPad 2
iPad Air
iPad Retina |
-| iOS 9.0 | 9.4.1
10.0
10.1
10.2
10.2.1
10.3
11.0
11.1
11.2
11.2.1
11.3
11.3.1 | iPhone 4s
iPhone 5
iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPad 2
iPad Air
iPad Air 2
iPad Retina |
-| iOS 9.1 | 9.4.1
10.0
10.1
10.2
10.2.1
10.3
11.0
11.1
11.2
11.2.1
11.3
11.3.1 | iPhone 4s
iPhone 5
iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPad 2
iPad Air
iPad Air 2
iPad Pro
iPad Retina |
-| iOS 9.2 | 9.4.1
10.0
10.1
10.2
10.2.1
10.3
11.0
11.1
11.2
11.2.1
11.3
11.3.1 | iPhone 4s
iPhone 5
iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPad 2
iPad Air
iPad Air 2
iPad Pro
iPad Retina |
-| iOS 9.3 | 9.4.1
10.0
10.1
10.2
10.2.1
10.3
11.0
11.1
11.2
11.2.1
11.3
11.3.1 | iPhone 4s
iPhone 5
iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPad 2
iPad Air
iPad Air 2
iPad Pro
iPad Retina |
-| iOS 10.0 | 9.4.1
10.0
10.1
10.2
10.2.1
10.3
11.0
11.1
11.2
11.2.1
11.3
11.3.1 | iPhone 5
iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone SE
iPad Air
iPad Air 2
iPad Pro (12.9 inch)
iPad Pro (9.7 inch) |
-| iOS 10.1 | 9.4.1
10.0
10.1
10.2
10.2.1
10.3
11.0
11.1
11.2
11.2.1
11.3
11.3.1 | iPhone 5
iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone SE
iPad Air
iPad Air 2
iPad Pro (12.9 inch)
iPad Pro (9.7 inch) |
-| iOS 10.2 | 9.4.1
10.0
10.1
10.2
10.2.1
10.3
11.0
11.1
11.2
11.2.1
11.3
11.3.1 | iPhone 5
iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone SE
iPad Air
iPad Air 2
iPad Pro (12.9 inch)
iPad Pro (9.7 inch) |
-| iOS 10.3 | 9.4.1
10.0
10.1
10.2
10.2.1
10.3
11.0
11.1
11.2
11.2.1
11.3
11.3.1 | iPhone 5
iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone SE
iPad (5th generation)
iPad Air
iPad Air 2
iPad Pro (10.5-inch)
iPad Pro (12.9 inch)
iPad Pro (12.9-inch) (2nd generation)
iPad Pro (9.7 inch) |
-| iOS 11.4 | 9.4.1 | iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone 8
iPhone 8 Plus
iPhone SE
iPhone X
iPad (5th generation)
iPad Air
iPad Air 2
iPad Pro (10.5-inch)
iPad Pro (12.9-inch)
iPad Pro (12.9-inch) (2nd generation)
iPad Pro (9.7-inch) |
-| iOS 12.0 | 10.0 | iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone 8
iPhone 8 Plus
iPhone SE
iPhone X
iPhone XR
iPhone XS
iPhone XS Max
iPad (5th generation)
iPad (6th generation)
iPad Air
iPad Air 2
iPad Pro (10.5-inch)
iPad Pro (12.9-inch)
iPad Pro (12.9-inch) (2nd generation)
iPad Pro (9.7-inch) |
-| iOS 12.1 | 10.1 | iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone 8
iPhone 8 Plus
iPhone SE
iPhone X
iPhone XR
iPhone XS
iPhone XS Max
iPad (5th generation)
iPad (6th generation)
iPad Air
iPad Air 2
iPad Pro (10.5-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch)
iPad Pro (12.9-inch) (2nd generation)
iPad Pro (12.9-inch) (3rd generation)
iPad Pro (9.7-inch) |
-| iOS 12.2 | 10.2
10.2.1 | iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone 8
iPhone 8 Plus
iPhone SE
iPhone X
iPhone XR
iPhone Xs
iPhone Xs Max
iPad (5th generation)
iPad (6th generation)
iPad Air
iPad Air (3rd generation)
iPad Air 2
iPad Pro (10.5-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch)
iPad Pro (12.9-inch) (2nd generation)
iPad Pro (12.9-inch) (3rd generation)
iPad Pro (9.7-inch) |
-| iOS 12.4 | 10.3 | iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone 8
iPhone 8 Plus
iPhone SE
iPhone X
iPhone XR
iPhone Xs
iPhone Xs Max
iPad (5th generation)
iPad (6th generation)
iPad Air
iPad Air (3rd generation)
iPad Air 2
iPad Pro (10.5-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch)
iPad Pro (12.9-inch) (2nd generation)
iPad Pro (12.9-inch) (3rd generation)
iPad Pro (9.7-inch) |
-| iOS 13.0 | 11.0 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPad Air (3rd generation)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Pro (9.7-inch) |
-| iOS 13.1 | 11.1 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPad Air (3rd generation)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Pro (9.7-inch) |
-| iOS 13.2 | 11.2
11.2.1 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Pro (9.7-inch) |
-| iOS 13.3 | 11.3
11.3.1 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Pro (9.7-inch) |
-| tvOS 11.4 | 9.4.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) |
-| tvOS 12.0 | 10.0 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) |
-| tvOS 12.1 | 10.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) |
-| tvOS 12.2 | 10.2
10.2.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) |
-| tvOS 12.4 | 10.3 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) |
-| tvOS 13.0 | 11.0
11.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) |
-| tvOS 13.2 | 11.2
11.2.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) |
-| tvOS 13.3 | 11.3
11.3.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) |
-| watchOS 4.3 | 9.4.1 | Apple Watch - 38mm
Apple Watch - 42mm
Apple Watch Series 2 - 38mm
Apple Watch Series 2 - 42mm
Apple Watch Series 3 - 38mm
Apple Watch Series 3 - 42mm |
-| watchOS 5.0 | 10.0 | Apple Watch Series 2 - 38mm
Apple Watch Series 2 - 42mm
Apple Watch Series 3 - 38mm
Apple Watch Series 3 - 42mm
Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm |
-| watchOS 5.1 | 10.1 | Apple Watch Series 2 - 38mm
Apple Watch Series 2 - 42mm
Apple Watch Series 3 - 38mm
Apple Watch Series 3 - 42mm
Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm |
-| watchOS 5.2 | 10.2
10.2.1 | Apple Watch Series 2 - 38mm
Apple Watch Series 2 - 42mm
Apple Watch Series 3 - 38mm
Apple Watch Series 3 - 42mm
Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm |
-| watchOS 5.3 | 10.3 | Apple Watch Series 2 - 38mm
Apple Watch Series 2 - 42mm
Apple Watch Series 3 - 38mm
Apple Watch Series 3 - 42mm
Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm |
-| watchOS 6.0 | 11.0
11.1 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm |
-| watchOS 6.1 | 11.2
11.2.1
11.3
11.3.1 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm |
-
-### Android
-| Package Name | Version |
-| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Android Command Line Tools | 4.0 |
-| Android Emulator | 30.8.4 |
-| Android SDK Build-tools | 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
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 |
-| Android SDK Platforms | android-31 (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5) |
-| Android SDK Platform-Tools | 31.0.3 |
-| Android Support Repository | 47.0.0 |
-| CMake | 3.10.2
3.18.1 |
-| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 |
-| Google Play services | 49 |
-| Google Repository | 58 |
-| NDK | 15.2.4203891
18.1.5063045
21.4.7075529 (default)
22.1.7171670
23.0.7599858 |
-| SDK Patch Applier v4 | 1 |
-| Intel HAXM | 7.6.5 |
-
-#### Environment variables
-| Name | Value |
-| ----------------------- | -------------------------------------------------------------------------------------------------- |
-| ANDROID_HOME | /Users/runner/Library/Android/sdk |
-| ANDROID_NDK_18R_PATH | /Users/runner/Library/Android/sdk/ndk/18.1.5063045 |
-| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 |
-| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/23.0.7599858 |
-| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 |
-| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk |
-
-
-
diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh
index c97d44398..89ecfa020 100644
--- a/images/macos/provision/configuration/configure-machine.sh
+++ b/images/macos/provision/configuration/configure-machine.sh
@@ -29,7 +29,7 @@ fi
# sudo security delete-certificate -Z FF6797793A3CD798DC5B2ABEF56F73EDC9F83A64 /Library/Keychains/System.keychain
curl https://www.apple.com/certificateauthority/AppleWWDRCAG3.cer --output $HOME/AppleWWDRCAG3.cer --silent
# Big Sur requires user interaction to add a cert https://developer.apple.com/forums/thread/671582, we need to use a workaround with SecItemAdd swift method
-if is_Less_BigSur; then
+if is_Catalina; then
sudo security add-trusted-cert -d -r unspecified -k /Library/Keychains/System.keychain $HOME/AppleWWDRCAG3.cer
else
swiftc $HOME/image-generation/add-certificate.swift
diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh
index 44fb8e9ec..e7af07eb3 100644
--- a/images/macos/provision/configuration/finalize-vm.sh
+++ b/images/macos/provision/configuration/finalize-vm.sh
@@ -5,7 +5,7 @@ source ~/utils/utils.sh
# Close all finder windows because they can interfere with UI tests
osascript -e 'tell application "Finder" to close windows'
-if is_Less_BigSur; then
+if is_Catalina; then
# Ignore available updates to prevent system pop-ups
updateName=$(softwareupdate -l | grep "Title: " | awk -F[:,] '{print $2}' | awk '{$1=$1};1') || true
if [ ! -z "$updateName" ]; then
diff --git a/images/macos/provision/configuration/preimagedata.sh b/images/macos/provision/configuration/preimagedata.sh
index 4f20c842a..21d9654db 100644
--- a/images/macos/provision/configuration/preimagedata.sh
+++ b/images/macos/provision/configuration/preimagedata.sh
@@ -8,7 +8,7 @@ os_name=$(sw_vers -productName)
os_version=$(sw_vers -productVersion)
os_build=$(sw_vers -buildVersion)
label_version=$(echo $os_version | cut -d. -f1,2)
-if is_Less_BigSur; then
+if is_Catalina; then
label_version=$(echo $os_version | cut -d. -f1,2)
else
label_version=$(echo $os_version | cut -d. -f1)
diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh
index 813d3cd05..0fe237ffb 100755
--- a/images/macos/provision/core/android-toolsets.sh
+++ b/images/macos/provision/core/android-toolsets.sh
@@ -93,7 +93,7 @@ done
# The Android Emulator uses the built-in Hypervisor.Framework by default, and falls back to using Intel HAXM if Hypervisor.Framework fails to initialize
# https://developer.android.com/studio/run/emulator-acceleration#vm-mac
# The installation doesn't work properly on macOS Big Sur, /dev/HAX is not created
-if is_Less_BigSur; then
+if is_Catalina; then
chmod +x $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh
sudo $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh
fi
diff --git a/images/macos/provision/core/audiodevice.sh b/images/macos/provision/core/audiodevice.sh
index a078c04f8..a94de8100 100644
--- a/images/macos/provision/core/audiodevice.sh
+++ b/images/macos/provision/core/audiodevice.sh
@@ -9,7 +9,7 @@ brew_smart_install "sox"
# Big Sur doesn't support soundflower installation without user interaction https://github.com/mattingalls/Soundflower/releases/tag/2.0b2
# Install blackhole-2ch for Big Sur instead
-if is_Less_BigSur; then
+if is_Catalina; then
echo "install soundflower"
brew install --cask soundflower
diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh
index a91554f68..9b8df5334 100644
--- a/images/macos/provision/core/commonutils.sh
+++ b/images/macos/provision/core/commonutils.sh
@@ -16,12 +16,6 @@ for package in $cask_packages; do
brew install --cask $package
done
-# Specify Bazel version 3.7.1 to install due to the bug with 4.0.0: https://github.com/bazelbuild/bazel/pull/12882
-if is_Less_Catalina; then
- export USE_BAZEL_VERSION="3.7.1"
- echo "export USE_BAZEL_VERSION=${USE_BAZEL_VERSION}" >> "${HOME}/.bashrc"
-fi
-
# Invoke bazel to download bazel version via bazelisk
bazel
diff --git a/images/macos/provision/core/dotnet.sh b/images/macos/provision/core/dotnet.sh
index 31454ff71..1dad1c914 100755
--- a/images/macos/provision/core/dotnet.sh
+++ b/images/macos/provision/core/dotnet.sh
@@ -22,21 +22,11 @@ DOTNET_VERSIONS=($(get_toolset_value '.dotnet.versions | .[]'))
for DOTNET_VERSION in "${DOTNET_VERSIONS[@]}"; do
RELEASE_URL="https://raw.githubusercontent.com/dotnet/core/master/release-notes/${DOTNET_VERSION}/releases.json"
- # Old Mono versions don't support NuGet versions from .Net sdk >=2.1.6**, exclude them explicitly from Mojave and HS images
- # https://rider-support.jetbrains.com/hc/en-us/articles/360004180039
- if is_Less_Catalina; then
- ARGS_LIST+=(
- $(curl -s "$RELEASE_URL" | \
- jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | grep -v -E '2.1.[6-9]\d*' | \
- sort -r | rev | uniq -s 2 | rev)
- )
- else
- ARGS_LIST+=(
- $(curl -s "$RELEASE_URL" | \
- jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | \
- sort -r | rev | uniq -s 2 | rev)
- )
- fi
+ ARGS_LIST+=(
+ $(curl -s "$RELEASE_URL" | \
+ jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | \
+ sort -r | rev | uniq -s 2 | rev)
+ )
done
for ARGS in "${ARGS_LIST[@]}"; do
diff --git a/images/macos/provision/core/node.sh b/images/macos/provision/core/node.sh
index 128b4f6fb..f98113fc0 100644
--- a/images/macos/provision/core/node.sh
+++ b/images/macos/provision/core/node.sh
@@ -1,22 +1,11 @@
#!/bin/bash -e -o pipefail
source ~/utils/utils.sh
-if is_Less_Catalina; then
- echo Installing the latest Node JS 8...
- TMP_FILE=/tmp/node-v8.17.0.pkg
- NODEURL=https://nodejs.org/dist/latest-v8.x/node-v8.17.0.pkg
- download_with_retries $NODEURL "/tmp"
- sudo installer -pkg "${TMP_FILE}" -target /
- rm -rf "${TMP_FILE}"
- sudo chown -R $USER "/usr/local/lib/node_modules"
-else
- # Install default Node.js for macOS >= 10.15
- defaultVersion=$(get_toolset_value '.node.default')
+defaultVersion=$(get_toolset_value '.node.default')
- echo "Installing Node.js $defaultVersion"
- brew_smart_install "node@$defaultVersion"
- brew link node@$defaultVersion --force
-fi
+echo "Installing Node.js $defaultVersion"
+brew_smart_install "node@$defaultVersion"
+brew link node@$defaultVersion --force
echo Installing yarn...
curl -o- -L https://yarnpkg.com/install.sh | bash
diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh
index 5af741135..90a91695e 100755
--- a/images/macos/provision/core/openjdk.sh
+++ b/images/macos/provision/core/openjdk.sh
@@ -79,7 +79,7 @@ done
# Big Sur or newer does not have these versions of Adopt.
# Also hardcode these versions as they only exist for Adopt
-if is_Less_BigSur; then
+if is_Catalina; then
for adoptVersionToInstall in 12 13 14; do
createEnvironmentVariable ${adoptVersionToInstall} "Adopt"
done
diff --git a/images/macos/provision/core/powershell.sh b/images/macos/provision/core/powershell.sh
index 289b6106c..fc6d6ffca 100644
--- a/images/macos/provision/core/powershell.sh
+++ b/images/macos/provision/core/powershell.sh
@@ -7,7 +7,7 @@ psDownloadUrl=$(echo $psRelease | jq -r '.assets[].browser_download_url | select
download_with_retries $psDownloadUrl "/tmp" "powershell.pkg"
# Work around the issue on macOS Big Sur 11.5 or higher for possible error message ("can't be opened because Apple cannot check it for malicious software") when installing the package
-if ! is_Less_BigSur; then
+if ! is_Catalina; then
sudo xattr -rd com.apple.quarantine /tmp/powershell.pkg
fi
diff --git a/images/macos/provision/core/xamarin.sh b/images/macos/provision/core/xamarin.sh
index 5cc6b360c..b747faaa7 100755
--- a/images/macos/provision/core/xamarin.sh
+++ b/images/macos/provision/core/xamarin.sh
@@ -64,17 +64,11 @@ createBundleLink $CURRENT_SDK_SYMLINK "Current"
# Fix nuget in some mono versions because of known bugs
#
-if is_Less_BigSur; then
+if is_Catalina; then
# Fix Mono issue with default nuget: https://github.com/mono/mono/issues/17637
installNuget "6.4.0" "5.3.1"
fi
-if is_Less_Catalina; then
- installNuget "4.8.1" "4.3.0"
- installNuget "5.0.1" "4.3.0"
- installNuget "5.2.0" "4.3.0"
-fi
-
# Creating UWP Shim to hack UWP build failure
createUWPShim
diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1
index 1f8ce717c..802bb9af4 100644
--- a/images/macos/provision/core/xcode.ps1
+++ b/images/macos/provision/core/xcode.ps1
@@ -32,10 +32,6 @@ $xcodeVersions | ForEach-Object -ThrottleLimit $threadCount -Parallel {
}
Write-Host "Configuring Xcode versions..."
-if ($os.IsLessThanCatalina) {
- $latestXcodeVersion = $xcodeVersions | Select-Object -Last 1 -ExpandProperty link
- Install-XcodeAdditionalPackages -Version $latestXcodeVersion
-}
$xcodeVersions | ForEach-Object {
Invoke-XcodeRunFirstLaunch -Version $_.link
}
diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh
index a51fab435..2e2789667 100755
--- a/images/macos/provision/utils/utils.sh
+++ b/images/macos/provision/utils/utils.sh
@@ -63,32 +63,8 @@ is_Catalina() {
fi
}
-is_Mojave() {
- if [ "$OSTYPE" = "darwin18" ]; then
- true
- else
- false
- fi
-}
-
-is_Less_Catalina() {
- if is_Mojave; then
- true
- else
- false
- fi
-}
-
-is_Less_BigSur() {
- if is_Mojave || is_Catalina; then
- true
- else
- false
- fi
-}
-
is_Less_Monterey() {
- if is_Mojave || is_Catalina || is_BigSur; then
+ if is_Catalina || is_BigSur; then
true
else
false
@@ -124,9 +100,7 @@ brew_cask_install_ignoring_sha256() {
}
get_brew_os_keyword() {
- if is_Mojave; then
- echo "mojave"
- elif is_Catalina; then
+ if is_Catalina; then
echo "catalina"
elif is_BigSur; then
echo "big_sur"
diff --git a/images/macos/software-report/SoftwareReport.Android.psm1 b/images/macos/software-report/SoftwareReport.Android.psm1
index ab7a2aa2a..919733322 100644
--- a/images/macos/software-report/SoftwareReport.Android.psm1
+++ b/images/macos/software-report/SoftwareReport.Android.psm1
@@ -177,7 +177,7 @@ function Get-AndroidGoogleAPIsVersions {
function Get-AndroidNDKVersions {
$os = Get-OSVersion
- if ($os.IsLessThanBigSur) {
+ if ($os.IsCatalina) {
# Hardcode NDK 15 as a separate case since it is installed manually without sdk-manager (to none default location)
$versions = @()
$versions += "15.2.4203891"
diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1
index d8d724a3b..f77bc980e 100644
--- a/images/macos/software-report/SoftwareReport.Generator.ps1
+++ b/images/macos/software-report/SoftwareReport.Generator.ps1
@@ -50,7 +50,7 @@ $languageAndRuntimeList = @(
(Get-FortranVersion)
)
-if ($os.IsLessThanBigSur) {
+if ($os.IsCatalina) {
$languageAndRuntimeList += @(
(Get-RVersion)
)
@@ -74,7 +74,8 @@ $packageManagementList = @(
(Get-NuGetVersion),
(Get-RubyGemsVersion),
(Get-ComposerVersion),
- (Get-CarthageVersion)
+ (Get-CarthageVersion),
+ (Get-VcpkgVersion)
)
if ($os.IsLessThanMonterey) {
@@ -83,12 +84,6 @@ if ($os.IsLessThanMonterey) {
)
}
-if ($os.IsHigherThanMojave) {
- $packageManagementList += @(
- (Get-VcpkgVersion)
- )
-}
-
$markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object)
if ($os.IsLessThanMonterey) {
$markdown += New-MDHeader "Environment variables" -Level 4
@@ -141,13 +136,13 @@ if ($os.IsLessThanMonterey) {
)
}
-if ($os.IsHigherThanMojave -and $os.IsLessThanMonterey) {
+if ($os.IsLessThanMonterey) {
$utilitiesList += @(
(Get-NewmanVersion)
)
}
-if ($os.IsLessThanBigSur) {
+if ($os.IsCatalina) {
$utilitiesList += @(
(Get-VirtualBoxVersion),
(Get-VagrantVersion),
@@ -245,9 +240,8 @@ $markdown += Get-PowerShellModules | New-MDTable
$markdown += New-MDNewLine
# Web Servers
-if ($os.IsHigherThanMojave) {
- $markdown += Build-WebServersSection
-}
+$markdown += Build-WebServersSection
+
# Xamarin section
$markdown += New-MDHeader "Xamarin" -Level 3
@@ -282,7 +276,7 @@ $markdown += New-MDNewLine
# Android section
$markdown += New-MDHeader "Android" -Level 3
$androidTable = Build-AndroidTable
-if ($os.IsLessThanBigSur) {
+if ($os.IsCatalina) {
$androidTable += Get-IntelHaxmVersion
}
$markdown += $androidTable | New-MDTable
diff --git a/images/macos/software-report/SoftwareReport.Xcode.psm1 b/images/macos/software-report/SoftwareReport.Xcode.psm1
index fba70458d..b9ad8e834 100644
--- a/images/macos/software-report/SoftwareReport.Xcode.psm1
+++ b/images/macos/software-report/SoftwareReport.Xcode.psm1
@@ -246,7 +246,7 @@ function Build-XcodeSupportToolsSection {
)
}
- if ($os.IsLessThanBigSur) {
+ if ($os.IsCatalina) {
$xctool = Run-Command "xctool --version"
$toolList += @(
"xctool $xctool"
diff --git a/images/macos/templates/macOS-10.14.json b/images/macos/templates/macOS-10.14.json
deleted file mode 100644
index 3b17fda09..000000000
--- a/images/macos/templates/macOS-10.14.json
+++ /dev/null
@@ -1,229 +0,0 @@
-{
- "variables": {
- "vcenter_server": null,
- "vcenter_username": null,
- "vcenter_password": null,
- "vcenter_datacenter": null,
- "cluster_or_esxi_host": null,
- "esxi_datastore": null,
- "build_id": null,
- "baseimage_name": null,
- "output_folder": null,
- "vm_username": null,
- "vm_password": null,
- "xcode_install_user": null,
- "xcode_install_password": null,
- "image_os": "macos1014"
- },
- "builders": [
- {
- "type": "vsphere-clone",
- "vcenter_server": "{{user `vcenter_server`}}",
- "username": "{{user `vcenter_username`}}",
- "password": "{{user `vcenter_password`}}",
- "insecure_connection": true,
- "datacenter": "{{ user `vcenter_datacenter` }}",
- "template": "{{ user `baseimage_name` }}",
- "folder": "{{user `output_folder` }}",
- "host": "{{user `cluster_or_esxi_host`}}",
- "datastore": "{{user `esxi_datastore`}}",
- "vm_name": "{{user `build_id`}}",
- "ssh_username": "{{user `vm_username`}}",
- "ssh_password": "{{user `vm_password`}}",
- "CPUs": "10",
- "RAM": "24576",
- "NestedHV": "true",
- "shutdown_timeout": "15m"
- }
- ],
- "provisioners": [
- {
- "type": "shell",
- "inline": "mkdir ~/image-generation"
- },
- {
- "type": "file",
- "source": "./provision/assets",
- "destination": "~/image-generation/"
- },
- {
- "type": "file",
- "source": "./tests",
- "destination": "~/image-generation/"
- },
- {
- "type": "file",
- "source": "./software-report",
- "destination": "~/image-generation/"
- },
- {
- "type": "file",
- "source": "./helpers",
- "destination": "~/image-generation/"
- },
- {
- "type": "file",
- "source": "./provision/configuration/environment/bashrc",
- "destination": "~/.bashrc"
- },
- {
- "type": "file",
- "source": "./provision/configuration/environment/bashprofile",
- "destination": "~/.bash_profile"
- },
- {
- "type": "file",
- "source": "./provision/utils",
- "destination": "~/"
- },
- {
- "type": "file",
- "source": "./provision/bootstrap-provisioner",
- "destination": "~/bootstrap"
- },
- {
- "type": "file",
- "source": "./toolsets/toolset-10.14.json",
- "destination": "~/image-generation/toolset.json"
- },
- {
- "type": "shell",
- "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}",
- "scripts": [
- "./provision/configuration/add-network-interface-detection.sh",
- "./provision/configuration/autologin.sh",
- "./provision/configuration/disable-auto-updates.sh",
- "./provision/configuration/screensaver-off.sh",
- "./provision/configuration/ntpconf.sh",
- "./provision/configuration/max-files.sh"
- ],
- "environment_vars": [
- "PASSWORD={{user `vm_password`}}",
- "USERNAME={{user `vm_username`}}"
- ]
- },
- {
- "type": "shell",
- "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
- "scripts": [
- "./provision/configuration/preimagedata.sh",
- "./provision/configuration/configure-ssh.sh",
- "./provision/configuration/configure-machine.sh"
- ],
- "environment_vars": [
- "IMAGE_VERSION={{user `build_id`}}",
- "IMAGE_OS={{user `image_os`}}"
- ]
- },
- {
- "type": "shell",
- "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}",
- "script": "./provision/core/reboot.sh",
- "expect_disconnect": true
- },
- {
- "type": "shell",
- "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
- "pause_before": "30s",
- "scripts": [
- "./provision/core/xcode-clt.sh",
- "./provision/core/homebrew.sh",
- "./provision/core/powershell.sh",
- "./provision/core/dotnet.sh",
- "./provision/core/python.sh",
- "./provision/core/azcopy.sh",
- "./provision/core/openssl.sh",
- "./provision/core/ruby.sh",
- "./provision/core/rubygem.sh",
- "./provision/core/git.sh",
- "./provision/core/node.sh"
- ]
- },
- {
- "type": "shell",
- "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}",
- "script": "./provision/core/xcode.ps1",
- "environment_vars": [
- "XCODE_INSTALL_USER={{user `xcode_install_user`}}",
- "XCODE_INSTALL_PASSWORD={{user `xcode_install_password`}}"
- ]
- },
- {
- "type": "shell",
- "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}",
- "script": "./provision/core/reboot.sh",
- "expect_disconnect": true
- },
- {
- "type": "shell",
- "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
- "scripts": [
- "./provision/core/commonutils.sh",
- "./provision/core/golang.sh",
- "./provision/core/swiftlint.sh",
- "./provision/core/openjdk.sh",
- "./provision/core/php.sh",
- "./provision/core/aws.sh",
- "./provision/core/rust.sh",
- "./provision/core/gcc.sh",
- "./provision/core/haskell.sh",
- "./provision/core/stack.sh",
- "./provision/core/cocoapods.sh",
- "./provision/core/android-toolsets.sh",
- "./provision/core/xamarin.sh",
- "./provision/core/xamarin-android-ndk.sh",
- "./provision/core/vsmac.sh",
- "./provision/core/nvm.sh",
- "./provision/core/postgresql.sh",
- "./provision/core/mongodb.sh",
- "./provision/core/audiodevice.sh",
- "./provision/core/safari.sh",
- "./provision/core/chrome.sh",
- "./provision/core/edge.sh",
- "./provision/core/firefox.sh",
- "./provision/core/miniconda.sh",
- "./provision/core/xcode-sims.sh",
- "./provision/core/xcode-postbuild.sh",
- "./provision/core/pypy.sh",
- "./provision/core/pipx-packages.sh",
- "./provision/core/bicep.sh"
- ]
- },
- {
- "type": "shell",
- "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}",
- "scripts": [
- "./provision/core/toolset.ps1",
- "./provision/core/configure-toolset.ps1"
- ]
- },
- {
- "type": "shell",
- "execute_command": "ruby {{ .Path }}",
- "scripts": [
- "./provision/core/delete-duplicate-sims.rb"
- ]
- },
- {
- "type": "shell",
- "inline": [
- "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}",
- "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\""
- ]
- },
- {
- "type": "file",
- "direction": "download",
- "source": "~/image-generation/output/*",
- "destination": "../image-output/"
- },
- {
- "type": "shell",
- "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
- "scripts": [
- "./provision/configuration/configure-hostname.sh",
- "./provision/configuration/finalize-vm.sh"
- ]
- }
- ]
-}
diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1
index 19f338a2c..9d05270fe 100644
--- a/images/macos/tests/Common.Tests.ps1
+++ b/images/macos/tests/Common.Tests.ps1
@@ -33,7 +33,7 @@ Describe "GCC" {
}
}
-Describe "vcpkg" -Skip:($os.IsMojave) {
+Describe "vcpkg" {
It "vcpkg" {
"vcpkg version" | Should -ReturnZeroExitCode
}
diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1
index 2b7f00915..a067fb5f4 100644
--- a/images/macos/tests/System.Tests.ps1
+++ b/images/macos/tests/System.Tests.ps1
@@ -30,7 +30,7 @@ Describe "Audio device" {
SwitchAudioSource -c | Should -BeLikeExactly "Soundflower (2ch)"
}
- It "Audio channel BlackHole 2ch" -Skip:($os.IsLessThanBigSur) {
+ It "Audio channel BlackHole 2ch" -Skip:($os.IsCatalina) {
SwitchAudioSource -c | Should -BeLikeExactly "BlackHole 2ch"
}
}
diff --git a/images/macos/tests/WebServers.Tests.ps1 b/images/macos/tests/WebServers.Tests.ps1
index ae9dc724f..0763320ab 100644
--- a/images/macos/tests/WebServers.Tests.ps1
+++ b/images/macos/tests/WebServers.Tests.ps1
@@ -1,6 +1,6 @@
$os = Get-OSVersion
-Describe "Apache" -Skip:($os.IsLessThanCatalina) {
+Describe "Apache" {
It "Apache CLI" {
"httpd -v" | Should -ReturnZeroExitCode
}
@@ -10,7 +10,7 @@ Describe "Apache" -Skip:($os.IsLessThanCatalina) {
}
}
-Describe "Nginx" -Skip:($os.IsLessThanCatalina) {
+Describe "Nginx" {
It "Nginx CLI" {
"nginx -v" | Should -ReturnZeroExitCode
}
diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json
deleted file mode 100644
index 420f0ecc4..000000000
--- a/images/macos/toolsets/toolset-10.14.json
+++ /dev/null
@@ -1,390 +0,0 @@
-{
- "xcode": {
- "default": "11.3.1",
- "versions": [
- { "link": "11.3.1", "version": "11.3.1", "symlinks": ["11.3.1_beta"] },
- { "link": "11.3", "version": "11.3.0", "symlinks": ["11.3_beta"] },
- { "link": "11.2.1", "version": "11.2.1", "symlinks": ["11.2.1_beta"] },
- { "link": "11.2", "version": "11.2.0", "symlinks": ["11.2_beta"] },
- { "link": "11.1", "version": "11.1.0", "symlinks": ["11.1_beta"] },
- { "link": "11", "version": "11.0.0", "symlinks": ["11_beta"] },
- { "link": "10.3", "version": "10.3.0", "symlinks": ["10.3_beta"] },
- { "link": "10.2.1", "version": "10.2.1", "symlinks": ["10.2.1_beta"] },
- { "link": "10.2", "version": "10.2.0", "symlinks": ["10.2_beta"] },
- { "link": "10.1", "version": "10.1.0", "symlinks": ["10.1_beta"] },
- { "link": "10", "version": "10.0.0", "symlinks": ["10_beta"] },
- { "link": "9.4.1", "version": "9.4.1" }
- ]
- },
- "xamarin": {
- "vsmac": "8.5.0.3183",
- "mono-versions": [
- "6.8.0.123", "6.6.0.166", "6.4.0.208", "6.0.0.334", "5.18.1.3", "5.16.1.0", "5.12.0.309", "5.10.1.57", "5.8.1.0", "5.4.1.7", "5.2.0.224", "5.0.1.1", "4.8.1.0"
- ],
- "ios-versions": [
- "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47", "12.14.0.114", "12.10.0.157", "12.8.0.2", "12.6.0.25", "12.2.1.16", "12.0.0.15", "11.14.0.13", "11.12.0.4", "11.9.1.24", "11.8.0.20", "11.6.1.4", "11.2.0.11", "11.0.0.0", "10.10.0.36", "10.6.0.10"
- ],
- "mac-versions": [
- "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47", "5.16.1.24", "5.10.0.157", "5.8.0.0", "5.6.0.25", "5.3.1.28", "5.2.1.16" , "4.6.0.13", "4.4.1.193", "4.2.1.28", "4.0.0.216", "3.8.0.49", "3.6.3.3", "3.4.0.36", "3.0.0.398"
- ],
- "android-versions": [
- "10.2.0.100", "10.1.3.7", "10.0.6.2", "9.4.1.0", "9.3.0-23", "9.2.3-0", "9.1.8-0", "9.0.0-20", "8.3.3-2", "8.2.0-16", "8.1.5-0", "8.0.0-33", "7.4.5-1", "7.3.1-2", "7.1.0-43"
- ],
- "bundle-default": "5_12_0",
- "bundles": [
- {
- "symlink": "6_8_0",
- "mono": "6.8",
- "ios": "13.14",
- "mac": "6.14",
- "android": "10.2"
- },
- {
- "symlink": "6_6_1",
- "mono": "6.6",
- "ios": "13.10",
- "mac": "6.10",
- "android": "10.1"
- },
- {
- "symlink": "6_6_0",
- "mono": "6.6",
- "ios": "13.8",
- "mac": "6.8",
- "android": "10.1"
- },
- {
- "symlink": "6_4_2",
- "mono": "6.4",
- "ios": "13.6",
- "mac": "6.6",
- "android": "10.0"
- },
- {
- "symlink": "6_4_1",
- "mono": "6.4",
- "ios": "13.4",
- "mac": "6.4",
- "android": "10.0"
- },
- {
- "symlink": "6_4_0",
- "mono": "6.4",
- "ios": "13.2",
- "mac": "6.2",
- "android": "10.0"
- },
- {
- "symlink": "6_0_0",
- "mono": "6.0",
- "ios": "12.14",
- "mac": "5.16",
- "android": "9.4"
- },
- {
- "symlink": "5_18_3",
- "mono": "5.18",
- "ios": "12.10",
- "mac": "5.10",
- "android": "9.3"
- },
- {
- "symlink": "5_18_2",
- "mono": "5.18",
- "ios": "12.8",
- "mac": "5.8",
- "android": "9.2"
- },
- {
- "symlink": "5_18_1",
- "mono": "5.18",
- "ios": "12.6",
- "mac": "5.6",
- "android": "9.2"
- },
- {
- "symlink": "5_16_0_0",
- "mono": "5.16",
- "ios": "12.2",
- "mac": "5.2",
- "android": "9.1"
- },
- {
- "symlink": "5_16_0",
- "mono": "5.16",
- "ios": "12.2",
- "mac": "5.2",
- "android": "9.1"
- },
- {
- "symlink": "5_12_0_3",
- "mono": "5.12",
- "ios": "12.2",
- "mac": "5.3",
- "android": "9.0"
- },
- {
- "symlink": "5_12_0_XC10_PRE",
- "mono": "5.12",
- "ios": "12.0",
- "mac": "5.2",
- "android": "9.0"
- },
- {
- "symlink": "5_12_0",
- "mono": "5.12",
- "ios": "11.14",
- "mac": "4.6",
- "android": "9.0"
- },
- {
- "symlink": "5_10_1",
- "mono": "5.10",
- "ios": "11.12",
- "mac": "4.4",
- "android": "8.3"
- },
- {
- "symlink": "5_8_1",
- "mono": "5.8",
- "ios": "11.9",
- "mac": "4.2",
- "android": "8.2"
- },
- {
- "symlink": "5_8_0",
- "mono": "5.8",
- "ios": "11.8",
- "mac": "4.2",
- "android": "8.2"
- },
- {
- "symlink": "5_4_1",
- "mono": "5.4",
- "ios": "11.6",
- "mac": "4.0",
- "android": "8.1"
- },
- {
- "symlink": "5_4_0",
- "mono": "5.4",
- "ios": "11.2",
- "mac": "3.8",
- "android": "8.0"
- },
- {
- "symlink": "5_2_0",
- "mono": "5.2",
- "ios": "11.0",
- "mac": "3.6",
- "android": "7.4"
- },
- {
- "symlink": "Legacy_5_0_1",
- "mono": "5.0",
- "ios": "10.10",
- "mac": "3.4",
- "android": "7.3"
- },
- {
- "symlink": "Legacy_4_8_1",
- "mono": "4.8",
- "ios": "10.6",
- "mac": "3.0",
- "android": "7.1"
- }
- ]
- },
- "java": {
- "default": "8",
- "default_vendor": "Temurin-Hotspot",
- "vendors": [
- {
- "name": "Temurin-Hotspot",
- "versions": [ "8", "11", "17" ]
- },
- {
- "name": "Adopt",
- "versions": [ "8", "11", "12", "13", "14" ]
- }
- ]
- },
- "android": {
- "platform_min_version": "15",
- "build_tools_min_version": "17.0.0",
- "extra-list": [
- "android;m2repository", "google;m2repository", "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta1", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta2", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta3", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta4", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta5", "m2repository;com;android;support;constraint;constraint-layout;1.0.0", "m2repository;com;android;support;constraint;constraint-layout;1.0.1", "m2repository;com;android;support;constraint;constraint-layout;1.0.2"
- ],
- "addon-list": [
- "addon-google_apis-google-24", "addon-google_apis-google-23", "addon-google_apis-google-22", "addon-google_apis-google-21"
- ],
- "additional-tools": [
- "cmake;3.10.2.4988404",
- "cmake;3.18.1"
- ],
- "ndk": {
- "default": "21",
- "versions": [
- "21", "22", "23"
- ]
- }
- },
- "powershellModules": [
- {
- "name": "Az",
- "versions": [
- "6.1.0"
- ]
- },
- {"name": "MarkdownPS"},
- {"name": "Pester"},
- {"name": "PSScriptAnalyzer"}
- ],
- "npm": {
- "global_packages": [
- { "name": "npm@3" },
- { "name": "omelette@0.4.14" },
- { "name": "appcenter-cli@^1.0.0", "test": "appcenter --version" },
- { "name": "node-gyp" }
- ]
- },
- "brew": {
- "common_packages": [
- "aliyun-cli",
- "ant",
- "aria2",
- "azure-cli",
- "bats",
- "bazelisk",
- "carthage",
- "cmake",
- "gh",
- "gnupg",
- "gnu-tar",
- "helm",
- "kotlin",
- "libpq",
- "llvm",
- "p7zip",
- "packer",
- "parallel",
- "perl",
- "sbt",
- "subversion",
- "swiftformat",
- "swig",
- "xctool",
- "zstd"
- ],
- "cask_packages": [
- "julia",
- "r",
- "vagrant",
- "virtualbox"
- ]
- },
- "gcc": {
- "versions": [
- "9",
- "10",
- "11"
- ]
- },
- "toolcache": [
- {
- "name": "Python",
- "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json",
- "arch": "x64",
- "platform" : "darwin",
- "versions": [
- "2.7.*",
- "3.5.*",
- "3.6.*",
- "3.7.*",
- "3.8.*",
- "3.9.*",
- "3.10.*"
- ]
- },
- {
- "name": "PyPy",
- "arch": "x64",
- "platform" : "darwin",
- "versions": [
- "2.7",
- "3.6"
- ]
- },
- {
- "name": "Node",
- "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json",
- "platform" : "darwin",
- "arch": "x64",
- "versions": [
- "10.*",
- "12.*",
- "14.*"
- ]
- },
- {
- "name": "Go",
- "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json",
- "arch": "x64",
- "platform" : "darwin",
- "variable_template" : "GOROOT_{0}_{1}_X64",
- "versions": [
- "1.15.*",
- "1.16.*",
- "1.17.*"
- ]
- },
- {
- "name": "Ruby",
- "arch": "x64",
- "versions": [
- "2.4.*",
- "2.5.*",
- "2.6.*",
- "2.7.*",
- "3.0.*"
- ]
- }
- ],
- "pipx": [
- {
- "package": "yamllint",
- "cmd": "yamllint --version"
- }
- ],
- "dotnet": {
- "versions": [
- "2.1"
- ]
- },
- "ruby": {
- "default": "2.7",
- "rubygems": [
- "xcode-install",
- "cocoapods",
- "nomad-cli",
- "xcpretty",
- "bundler",
- "fastlane",
- "jazzy"
- ]
- },
- "go": {
- "default": "1.15"
- },
- "node": {
- "default": "8",
- "nvm_versions": [
- "10",
- "12",
- "14"
- ]
- },
- "mongodb": {
- "version": "5.0"
- }
-}