diff --git a/images.CI/macos/select-datastore.ps1 b/images.CI/macos/select-datastore.ps1 index 2884fdf4..3daa0b39 100644 --- a/images.CI/macos/select-datastore.ps1 +++ b/images.CI/macos/select-datastore.ps1 @@ -61,7 +61,7 @@ function Select-DataStore { $buildDatastore = $allDatastores | Where-Object { $_.FreeSpaceGB -ge $thresholdInGb } | Where-Object { $vmOnDatastore = @((Get-ChildItem -Path $_.DatastoreBrowserPath).Name -notmatch "^\.").Count $vmOnDatastore -lt $vmCount - } | Select-Object -ExpandProperty Name -First 1 + } | Get-Random | Select-Object -ExpandProperty Name $tag = Get-Tag -Category $TagCategory -Name $VMName -ErrorAction Ignore if (-not $tag) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index 57198a44..b88133f5 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -2,12 +2,12 @@ |-| | [Default Node.JS will be switched to 14.x on all platforms ](https://github.com/actions/virtual-environments/issues/1953) | | [[macOS] Default Python will be upgraded to 3.9](https://github.com/actions/virtual-environments/issues/1929) | -| [.NET 5.0 will become a default .NET version on November, 10](https://github.com/actions/virtual-environments/issues/1891) | +| [.NET 5.0 will become a default .NET version the week of November 16, 2020](https://github.com/actions/virtual-environments/issues/1891) | | [[Ubuntu] [Windows] Boost 1.69.0 will be deprecated on November, 10](https://github.com/actions/virtual-environments/issues/1847) | | [Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816) | *** # Ubuntu 16.04.7 LTS -- Image Version: 20201102.0 +- Image Version: 20201108.1 ## Installed Software ### Language and Runtime @@ -39,13 +39,13 @@ - Ant 1.9.6 - Gradle 6.7 - Maven 3.6.3 -- Sbt 1.4.1 +- Sbt 1.4.2 ### Tools - 7-Zip 9.20 -- Ansible 2.9.14 +- Ansible 2.9.15 - apt-fast 1.9.10 -- AzCopy10 10.6.1 (available by `azcopy10` alias) +- AzCopy10 10.7.0 (available by `azcopy10` alias) - AzCopy7 7.3.0 (available by `azcopy` alias) - Bazel 3.7.0 - Bazelisk 1.7.3 @@ -56,9 +56,9 @@ - Docker-Buildx 0.4.2 - Docker-Moby 19.03.13 - Git 2.29.0 -- Git LFS 2.12.0 +- Git LFS 2.12.1 - Git-ftp 1.0.2 -- Google Cloud SDK 316.0.0 +- Google Cloud SDK 317.0.0 - Haveged 1.9.1 - Heroku 7.47.0 - HHVM (HipHop VM) 4.56.1 @@ -71,10 +71,10 @@ - Mercurial 4.4.1 - Minikube 1.14.2 - Newman 5.2.1 -- nvm 0.36.0 +- nvm 0.37.0 - Packer 1.6.5 - PhantomJS 2.1.1 -- Pulumi 2.12.1 +- Pulumi 2.13.2 - R 4.0.3 - Sphinx Open Source Search Server 2.2.9 - SVN 1.9.3 @@ -88,14 +88,14 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.60 -- AWS CLI 1.18.169 +- AWS CLI 1.18.173 - AWS CLI Session manager plugin 1.2.7.0 -- AWS SAM CLI 1.7.0 -- Azure CLI (azure-cli) 2.14.0 +- AWS SAM CLI 1.8.0 +- Azure CLI (azure-cli) 2.14.1 - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.2.0 - Hub CLI 2.14.2 -- Netlify CLI 2.67.2 +- Netlify CLI 2.68.0 - oc CLI 4.5.0 - ORAS CLI 0.8.1 - Vercel CLI 20.1.2 @@ -112,7 +112,7 @@ | Tool | Version | | -------- | ----------------------------------------- | | PHP | 5.6.40 7.0.33 7.1.33 7.2.34 7.3.24 7.4.12 | -| Composer | 2.0.4 | +| Composer | 2.0.6 | | PHPUnit | 7.5.20 | ### Haskell @@ -137,8 +137,8 @@ ### Browsers and Drivers - Google Chrome 86.0.4240.183 - ChromeDriver 86.0.4240.22 -- Mozilla Firefox 82.0 -- Geckodriver 0.27.0 +- Mozilla Firefox 82.0.2 +- Geckodriver 0.28.0 ### .NET Core 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.508 2.1.509 2.1.510 2.1.511 2.1.512 2.1.513 2.1.514 2.1.515 2.1.516 2.1.517 2.1.518 2.1.519 2.1.602 2.1.603 2.1.604 2.1.605 2.1.606 2.1.607 2.1.608 2.1.609 2.1.610 2.1.611 2.1.612 2.1.613 2.1.614 2.1.615 2.1.616 2.1.700 2.1.701 2.1.801 2.1.802 2.1.803 2.1.804 2.1.805 2.1.806 2.1.807 2.1.808 2.1.809 2.1.810 2.1.811 3.0.100 3.0.101 3.0.102 3.0.103 3.1.100 3.1.101 3.1.102 3.1.103 3.1.104 3.1.105 3.1.106 3.1.107 3.1.108 3.1.109 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 @@ -185,20 +185,17 @@ - 14.15.0 #### Go -- 1.11.13 -- 1.12.17 - 1.13.15 -- 1.14.10 -- 1.15.3 +- 1.14.11 +- 1.15.4 #### Boost -- 1.69.0 - 1.72.0 ### Android | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android SDK Platform-Tools | 30.0.4 | +| Android SDK Platform-Tools | 30.0.5 | | Android SDK Tools | 26.1.1 | | Android SDK Platforms | android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5)
android-14 (rev 4)
android-13 (rev 1)
android-12 (rev 3)
android-11 (rev 2)
android-10 (rev 2) | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | @@ -211,21 +208,23 @@ | CMake | 3.10.2
3.6.4111459 | ### Cached 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 +| Repository:Tag | Digest | Created | +| --------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | +| node:10 | sha256:10e45e7d078a5b21b5e29dff1b3479638871d1447a76491708ade87222e48ad8 | 2020-10-28 | +| node:10-alpine | sha256:34d01a98b50563abff4a8e18269f35d4eb1f33e911a38dd14e4798e430af5cac | 2020-10-28 | +| node:12 | sha256:b7aa57bb141b7adca179797a88f6dc350603124f9a88e4d78d9a67d0ad129350 | 2020-10-13 | +| buildpack-deps:stretch | sha256:0a19d53ec7f0d2742f5d0791e5ac88ff7e371586bba99f20d3e4731dfbfacc10 | 2020-10-13 | +| buildpack-deps:buster | sha256:c252b52f6993e81ffe78e5389df10cd0208c501e688f3f16e4e9435ef1f7c8de | 2020-10-13 | +| debian:9 | sha256:26d14aa81aa59de744d6ec9509000341f3f8e0160d78f3659f1d25a2b252d28e | 2020-10-13 | +| debian:8 | sha256:62459e0ef769f129957fed32a1a4512b1415f09b794454acf012c82412ddf834 | 2020-10-13 | +| node:12-alpine | sha256:53bbb1eeb8bc916ee27f9e01c542788699121bd7b5a9d9f39eaff64c2fcd0412 | 2020-10-08 | +| ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | +| jekyll/builder:latest | sha256:4bc6a3b6eddebef1652ef38ceb965fc9c1b06677f65f764e1e17b88dc2aa9934 | 2020-09-03 | +| alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | +| alpine:3.10 | sha256:f0e9534a598e501320957059cb2a23774b4d4072e37c7b2cf7e95b241f019e35 | 2020-04-24 | +| alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | +| alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | +| mcr.microsoft.com/azure-pipelines/node8-typescript:latest | sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a | 2018-10-09 | ### Installed apt packages - bison, brotli, bzip2, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl3, libgbm-dev, libgconf-2-4, libgtk-3-0, libicu55, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, netcat, openssh-client, parallel, patchelf, pkg-config, rpm, rsync, shellcheck, sqlite3, ssh, sudo, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, yamllint, zip, zstd, zsync diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 3c21237a..889ee570 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -2,12 +2,12 @@ |-| | [Default Node.JS will be switched to 14.x on all platforms ](https://github.com/actions/virtual-environments/issues/1953) | | [[macOS] Default Python will be upgraded to 3.9](https://github.com/actions/virtual-environments/issues/1929) | -| [.NET 5.0 will become a default .NET version on November, 10](https://github.com/actions/virtual-environments/issues/1891) | +| [.NET 5.0 will become a default .NET version the week of November 16, 2020](https://github.com/actions/virtual-environments/issues/1891) | | [[Ubuntu] [Windows] Boost 1.69.0 will be deprecated on November, 10](https://github.com/actions/virtual-environments/issues/1847) | | [Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816) | *** # Ubuntu 18.04.5 LTS -- Image Version: 20201102.0 +- Image Version: 20201108.1 ## Installed Software ### Language and Runtime @@ -40,17 +40,17 @@ - Ant 1.10.5 - Gradle 6.7 - Maven 3.6.3 -- Sbt 1.4.1 +- Sbt 1.4.2 ### Tools - 7-Zip 16.02 -- Ansible 2.9.14 +- Ansible 2.9.15 - apt-fast 1.9.10 -- AzCopy10 10.6.1 (available by `azcopy10` alias) +- AzCopy10 10.7.0 (available by `azcopy10` alias) - AzCopy7 7.3.0 (available by `azcopy` alias) - Bazel 3.7.0 - Bazelisk 1.7.3 -- Buildah 1.16.4 +- Buildah 1.17.0 - CMake 3.17.0 - CodeQL Action Bundle 2.3.1+202010222007 - curl 7.58.0 @@ -58,12 +58,12 @@ - Docker-Buildx 0.4.2 - Docker-Moby 19.03.13 - Git 2.29.2 -- Git LFS 2.12.0 +- Git LFS 2.12.1 - Git-ftp 1.3.1 -- Google Cloud SDK 316.0.0 +- Google Cloud SDK 317.0.0 - Haveged 1.9.1 - Heroku 7.47.0 -- HHVM (HipHop VM) 4.81.0 +- HHVM (HipHop VM) 4.82.0 - jq 1.5 - Kind 0.9.0 - Kubectl 1.19.3 @@ -73,11 +73,11 @@ - Mercurial 4.5.3 - Minikube 1.14.2 - Newman 5.2.1 -- nvm 0.36.0 +- nvm 0.37.0 - Packer 1.6.5 - PhantomJS 2.1.1 - Podman 2.1.1 -- Pulumi 2.12.1 +- Pulumi 2.13.2 - R 4.0.3 - Skopeo 1.2.0 - Sphinx Open Source Search Server 2.2.11 @@ -92,14 +92,14 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.60 -- AWS CLI 1.18.169 +- AWS CLI 1.18.173 - AWS CLI Session manager plugin 1.2.7.0 -- AWS SAM CLI 1.7.0 -- Azure CLI (azure-cli) 2.14.0 +- AWS SAM CLI 1.8.0 +- Azure CLI (azure-cli) 2.14.1 - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.2.0 - Hub CLI 2.14.2 -- Netlify CLI 2.67.2 +- Netlify CLI 2.68.0 - oc CLI 4.5.0 - ORAS CLI 0.8.1 - Vercel CLI 20.1.2 @@ -116,7 +116,7 @@ | Tool | Version | | -------- | --------------------------- | | PHP | 7.1.33 7.2.34 7.3.24 7.4.12 | -| Composer | 2.0.4 | +| Composer | 2.0.6 | | PHPUnit | 7.5.20 | ### Haskell @@ -141,8 +141,8 @@ ### Browsers and Drivers - Google Chrome 86.0.4240.183 - ChromeDriver 86.0.4240.22 -- Mozilla Firefox 82.0 -- Geckodriver 0.27.0 +- Mozilla Firefox 82.0.2 +- Geckodriver 0.28.0 ### .NET Core 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.508 2.1.509 2.1.510 2.1.511 2.1.512 2.1.513 2.1.514 2.1.515 2.1.516 2.1.517 2.1.518 2.1.519 2.1.602 2.1.603 2.1.604 2.1.605 2.1.606 2.1.607 2.1.608 2.1.609 2.1.610 2.1.611 2.1.612 2.1.613 2.1.614 2.1.615 2.1.616 2.1.700 2.1.701 2.1.801 2.1.802 2.1.803 2.1.804 2.1.805 2.1.806 2.1.807 2.1.808 2.1.809 2.1.810 2.1.811 3.0.100 3.0.101 3.0.102 3.0.103 3.1.100 3.1.101 3.1.102 3.1.103 3.1.104 3.1.105 3.1.106 3.1.107 3.1.108 3.1.109 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 @@ -189,20 +189,17 @@ - 14.15.0 #### Go -- 1.11.13 -- 1.12.17 - 1.13.15 -- 1.14.10 -- 1.15.3 +- 1.14.11 +- 1.15.4 #### Boost -- 1.69.0 - 1.72.0 ### Android | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android SDK Platform-Tools | 30.0.4 | +| Android SDK Platform-Tools | 30.0.5 | | Android SDK Tools | 26.1.1 | | Android SDK Platforms | android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3) | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | @@ -215,21 +212,23 @@ | CMake | 3.10.2
3.6.4111459 | ### Cached 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 +| Repository:Tag | Digest | Created | +| --------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | +| node:10 | sha256:10e45e7d078a5b21b5e29dff1b3479638871d1447a76491708ade87222e48ad8 | 2020-10-28 | +| node:10-alpine | sha256:34d01a98b50563abff4a8e18269f35d4eb1f33e911a38dd14e4798e430af5cac | 2020-10-28 | +| node:12 | sha256:b7aa57bb141b7adca179797a88f6dc350603124f9a88e4d78d9a67d0ad129350 | 2020-10-13 | +| buildpack-deps:stretch | sha256:0a19d53ec7f0d2742f5d0791e5ac88ff7e371586bba99f20d3e4731dfbfacc10 | 2020-10-13 | +| buildpack-deps:buster | sha256:c252b52f6993e81ffe78e5389df10cd0208c501e688f3f16e4e9435ef1f7c8de | 2020-10-13 | +| debian:9 | sha256:26d14aa81aa59de744d6ec9509000341f3f8e0160d78f3659f1d25a2b252d28e | 2020-10-13 | +| debian:8 | sha256:62459e0ef769f129957fed32a1a4512b1415f09b794454acf012c82412ddf834 | 2020-10-13 | +| node:12-alpine | sha256:53bbb1eeb8bc916ee27f9e01c542788699121bd7b5a9d9f39eaff64c2fcd0412 | 2020-10-08 | +| ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | +| jekyll/builder:latest | sha256:4bc6a3b6eddebef1652ef38ceb965fc9c1b06677f65f764e1e17b88dc2aa9934 | 2020-09-03 | +| alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | +| alpine:3.10 | sha256:f0e9534a598e501320957059cb2a23774b4d4072e37c7b2cf7e95b241f019e35 | 2020-04-24 | +| alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | +| alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | +| mcr.microsoft.com/azure-pipelines/node8-typescript:latest | sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a | 2018-10-09 | ### Installed apt packages - bison, brotli, bzip2, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl3, libgbm-dev, libgconf-2-4, libgtk-3-0, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, netcat, openssh-client, parallel, patchelf, pkg-config, rpm, rsync, shellcheck, sqlite3, ssh, sudo, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, zip, zstd, zsync diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index cd5aa841..2560b16b 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,11 +1,13 @@ | Announcements | |-| -| [.NET 5.0 will become a default .NET version on November, 10](https://github.com/actions/virtual-environments/issues/1891) | +| [Default Node.JS will be switched to 14.x on all platforms ](https://github.com/actions/virtual-environments/issues/1953) | +| [[macOS] Default Python will be upgraded to 3.9](https://github.com/actions/virtual-environments/issues/1929) | +| [.NET 5.0 will become a default .NET version the week of November 16, 2020](https://github.com/actions/virtual-environments/issues/1891) | | [[Ubuntu] [Windows] Boost 1.69.0 will be deprecated on November, 10](https://github.com/actions/virtual-environments/issues/1847) | | [Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816) | *** # Ubuntu 20.04.1 LTS -- Image Version: 20201026.1 +- Image Version: 20201108.1 ## Installed Software ### Language and Runtime @@ -14,7 +16,7 @@ - Clang 8.0.1, 9.0.1, 10.0.0 - Erlang 11.1 - Mono 6.12.0.90 -- Node 12.19.0 +- Node 14.15.0 - Python 3.8.5 - Python3 3.8.5 - PowerShell 7.0.3 @@ -24,8 +26,8 @@ ### Package Management - Gem 3.1.2 -- Helm 3.3.4 -- Homebrew 2.5.6 +- Helm 3.4.0 +- Homebrew 2.5.8 - Miniconda 4.8.3 - Npm 6.14.8 - Pip 20.0.2 @@ -38,44 +40,44 @@ - Ant 1.10.7 - Gradle 6.7 - Maven 3.6.3 -- Sbt 1.4.1 +- Sbt 1.4.2 ### Tools - 7-Zip 16.02 - Ansible 2.9.6 - apt-fast 1.9.10 -- AzCopy10 10.6.1 (available by `azcopy10` alias) +- AzCopy10 10.7.0 (available by `azcopy10` alias) - AzCopy7 7.3.0 (available by `azcopy` alias) - Bazel 3.7.0 - Bazelisk 1.7.3 -- Buildah 1.16.4 +- Buildah 1.17.0 - CMake 3.17.0 -- CodeQL Action Bundle 2.3.0 +- CodeQL Action Bundle 2.3.1+202010222007 - curl 7.68.0 - Docker Compose 1.27.4 - Docker-Buildx 0.4.2 - Docker-Moby 19.03.13 -- Git 2.29.0 -- Git LFS 2.12.0 +- Git 2.29.2 +- Git LFS 2.12.1 - Git-ftp 1.6.0 -- Google Cloud SDK 315.0.0 +- Google Cloud SDK 317.0.0 - Haveged 1.9.1 -- Heroku 7.46.2 -- HHVM (HipHop VM) 4.80.0 +- Heroku 7.47.0 +- HHVM (HipHop VM) 4.82.0 - jq 1.6 - Kind 0.9.0 - Kubectl 1.19.3 -- Kustomize 3.8.5 +- Kustomize 3.8.6 - Leiningen 2.9.4 - m4 1.4.18 - Mercurial 5.3.1 -- Minikube 1.14.1 -- Newman 5.2.0 -- nvm 0.36.0 -- Packer 1.6.4 +- Minikube 1.14.2 +- Newman 5.2.1 +- nvm 0.37.0 +- Packer 1.6.5 - PhantomJS 2.1.1 - Podman 2.1.1 -- Pulumi 2.12.1 +- Pulumi 2.13.2 - R 4.0.3 - Skopeo 1.2.0 - Sphinx Open Source Search Server 2.2.11 @@ -90,14 +92,14 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.60 -- AWS CLI 2.0.59 +- AWS CLI 2.0.62 - AWS CLI Session manager plugin 1.2.7.0 -- AWS SAM CLI 1.6.2 -- Azure CLI (azure-cli) 2.13.0 +- AWS SAM CLI 1.8.0 +- Azure CLI (azure-cli) 2.14.1 - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.1.0 +- GitHub CLI 1.2.0 - Hub CLI 2.14.2 -- Netlify CLI 2.65.7 +- Netlify CLI 2.68.0 - oc CLI 4.5.0 - ORAS CLI 0.8.1 - Vercel CLI 20.1.2 @@ -111,8 +113,8 @@ ### PHP | Tool | Version | | -------- | ------- | -| PHP | 7.4.11 | -| Composer | 2.0.2 | +| PHP | 7.4.12 | +| Composer | 2.0.6 | | PHPUnit | 7.5.20 | ### Haskell @@ -128,17 +130,17 @@ #### Packages - Bindgen 0.55.1 -- Cargo audit 0.12.1 -- Cargo outdated 0.9.11 +- Cargo audit 0.13.1 +- Cargo outdated 0.9.13 - Cargo clippy 0.0.212 - Cbindgen 0.15.0 - Rustfmt 1.4.20 ### Browsers and Drivers -- Google Chrome 86.0.4240.111 +- Google Chrome 86.0.4240.183 - ChromeDriver 86.0.4240.22 -- Mozilla Firefox 82.0 -- Geckodriver 0.27.0 +- Mozilla Firefox 82.0.2 +- Geckodriver 0.28.0 ### .NET Core 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.508 2.1.509 2.1.510 2.1.511 2.1.512 2.1.513 2.1.514 2.1.515 2.1.516 2.1.517 2.1.518 2.1.519 2.1.602 2.1.603 2.1.604 2.1.605 2.1.606 2.1.607 2.1.608 2.1.609 2.1.610 2.1.611 2.1.612 2.1.613 2.1.614 2.1.615 2.1.616 2.1.700 2.1.701 2.1.801 2.1.802 2.1.803 2.1.804 2.1.805 2.1.806 2.1.807 2.1.808 2.1.809 2.1.810 2.1.811 3.1.100 3.1.101 3.1.102 3.1.103 3.1.104 3.1.105 3.1.106 3.1.107 3.1.108 3.1.109 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 @@ -152,7 +154,7 @@ - sqlite3 3.31.1 #### MySQL -- MySQL 8.0.21 +- MySQL 8.0.22 - MySQL Server (user:root password:root) - MS SQL Server Client Tools @@ -179,18 +181,18 @@ #### Node.js - 8.17.0 -- 10.22.1 +- 10.23.0 - 12.19.0 -- 14.14.0 +- 14.15.0 #### Go -- 1.14.10 -- 1.15.3 +- 1.14.11 +- 1.15.4 ### Android | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------- | -| Android SDK Platform-Tools | 30.0.4 | +| Android SDK Platform-Tools | 30.0.5 | | Android SDK Tools | 26.1.1 | | Android SDK Platforms | android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | @@ -202,21 +204,23 @@ | CMake | 3.10.2 | ### Cached 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 +| Repository:Tag | Digest | Created | +| --------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | +| node:10 | sha256:10e45e7d078a5b21b5e29dff1b3479638871d1447a76491708ade87222e48ad8 | 2020-10-28 | +| node:10-alpine | sha256:34d01a98b50563abff4a8e18269f35d4eb1f33e911a38dd14e4798e430af5cac | 2020-10-28 | +| node:12 | sha256:b7aa57bb141b7adca179797a88f6dc350603124f9a88e4d78d9a67d0ad129350 | 2020-10-13 | +| buildpack-deps:stretch | sha256:0a19d53ec7f0d2742f5d0791e5ac88ff7e371586bba99f20d3e4731dfbfacc10 | 2020-10-13 | +| buildpack-deps:buster | sha256:c252b52f6993e81ffe78e5389df10cd0208c501e688f3f16e4e9435ef1f7c8de | 2020-10-13 | +| debian:9 | sha256:26d14aa81aa59de744d6ec9509000341f3f8e0160d78f3659f1d25a2b252d28e | 2020-10-13 | +| debian:8 | sha256:62459e0ef769f129957fed32a1a4512b1415f09b794454acf012c82412ddf834 | 2020-10-13 | +| node:12-alpine | sha256:53bbb1eeb8bc916ee27f9e01c542788699121bd7b5a9d9f39eaff64c2fcd0412 | 2020-10-08 | +| ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | +| jekyll/builder:latest | sha256:4bc6a3b6eddebef1652ef38ceb965fc9c1b06677f65f764e1e17b88dc2aa9934 | 2020-09-03 | +| alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | +| alpine:3.10 | sha256:f0e9534a598e501320957059cb2a23774b4d4072e37c7b2cf7e95b241f019e35 | 2020-04-24 | +| alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | +| alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | +| mcr.microsoft.com/azure-pipelines/node8-typescript:latest | sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a | 2018-10-09 | ### Installed apt packages - bison, brotli, bzip2, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl4, libgbm-dev, libgconf-2-4, libgtk-3-0, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, netcat, openssh-client, parallel, patchelf, pkg-config, python-is-python3, rpm, rsync, shellcheck, sqlite3, ssh, sudo, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, zip, zstd, zsync diff --git a/images/linux/scripts/base/apt.sh b/images/linux/scripts/base/apt.sh index cf221452..ccb1c3b0 100644 --- a/images/linux/scripts/base/apt.sh +++ b/images/linux/scripts/base/apt.sh @@ -17,6 +17,9 @@ echo "APT::Acquire::Retries \"10\";" > /etc/apt/apt.conf.d/80-retries # Configure apt to always assume Y echo "APT::Get::Assume-Yes \"true\";" > /etc/apt/apt.conf.d/90assumeyes +# Uninstall unattended-upgrades +apt-get remove unattended-upgrades + # Install aria2 and jq apt-get install aria2 apt-get install jq diff --git a/images/linux/scripts/installers/azpowershell.sh b/images/linux/scripts/installers/azpowershell.sh index f18492c5..6c299e32 100644 --- a/images/linux/scripts/installers/azpowershell.sh +++ b/images/linux/scripts/installers/azpowershell.sh @@ -4,9 +4,6 @@ ## Desc: Installed Azure PowerShell ################################################################################ -# Source the helpers for use with the script -source $HELPER_SCRIPTS/os.sh - # List of versions toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json" versions=$(jq -r '.azureModules[] | select(.name | contains("az")) | .versions[]' $toolset) @@ -18,10 +15,6 @@ pwsh -Command "Update-Module -Name PowerShellGet -Force" # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli) for version in ${versions[@]}; do pwsh -Command "Save-Module -Name Az -LiteralPath /usr/share/az_$version -RequiredVersion $version -Force -Verbose" - if isUbuntu20; then - rm -rf "/usr/share/az_$version/Az.Accounts" - pwsh -Command "Save-Module -Name Az.Accounts -LiteralPath /usr/share/az_$version -RequiredVersion 1.9.5 -Force -Verbose" - fi done # Run tests to determine that the software installed as expected diff --git a/images/linux/scripts/installers/dotnetcore-sdk.sh b/images/linux/scripts/installers/dotnetcore-sdk.sh index ff966cd2..31210b6e 100644 --- a/images/linux/scripts/installers/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/dotnetcore-sdk.sh @@ -9,15 +9,9 @@ source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/os.sh # Ubuntu 20 doesn't support EOL versions -if isUbuntu20 ; then - LATEST_DOTNET_PACKAGES=("dotnet-sdk-3.1") - release_urls=("https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json") -fi - -if isUbuntu16 || isUbuntu18 ; then - LATEST_DOTNET_PACKAGES=("dotnet-sdk-3.0" "dotnet-sdk-3.1") - release_urls=("https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.0/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json") -fi +toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json" +LATEST_DOTNET_PACKAGES=$(jq -r '.dotnet.aptPackages[]' $toolset) +versions=$(jq -r '.dotnet.versions[]' $toolset) mksamples() { @@ -50,7 +44,8 @@ done # Get list of all released SDKs from channels which are not end-of-life or preview sdks=() -for release_url in ${release_urls[@]}; do +for version in ${versions[@]}; do + release_url="https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/${version}/releases.json" echo "${release_url}" releases=$(curl "${release_url}") sdks=("${sdks[@]}" $(echo "${releases}" | jq '.releases[]' | jq '.sdk.version')) diff --git a/images/linux/scripts/installers/powershellcore.sh b/images/linux/scripts/installers/powershellcore.sh index 0ac52072..c3a2c53d 100644 --- a/images/linux/scripts/installers/powershellcore.sh +++ b/images/linux/scripts/installers/powershellcore.sh @@ -4,17 +4,8 @@ ## Desc: Installs powershellcore ################################################################################ -# Source the helpers for use with the script -source $HELPER_SCRIPTS/os.sh - # Install Powershell -if isUbuntu20 ; then - snap install powershell --classic --channel=edge/useedge -fi - -if isUbuntu16 || isUbuntu18 ; then - apt-get install -y powershell -fi +apt-get install -y powershell # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 1c5ff532..4708718b 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -188,5 +188,16 @@ "node:12-alpine", "ubuntu:14.04" ] + }, + "dotnet": { + "aptPackages": [ + "dotnet-sdk-3.0", + "dotnet-sdk-3.1" + ], + "versions": [ + "2.1", + "3.0", + "3.1" + ] } } diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 226dd190..d3a94212 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -192,5 +192,16 @@ "package": "aws-sam-cli", "cmd": "sam" } - ] + ], + "dotnet": { + "aptPackages": [ + "dotnet-sdk-3.0", + "dotnet-sdk-3.1" + ], + "versions": [ + "2.1", + "3.0", + "3.1" + ] + } } diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 76f2af42..b4c17da0 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -166,5 +166,14 @@ "package": "aws-sam-cli", "cmd": "sam" } - ] + ], + "dotnet": { + "aptPackages": [ + "dotnet-sdk-3.1" + ], + "versions": [ + "2.1", + "3.1" + ] + } } diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1 index e71aa765..66edb878 100644 --- a/images/macos/helpers/Common.Helpers.psm1 +++ b/images/macos/helpers/Common.Helpers.psm1 @@ -27,16 +27,17 @@ function Get-EnvironmentVariable($variable) { # It can be used for OS-specific tests function Get-OSVersion { $osVersion = [Environment]::OSVersion + $osVersionMajorMinor = $osVersion.Version.ToString(2) return [PSCustomObject]@{ Version = $osVersion.Version Platform = $osVersion.Platform - IsHighSierra = $osVersion.Version.Major -eq 17 - IsMojave = $osVersion.Version.Major -eq 18 - IsCatalina = $osVersion.Version.Major -eq 19 - IsBigSur = $osVersion.Version.Major -eq 20 - IsLessThanCatalina = $osVersion.Version.Major -lt 19 - IsLessThanBigSur = $osVersion.Version.Major -lt 20 - IsHigherThanMojave = $osVersion.Version.Major -gt 18 + IsHighSierra = $osVersionMajorMinor -eq "10.13" + IsMojave = $osVersionMajorMinor -eq "10.14" + IsCatalina = $osVersionMajorMinor -eq "10.15" + IsBigSur = $osVersionMajorMinor -eq "11.0" + IsLessThanCatalina = [SemVer]$osVersion.Version -lt "10.15" + IsLessThanBigSur = [SemVer]$osVersion.Version -lt "11.0" + IsHigherThanMojave = [SemVer]$osVersion.Version -ge "10.15" } } diff --git a/images/macos/provision/configuration/preimagedata.sh b/images/macos/provision/configuration/preimagedata.sh index 8060acb7..92873d9d 100644 --- a/images/macos/provision/configuration/preimagedata.sh +++ b/images/macos/provision/configuration/preimagedata.sh @@ -9,10 +9,10 @@ os_version=$(sw_vers -productVersion) os_build=$(sw_vers -buildVersion) label_version=$(echo $os_version | cut -d. -f1,2) image_label="macos-${label_version}" -software_url="https://github.com/actions/virtual-environments/blob/${image_label}/${image_version}/images/macos/${image_label}-Readme.md" +release_label="macOS-${label_version}" +software_url="https://github.com/actions/virtual-environments/blob/${release_label}/${image_version}/images/macos/${image_label}-Readme.md" -if is_Catalina || is_BigSur; then - cat < $imagedata_file +cat < $imagedata_file [ { "group": "Operating System", @@ -24,7 +24,6 @@ if is_Catalina || is_BigSur; then } ] EOF -fi echo "export ImageVersion=$image_version" >> $HOME/.bashrc echo "export ImageOS=$IMAGE_OS" >> $HOME/.bashrc \ No newline at end of file diff --git a/images/macos/provision/core/dotnet.sh b/images/macos/provision/core/dotnet.sh index 36df3be9..81442d70 100755 --- a/images/macos/provision/core/dotnet.sh +++ b/images/macos/provision/core/dotnet.sh @@ -19,35 +19,20 @@ chmod +x ./dotnet-install.sh ARGS_LIST=() echo "Parsing dotnet SDK (except rc and preview versions) from .json..." -# TO-DO: move the list of versions to install to toolset -if is_BigSur; then - DOTNET_CHANNELS=( - 'https://raw.githubusercontent.com/dotnet/core/master/release-notes/2.1/releases.json' - 'https://raw.githubusercontent.com/dotnet/core/master/release-notes/3.1/releases.json' - ) -elif is_Less_Catalina; then - DOTNET_CHANNELS=( - 'https://raw.githubusercontent.com/dotnet/core/master/release-notes/2.1/releases.json' - ) -else - DOTNET_CHANNELS=( - 'https://raw.githubusercontent.com/dotnet/core/master/release-notes/2.1/releases.json' - 'https://raw.githubusercontent.com/dotnet/core/master/release-notes/3.0/releases.json' - 'https://raw.githubusercontent.com/dotnet/core/master/release-notes/3.1/releases.json' - ) -fi +DOTNET_VERSIONS=($(get_toolset_value '.dotnet.versions | .[]')) -for DOTNET_CHANNEL in "${DOTNET_CHANNELS[@]}"; do +for DOTNET_VERSION in "${DOTNET_VERSIONS[@]}"; do + RELEASE_URL="https://raw.githubusercontent.com/dotnet/core/master/release-notes/${DOTNET_VERSION}/releases.json" # Old Mono versions don't support NuGet versions from .Net sdk >=2.1.6**, exclude them explicitly from Mojave and HS images # https://rider-support.jetbrains.com/hc/en-us/articles/360004180039 if is_Less_Catalina; then ARGS_LIST+=( - $(curl -s "$DOTNET_CHANNEL" | \ + $(curl -s "$RELEASE_URL" | \ jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | grep -v -E '2.1.[6-9]\d*') ) else ARGS_LIST+=( - $(curl -s "$DOTNET_CHANNEL" | \ + $(curl -s "$RELEASE_URL" | \ jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*') ) fi diff --git a/images/macos/provision/core/python.sh b/images/macos/provision/core/python.sh index da049319..f517b595 100755 --- a/images/macos/provision/core/python.sh +++ b/images/macos/provision/core/python.sh @@ -5,12 +5,7 @@ source ~/utils/utils.sh echo "Installing Python Tooling" echo "Brew Installing Python 3" -# Workaround to have both 3.8 & 3.9(which required by some brew formulas) in the system, but only 3.8 is linked -brew install python@3.8 brew install python@3.9 -brew unlink python@3.9 -brew unlink python@3.8 -brew link python@3.8 --force echo "Brew Installing Python 2" # Create local tap with formula due to python2 formula depreciation diff --git a/images/macos/provision/core/xcode-clt.sh b/images/macos/provision/core/xcode-clt.sh index 84e4a9e5..aecba8e8 100644 --- a/images/macos/provision/core/xcode-clt.sh +++ b/images/macos/provision/core/xcode-clt.sh @@ -11,12 +11,7 @@ install_clt() { # This temporary file prompts the 'softwareupdate' utility to list the Command Line Tools clt_placeholder="/tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress" sudo touch $clt_placeholder - # The only working tools for Big Sur are 12.2 - if is_Less_BigSur; then - cltPattern="Command Line Tools" - else - cltPattern="Command Line Tools.*Xcode-12.2" - fi + cltPattern="Command Line Tools" clt_label_command="/usr/sbin/softwareupdate -l | grep -B 1 -E '${cltPattern}' | diff --git a/images/macos/toolsets/toolset-10.13.json b/images/macos/toolsets/toolset-10.13.json index 11338ef8..8e2bcc9d 100644 --- a/images/macos/toolsets/toolset-10.13.json +++ b/images/macos/toolsets/toolset-10.13.json @@ -217,5 +217,10 @@ "package": "yamllint", "cmd": "yamllint --version" } - ] + ], + "dotnet": { + "versions": [ + "2.1" + ] + } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index c7b8c1ef..9b1d3d30 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -276,5 +276,10 @@ "package": "yamllint", "cmd": "yamllint --version" } - ] + ], + "dotnet": { + "versions": [ + "2.1" + ] + } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index f00ea5d1..6a6e9b18 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -22,16 +22,23 @@ "6.12.0.93", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ - "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" + "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" ], "mac-versions": [ - "6.20.2.2", "6.18.3.2", "6.16.0.13", "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47" + "6.22.1.26", "6.20.2.2", "6.18.3.2", "6.16.0.13", "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47" ], "android-versions": [ - "11.0.2.0", "10.3.1.4", "10.2.0.100", "10.1.3.7", "10.0.6.2" + "11.1.0.17", "11.0.2.0", "10.3.1.4", "10.2.0.100", "10.1.3.7", "10.0.6.2" ], "bundle-default": "6_12_1", "bundles": [ + { + "symlink": "6_12_3", + "mono":"6.12", + "ios": "14.4", + "mac": "6.22", + "android": "11.1" + }, { "symlink": "6_12_2", "mono":"6.12", @@ -190,5 +197,12 @@ "package": "yamllint", "cmd": "yamllint --version" } - ] + ], + "dotnet": { + "versions": [ + "2.1", + "3.0", + "3.1" + ] + } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index 801c19c6..1cdc2f46 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -13,16 +13,23 @@ "6.12.0.93" ], "ios-versions": [ - "14.2.0.12", "14.0.0.0", "13.20.2.2" + "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" ], "mac-versions": [ - "6.20.2.2" + "6.22.1.26", "6.20.2.2" ], "android-versions": [ - "11.0.2.0" + "11.1.0.17", "11.0.2.0" ], "bundle-default": "6_12_0", "bundles": [ + { + "symlink": "6_12_3", + "mono":"6.12", + "ios": "14.4", + "mac": "6.22", + "android": "11.1" + }, { "symlink": "6_12_2", "mono":"6.12", @@ -108,5 +115,11 @@ "package": "yamllint", "cmd": "yamllint --version" } - ] + ], + "dotnet": { + "versions": [ + "2.1", + "3.1" + ] + } } \ No newline at end of file diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 05e7c2d6..3cb5f4dc 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,25 +1,28 @@ | Announcements | |-| +| [Default Node.JS will be switched to 14.x on all platforms ](https://github.com/actions/virtual-environments/issues/1953) | +| [[macOS] Default Python will be upgraded to 3.9](https://github.com/actions/virtual-environments/issues/1929) | +| [.NET 5.0 will become a default .NET version the week of November 16, 2020](https://github.com/actions/virtual-environments/issues/1891) | | [[Ubuntu] [Windows] Boost 1.69.0 will be deprecated on November, 10](https://github.com/actions/virtual-environments/issues/1847) | -| [[In Discussion] Git internal tools will be removed from PATH Windows images and replaced with MSYS2 tools](https://github.com/actions/virtual-environments/issues/1525) | +| [Switch Unix tools from Git internal tools to MSYS2 tools on Windows images](https://github.com/actions/virtual-environments/issues/1525) | *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 3986 -- Image Version: 20201020.1 +- Image Version: 20201108.1 ## Installed Software ### Language and Runtime - Java 1.7.0_232 -- Java 1.8.0_265 (default) -- Java 11.0.8 +- Java 1.8.0_272 (default) +- Java 11.0.9 - Java 13.0.2 - Python 3.7.9 - Ruby 2.5.8p224 -- Go 1.14.10 +- Go 1.14.11 - PHP 7.4.11 - Julia 1.5.2 - Perl 5.32.0 -- Node 12.19.0 +- Node 14.15.0 ### Package Management - Chocolatey 0.10.15 @@ -29,28 +32,29 @@ - pip 20.2.4 (python 3.7) - Miniconda 4.8.3 - RubyGems 3.1.4 -- Helm 3.3.4 -- Composer 1.10.15 +- Helm 3.4.0 +- Composer 2.0.6 - NuGet 5.7.0.6726 +- Pipx 0.15.6.0 ### Project Management - Ant 1.10.9 - Maven 3.6.3 - Gradle 6.7 -- sbt 1.4.0 +- sbt 1.4.1 ### Tools -- azcopy 10.6.0 +- azcopy 10.7.0 - Bazel 3.7.0 - Bazelisk 1.7.3 - CMake 3.18.4 -- CodeQL Action Bundle 2.3.0 +- CodeQL Action Bundle 2.3.1+202010222007 - R 4.0.3 - Docker 19.03.12 - Docker-compose 1.27.4 -- Git 2.29.0 -- Git LFS 2.12.0 -- Google Cloud SDK 315.0.0 +- Git 2.29.2 +- Git LFS 2.12.1 +- Google Cloud SDK 317.0.0 - InnoSetup 6.0.5 - jq 1.6 - Kubectl 1.19.3 @@ -58,31 +62,31 @@ - Mingw-w64 8.1.0 - Mercurial 5.0 - NSIS v3.06.1 -- Newman 5.2.0 +- Newman 5.2.1 - OpenSSL 1.1.1 -- Packer 1.6.4 -- Pulumi v2.12.0 +- Packer 1.6.5 +- Pulumi v2.13.2 - Subversion (SVN) 1.14.0 - ghc 8.10.2 - Cabal 3.2.0.0 - Stack 2.5.1 -- WinAppDriver 1.1.1809.18001 +- WinAppDriver 1.2.2009.02003 - zstd 1.4.5 - VSWhere 2.8.4 - 7zip 19.00 - yamllint 1.25.0 ### CLI Tools -- Azure CLI 2.13.0 +- Azure CLI 2.14.1 - Azure DevOps CLI extension 0.18.0 -- Azure Dev Spaces CLI 1.0.20200921.3 -- AWS CLI 2.0.57 -- AWS SAM CLI 1.6.2 +- Azure Dev Spaces CLI 1.0.20201021.1 +- AWS CLI 2.0.62 +- AWS SAM CLI 1.8.0 - AWS Session Manager CLI 1.2.7.0 - Alibaba Cloud CLI 3.0.60 - Cloud Foundry CLI 6.53.0 - Hub CLI 2.14.2 -- GitHub CLI 1.1.0 +- GitHub CLI 1.2.0 ### Rust Tools - Rust 1.47.0 @@ -90,16 +94,16 @@ #### Packages - bindgen 0.55.1 - cbindgen 0.15.0 -- cargo-audit 0.12.1 -- cargo-outdated v0.9.11 +- cargo-audit 0.13.1 +- cargo-outdated v0.9.13 ### Browsers and webdrivers -- Google Chrome 86.0.4240.111 +- Google Chrome 86.0.4240.183 - Chrome Driver 86.0.4240.22 -- Microsoft Edge 86.0.622.48 -- Microsoft Edge Driver 86.0.622.48 -- Mozilla Firefox 82.0 -- Gecko Driver 0.27.0 +- Microsoft Edge 86.0.622.63 +- Microsoft Edge Driver 86.0.622.63 +- Mozilla Firefox 82.0.2 +- Gecko Driver 0.28.0 - IE Driver 3.150.1.0 ### MSYS2 @@ -113,7 +117,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Boost | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | -| 1.69.0 | x64, x86 | BOOST_ROOT_1_69_0 | | 1.72.0 | x64, x86 | BOOST_ROOT_1_72_0 | ##### Notes: ``` @@ -138,17 +141,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 1.11.13 | x64 | GOROOT_1_11_X64 | | 1.12.17 | x64 | GOROOT_1_12_X64 | | 1.13.15 | x64 | GOROOT_1_13_X64 | -| 1.14.10 (Default) | x64 | GOROOT_1_14_X64 | -| 1.15.3 | x64 | GOROOT_1_15_X64 | +| 1.14.11 (Default) | x64 | GOROOT_1_14_X64 | +| 1.15.4 | x64 | GOROOT_1_15_X64 | #### Node | Version | Architecture | | ------- | ------------ | | 8.17.0 | x64 | -| 10.22.1 | x64 | +| 10.23.0 | x64 | | 12.19.0 | x64 | -| 14.14.0 | x64 | +| 14.15.0 | x64 | #### Python @@ -168,7 +171,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 2.4.10 | x64 | | 2.5.8 (Default) | x64 | | 2.6.6 | x64 | -| 2.7.1 | x64 | +| 2.7.2 | x64 | #### PyPy @@ -201,7 +204,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools -- Azure CosmosDb Emulator 2.11.6.0 +- Azure CosmosDb Emulator 2.11.8.0 - DacFx 15.0.4897.1 - SQLPS 1.0 - MySQL 5.7.21.0 @@ -527,7 +530,7 @@ All other versions are saved but not installed. ### Android | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Android SDK Platform-Tools | 30.0.4 | +| Android SDK Platform-Tools | 30.0.5 | | Android SDK Tools | 25.2.5 | | Android SDK Platforms | android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4) | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | @@ -540,10 +543,12 @@ All other versions are saved but not installed. | CMake | 3.10.2
3.6.4111459 | ### Cached Docker images -- mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 -- mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 -- mcr.microsoft.com/windows/servercore:ltsc2016 -- microsoft/aspnetcore-build:1.0-2.0 -- mcr.microsoft.com/windows/nanoserver:10.0.14393.953 +| Repository:Tag | Digest | Created | +| ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:650301a9671e66ee2785cc5d1d3838da09c2843da36f90d6b8138f9eabc274b2 | 2020-10-13 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:dbba8ea48c7e16c83cb11190918f0194d3f6b8ebdb84911dd5c1b71583cb3812 | 2020-10-13 | +| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:7f5b13497afa9a7b76f61e87461d7c14e529d8f11d9994056a50c85d6147271e | 2020-10-02 | +| microsoft/aspnetcore-build:1.0-2.0 | sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c | 2018-08-15 | +| mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 0f79ae55..7f63490b 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,11 +1,14 @@ | Announcements | |-| +| [Default Node.JS will be switched to 14.x on all platforms ](https://github.com/actions/virtual-environments/issues/1953) | +| [[macOS] Default Python will be upgraded to 3.9](https://github.com/actions/virtual-environments/issues/1929) | +| [.NET 5.0 will become a default .NET version the week of November 16, 2020](https://github.com/actions/virtual-environments/issues/1891) | | [[Ubuntu] [Windows] Boost 1.69.0 will be deprecated on November, 10](https://github.com/actions/virtual-environments/issues/1847) | -| [[In Discussion] Git internal tools will be removed from PATH Windows images and replaced with MSYS2 tools](https://github.com/actions/virtual-environments/issues/1525) | +| [Switch Unix tools from Git internal tools to MSYS2 tools on Windows images](https://github.com/actions/virtual-environments/issues/1525) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 1518 -- Image Version: 20201021.0 +- Image Version: 20201108.1 ## Enabled windows optional features - Windows Subsystem for Linux @@ -13,16 +16,16 @@ ## Installed Software ### Language and Runtime - Java 1.7.0_232 -- Java 1.8.0_265 (default) -- Java 11.0.8 +- Java 1.8.0_272 (default) +- Java 11.0.9 - Java 13.0.2 - Python 3.7.9 - Ruby 2.5.8p224 -- Go 1.14.10 +- Go 1.14.11 - PHP 7.4.11 - Julia 1.5.2 - Perl 5.32.0 -- Node 12.19.0 +- Node 14.15.0 ### Package Management - Chocolatey 0.10.15 @@ -32,9 +35,10 @@ - pip 20.2.4 (python 3.7) - Miniconda 4.8.3 - RubyGems 3.1.4 -- Helm 3.3.4 -- Composer 1.10.15 +- Helm 3.4.0 +- Composer 2.0.6 - NuGet 5.7.0.6726 +- Pipx 0.15.6.0 ### Project Management - Ant 1.10.9 @@ -43,17 +47,17 @@ - sbt 1.4.1 ### Tools -- azcopy 10.6.0 +- azcopy 10.7.0 - Bazel 3.7.0 - Bazelisk 1.7.3 - CMake 3.18.4 -- CodeQL Action Bundle 2.3.0 +- CodeQL Action Bundle 2.3.1+202010222007 - R 4.0.3 - Docker 19.03.12 - Docker-compose 1.27.4 -- Git 2.29.0 -- Git LFS 2.12.0 -- Google Cloud SDK 315.0.0 +- Git 2.29.2 +- Git LFS 2.12.1 +- Google Cloud SDK 317.0.0 - InnoSetup 6.0.5 - jq 1.6 - Kubectl 1.19.3 @@ -61,31 +65,31 @@ - Mingw-w64 8.1.0 - Mercurial 5.0 - NSIS v3.06.1 -- Newman 5.2.0 +- Newman 5.2.1 - OpenSSL 1.1.1 -- Packer 1.6.4 -- Pulumi v2.12.0 +- Packer 1.6.5 +- Pulumi v2.13.2 - Subversion (SVN) 1.14.0 - ghc 8.10.2 - Cabal 3.2.0.0 - Stack 2.5.1 -- WinAppDriver 1.1.1809.18001 +- WinAppDriver 1.2.2009.02003 - zstd 1.4.5 - VSWhere 2.8.4 - 7zip 19.00 - yamllint 1.25.0 ### CLI Tools -- Azure CLI 2.13.0 +- Azure CLI 2.14.1 - Azure DevOps CLI extension 0.18.0 -- Azure Dev Spaces CLI 1.0.20200921.3 -- AWS CLI 2.0.58 -- AWS SAM CLI 1.6.2 +- Azure Dev Spaces CLI 1.0.20201021.1 +- AWS CLI 2.0.62 +- AWS SAM CLI 1.8.0 - AWS Session Manager CLI 1.2.7.0 - Alibaba Cloud CLI 3.0.60 - Cloud Foundry CLI 6.53.0 - Hub CLI 2.14.2 -- GitHub CLI 1.1.0 +- GitHub CLI 1.2.0 ### Rust Tools - Rust 1.47.0 @@ -93,16 +97,16 @@ #### Packages - bindgen 0.55.1 - cbindgen 0.15.0 -- cargo-audit 0.12.1 -- cargo-outdated v0.9.11 +- cargo-audit 0.13.1 +- cargo-outdated v0.9.13 ### Browsers and webdrivers -- Google Chrome 86.0.4240.111 +- Google Chrome 86.0.4240.183 - Chrome Driver 86.0.4240.22 -- Microsoft Edge 86.0.622.48 -- Microsoft Edge Driver 86.0.622.48 -- Mozilla Firefox 82.0 -- Gecko Driver 0.27.0 +- Microsoft Edge 86.0.622.63 +- Microsoft Edge Driver 86.0.622.63 +- Mozilla Firefox 82.0.2 +- Gecko Driver 0.28.0 - IE Driver 3.150.1.0 ### MSYS2 @@ -116,7 +120,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Boost | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | -| 1.69.0 | x64, x86 | BOOST_ROOT_1_69_0 | | 1.72.0 | x64, x86 | BOOST_ROOT_1_72_0 | ##### Notes: ``` @@ -141,17 +144,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 1.11.13 | x64 | GOROOT_1_11_X64 | | 1.12.17 | x64 | GOROOT_1_12_X64 | | 1.13.15 | x64 | GOROOT_1_13_X64 | -| 1.14.10 (Default) | x64 | GOROOT_1_14_X64 | -| 1.15.3 | x64 | GOROOT_1_15_X64 | +| 1.14.11 (Default) | x64 | GOROOT_1_14_X64 | +| 1.15.4 | x64 | GOROOT_1_15_X64 | #### Node | Version | Architecture | | ------- | ------------ | | 8.17.0 | x64 | -| 10.22.1 | x64 | +| 10.23.0 | x64 | | 12.19.0 | x64 | -| 14.14.0 | x64 | +| 14.15.0 | x64 | #### Python @@ -171,7 +174,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 2.4.10 | x64 | | 2.5.8 (Default) | x64 | | 2.6.6 | x64 | -| 2.7.1 | x64 | +| 2.7.2 | x64 | #### PyPy @@ -204,22 +207,22 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools -- Azure CosmosDb Emulator 2.11.6.0 +- Azure CosmosDb Emulator 2.11.8.0 - DacFx 15.0.4897.1 - SQLPS 1.0 - MySQL 5.7.21.0 ### Visual Studio Enterprise 2019 -| Name | Version | Path | -| ----------------------------- | ------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.7.30611.23 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Name | Version | Path | +| ----------------------------- | -------------- | -------------------------------------------------------------- | +| Visual Studio Enterprise 2019 | 16.7.30621.155 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | -------------- | -| Component.Android.NDK.R16B | 16.7.30611.6 | +| Component.Android.NDK.R16B | 16.7.30620.74 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK28 | 16.2.29003.222 | | Component.Ant | 1.9.3.8 | @@ -510,7 +513,7 @@ All other versions are saved but not installed. ### Android | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Android SDK Platform-Tools | 30.0.4 | +| Android SDK Platform-Tools | 30.0.5 | | Android SDK Tools | 26.1.1 | | Android SDK Platforms | android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4) | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | @@ -523,10 +526,12 @@ All other versions are saved but not installed. | CMake | 3.10.2
3.6.4111459 | ### Cached Docker images -- mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 -- mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 -- mcr.microsoft.com/windows/servercore:ltsc2019 -- mcr.microsoft.com/windows/nanoserver:1809 -- microsoft/aspnetcore-build:1.0-2.0 +| Repository:Tag | Digest | Created | +| ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:22bf1681055a29388f25d88e412ba8e36687bb8f78104c476c0187d0a116dd55 | 2020-10-13 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:877b131e45b79daf366e3c6fb0e353c23a2d68b38d1a7288b895a17535816b73 | 2020-10-13 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:c09d8edfe68365f519b02827171aacc61ed3451f7863325cee4059b96f41c0ce | 2020-10-01 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:e50bdbdbd0831ff5507be61074db1cdd595b6852bdc83a653a9e5466e1958394 | 2020-09-30 | +| microsoft/aspnetcore-build:1.0-2.0 | sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c | 2018-08-15 | diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1 index 7b91c7ac..12b4a701 100644 --- a/images/win/scripts/Installers/Install-DotnetSDK.ps1 +++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1 @@ -55,24 +55,19 @@ function InstallSDKVersion ( function InstallAllValidSdks() { - $releaseIndexName = "releases-index.json" - $releaseIndexUrl = "https://raw.githubusercontent.com/dotnet/core/master/release-notes/${releaseIndexName}" - $releasesIndexPath = Start-DownloadWithRetry -Url $releaseIndexUrl -Name $releaseIndexName - $dotnetChannels = Get-Content -Path $releasesIndexPath | ConvertFrom-Json - # Consider all channels except preview/eol channels. # Sort the channels in ascending order - $dotnetChannels = $dotnetChannels.'releases-index' | Where-Object { (!$_."support-phase".Equals('preview') -and !$_."support-phase".Equals('eol') -and !$_."support-phase".Equals('rc')) } | Sort-Object { [Version] $_."channel-version" } + $dotnetVersions = (Get-ToolsetContent).dotnet.versions # Download installation script. $installationName = "dotnet-install.ps1" $installationUrl = "https://dot.net/v1/${installationName}" Start-DownloadWithRetry -Url $installationUrl -Name $installationName -DownloadPath ".\" - ForEach ($dotnetChannel in $dotnetChannels) + ForEach ($dotnetVersion in $dotnetVersions) { - $channelVersion = $dotnetChannel.'channel-version'; - $releasesJsonPath = Start-DownloadWithRetry -Url $dotnetChannel.'releases.json' -Name "releases-$channelVersion.json" + $releaseJson = "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/${dotnetVersion}/releases.json" + $releasesJsonPath = Start-DownloadWithRetry -Url $releaseJson -Name "releases-${dotnetVersion}.json" $currentReleases = Get-Content -Path $releasesJsonPath | ConvertFrom-Json # filtering out the preview/rc releases $currentReleases = $currentReleases.'releases' | Where-Object { !$_.'release-version'.Contains('-') } | Sort-Object { [Version] $_.'release-version' } diff --git a/images/win/scripts/Tests/DotnetSDK.Tests.ps1 b/images/win/scripts/Tests/DotnetSDK.Tests.ps1 index 373e1d47..903be287 100644 --- a/images/win/scripts/Tests/DotnetSDK.Tests.ps1 +++ b/images/win/scripts/Tests/DotnetSDK.Tests.ps1 @@ -1,6 +1,4 @@ -$releaseIndexUrl = "https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases-index.json" -$dotnetChannels = (New-Object system.net.webclient).DownloadString($releaseIndexUrl) | ConvertFrom-Json -$dotnetVersions = $dotnetChannels.'releases-index' | Where-Object { (!$_."support-phase".Equals('preview') -and !$_."support-phase".Equals('eol') -and !$_."support-phase".Equals('rc')) } | Select-Object -ExpandProperty "channel-version" +$dotnetVersions = (Get-ToolsetContent).dotnet.versions Describe "Dotnet SDK" { diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index f5d30694..d041ece2 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -243,5 +243,11 @@ "package": "yamllint", "cmd": "yamllint --version" } - ] + ], + "dotnet": { + "versions": [ + "2.1", + "3.1" + ] + } } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index ebb7aa82..2b226ab7 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -286,5 +286,11 @@ "package": "yamllint", "cmd": "yamllint --version" } - ] + ], + "dotnet": { + "versions": [ + "2.1", + "3.1" + ] + } } diff --git a/images/win/windows2016.json b/images/win/windows2016.json index 120e7ac9..13cdc4a7 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -285,6 +285,9 @@ }, { "type": "powershell", + "environment_vars": [ + "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" + ], "scripts": [ "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1", "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1", diff --git a/images/win/windows2019.json b/images/win/windows2019.json index a27bf27d..f2c230bf 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -292,6 +292,9 @@ }, { "type": "powershell", + "environment_vars": [ + "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" + ], "scripts": [ "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1", "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1",