From a400c7065e7f02f7112d1e8b7a35819e24658c5d Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Wed, 26 Aug 2020 16:23:13 +0000 Subject: [PATCH 01/28] Updating readme file for ubuntu20 version 20200825.1 --- images/linux/Ubuntu2004-README.md | 45 ++++++++++++++++--------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index ed26985a8..fb074ef38 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,12 +1,12 @@ # Ubuntu 20.04.1 LTS -The following software is installed on machines with the 20200817.1 update. +The following software is installed on machines with the 20200825.1 update. *** - 7-Zip 16.02 - Ansible (ansible 2.9.6) - AzCopy7 (available by azcopy alias) 7.3.0 -- AzCopy10 (available by azcopy10 alias) 10.5.1 -- Azure CLI (azure-cli 2.10.1) +- AzCopy10 (available by azcopy10 alias) 10.6.0 +- Azure CLI (azure-cli 2.10.1 *) - Azure CLI (azure-devops 0.18.0) - Basic packages: - dnsutils @@ -65,7 +65,7 @@ The following software is installed on machines with the 20200817.1 update. - yamllint - libcurl4 - Alibaba Cloud CLI (3.0.56) -- AWS CLI (aws-cli/2.0.40 Python/3.7.3 Linux/5.4.0-1022-azure exe/x86_64.ubuntu.20) +- AWS CLI (aws-cli/2.0.42 Python/3.7.3 Linux/5.4.0-1022-azure exe/x86_64.ubuntu.20) - AWS CLI Session manager plugin (1.1.61.0) - build-essential - Clang 6.0 (6.0.1) @@ -79,7 +79,7 @@ Target: x86_64-unknown-linux-gnu - Skopeo (1.1.1) - Docker Compose (docker-compose version 1.26.2, build eefe0d31) - Docker-Moby (Docker version 19.03.12+azure, build 0ed913b885c8919944a2e4c8d0b80a318a8dd48b) -- Docker-Buildx (0.4.1+azure) +- Docker-Buildx (0.4.2+azure) - .NET Core SDK: - 3.1.401 - 3.1.302 @@ -156,26 +156,27 @@ Target: x86_64-unknown-linux-gnu - Git-ftp (1.6.0) - Hub CLI (2.14.2) - GitHub CLI 0.11.1 -- Google Chrome (Google Chrome 84.0.4147.125 ) -- ChromeDriver 84.0.4147.30 (48b3e868b4cc0aa7e8149519690b6f6949e110a8-refs/branch-heads/4147@{#310}); Chrome Driver is available via CHROMEWEBDRIVER environment variable -- Google Cloud SDK (305.0.0) +- Google Chrome (Google Chrome 85.0.4183.83 ) +- ChromeDriver 85.0.4183.38 (9047dbc2c693f044042bbec5c91401c708c7c26a-refs/branch-heads/4183@{#779}); Chrome Driver is available via CHROMEWEBDRIVER environment variable +- Google Cloud SDK (307.0.0) - Haskell Cabal (cabal-install version 3.2.0.0 compiled using version 3.2.0.0 of the Cabal library ) - GHC (The Glorious Glasgow Haskell Compilation System, version 8.10.2) - Haskell Stack (Version 2.3.3, Git revision cb44d51bed48b723a5deb08c3348c0b3ccfc437e x86_64 hpack-0.33.0) -- Heroku (heroku/7.42.6 linux-x64 node-v12.16.2) -- HHVM (HipHop VM 4.69.1 (rel)) +- Heroku (heroku/7.42.10 linux-x64 node-v12.16.2) +- HHVM (HipHop VM 4.71.0 (rel)) - ImageMagick - Adopt OpenJDK: - 8 (openjdk version "1.8.0_265") - 11 (openjdk version "11.0.8" 2020-07-14) (default) - Ant (Apache Ant(TM) version 1.10.7 compiled on October 24 2019) -- Gradle 6.6 +- Gradle 6.6.1 - Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)) - Kind (kind v0.8.1 go1.14.2 linux/amd64) - kubectl (Client Version: v1.18.8) - helm (v3.3.0+g8a4aeec) - minikube version: v1.12.3 +- kustomize ({kustomize/v3.8.1 2020-07-16T00:58:46Z }) - oc CLI Client Version: 4.5.0-202005291417-9933eb9 - Leiningen (Leiningen 2.9.4 on Java 11.0.8 OpenJDK 64-Bit Server VM) - Mercurial (Mercurial Distributed SCM (version 5.3.1)) @@ -192,13 +193,13 @@ compiled using version 3.2.0.0 of the Cabal library ) Local version: Unknown) - n (6.7.0) - Parcel (1.12.4) -- TypeScript (Version 3.9.7) +- TypeScript (Version 4.0.2) - Webpack (4.44.1) - Webpack CLI (3.3.12) - Yarn (1.22.4) - Newman (5.1.2) - Bazel (bazel 3.4.1) -- Bazelisk (1.6.0) +- Bazelisk (1.6.1) - ORAS CLI 0.8.1 - PhantomJS (2.1.1) - PHP 7.4 (PHP 7.4.9 (cli) (built: Aug 7 2020 14:30:01) ( NTS )) @@ -223,8 +224,8 @@ apt-get update - rustfmt (1.4.17-stable) - clippy (0.0.212) - rustdoc (1.45.2) -- bindgen (0.54.1) -- cbindgen (0.14.3) +- bindgen (0.55.1) +- cbindgen (0.14.4) - cargo audit (0.12.0) - cargo outdated (v0.9.11) - Julia (julia version 1.5.0) @@ -236,7 +237,7 @@ apt-get update - Terraform (Terraform v0.13.0) - Packer (1.6.1) - Vcpkg 2020.06.15-unknownhash -- Vercel CLI (19.2.0) +- Vercel CLI (20.0.0) - MongoDB on Linux v4.4.0 - Haveged 1.9.1-6ubuntu1 - Swig 4.0.1 @@ -244,13 +245,13 @@ apt-get update - Google Repository 58 - Google Play services 49 - CMake 3.10.2.4988404 -- Android Support Repository 47.0.0 - Android SDK Platform-Tools 30.0.4 - Android SDK Platform 30 - Android SDK Platform 29 - Android SDK Platform 28 - Android SDK Platform 27 - Android SDK Patch Applier v4 +- Android SDK Build-Tools 30.0.2 - Android SDK Build-Tools 30.0.1 - Android SDK Build-Tools 30.0.0 - Android SDK Build-Tools 29.0.3 @@ -265,7 +266,7 @@ apt-get update - Android SDK Build-Tools 27.0.1 - Android SDK Build-Tools 27.0.0 - Android NDK 21.3.6528147 -- Az Module (4.5.0) +- Az Module (4.6.0) - Cached container images - node:10 (Digest: sha256:cf3ee6a5a1b1916c7a2e4fb51eb7ecba1afe186739677d62e9c1bb2cb1c7d6b0) - node:12 (Digest: sha256:d0738468dfc7cedb7d260369e0546fd7ee8731cfd67136f6023d070ad9679090) @@ -293,8 +294,8 @@ apt-get update - Python: - Python 2.7.18 - Python 3.5.9 - - Python 3.6.11 - - Python 3.7.8 + - Python 3.6.12 + - Python 3.7.9 - Python 3.8.5 - PyPy: - PyPy 2.7.13 [PyPy 7.3.1 with GCC 7.3.1 20180303 (Red Hat 7.3.1-5)] @@ -308,5 +309,5 @@ apt-get update - go 1.14.7 - go 1.15.0 - AWS SAM CLI, version 1.1.0 -- Homebrew on Linux (Homebrew 2.4.11 -Homebrew/linuxbrew-core (git revision 99cdab; last commit 2020-08-16)) +- Homebrew on Linux (Homebrew 2.4.13 +Homebrew/linuxbrew-core (git revision 7d5ec; last commit 2020-08-24)) From 4083238f8de0426edfa7628e4ad2145a4f11b33e Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Wed, 26 Aug 2020 16:32:06 +0000 Subject: [PATCH 02/28] Updating readme file for ubuntu18 version 20200825.1 --- images/linux/Ubuntu1804-README.md | 43 ++++++++++++++++--------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 5f913d636..03ef00720 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,12 +1,12 @@ # Ubuntu 18.04.5 LTS -The following software is installed on machines with the 20200817.1 update. +The following software is installed on machines with the 20200825.1 update. *** - 7-Zip 16.02 - Ansible (ansible 2.9.12) - AzCopy7 (available by azcopy alias) 7.3.0 -- AzCopy10 (available by azcopy10 alias) 10.5.1 -- Azure CLI (azure-cli 2.10.1) +- AzCopy10 (available by azcopy10 alias) 10.6.0 +- Azure CLI (azure-cli 2.10.1 *) - Azure CLI (azure-devops 0.18.0) - Basic packages: - dnsutils @@ -65,7 +65,7 @@ The following software is installed on machines with the 20200817.1 update. - yamllint - libcurl3 - Alibaba Cloud CLI (3.0.56) -- AWS CLI (aws-cli/1.18.120 Python/2.7.17 Linux/5.3.0-1034-azure botocore/1.17.43) +- AWS CLI (aws-cli/1.18.125 Python/2.7.17 Linux/5.3.0-1035-azure botocore/1.17.48) - AWS CLI Session manager plugin (1.1.61.0) - build-essential - Clang 6.0 (6.0.0) @@ -79,7 +79,7 @@ Target: x86_64-unknown-linux-gnu - Skopeo (1.1.1) - Docker Compose (docker-compose version 1.26.2, build eefe0d31) - Docker-Moby (Docker version 19.03.12+azure, build 0ed913b885c8919944a2e4c8d0b80a318a8dd48b) -- Docker-Buildx (0.4.1+azure) +- Docker-Buildx (0.4.2+azure) - .NET Core SDK: - 3.1.401 - 3.1.302 @@ -160,15 +160,15 @@ Target: x86_64-unknown-linux-gnu - Git-ftp (1.3.1) - Hub CLI (2.14.2) - GitHub CLI 0.11.1 -- Google Chrome (Google Chrome 84.0.4147.125 ) -- ChromeDriver 84.0.4147.30 (48b3e868b4cc0aa7e8149519690b6f6949e110a8-refs/branch-heads/4147@{#310}); Chrome Driver is available via CHROMEWEBDRIVER environment variable -- Google Cloud SDK (305.0.0) +- Google Chrome (Google Chrome 85.0.4183.83 ) +- ChromeDriver 85.0.4183.38 (9047dbc2c693f044042bbec5c91401c708c7c26a-refs/branch-heads/4183@{#779}); Chrome Driver is available via CHROMEWEBDRIVER environment variable +- Google Cloud SDK (307.0.0) - Haskell Cabal (cabal-install version 3.2.0.0 compiled using version 3.2.0.0 of the Cabal library ) - GHC (The Glorious Glasgow Haskell Compilation System, version 8.10.2) - Haskell Stack (Version 2.3.3, Git revision cb44d51bed48b723a5deb08c3348c0b3ccfc437e x86_64 hpack-0.33.0) -- Heroku (heroku/7.42.6 linux-x64 node-v12.16.2) -- HHVM (HipHop VM 4.69.1 (rel)) +- Heroku (heroku/7.42.10 linux-x64 node-v12.16.2) +- HHVM (HipHop VM 4.71.0 (rel)) - ImageMagick - Azul Zulu OpenJDK: - 7 (openjdk version "1.7.0_272") @@ -177,12 +177,13 @@ compiled using version 3.2.0.0 of the Cabal library ) - 11 (openjdk version "11.0.8" 2020-07-14) - 12 (openjdk version "12.0.2" 2019-07-16) - Ant (Apache Ant(TM) version 1.10.5 compiled on March 28 2019) -- Gradle 6.6 +- Gradle 6.6.1 - Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)) - Kind (kind v0.8.1 go1.14.2 linux/amd64) - kubectl (Client Version: v1.18.8) - helm (v3.3.0+g8a4aeec) - minikube version: v1.12.3 +- kustomize ({kustomize/v3.8.1 2020-07-16T00:58:46Z }) - oc CLI Client Version: 4.5.0-202005291417-9933eb9 - Leiningen (Leiningen 2.9.4 on Java 1.8.0_265 OpenJDK 64-Bit Server VM) - Mercurial (Mercurial Distributed SCM (version 4.5.3)) @@ -199,13 +200,13 @@ compiled using version 3.2.0.0 of the Cabal library ) Local version: Unknown) - n (6.7.0) - Parcel (1.12.4) -- TypeScript (Version 3.9.7) +- TypeScript (Version 4.0.2) - Webpack (4.44.1) - Webpack CLI (3.3.12) - Yarn (1.22.4) - Newman (5.1.2) - Bazel (bazel 3.4.1) -- Bazelisk (1.6.0) +- Bazelisk (1.6.1) - ORAS CLI 0.8.1 - PhantomJS (2.1.1) - PHP 7.1 (PHP 7.1.33-17+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Aug 7 2020 14:47:20) ( NTS )) @@ -228,8 +229,8 @@ Local version: Unknown) - rustfmt (1.4.17-stable) - clippy (0.0.212) - rustdoc (1.45.2) -- bindgen (0.54.1) -- cbindgen (0.14.3) +- bindgen (0.55.1) +- cbindgen (0.14.4) - cargo audit (0.12.0) - cargo outdated (v0.9.11) - Julia (julia version 1.5.0) @@ -240,7 +241,7 @@ Local version: Unknown) - Terraform (Terraform v0.13.0) - Packer (1.6.1) - Vcpkg 2020.06.15-unknownhash -- Vercel CLI (19.2.0) +- Vercel CLI (20.0.0) - MongoDB on Linux v4.4.0 - Haveged 1.9.1-6 - Swig 3.0.12 @@ -253,7 +254,6 @@ Local version: Unknown) - Google APIs 21 - CMake 3.10.2.4988404 3.6.4111459 -- Android Support Repository 47.0.0 - Android SDK Platform-Tools 30.0.4 - Android SDK Platform 30 - Android SDK Platform 29 @@ -268,6 +268,7 @@ Local version: Unknown) - Android SDK Platform 19 - Android SDK Platform 17 - Android SDK Patch Applier v4 +- Android SDK Build-Tools 30.0.2 - Android SDK Build-Tools 30.0.1 - Android SDK Build-Tools 30.0.0 - Android SDK Build-Tools 29.0.3 @@ -340,8 +341,8 @@ Local version: Unknown) - Python: - Python 2.7.18 - Python 3.5.9 - - Python 3.6.11 - - Python 3.7.8 + - Python 3.6.12 + - Python 3.7.9 - Python 3.8.5 - PyPy: - PyPy 2.7.13 [PyPy 7.3.1 with GCC 7.3.1 20180303 (Red Hat 7.3.1-5)] @@ -361,5 +362,5 @@ Local version: Unknown) - boost 1.69.0 - boost 1.72.0 - AWS SAM CLI, version 1.1.0 -- Homebrew on Linux (Homebrew 2.4.11 -Homebrew/linuxbrew-core (git revision 99cdab; last commit 2020-08-16)) +- Homebrew on Linux (Homebrew 2.4.13 +Homebrew/linuxbrew-core (git revision 7d5ec; last commit 2020-08-24)) From 82fba472ed5b6f204042c9bab0a5dfa67fe167d4 Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Wed, 26 Aug 2020 16:32:18 +0000 Subject: [PATCH 03/28] Updating readme file for ubuntu16 version 20200825.1 --- images/linux/Ubuntu1604-README.md | 49 ++++++++++++++++--------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index e8e99f3b5..56c643030 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -1,12 +1,12 @@ # Ubuntu 16.04.7 LTS -The following software is installed on machines with the 20200817.1 update. +The following software is installed on machines with the 20200825.1 update. *** - 7-Zip 9.20 - Ansible (ansible 2.9.12) - AzCopy7 (available by azcopy alias) 7.3.0 -- AzCopy10 (available by azcopy10 alias) 10.5.1 -- Azure CLI (azure-cli 2.10.1) +- AzCopy10 (available by azcopy10 alias) 10.6.0 +- Azure CLI (azure-cli 2.10.1 *) - Azure CLI (azure-devops 0.18.0) - Basic packages: - dnsutils @@ -66,7 +66,7 @@ The following software is installed on machines with the 20200817.1 update. - yamllint - libcurl3 - Alibaba Cloud CLI (3.0.56) -- AWS CLI (aws-cli/1.18.120 Python/2.7.12 Linux/4.15.0-1092-azure botocore/1.17.43) +- AWS CLI (aws-cli/1.18.125 Python/2.7.12 Linux/4.15.0-1092-azure botocore/1.17.48) - AWS CLI Session manager plugin (1.1.61.0) - build-essential - nvm (0.35.3) @@ -78,7 +78,7 @@ Target: x86_64-unknown-linux-gnu - CMake (cmake version 3.17.0) - Docker Compose (docker-compose version 1.26.2, build eefe0d31) - Docker-Moby (Docker version 19.03.12+azure, build 0ed913b885c8919944a2e4c8d0b80a318a8dd48b) -- Docker-Buildx (0.4.1+azure) +- Docker-Buildx (0.4.2+azure) - .NET Core SDK: - 3.1.401 - 3.1.302 @@ -159,14 +159,14 @@ Target: x86_64-unknown-linux-gnu - Git-ftp (1.0.2) - Hub CLI (2.14.2) - GitHub CLI 0.11.1 -- Google Chrome (Google Chrome 84.0.4147.125 ) -- ChromeDriver 84.0.4147.30 (48b3e868b4cc0aa7e8149519690b6f6949e110a8-refs/branch-heads/4147@{#310}); Chrome Driver is available via CHROMEWEBDRIVER environment variable -- Google Cloud SDK (305.0.0) +- Google Chrome (Google Chrome 85.0.4183.83 ) +- ChromeDriver 85.0.4183.38 (9047dbc2c693f044042bbec5c91401c708c7c26a-refs/branch-heads/4183@{#779}); Chrome Driver is available via CHROMEWEBDRIVER environment variable +- Google Cloud SDK (307.0.0) - Haskell Cabal (cabal-install version 3.2.0.0 compiled using version 3.2.0.0 of the Cabal library ) - GHC (The Glorious Glasgow Haskell Compilation System, version 8.10.2) - Haskell Stack (Version 2.3.3, Git revision cb44d51bed48b723a5deb08c3348c0b3ccfc437e x86_64 hpack-0.33.0) -- Heroku (heroku/7.42.6 linux-x64 node-v12.16.2) +- Heroku (heroku/7.42.10 linux-x64 node-v12.16.2) - HHVM (HipHop VM 4.56.1 (rel)) - ImageMagick - Azul Zulu OpenJDK: @@ -176,12 +176,13 @@ compiled using version 3.2.0.0 of the Cabal library ) - 11 (openjdk version "11.0.8" 2020-07-14) - 12 (openjdk version "12.0.2" 2019-07-16) - Ant (Apache Ant(TM) version 1.9.6 compiled on July 20 2018) -- Gradle 6.6 +- Gradle 6.6.1 - Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)) - Kind (kind v0.8.1 go1.14.2 linux/amd64) - kubectl (Client Version: v1.18.8) - helm (v3.3.0+g8a4aeec) - minikube version: v1.12.3 +- kustomize ({kustomize/v3.8.1 2020-07-16T00:58:46Z }) - oc CLI Client Version: 4.5.0-202005291417-9933eb9 - Leiningen (Leiningen 2.9.4 on Java 1.8.0_265 OpenJDK 64-Bit Server VM) - Mercurial (Mercurial Distributed SCM (version 4.4.1)) @@ -197,13 +198,13 @@ compiled using version 3.2.0.0 of the Cabal library ) Local version: Unknown) - n (6.7.0) - Parcel (1.12.4) -- TypeScript (Version 3.9.7) +- TypeScript (Version 4.0.2) - Webpack (4.44.1) - Webpack CLI (3.3.12) - Yarn (1.22.4) - Newman (5.1.2) - Bazel (bazel 3.4.1) -- Bazelisk (1.6.0) +- Bazelisk (1.6.1) - ORAS CLI 0.8.1 - PhantomJS (2.1.1) - PHP 5.6 (PHP 5.6.40-30+ubuntu16.04.1+deb.sury.org+1 (cli) ) @@ -228,8 +229,8 @@ Local version: Unknown) - rustfmt (1.4.17-stable) - clippy (0.0.212) - rustdoc (1.45.2) -- bindgen (0.54.1) -- cbindgen (0.14.3) +- bindgen (0.55.1) +- cbindgen (0.14.4) - cargo audit (0.12.0) - cargo outdated (v0.9.11) - Julia (julia version 1.5.0) @@ -240,7 +241,7 @@ Local version: Unknown) - Terraform (Terraform v0.13.0) - Packer (1.6.1) - Vcpkg 2020.06.15-unknownhash -- Vercel CLI (19.2.0) +- Vercel CLI (20.0.0) - MongoDB on Linux v4.4.0 - Haveged 1.9.1-3 - Swig 3.0.8 @@ -253,9 +254,10 @@ Local version: Unknown) - Google APIs 21 - CMake 3.10.2.4988404 3.6.4111459 -- Android Support Repository 47.0.0 -- Android Solver for ConstraintLayout 1.0.2 -- Android Solver for ConstraintLayout 1.0.1 +- Android ConstraintLayout 1.0.2 +- Android ConstraintLayout 1.0.1 +- Android ConstraintLayout Solver 1.0.2 +- Android ConstraintLayout Solver 1.0.1 - Android SDK Platform-Tools 30.0.4 - Android SDK Platform 30 - Android SDK Platform 29 @@ -272,6 +274,7 @@ Local version: Unknown) - Android SDK Platform 15 - Android SDK Platform 10 - Android SDK Patch Applier v4 +- Android SDK Build-Tools 30.0.2 - Android SDK Build-Tools 30.0.1 - Android SDK Build-Tools 30.0.0 - Android SDK Build-Tools 29.0.3 @@ -306,8 +309,6 @@ Local version: Unknown) - Android SDK Build-Tools 19.1.0 - Android SDK Build-Tools 17.0.0 - Android NDK 21.3.6528147 -- Android ConstraintLayout 1.0.2 -- Android ConstraintLayout 1.0.1 - Az Module (1.0.0) - Az Module (1.6.0) - Az Module (2.3.2) @@ -346,8 +347,8 @@ Local version: Unknown) - Python: - Python 2.7.18 - Python 3.5.9 - - Python 3.6.11 - - Python 3.7.8 + - Python 3.6.12 + - Python 3.7.9 - Python 3.8.5 - PyPy: - PyPy 2.7.13 [PyPy 7.3.1 with GCC 7.3.1 20180303 (Red Hat 7.3.1-5)] @@ -367,5 +368,5 @@ Local version: Unknown) - boost 1.69.0 - boost 1.72.0 - AWS SAM CLI, version 1.1.0 -- Homebrew on Linux (Homebrew 2.4.11 -Homebrew/linuxbrew-core (git revision 99cdab; last commit 2020-08-16)) +- Homebrew on Linux (Homebrew 2.4.13 +Homebrew/linuxbrew-core (git revision 7d5ec; last commit 2020-08-24)) From a014097c35ac8e3a0f89a035bf3c620cd0bd5475 Mon Sep 17 00:00:00 2001 From: "no-reply@microsoft.com" Date: Thu, 27 Aug 2020 13:54:20 +0000 Subject: [PATCH 04/28] Updating readme file for macos-10.15 version 20200825.1 --- images/macos/macos-10.15-Readme.md | 56 ++++++++++++++++-------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index dc15f6ced..bf4c9a247 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,16 +1,10 @@ # macOS info - System Version: macOS 10.15.6 (19G2021) - Kernel Version: Darwin 19.6.0 -- Image Version: 20200819.1 +- Image Version: 20200825.1 ## Installed Software ### Language and Runtime -- Java 1.7: (Zulu 7.40.0.15-CA-macosx) (build 1.7.0_272-b10) -- Java 1.8: (AdoptOpenJDK)(build 1.8.0_265-b01) (default) -- Java 11: AdoptOpenJDK (build 11.0.8+10) -- Java 12: AdoptOpenJDK (build 12.0.2+10) -- Java 13: AdoptOpenJDK (build 13.0.2+8) -- Java 14: AdoptOpenJDK (build 14.0.2+12) - 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 @@ -33,7 +27,7 @@ - Bundler version 2.1.4 - Carthage 0.35.0 - CocoaPods 1.9.3 -- Homebrew 2.4.12 +- Homebrew 2.4.13 - NPM 6.14.6 - Yarn 1.22.4 - NuGet 5.6.0.6489 @@ -45,11 +39,11 @@ ### Project Management - Apache Maven 3.6.3 -- Gradle 6.6 +- Gradle 6.6.1 - Apache Ant(TM) 1.10.8 ### Utilities -- Curl 7.71.1 +- Curl 7.72.0 - Git: 2.28.0 - Git LFS: 2.11.0 - GitHub CLI: 0.11.1 @@ -57,7 +51,7 @@ - GNU Wget 1.20.3 - Subversion (SVN) 1.14.0 - Packer 1.6.1 -- GNU parallel 20200722 +- GNU parallel 20200822 - OpenSSL 1.0.2t 10 Sep 2019 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl/1.0.2t)` - jq 1.6 - gpg (GnuPG) 2.2.21 @@ -72,17 +66,17 @@ - virtualbox 6.1.12r139181 - mongo v4.4.0 - mongod v4.4.0 -- Vagrant 2.2.9 +- Vagrant 2.2.10 - 7-Zip 16.02 - Newman 5.1.2 ### Tools - Fastlane 2.156.1 -- Cmake 3.18.1 +- Cmake 3.18.2 - App Center CLI 2.6.6 -- Azure CLI 2.10.1 -- AWS CLI 2.0.40 +- Azure CLI 2.11.0 +- AWS CLI 2.0.42 - AWS SAM CLI 1.1.0 - AWS Session Manager CLI 1.1.61.0 - Aliyun CLI 3.0.56 @@ -98,13 +92,22 @@ ### Browsers - Safari 13.1.2 (15609.3.5.1.3) - SafariDriver 13.1.2 (15609.3.5.1.3) -- Google Chrome 84.0.4147.135 +- Google Chrome 85.0.4183.83 - ChromeDriver 84.0.4147.30 -- Microsoft Edge 84.0.522.61 -- MSEdgeDriver 84.0.522.61 -- Mozilla Firefox 79.0 +- Microsoft Edge 84.0.522.63 +- MSEdgeDriver 84.0.522.63 +- Mozilla Firefox 80.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 | +| 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 @@ -141,8 +144,8 @@ - Rustup 1.22.1 #### Packages -- Bindgen 0.54.1 -- Cbindgen 0.14.3 +- Bindgen 0.55.1 +- Cbindgen 0.14.4 - Cargo-outdated v0.9.11 - Cargo-audit 0.12.0 @@ -152,13 +155,13 @@ #### PowerShell Modules | Module | Version | | ---------- | ------- | -| Az | 4.5.0 | +| Az | 4.6.0 | | MarkdownPS | 1.9 | | Pester | 5.0.3 | ### Xamarin #### Visual Studio for Mac -- 8.7.1.15 +- 8.7.3.13 #### Mono - 6.12.0.90 @@ -190,7 +193,7 @@ - 6.2.0.47 #### Xamarin.Android -- 11.0.0 +- 11.0.2 - 10.3.1 - 10.2.0 - 10.1.3 @@ -202,7 +205,7 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | ------------------------------- | -| 12.0 (beta) | 12A8189h | /Applications/Xcode_12_beta.app | +| 12.0 (beta) | 12A8189n | /Applications/Xcode_12_beta.app | | 11.6 (default) | 11E708 | /Applications/Xcode_11.6.app | | 11.5 | 11E608c | /Applications/Xcode_11.5.app | | 11.4.1 | 11E503a | /Applications/Xcode_11.4.1.app | @@ -340,6 +343,7 @@ | build-tools-29.0.3 | Android SDK Build-Tools, Revision 29.0.3 | | build-tools-30.0.0 | Android SDK Build-Tools, Revision 30.0.0 | | build-tools-30.0.1 | Android SDK Build-Tools, Revision 30.0.1 | +| build-tools-30.0.2 | Android SDK Build-Tools, Revision 30.0.2 | #### Android NDKs | Version | Path | @@ -352,7 +356,7 @@ | Package Name | Version | | ---------------- | ----------- | | cmake | 3.6.4111459 | -| Android Emulator | 30.0.12 | +| Android Emulator | 30.0.26 | #### Android Google APIs | Package Name | Description | From 4dd9ba84fd05fcd30b165087a6f9143e456a7475 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Fri, 28 Aug 2020 16:17:22 +0300 Subject: [PATCH 05/28] add permissions --- images/linux/scripts/installers/android.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 725bf3d33..73611e665 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -27,9 +27,6 @@ wget -O android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux unzip android-sdk.zip -d ${ANDROID_SDK_ROOT} rm -f android-sdk.zip -# Add required permissions -chmod -R a+rwx ${ANDROID_SDK_ROOT} - if isUbuntu20 ; then # Sdk manager doesn't work with Java > 8, set version 8 explicitly sed -i "2i export JAVA_HOME=${JAVA_HOME_8_X64}" /usr/local/lib/android/sdk/tools/bin/sdkmanager @@ -63,6 +60,9 @@ constraint_layout_solver_versions_list=$(echo "$extras"|awk -F';' '/constraint-l platform_versions_list=$(echo "$platforms"|awk -F- '{print $2}') buildtools_versions_list=$(echo "$buildtools"|awk -F';' '{print $2}') +# Add required permissions +chmod -R a+rwx ${ANDROID_SDK_ROOT} + echo "Lastly, document what was added to the metadata file" DocumentInstalledItem "Google Repository $(cat ${ANDROID_SDK_ROOT}/extras/google/m2repository/source.properties 2>&1 | grep Pkg.Revision | cut -d '=' -f 2)" DocumentInstalledItem "Google Play services $(cat ${ANDROID_SDK_ROOT}/extras/google/google_play_services/source.properties 2>&1 | grep Pkg.Revision | cut -d '=' -f 2)" From 659158fecb880358d19878aa85dfd00b52b6ad14 Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Fri, 28 Aug 2020 13:55:04 +0000 Subject: [PATCH 06/28] Updating readme file for win16 version 20200827.1 --- images/win/Windows2016-Readme.md | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 692b014b8..67117884d 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -4,7 +4,7 @@ *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 3866 -- Image Version: 20200820.1 +- Image Version: 20200827.1 ## Installed Software ### Language and Runtime @@ -16,7 +16,7 @@ - Ruby 2.5.8p224 - Go 1.14.7 - PHP 7.4.9 -- Julia 1.5.0 +- Julia 1.5.1 - Perl 5.30.3 - Node 12.18.3 @@ -39,17 +39,17 @@ - sbt 1.3.13 ### Tools -- Azure CosmosDb Emulator 2.11.3.0 +- Azure CosmosDb Emulator 2.11.5.0 - azcopy 10.6.0 - Bazel 3.4.1 - Bazelisk 1.6.1 -- CMake 3.18.1 +- CMake 3.18.2 - R 4.0.2 - Docker 19.03.11 - Docker-compose 1.26.2 - Git 2.28.0 - Git LFS 2.11.0 -- Google Cloud SDK 306.0.0 +- Google Cloud SDK 307.0.0 - InnoSetup 6.0.5 - jq 1.6 - Kubectl 1.18.8 @@ -74,13 +74,13 @@ - yamllint 1.24.2 ### CLI Tools -- Azure CLI 2.10.1 +- Azure CLI 2.11.0 - Azure DevOps CLI extension 0.18.0 -- AWS CLI 2.0.41 +- AWS CLI 2.0.43 - AWS SAM CLI 1.1.0 - AWS Session Manager CLI 1.1.61.0 - Alibaba Cloud CLI 3.0.56 -- Cloud Foundry CLI 6.51.0 +- Cloud Foundry CLI 6.52.0 - Hub CLI 2.14.2 - GitHub CLI gh version 0.11.1 (2020-07-28) https://github.com/cli/cli/releases/tag/v0.11.1 @@ -88,17 +88,17 @@ - Rust 1.45.2 #### Packages -- bindgen 0.54.1 -- cbindgen 0.14.3 +- bindgen 0.55.1 +- cbindgen 0.14.4 - cargo-audit 0.12.0 - cargo-outdated v0.9.11 ### Browsers and webdrivers -- Google Chrome 84.0.4147.135 -- Chrome Driver 84.0.4147.30 -- Microsoft Edge 84.0.522.61 -- Microsoft Edge Driver 84.0.522.61 -- Mozilla Firefox 79.0 +- Google Chrome 85.0.4183.83 +- Chrome Driver 85.0.4183.83 +- Microsoft Edge 84.0.522.63 +- Microsoft Edge Driver 84.0.522.63 +- Mozilla Firefox 80.0 - Gecko Driver 0.27.0 - IE Driver 3.150.1.0 @@ -574,6 +574,8 @@ All other versions are saved but not installed. | build-tools-29.0.2 | Android SDK Build-Tools, Revision 29.0.2 | | build-tools-29.0.3 | Android SDK Build-Tools, Revision 29.0.3 | | build-tools-30.0.0 | Android SDK Build-Tools, Revision 30.0.0 | +| build-tools-30.0.1 | Android SDK Build-Tools, Revision 30.0.1 | +| build-tools-30.0.2 | Android SDK Build-Tools, Revision 30.0.2 | ### Android Extra Packages | Package Name | Version | From 6401bea1dff6def9fc99b01932b4266a86a1922f Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Fri, 28 Aug 2020 13:55:53 +0000 Subject: [PATCH 07/28] Updating readme file for win19 version 20200827.1 --- images/win/Windows2019-Readme.md | 34 +++++++++++++++++--------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 07e337dcd..c74d15f3b 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -4,7 +4,7 @@ *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 1397 -- Image Version: 20200820.1 +- Image Version: 20200827.1 ## Enabled windows optional features - Windows Subsystem for Linux @@ -19,7 +19,7 @@ - Ruby 2.5.8p224 - Go 1.14.7 - PHP 7.4.9 -- Julia 1.5.0 +- Julia 1.5.1 - Perl 5.30.3 - Node 12.18.3 @@ -42,17 +42,17 @@ - sbt 1.3.13 ### Tools -- Azure CosmosDb Emulator 2.11.3.0 +- Azure CosmosDb Emulator 2.11.5.0 - azcopy 10.6.0 - Bazel 3.4.1 - Bazelisk 1.6.1 -- CMake 3.18.1 +- CMake 3.18.2 - R 4.0.2 - Docker 19.03.11 - Docker-compose 1.26.2 - Git 2.28.0 - Git LFS 2.11.0 -- Google Cloud SDK 306.0.0 +- Google Cloud SDK 307.0.0 - InnoSetup 6.0.5 - jq 1.6 - Kubectl 1.18.8 @@ -77,13 +77,13 @@ - yamllint 1.24.2 ### CLI Tools -- Azure CLI 2.10.1 +- Azure CLI 2.11.0 - Azure DevOps CLI extension 0.18.0 -- AWS CLI 2.0.41 +- AWS CLI 2.0.43 - AWS SAM CLI 1.1.0 - AWS Session Manager CLI 1.1.61.0 - Alibaba Cloud CLI 3.0.56 -- Cloud Foundry CLI 6.51.0 +- Cloud Foundry CLI 6.52.0 - Hub CLI 2.14.2 - GitHub CLI gh version 0.11.1 (2020-07-28) https://github.com/cli/cli/releases/tag/v0.11.1 @@ -91,17 +91,17 @@ - Rust 1.45.2 #### Packages -- bindgen 0.54.1 -- cbindgen 0.14.3 +- bindgen 0.55.1 +- cbindgen 0.14.4 - cargo-audit 0.12.0 - cargo-outdated v0.9.11 ### Browsers and webdrivers -- Google Chrome 84.0.4147.135 -- Chrome Driver 84.0.4147.30 -- Microsoft Edge 84.0.522.61 -- Microsoft Edge Driver 84.0.522.61 -- Mozilla Firefox 79.0 +- Google Chrome 85.0.4183.83 +- Chrome Driver 85.0.4183.83 +- Microsoft Edge 84.0.522.63 +- Microsoft Edge Driver 84.0.522.63 +- Mozilla Firefox 80.0 - Gecko Driver 0.27.0 - IE Driver 3.150.1.0 @@ -423,7 +423,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Universal | 16.7.30310.162 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 16.4.29409.204 | | SSDT Microsoft Analysis Services Projects | 2.9.12 | -| SSDT SQL Server Integration Services Projects | 3.8 | +| SSDT SQL Server Integration Services Projects | 3.9 | | SSDT Microsoft Reporting Services Projects | 2.6.7 | | Windows Driver Kit | 3.11.4516 | | Windows Driver Kit Visual Studio Extension | 10.1.19041.1 | @@ -554,6 +554,8 @@ All other versions are saved but not installed. | build-tools-29.0.2 | Android SDK Build-Tools, Revision 29.0.2 | | build-tools-29.0.3 | Android SDK Build-Tools, Revision 29.0.3 | | build-tools-30.0.0 | Android SDK Build-Tools, Revision 30.0.0 | +| build-tools-30.0.1 | Android SDK Build-Tools, Revision 30.0.1 | +| build-tools-30.0.2 | Android SDK Build-Tools, Revision 30.0.2 | ### Android Extra Packages | Package Name | Version | From 053476eee2a8ee0bc75fa8e209e414f6e32d5d52 Mon Sep 17 00:00:00 2001 From: Paolo Mainardi Date: Fri, 28 Aug 2020 17:49:24 +0200 Subject: [PATCH 08/28] Install hub without snap --- images/linux/scripts/installers/git.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/git.sh b/images/linux/scripts/installers/git.sh index e2b27429a..aa1f0f1a0 100644 --- a/images/linux/scripts/installers/git.sh +++ b/images/linux/scripts/installers/git.sh @@ -5,7 +5,7 @@ ################################################################################ # Source the helpers for use with the script -source $HELPER_SCRIPTS/document.sh +source "$HELPER_SCRIPTS"/document.sh ## Install git add-apt-repository ppa:git-core/ppa -y @@ -46,7 +46,15 @@ DocumentInstalledItem "Git Large File Storage (LFS) ($(git-lfs --version 2>&1 | DocumentInstalledItem "Git-ftp ($(git-ftp --version | cut -d ' ' -f 3))" #Install hub -snap install hub --classic +TEMP_HUB=$(mktemp -d -t) +pushd "$TEMP_HUB" || exit +URL=$(curl -s https://api.github.com/repos/github/hub/releases/latest | jq -r '.assets[].browser_download_url | select(contains("hub-linux-amd64"))') +wget -P "$TEMP_HUB" "$URL" +tar xzvf "$TEMP_HUB"/hub-linux-amd64-*.tgz --strip-components 1 +mv bin/hub /usr/local/bin +rm -rf "$TEMP_HUB" +popd || exit + if command -v hub; then echo "hub CLI was installed successfully" DocumentInstalledItem "Hub CLI ($(hub --version | grep "hub version" | cut -d ' ' -f 3))" From 12a99c7f7f4286315626c19e2548fe7e949c3b22 Mon Sep 17 00:00:00 2001 From: Paolo Mainardi Date: Fri, 28 Aug 2020 18:14:03 +0200 Subject: [PATCH 09/28] Install kustomize without snap --- images/linux/scripts/installers/kubernetes-tools.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/kubernetes-tools.sh b/images/linux/scripts/installers/kubernetes-tools.sh index bdd22dd2c..4710d968d 100644 --- a/images/linux/scripts/installers/kubernetes-tools.sh +++ b/images/linux/scripts/installers/kubernetes-tools.sh @@ -24,7 +24,9 @@ curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux- sudo install minikube-linux-amd64 /usr/local/bin/minikube # Install kustomize -sudo snap install kustomize +curl -s "https://raw.githubusercontent.com/\ +kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash +mv kustomize /usr/local/bin # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" From f7699ffa5b543db42af529f28ee0088eb1c2fa2f Mon Sep 17 00:00:00 2001 From: Paolo Mainardi Date: Mon, 31 Aug 2020 12:28:44 +0200 Subject: [PATCH 10/28] code review: use download_with_retries, remove custom tmp dir, set -e Signed-off-by: Paolo Mainardi --- images/linux/scripts/helpers/install.sh | 2 +- images/linux/scripts/installers/git.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/images/linux/scripts/helpers/install.sh b/images/linux/scripts/helpers/install.sh index 232a7353d..414980bb2 100644 --- a/images/linux/scripts/helpers/install.sh +++ b/images/linux/scripts/helpers/install.sh @@ -13,7 +13,7 @@ download_with_retries() { local NAME="${3:-${URL##*/}}" local COMPRESSED="$4" - if [ $COMPRESSED == "compressed" ]; then + if [[ $COMPRESSED == "compressed" ]]; then COMMAND="curl $URL -4 -sL --compressed -o '$DEST/$NAME'" else COMMAND="curl $URL -4 -sL -o '$DEST/$NAME'" diff --git a/images/linux/scripts/installers/git.sh b/images/linux/scripts/installers/git.sh index aa1f0f1a0..cfd13898c 100644 --- a/images/linux/scripts/installers/git.sh +++ b/images/linux/scripts/installers/git.sh @@ -3,9 +3,11 @@ ## File: git.sh ## Desc: Installs Git ################################################################################ +set -e # Source the helpers for use with the script source "$HELPER_SCRIPTS"/document.sh +source "$HELPER_SCRIPTS"/install.sh ## Install git add-apt-repository ppa:git-core/ppa -y @@ -46,14 +48,12 @@ DocumentInstalledItem "Git Large File Storage (LFS) ($(git-lfs --version 2>&1 | DocumentInstalledItem "Git-ftp ($(git-ftp --version | cut -d ' ' -f 3))" #Install hub -TEMP_HUB=$(mktemp -d -t) -pushd "$TEMP_HUB" || exit -URL=$(curl -s https://api.github.com/repos/github/hub/releases/latest | jq -r '.assets[].browser_download_url | select(contains("hub-linux-amd64"))') -wget -P "$TEMP_HUB" "$URL" -tar xzvf "$TEMP_HUB"/hub-linux-amd64-*.tgz --strip-components 1 -mv bin/hub /usr/local/bin -rm -rf "$TEMP_HUB" -popd || exit +tmp_hub="/tmp/hub" +mkdir -p "$tmp_hub" +url=$(curl -s https://api.github.com/repos/github/hub/releases/latest | jq -r '.assets[].browser_download_url | select(contains("hub-linux-amd64"))') +download_with_retries "$url" "$tmp_hub" +tar xzvf /tmp/hub-linux-amd64-*.tgz --strip-components 1 -C "$tmp_hub" +mv "$tmp_hub"/bin/hub /usr/local/bin if command -v hub; then echo "hub CLI was installed successfully" From 197cc250ed3f236db3367629a6e7d8f9c8c74ff2 Mon Sep 17 00:00:00 2001 From: Paolo Mainardi Date: Mon, 31 Aug 2020 14:39:57 +0200 Subject: [PATCH 11/28] Code review: using a variable --- images/linux/scripts/installers/kubernetes-tools.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/kubernetes-tools.sh b/images/linux/scripts/installers/kubernetes-tools.sh index 4710d968d..f86f8abaa 100644 --- a/images/linux/scripts/installers/kubernetes-tools.sh +++ b/images/linux/scripts/installers/kubernetes-tools.sh @@ -24,8 +24,8 @@ curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux- sudo install minikube-linux-amd64 /usr/local/bin/minikube # Install kustomize -curl -s "https://raw.githubusercontent.com/\ -kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash +download_url="https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" +curl -s "$download_url" | bash mv kustomize /usr/local/bin # Run tests to determine that the software installed as expected @@ -60,4 +60,4 @@ DocumentInstalledItem "helm ($(helm version --short |& head -n 1))" # minikube version output already has word minikube in it. example minikube version: v1.9.2 DocumentInstalledItem "$(minikube version --short)" # kustomize version output has "{} in it". example {kustomize/v3.8.1 2020-07-16T00:58:46Z } -DocumentInstalledItem "kustomize ($(kustomize version --short))" \ No newline at end of file +DocumentInstalledItem "kustomize ($(kustomize version --short))" From 3b2abcd6ec8c789ad19e02b53545647232b66cd5 Mon Sep 17 00:00:00 2001 From: Paolo Mainardi Date: Mon, 31 Aug 2020 16:12:26 +0200 Subject: [PATCH 12/28] Fix untar path --- images/linux/scripts/installers/git.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/git.sh b/images/linux/scripts/installers/git.sh index cfd13898c..ae497458d 100644 --- a/images/linux/scripts/installers/git.sh +++ b/images/linux/scripts/installers/git.sh @@ -52,7 +52,7 @@ tmp_hub="/tmp/hub" mkdir -p "$tmp_hub" url=$(curl -s https://api.github.com/repos/github/hub/releases/latest | jq -r '.assets[].browser_download_url | select(contains("hub-linux-amd64"))') download_with_retries "$url" "$tmp_hub" -tar xzvf /tmp/hub-linux-amd64-*.tgz --strip-components 1 -C "$tmp_hub" +tar xzvf "$tmp_hub"/hub-linux-amd64-*.tgz --strip-components 1 -C "$tmp_hub" mv "$tmp_hub"/bin/hub /usr/local/bin if command -v hub; then From 2674d46accc6e61b85e8f140aeef807403fb83d8 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 1 Sep 2020 11:59:24 +0300 Subject: [PATCH 13/28] add az 4.6.0 to toolset (#1522) Co-authored-by: Dmitry Shibanov --- images/linux/toolsets/toolset-1604.json | 3 ++- images/linux/toolsets/toolset-1804.json | 3 ++- images/win/toolsets/toolset-2016.json | 3 ++- images/win/toolsets/toolset-2019.json | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index c2fe19c19..40ea0af4b 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -104,7 +104,8 @@ "3.5.0", "3.8.0", "4.3.0", - "4.4.0" + "4.4.0", + "4.6.0" ] } ] diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 6b4c9f088..1bd31b15d 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -100,7 +100,8 @@ "3.5.0", "3.8.0", "4.3.0", - "4.4.0" + "4.4.0", + "4.6.0" ] } ] diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index f01e9473c..a76246e60 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -120,7 +120,8 @@ "3.5.0", "3.8.0", "4.3.0", - "4.4.0" + "4.4.0", + "4.6.0" ] } ], diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index e29552df3..48af87df7 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -129,7 +129,8 @@ "3.5.0", "3.8.0", "4.3.0", - "4.4.0" + "4.4.0", + "4.6.0" ] } ], From 53993a9421a96efac9694cbbef7cb698be0f47b6 Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Tue, 1 Sep 2020 13:28:12 +0000 Subject: [PATCH 14/28] Updating readme file for ubuntu16 version 20200901.1 --- images/linux/Ubuntu1604-README.md | 50 ++++++++++++++++--------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index 56c643030..aaf93b3d6 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -1,12 +1,12 @@ # Ubuntu 16.04.7 LTS -The following software is installed on machines with the 20200825.1 update. +The following software is installed on machines with the 20200901.1 update. *** - 7-Zip 9.20 - Ansible (ansible 2.9.12) - AzCopy7 (available by azcopy alias) 7.3.0 - AzCopy10 (available by azcopy10 alias) 10.6.0 -- Azure CLI (azure-cli 2.10.1 *) +- Azure CLI (azure-cli 2.11.1) - Azure CLI (azure-devops 0.18.0) - Basic packages: - dnsutils @@ -66,7 +66,7 @@ The following software is installed on machines with the 20200825.1 update. - yamllint - libcurl3 - Alibaba Cloud CLI (3.0.56) -- AWS CLI (aws-cli/1.18.125 Python/2.7.12 Linux/4.15.0-1092-azure botocore/1.17.48) +- AWS CLI (aws-cli/1.18.129 Python/2.7.12 Linux/4.15.0-1092-azure botocore/1.17.52) - AWS CLI Session manager plugin (1.1.61.0) - build-essential - nvm (0.35.3) @@ -147,7 +147,7 @@ Target: x86_64-unknown-linux-gnu - 2.1.301 - 2.1.300 - Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 11.0.3) -- Firefox (Mozilla Firefox 79.0) +- Firefox (Mozilla Firefox 80.0) - Geckodriver (0.27.0); Gecko Driver is available via GECKOWEBDRIVER environment variable - GNU C++ 7.5.0 - GNU C++ 8.4.0 @@ -160,13 +160,13 @@ Target: x86_64-unknown-linux-gnu - Hub CLI (2.14.2) - GitHub CLI 0.11.1 - Google Chrome (Google Chrome 85.0.4183.83 ) -- ChromeDriver 85.0.4183.38 (9047dbc2c693f044042bbec5c91401c708c7c26a-refs/branch-heads/4183@{#779}); Chrome Driver is available via CHROMEWEBDRIVER environment variable +- ChromeDriver 85.0.4183.87 (cd6713ebf92fa1cacc0f1a598df280093af0c5d7-refs/branch-heads/4183@{#1689}); Chrome Driver is available via CHROMEWEBDRIVER environment variable - Google Cloud SDK (307.0.0) - Haskell Cabal (cabal-install version 3.2.0.0 compiled using version 3.2.0.0 of the Cabal library ) - GHC (The Glorious Glasgow Haskell Compilation System, version 8.10.2) - Haskell Stack (Version 2.3.3, Git revision cb44d51bed48b723a5deb08c3348c0b3ccfc437e x86_64 hpack-0.33.0) -- Heroku (heroku/7.42.10 linux-x64 node-v12.16.2) +- Heroku (heroku/7.42.13 linux-x64 node-v12.16.2) - HHVM (HipHop VM 4.56.1 (rel)) - ImageMagick - Azul Zulu OpenJDK: @@ -179,15 +179,16 @@ compiled using version 3.2.0.0 of the Cabal library ) - Gradle 6.6.1 - Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)) - Kind (kind v0.8.1 go1.14.2 linux/amd64) -- kubectl (Client Version: v1.18.8) -- helm (v3.3.0+g8a4aeec) +- kubectl (Client Version: v1.19.0) +- helm (v3.3.1+g249e521) - minikube version: v1.12.3 -- kustomize ({kustomize/v3.8.1 2020-07-16T00:58:46Z }) +- kustomize ({kustomize/v3.8.2 2020-08-29T17:44:01Z }) - oc CLI Client Version: 4.5.0-202005291417-9933eb9 - Leiningen (Leiningen 2.9.4 on Java 1.8.0_265 OpenJDK 64-Bit Server VM) - Mercurial (Mercurial Distributed SCM (version 4.4.1)) - Miniconda (conda 4.8.3) - Mono (Mono JIT compiler version 6.10.0.104 (tarball Fri Jun 26 19:43:02 UTC 2020)) +- NuGet (NuGet Version: 5.5.0.6382) - MySQL (mysql Ver 14.14 Distrib 5.7.31, for Linux (x86_64) using EditLine wrapper) - MySQL Server (user:root password:root) - MS SQL Server Client Tools @@ -201,7 +202,7 @@ Local version: Unknown) - TypeScript (Version 4.0.2) - Webpack (4.44.1) - Webpack CLI (3.3.12) -- Yarn (1.22.4) +- Yarn (1.22.5) - Newman (5.1.2) - Bazel (bazel 3.4.1) - Bazelisk (1.6.1) @@ -218,34 +219,35 @@ Local version: Unknown) - Pollinate - psql (PostgreSQL) 12.4 - Powershell (PowerShell 7.0.3) +- Pulumi v2.9.2 - ruby (2.3.1p112) - gem (3.1.4) - OpenSSL 1.1.0h 27 Mar 2018 (Library: OpenSSL 1.1.1g 21 Apr 2020) - Libssl 1.1.1g-1+ubuntu16.04.1+deb.sury.org+1 - R 4.0.2 - rustup (1.22.1) -- rust (1.45.2) -- cargo (1.45.1) -- rustfmt (1.4.17-stable) +- rust (1.46.0) +- cargo (1.46.0) +- rustfmt (1.4.18-stable) - clippy (0.0.212) -- rustdoc (1.45.2) +- rustdoc (1.46.0) - bindgen (0.55.1) - cbindgen (0.14.4) - cargo audit (0.12.0) - cargo outdated (v0.9.11) -- Julia (julia version 1.5.0) +- Julia (julia version 1.5.1) - sbt (1.3.13) - Selenium server standalone (available via SELENIUM_JAR_PATH environment variable) - Sphinx Open Source Search Server - Subversion (svn, version 1.9.3 (r1718519)) -- Terraform (Terraform v0.13.0) -- Packer (1.6.1) +- Terraform (Terraform v0.13.1) +- Packer (1.6.2) - Vcpkg 2020.06.15-unknownhash -- Vercel CLI (20.0.0) +- Vercel CLI (20.1.0) - MongoDB on Linux v4.4.0 - Haveged 1.9.1-3 - Swig 3.0.8 -- Netlify CLI (netlify-cli/2.59.1 linux-x64 node-v12.18.3) +- Netlify CLI (netlify-cli/2.59.3 linux-x64 node-v12.18.3) - Google Repository 58 - Google Play services 49 - Google APIs 24 @@ -320,10 +322,10 @@ Local version: Unknown) - Az Module (4.3.0) - Az Module (4.4.0) - Cached container images + - buildpack-deps:stretch (Digest: sha256:82a686ba95fdf2bf4a5f5264e8e55b8aa272ffcedaed7826777f08de0d9e1146) + - buildpack-deps:buster (Digest: sha256:0f7be4c25fadb2b8aee537cdac00a684b09057e66368683bbf22adf477e05faa) - node:10 (Digest: sha256:cf3ee6a5a1b1916c7a2e4fb51eb7ecba1afe186739677d62e9c1bb2cb1c7d6b0) - node:12 (Digest: sha256:d0738468dfc7cedb7d260369e0546fd7ee8731cfd67136f6023d070ad9679090) - - buildpack-deps:stretch (Digest: sha256:34a18637ed801407f7a17a29575e82264fb0818f9b6a0c890f8a6530afea43dc) - - buildpack-deps:buster (Digest: sha256:b9343e9ba16795186ab1f34825803f1d7e9b0943dba5d644d3c1de5473f0602e) - debian:9 (Digest: sha256:335ecf9e8d9b2206c2e9e7f8b09547faa9f868e694f7c5be14c38be15ea8a7cf) - debian:8 (Digest: sha256:8a0f2603166345b4d7bbf4842137b2ffcb492ece20d15f963f08aa26670f82c7) - node:12-alpine (Digest: sha256:9623cd396644f9b2e595d833dc0188a880333674488d939338ab5fde10ef7c43) @@ -357,7 +359,7 @@ Local version: Unknown) - node 8.17.0 - node 10.22.0 - node 12.18.3 - - node 14.8.0 + - node 14.9.0 - go: - go 1.11.13 - go 1.12.17 @@ -368,5 +370,5 @@ Local version: Unknown) - boost 1.69.0 - boost 1.72.0 - AWS SAM CLI, version 1.1.0 -- Homebrew on Linux (Homebrew 2.4.13 -Homebrew/linuxbrew-core (git revision 7d5ec; last commit 2020-08-24)) +- Homebrew on Linux (Homebrew 2.4.16 +Homebrew/linuxbrew-core (git revision d0486f; last commit 2020-09-01)) From 956c4284e4bd744b1f591432df08ce99f8d81d6e Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Tue, 1 Sep 2020 13:29:14 +0000 Subject: [PATCH 15/28] Updating readme file for ubuntu18 version 20200901.1 --- images/linux/Ubuntu1804-README.md | 54 ++++++++++++++++--------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 03ef00720..11cc81e81 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,12 +1,12 @@ # Ubuntu 18.04.5 LTS -The following software is installed on machines with the 20200825.1 update. +The following software is installed on machines with the 20200901.1 update. *** - 7-Zip 16.02 - Ansible (ansible 2.9.12) - AzCopy7 (available by azcopy alias) 7.3.0 - AzCopy10 (available by azcopy10 alias) 10.6.0 -- Azure CLI (azure-cli 2.10.1 *) +- Azure CLI (azure-cli 2.11.1) - Azure CLI (azure-devops 0.18.0) - Basic packages: - dnsutils @@ -65,7 +65,7 @@ The following software is installed on machines with the 20200825.1 update. - yamllint - libcurl3 - Alibaba Cloud CLI (3.0.56) -- AWS CLI (aws-cli/1.18.125 Python/2.7.17 Linux/5.3.0-1035-azure botocore/1.17.48) +- AWS CLI (aws-cli/1.18.129 Python/2.7.17 Linux/5.3.0-1035-azure botocore/1.17.52) - AWS CLI Session manager plugin (1.1.61.0) - build-essential - Clang 6.0 (6.0.0) @@ -74,7 +74,7 @@ The following software is installed on machines with the 20200825.1 update. - Swift version 5.2.5 (swift-5.2.5-RELEASE) Target: x86_64-unknown-linux-gnu - CMake (cmake version 3.17.0) -- Podman (2.0.4) +- Podman (2.0.5) - Buildah (1.15.1) - Skopeo (1.1.1) - Docker Compose (docker-compose version 1.26.2, build eefe0d31) @@ -148,7 +148,7 @@ Target: x86_64-unknown-linux-gnu - 2.1.301 - 2.1.300 - Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 11.0.3) -- Firefox (Mozilla Firefox 79.0) +- Firefox (Mozilla Firefox 80.0) - Geckodriver (0.27.0); Gecko Driver is available via GECKOWEBDRIVER environment variable - GNU C++ 7.5.0 - GNU C++ 8.4.0 @@ -161,14 +161,14 @@ Target: x86_64-unknown-linux-gnu - Hub CLI (2.14.2) - GitHub CLI 0.11.1 - Google Chrome (Google Chrome 85.0.4183.83 ) -- ChromeDriver 85.0.4183.38 (9047dbc2c693f044042bbec5c91401c708c7c26a-refs/branch-heads/4183@{#779}); Chrome Driver is available via CHROMEWEBDRIVER environment variable +- ChromeDriver 85.0.4183.87 (cd6713ebf92fa1cacc0f1a598df280093af0c5d7-refs/branch-heads/4183@{#1689}); Chrome Driver is available via CHROMEWEBDRIVER environment variable - Google Cloud SDK (307.0.0) - Haskell Cabal (cabal-install version 3.2.0.0 compiled using version 3.2.0.0 of the Cabal library ) - GHC (The Glorious Glasgow Haskell Compilation System, version 8.10.2) - Haskell Stack (Version 2.3.3, Git revision cb44d51bed48b723a5deb08c3348c0b3ccfc437e x86_64 hpack-0.33.0) -- Heroku (heroku/7.42.10 linux-x64 node-v12.16.2) -- HHVM (HipHop VM 4.71.0 (rel)) +- Heroku (heroku/7.42.13 linux-x64 node-v12.16.2) +- HHVM (HipHop VM 4.72.0 (rel)) - ImageMagick - Azul Zulu OpenJDK: - 7 (openjdk version "1.7.0_272") @@ -180,15 +180,16 @@ compiled using version 3.2.0.0 of the Cabal library ) - Gradle 6.6.1 - Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)) - Kind (kind v0.8.1 go1.14.2 linux/amd64) -- kubectl (Client Version: v1.18.8) -- helm (v3.3.0+g8a4aeec) +- kubectl (Client Version: v1.19.0) +- helm (v3.3.1+g249e521) - minikube version: v1.12.3 -- kustomize ({kustomize/v3.8.1 2020-07-16T00:58:46Z }) +- kustomize ({kustomize/v3.8.2 2020-08-29T17:44:01Z }) - oc CLI Client Version: 4.5.0-202005291417-9933eb9 - Leiningen (Leiningen 2.9.4 on Java 1.8.0_265 OpenJDK 64-Bit Server VM) - Mercurial (Mercurial Distributed SCM (version 4.5.3)) - Miniconda (conda 4.8.3) - Mono (Mono JIT compiler version 6.10.0.104 (tarball Fri Jun 26 19:38:24 UTC 2020)) +- NuGet (NuGet Version: 5.5.0.6382) - MySQL (mysql Ver 14.14 Distrib 5.7.31, for Linux (x86_64) using EditLine wrapper) - MySQL Server (user:root password:root) - MS SQL Server Client Tools @@ -203,7 +204,7 @@ Local version: Unknown) - TypeScript (Version 4.0.2) - Webpack (4.44.1) - Webpack CLI (3.3.12) -- Yarn (1.22.4) +- Yarn (1.22.5) - Newman (5.1.2) - Bazel (bazel 3.4.1) - Bazelisk (1.6.1) @@ -218,34 +219,35 @@ Local version: Unknown) - Pollinate - psql (PostgreSQL) 12.4 - Powershell (PowerShell 7.0.3) +- Pulumi v2.9.2 - ruby (2.5.1p57) - gem (3.1.4) - OpenSSL 1.1.1g 21 Apr 2020 - Libssl 1.1.1g-1+ubuntu18.04.1+deb.sury.org+1 - R 4.0.2 - rustup (1.22.1) -- rust (1.45.2) -- cargo (1.45.1) -- rustfmt (1.4.17-stable) +- rust (1.46.0) +- cargo (1.46.0) +- rustfmt (1.4.18-stable) - clippy (0.0.212) -- rustdoc (1.45.2) +- rustdoc (1.46.0) - bindgen (0.55.1) - cbindgen (0.14.4) - cargo audit (0.12.0) - cargo outdated (v0.9.11) -- Julia (julia version 1.5.0) +- Julia (julia version 1.5.1) - sbt (1.3.13) - Selenium server standalone (available via SELENIUM_JAR_PATH environment variable) - Sphinx Open Source Search Server - Subversion (svn, version 1.9.7 (r1800392)) -- Terraform (Terraform v0.13.0) -- Packer (1.6.1) +- Terraform (Terraform v0.13.1) +- Packer (1.6.2) - Vcpkg 2020.06.15-unknownhash -- Vercel CLI (20.0.0) +- Vercel CLI (20.1.0) - MongoDB on Linux v4.4.0 - Haveged 1.9.1-6 - Swig 3.0.12 -- Netlify CLI (netlify-cli/2.59.1 linux-x64 node-v12.18.3) +- Netlify CLI (netlify-cli/2.59.3 linux-x64 node-v12.18.3) - Google Repository 58 - Google Play services 49 - Google APIs 24 @@ -314,10 +316,10 @@ Local version: Unknown) - Az Module (4.3.0) - Az Module (4.4.0) - Cached container images + - buildpack-deps:stretch (Digest: sha256:82a686ba95fdf2bf4a5f5264e8e55b8aa272ffcedaed7826777f08de0d9e1146) + - buildpack-deps:buster (Digest: sha256:0f7be4c25fadb2b8aee537cdac00a684b09057e66368683bbf22adf477e05faa) - node:10 (Digest: sha256:cf3ee6a5a1b1916c7a2e4fb51eb7ecba1afe186739677d62e9c1bb2cb1c7d6b0) - node:12 (Digest: sha256:d0738468dfc7cedb7d260369e0546fd7ee8731cfd67136f6023d070ad9679090) - - buildpack-deps:stretch (Digest: sha256:34a18637ed801407f7a17a29575e82264fb0818f9b6a0c890f8a6530afea43dc) - - buildpack-deps:buster (Digest: sha256:b9343e9ba16795186ab1f34825803f1d7e9b0943dba5d644d3c1de5473f0602e) - debian:9 (Digest: sha256:335ecf9e8d9b2206c2e9e7f8b09547faa9f868e694f7c5be14c38be15ea8a7cf) - debian:8 (Digest: sha256:8a0f2603166345b4d7bbf4842137b2ffcb492ece20d15f963f08aa26670f82c7) - node:12-alpine (Digest: sha256:9623cd396644f9b2e595d833dc0188a880333674488d939338ab5fde10ef7c43) @@ -351,7 +353,7 @@ Local version: Unknown) - node 8.17.0 - node 10.22.0 - node 12.18.3 - - node 14.8.0 + - node 14.9.0 - go: - go 1.11.13 - go 1.12.17 @@ -362,5 +364,5 @@ Local version: Unknown) - boost 1.69.0 - boost 1.72.0 - AWS SAM CLI, version 1.1.0 -- Homebrew on Linux (Homebrew 2.4.13 -Homebrew/linuxbrew-core (git revision 7d5ec; last commit 2020-08-24)) +- Homebrew on Linux (Homebrew 2.4.16 +Homebrew/linuxbrew-core (git revision d0486f; last commit 2020-09-01)) From 210cb9cdbb790563d91fe5ae817ec55ccf07ec70 Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Tue, 1 Sep 2020 15:12:32 +0000 Subject: [PATCH 16/28] Updating readme file for ubuntu20 version 20200901.1 --- images/linux/Ubuntu2004-README.md | 56 ++++++++++++++++--------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index fb074ef38..7a78efab2 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,12 +1,12 @@ # Ubuntu 20.04.1 LTS -The following software is installed on machines with the 20200825.1 update. +The following software is installed on machines with the 20200901.1 update. *** - 7-Zip 16.02 - Ansible (ansible 2.9.6) - AzCopy7 (available by azcopy alias) 7.3.0 - AzCopy10 (available by azcopy10 alias) 10.6.0 -- Azure CLI (azure-cli 2.10.1 *) +- Azure CLI (azure-cli 2.11.1) - Azure CLI (azure-devops 0.18.0) - Basic packages: - dnsutils @@ -65,7 +65,7 @@ The following software is installed on machines with the 20200825.1 update. - yamllint - libcurl4 - Alibaba Cloud CLI (3.0.56) -- AWS CLI (aws-cli/2.0.42 Python/3.7.3 Linux/5.4.0-1022-azure exe/x86_64.ubuntu.20) +- AWS CLI (aws-cli/2.0.44 Python/3.7.3 Linux/5.4.0-1022-azure exe/x86_64.ubuntu.20) - AWS CLI Session manager plugin (1.1.61.0) - build-essential - Clang 6.0 (6.0.1) @@ -74,7 +74,7 @@ The following software is installed on machines with the 20200825.1 update. - Swift version 5.2.5 (swift-5.2.5-RELEASE) Target: x86_64-unknown-linux-gnu - CMake (cmake version 3.17.0) -- Podman (2.0.4) +- Podman (2.0.5) - Buildah (1.15.1) - Skopeo (1.1.1) - Docker Compose (docker-compose version 1.26.2, build eefe0d31) @@ -144,7 +144,7 @@ Target: x86_64-unknown-linux-gnu - 2.1.301 - 2.1.300 - Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 11.0.3) -- Firefox (Mozilla Firefox 79.0) +- Firefox (Mozilla Firefox 80.0) - Geckodriver (0.27.0); Gecko Driver is available via GECKOWEBDRIVER environment variable - GNU C++ 7.5.0 - GNU C++ 8.4.0 @@ -157,14 +157,14 @@ Target: x86_64-unknown-linux-gnu - Hub CLI (2.14.2) - GitHub CLI 0.11.1 - Google Chrome (Google Chrome 85.0.4183.83 ) -- ChromeDriver 85.0.4183.38 (9047dbc2c693f044042bbec5c91401c708c7c26a-refs/branch-heads/4183@{#779}); Chrome Driver is available via CHROMEWEBDRIVER environment variable +- ChromeDriver 85.0.4183.87 (cd6713ebf92fa1cacc0f1a598df280093af0c5d7-refs/branch-heads/4183@{#1689}); Chrome Driver is available via CHROMEWEBDRIVER environment variable - Google Cloud SDK (307.0.0) - Haskell Cabal (cabal-install version 3.2.0.0 compiled using version 3.2.0.0 of the Cabal library ) - GHC (The Glorious Glasgow Haskell Compilation System, version 8.10.2) - Haskell Stack (Version 2.3.3, Git revision cb44d51bed48b723a5deb08c3348c0b3ccfc437e x86_64 hpack-0.33.0) -- Heroku (heroku/7.42.10 linux-x64 node-v12.16.2) -- HHVM (HipHop VM 4.71.0 (rel)) +- Heroku (heroku/7.42.13 linux-x64 node-v12.16.2) +- HHVM (HipHop VM 4.72.0 (rel)) - ImageMagick - Adopt OpenJDK: - 8 (openjdk version "1.8.0_265") @@ -173,15 +173,16 @@ compiled using version 3.2.0.0 of the Cabal library ) - Gradle 6.6.1 - Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)) - Kind (kind v0.8.1 go1.14.2 linux/amd64) -- kubectl (Client Version: v1.18.8) -- helm (v3.3.0+g8a4aeec) +- kubectl (Client Version: v1.19.0) +- helm (v3.3.1+g249e521) - minikube version: v1.12.3 -- kustomize ({kustomize/v3.8.1 2020-07-16T00:58:46Z }) +- kustomize ({kustomize/v3.8.2 2020-08-29T17:44:01Z }) - oc CLI Client Version: 4.5.0-202005291417-9933eb9 - Leiningen (Leiningen 2.9.4 on Java 11.0.8 OpenJDK 64-Bit Server VM) - Mercurial (Mercurial Distributed SCM (version 5.3.1)) - Miniconda (conda 4.8.3) - Mono (Mono JIT compiler version 6.10.0.104 (tarball Fri Jun 26 19:38:44 UTC 2020)) +- NuGet (NuGet Version: 5.5.0.6382) - MySQL (mysql Ver 8.0.21-0ubuntu0.20.04.4 for Linux on x86_64 ((Ubuntu))) - MySQL Server (user:root password:root) - MS SQL Server Client Tools @@ -196,7 +197,7 @@ Local version: Unknown) - TypeScript (Version 4.0.2) - Webpack (4.44.1) - Webpack CLI (3.3.12) -- Yarn (1.22.4) +- Yarn (1.22.5) - Newman (5.1.2) - Bazel (bazel 3.4.1) - Bazelisk (1.6.1) @@ -213,35 +214,36 @@ apt-get update - Pollinate - psql (PostgreSQL) 12.4 - Powershell (PowerShell 7.0.3) +- Pulumi v2.9.2 - ruby (2.7.0p0) - gem (3.1.2) - OpenSSL 1.1.1f 31 Mar 2020 - Libssl 1.1.1f-1ubuntu2 - R 4.0.2 - rustup (1.22.1) -- rust (1.45.2) -- cargo (1.45.1) -- rustfmt (1.4.17-stable) +- rust (1.46.0) +- cargo (1.46.0) +- rustfmt (1.4.18-stable) - clippy (0.0.212) -- rustdoc (1.45.2) +- rustdoc (1.46.0) - bindgen (0.55.1) - cbindgen (0.14.4) - cargo audit (0.12.0) - cargo outdated (v0.9.11) -- Julia (julia version 1.5.0) +- Julia (julia version 1.5.1) - sbt (copying runtime jar... 1.3.13) - Selenium server standalone (available via SELENIUM_JAR_PATH environment variable) - Sphinx Open Source Search Server - Subversion (svn, version 1.13.0 (r1867053)) -- Terraform (Terraform v0.13.0) -- Packer (1.6.1) +- Terraform (Terraform v0.13.1) +- Packer (1.6.2) - Vcpkg 2020.06.15-unknownhash -- Vercel CLI (20.0.0) +- Vercel CLI (20.1.0) - MongoDB on Linux v4.4.0 - Haveged 1.9.1-6ubuntu1 - Swig 4.0.1 -- Netlify CLI (netlify-cli/2.59.1 linux-x64 node-v12.18.3) +- Netlify CLI (netlify-cli/2.59.3 linux-x64 node-v12.18.3) - Google Repository 58 - Google Play services 49 - CMake 3.10.2.4988404 @@ -266,12 +268,12 @@ apt-get update - Android SDK Build-Tools 27.0.1 - Android SDK Build-Tools 27.0.0 - Android NDK 21.3.6528147 -- Az Module (4.6.0) +- Az Module (4.6.1) - Cached container images + - buildpack-deps:stretch (Digest: sha256:82a686ba95fdf2bf4a5f5264e8e55b8aa272ffcedaed7826777f08de0d9e1146) + - buildpack-deps:buster (Digest: sha256:0f7be4c25fadb2b8aee537cdac00a684b09057e66368683bbf22adf477e05faa) - node:10 (Digest: sha256:cf3ee6a5a1b1916c7a2e4fb51eb7ecba1afe186739677d62e9c1bb2cb1c7d6b0) - node:12 (Digest: sha256:d0738468dfc7cedb7d260369e0546fd7ee8731cfd67136f6023d070ad9679090) - - buildpack-deps:stretch (Digest: sha256:34a18637ed801407f7a17a29575e82264fb0818f9b6a0c890f8a6530afea43dc) - - buildpack-deps:buster (Digest: sha256:b9343e9ba16795186ab1f34825803f1d7e9b0943dba5d644d3c1de5473f0602e) - debian:9 (Digest: sha256:335ecf9e8d9b2206c2e9e7f8b09547faa9f868e694f7c5be14c38be15ea8a7cf) - debian:8 (Digest: sha256:8a0f2603166345b4d7bbf4842137b2ffcb492ece20d15f963f08aa26670f82c7) - node:12-alpine (Digest: sha256:9623cd396644f9b2e595d833dc0188a880333674488d939338ab5fde10ef7c43) @@ -304,10 +306,10 @@ apt-get update - node 8.17.0 - node 10.22.0 - node 12.18.3 - - node 14.8.0 + - node 14.9.0 - go: - go 1.14.7 - go 1.15.0 - AWS SAM CLI, version 1.1.0 -- Homebrew on Linux (Homebrew 2.4.13 -Homebrew/linuxbrew-core (git revision 7d5ec; last commit 2020-08-24)) +- Homebrew on Linux (Homebrew 2.4.16 +Homebrew/linuxbrew-core (git revision d0486f; last commit 2020-09-01)) From ff1423cd6f345ef56adcf8e3e8585908f742f740 Mon Sep 17 00:00:00 2001 From: "no-reply@microsoft.com" Date: Wed, 2 Sep 2020 07:17:20 +0000 Subject: [PATCH 17/28] Updating readme file for macos-10.15 version 20200829.1 --- images/macos/macos-10.15-Readme.md | 198 +++++++++++++++-------------- 1 file changed, 101 insertions(+), 97 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index bf4c9a247..2e0227806 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,7 +1,7 @@ # macOS info - System Version: macOS 10.15.6 (19G2021) - Kernel Version: Darwin 19.6.0 -- Image Version: 20200825.1 +- Image Version: 20200829.1 ## Installed Software ### Language and Runtime @@ -12,7 +12,7 @@ - GNU Fortran (Homebrew GCC 9.3.0) 9.3.0 — available by `gfortran-9` alias - Node.js v12.18.3 - NVM 0.35.3 -- NVM - Cached node versions: v6.17.1 v8.17.0 v10.22.0 v12.18.3 v13.14.0 v14.8.0 +- NVM - Cached node versions: v6.17.1 v8.17.0 v10.22.0 v12.18.3 v13.14.0 v14.9.0 - Python 2.7.17 - Python 3.8.5 - Ruby 2.6.6p146 @@ -20,16 +20,16 @@ - R 4.0.2 - Go 1.15 - PHP 7.4.9 -- julia 1.5.0 +- julia 1.5.1 ### Package Management - Vcpkg 2020.06.15 - Bundler version 2.1.4 - Carthage 0.35.0 - CocoaPods 1.9.3 -- Homebrew 2.4.13 +- Homebrew 2.4.14 - NPM 6.14.6 -- Yarn 1.22.4 +- Yarn 1.22.5 - NuGet 5.6.0.6489 - Pip 19.3.1 (python 2.7) - Pip 20.1.1 (python 3.8) @@ -50,8 +50,8 @@ - Hub CLI: 2.14.2 - GNU Wget 1.20.3 - Subversion (SVN) 1.14.0 -- Packer 1.6.1 -- GNU parallel 20200822 +- Packer 1.6.2 +- GNU parallel 20200722 - OpenSSL 1.0.2t 10 Sep 2019 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl/1.0.2t)` - jq 1.6 - gpg (GnuPG) 2.2.21 @@ -72,30 +72,30 @@ ### Tools -- Fastlane 2.156.1 +- Fastlane 2.157.2 - Cmake 3.18.2 -- App Center CLI 2.6.6 -- Azure CLI 2.11.0 -- AWS CLI 2.0.42 +- App Center CLI 2.6.7 +- Azure CLI 2.11.1 +- AWS CLI 2.0.44 - AWS SAM CLI 1.1.0 - AWS Session Manager CLI 1.1.61.0 - Aliyun CLI 3.0.56 - GHCup v0.1.10 -- GHC 8.10.2 +- GHC 9.0.0 - Cabal 3.2.0.0 - Stack 2.3.3 ### Linters - yamllint 1.24.2 -- SwiftLint 0.40.0 +- SwiftLint 0.40.1 ### Browsers - Safari 13.1.2 (15609.3.5.1.3) - SafariDriver 13.1.2 (15609.3.5.1.3) - Google Chrome 85.0.4183.83 -- ChromeDriver 84.0.4147.30 -- Microsoft Edge 84.0.522.63 -- MSEdgeDriver 84.0.522.63 +- ChromeDriver 85.0.4183.87 +- Microsoft Edge 85.0.564.41 +- MSEdgeDriver 85.0.564.41 - Mozilla Firefox 80.0 - geckodriver 0.27.0 @@ -130,7 +130,7 @@ - 8.17.0 - 10.22.0 - 12.18.3 -- 14.8.0 +- 14.9.0 #### Go - 1.11.13 @@ -140,7 +140,7 @@ - 1.15.0 ### Rust Tools -- Rust 1.45.2 +- Rust 1.46.0 - Rustup 1.22.1 #### Packages @@ -155,13 +155,13 @@ #### PowerShell Modules | Module | Version | | ---------- | ------- | -| Az | 4.6.0 | +| Az | 4.6.1 | | MarkdownPS | 1.9 | | Pester | 5.0.3 | ### Xamarin #### Visual Studio for Mac -- 8.7.3.13 +- 8.7.4.38 #### Mono - 6.12.0.90 @@ -203,18 +203,19 @@ - NUnit 3.6.1 ### Xcode -| Version | Build | Path | -| -------------- | -------- | ------------------------------- | -| 12.0 (beta) | 12A8189n | /Applications/Xcode_12_beta.app | -| 11.6 (default) | 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.0 (beta) | 12A8189n | /Applications/Xcode_12_beta.app | +| 11.7 (beta) | 11E801a | /Applications/Xcode_11.7_beta.app | +| 11.6 (default) | 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 - Nomad CLI 3.1.4 @@ -224,73 +225,76 @@ - xcversion 2.6.6 #### Installed SDKs -| SDK | SDK Name | Xcode Version | -| ----------------------- | -------------------- | ---------------------------------------------------- | -| macOS 10.14 | macosx10.14 | 10.3 | -| macOS 10.15 | macosx10.15 | 11.0, 11.1, 11.2.1, 11.3.1, 11.4, 11.4.1, 11.5, 11.6 | -| macOS 11.0 | macosx11.0 | 12.0 | -| 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.1, 11.3.1 | -| iOS 13.4 | iphoneos13.4 | 11.4, 11.4.1 | -| iOS 13.5 | iphoneos13.5 | 11.5 | -| iOS 13.6 | iphoneos13.6 | 11.6 | -| iOS 14.0 | iphoneos14.0 | 12.0 | -| 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.1, 11.3.1 | -| Simulator - iOS 13.4 | iphonesimulator13.4 | 11.4, 11.4.1 | -| Simulator - iOS 13.5 | iphonesimulator13.5 | 11.5 | -| Simulator - iOS 13.6 | iphonesimulator13.6 | 11.6 | -| Simulator - iOS 14.0 | iphonesimulator14.0 | 12.0 | -| tvOS 12.4 | appletvos12.4 | 10.3 | -| tvOS 13.0 | appletvos13.0 | 11.0, 11.1 | -| tvOS 13.2 | appletvos13.2 | 11.2.1, 11.3.1 | -| tvOS 13.4 | appletvos13.4 | 11.4, 11.4.1, 11.5, 11.6 | -| tvOS 14.0 | appletvos14.0 | 12.0 | -| 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.1, 11.3.1 | -| Simulator - tvOS 13.4 | appletvsimulator13.4 | 11.4, 11.4.1, 11.5, 11.6 | -| Simulator - tvOS 14.0 | appletvsimulator14.0 | 12.0 | -| watchOS 5.3 | watchos5.3 | 10.3 | -| watchOS 6.0 | watchos6.0 | 11.0, 11.1 | -| watchOS 6.1 | watchos6.1 | 11.2.1, 11.3.1 | -| watchOS 6.2 | watchos6.2 | 11.4, 11.4.1, 11.5, 11.6 | -| watchOS 7.0 | watchos7.0 | 12.0 | -| 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.1, 11.3.1 | -| Simulator - watchOS 6.2 | watchsimulator6.2 | 11.4, 11.4.1, 11.5, 11.6 | -| Simulator - watchOS 7.0 | watchsimulator7.0 | 12.0 | -| DriverKit 19.0 | driverkit.macosx19.0 | 11.0, 11.1, 11.2.1, 11.3.1, 11.4, 11.4.1, 11.5, 11.6 | -| DriverKit 20.0 | driverkit.macosx20.0 | 12.0 | +| SDK | SDK Name | Xcode Version | +| ----------------------- | -------------------- | ---------------------------------------------------------- | +| macOS 10.14 | macosx10.14 | 10.3 | +| macOS 10.15 | macosx10.15 | 11.0, 11.1, 11.2.1, 11.3.1, 11.4, 11.4.1, 11.5, 11.6, 11.7 | +| macOS 11.0 | macosx11.0 | 12.0 | +| 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.1, 11.3.1 | +| iOS 13.4 | iphoneos13.4 | 11.4, 11.4.1 | +| iOS 13.5 | iphoneos13.5 | 11.5 | +| iOS 13.6 | iphoneos13.6 | 11.6 | +| iOS 13.7 | iphoneos13.7 | 11.7 | +| iOS 14.0 | iphoneos14.0 | 12.0 | +| 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.1, 11.3.1 | +| Simulator - iOS 13.4 | iphonesimulator13.4 | 11.4, 11.4.1 | +| Simulator - iOS 13.5 | iphonesimulator13.5 | 11.5 | +| Simulator - iOS 13.6 | iphonesimulator13.6 | 11.6 | +| Simulator - iOS 13.7 | iphonesimulator13.7 | 11.7 | +| Simulator - iOS 14.0 | iphonesimulator14.0 | 12.0 | +| tvOS 12.4 | appletvos12.4 | 10.3 | +| tvOS 13.0 | appletvos13.0 | 11.0, 11.1 | +| tvOS 13.2 | appletvos13.2 | 11.2.1, 11.3.1 | +| tvOS 13.4 | appletvos13.4 | 11.4, 11.4.1, 11.5, 11.6, 11.7 | +| tvOS 14.0 | appletvos14.0 | 12.0 | +| 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.1, 11.3.1 | +| Simulator - tvOS 13.4 | appletvsimulator13.4 | 11.4, 11.4.1, 11.5, 11.6, 11.7 | +| Simulator - tvOS 14.0 | appletvsimulator14.0 | 12.0 | +| watchOS 5.3 | watchos5.3 | 10.3 | +| watchOS 6.0 | watchos6.0 | 11.0, 11.1 | +| watchOS 6.1 | watchos6.1 | 11.2.1, 11.3.1 | +| watchOS 6.2 | watchos6.2 | 11.4, 11.4.1, 11.5, 11.6, 11.7 | +| watchOS 7.0 | watchos7.0 | 12.0 | +| 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.1, 11.3.1 | +| Simulator - watchOS 6.2 | watchsimulator6.2 | 11.4, 11.4.1, 11.5, 11.6, 11.7 | +| Simulator - watchOS 7.0 | watchsimulator7.0 | 12.0 | +| DriverKit 19.0 | driverkit.macosx19.0 | 11.0, 11.1, 11.2.1, 11.3.1, 11.4, 11.4.1, 11.5, 11.6, 11.7 | +| DriverKit 20.0 | driverkit.macosx20.0 | 12.0 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| 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.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.3 | 11.3.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.4 | 11.4
11.4.1 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | -| iOS 13.5 | 11.5 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | -| iOS 13.6 | 11.6 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | -| iOS 14.0 | 12.0 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | -| 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.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 13.3 | 11.3.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 13.4 | 11.4
11.4.1
11.5
11.6 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 14.0 | 12.0 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| 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.1
11.3.1 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | -| watchOS 6.2 | 11.4
11.4.1
11.5
11.6 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | -| watchOS 7.0 | 12.0 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | +| OS | Xcode Version | Simulators | +| ----------- | -------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| 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.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.3 | 11.3.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.4 | 11.4
11.4.1 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | +| iOS 13.5 | 11.5 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | +| iOS 13.6 | 11.6 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | +| iOS 13.7 | 11.7 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | +| iOS 14.0 | 12.0 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | +| 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.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 13.3 | 11.3.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 13.4 | 11.4
11.4.1
11.5
11.6
11.7 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 14.0 | 12.0 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| 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.1
11.3.1 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | +| watchOS 6.2 | 11.4
11.4.1
11.5
11.6
11.7 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | +| watchOS 7.0 | 12.0 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | ### Android #### Android SDK Tools From af06b80d9863def7314f6cfa2ae54633b97fc056 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Thu, 3 Sep 2020 18:23:08 +0300 Subject: [PATCH 18/28] fix output announcements --- images/linux/scripts/installers/preparemetadata.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/preparemetadata.sh b/images/linux/scripts/installers/preparemetadata.sh index 8342cfe11..9e8aef1e1 100644 --- a/images/linux/scripts/installers/preparemetadata.sh +++ b/images/linux/scripts/installers/preparemetadata.sh @@ -9,8 +9,8 @@ source $HELPER_SCRIPTS/document.sh WriteItem "" -if [ $ANNOUNCEMENTS ]; then - WriteItem $ANNOUNCEMENTS +if [ -n "$ANNOUNCEMENTS" ]; then + WriteItem "$ANNOUNCEMENTS" WriteItem "***" fi From 9129c68e36225aa5a60a51fc231a5781f6dd3038 Mon Sep 17 00:00:00 2001 From: "Andrey Mishechkin (GITHUB INC)" Date: Fri, 4 Sep 2020 12:09:39 +0400 Subject: [PATCH 19/28] Microsoft.VisualStudio.ComponentGroup.UWP.VC has been added to toolset 2019 --- images/win/toolsets/toolset-2019.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 48af87df7..a2a7ec4a5 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -239,6 +239,7 @@ "Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang", "Microsoft.VisualStudio.ComponentGroup.Web.CloudTools", + "Microsoft.VisualStudio.ComponentGroup.UWP.VC", "Microsoft.VisualStudio.Workload.Azure", "Microsoft.VisualStudio.Workload.Data", "Microsoft.VisualStudio.Workload.DataScience", From 865b3bf4cd0c6d0b24dbab6afbc693a2263d2627 Mon Sep 17 00:00:00 2001 From: "no-reply@microsoft.com" Date: Tue, 8 Sep 2020 06:56:18 +0000 Subject: [PATCH 20/28] Updating readme file for macos-10.15 version 20200903.1 --- images/macos/macos-10.15-Readme.md | 64 ++++++++++++++++-------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 2e0227806..325d4c7e7 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,7 +1,11 @@ -# macOS info +| Announcements | +|-| +| [Xcode 11.7 will be set as a default one on September, 9](https://github.com/actions/virtual-environments/issues/1537) | +*** +# macOS 10.15 info - System Version: macOS 10.15.6 (19G2021) - Kernel Version: Darwin 19.6.0 -- Image Version: 20200829.1 +- Image Version: 20200903.1 ## Installed Software ### Language and Runtime @@ -19,7 +23,7 @@ - .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 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 - R 4.0.2 - Go 1.15 -- PHP 7.4.9 +- PHP 7.4.10 - julia 1.5.1 ### Package Management @@ -27,7 +31,7 @@ - Bundler version 2.1.4 - Carthage 0.35.0 - CocoaPods 1.9.3 -- Homebrew 2.4.14 +- Homebrew 2.4.16 - NPM 6.14.6 - Yarn 1.22.5 - NuGet 5.6.0.6489 @@ -45,7 +49,7 @@ ### Utilities - Curl 7.72.0 - Git: 2.28.0 -- Git LFS: 2.11.0 +- Git LFS: 2.12.0 - GitHub CLI: 0.11.1 - Hub CLI: 2.14.2 - GNU Wget 1.20.3 @@ -54,30 +58,30 @@ - GNU parallel 20200722 - OpenSSL 1.0.2t 10 Sep 2019 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl/1.0.2t)` - jq 1.6 -- gpg (GnuPG) 2.2.21 +- gpg (GnuPG) 2.2.22 - psql (PostgreSQL) 12.4 - PostgreSQL 12.4 - aria2 1.35.0 - azcopy 10.6.0 - zstd 1.4.5 -- bazel 3.4.1 +- bazel 3.5.0 - bazelisk 1.6.1 -- helm v3.3.0+g8a4aeec +- helm v3.3.1+g249e521 - virtualbox 6.1.12r139181 - mongo v4.4.0 - mongod v4.4.0 - Vagrant 2.2.10 - 7-Zip 16.02 -- Newman 5.1.2 +- Newman 5.2.0 ### Tools -- Fastlane 2.157.2 +- Fastlane fastlane - Cmake 3.18.2 - App Center CLI 2.6.7 - Azure CLI 2.11.1 - AWS CLI 2.0.44 -- AWS SAM CLI 1.1.0 +- AWS SAM CLI 1.2.0 - AWS Session Manager CLI 1.1.61.0 - Aliyun CLI 3.0.56 - GHCup v0.1.10 @@ -94,9 +98,9 @@ - SafariDriver 13.1.2 (15609.3.5.1.3) - Google Chrome 85.0.4183.83 - ChromeDriver 85.0.4183.87 -- Microsoft Edge 85.0.564.41 -- MSEdgeDriver 85.0.564.41 -- Mozilla Firefox 80.0 +- Microsoft Edge 85.0.564.44 +- MSEdgeDriver 85.0.564.44 +- Mozilla Firefox 80.0.1 - geckodriver 0.27.0 ### Java @@ -136,8 +140,8 @@ - 1.11.13 - 1.12.17 - 1.13.15 -- 1.14.7 -- 1.15.0 +- 1.14.8 +- 1.15.1 ### Rust Tools - Rust 1.46.0 @@ -157,7 +161,7 @@ | ---------- | ------- | | Az | 4.6.1 | | MarkdownPS | 1.9 | -| Pester | 5.0.3 | +| Pester | 5.0.4 | ### Xamarin #### Visual Studio for Mac @@ -203,19 +207,19 @@ - NUnit 3.6.1 ### Xcode -| Version | Build | Path | -| -------------- | -------- | --------------------------------- | -| 12.0 (beta) | 12A8189n | /Applications/Xcode_12_beta.app | -| 11.7 (beta) | 11E801a | /Applications/Xcode_11.7_beta.app | -| 11.6 (default) | 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.0 (beta) | 12A8189n | /Applications/Xcode_12_beta.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 | #### Xcode Support Tools - Nomad CLI 3.1.4 From 5b40c3de56addd8f65e38244c5a950c0762fc227 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Tue, 8 Sep 2020 10:21:52 +0300 Subject: [PATCH 21/28] Update macos-10.15-Readme.md --- images/macos/macos-10.15-Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 325d4c7e7..3c57b80b5 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -76,7 +76,7 @@ ### Tools -- Fastlane fastlane +- Fastlane 2.157.2 - Cmake 3.18.2 - App Center CLI 2.6.7 - Azure CLI 2.11.1 From 54978f0e06d7339440d749015c2656404d53fd21 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Tue, 8 Sep 2020 10:48:31 +0300 Subject: [PATCH 22/28] Add VS build tools installation for Windows (#1533) * add VS build tools installation, tests, reports, made minor changes to current VS install helper functions * Vstype typo * removed unused variable * validate set for new functions * some variable names clarifications * test parameter error * style and syntax improvments * syntax notation Co-authored-by: Leonid Lapshin --- .../scripts/ImageHelpers/ImageHelpers.psm1 | 3 +- .../scripts/ImageHelpers/InstallHelpers.ps1 | 28 --------- .../ImageHelpers/VisualStudioHelpers.ps1 | 57 ++++++++++++++++--- images/win/scripts/Installers/Install-VS.ps1 | 25 ++++---- .../SoftwareReport.Generator.ps1 | 7 ++- .../SoftwareReport.VisualStudio.psm1 | 10 ++-- .../scripts/Tests/SSDTExtensions.Tests.ps1 | 4 +- .../win/scripts/Tests/VisualStudio.Tests.ps1 | 18 ++++-- images/win/scripts/Tests/WDK.Tests.ps1 | 2 +- images/win/scripts/Tests/Wix.Tests.ps1 | 4 +- images/win/toolsets/toolset-2016.json | 3 + images/win/toolsets/toolset-2019.json | 3 + 12 files changed, 96 insertions(+), 68 deletions(-) diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 index e150e1a12..07b406621 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 +++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 @@ -35,8 +35,7 @@ Export-ModuleMember -Function @( 'Get-EnvironmentVariable' 'Invoke-PesterTests' 'Get-VsCatalogJsonPath' - 'Get-VisualStudioPath' 'Install-AndroidSDKPackages' - 'Get-VisualStudioPackages' + 'Get-VisualStudioProduct' 'Get-VisualStudioComponents' ) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 282c03762..9f1a32f6a 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -258,34 +258,6 @@ function Install-VsixExtension } } -function Get-VSExtensionVersion -{ - Param - ( - [Parameter(Mandatory=$true)] - [string] $packageName - ) - - $instanceFolders = Get-ChildItem -Path "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances" - if ($instanceFolders -is [array]) - { - Write-Host "More than one instance installed" - exit 1 - } - - $stateContent = Get-Content -Path (Join-Path $instanceFolders.FullName '\state.packages.json') - $state = $stateContent | ConvertFrom-Json - $packageVersion = ($state.packages | Where-Object { $_.id -eq $packageName }).version - - if (-not $packageVersion) - { - Write-Host "installed package $packageName for Visual Studio 2019 was not found" - exit 1 - } - - return $packageVersion -} - function Get-ToolcachePackages { $toolcachePath = Join-Path $env:ROOT_FOLDER "toolcache.json" diff --git a/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1 b/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1 index 0fd6bc8b6..d9478390f 100644 --- a/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1 @@ -60,21 +60,60 @@ Function Install-VisualStudio } } +function Get-VisualStudioInstancePath { + return "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances\" + (Get-VisualStudioProduct -ProductType "VisualStudio").InstanceId +} + function Get-VsCatalogJsonPath { - $instanceFolder = Get-Item "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances\*" | Select-Object -First 1 - return Join-Path $instanceFolder.FullName "catalog.json" + return Join-Path (Get-VisualStudioInstancePath) "catalog.json" } -function Get-VisualStudioPath { - return (Get-VSSetupInstance | Select-VSSetupInstance -Product *).InstallationPath -} +function Get-VisualStudioProduct { + Param + ( + [Parameter(Mandatory)] + [ValidateSet('VisualStudio','BuildTools')] + [String] $ProductType + ) -function Get-VisualStudioPackages { - return (Get-VSSetupInstance | Select-VSSetupInstance -Product *).Packages + if ($ProductType -eq "VisualStudio") + { + $VSSelectionType = "*Enterprise*" + } + elseif ($ProductType -eq "BuildTools") + { + $VSSelectionType = "*Build*" + } + return Get-VSSetupInstance | Where-Object -Property DisplayName -like $VSSelectionType } function Get-VisualStudioComponents { - Get-VisualStudioPackages | Where-Object type -in 'Component', 'Workload' | + Param + ( + [Parameter(Mandatory)] + [String] $ProductType + ) + (Get-VisualStudioProduct -ProductType $ProductType).Packages | Where-Object type -in 'Component', 'Workload' | Sort-Object Id, Version | Select-Object @{n = 'Package'; e = {$_.Id}}, Version | Where-Object { $_.Package -notmatch "[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}" } -} \ No newline at end of file +} + +function Get-VSExtensionVersion +{ + Param + ( + [Parameter(Mandatory=$true)] + [string] $PackageName + ) + + $state = Get-Content -Path (Join-Path (Get-VisualStudioInstancePath) '\state.packages.json') | ConvertFrom-Json + $packageVersion = ($state.packages | Where-Object { $_.id -eq $PackageName }).version + + if (-not $packageVersion) + { + Write-Host "installed package $PackageName for Visual Studio 2019 was not found" + exit 1 + } + + return $packageVersion +} diff --git a/images/win/scripts/Installers/Install-VS.ps1 b/images/win/scripts/Installers/Install-VS.ps1 index ed4fca73f..be776dded 100644 --- a/images/win/scripts/Installers/Install-VS.ps1 +++ b/images/win/scripts/Installers/Install-VS.ps1 @@ -1,38 +1,35 @@ ################################################################################ ## File: Install-VS.ps1 -## Desc: Install Visual Studio +## Desc: Install Visual Studio and build tools ################################################################################ $ErrorActionPreference = "Stop" $toolset = Get-ToolsetContent $requiredComponents = $toolset.visualStudio.workloads | ForEach-Object { "--add $_" } +$buildToolsRequiredComponents = $toolset.visualStudio.buildtools_workloads | ForEach-Object { "--add $_" } $workLoads = @( "--allWorkloads --includeRecommended" $requiredComponents "--remove Component.CPython3.x64" ) $workLoadsArgument = [String]::Join(" ", $workLoads) +$buildToolsWorkloads= @( + "--includeRecommended" + $buildToolsRequiredComponents +) +$buildWorkLoadsArgument = [String]::Join(" ", $buildToolsWorkloads) $releaseInPath = $toolset.visualStudio.edition $subVersion = $toolset.visualStudio.subversion $bootstrapperUrl = "https://aka.ms/vs/${subVersion}/release/vs_${releaseInPath}.exe" +$buildbootstrapperUrl = "https://aka.ms/vs/${subVersion}/release/vs_buildtools.exe" -# Install VS +# Install VS and VS Build tools Install-VisualStudio -BootstrapperUrl $bootstrapperUrl -WorkLoads $workLoadsArgument +Install-VisualStudio -BootstrapperUrl $buildbootstrapperUrl -WorkLoads $buildWorkLoadsArgument -# Find the version of VS installed for this instance -# Only supports a single instance -$vsProgramData = Get-Item -Path "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances" -$instanceFolders = Get-ChildItem -Path $vsProgramData.FullName - -if ($instanceFolders -is [array]) -{ - Write-Host "More than one instance installed" - exit 1 -} - -$vsInstallRoot = Get-VisualStudioPath +$vsInstallRoot = (Get-VisualStudioProduct -ProductType "VisualStudio").InstallationPath # Initialize Visual Studio Experimental Instance & "$vsInstallRoot\Common7\IDE\devenv.exe" /RootSuffix Exp /ResetSettings General.vssettings /Command File.Exit diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index eb8b35f0d..5ff886c77 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -171,7 +171,12 @@ $markdown += New-MDNewLine $markdown += New-MDHeader "Workloads, components and extensions:" -Level 4 $markdown += New-MDNewLine -$markdown += ((Get-VisualStudioComponents) + (Get-VisualStudioExtensions)) | New-MDTable +$markdown += ((Get-VisualStudioComponents -ProductType "VisualStudio") + (Get-VisualStudioExtensions)) | New-MDTable +$markdown += New-MDNewLine + +$markdown += New-MDHeader "Build Tools Workloads:" -Level 4 +$markdown += New-MDNewLine +$markdown += (Get-VisualStudioComponents -ProductType "BuildTools") | New-MDTable $markdown += New-MDNewLine $markdown += New-MDHeader "Microsoft Visual C++:" -Level 4 diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 index 0004c168b..9427ccc3b 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 @@ -23,18 +23,18 @@ function Get-VisualStudioExtensions { # Wix $vs = (Get-VisualStudioVersion).Name.Split()[-1] $wixPackageVersion = Get-WixVersion - $wixExtensionVersion = (Get-VisualStudioPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version + $wixExtensionVersion = ((Get-VisualStudioProduct -ProductType "VisualStudio").Packages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version # WDK - $wdkPackageVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit' + $wdkPackageVersion = Get-VSExtensionVersion -PackageName 'Microsoft.Windows.DriverKit' $wdkExtensionVersion = Get-WDKVersion # SSDT - $analysisPackageVersion = Get-VSExtensionVersion -packageName '04a86fc2-dbd5-4222-848e-911638e487fe' - $reportingPackageVersion = Get-VSExtensionVersion -packageName '717ad572-c4b7-435c-c166-c2969777f718' + $analysisPackageVersion = Get-VSExtensionVersion -PackageName '04a86fc2-dbd5-4222-848e-911638e487fe' + $reportingPackageVersion = Get-VSExtensionVersion -PackageName '717ad572-c4b7-435c-c166-c2969777f718' $integrationPackageName = ($vs -match "2019") ? '851E7A09-7B2B-4F06-A15D-BABFCB26B970' : 'D1B09713-C12E-43CC-9EF4-6562298285AB' - $integrationPackageVersion = Get-VSExtensionVersion -packageName $integrationPackageName + $integrationPackageVersion = Get-VSExtensionVersion -PackageName $integrationPackageName $extensions = @( @{Package = 'SSDT Microsoft Analysis Services Projects'; Version = $analysisPackageVersion} diff --git a/images/win/scripts/Tests/SSDTExtensions.Tests.ps1 b/images/win/scripts/Tests/SSDTExtensions.Tests.ps1 index 7d1c6ee0b..5b6031de5 100644 --- a/images/win/scripts/Tests/SSDTExtensions.Tests.ps1 +++ b/images/win/scripts/Tests/SSDTExtensions.Tests.ps1 @@ -9,12 +9,12 @@ Describe "SSDTExtensions" { ) It "Extensions id=" -TestCases $testExtenions { - $version = Get-VSExtensionVersion -packageName "${id}" + $version = Get-VSExtensionVersion -PackageName "${id}" $version | Should -Not -BeNullOrEmpty } } else { It "Extension SSDT" { - $version = Get-VSExtensionVersion -packageName "SSDT" + $version = Get-VSExtensionVersion -PackageName "SSDT" $version | Should -Not -BeNullOrEmpty } } diff --git a/images/win/scripts/Tests/VisualStudio.Tests.ps1 b/images/win/scripts/Tests/VisualStudio.Tests.ps1 index 142a9917e..56869cc91 100644 --- a/images/win/scripts/Tests/VisualStudio.Tests.ps1 +++ b/images/win/scripts/Tests/VisualStudio.Tests.ps1 @@ -5,17 +5,27 @@ Describe "Visual Studio" { } It "Devenv.exe" { - $vsInstallRoot = Get-VisualStudioPath + $vsInstallRoot = (Get-VisualStudioProduct -ProductType "VisualStudio").InstallationPath $devenvexePath = "${vsInstallRoot}\Common7\IDE\devenv.exe" $devenvexePath | Should -Exist } } Context "Visual Studio components" { - $expectedComponents = Get-ToolsetContent | Select-Object -ExpandProperty visualStudio | Select-Object -ExpandProperty workloads - $testCases = $expectedComponents | ForEach-Object { @{ComponentName = $_} } + $testCases = (Get-ToolsetContent).visualStudio.workloads | ForEach-Object { @{ComponentName = $_} } BeforeAll { - $installedComponents = Get-VisualStudioComponents | Select-Object -ExpandProperty Package + $installedComponents = Get-VisualStudioComponents -ProductType "VisualStudio" | Select-Object -ExpandProperty Package + } + + It "" -TestCases $testCases { + $installedComponents | Should -Contain $ComponentName + } + } + + Context "Visual Studio Build Tools components" { + $testCases = (Get-ToolsetContent).visualStudio.buildtools_workloads | ForEach-Object { @{ComponentName = $_} } + BeforeAll { + $installedComponents = Get-VisualStudioComponents -ProductType "BuildTools" | Select-Object -ExpandProperty Package } It "" -TestCases $testCases { diff --git a/images/win/scripts/Tests/WDK.Tests.ps1 b/images/win/scripts/Tests/WDK.Tests.ps1 index c67586e79..0f8e76770 100644 --- a/images/win/scripts/Tests/WDK.Tests.ps1 +++ b/images/win/scripts/Tests/WDK.Tests.ps1 @@ -5,7 +5,7 @@ Describe "WDK" { } It "WDK version from system" { - $version = Get-VSExtensionVersion -packageName "Microsoft.Windows.DriverKit" + $version = Get-VSExtensionVersion -PackageName "Microsoft.Windows.DriverKit" $version | Should -Not -BeNullOrEmpty } } diff --git a/images/win/scripts/Tests/Wix.Tests.ps1 b/images/win/scripts/Tests/Wix.Tests.ps1 index 2a12261e2..bd22bef36 100644 --- a/images/win/scripts/Tests/Wix.Tests.ps1 +++ b/images/win/scripts/Tests/Wix.Tests.ps1 @@ -12,11 +12,11 @@ Describe "Wix" { It "Wix Toolset version from system" { if (Test-IsWin19) { - $exVersion = Get-VSExtensionVersion -packageName "WixToolset.VisualStudioExtension.Dev16" + $exVersion = Get-VSExtensionVersion -PackageName "WixToolset.VisualStudioExtension.Dev16" } else { - $exVersion = Get-VSExtensionVersion -packageName "WixToolset.VisualStudioExtension.Dev15" + $exVersion = Get-VSExtensionVersion -PackageName "WixToolset.VisualStudioExtension.Dev15" } $exVersion | Should -Not -BeNullOrEmpty } diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index a76246e60..c292c7af9 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -227,6 +227,9 @@ "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre", "Microsoft.VisualStudio.Component.Workflow", "Microsoft.VisualStudio.Workload.Office" + ], + "buildtools_workloads": [ + "Microsoft.VisualStudio.Workload.WebBuildTools" ] } } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index a2a7ec4a5..db7919f9a 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -259,6 +259,9 @@ "Microsoft.VisualStudio.Workload.VisualStudioExtension", "Component.MDD.Linux", "Component.MDD.Linux.GCC.arm" + ], + "buildtools_workloads": [ + "Microsoft.VisualStudio.Workload.WebBuildTools" ] } } From 2881a81b22886c8b13a8c9a982de512f82161a95 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Tue, 8 Sep 2020 14:40:56 +0300 Subject: [PATCH 23/28] move apt pkgs to the toolset.json --- images/linux/scripts/base/apt.sh | 6 +- .../linux/scripts/helpers/containercache.sh | 34 -------- images/linux/scripts/installers/basic.sh | 87 +------------------ .../linux/scripts/installers/docker-moby.sh | 42 ++++++--- images/linux/toolsets/toolset-1604.json | 64 +++++++++++++- images/linux/toolsets/toolset-1804.json | 63 +++++++++++++- images/linux/toolsets/toolset-2004.json | 62 +++++++++++++ images/linux/ubuntu1604.json | 37 +++----- images/linux/ubuntu1804.json | 37 +++----- images/linux/ubuntu2004.json | 37 +++----- 10 files changed, 263 insertions(+), 206 deletions(-) delete mode 100644 images/linux/scripts/helpers/containercache.sh diff --git a/images/linux/scripts/base/apt.sh b/images/linux/scripts/base/apt.sh index b7ad9e7bb..8afcbe8d2 100644 --- a/images/linux/scripts/base/apt.sh +++ b/images/linux/scripts/base/apt.sh @@ -11,8 +11,10 @@ systemctl disable apt-daily-upgrade.service # Configure apt to always assume Y echo "APT::Get::Assume-Yes \"true\";" > /etc/apt/apt.conf.d/90assumeyes -# Use apt-fast for parallel downloads +# Install aria2 and jq apt-get install aria2 +apt-get install jq +# Use apt-fast for parallel downloads add-apt-repository -y ppa:apt-fast/stable apt-get update -apt-get -y install apt-fast +apt-get install apt-fast diff --git a/images/linux/scripts/helpers/containercache.sh b/images/linux/scripts/helpers/containercache.sh deleted file mode 100644 index 018bcf534..000000000 --- a/images/linux/scripts/helpers/containercache.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -################################################################################ -## File: containercache.sh -## Desc: Prepulls Docker images used in build tasks and templates -################################################################################ - -source $HELPER_SCRIPTS/document.sh - -# Check prereqs -echo "Checking prereqs for image pulls" -if ! command -v docker; then - echo "Docker is not installed, cant pull images" - exit 1 -fi - -# Information output -systemctl status docker --no-pager - -# Pull images -images=( - docker.io/jekyll/builder - mcr.microsoft.com/azure-pipelines/node8-typescript -) - -for image in "${images[@]}"; do - docker pull "$image" -done - -## Add container information to the metadata file - DocumentInstalledItem "Cached container images" - -while read -r line; do - DocumentInstalledItemIndent "$line" -done <<< "$(docker images --digests --format '{{.Repository}}:{{.Tag}} (Digest: {{.Digest}})')" diff --git a/images/linux/scripts/installers/basic.sh b/images/linux/scripts/installers/basic.sh index 0a9e0e1b4..d216bffb3 100644 --- a/images/linux/scripts/installers/basic.sh +++ b/images/linux/scripts/installers/basic.sh @@ -4,90 +4,13 @@ ## Desc: Installs basic command line utilities and dev packages ################################################################################ +set -e # Source the helpers for use with the script source $HELPER_SCRIPTS/document.sh -source $HELPER_SCRIPTS/os.sh - -set -e - -common_packages="dnsutils - iproute2 - iputils-ping - libunwind8 - locales - openssh-client - tzdata - upx - zstd - libxkbfile-dev - pkg-config - libsecret-1-dev - libxss1 - libgconf-2-4 - dbus - xvfb - libgbm-dev - libgtk-3-0 - tk - fakeroot - dpkg - rpm - xz-utils - xorriso - zsync - gnupg2 - lib32z1 - texinfo - libsqlite3-dev - libc++-dev - libc++abi-dev" - -cmd_packages="curl - file - ftp - jq - netcat - ssh - parallel - rsync - shellcheck - sudo - telnet - time - unzip - zip - wget - m4 - bison - flex - patchelf - bzip2 - sqlite3 - brotli - yamllint" - -if isUbuntu20 ; then - echo "Install python2" - apt-get install -y --no-install-recommends python-is-python2 -fi - -echo "Install libcurl" -if isUbuntu16 || isUbuntu18; then - libcurelVer="libcurl3" -fi - -if isUbuntu20 ; then - libcurelVer="libcurl4" -fi - -apt-get install -y --no-install-recommends $libcurelVer - -# install additional packages only for Ubuntu16.04 -if isUbuntu16; then - common_packages="$common_packages - libicu55" -fi +toolsetJson="$INSTALLER_SCRIPT_FOLDER/toolset.json" +common_packages=$(jq -r ".apt.common_packages[]" $toolsetJson) +cmd_packages=$(jq -r ".apt.cmd_packages[]" $toolsetJson) for package in $common_packages $cmd_packages; do echo "Install $package" apt-get install -y --no-install-recommends $package @@ -108,5 +31,3 @@ DocumentInstalledItem "Basic packages:" for package in $common_packages $cmd_packages; do DocumentInstalledItemIndent $package done - -DocumentInstalledItemIndent "$libcurelVer" diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index 7ab457de8..0ce51b7ec 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -49,19 +49,28 @@ else set +e fi -docker pull node:10 -docker pull node:12 -docker pull buildpack-deps:stretch -docker pull buildpack-deps:buster -docker pull node:10-alpine -docker pull node:12-alpine -docker pull debian:8 -docker pull debian:9 -docker pull alpine:3.7 -docker pull alpine:3.8 -docker pull alpine:3.9 -docker pull alpine:3.10 -docker pull ubuntu:14.04 +# Pull images +images=( + node:10 + node:12 + buildpack-deps:stretch + buildpack-deps:buster + node:10-alpine + node:12-alpine + debian:8 + debian:9 + alpine:3.7 + alpine:3.8 + alpine:3.9 + alpine:3.10 + ubuntu:14.04 + docker.io/jekyll/builder + mcr.microsoft.com/azure-pipelines/node8-typescript +) + +for image in "${images[@]}"; do + docker pull "$image" +done ## Add version information to the metadata file echo "Documenting Docker version" @@ -71,3 +80,10 @@ DocumentInstalledItem "Docker-Moby ($docker_version)" echo "Documenting Docker-buildx version" DOCKER_BUILDX_VERSION=$(docker buildx version | cut -d ' ' -f2) DocumentInstalledItem "Docker-Buildx ($DOCKER_BUILDX_VERSION)" + +## Add container information to the metadata file +DocumentInstalledItem "Cached container images" + +while read -r line; do + DocumentInstalledItemIndent "$line" +done <<< "$(docker images --digests --format '{{.Repository}}:{{.Tag}} (Digest: {{.Digest}})')" \ No newline at end of file diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 40ea0af4b..f03740059 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -108,5 +108,67 @@ "4.6.0" ] } - ] + ], + "apt": { + "common_packages": [ + "dbus", + "dnsutils", + "dpkg", + "fakeroot", + "gnupg2", + "iproute2", + "iputils-ping", + "lib32z1", + "libc++abi-dev", + "libc++-dev", + "libcurl3", + "libgbm-dev", + "libgconf-2-4", + "libgtk-3-0", + "libicu55", + "libsecret-1-dev", + "libsqlite3-dev", + "libunwind8", + "libxkbfile-dev", + "libxss1", + "locales", + "openssh-client", + "pkg-config", + "rpm", + "texinfo", + "tk", + "tzdata", + "upx", + "xorriso", + "xvfb", + "xz-utils", + "zstd", + "zsync" + ], + "cmd_packages": [ + "bison", + "brotli", + "bzip2", + "curl", + "file", + "flex", + "ftp", + "jq", + "m4", + "netcat", + "parallel", + "patchelf", + "rsync", + "shellcheck", + "sqlite3", + "ssh", + "sudo", + "telnet", + "time", + "unzip", + "wget", + "yamllint", + "zip" + ] + } } diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 1bd31b15d..f1ea16b56 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -104,5 +104,66 @@ "4.6.0" ] } - ] + ], + "apt": { + "common_packages": [ + "dbus", + "dnsutils", + "dpkg", + "fakeroot", + "gnupg2", + "iproute2", + "iputils-ping", + "lib32z1", + "libc++abi-dev", + "libc++-dev", + "libcurl3", + "libgbm-dev", + "libgconf-2-4", + "libgtk-3-0", + "libsecret-1-dev", + "libsqlite3-dev", + "libunwind8", + "libxkbfile-dev", + "libxss1", + "locales", + "openssh-client", + "pkg-config", + "rpm", + "texinfo", + "tk", + "tzdata", + "upx", + "xorriso", + "xvfb", + "xz-utils", + "zstd", + "zsync" + ], + "cmd_packages": [ + "bison", + "brotli", + "bzip2", + "curl", + "file", + "flex", + "ftp", + "jq", + "m4", + "netcat", + "parallel", + "patchelf", + "rsync", + "shellcheck", + "sqlite3", + "ssh", + "sudo", + "telnet", + "time", + "unzip", + "wget", + "yamllint", + "zip" + ] + } } diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index db07186fb..b4aa7ec41 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -67,5 +67,67 @@ "ndk-bundle", "platform-tools" ] + }, + "apt": { + "common_packages": [ + "dbus", + "dnsutils", + "dpkg", + "fakeroot", + "gnupg2", + "iproute2", + "iputils-ping", + "lib32z1", + "libc++abi-dev", + "libc++-dev", + "libcurl4", + "libgbm-dev", + "libgconf-2-4", + "libgtk-3-0", + "libsecret-1-dev", + "libsqlite3-dev", + "libunwind8", + "libxkbfile-dev", + "libxss1", + "locales", + "openssh-client", + "pkg-config", + "python-is-python2", + "rpm", + "texinfo", + "tk", + "tzdata", + "upx", + "xorriso", + "xvfb", + "xz-utils", + "zstd", + "zsync" + ], + "cmd_packages": [ + "bison", + "brotli", + "bzip2", + "curl", + "file", + "flex", + "ftp", + "jq", + "m4", + "netcat", + "parallel", + "patchelf", + "rsync", + "shellcheck", + "sqlite3", + "ssh", + "sudo", + "telnet", + "time", + "unzip", + "wget", + "yamllint", + "zip" + ] } } diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 3625b7ed2..c0d3b39d7 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -88,6 +88,16 @@ "source": "{{template_dir}}/scripts/installers", "destination": "{{user `installer_script_folder`}}" }, + { + "type": "file", + "source": "{{template_dir}}/toolsets/toolcache-1604.json", + "destination": "{{user `installer_script_folder`}}/toolcache.json" + }, + { + "type": "file", + "source": "{{template_dir}}/toolsets/toolset-1604.json", + "destination": "{{user `installer_script_folder`}}/toolset.json" + }, { "type": "shell", "scripts":[ @@ -198,31 +208,9 @@ "{{template_dir}}/scripts/installers/mongodb.sh", "{{template_dir}}/scripts/installers/rndgenerator.sh", "{{template_dir}}/scripts/installers/swig.sh", - "{{template_dir}}/scripts/installers/netlify.sh" - ], - "environment_vars": [ - "METADATA_FILE={{user `metadata_file`}}", - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "DEBIAN_FRONTEND=noninteractive" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "file", - "source": "{{template_dir}}/toolsets/toolcache-1604.json", - "destination": "{{user `installer_script_folder`}}/toolcache.json" - }, - { - "type": "file", - "source": "{{template_dir}}/toolsets/toolset-1604.json", - "destination": "{{user `installer_script_folder`}}/toolset.json" - }, - { - "type": "shell", - "scripts":[ + "{{template_dir}}/scripts/installers/netlify.sh", "{{template_dir}}/scripts/installers/android.sh", "{{template_dir}}/scripts/installers/azpowershell.sh", - "{{template_dir}}/scripts/helpers/containercache.sh", "{{template_dir}}/scripts/installers/hosted-tool-cache.sh", "{{template_dir}}/scripts/installers/pypy.sh", "{{template_dir}}/scripts/installers/python.sh", @@ -232,7 +220,8 @@ "METADATA_FILE={{user `metadata_file`}}", "HELPER_SCRIPTS={{user `helper_script_folder`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "GITHUB_FEED_TOKEN={{user `github_feed_token`}}" + "GITHUB_FEED_TOKEN={{user `github_feed_token`}}", + "DEBIAN_FRONTEND=noninteractive" ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index b5037520d..95de0713d 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -91,6 +91,16 @@ "source": "{{template_dir}}/scripts/installers", "destination": "{{user `installer_script_folder`}}" }, + { + "type": "file", + "source": "{{template_dir}}/toolsets/toolcache-1804.json", + "destination": "{{user `installer_script_folder`}}/toolcache.json" + }, + { + "type": "file", + "source": "{{template_dir}}/toolsets/toolset-1804.json", + "destination": "{{user `installer_script_folder`}}/toolset.json" + }, { "type": "shell", "scripts":[ @@ -202,31 +212,9 @@ "{{template_dir}}/scripts/installers/mongodb.sh", "{{template_dir}}/scripts/installers/rndgenerator.sh", "{{template_dir}}/scripts/installers/swig.sh", - "{{template_dir}}/scripts/installers/netlify.sh" - ], - "environment_vars": [ - "METADATA_FILE={{user `metadata_file`}}", - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "DEBIAN_FRONTEND=noninteractive" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "file", - "source": "{{template_dir}}/toolsets/toolcache-1804.json", - "destination": "{{user `installer_script_folder`}}/toolcache.json" - }, - { - "type": "file", - "source": "{{template_dir}}/toolsets/toolset-1804.json", - "destination": "{{user `installer_script_folder`}}/toolset.json" - }, - { - "type": "shell", - "scripts":[ + "{{template_dir}}/scripts/installers/netlify.sh", "{{template_dir}}/scripts/installers/android.sh", "{{template_dir}}/scripts/installers/azpowershell.sh", - "{{template_dir}}/scripts/helpers/containercache.sh", "{{template_dir}}/scripts/installers/hosted-tool-cache.sh", "{{template_dir}}/scripts/installers/pypy.sh", "{{template_dir}}/scripts/installers/python.sh", @@ -236,7 +224,8 @@ "METADATA_FILE={{user `metadata_file`}}", "HELPER_SCRIPTS={{user `helper_script_folder`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "GITHUB_FEED_TOKEN={{user `github_feed_token`}}" + "GITHUB_FEED_TOKEN={{user `github_feed_token`}}", + "DEBIAN_FRONTEND=noninteractive" ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 48d309b1e..8e2b69e49 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -93,6 +93,16 @@ "source": "{{template_dir}}/scripts/installers", "destination": "{{user `installer_script_folder`}}" }, + { + "type": "file", + "source": "{{template_dir}}/toolsets/toolcache-2004.json", + "destination": "{{user `installer_script_folder`}}/toolcache.json" + }, + { + "type": "file", + "source": "{{template_dir}}/toolsets/toolset-2004.json", + "destination": "{{user `installer_script_folder`}}/toolset.json" + }, { "type": "shell", "scripts":[ @@ -204,31 +214,9 @@ "{{template_dir}}/scripts/installers/mongodb.sh", "{{template_dir}}/scripts/installers/rndgenerator.sh", "{{template_dir}}/scripts/installers/swig.sh", - "{{template_dir}}/scripts/installers/netlify.sh" - ], - "environment_vars": [ - "METADATA_FILE={{user `metadata_file`}}", - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "DEBIAN_FRONTEND=noninteractive" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "file", - "source": "{{template_dir}}/toolsets/toolcache-2004.json", - "destination": "{{user `installer_script_folder`}}/toolcache.json" - }, - { - "type": "file", - "source": "{{template_dir}}/toolsets/toolset-2004.json", - "destination": "{{user `installer_script_folder`}}/toolset.json" - }, - { - "type": "shell", - "scripts":[ + "{{template_dir}}/scripts/installers/netlify.sh", "{{template_dir}}/scripts/installers/android.sh", "{{template_dir}}/scripts/installers/azpowershell.sh", - "{{template_dir}}/scripts/helpers/containercache.sh", "{{template_dir}}/scripts/installers/hosted-tool-cache.sh", "{{template_dir}}/scripts/installers/pypy.sh", "{{template_dir}}/scripts/installers/python.sh", @@ -238,7 +226,8 @@ "METADATA_FILE={{user `metadata_file`}}", "HELPER_SCRIPTS={{user `helper_script_folder`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "GITHUB_FEED_TOKEN={{user `github_feed_token`}}" + "GITHUB_FEED_TOKEN={{user `github_feed_token`}}", + "DEBIAN_FRONTEND=noninteractive" ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, From b8d3652352384ed633a00f8dc43611ed7aa80582 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Tue, 8 Sep 2020 19:09:31 +0300 Subject: [PATCH 24/28] rename toolsetJson -> toolset --- images/linux/scripts/installers/android.sh | 12 ++++++------ images/linux/scripts/installers/azpowershell.sh | 4 ++-- images/linux/scripts/installers/basic.sh | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 73611e665..ed06f51ac 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -42,12 +42,12 @@ else exit 1 fi -toolsetJson="$INSTALLER_SCRIPT_FOLDER/toolset.json" -platforms=$(cat $toolsetJson | jq -r '.android.platform_list[]|"platforms;" + .') -buildtools=$(cat $toolsetJson | jq -r '.android.build_tools[]|"build-tools;" + .') -extras=$(cat $toolsetJson | jq -r '.android.extra_list[]|"extras;" + .') -addons=$(cat $toolsetJson | jq -r '.android.addon_list[]|"add-ons;" + .') -additional=$(cat $toolsetJson | jq -r '.android.additional_tools[]') +toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json" +platforms=$(jq -r '.android.platform_list[]|"platforms;" + .' $toolset) +buildtools=$(jq -r '.android.build_tools[]|"build-tools;" + .' $toolset) +extras=$(jq -r '.android.extra_list[]|"extras;" + .' $toolset) +addons=$(jq -r '.android.addon_list[]|"add-ons;" + .' $toolset) +additional=$(jq -r '.android.additional_tools[]' $toolset) # Install the following SDKs and build tools, passing in "y" to accept licenses. echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager $platforms $buildtools $extras $google_api_list $addons $additional diff --git a/images/linux/scripts/installers/azpowershell.sh b/images/linux/scripts/installers/azpowershell.sh index 082ab185d..2b7d703df 100644 --- a/images/linux/scripts/installers/azpowershell.sh +++ b/images/linux/scripts/installers/azpowershell.sh @@ -12,8 +12,8 @@ source $HELPER_SCRIPTS/os.sh if isUbuntu20 ; then versions=$(pwsh -Command '(Find-Module -Name Az).Version') else - toolsetJson="$INSTALLER_SCRIPT_FOLDER/toolset.json" - versions=$(cat $toolsetJson | jq -r '.azureModules[] | select(.name | contains("az")) | .versions[]') + toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json" + versions=$(jq -r '.azureModules[] | select(.name | contains("az")) | .versions[]' $toolset) fi # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli) diff --git a/images/linux/scripts/installers/basic.sh b/images/linux/scripts/installers/basic.sh index d216bffb3..0772cf4ed 100644 --- a/images/linux/scripts/installers/basic.sh +++ b/images/linux/scripts/installers/basic.sh @@ -8,9 +8,9 @@ set -e # Source the helpers for use with the script source $HELPER_SCRIPTS/document.sh -toolsetJson="$INSTALLER_SCRIPT_FOLDER/toolset.json" -common_packages=$(jq -r ".apt.common_packages[]" $toolsetJson) -cmd_packages=$(jq -r ".apt.cmd_packages[]" $toolsetJson) +toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json" +common_packages=$(jq -r ".apt.common_packages[]" $toolset) +cmd_packages=$(jq -r ".apt.cmd_packages[]" $toolset) for package in $common_packages $cmd_packages; do echo "Install $package" apt-get install -y --no-install-recommends $package From 2f46bd5c7c9e4d04ba58932d20efd13e3fd3292c Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Tue, 8 Sep 2020 19:20:07 +0300 Subject: [PATCH 25/28] rename toolsetJson -> toolset --- images/linux/scripts/installers/Install-Toolset.ps1 | 4 ++-- images/linux/scripts/installers/Validate-Toolset.ps1 | 4 ++-- images/linux/scripts/installers/pypy.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/installers/Install-Toolset.ps1 b/images/linux/scripts/installers/Install-Toolset.ps1 index e95645e53..1d261ff3f 100644 --- a/images/linux/scripts/installers/Install-Toolset.ps1 +++ b/images/linux/scripts/installers/Install-Toolset.ps1 @@ -27,10 +27,10 @@ Function Install-Asset { $ErrorActionPreference = "Stop" # Get toolset content -$toolsetJson = Get-Content -Path "$env:INSTALLER_SCRIPT_FOLDER/toolset.json" -Raw +$toolset = Get-Content -Path "$env:INSTALLER_SCRIPT_FOLDER/toolset.json" -Raw $toolsToInstall = @("Python", "Node", "Boost", "Go") -$tools = ConvertFrom-Json -InputObject $toolsetJson | Select-Object -ExpandProperty toolcache | Where-Object {$ToolsToInstall -contains $_.Name} +$tools = ConvertFrom-Json -InputObject $toolset | Select-Object -ExpandProperty toolcache | Where-Object {$ToolsToInstall -contains $_.Name} foreach ($tool in $tools) { # Get versions manifest for current tool diff --git a/images/linux/scripts/installers/Validate-Toolset.ps1 b/images/linux/scripts/installers/Validate-Toolset.ps1 index 5d20dfcaf..b5eb9a0a5 100644 --- a/images/linux/scripts/installers/Validate-Toolset.ps1 +++ b/images/linux/scripts/installers/Validate-Toolset.ps1 @@ -46,8 +46,8 @@ $toolsExecutables = @{ } # Get toolset content -$toolsetJson = Get-Content -Path "$env:INSTALLER_SCRIPT_FOLDER/toolset.json" -Raw -$tools = ConvertFrom-Json -InputObject $toolsetJson | Select-Object -ExpandProperty toolcache +$toolset = Get-Content -Path "$env:INSTALLER_SCRIPT_FOLDER/toolset.json" -Raw +$tools = ConvertFrom-Json -InputObject $toolset | Select-Object -ExpandProperty toolcache foreach($tool in $tools) { Invoke-Expression "bash -c `"source $env:HELPER_SCRIPTS/document.sh; DocumentInstalledItem '$($tool.name):'`"" diff --git a/images/linux/scripts/installers/pypy.sh b/images/linux/scripts/installers/pypy.sh index e47235af7..b859eb4e1 100644 --- a/images/linux/scripts/installers/pypy.sh +++ b/images/linux/scripts/installers/pypy.sh @@ -75,8 +75,8 @@ uri="https://downloads.python.org/pypy/" download_with_retries $uri "/tmp" "pypyUrls.html" compressed pypyVersions="$(cat /tmp/pypyUrls.html | grep 'linux64' | awk -v uri="$uri" -F'>|<' '{print uri$5}')" -toolsetJson="$INSTALLER_SCRIPT_FOLDER/toolset.json" -toolsetVersions=$(cat $toolsetJson | jq -r '.toolcache[] | select(.name | contains("PyPy")) | .versions[]') +toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json" +toolsetVersions=$(jq -r '.toolcache[] | select(.name | contains("PyPy")) | .versions[]' $toolset) # Fail out if any setups fail set -e From 9e6468a11c8f8a9905119902454b0a482db2c6bb Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Tue, 8 Sep 2020 23:56:33 +0300 Subject: [PATCH 26/28] test --- images/linux/ubuntu2004.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 48d309b1e..131bd1f04 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -95,6 +95,7 @@ }, { "type": "shell", + "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", "scripts":[ "{{template_dir}}/scripts/installers/preparemetadata.sh" ], @@ -103,8 +104,7 @@ "METADATA_FILE={{user `metadata_file`}}", "HELPER_SCRIPTS={{user `helper_script_folder`}}", "ANNOUNCEMENTS={{user `announcements`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + ] }, { "type": "shell", From 6e04edd2ad4ac156a5ad903fca480a3cd40d4fcc Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Wed, 9 Sep 2020 14:38:16 +0300 Subject: [PATCH 27/28] add all the other ubuntu templates --- images/linux/ubuntu1604.json | 4 ++-- images/linux/ubuntu1804.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 3625b7ed2..82cb0f06e 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -90,6 +90,7 @@ }, { "type": "shell", + "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", "scripts":[ "{{template_dir}}/scripts/installers/preparemetadata.sh" ], @@ -98,8 +99,7 @@ "METADATA_FILE={{user `metadata_file`}}", "HELPER_SCRIPTS={{user `helper_script_folder`}}", "ANNOUNCEMENTS={{user `announcements`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + ] }, { "type": "shell", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index b5037520d..e9c756f15 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -93,6 +93,7 @@ }, { "type": "shell", + "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", "scripts":[ "{{template_dir}}/scripts/installers/preparemetadata.sh" ], @@ -101,8 +102,7 @@ "METADATA_FILE={{user `metadata_file`}}", "HELPER_SCRIPTS={{user `helper_script_folder`}}", "ANNOUNCEMENTS={{user `announcements`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + ] }, { "type": "shell", From 37aa3f5ade5f4a1b159038f515815ed03fb7bd52 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Wed, 9 Sep 2020 15:42:39 +0300 Subject: [PATCH 28/28] move docker images to the toolset.json --- .../linux/scripts/installers/docker-moby.sh | 38 +++++-------------- images/linux/toolsets/toolset-1604.json | 19 ++++++++++ images/linux/toolsets/toolset-1804.json | 19 ++++++++++ images/linux/toolsets/toolset-2004.json | 19 ++++++++++ 4 files changed, 67 insertions(+), 28 deletions(-) diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index 0ce51b7ec..6ce336718 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -3,19 +3,20 @@ ## File: docker-moby.sh ## Desc: Installs docker onto the image ################################################################################ +set -e +# Source the helpers for use with the script source $HELPER_SCRIPTS/document.sh source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/os.sh -docker_package=moby - # There is no stable docker-moby for Ubuntu 20 at the moment if isUbuntu20 ; then add-apt-repository "deb [arch=amd64,armhf,arm64] https://packages.microsoft.com/ubuntu/20.04/prod testing main" fi -## Check to see if docker is already installed +# Check to see if docker is already installed +docker_package=moby echo "Determing if Docker ($docker_package) is installed" if ! IsPackageInstalled $docker_package; then echo "Docker ($docker_package) was not found. Installing..." @@ -44,35 +45,17 @@ else echo "Docker-moby and Docker-buildx checking the successfull" # Docker daemon takes time to come up after installing sleep 10 - set -e docker info - set +e fi # Pull images -images=( - node:10 - node:12 - buildpack-deps:stretch - buildpack-deps:buster - node:10-alpine - node:12-alpine - debian:8 - debian:9 - alpine:3.7 - alpine:3.8 - alpine:3.9 - alpine:3.10 - ubuntu:14.04 - docker.io/jekyll/builder - mcr.microsoft.com/azure-pipelines/node8-typescript -) - -for image in "${images[@]}"; do +toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json" +images=$(jq -r '.docker.images[]' $toolset) +for image in $images; do docker pull "$image" done -## Add version information to the metadata file +# Add version information to the metadata file echo "Documenting Docker version" docker_version=$(docker -v) DocumentInstalledItem "Docker-Moby ($docker_version)" @@ -81,9 +64,8 @@ echo "Documenting Docker-buildx version" DOCKER_BUILDX_VERSION=$(docker buildx version | cut -d ' ' -f2) DocumentInstalledItem "Docker-Buildx ($DOCKER_BUILDX_VERSION)" -## Add container information to the metadata file +# Add container information to the metadata file DocumentInstalledItem "Cached container images" - while read -r line; do DocumentInstalledItemIndent "$line" -done <<< "$(docker images --digests --format '{{.Repository}}:{{.Tag}} (Digest: {{.Digest}})')" \ No newline at end of file +done <<< "$(docker images --digests --format '{{.Repository}}:{{.Tag}} (Digest: {{.Digest}})')" diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index f03740059..1204f2a86 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -170,5 +170,24 @@ "yamllint", "zip" ] + }, + "docker": { + "images": [ + "alpine:3.7", + "alpine:3.8", + "alpine:3.9", + "alpine:3.10", + "buildpack-deps:stretch", + "buildpack-deps:buster", + "debian:8", + "debian:9", + "jekyll/builder", + "mcr.microsoft.com/azure-pipelines/node8-typescript", + "node:10", + "node:12", + "node:10-alpine", + "node:12-alpine", + "ubuntu:14.04" + ] } } diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index f1ea16b56..2c399c8fc 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -165,5 +165,24 @@ "yamllint", "zip" ] + }, + "docker": { + "images": [ + "alpine:3.7", + "alpine:3.8", + "alpine:3.9", + "alpine:3.10", + "buildpack-deps:stretch", + "buildpack-deps:buster", + "debian:8", + "debian:9", + "jekyll/builder", + "mcr.microsoft.com/azure-pipelines/node8-typescript", + "node:10", + "node:12", + "node:10-alpine", + "node:12-alpine", + "ubuntu:14.04" + ] } } diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index b4aa7ec41..1162b713f 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -129,5 +129,24 @@ "yamllint", "zip" ] + }, + "docker": { + "images": [ + "alpine:3.7", + "alpine:3.8", + "alpine:3.9", + "alpine:3.10", + "buildpack-deps:stretch", + "buildpack-deps:buster", + "debian:8", + "debian:9", + "jekyll/builder", + "mcr.microsoft.com/azure-pipelines/node8-typescript", + "node:10", + "node:12", + "node:10-alpine", + "node:12-alpine", + "ubuntu:14.04" + ] } }