diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml
index 37b17b8a0..f38d2fdcb 100644
--- a/images.CI/macos/azure-pipelines/image-generation.yml
+++ b/images.CI/macos/azure-pipelines/image-generation.yml
@@ -11,6 +11,10 @@ jobs:
value: $(Build.BuildNumber).$(System.JobAttempt)
steps:
+ - bash: |
+ echo "##vso[build.updatebuildnumber]${{ variables.VirtualMachineName }}"
+ displayName: Update BuildNumber
+
- checkout: self
clean: true
fetchDepth: 1
diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md
index 5e3c8ef26..e5cbce80f 100644
--- a/images/linux/Ubuntu1604-README.md
+++ b/images/linux/Ubuntu1604-README.md
@@ -1,10 +1,10 @@
| Announcements |
|-|
-| [Default Python will be switched to 3.8 on Ubuntu 20.04 on October, 6](https://github.com/actions/virtual-environments/issues/1591) |
+| [Obsolete Android build-tools packages will be removed from Ubuntu images on October, 20](https://github.com/actions/virtual-environments/issues/1743) |
| [Clang/LLVM 10 will be set as a default one and Clang/LLVM 6 will be deprecated for Ubuntu 20.04 on September, 23](https://github.com/actions/virtual-environments/issues/1536) |
***
# Ubuntu 16.04.7 LTS
-- Image Version: 20201004.1
+- Image Version: 20201012.1
## Installed Software
### Language and Runtime
@@ -13,7 +13,7 @@
- Clang 6.0.0, 8.0.0, 9.0.1
- Erlang 11.1
- Mono 6.12.0.90
-- Node 12.18.4
+- Node 12.19.0
- Python 2.7.12
- Python3 3.5.2
- PowerShell 7.0.3
@@ -22,29 +22,29 @@
- Julia 1.5.2
### Package Management
-- Homebrew 2.5.2
- Gem 3.1.4
+- Helm 3.3.4
+- Homebrew 2.5.5
- Miniconda 4.8.3
-- Helm
- Npm 6.14.8
-- Yarn
- Pip 8.1.1
- Pip3 8.1.1
- Vcpkg 2020.06.15
+- Yarn 1.22.5
### Project Management
- Ant 1.9.6
- Gradle 6.6.1
- Maven 3.6.3
-- Sbt 1.3.13
+- Sbt 1.4.0
### Tools
- 7-Zip 9.20
-- Ansible 2.9.13
+- Ansible 2.9.14
- AzCopy10 10.6.0 (available by `azcopy10` alias)
- AzCopy7 7.3.0 (available by `azcopy` alias)
-- Bazel 3.5.1
-- Bazelisk 1.6.1
+- Bazel 3.6.0
+- Bazelisk 1.7.1
- CMake 3.17.0
- CodeQL Action Bundle 2.2.5
- curl 7.47.0
@@ -54,46 +54,47 @@
- Git 2.28.0
- Git LFS 2.12.0
- Git-ftp 1.0.2
-- Google Cloud SDK 312.0.0
+- Google Cloud SDK 313.0.1
- Haveged 1.9.1
-- Heroku 7.44.0
+- Heroku 7.45.0
- HHVM (HipHop VM) 4.56.1
- jq 1.5
- Kind 0.9.0
- Kubectl 1.19.2
-- Kustomize 3.8.4
+- Kustomize 3.8.5
- Leiningen 2.9.4
- m4 1.4.17
- Mercurial 4.4.1
- Minikube 1.13.1
- Newman 5.2.0
-- nvm 0.35.3
+- nvm 0.36.0
- Packer 1.6.4
- PhantomJS 2.1.1
- Pulumi 2.11.2
-- R 4.0.2
+- R 4.0.3
- Sphinx Open Source Search Server 2.2.9
- SVN 1.9.3
- Swig 3.0.8
- Terraform 0.13.4
- unzip 6.00
- wget 1.17.1
+- yamllint 1.2.1
- zip 3.0
- zstd 1.3.1
### CLI Tools
-- Alibaba Cloud CLI 3.0.59
-- AWS CLI 1.18.152
+- Alibaba Cloud CLI 3.0.60
+- AWS CLI 1.18.157
- AWS CLI Session manager plugin 1.1.61.0
-- AWS SAM CLI 1.4.0
+- AWS SAM CLI 1.6.2
- Azure CLI (azure-cli) 2.12.1
- Azure CLI (azure-devops) 0.18.0
-- GitHub CLI
+- GitHub CLI 1.1.0
- Hub CLI 2.14.2
-- Netlify CLI 2.64.1
+- Netlify CLI 2.65.5
- oc CLI 4.5.0
- ORAS CLI 0.8.1
-- Vercel CLI 20.1.1
+- Vercel CLI 20.1.2
### Java
| Version | Vendor | Environment Variable |
@@ -106,7 +107,7 @@
### PHP
| Tool | Version |
| -------- | ----------------------------------------- |
-| PHP | 5.6.40 7.0.33 7.1.33 7.2.33 7.3.22 7.4.10 |
+| PHP | 5.6.40 7.0.33 7.1.33 7.2.34 7.3.23 7.4.11 |
| Composer | 1.10.13 |
| PHPUnit | 7.5.20 |
@@ -116,22 +117,22 @@
- Stack 2.3.3
### Rust Tools
-- Rust 1.46.0
+- Rust 1.47.0
- Rustup 1.22.1
-- Rustdoc 1.46.0
-- Cargo 1.46.0
+- Rustdoc 1.47.0
+- Cargo 1.47.0
#### Packages
- Bindgen 0.55.1
- Cargo audit 0.12.1
- Cargo outdated 0.9.11
- Cargo clippy 0.0.212
-- Cbindgen 0.14.6
-- Rustfmt 1.4.18
+- Cbindgen 0.15.0
+- Rustfmt 1.4.20
### Browsers and Drivers
-- Google Chrome 85.0.4183.121
-- ChromeDriver 85.0.4183.87
+- Google Chrome 86.0.4240.75
+- ChromeDriver 86.0.4240.22
- Mozilla Firefox 81.0
- Geckodriver 0.27.0
@@ -167,6 +168,7 @@
- 3.6.12
- 3.7.9
- 3.8.6
+- 3.9.0
#### PyPy
- 2.7.13 [PyPy 7.3.2]
@@ -175,8 +177,8 @@
#### Node.js
- 8.17.0
- 10.22.1
-- 12.18.4
-- 14.13.0
+- 12.19.0
+- 14.13.1
#### Go
- 1.11.13
@@ -190,19 +192,19 @@
- 1.72.0
### Android
-| Package Name | Version |
-| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Android SDK Platform-Tools | 30.0.4 |
-| 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-19 (rev 4)
android-17 (rev 3)
android-15 (rev 5)
android-10 (rev 2) |
-| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2
29.0.0 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
17.0.0 |
-| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 |
-| NDK | 21.3.6528147 |
-| Android Support Repository | 47.0.0 |
-| Google Play services | 49 |
-| Google Repository | 58 |
-| SDK Patch Applier v4 | 1 |
-| CMake | 3.10.2
3.6.4111459 |
+| Package Name | Version |
+| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Android SDK Platform-Tools | 30.0.4 |
+| 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-14 (rev 4)
android-13 (rev 1)
android-12 (rev 3)
android-11 (rev 2)
android-10 (rev 2) |
+| 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 |
+| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 |
+| NDK | 21.3.6528147 |
+| Android Support Repository | 47.0.0 |
+| Google Play services | 49 |
+| Google Repository | 58 |
+| SDK Patch Applier v4 | 1 |
+| CMake | 3.10.2
3.6.4111459 |
### Cached Docker images
- alpine:3.7
diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md
index da48be720..86137c039 100644
--- a/images/linux/Ubuntu1804-README.md
+++ b/images/linux/Ubuntu1804-README.md
@@ -1,10 +1,10 @@
| Announcements |
|-|
-| [Default Python will be switched to 3.8 on Ubuntu 20.04 on October, 6](https://github.com/actions/virtual-environments/issues/1591) |
+| [Obsolete Android build-tools packages will be removed from Ubuntu images on October, 20](https://github.com/actions/virtual-environments/issues/1743) |
| [Clang/LLVM 10 will be set as a default one and Clang/LLVM 6 will be deprecated for Ubuntu 20.04 on September, 23](https://github.com/actions/virtual-environments/issues/1536) |
***
# Ubuntu 18.04.5 LTS
-- Image Version: 20201004.1
+- Image Version: 20201012.1
## Installed Software
### Language and Runtime
@@ -13,7 +13,7 @@
- Clang 6.0.0, 8.0.0, 9.0.0
- Erlang 11.1
- Mono 6.12.0.90
-- Node 12.18.4
+- Node 12.19.0
- Python 2.7.17
- Python3 3.6.9
- PowerShell 7.0.3
@@ -22,30 +22,31 @@
- Julia 1.5.2
### Package Management
-- Homebrew 2.5.2
- Gem 3.1.4
+- Helm 3.3.4
+- Homebrew 2.5.5
- Miniconda 4.8.3
-- Helm
- Npm 6.14.8
-- Yarn
- Pip 9.0.1
- Pip3 9.0.1
+- Pipx 0.15.5.1
- Vcpkg 2020.06.15
+- Yarn 1.22.5
### Project Management
- Ant 1.10.5
- Gradle 6.6.1
- Maven 3.6.3
-- Sbt 1.3.13
+- Sbt 1.4.0
### Tools
- 7-Zip 16.02
-- Ansible 2.9.13
+- Ansible 2.9.14
- AzCopy10 10.6.0 (available by `azcopy10` alias)
- AzCopy7 7.3.0 (available by `azcopy` alias)
-- Bazel 3.5.1
-- Bazelisk 1.6.1
-- Buildah
+- Bazel 3.6.0
+- Bazelisk 1.7.1
+- Buildah 1.16.4
- CMake 3.17.0
- CodeQL Action Bundle 2.2.5
- curl 7.58.0
@@ -55,25 +56,25 @@
- Git 2.28.0
- Git LFS 2.12.0
- Git-ftp 1.3.1
-- Google Cloud SDK 312.0.0
+- Google Cloud SDK 313.0.1
- Haveged 1.9.1
-- Heroku 7.44.0
-- HHVM (HipHop VM) 4.77.0
+- Heroku 7.45.0
+- HHVM (HipHop VM) 4.78.0
- jq 1.5
- Kind 0.9.0
- Kubectl 1.19.2
-- Kustomize 3.8.4
+- Kustomize 3.8.5
- Leiningen 2.9.4
- m4 1.4.18
- Mercurial 4.5.3
- Minikube 1.13.1
- Newman 5.2.0
-- nvm 0.35.3
+- nvm 0.36.0
- Packer 1.6.4
- PhantomJS 2.1.1
-- Podman
+- Podman 2.1.1
- Pulumi 2.11.2
-- R 4.0.2
+- R 4.0.3
- Skopeo 1.2.0
- Sphinx Open Source Search Server 2.2.11
- SVN 1.9.7
@@ -81,22 +82,23 @@
- Terraform 0.13.4
- unzip 6.00
- wget 1.19.4
+- yamllint 1.25.0
- zip 3.0
- zstd 1.3.3
### CLI Tools
-- Alibaba Cloud CLI 3.0.59
-- AWS CLI 1.18.152
+- Alibaba Cloud CLI 3.0.60
+- AWS CLI 1.18.157
- AWS CLI Session manager plugin 1.1.61.0
-- AWS SAM CLI 1.4.0
+- AWS SAM CLI 1.6.2
- Azure CLI (azure-cli) 2.12.1
- Azure CLI (azure-devops) 0.18.0
-- GitHub CLI
+- GitHub CLI 1.1.0
- Hub CLI 2.14.2
-- Netlify CLI 2.64.1
+- Netlify CLI 2.65.5
- oc CLI 4.5.0
- ORAS CLI 0.8.1
-- Vercel CLI 20.1.1
+- Vercel CLI 20.1.2
### Java
| Version | Vendor | Environment Variable |
@@ -109,7 +111,7 @@
### PHP
| Tool | Version |
| -------- | --------------------------- |
-| PHP | 7.1.33 7.2.33 7.3.22 7.4.10 |
+| PHP | 7.1.33 7.2.34 7.3.23 7.4.11 |
| Composer | 1.10.13 |
| PHPUnit | 7.5.20 |
@@ -119,22 +121,22 @@
- Stack 2.3.3
### Rust Tools
-- Rust 1.46.0
+- Rust 1.47.0
- Rustup 1.22.1
-- Rustdoc 1.46.0
-- Cargo 1.46.0
+- Rustdoc 1.47.0
+- Cargo 1.47.0
#### Packages
- Bindgen 0.55.1
- Cargo audit 0.12.1
- Cargo outdated 0.9.11
- Cargo clippy 0.0.212
-- Cbindgen 0.14.6
-- Rustfmt 1.4.18
+- Cbindgen 0.15.0
+- Rustfmt 1.4.20
### Browsers and Drivers
-- Google Chrome 85.0.4183.121
-- ChromeDriver 85.0.4183.87
+- Google Chrome 86.0.4240.75
+- ChromeDriver 86.0.4240.22
- Mozilla Firefox 81.0
- Geckodriver 0.27.0
@@ -170,6 +172,7 @@
- 3.6.12
- 3.7.9
- 3.8.6
+- 3.9.0
#### PyPy
- 2.7.13 [PyPy 7.3.2]
@@ -178,8 +181,8 @@
#### Node.js
- 8.17.0
- 10.22.1
-- 12.18.4
-- 14.13.0
+- 12.19.0
+- 14.13.1
#### Go
- 1.11.13
@@ -193,19 +196,19 @@
- 1.72.0
### Android
-| Package Name | Version |
-| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Android SDK Platform-Tools | 30.0.4 |
-| 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-19 (rev 4)
android-17 (rev 3) |
-| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2
29.0.0 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
17.0.0 |
-| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 |
-| NDK | 21.3.6528147 |
-| Android Support Repository | 47.0.0 |
-| Google Play services | 49 |
-| Google Repository | 58 |
-| SDK Patch Applier v4 | 1 |
-| CMake | 3.10.2
3.6.4111459 |
+| Package Name | Version |
+| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Android SDK Platform-Tools | 30.0.4 |
+| 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 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 |
+| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 |
+| NDK | 21.3.6528147 |
+| Android Support Repository | 47.0.0 |
+| Google Play services | 49 |
+| Google Repository | 58 |
+| SDK Patch Applier v4 | 1 |
+| CMake | 3.10.2
3.6.4111459 |
### Cached Docker images
- alpine:3.7
@@ -225,6 +228,6 @@
- ubuntu:14.04
### Installed apt packages
-- bison, brotli, bzip2, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl3, libgbm-dev, libgconf-2-4, libgtk-3-0, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, netcat, openssh-client, parallel, patchelf, pkg-config, rpm, rsync, shellcheck, sqlite3, ssh, sudo, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, yamllint, zip, zstd, zsync
+- bison, brotli, bzip2, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl3, libgbm-dev, libgconf-2-4, libgtk-3-0, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, netcat, openssh-client, parallel, patchelf, pkg-config, rpm, rsync, shellcheck, sqlite3, ssh, sudo, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, zip, zstd, zsync
diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md
index 4a59e7ca9..02045aceb 100644
--- a/images/linux/Ubuntu2004-README.md
+++ b/images/linux/Ubuntu2004-README.md
@@ -1,50 +1,51 @@
| Announcements |
|-|
-| [Default Python will be switched to 3.8 on Ubuntu 20.04 on October, 6](https://github.com/actions/virtual-environments/issues/1591) |
+| [Obsolete Android build-tools packages will be removed from Ubuntu images on October, 20](https://github.com/actions/virtual-environments/issues/1743) |
| [Clang/LLVM 10 will be set as a default one and Clang/LLVM 6 will be deprecated for Ubuntu 20.04 on September, 23](https://github.com/actions/virtual-environments/issues/1536) |
***
# Ubuntu 20.04.1 LTS
-- Image Version: 20201004.1
+- Image Version: 20201012.1
## Installed Software
### Language and Runtime
-- GNU C++ 7.5.0, 8.4.0, 9.3.0, 10.0.1
+- GNU C++ 7.5.0, 8.4.0, 9.3.0, 10.2.0
- GNU Fortran 8.4.0, 9.3.0
- Clang 8.0.1, 9.0.1, 10.0.0
- Erlang 11.1
- Mono 6.12.0.90
-- Node 12.18.4
-- Python 3.8.2
-- Python3 3.8.2
+- Node 12.19.0
+- Python 3.8.5
+- Python3 3.8.5
- PowerShell 7.0.3
- Ruby 2.7.0p0
- Swift 5.3
- Julia 1.5.2
### Package Management
-- Homebrew 2.5.2
- Gem 3.1.2
-- Miniconda 4.8.3
- Helm 3.3.4
+- Homebrew 2.5.5
+- Miniconda 4.8.3
- Npm 6.14.8
-- Yarn 1.22.5
- Pip 20.0.2
- Pip3 20.0.2
+- Pipx 0.15.5.1
- Vcpkg 2020.06.15
+- Yarn 1.22.5
### Project Management
- Ant 1.10.7
- Gradle 6.6.1
- Maven 3.6.3
-- Sbt 1.3.13
+- Sbt 1.4.0
### Tools
- 7-Zip 16.02
- Ansible 2.9.6
- AzCopy10 10.6.0 (available by `azcopy10` alias)
- AzCopy7 7.3.0 (available by `azcopy` alias)
-- Bazel 3.5.1
-- Bazelisk 1.6.1
+- Bazel 3.6.0
+- Bazelisk 1.7.1
- Buildah 1.16.4
- CMake 3.17.0
- CodeQL Action Bundle 2.2.5
@@ -55,25 +56,25 @@
- Git 2.28.0
- Git LFS 2.12.0
- Git-ftp 1.6.0
-- Google Cloud SDK 312.0.0
+- Google Cloud SDK 313.0.1
- Haveged 1.9.1
-- Heroku 7.44.0
-- HHVM (HipHop VM) 4.77.0
+- Heroku 7.45.0
+- HHVM (HipHop VM) 4.78.0
- jq 1.6
- Kind 0.9.0
- Kubectl 1.19.2
-- Kustomize 3.8.4
+- Kustomize 3.8.5
- Leiningen 2.9.4
- m4 1.4.18
- Mercurial 5.3.1
- Minikube 1.13.1
- Newman 5.2.0
-- nvm 0.35.3
+- nvm 0.36.0
- Packer 1.6.4
- PhantomJS 2.1.1
- Podman 2.1.1
- Pulumi 2.11.2
-- R 4.0.2
+- R 4.0.3
- Skopeo 1.2.0
- Sphinx Open Source Search Server 2.2.11
- SVN 1.13.0
@@ -81,22 +82,23 @@
- Terraform 0.13.4
- unzip 6.00
- wget 1.20.3
+- yamllint 1.25.0
- zip 3.0
- zstd 1.4.4
### CLI Tools
-- Alibaba Cloud CLI 3.0.59
-- AWS CLI 2.0.54
+- Alibaba Cloud CLI 3.0.60
+- AWS CLI 2.0.56
- AWS CLI Session manager plugin 1.1.61.0
-- AWS SAM CLI 1.4.0
+- AWS SAM CLI 1.6.2
- Azure CLI (azure-cli) 2.12.1
- Azure CLI (azure-devops) 0.18.0
-- GitHub CLI 1.0.0
+- GitHub CLI 1.1.0
- Hub CLI 2.14.2
-- Netlify CLI 2.64.1
+- Netlify CLI 2.65.5
- oc CLI 4.5.0
- ORAS CLI 0.8.1
-- Vercel CLI 20.1.1
+- Vercel CLI 20.1.2
### Java
| Version | Vendor | Environment Variable |
@@ -107,7 +109,7 @@
### PHP
| Tool | Version |
| -------- | ------- |
-| PHP | 7.4.10 |
+| PHP | 7.4.11 |
| Composer | 1.10.13 |
| PHPUnit | 7.5.20 |
@@ -117,22 +119,22 @@
- Stack 2.3.3
### Rust Tools
-- Rust 1.46.0
+- Rust 1.47.0
- Rustup 1.22.1
-- Rustdoc 1.46.0
-- Cargo 1.46.0
+- Rustdoc 1.47.0
+- Cargo 1.47.0
#### Packages
- Bindgen 0.55.1
- Cargo audit 0.12.1
- Cargo outdated 0.9.11
- Cargo clippy 0.0.212
-- Cbindgen 0.14.6
-- Rustfmt 1.4.18
+- Cbindgen 0.15.0
+- Rustfmt 1.4.20
### Browsers and Drivers
-- Google Chrome 85.0.4183.121
-- ChromeDriver 85.0.4183.87
+- Google Chrome 86.0.4240.75
+- ChromeDriver 86.0.4240.22
- Mozilla Firefox 81.0
- Geckodriver 0.27.0
@@ -167,6 +169,7 @@
- 3.6.12
- 3.7.9
- 3.8.6
+- 3.9.0
#### PyPy
- 2.7.13 [PyPy 7.3.2]
@@ -175,26 +178,26 @@
#### Node.js
- 8.17.0
- 10.22.1
-- 12.18.4
-- 14.13.0
+- 12.19.0
+- 14.13.1
#### Go
- 1.14.9
- 1.15.2
### Android
-| Package Name | Version |
-| -------------------------- | ---------------------------------------------------------------------------------------------------------- |
-| Android SDK Platform-Tools | 30.0.4 |
-| 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 SDK Build-tools | 30.0.0 30.0.1 30.0.2
29.0.0 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 |
-| NDK | 21.3.6528147 |
-| Android Support Repository | 47.0.0 |
-| Google Play services | 49 |
-| Google Repository | 58 |
-| SDK Patch Applier v4 | 1 |
-| CMake | 3.10.2 |
+| Package Name | Version |
+| -------------------------- | ----------------------------------------------------------------------------------------------------------------- |
+| Android SDK Platform-Tools | 30.0.4 |
+| 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 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 |
+| NDK | 21.3.6528147 |
+| Android Support Repository | 47.0.0 |
+| Google Play services | 49 |
+| Google Repository | 58 |
+| SDK Patch Applier v4 | 1 |
+| CMake | 3.10.2 |
### Cached Docker images
- alpine:3.7
@@ -214,6 +217,6 @@
- ubuntu:14.04
### Installed apt packages
-- bison, brotli, bzip2, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl4, libgbm-dev, libgconf-2-4, libgtk-3-0, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, netcat, openssh-client, parallel, patchelf, pkg-config, python-is-python3, rpm, rsync, shellcheck, sqlite3, ssh, sudo, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, yamllint, zip, zstd, zsync
+- bison, brotli, bzip2, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl4, libgbm-dev, libgconf-2-4, libgtk-3-0, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, netcat, openssh-client, parallel, patchelf, pkg-config, python-is-python3, rpm, rsync, shellcheck, sqlite3, ssh, sudo, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, zip, zstd, zsync
diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1
index 14d4a18e6..1989caf4b 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1
@@ -144,17 +144,17 @@ function Get-AntVersion {
}
function Get-GradleVersion {
- $result = gradle -v | Out-String
- $result -match "Gradle (?\d+\.\d+\.\d+)" | Out-Null
- $gradleVersion = $Matches.version
+ $gradleVersion = (gradle -v) -match "^Gradle \d" | Take-OutputPart -Part 1
return "Gradle $gradleVersion"
}
+
function Get-MavenVersion {
$result = mvn -version | Out-String
$result -match "Apache Maven (?\d+\.\d+\.\d+)" | Out-Null
$mavenVersion = $Matches.version
return "Maven $mavenVersion"
}
+
function Get-SbtVersion {
$result = Get-CommandResult "sbt -version"
$result.Output -match "sbt script version: (?\d+\.\d+\.\d+)" | Out-Null
diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh
index 0f28d9c8e..2cfbdd8dd 100644
--- a/images/linux/scripts/installers/android.sh
+++ b/images/linux/scripts/installers/android.sh
@@ -67,7 +67,7 @@ additional=$(jq -r '.android.additional_tools[]' $toolset)
components=( "${extras[@]}" "${addons[@]}" "${additional[@]}" )
availablePlatforms=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android-" | cut -d"|" -f 1))
-allBuildTools=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list --include_obsolete | grep "build-tools;" | cut -d"|" -f 1 | sort -u))
+allBuildTools=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | grep "build-tools;" | cut -d"|" -f 1 | sort -u))
availableBuildTools=$(echo ${allBuildTools[@]//*rc[0-9]/})
filter_components_by_version $minimumPlatformVersion "${availablePlatforms[@]}"
diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json
index 4e93ee77b..1136ae921 100644
--- a/images/linux/toolsets/toolset-1604.json
+++ b/images/linux/toolsets/toolset-1604.json
@@ -64,7 +64,7 @@
],
"android": {
"platform_min_version": "10",
- "build_tools_min_version": "17.0.0",
+ "build_tools_min_version": "19.1.0",
"extra_list": [
"android;m2repository",
"google;m2repository",
diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json
index 52357c3cf..de611ebc0 100644
--- a/images/linux/toolsets/toolset-1804.json
+++ b/images/linux/toolsets/toolset-1804.json
@@ -64,7 +64,7 @@
],
"android": {
"platform_min_version": "17",
- "build_tools_min_version": "17.0.0",
+ "build_tools_min_version": "19.1.0",
"extra_list": [
"android;m2repository",
"google;m2repository",
diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json
index 9b4181ede..477f8c55a 100644
--- a/images/linux/ubuntu2004.json
+++ b/images/linux/ubuntu2004.json
@@ -97,7 +97,7 @@
{
"type": "file",
"source": "{{ template_dir }}/post-generation",
- "destination": "{{user `installer_script_folder`}}"
+ "destination": "{{user `image_folder`}}"
},
{
"type": "file",
diff --git a/images/macos/macos-11.0-Readme.md b/images/macos/macos-11.0-Readme.md
new file mode 100644
index 000000000..7363eefc8
--- /dev/null
+++ b/images/macos/macos-11.0-Readme.md
@@ -0,0 +1,217 @@
+| Announcements |
+|-|
+| [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 October, 20](https://github.com/actions/virtual-environments/issues/1688) |
+| [Remove Xcode 12 beta 6 from MacOS Catalina image in favor of Xcode 12.2 beta 1 on October 13](https://github.com/actions/virtual-environments/issues/1646) |
+***
+# macOS 11.0 info
+- System Version: macOS 11.0 (20A5384c)
+- Kernel Version: Darwin 20.1.0
+- Image Version: 20201002.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
+- Node.js v12.18.4
+- NVM 0.35.3
+- NVM - Cached node versions: v6.17.1 v8.17.0 v10.22.1 v12.18.4 v13.14.0 v14.13.0
+- Python 2.7.17
+- Python 3.8.5
+- 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 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
+- Go 1.15.2
+- PHP 7.4.11
+- julia 1.5.2
+
+### Package Management
+- Vcpkg 2020.06.15
+- Pip 20.1.1 (python 3.8)
+- Bundler version 2.1.4
+- Carthage 0.36.0
+- CocoaPods 1.9.3
+- Homebrew 2.5.2
+- NPM 6.14.6
+- Yarn 1.22.5
+- NuGet 5.6.0.6489
+- Miniconda 4.8.3
+- RubyGems 3.1.4
+- Composer 1.10.13
+
+### Project Management
+- Apache Maven 3.6.3
+- Gradle 6.6.1
+- Apache Ant(TM) 1.10.9
+
+### Utilities
+- Curl 7.72.0
+- Git: 2.28.0
+- Git LFS: 2.12.0
+- GitHub CLI: 1.0.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) 12.4
+- PostgreSQL 12.4
+- aria2 1.35.0
+- azcopy 10.6.0
+- zstd 1.4.5
+- bazel 3.5.1
+- bazelisk 1.6.1
+- helm v3.3.4+ga61ce56
+- mongo v4.4.0
+- mongod v4.4.0
+- 7-Zip 16.02
+- Newman 5.2.0
+
+### Tools
+- Fastlane 2.162.0
+- Cmake 3.18.3
+- App Center CLI 2.7.1
+- Azure CLI 2.12.1
+- AWS CLI 2.0.54
+- AWS SAM CLI 1.4.0
+- AWS Session Manager CLI 1.1.61.0
+- Aliyun CLI 3.0.59
+- GHCup v0.1.11
+- GHC 8.8.4
+- Cabal 3.2.0.0
+- Stack 2.3.3
+
+### Linters
+- yamllint 1.24.2
+- SwiftLint 0.40.3
+
+### Browsers
+- Safari 14.0.1 (16610.2.6.1.6)
+- SafariDriver 14.0.1 (16610.2.6.1.6)
+- Google Chrome 85.0.4183.121
+- ChromeDriver 85.0.4183.87
+- Microsoft Edge 85.0.564.68
+- MSEdgeDriver 85.0.564.63
+- Mozilla Firefox 81.0.1
+- geckodriver 0.27.0
+
+### Java
+| Version | Vendor | Environment Variable |
+| --------- | ------------ | -------------------- |
+| 1.8.0_265 | AdoptOpenJDK | JAVA_HOME_8_X64 |
+| 11.0.8 | AdoptOpenJDK | JAVA_HOME_11_X64 |
+### Cached Tools
+#### Ruby
+- 2.4.10
+- 2.5.8
+- 2.6.6
+- 2.7.1
+
+#### Python
+- 3.7.9
+- 3.8.6
+
+#### Node.js
+- 10.22.1
+- 12.18.4
+- 14.13.0
+
+#### Go
+- 1.15.2
+
+### Rust Tools
+- Rust 1.46.0
+- Rustup 1.22.1
+
+#### Packages
+- Bindgen 0.55.1
+- Cbindgen 0.14.6
+- Cargo-outdated v0.9.11
+- Cargo-audit 0.12.1
+
+### PowerShell Tools
+- PowerShell 7.0.3
+
+#### PowerShell Modules
+| Module | Version |
+| ---------- | ------- |
+| Az | 4.7.0 |
+| MarkdownPS | 1.9 |
+| Pester | 5.0.4 |
+
+### Xamarin
+#### Visual Studio for Mac
+- 8.7.8.4
+
+#### Mono
+- 6.12.0.93
+
+#### Xamarin.iOS
+- 14.0.0.0
+- 13.20.2.2
+
+#### Xamarin.Mac
+- 6.20.2.2
+
+#### Xamarin.Android
+- 11.0.2
+
+#### Unit Test Framework
+- NUnit 3.6.1
+
+### Xcode
+| Version | Build | Path |
+| -------------- | -------- | ---------------------------- |
+| 12.2 | 12B5025f | /Applications/Xcode_12.2.app |
+| 12.0 | 12A8189n | /Applications/Xcode_12.app |
+| 11.7 (default) | 11E801a | /Applications/Xcode_11.7.app |
+
+#### Xcode Support Tools
+- xcpretty 0.3.0
+- xcversion 2.6.6
+
+#### Installed SDKs
+| SDK | SDK Name | Xcode Version |
+| ----------------------- | -------------------- | ------------- |
+| macOS 10.15 | macosx10.15 | 11.7 |
+| macOS 11.0 | macosx11.0 | 12.0, 12.2 |
+| iOS 13.7 | iphoneos13.7 | 11.7 |
+| iOS 14.0 | iphoneos14.0 | 12.0 |
+| iOS 14.2 | iphoneos14.2 | 12.2 |
+| Simulator - iOS 13.7 | iphonesimulator13.7 | 11.7 |
+| Simulator - iOS 14.0 | iphonesimulator14.0 | 12.0 |
+| Simulator - iOS 14.2 | iphonesimulator14.2 | 12.2 |
+| tvOS 13.4 | appletvos13.4 | 11.7 |
+| tvOS 14.0 | appletvos14.0 | 12.0 |
+| tvOS 14.2 | appletvos14.2 | 12.2 |
+| Simulator - tvOS 13.4 | appletvsimulator13.4 | 11.7 |
+| Simulator - tvOS 14.0 | appletvsimulator14.0 | 12.0 |
+| Simulator - tvOS 14.2 | appletvsimulator14.2 | 12.2 |
+| watchOS 6.2 | watchos6.2 | 11.7 |
+| watchOS 7.0 | watchos7.0 | 12.0 |
+| watchOS 7.1 | watchos7.1 | 12.2 |
+| Simulator - watchOS 6.2 | watchsimulator6.2 | 11.7 |
+| Simulator - watchOS 7.0 | watchsimulator7.0 | 12.0 |
+| Simulator - watchOS 7.1 | watchsimulator7.1 | 12.2 |
+| DriverKit 19.0 | driverkit.macosx19.0 | 11.7 |
+| DriverKit 20.0 | driverkit.macosx20.0 | 12.0, 12.2 |
+
+### 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 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 |
+| Android SDK Platform-Tools | 30.0.4 |
+| Android Support Repository | 47.0.0 |
+| Google Play services | 49 |
+| Google Repository | 58 |
+| SDK Patch Applier v4 | 1 |
+| CMake | 3.6.4111459 |
+| NDK | 21.3.6528147 |
+
+
diff --git a/images/macos/provision/core/aws.sh b/images/macos/provision/core/aws.sh
index 9e0063be1..4d98d5122 100644
--- a/images/macos/provision/core/aws.sh
+++ b/images/macos/provision/core/aws.sh
@@ -1,7 +1,9 @@
#!/bin/bash
echo Installing aws...
-brew install awscli
+curl "https://awscli.amazonaws.com/AWSCLIV2.pkg" -o "AWSCLIV2.pkg"
+sudo installer -pkg AWSCLIV2.pkg -target /
+rm -rf AWSCLIV2.pkg
echo Installing aws sam cli...
brew tap aws/tap
diff --git a/images/macos/provision/core/homebrew.sh b/images/macos/provision/core/homebrew.sh
index 01b0fb0f3..201fc586a 100755
--- a/images/macos/provision/core/homebrew.sh
+++ b/images/macos/provision/core/homebrew.sh
@@ -1,23 +1,19 @@
-#!/bin/sh
+#!/bin/bash -e -o pipefail
+
echo "Installing Homebrew..."
-
-source ~/utils/utils.sh
-
-echo Installing Homebrew...
HOMEBREW_INSTALL_URL="https://raw.githubusercontent.com/Homebrew/install/master/install.sh"
-
/bin/bash -c "$(curl -fsSL ${HOMEBREW_INSTALL_URL})"
-echo Disabling Homebrew analytics...
+echo "Disabling Homebrew analytics..."
brew analytics off
-echo Installing the last version of curl
+echo "Installing the latest curl..."
brew install curl
-echo Installing wget...
+echo "Installing wget..."
brew install wget
-echo Installing jq
+echo "Installing jq..."
brew install jq
# init brew bundle feature
diff --git a/images/macos/provision/core/node.sh b/images/macos/provision/core/node.sh
index daf5ea408..840b433f9 100644
--- a/images/macos/provision/core/node.sh
+++ b/images/macos/provision/core/node.sh
@@ -1,11 +1,6 @@
source ~/utils/utils.sh
-node_common_modules=(
- node-gyp
- mobile-center-cli
-)
-
-node_catalina_modules=(
+node_modules=(
appcenter-cli
newman
)
@@ -23,6 +18,10 @@ if is_Less_Catalina; then
npm install -g npm@3
npm config set prefix /usr/local
+ # This step is required to install App Center CLI
+ echo Installing Omelette...
+ npm install -g omelette@0.4.14
+
echo Installing App Center CLI...
npm install -g appcenter-cli@^1.0.0
else
@@ -30,7 +29,7 @@ else
brew install node@12
brew link node@12 --force
- for module in ${node_catalina_modules[@]}; do
+ for module in ${node_modules[@]}; do
echo "Install $module"
npm install -g $module
done
@@ -40,8 +39,6 @@ echo Installing yarn...
curl -o- -L https://yarnpkg.com/install.sh | bash
if is_Less_BigSur; then
- for module in ${node_common_modules[@]}; do
- echo "Install $module"
- npm install -g $module
- done
+ echo "Install node-gyp"
+ npm install -g node-gyp
fi
diff --git a/images/macos/provision/core/python.sh b/images/macos/provision/core/python.sh
index 41488642e..1565ced20 100755
--- a/images/macos/provision/core/python.sh
+++ b/images/macos/provision/core/python.sh
@@ -4,10 +4,15 @@ source ~/utils/utils.sh
echo "Installing Python Tooling"
echo "Brew Installing Python 3"
-/usr/local/bin/brew install python3
+# Workaround to have both 3.8 & 3.9(which required by some brew formulas) in the system, but only 3.8 is linked
+/usr/local/bin/brew install python@3.8
+/usr/local/bin/brew install python@3.9
+/usr/local/bin/brew unlink python@3.9
+/usr/local/bin/brew unlink python@3.8
+/usr/local/bin/brew link python@3.8
echo "Brew Installing Python 2"
-# Create local tap with formula due to python2 formula depreciation
+# Create local tap with formula due to python2 formula depreciation
/usr/local/bin/brew tap-new local/python2
FORMULA_PATH=$(/usr/local/bin/brew extract python@2 local/python2 | grep "Homebrew/Library/Taps")
/usr/local/bin/brew install $FORMULA_PATH
diff --git a/images/macos/provision/core/rubygem.sh b/images/macos/provision/core/rubygem.sh
index 83639e472..872436f88 100755
--- a/images/macos/provision/core/rubygem.sh
+++ b/images/macos/provision/core/rubygem.sh
@@ -4,6 +4,14 @@ source ~/utils/utils.sh
echo Updating RubyGems...
gem update --system
+
+# Freeze xcodeproj 1.18.0 because version 1.19.0 contains breaking changes related to CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER flag
+# Related issues:
+# - https://github.com/CocoaPods/CocoaPods/issues/10153
+# - https://github.com/actions/virtual-environments/issues/1804
+# Need to revisit when Cocoapods 1.10.0 is released and added to VM
+gem install xcodeproj -v 1.18.0
+
echo Installing xcode-install utility...
gem install xcode-install --force
diff --git a/images/macos/provision/core/xcode-clt.sh b/images/macos/provision/core/xcode-clt.sh
new file mode 100644
index 000000000..49693d33b
--- /dev/null
+++ b/images/macos/provision/core/xcode-clt.sh
@@ -0,0 +1,43 @@
+#!/bin/bash -e -o pipefail
+
+is_clt_installed() {
+ clt_path=`xcode-select -p 2>&1`
+ [[ -d "$clt_path" ]]
+}
+
+install_clt() {
+ echo "Searching online for the Command Line Tools"
+ # This temporary file prompts the 'softwareupdate' utility to list the Command Line Tools
+ clt_placeholder="/tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress"
+ sudo touch $clt_placeholder
+ clt_label_command="/usr/sbin/softwareupdate -l |
+ grep -B 1 -E 'Command Line Tools' |
+ awk -F'*' '/^ *\\*/ {print \$2}' |
+ sed -e 's/^ *Label: //' -e 's/^ *//' |
+ sort -V |
+ tail -n1"
+ clt_label=$(eval $clt_label_command) || true
+ if [[ -n "$clt_label" ]]; then
+ echo "Installing $clt_label"
+ sudo "/usr/sbin/softwareupdate" "-i" "$clt_label"
+ fi
+ sudo "/bin/rm" "-f" "$clt_placeholder"
+}
+
+echo "Installing Command Line Tools..."
+install_clt
+
+# Retry the installation if tools are not installed from the first attempt
+retries=30
+sleepInterval=60
+while ! is_clt_installed; do
+ if [[ $retries -eq 0 ]]; then
+ echo "Unable to find the Command Line Tools, all the attempts exhausted"
+ exit 1
+ fi
+ echo "Command Line Tools not found, trying to install them via softwareupdates, $retries attempts left"
+ install_clt
+ ((retries--))
+ echo "Wait $sleepInterval seconds before the next check for installed Command Line Tools"
+ sleep $sleepInterval
+done
\ No newline at end of file
diff --git a/images/macos/provision/core/xcode-ctl.sh b/images/macos/provision/core/xcode-ctl.sh
deleted file mode 100644
index cea7aa633..000000000
--- a/images/macos/provision/core/xcode-ctl.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Homebrew doesn't support installation of command line tools on MacOS 11.0
-# https://github.com/Homebrew/install/blob/master/install.sh#L191
-# Copy-paste script from brew installation process
-# https://github.com/Homebrew/install/blob/master/install.sh#L530
-# This temporary file prompts the 'softwareupdate' utility to list the Command Line Tools
-
-clt_placeholder="/tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress"
-touch $clt_placeholder
-clt_label=`/usr/sbin/softwareupdate -l |
- grep -B 1 -E 'Command Line Tools beta 5' |
- awk -F'*' '/^ *\\*/ {print \$2}' |
- sed -e 's/^ *Label: //' -e 's/^ *//' |
- sort -V |
- tail -n1`
-/usr/sbin/softwareupdate -i "$clt_label"
-rm -f $clt_placeholder
-sudo xcode-select --switch "/Library/Developer/CommandLineTools/"
\ No newline at end of file
diff --git a/images/macos/provision/utils/xcode-utils.sh b/images/macos/provision/utils/xcode-utils.sh
index 0f7855ec1..fccde9efd 100644
--- a/images/macos/provision/utils/xcode-utils.sh
+++ b/images/macos/provision/utils/xcode-utils.sh
@@ -2,6 +2,11 @@ createXamarinProvisionatorSymlink() {
local XCODE_VERSION="$1"
local FULL_VERSION=$(echo "${XCODE_VERSION}.0.0" | cut -d'.' -f 1,2,3)
+ # temporary trick for 12.0.1
+ if [[ $XCODE_VERSION == "12" ]]; then
+ FULL_VERSION="12.0.1"
+ fi
+
if [ $FULL_VERSION != $XCODE_VERSION ]; then
ln -sf "/Applications/Xcode_${XCODE_VERSION}.app" "/Applications/Xcode_${FULL_VERSION}.app"
fi
@@ -10,7 +15,9 @@ createXamarinProvisionatorSymlink() {
getXcodeVersionToInstall() {
local XCODE_VERSION="$1"
- if [[ ! $XCODE_VERSION =~ "_beta" ]]; then
+ if [[ $XCODE_VERSION == "12" ]]; then
+ echo "12.0.1"
+ elif [[ ! $XCODE_VERSION =~ "_beta" ]]; then
echo "${XCODE_VERSION//_/ }"
else
local XCODE_BETA="${XCODE_VERSION/_/ }"
@@ -51,6 +58,7 @@ setXcodeDeveloperDirVariables() {
for MAJOR_VERSION in "${major_versions[@]}"
do
LATEST_STABLE_VERSION=$(echo "${stable_xcode_versions[*]}" | grep "${MAJOR_VERSION}" | tail -n 1)
+ LATEST_STABLE_VERSION=$(echo $LATEST_STABLE_VERSION | cut -d"_" -f 1)
echo "export XCODE_${MAJOR_VERSION}_DEVELOPER_DIR=/Applications/Xcode_${LATEST_STABLE_VERSION}.app/Contents/Developer" >> "$HOME/.bashrc"
done
}
diff --git a/images/macos/templates/macOS-10.13.json b/images/macos/templates/macOS-10.13.json
index 2190a6b4a..35c7ef3c7 100644
--- a/images/macos/templates/macOS-10.13.json
+++ b/images/macos/templates/macOS-10.13.json
@@ -128,6 +128,7 @@
"execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
"pause_before": "30s",
"scripts": [
+ "./provision/core/xcode-clt.sh",
"./provision/core/homebrew.sh",
"./provision/core/dotnet.sh",
"./provision/core/python.sh",
diff --git a/images/macos/templates/macOS-10.14.json b/images/macos/templates/macOS-10.14.json
index 269ffa71f..2687302e0 100644
--- a/images/macos/templates/macOS-10.14.json
+++ b/images/macos/templates/macOS-10.14.json
@@ -128,6 +128,7 @@
"execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
"pause_before": "30s",
"scripts": [
+ "./provision/core/xcode-clt.sh",
"./provision/core/homebrew.sh",
"./provision/core/dotnet.sh",
"./provision/core/python.sh",
diff --git a/images/macos/templates/macOS-10.15.json b/images/macos/templates/macOS-10.15.json
index 3dcc3d33e..a65bd72ac 100644
--- a/images/macos/templates/macOS-10.15.json
+++ b/images/macos/templates/macOS-10.15.json
@@ -129,6 +129,7 @@
"execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
"pause_before": "30s",
"scripts": [
+ "./provision/core/xcode-clt.sh",
"./provision/core/homebrew.sh",
"./provision/core/dotnet.sh",
"./provision/core/python.sh",
diff --git a/images/macos/templates/macOS-11.0.json b/images/macos/templates/macOS-11.0.json
index 6da9df38d..27f39bfb0 100644
--- a/images/macos/templates/macOS-11.0.json
+++ b/images/macos/templates/macOS-11.0.json
@@ -129,7 +129,7 @@
"execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
"pause_before": "30s",
"scripts": [
- "./provision/core/xcode-ctl.sh",
+ "./provision/core/xcode-clt.sh",
"./provision/core/homebrew.sh",
"./provision/core/dotnet.sh",
"./provision/core/python.sh",
diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1
index 72a657e6b..88d735bf1 100644
--- a/images/macos/tests/Common.Tests.ps1
+++ b/images/macos/tests/Common.Tests.ps1
@@ -102,10 +102,6 @@ Describe "Common utilities" {
"aliyun --version" | Should -ReturnZeroExitCode
}
- It "Mobile Center CLI" -Skip:($os.IsBigSur) {
- "mobile-center --version" | Should -ReturnZeroExitCode
- }
-
Context "Nomad" -Skip:($os.IsBigSur) {
It "Nomad CLI" {
$result = Get-CommandResult "gem list"
diff --git a/images/macos/tests/Python.Tests.ps1 b/images/macos/tests/Python.Tests.ps1
index 76cd8941b..624609994 100644
--- a/images/macos/tests/Python.Tests.ps1
+++ b/images/macos/tests/Python.Tests.ps1
@@ -31,4 +31,10 @@ Describe "Python" {
It "Pip 3 is available" {
"pip3 --version" | Should -ReturnZeroExitCode
}
+
+ It "Pip 3 and Python 3 came from the same brew formula" {
+ $pip3Path = Split-Path (readlink (which pip3))
+ $python3Path = Split-Path (readlink (which python3))
+ $pip3Path | Should -BeExactly $python3Path
+ }
}
\ No newline at end of file
diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json
index 3e3833528..77c8ec2e2 100644
--- a/images/macos/toolsets/toolset-10.15.json
+++ b/images/macos/toolsets/toolset-10.15.json
@@ -2,7 +2,7 @@
"xcode": {
"default": "11.7",
"versions": [
- "12.2_beta", "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_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"
]
},
"xamarin": {
diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json
index 5ff2280a2..18d72c23f 100644
--- a/images/macos/toolsets/toolset-11.0.json
+++ b/images/macos/toolsets/toolset-11.0.json
@@ -2,7 +2,7 @@
"xcode": {
"default": "11.7",
"versions": [
- "12.2_beta", "11.7"
+ "12.2_beta", "12.1_GM_seed", "11.7"
]
},
"xamarin": {
diff --git a/images/win/scripts/Installers/Install-Haskell.ps1 b/images/win/scripts/Installers/Install-Haskell.ps1
index 50c0c6d4a..18b256a3b 100644
--- a/images/win/scripts/Installers/Install-Haskell.ps1
+++ b/images/win/scripts/Installers/Install-Haskell.ps1
@@ -17,7 +17,8 @@ ForEach ($version in $VersionsList)
# Add default version of GHC to path, because choco formula updates path on user level
$DefaultGhcVersion = $VersionsList | Select-Object -Last 1
-$DefaultGhcPath = Join-Path $env:ChocolateyInstall "lib\ghc.$DefaultGhcVersion\tools\ghc-$DefaultGhcVersion\bin"
+$DefaultGhcShortVersion = ([version]$DefaultGhcVersion).ToString(3)
+$DefaultGhcPath = Join-Path $env:ChocolateyInstall "lib\ghc.$DefaultGhcVersion\tools\ghc-$DefaultGhcShortVersion\bin"
Add-MachinePathItem -PathItem $DefaultGhcPath
Write-Host "Installing cabal..."
diff --git a/images/win/scripts/Tests/Haskell.Tests.ps1 b/images/win/scripts/Tests/Haskell.Tests.ps1
index b6ebb7630..826dc16d8 100644
--- a/images/win/scripts/Tests/Haskell.Tests.ps1
+++ b/images/win/scripts/Tests/Haskell.Tests.ps1
@@ -3,12 +3,18 @@ Describe "Haskell" {
[array]$ghcVersionList = Get-ChildItem -Path $chocoPackagesPath -Filter "ghc.*" | ForEach-Object { $_.Name.TrimStart("ghc.") }
$ghcCount = $ghcVersionList.Count
$defaultGhcVersion = $ghcVersionList | Sort-Object {[Version]$_} | Select-Object -Last 1
+ $ghcDefaultCases = @{
+ defaultGhcVersion = $defaultGhcVersion
+ defaultGhcShortVersion = ([version]$defaultGhcVersion).ToString(3)
+ }
$ghcTestCases = $ghcVersionList | ForEach-Object {
$ghcVersion = $_
+ $ghcShortVersion = ([version]$ghcVersion).ToString(3)
@{
ghcVersion = $ghcVersion
- binGhcPath = Join-Path $chocoPackagesPath "ghc.$ghcVersion\tools\ghc-$ghcVersion\bin\ghc.exe"
+ ghcShortVersion = $ghcShortVersion
+ binGhcPath = Join-Path $chocoPackagesPath "ghc.$ghcVersion\tools\ghc-$ghcShortVersion\bin\ghc.exe"
}
}
@@ -17,11 +23,11 @@ Describe "Haskell" {
}
It "GHC is installed" -TestCases $ghcTestCases {
- "$binGhcPath --version" | Should -MatchCommandOutput $ghcVersion
+ "$binGhcPath --version" | Should -MatchCommandOutput $ghcShortVersion
}
- It "GHC is the default version and should be the latest installed" -TestCases @{defaultGhcVersion = $defaultGhcVersion} {
- "ghc --version" | Should -MatchCommandOutput $defaultGhcVersion
+ It "GHC is the default version and should be the latest installed" -TestCases $ghcDefaultCases {
+ "ghc --version" | Should -MatchCommandOutput $defaultGhcShortVersion
}
It "Cabal is installed" {
diff --git a/images/win/windows2016.json b/images/win/windows2016.json
index 8995569e2..0000e686c 100644
--- a/images/win/windows2016.json
+++ b/images/win/windows2016.json
@@ -85,7 +85,7 @@
{
"type": "file",
"source": "{{ template_dir }}/post-generation",
- "destination": "C:/post-generation"
+ "destination": "C:/"
},
{
"type": "file",
diff --git a/images/win/windows2019.json b/images/win/windows2019.json
index ced90aad1..fd32abb8c 100644
--- a/images/win/windows2019.json
+++ b/images/win/windows2019.json
@@ -85,7 +85,7 @@
{
"type": "file",
"source": "{{ template_dir }}/post-generation",
- "destination": "C:/post-generation"
+ "destination": "C:/"
},
{
"type": "file",