diff --git a/images/linux/scripts/installers/azpowershell.sh b/images/linux/scripts/installers/azpowershell.sh
index 47ac5ff3e..13253b5fa 100644
--- a/images/linux/scripts/installers/azpowershell.sh
+++ b/images/linux/scripts/installers/azpowershell.sh
@@ -8,12 +8,8 @@
source $HELPER_SCRIPTS/os.sh
# List of versions
-if isUbuntu20 ; then
- versions=$(pwsh -Command '(Find-Module -Name Az).Version')
-else
- toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json"
- versions=$(jq -r '.azureModules[] | select(.name | contains("az")) | .versions[]' $toolset)
-fi
+toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json"
+versions=$(jq -r '.azureModules[] | select(.name | contains("az")) | .versions[]' $toolset)
# Try to install and update PowerShellGet before the actual installation
pwsh -Command "Install-Module -Name PowerShellGet -Force"
diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json
index c52fcb406..76f2af421 100644
--- a/images/linux/toolsets/toolset-2004.json
+++ b/images/linux/toolsets/toolset-2004.json
@@ -69,6 +69,14 @@
{"name": "MarkdownPS"},
{"name": "Pester"}
],
+ "azureModules": [
+ {
+ "name": "az",
+ "versions": [
+ "4.8.0"
+ ]
+ }
+ ],
"apt": {
"common_packages": [
"dbus",
diff --git a/images/macos/macos-10.13-Readme.md b/images/macos/macos-10.13-Readme.md
new file mode 100644
index 000000000..da35d0f76
--- /dev/null
+++ b/images/macos/macos-10.13-Readme.md
@@ -0,0 +1,351 @@
+| Announcements |
+|-|
+| [macOS 11.0 (Big Sur) is available as a preview 🚀](https://github.com/actions/virtual-environments/issues/1814) |
+| [[macOS] Default Ruby version will be changed to 2.7 on October, 26](https://github.com/actions/virtual-environments/issues/1775) |
+| [Default Xcode will be changed to Xcode 12.0 on October, 20](https://github.com/actions/virtual-environments/issues/1712) |
+| [Xcode 11.0, 11.1, 11.4.0 will be deprecated on November, 5](https://github.com/actions/virtual-environments/issues/1688) |
+***
+# macOS 10.13 info
+- System Version: macOS 10.13.6 (17G14033)
+- Kernel Version: Darwin 17.7.0
+- Image Version: 20201015.3
+
+## Installed Software
+### Language and Runtime
+- R 4.0.3
+- Node.js v8.17.0
+- NVM 0.36.0
+- NVM - Cached node versions: v6.17.1 v8.17.0 v10.22.1 v12.19.0 v13.14.0 v14.14.0
+- Python 2.7.17
+- Python 3.8.6
+- Ruby 2.6.6p146
+- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507
+- Go 1.15.2
+- PHP 7.4.11
+- julia 1.5.2
+
+### Package Management
+- Pip 19.3.1 (python 2.7)
+- Pip 20.2.3 (python 3.8)
+- Bundler version 2.1.4
+- Carthage 0.36.0
+- CocoaPods 1.9.3
+- Homebrew 2.5.6
+- NPM 3.10.10
+- Yarn 1.22.5
+- NuGet 4.7.0.5148
+- Miniconda 4.8.3
+- RubyGems 3.1.4
+- Composer 1.10.15
+
+### Project Management
+- Apache Maven 3.6.3
+- Gradle 6.7
+- Apache Ant(TM) 1.10.9
+
+### Utilities
+- Curl 7.73.0
+- Git: 2.28.0
+- Git LFS: 2.12.0
+- GitHub CLI: 1.1.0
+- Hub CLI: 2.14.2
+- GNU Wget 1.20.3
+- Subversion (SVN) 1.14.0
+- Packer 1.6.4
+- OpenSSL 1.0.2t 10 Sep 2019 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.0.2t/1.0.2t)`
+- jq 1.6
+- gpg (GnuPG) 2.2.23
+- psql (PostgreSQL) 13.0
+- PostgreSQL 13.0
+- aria2 1.35.0
+- azcopy 10.6.0
+- zstd 1.4.5
+- bazel 3.6.0
+- bazelisk 1.7.2
+- helm v3.3.4+ga61ce56
+- mongo v4.4.1
+- mongod v4.4.1
+- 7-Zip 16.02
+- virtualbox 6.1.14r140239
+- Vagrant 2.2.10
+- GNU parallel 20200722
+
+
+### Tools
+- Fastlane 2.163.0
+- Cmake 3.18.4
+- App Center CLI 1.2.2
+- Azure CLI 2.13.0
+- AWS CLI 2.0.56
+- AWS SAM CLI 1.6.2
+- AWS Session Manager CLI 1.1.61.0
+- Aliyun CLI 3.0.60
+### Linters
+- yamllint 1.25.0
+### Browsers
+- Safari 13.1.2 (13609.3.5.1.5)
+- SafariDriver 13.1.2 (13609.3.5.1.5)
+- Google Chrome 86.0.4240.80
+- ChromeDriver 86.0.4240.22
+- Microsoft Edge 85.0.564.70
+- MSEdgeDriver 85.0.564.70
+- Mozilla Firefox 81.0.2
+- geckodriver 0.27.0
+
+### Java
+| Version | Vendor | Environment Variable |
+| --------- | ------------ | -------------------- |
+| 1.7.0_272 | Zulu | JAVA_HOME_7_X64 |
+| 1.8.0_265 | AdoptOpenJDK | JAVA_HOME_8_X64 |
+| 11.0.8 | AdoptOpenJDK | JAVA_HOME_11_X64 |
+| 12.0.2 | AdoptOpenJDK | JAVA_HOME_12_X64 |
+| 13.0.2 | AdoptOpenJDK | JAVA_HOME_13_X64 |
+| 14.0.2 | AdoptOpenJDK | JAVA_HOME_14_X64 |
+### Cached Tools
+#### Ruby
+- 2.4.10
+- 2.5.8
+- 2.6.6
+- 2.7.1
+
+#### Python
+- 2.7.17
+- 3.5.9
+- 3.6.10
+- 3.7.6
+- 3.8.2
+
+#### PyPy
+- 2.7.13 [PyPy 7.3.1]
+- 3.6.9 [PyPy 7.3.1]
+
+### PowerShell Tools
+- PowerShell 7.0.3
+
+#### PowerShell Modules
+| Module | Version |
+| ---------- | ------- |
+| Az | 4.8.0 |
+| MarkdownPS | 1.9 |
+| Pester | 5.0.4 |
+
+### Xamarin
+#### Visual Studio for Mac
+- 8.3.11.1
+
+#### Mono
+- 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
+
+#### Xamarin.iOS
+- 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
+
+#### Xamarin.Mac
+- 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
+
+#### Xamarin.Android
+- 10.0.6
+- 9.4.1
+- 9.3.0
+- 9.2.3
+- 9.1.8
+- 9.0.0
+- 8.3.3
+- 8.2.0
+- 8.1.5
+- 8.0.0
+- 7.4.5
+- 7.3.1
+- 7.1.0
+
+#### Unit Test Framework
+- NUnit 3.6.1
+
+### Xcode
+| Version | Build | Path |
+| -------------- | ------- | ----------------------------- |
+| 10.1 (default) | 10B61 | /Applications/Xcode_10.1.app |
+| 10.0 | 10A255 | /Applications/Xcode_10.app |
+| 9.4.1 | 9F2000 | /Applications/Xcode_9.4.1.app |
+| 9.4 | 9F1027a | /Applications/Xcode_9.4.app |
+| 9.3.1 | 9E501 | /Applications/Xcode_9.3.1.app |
+| 9.3 | 9E145 | /Applications/Xcode_9.3.app |
+| 9.2 | 9C40b | /Applications/Xcode_9.2.app |
+| 9.1 | 9B55 | /Applications/Xcode_9.1.app |
+| 9.0 | 9A235 | /Applications/Xcode_9.app |
+| 8.3.3 | 8E3004b | /Applications/Xcode_8.3.3.app |
+| 8.2.1 | 8C1002 | /Applications/Xcode_8.2.1.app |
+| 8.1 | 8B62 | /Applications/Xcode_8.1.app |
+| 8.0 | 8A218a | /Applications/Xcode_8.app |
+
+#### Xcode Support Tools
+- xcpretty 0.3.0
+- xcversion 2.6.6
+- Nomad CLI 3.1.4
+- Nomad CLI IPA ipa 0.14.3
+- xctool 0.3.7
+
+#### Installed SDKs
+| SDK | SDK Name | Xcode Version |
+| ----------------------- | -------------------- | ------------------------------------- |
+| macOS 10.12 | macosx10.12 | 8.0, 8.1, 8.2.1, 8.3.3 |
+| macOS 10.13 | macosx10.13 | 9.0, 9.1, 9.2, 9.3, 9.3.1, 9.4, 9.4.1 |
+| macOS 10.14 | macosx10.14 | 10.0, 10.1 |
+| iOS 10.0 | iphoneos10.0 | 8.0 |
+| iOS 10.1 | iphoneos10.1 | 8.1 |
+| iOS 10.2 | iphoneos10.2 | 8.2.1 |
+| iOS 10.3 | iphoneos10.3 | 8.3.3 |
+| iOS 11.0 | iphoneos11.0 | 9.0 |
+| iOS 11.1 | iphoneos11.1 | 9.1 |
+| iOS 11.2 | iphoneos11.2 | 9.2 |
+| iOS 11.3 | iphoneos11.3 | 9.3, 9.3.1 |
+| iOS 11.4 | iphoneos11.4 | 9.4, 9.4.1 |
+| iOS 12.0 | iphoneos12.0 | 10.0 |
+| iOS 12.1 | iphoneos12.1 | 10.1 |
+| Simulator - iOS 10.0 | iphonesimulator10.0 | 8.0 |
+| Simulator - iOS 10.1 | iphonesimulator10.1 | 8.1 |
+| Simulator - iOS 10.2 | iphonesimulator10.2 | 8.2.1 |
+| Simulator - iOS 10.3 | iphonesimulator10.3 | 8.3.3 |
+| Simulator - iOS 11.0 | iphonesimulator11.0 | 9.0 |
+| Simulator - iOS 11.1 | iphonesimulator11.1 | 9.1 |
+| Simulator - iOS 11.2 | iphonesimulator11.2 | 9.2 |
+| Simulator - iOS 11.3 | iphonesimulator11.3 | 9.3, 9.3.1 |
+| Simulator - iOS 11.4 | iphonesimulator11.4 | 9.4, 9.4.1 |
+| Simulator - iOS 12.0 | iphonesimulator12.0 | 10.0 |
+| Simulator - iOS 12.1 | iphonesimulator12.1 | 10.1 |
+| tvOS 10.0 | appletvos10.0 | 8.0, 8.1 |
+| tvOS 10.1 | appletvos10.1 | 8.2.1 |
+| tvOS 10.2 | appletvos10.2 | 8.3.3 |
+| tvOS 11.0 | appletvos11.0 | 9.0 |
+| tvOS 11.1 | appletvos11.1 | 9.1 |
+| tvOS 11.2 | appletvos11.2 | 9.2 |
+| tvOS 11.3 | appletvos11.3 | 9.3, 9.3.1 |
+| tvOS 11.4 | appletvos11.4 | 9.4, 9.4.1 |
+| tvOS 12.0 | appletvos12.0 | 10.0 |
+| tvOS 12.1 | appletvos12.1 | 10.1 |
+| Simulator - tvOS 10.0 | appletvsimulator10.0 | 8.0, 8.1 |
+| Simulator - tvOS 10.1 | appletvsimulator10.1 | 8.2.1 |
+| Simulator - tvOS 10.2 | appletvsimulator10.2 | 8.3.3 |
+| Simulator - tvOS 11.0 | appletvsimulator11.0 | 9.0 |
+| Simulator - tvOS 11.1 | appletvsimulator11.1 | 9.1 |
+| Simulator - tvOS 11.2 | appletvsimulator11.2 | 9.2 |
+| Simulator - tvOS 11.3 | appletvsimulator11.3 | 9.3, 9.3.1 |
+| Simulator - tvOS 11.4 | appletvsimulator11.4 | 9.4, 9.4.1 |
+| Simulator - tvOS 12.0 | appletvsimulator12.0 | 10.0 |
+| Simulator - tvOS 12.1 | appletvsimulator12.1 | 10.1 |
+| watchOS 3.0 | watchos3.0 | 8.0 |
+| watchOS 3.1 | watchos3.1 | 8.1, 8.2.1 |
+| watchOS 3.2 | watchos3.2 | 8.3.3 |
+| watchOS 4.0 | watchos4.0 | 9.0 |
+| watchOS 4.1 | watchos4.1 | 9.1 |
+| watchOS 4.2 | watchos4.2 | 9.2 |
+| watchOS 4.3 | watchos4.3 | 9.3, 9.3.1, 9.4, 9.4.1 |
+| watchOS 5.0 | watchos5.0 | 10.0 |
+| watchOS 5.1 | watchos5.1 | 10.1 |
+| Simulator - watchOS 3.0 | watchsimulator3.0 | 8.0 |
+| Simulator - watchOS 3.1 | watchsimulator3.1 | 8.1, 8.2.1 |
+| Simulator - watchOS 3.2 | watchsimulator3.2 | 8.3.3 |
+| Simulator - watchOS 4.0 | watchsimulator4.0 | 9.0 |
+| Simulator - watchOS 4.1 | watchsimulator4.1 | 9.1 |
+| Simulator - watchOS 4.2 | watchsimulator4.2 | 9.2 |
+| Simulator - watchOS 4.3 | watchsimulator4.3 | 9.3, 9.3.1, 9.4, 9.4.1 |
+| Simulator - watchOS 5.0 | watchsimulator5.0 | 10.0 |
+| Simulator - watchOS 5.1 | watchsimulator5.1 | 10.1 |
+
+#### Installed Simulators
+| OS | Xcode Version | Simulators |
+| ----------- | ------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| iOS 8.4 | 8.0
8.1
8.2.1
8.3.3
9.0
9.1
9.2
9.3
9.3.1
9.4
9.4.1
10.0
10.1 | iPhone 4s
iPhone 5
iPhone 5s
iPhone 6
iPhone 6 Plus
iPad 2
iPad Air
iPad Retina |
+| iOS 9.0 | 8.0
8.1
8.2.1
8.3.3
9.0
9.1
9.2
9.3
9.3.1
9.4
9.4.1
10.0
10.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 | 8.0
8.1
8.2.1
8.3.3
9.0
9.1
9.2
9.3
9.3.1
9.4
9.4.1
10.0
10.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 | 8.0
8.1
8.2.1
8.3.3
9.0
9.1
9.2
9.3
9.3.1
9.4
9.4.1
10.0
10.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 | 8.0
8.1
8.2.1
8.3.3
9.0
9.1
9.2
9.3
9.3.1
9.4
9.4.1
10.0
10.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 | 8.0
8.1
8.2.1
8.3.3
9.0
9.1
9.2
9.3
9.3.1
9.4
9.4.1
10.0
10.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)
iPad Retina |
+| iOS 10.1 | 8.0
8.1
8.2.1
8.3.3
9.0
9.1
9.2
9.3
9.3.1
9.4
9.4.1
10.0
10.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)
iPad Retina |
+| iOS 10.2 | 8.0
8.1
8.2.1
8.3.3
9.0
9.1
9.2
9.3
9.3.1
9.4
9.4.1
10.0
10.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)
iPad Retina |
+| iOS 10.3 | 8.0
8.1
8.2.1
8.3.3
9.0
9.1
9.2
9.3
9.3.1
9.4
9.4.1
10.0
10.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)
iPad Retina |
+| iOS 11.0 | 9.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
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.1 | 9.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 11.2 | 9.2 | 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 11.3 | 9.3
9.3.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 11.4 | 9.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) |
+| tvOS 10.0 | 8.0
8.1 | Apple TV 1080p |
+| tvOS 10.1 | 8.2.1 | Apple TV 1080p |
+| tvOS 10.2 | 8.3.3 | Apple TV 1080p |
+| tvOS 11.0 | 9.0 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) |
+| tvOS 11.1 | 9.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) |
+| tvOS 11.2 | 9.2 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) |
+| tvOS 11.3 | 9.3
9.3.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) |
+| tvOS 11.4 | 9.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) |
+| watchOS 3.0 | 8.0 | Apple Watch - 38mm
Apple Watch - 42mm
Apple Watch Series 2 - 38mm
Apple Watch Series 2 - 42mm |
+| watchOS 3.1 | 8.1
8.2.1 | Apple Watch - 38mm
Apple Watch - 42mm
Apple Watch Series 2 - 38mm
Apple Watch Series 2 - 42mm |
+| watchOS 3.2 | 8.3.3 | Apple Watch - 38mm
Apple Watch - 42mm
Apple Watch Series 2 - 38mm
Apple Watch Series 2 - 42mm |
+| watchOS 4.0 | 9.0 | 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 4.1 | 9.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 4.2 | 9.2 | 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 4.3 | 9.3
9.3.1
9.4
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 |
+
+### Android
+| Package Name | Version |
+| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Android SDK Tools | 26.1.1 |
+| Android SDK Platforms | 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 Build-tools | 30.0.0 30.0.1 30.0.2
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 23.0.0
22.0.1 22.0.0
21.1.2 21.0.0 21.0.1 21.0.2 21.1.0 21.1.1
20.0.0
19.1.0 19.0.0 19.0.1 19.0.2 19.0.3
18.0.1 18.1.0 18.1.1
17.0.0 |
+| Android SDK Platform-Tools | 30.0.4 |
+| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 |
+| Android Support Repository | 47.0.0 |
+| Google Play services | 49 |
+| Google Repository | 58 |
+| SDK Patch Applier v4 | 1 |
+| CMake | 3.6.4111459 |
+| NDK | 15.2.4203891
18.1.5063045
21.3.6528147 |
+
+
diff --git a/images/macos/macos-10.14-Readme.md b/images/macos/macos-10.14-Readme.md
new file mode 100644
index 000000000..e8fa2cac5
--- /dev/null
+++ b/images/macos/macos-10.14-Readme.md
@@ -0,0 +1,379 @@
+| Announcements |
+|-|
+| [macOS 11.0 (Big Sur) is available as a preview 🚀](https://github.com/actions/virtual-environments/issues/1814) |
+| [[macOS] Default Ruby version will be changed to 2.7 on October, 26](https://github.com/actions/virtual-environments/issues/1775) |
+| [Default Xcode will be changed to Xcode 12.0 on October, 20](https://github.com/actions/virtual-environments/issues/1712) |
+| [Xcode 11.0, 11.1, 11.4.0 will be deprecated on November, 5](https://github.com/actions/virtual-environments/issues/1688) |
+***
+# macOS 10.14 info
+- System Version: macOS 10.14.6 (18G6032)
+- Kernel Version: Darwin 18.7.0
+- Image Version: 20201018.1
+
+## Installed Software
+### Language and Runtime
+- Clang/LLVM 10.0.1
+- gcc-8 (Homebrew GCC 8.4.0_1) 8.4.0 - available by `gcc-8` alias
+- gcc-9 (Homebrew GCC 9.3.0) 9.3.0 - available by `gcc-9` alias
+- GNU Fortran (Homebrew GCC 8.4.0_1) 8.4.0 - available by `gfortran-8` alias
+- GNU Fortran (Homebrew GCC 9.3.0) 9.3.0 - available by `gfortran-9` alias
+- R 4.0.3
+- Node.js v8.17.0
+- NVM 0.36.0
+- NVM - Cached node versions: v6.17.1 v8.17.0 v10.22.1 v12.19.0 v13.14.0 v14.14.0
+- Python 2.7.17
+- Python 3.8.6
+- Ruby 2.6.6p146
+- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507
+- Go 1.15.3
+- PHP 7.4.11
+- julia 1.5.2
+
+### Package Management
+- Pip 19.3.1 (python 2.7)
+- Pip 20.2.3 (python 3.8)
+- Bundler version 2.1.4
+- Carthage 0.36.0
+- CocoaPods 1.9.3
+- Homebrew 2.5.6
+- NPM 3.10.10
+- Yarn 1.22.5
+- NuGet 4.7.0.5148
+- Miniconda 4.8.3
+- RubyGems 3.1.4
+- Composer 1.10.15
+
+### Project Management
+- Apache Maven 3.6.3
+- Gradle 6.7
+- Apache Ant(TM) 1.10.9
+
+### Utilities
+- Curl 7.73.0
+- Git: 2.28.0
+- Git LFS: 2.12.0
+- GitHub CLI: 1.1.0
+- Hub CLI: 2.14.2
+- GNU Wget 1.20.3
+- Subversion (SVN) 1.14.0
+- Packer 1.6.4
+- OpenSSL 1.0.2t 10 Sep 2019 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.0.2t/1.0.2t)`
+- jq 1.6
+- gpg (GnuPG) 2.2.23
+- psql (PostgreSQL) 13.0
+- PostgreSQL 13.0
+- aria2 1.35.0
+- azcopy 10.6.0
+- zstd 1.4.5
+- bazel 3.6.0
+- bazelisk 1.7.2
+- helm v3.3.4+ga61ce56
+- mongo v4.4.1
+- mongod v4.4.1
+- 7-Zip 16.02
+- virtualbox 6.1.14r140239
+- Vagrant 2.2.10
+- GNU parallel 20200722
+
+
+### Tools
+- Fastlane 2.163.0
+- Cmake 3.18.4
+- App Center CLI 1.2.2
+- Azure CLI 2.13.0
+- AWS CLI 2.0.57
+- AWS SAM CLI 1.6.2
+- AWS Session Manager CLI 1.1.61.0
+- Aliyun CLI 3.0.60
+- GHCup v0.1.11
+- GHC 8.10.2
+- Cabal 3.2.0.0
+- Stack 2.5.1
+
+### Linters
+- yamllint 1.25.0
+- SwiftLint 0.40.3
+
+### Browsers
+- Safari 14.0 (14610.1.28.1.9)
+- SafariDriver 14.0 (14610.1.28.1.9)
+- Google Chrome 86.0.4240.80
+- ChromeDriver 86.0.4240.22
+- Microsoft Edge 85.0.564.70
+- MSEdgeDriver 85.0.564.70
+- Mozilla Firefox 81.0.2
+- geckodriver 0.27.0
+
+### Java
+| Version | Vendor | Environment Variable |
+| --------- | ------------ | -------------------- |
+| 1.7.0_272 | Zulu | JAVA_HOME_7_X64 |
+| 1.8.0_265 | AdoptOpenJDK | JAVA_HOME_8_X64 |
+| 11.0.8 | AdoptOpenJDK | JAVA_HOME_11_X64 |
+| 12.0.2 | AdoptOpenJDK | JAVA_HOME_12_X64 |
+| 13.0.2 | AdoptOpenJDK | JAVA_HOME_13_X64 |
+| 14.0.2 | AdoptOpenJDK | JAVA_HOME_14_X64 |
+### Cached Tools
+#### Ruby
+- 2.4.10
+- 2.5.8
+- 2.6.6
+- 2.7.1
+
+#### Python
+- 2.7.18
+- 3.5.10
+- 3.6.12
+- 3.7.9
+- 3.8.6
+- 3.9.0
+
+#### PyPy
+- 2.7.13 [PyPy 7.3.2]
+- 3.6.9 [PyPy 7.3.2]
+
+#### Node.js
+- 8.17.0
+- 10.22.1
+- 12.19.0
+- 14.14.0
+
+#### Go
+- 1.11.13
+- 1.12.17
+- 1.13.15
+- 1.14.10
+- 1.15.3
+
+### Rust Tools
+- Rust 1.47.0
+- Rustup 1.22.1
+
+#### Packages
+- Bindgen 0.55.1
+- Cbindgen 0.15.0
+- Cargo-outdated v0.9.11
+- Cargo-audit 0.12.1
+
+### PowerShell Tools
+- PowerShell 7.0.3
+
+#### PowerShell Modules
+| Module | Version |
+| ---------- | ------- |
+| Az | 4.8.0 |
+| MarkdownPS | 1.9 |
+| Pester | 5.0.4 |
+
+### Xamarin
+#### Visual Studio for Mac
+- 8.5.0.3183
+
+#### Mono
+- 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
+
+#### Xamarin.iOS
+- 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
+
+#### Xamarin.Mac
+- 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
+
+#### Xamarin.Android
+- 10.2.0
+- 10.1.3
+- 10.0.6
+- 9.4.1
+- 9.3.0
+- 9.2.3
+- 9.1.8
+- 9.0.0
+- 8.3.3
+- 8.2.0
+- 8.1.5
+- 8.0.0
+- 7.4.5
+- 7.3.1
+- 7.1.0
+
+#### 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.6.6
+- Nomad CLI 3.1.4
+- Nomad CLI IPA ipa 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 SDK Tools | 26.1.1 |
+| Android SDK Platforms | 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 Build-tools | 30.0.0 30.0.1 30.0.2
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 23.0.0
22.0.1 22.0.0
21.1.2 21.0.0 21.0.1 21.0.2 21.1.0 21.1.1
20.0.0
19.1.0 19.0.0 19.0.1 19.0.2 19.0.3
18.0.1 18.1.0 18.1.1
17.0.0 |
+| Android SDK Platform-Tools | 30.0.4 |
+| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 |
+| Android Support Repository | 47.0.0 |
+| Google Play services | 49 |
+| Google Repository | 58 |
+| SDK Patch Applier v4 | 1 |
+| CMake | 3.6.4111459 |
+| NDK | 15.2.4203891
18.1.5063045
21.3.6528147 |
+
+
diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md
index 415b41ba6..cfb4e8102 100644
--- a/images/macos/macos-10.15-Readme.md
+++ b/images/macos/macos-10.15-Readme.md
@@ -1,18 +1,19 @@
| Announcements |
|-|
+| [.NET 5.0 will become a default .NET version on November, 10](https://github.com/actions/virtual-environments/issues/1891) |
| [macOS 11.0 (Big Sur) is available as a preview 🚀](https://github.com/actions/virtual-environments/issues/1814) |
| [[macOS] Default Ruby version will be changed to 2.7 on October, 26](https://github.com/actions/virtual-environments/issues/1775) |
-| [Default Xcode will be changed to Xcode 12.0 on October, 20](https://github.com/actions/virtual-environments/issues/1712) |
+| [Default Xcode will be changed to Xcode 12.0.1 on October, 20](https://github.com/actions/virtual-environments/issues/1712) |
| [Xcode 11.0, 11.1, 11.4.0 will be deprecated on November, 5](https://github.com/actions/virtual-environments/issues/1688) |
***
# macOS 10.15 info
- System Version: macOS 10.15.7 (19H2)
- Kernel Version: Darwin 19.6.0
-- Image Version: 20201017.1
+- Image Version: 20201026.2
## Installed Software
### Language and Runtime
-- Clang/LLVM 10.0.1
+- Clang/LLVM 11.0.0
- gcc-8 (Homebrew GCC 8.4.0_1) 8.4.0 - available by `gcc-8` alias
- gcc-9 (Homebrew GCC 9.3.0) 9.3.0 - available by `gcc-9` alias
- GNU Fortran (Homebrew GCC 8.4.0_1) 8.4.0 - available by `gfortran-8` alias
@@ -23,9 +24,9 @@
- NVM - Cached node versions: v6.17.1 v8.17.0 v10.22.1 v12.19.0 v13.14.0 v14.14.0
- Python 2.7.17
- Python 3.8.6
-- Ruby 2.6.6p146
+- Ruby 2.7.2p137
- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 2.1.602 2.1.603 2.1.604 2.1.607 2.1.700 2.1.701 2.1.801 2.1.802 2.1.803 2.1.804 2.1.805 2.1.806 2.1.807 2.1.808 2.1.809 2.1.810 2.1.811 3.0.100 3.0.101 3.0.102 3.0.103 3.1.100 3.1.101 3.1.200 3.1.201 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403
-- Go 1.15.2
+- Go 1.15.3
- PHP 7.4.11
- julia 1.5.2
@@ -35,14 +36,14 @@
- Pip 20.2.3 (python 3.8)
- Bundler version 2.1.4
- Carthage 0.36.0
-- CocoaPods 1.9.3
-- Homebrew 2.5.6
+- CocoaPods 1.10.0
+- Homebrew 2.5.7
- NPM 6.14.8
- Yarn 1.22.5
- NuGet 5.6.0.6489
- Miniconda 4.8.3
- RubyGems 3.1.4
-- Composer 1.10.15
+- Composer 2.0.2
### Project Management
- Apache Maven 3.6.3
@@ -51,7 +52,7 @@
### Utilities
- Curl 7.73.0
-- Git: 2.28.0
+- Git: 2.29.1
- Git LFS: 2.12.0
- GitHub CLI: 1.1.0
- Hub CLI: 2.14.2
@@ -64,28 +65,28 @@
- psql (PostgreSQL) 13.0
- PostgreSQL 13.0
- aria2 1.35.0
-- azcopy 10.6.0
+- azcopy 10.6.1
- zstd 1.4.5
-- bazel 3.6.0
-- bazelisk 1.7.2
+- bazel 3.7.0
+- bazelisk 1.7.4
- helm v3.3.4+ga61ce56
- mongo v4.4.1
- mongod v4.4.1
- 7-Zip 16.02
- Newman 5.2.0
-- virtualbox 6.1.14r140239
+- virtualbox 6.1.16r140961
- Vagrant 2.2.10
-- GNU parallel 20200722
+- GNU parallel 20201022
### Tools
-- Fastlane 2.163.0
+- Fastlane 2.165.0
- Cmake 3.18.4
- App Center CLI 2.7.2
- Azure CLI 2.13.0
-- AWS CLI 2.0.57
+- AWS CLI 2.0.59
- AWS SAM CLI 1.6.2
-- AWS Session Manager CLI 1.1.61.0
+- AWS Session Manager CLI 1.2.7.0
- Aliyun CLI 3.0.60
- GHCup v0.1.11
- GHC 8.10.2
@@ -99,19 +100,19 @@
### Browsers
- Safari 14.0 (15610.1.28.1.9)
- SafariDriver 14.0 (15610.1.28.1.9)
-- Google Chrome 86.0.4240.80
+- Google Chrome 86.0.4240.111
- ChromeDriver 86.0.4240.22
-- Microsoft Edge 85.0.564.70
-- MSEdgeDriver 85.0.564.70
-- Mozilla Firefox 81.0.2
+- Microsoft Edge 86.0.622.51
+- MSEdgeDriver 86.0.622.51
+- Mozilla Firefox 82.0
- geckodriver 0.27.0
### Java
| Version | Vendor | Environment Variable |
| --------- | ------------ | -------------------- |
| 1.7.0_272 | Zulu | JAVA_HOME_7_X64 |
-| 1.8.0_265 | AdoptOpenJDK | JAVA_HOME_8_X64 |
-| 11.0.8 | AdoptOpenJDK | JAVA_HOME_11_X64 |
+| 1.8.0_272 | AdoptOpenJDK | JAVA_HOME_8_X64 |
+| 11.0.9 | AdoptOpenJDK | JAVA_HOME_11_X64 |
| 12.0.2 | AdoptOpenJDK | JAVA_HOME_12_X64 |
| 13.0.2 | AdoptOpenJDK | JAVA_HOME_13_X64 |
| 14.0.2 | AdoptOpenJDK | JAVA_HOME_14_X64 |
@@ -120,7 +121,7 @@
- 2.4.10
- 2.5.8
- 2.6.6
-- 2.7.1
+- 2.7.2
#### Python
- 2.7.18
@@ -212,21 +213,21 @@
- NUnit 3.6.1
### Xcode
-| Version | Build | Path |
-| -------------- | -------- | ------------------------------ |
-| 12.2 (beta) | 12B5035g | /Applications/Xcode_12.2.app |
-| 12.1 | 12A7403 | /Applications/Xcode_12.1.app |
-| 12.0.1 | 12A7300 | /Applications/Xcode_12.app |
-| 11.7 (default) | 11E801a | /Applications/Xcode_11.7.app |
-| 11.6 | 11E708 | /Applications/Xcode_11.6.app |
-| 11.5 | 11E608c | /Applications/Xcode_11.5.app |
-| 11.4.1 | 11E503a | /Applications/Xcode_11.4.1.app |
-| 11.4 | 11E146 | /Applications/Xcode_11.4.app |
-| 11.3.1 | 11C505 | /Applications/Xcode_11.3.1.app |
-| 11.2.1 | 11B500 | /Applications/Xcode_11.2.1.app |
-| 11.1 | 11A1027 | /Applications/Xcode_11.1.app |
-| 11.0 | 11A420a | /Applications/Xcode_11.app |
-| 10.3 | 10G8 | /Applications/Xcode_10.3.app |
+| Version | Build | Path |
+| ---------------- | -------- | ------------------------------ |
+| 12.2 (beta) | 12B5035g | /Applications/Xcode_12.2.app |
+| 12.1 | 12A7403 | /Applications/Xcode_12.1.app |
+| 12.0.1 (default) | 12A7300 | /Applications/Xcode_12.app |
+| 11.7 | 11E801a | /Applications/Xcode_11.7.app |
+| 11.6 | 11E708 | /Applications/Xcode_11.6.app |
+| 11.5 | 11E608c | /Applications/Xcode_11.5.app |
+| 11.4.1 | 11E503a | /Applications/Xcode_11.4.1.app |
+| 11.4 | 11E146 | /Applications/Xcode_11.4.app |
+| 11.3.1 | 11C505 | /Applications/Xcode_11.3.1.app |
+| 11.2.1 | 11B500 | /Applications/Xcode_11.2.1.app |
+| 11.1 | 11A1027 | /Applications/Xcode_11.1.app |
+| 11.0 | 11A420a | /Applications/Xcode_11.app |
+| 10.3 | 10G8 | /Applications/Xcode_10.3.app |
#### Xcode Support Tools
- xcpretty 0.3.0
diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh
index 2cbcc2d36..e3c4de7fc 100644
--- a/images/macos/provision/configuration/finalize-vm.sh
+++ b/images/macos/provision/configuration/finalize-vm.sh
@@ -30,4 +30,10 @@ npm cache clean --force
yarn cache clean
# Clean up temporary directories
-rm -rf ~/utils ~/image-generation
\ No newline at end of file
+rm -rf ~/utils ~/image-generation
+
+# Erase all indexes and wait until the rebuilding process ends,
+# for now there is no way to get status of indexing process, it takes around 3 minutes to accomplish
+sudo mdutil -E /
+sudo log stream | grep -q -E 'mds.*Released.*BackgroundTask' || true
+echo "Indexing completed"
\ No newline at end of file
diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh
index c2b22bafa..afca628e8 100644
--- a/images/macos/provision/core/openjdk.sh
+++ b/images/macos/provision/core/openjdk.sh
@@ -35,7 +35,7 @@ JAVA_DEFAULT=$(get_toolset_value '.java.default')
for JAVA_VERSION in "${JAVA_VERSIONS_LIST[@]}"
do
if [[ $JAVA_VERSION == "7" ]]; then
- installAzulJDK "https://cdn.azul.com/zulu/bin/zulu7.40.0.15-ca-jdk7.0.272-macosx_x64.dmg"
+ installAzulJDK "https://cdn.azul.com/zulu/bin/zulu7.42.0.13-ca-jdk7.0.282-macosx_x64.dmg"
else
brew cask install "adoptopenjdk${JAVA_VERSION}"
fi
diff --git a/images/macos/provision/core/pipx-packages.sh b/images/macos/provision/core/pipx-packages.sh
index bb6c50589..8e1da3f38 100644
--- a/images/macos/provision/core/pipx-packages.sh
+++ b/images/macos/provision/core/pipx-packages.sh
@@ -1,5 +1,4 @@
#!/bin/bash -e -o pipefail
-
source ~/utils/utils.sh
export PATH="$PATH:/opt/pipx_bin"
diff --git a/images/macos/provision/core/python.sh b/images/macos/provision/core/python.sh
index 629220535..da0493199 100755
--- a/images/macos/provision/core/python.sh
+++ b/images/macos/provision/core/python.sh
@@ -10,7 +10,7 @@ brew install python@3.8
brew install python@3.9
brew unlink python@3.9
brew unlink python@3.8
-brew link python@3.8
+brew link python@3.8 --force
echo "Brew Installing Python 2"
# Create local tap with formula due to python2 formula depreciation
diff --git a/images/macos/provision/utils/xcode-utils.sh b/images/macos/provision/utils/xcode-utils.sh
index cfe934398..4955ffcdc 100644
--- a/images/macos/provision/utils/xcode-utils.sh
+++ b/images/macos/provision/utils/xcode-utils.sh
@@ -9,6 +9,11 @@ createXamarinProvisionatorSymlink() {
FULL_VERSION="12.0.1"
fi
+ # temporary trick for 12.1.1
+ if [[ $XCODE_VERSION == "12.1" ]]; then
+ FULL_VERSION="12.1.1"
+ fi
+
if [ $FULL_VERSION != $XCODE_VERSION ]; then
ln -sf "/Applications/Xcode_${XCODE_VERSION}.app" "/Applications/Xcode_${FULL_VERSION}.app"
fi
@@ -19,6 +24,8 @@ getXcodeVersionToInstall() {
if [[ $XCODE_VERSION == "12" ]]; then
echo "12.0.1"
+ elif [[ $XCODE_VERSION == "12.1" ]]; then
+ echo "12.1.1 Release Candidate"
elif [[ ! $XCODE_VERSION =~ "_beta" ]]; then
echo "${XCODE_VERSION//_/ }"
else
diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json
index e041c15e2..229ccc794 100644
--- a/images/macos/toolsets/toolset-10.15.json
+++ b/images/macos/toolsets/toolset-10.15.json
@@ -2,7 +2,7 @@
"xcode": {
"default": "12",
"versions": [
- "12.2_beta", "12.1_GM_seed", "12", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3"
+ "12.2_beta", "12.1", "12", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3"
]
},
"xamarin": {
@@ -11,7 +11,7 @@
"6.12.0.93", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208"
],
"ios-versions": [
- "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47"
+ "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47"
],
"mac-versions": [
"6.20.2.2", "6.18.3.2", "6.16.0.13", "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47"
@@ -19,8 +19,15 @@
"android-versions": [
"11.0.2.0", "10.3.1.4", "10.2.0.100", "10.1.3.7", "10.0.6.2"
],
- "bundle-default": "latest",
+ "bundle-default": "6_12_1",
"bundles": [
+ {
+ "symlink": "6_12_2",
+ "mono":"6.12",
+ "ios": "14.2",
+ "mac": "6.20",
+ "android": "11.0"
+ },
{
"symlink": "6_12_1",
"mono":"6.12",
diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json
index cb14b3a0e..c05de28cb 100644
--- a/images/macos/toolsets/toolset-11.0.json
+++ b/images/macos/toolsets/toolset-11.0.json
@@ -11,7 +11,7 @@
"6.12.0.93"
],
"ios-versions": [
- "14.0.0.0", "13.20.2.2"
+ "14.2.0.12", "14.0.0.0", "13.20.2.2"
],
"mac-versions": [
"6.20.2.2"
@@ -21,6 +21,13 @@
],
"bundle-default": "6_12_0",
"bundles": [
+ {
+ "symlink": "6_12_2",
+ "mono":"6.12",
+ "ios": "14.2",
+ "mac": "6.20",
+ "android": "11.0"
+ },
{
"symlink": "6_12_1",
"mono":"6.12",
diff --git a/images/win/scripts/Installers/Configure-Shell.ps1 b/images/win/scripts/Installers/Configure-Shell.ps1
index 8eb163bcf..61b30bf3b 100644
--- a/images/win/scripts/Installers/Configure-Shell.ps1
+++ b/images/win/scripts/Installers/Configure-Shell.ps1
@@ -3,8 +3,8 @@ $shellPath = "C:\shells"
New-Item -Path $shellPath -ItemType Directory | Out-Null
# sh and bash <--> C:\msys64\usr\bin\bash.exe
-New-Item -ItemType SymbolicLink -Path "$shellPath\bash.exe" -Target "C:\msys64\usr\bin\bash.exe" | Out-Null
-New-Item -ItemType SymbolicLink -Path "$shellPath\sh.exe" -Target "C:\msys64\usr\bin\sh.exe" | Out-Null
+New-Item -ItemType SymbolicLink -Path "$shellPath\bash.exe" -Target "C:\msys64\bin\bash.exe" | Out-Null
+New-Item -ItemType SymbolicLink -Path "$shellPath\sh.exe" -Target "C:\msys64\bin\sh.exe" | Out-Null
# WSL is available on Windows Server 2019
if (Test-IsWin19)
diff --git a/images/win/scripts/Installers/Install-Msys2.ps1 b/images/win/scripts/Installers/Install-Msys2.ps1
index dea3b95d0..26a61e39d 100644
--- a/images/win/scripts/Installers/Install-Msys2.ps1
+++ b/images/win/scripts/Installers/Install-Msys2.ps1
@@ -95,4 +95,10 @@ if (Test-Path "C:\Program Files\Git\etc\ssh")
ssh-keyscan -t rsa ssh.dev.azure.com >> "C:\Program Files\Git\etc\ssh\ssh_known_hosts"
}
+# Copy bash wrapper from git
+$wrapperPath = "C:\msys64\bin"
+New-Item -Path $wrapperPath -ItemType Directory -Force | Out-Null
+Copy-Item -Path "$env:ProgramFiles\Git\bin\bash.exe" -Destination $wrapperPath
+Copy-Item -Path "$env:ProgramFiles\Git\bin\sh.exe" -Destination $wrapperPath
+
Invoke-PesterTests -TestFile "MSYS2"
diff --git a/images/win/scripts/Tests/Shell.Tests.ps1 b/images/win/scripts/Tests/Shell.Tests.ps1
index 915940e2a..084f40cad 100644
--- a/images/win/scripts/Tests/Shell.Tests.ps1
+++ b/images/win/scripts/Tests/Shell.Tests.ps1
@@ -1,7 +1,7 @@
Describe "Shell" {
$shellTestCases = @(
- @{Name = "C:\shells\bash.exe"; Target = "C:\msys64\usr\bin\bash.exe"},
- @{Name = "C:\shells\sh.exe"; Target = "C:\msys64\usr\bin\sh.exe"},
+ @{Name = "C:\shells\bash.exe"; Target = "C:\msys64\bin\bash.exe"},
+ @{Name = "C:\shells\sh.exe"; Target = "C:\msys64\bin\sh.exe"},
@{Name = "C:\shells\gitbash.exe"; Target = "$env:ProgramFiles\Git\bin\bash.exe"},
@{Name = "C:\shells\msysbash.exe"; Target = "C:\msys64\usr\bin\bash.exe"}
)