diff --git a/.github/ISSUE_TEMPLATE/announcement.md b/.github/ISSUE_TEMPLATE/announcement.md
new file mode 100644
index 000000000..0d501f6fe
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/announcement.md
@@ -0,0 +1,34 @@
+---
+name: Announcement
+about: Submit an announcement
+title: ''
+labels: Announcement
+assignees: ''
+
+---
+
+**Breaking changes**
+
+
+**Target date**
+
+
+**The motivation for the changes**
+
+
+**Possible impact**
+
+
+**Virtual environments affected**
+- [ ] Ubuntu 16.04
+- [ ] Ubuntu 18.04
+- [ ] Ubuntu 20.04
+- [ ] macOS 10.13
+- [ ] macOS 10.14
+- [ ] macOS 10.15
+- [ ] macOS 11.0
+- [ ] Windows Server 2016 R2
+- [ ] Windows Server 2019
+
+**Mitigation ways**
+
diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md
index b4513e8b3..c06b5d7b9 100644
--- a/images/linux/Ubuntu1604-README.md
+++ b/images/linux/Ubuntu1604-README.md
@@ -1,10 +1,11 @@
| Announcements |
|-|
+| [.NET 5.0 will become a default .NET version on November, 10](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) |
-| [Obsolete Android build-tools packages will be removed from Ubuntu images on October, 20](https://github.com/actions/virtual-environments/issues/1743) |
***
# Ubuntu 16.04.7 LTS
-- Image Version: 20201015.1
+- Image Version: 20201026.1
## Installed Software
### Language and Runtime
@@ -36,27 +37,28 @@
- Ant 1.9.6
- Gradle 6.7
- Maven 3.6.3
-- Sbt 1.4.0
+- Sbt 1.4.1
### Tools
- 7-Zip 9.20
- Ansible 2.9.14
-- AzCopy10 10.6.0 (available by `azcopy10` alias)
+- apt-fast 1.9.10
+- AzCopy10 10.6.1 (available by `azcopy10` alias)
- AzCopy7 7.3.0 (available by `azcopy` alias)
-- Bazel 3.6.0
-- Bazelisk 1.7.2
+- Bazel 3.7.0
+- Bazelisk 1.7.3
- CMake 3.17.0
- CodeQL Action Bundle 2.3.0
- curl 7.47.0
- Docker Compose 1.27.4
- Docker-Buildx 0.4.2
- Docker-Moby 19.03.13
-- Git 2.28.0
+- Git 2.29.0
- Git LFS 2.12.0
- Git-ftp 1.0.2
-- Google Cloud SDK 314.0.0
+- Google Cloud SDK 315.0.0
- Haveged 1.9.1
-- Heroku 7.46.0
+- Heroku 7.46.2
- HHVM (HipHop VM) 4.56.1
- jq 1.5
- Kind 0.9.0
@@ -65,17 +67,17 @@
- Leiningen 2.9.4
- m4 1.4.17
- Mercurial 4.4.1
-- Minikube 1.14.0
+- Minikube 1.14.1
- Newman 5.2.0
- nvm 0.36.0
- Packer 1.6.4
- PhantomJS 2.1.1
-- Pulumi 2.12.0
+- Pulumi 2.12.1
- R 4.0.3
- Sphinx Open Source Search Server 2.2.9
- SVN 1.9.3
- Swig 3.0.8
-- Terraform 0.13.4
+- Terraform 0.13.5
- unzip 6.00
- wget 1.17.1
- yamllint 1.2.1
@@ -84,14 +86,14 @@
### CLI Tools
- Alibaba Cloud CLI 3.0.60
-- AWS CLI 1.18.158
+- AWS CLI 1.18.164
- AWS CLI Session manager plugin 1.2.7.0
- AWS SAM CLI 1.6.2
- Azure CLI (azure-cli) 2.13.0
- Azure CLI (azure-devops) 0.18.0
- GitHub CLI 1.1.0
- Hub CLI 2.14.2
-- Netlify CLI 2.65.6
+- Netlify CLI 2.65.7
- oc CLI 4.5.0
- ORAS CLI 0.8.1
- Vercel CLI 20.1.2
@@ -99,16 +101,16 @@
### Java
| Version | Vendor | Environment Variable |
| ------------------- | ------------ | -------------------- |
-| 1.7.0_272 | Zulu | JAVA_HOME_7_X64 |
-| 1.8.0_265 (default) | AdoptOpenJDK | JAVA_HOME_8_X64 |
-| 11.0.8 | AdoptOpenJDK | JAVA_HOME_11_X64 |
+| 1.7.0_282 | Zulu | JAVA_HOME_7_X64 |
+| 1.8.0_272 (default) | AdoptOpenJDK | JAVA_HOME_8_X64 |
+| 11.0.9 | AdoptOpenJDK | JAVA_HOME_11_X64 |
| 12.0.2 | AdoptOpenJDK | JAVA_HOME_12_X64 |
### PHP
| Tool | Version |
| -------- | ----------------------------------------- |
| PHP | 5.6.40 7.0.33 7.1.33 7.2.34 7.3.23 7.4.11 |
-| Composer | 1.10.15 |
+| Composer | 2.0.2 |
| PHPUnit | 7.5.20 |
### Haskell
@@ -131,7 +133,7 @@
- Rustfmt 1.4.20
### Browsers and Drivers
-- Google Chrome 86.0.4240.75
+- Google Chrome 86.0.4240.111
- ChromeDriver 86.0.4240.22
- Mozilla Firefox 81.0.2
- Geckodriver 0.27.0
@@ -160,7 +162,7 @@
- 2.4.10
- 2.5.8
- 2.6.6
-- 2.7.1
+- 2.7.2
#### Python
- 2.7.18
@@ -178,7 +180,7 @@
- 8.17.0
- 10.22.1
- 12.19.0
-- 14.13.1
+- 14.14.0
#### Go
- 1.11.13
diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md
index 0029ea31d..68dd94222 100644
--- a/images/linux/Ubuntu1804-README.md
+++ b/images/linux/Ubuntu1804-README.md
@@ -1,10 +1,11 @@
| Announcements |
|-|
+| [.NET 5.0 will become a default .NET version on November, 10](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) |
-| [Obsolete Android build-tools packages will be removed from Ubuntu images on October, 20](https://github.com/actions/virtual-environments/issues/1743) |
***
# Ubuntu 18.04.5 LTS
-- Image Version: 20201015.1
+- Image Version: 20201026.1
## Installed Software
### Language and Runtime
@@ -29,7 +30,7 @@
- Npm 6.14.8
- Pip 9.0.1
- Pip3 9.0.1
-- Pipx 0.15.5.1
+- Pipx 0.15.6.0
- Vcpkg 2020.06.15
- Yarn 1.22.5
@@ -37,15 +38,16 @@
- Ant 1.10.5
- Gradle 6.7
- Maven 3.6.3
-- Sbt 1.4.0
+- Sbt 1.4.1
### Tools
- 7-Zip 16.02
- Ansible 2.9.14
-- AzCopy10 10.6.0 (available by `azcopy10` alias)
+- apt-fast 1.9.10
+- AzCopy10 10.6.1 (available by `azcopy10` alias)
- AzCopy7 7.3.0 (available by `azcopy` alias)
-- Bazel 3.6.0
-- Bazelisk 1.7.2
+- Bazel 3.7.0
+- Bazelisk 1.7.3
- Buildah 1.16.4
- CMake 3.17.0
- CodeQL Action Bundle 2.3.0
@@ -53,13 +55,13 @@
- Docker Compose 1.27.4
- Docker-Buildx 0.4.2
- Docker-Moby 19.03.13
-- Git 2.28.0
+- Git 2.29.0
- Git LFS 2.12.0
- Git-ftp 1.3.1
-- Google Cloud SDK 314.0.0
+- Google Cloud SDK 315.0.0
- Haveged 1.9.1
-- Heroku 7.46.0
-- HHVM (HipHop VM) 4.79.0
+- Heroku 7.46.2
+- HHVM (HipHop VM) 4.80.0
- jq 1.5
- Kind 0.9.0
- Kubectl 1.19.3
@@ -67,19 +69,19 @@
- Leiningen 2.9.4
- m4 1.4.18
- Mercurial 4.5.3
-- Minikube 1.14.0
+- Minikube 1.14.1
- Newman 5.2.0
- nvm 0.36.0
- Packer 1.6.4
- PhantomJS 2.1.1
- Podman 2.1.1
-- Pulumi 2.12.0
+- Pulumi 2.12.1
- R 4.0.3
- Skopeo 1.2.0
- Sphinx Open Source Search Server 2.2.11
- SVN 1.9.7
- Swig 3.0.12
-- Terraform 0.13.4
+- Terraform 0.13.5
- unzip 6.00
- wget 1.19.4
- yamllint 1.25.0
@@ -88,14 +90,14 @@
### CLI Tools
- Alibaba Cloud CLI 3.0.60
-- AWS CLI 1.18.157
-- AWS CLI Session manager plugin 1.1.61.0
+- AWS CLI 1.18.164
+- AWS CLI Session manager plugin 1.2.7.0
- AWS SAM CLI 1.6.2
- Azure CLI (azure-cli) 2.13.0
- Azure CLI (azure-devops) 0.18.0
- GitHub CLI 1.1.0
- Hub CLI 2.14.2
-- Netlify CLI 2.65.5
+- Netlify CLI 2.65.7
- oc CLI 4.5.0
- ORAS CLI 0.8.1
- Vercel CLI 20.1.2
@@ -103,22 +105,22 @@
### Java
| Version | Vendor | Environment Variable |
| ------------------- | ------------ | -------------------- |
-| 1.7.0_272 | Zulu | JAVA_HOME_7_X64 |
-| 1.8.0_265 (default) | AdoptOpenJDK | JAVA_HOME_8_X64 |
-| 11.0.8 | AdoptOpenJDK | JAVA_HOME_11_X64 |
+| 1.7.0_282 | Zulu | JAVA_HOME_7_X64 |
+| 1.8.0_272 (default) | AdoptOpenJDK | JAVA_HOME_8_X64 |
+| 11.0.9 | AdoptOpenJDK | JAVA_HOME_11_X64 |
| 12.0.2 | AdoptOpenJDK | JAVA_HOME_12_X64 |
### PHP
| Tool | Version |
| -------- | --------------------------- |
| PHP | 7.1.33 7.2.34 7.3.23 7.4.11 |
-| Composer | 1.10.15 |
+| Composer | 2.0.2 |
| PHPUnit | 7.5.20 |
### Haskell
- GHC 8.10.2
- Cabal 3.4.0.0
-- Stack 2.3.3
+- Stack 2.5.1
### Rust Tools
- Rust 1.47.0
@@ -135,9 +137,9 @@
- Rustfmt 1.4.20
### Browsers and Drivers
-- Google Chrome 86.0.4240.75
+- Google Chrome 86.0.4240.111
- ChromeDriver 86.0.4240.22
-- Mozilla Firefox 81.0
+- Mozilla Firefox 82.0
- Geckodriver 0.27.0
### .NET Core SDK
@@ -164,7 +166,7 @@
- 2.4.10
- 2.5.8
- 2.6.6
-- 2.7.1
+- 2.7.2
#### Python
- 2.7.18
@@ -182,7 +184,7 @@
- 8.17.0
- 10.22.1
- 12.19.0
-- 14.13.1
+- 14.14.0
#### Go
- 1.11.13
diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md
index b192a23ac..cd5aa8416 100644
--- a/images/linux/Ubuntu2004-README.md
+++ b/images/linux/Ubuntu2004-README.md
@@ -1,10 +1,11 @@
| Announcements |
|-|
+| [.NET 5.0 will become a default .NET version on November, 10](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) |
-| [Obsolete Android build-tools packages will be removed from Ubuntu images on October, 20](https://github.com/actions/virtual-environments/issues/1743) |
***
# Ubuntu 20.04.1 LTS
-- Image Version: 20201015.1
+- Image Version: 20201026.1
## Installed Software
### Language and Runtime
@@ -29,7 +30,7 @@
- Npm 6.14.8
- Pip 20.0.2
- Pip3 20.0.2
-- Pipx 0.15.5.1
+- Pipx 0.15.6.0
- Vcpkg 2020.06.15
- Yarn 1.22.5
@@ -37,15 +38,16 @@
- Ant 1.10.7
- Gradle 6.7
- Maven 3.6.3
-- Sbt 1.4.0
+- Sbt 1.4.1
### Tools
- 7-Zip 16.02
- Ansible 2.9.6
-- AzCopy10 10.6.0 (available by `azcopy10` alias)
+- apt-fast 1.9.10
+- AzCopy10 10.6.1 (available by `azcopy10` alias)
- AzCopy7 7.3.0 (available by `azcopy` alias)
-- Bazel 3.6.0
-- Bazelisk 1.7.2
+- Bazel 3.7.0
+- Bazelisk 1.7.3
- Buildah 1.16.4
- CMake 3.17.0
- CodeQL Action Bundle 2.3.0
@@ -53,13 +55,13 @@
- Docker Compose 1.27.4
- Docker-Buildx 0.4.2
- Docker-Moby 19.03.13
-- Git 2.28.0
+- Git 2.29.0
- Git LFS 2.12.0
- Git-ftp 1.6.0
-- Google Cloud SDK 314.0.0
+- Google Cloud SDK 315.0.0
- Haveged 1.9.1
-- Heroku 7.46.0
-- HHVM (HipHop VM) 4.79.0
+- Heroku 7.46.2
+- HHVM (HipHop VM) 4.80.0
- jq 1.6
- Kind 0.9.0
- Kubectl 1.19.3
@@ -67,19 +69,19 @@
- Leiningen 2.9.4
- m4 1.4.18
- Mercurial 5.3.1
-- Minikube 1.14.0
+- Minikube 1.14.1
- Newman 5.2.0
- nvm 0.36.0
- Packer 1.6.4
- PhantomJS 2.1.1
- Podman 2.1.1
-- Pulumi 2.12.0
+- Pulumi 2.12.1
- R 4.0.3
- Skopeo 1.2.0
- Sphinx Open Source Search Server 2.2.11
- SVN 1.13.0
- Swig 4.0.1
-- Terraform 0.13.4
+- Terraform 0.13.5
- unzip 6.00
- wget 1.20.3
- yamllint 1.25.0
@@ -88,14 +90,14 @@
### CLI Tools
- Alibaba Cloud CLI 3.0.60
-- AWS CLI 2.0.56
-- AWS CLI Session manager plugin 1.1.61.0
+- AWS CLI 2.0.59
+- AWS CLI Session manager plugin 1.2.7.0
- AWS SAM CLI 1.6.2
- Azure CLI (azure-cli) 2.13.0
- Azure CLI (azure-devops) 0.18.0
- GitHub CLI 1.1.0
- Hub CLI 2.14.2
-- Netlify CLI 2.65.5
+- Netlify CLI 2.65.7
- oc CLI 4.5.0
- ORAS CLI 0.8.1
- Vercel CLI 20.1.2
@@ -103,20 +105,20 @@
### Java
| Version | Vendor | Environment Variable |
| ---------------- | ------------ | -------------------- |
-| 1.8.0_265 | AdoptOpenJDK | JAVA_HOME_8_X64 |
-| 11.0.8 (default) | AdoptOpenJDK | JAVA_HOME_11_X64 |
+| 1.8.0_272 | AdoptOpenJDK | JAVA_HOME_8_X64 |
+| 11.0.9 (default) | AdoptOpenJDK | JAVA_HOME_11_X64 |
### PHP
| Tool | Version |
| -------- | ------- |
| PHP | 7.4.11 |
-| Composer | 1.10.15 |
+| Composer | 2.0.2 |
| PHPUnit | 7.5.20 |
### Haskell
- GHC 8.10.2
- Cabal 3.4.0.0
-- Stack 2.3.3
+- Stack 2.5.1
### Rust Tools
- Rust 1.47.0
@@ -133,9 +135,9 @@
- Rustfmt 1.4.20
### Browsers and Drivers
-- Google Chrome 86.0.4240.75
+- Google Chrome 86.0.4240.111
- ChromeDriver 86.0.4240.22
-- Mozilla Firefox 81.0
+- Mozilla Firefox 82.0
- Geckodriver 0.27.0
### .NET Core SDK
@@ -161,7 +163,7 @@
#### Ruby
- 2.5.8
- 2.6.6
-- 2.7.1
+- 2.7.2
#### Python
- 2.7.18
@@ -179,7 +181,7 @@
- 8.17.0
- 10.22.1
- 12.19.0
-- 14.13.1
+- 14.14.0
#### Go
- 1.14.10
diff --git a/images/linux/post-generation/homebrew-permissions.sh b/images/linux/post-generation/homebrew-permissions.sh
index 1dbd043e2..edd15fb79 100644
--- a/images/linux/post-generation/homebrew-permissions.sh
+++ b/images/linux/post-generation/homebrew-permissions.sh
@@ -2,10 +2,13 @@
# Fix permissions for Homebrew
# https://github.com/actions/virtual-environments/issues/1568
+
brew_folder="/home/linuxbrew/"
+homebrew_user=$(cut -d: -f1 /etc/passwd | tail -1)
+
if [ -d "$brew_folder" ]; then
brew_folder_owner=$(ls -ld $brew_folder | awk '{print $3}')
- if [ "$USER" != "$brew_folder_owner" ]; then
- chown "$USER":docker -R $brew_folder
+ if [ "$homebrew_user" != "$brew_folder_owner" ]; then
+ chown "$homebrew_user":docker -R $brew_folder
fi
fi
diff --git a/images/linux/post-generation/rust-permissions.sh b/images/linux/post-generation/rust-permissions.sh
index 6673686bd..aff56ca17 100644
--- a/images/linux/post-generation/rust-permissions.sh
+++ b/images/linux/post-generation/rust-permissions.sh
@@ -2,10 +2,13 @@
# Fix permissions for the Rust folder
# https://github.com/actions/virtual-environments/issues/572
+
rust_folder="/usr/share/rust"
+rust_user=$(cut -d: -f1 /etc/passwd | tail -1)
+
if [ -d "$rust_folder" ]; then
rust_folder_owner=$(ls -ld $rust_folder | awk '{print $3}')
- if [ "$USER" != "$rust_folder_owner" ]; then
- chown "$USER":docker -R $rust_folder
+ if [ "$rust_user" != "$rust_folder_owner" ]; then
+ chown "$rust_user":docker -R $rust_folder
fi
fi
diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md
index 415b41ba6..cfb4e8102 100644
--- a/images/macos/macos-10.15-Readme.md
+++ b/images/macos/macos-10.15-Readme.md
@@ -1,18 +1,19 @@
| Announcements |
|-|
+| [.NET 5.0 will become a default .NET version on November, 10](https://github.com/actions/virtual-environments/issues/1891) |
| [macOS 11.0 (Big Sur) is available as a preview 🚀](https://github.com/actions/virtual-environments/issues/1814) |
| [[macOS] Default Ruby version will be changed to 2.7 on October, 26](https://github.com/actions/virtual-environments/issues/1775) |
-| [Default Xcode will be changed to Xcode 12.0 on October, 20](https://github.com/actions/virtual-environments/issues/1712) |
+| [Default Xcode will be changed to Xcode 12.0.1 on October, 20](https://github.com/actions/virtual-environments/issues/1712) |
| [Xcode 11.0, 11.1, 11.4.0 will be deprecated on November, 5](https://github.com/actions/virtual-environments/issues/1688) |
***
# macOS 10.15 info
- System Version: macOS 10.15.7 (19H2)
- Kernel Version: Darwin 19.6.0
-- Image Version: 20201017.1
+- Image Version: 20201026.2
## Installed Software
### Language and Runtime
-- Clang/LLVM 10.0.1
+- Clang/LLVM 11.0.0
- gcc-8 (Homebrew GCC 8.4.0_1) 8.4.0 - available by `gcc-8` alias
- gcc-9 (Homebrew GCC 9.3.0) 9.3.0 - available by `gcc-9` alias
- GNU Fortran (Homebrew GCC 8.4.0_1) 8.4.0 - available by `gfortran-8` alias
@@ -23,9 +24,9 @@
- NVM - Cached node versions: v6.17.1 v8.17.0 v10.22.1 v12.19.0 v13.14.0 v14.14.0
- Python 2.7.17
- Python 3.8.6
-- Ruby 2.6.6p146
+- Ruby 2.7.2p137
- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 2.1.602 2.1.603 2.1.604 2.1.607 2.1.700 2.1.701 2.1.801 2.1.802 2.1.803 2.1.804 2.1.805 2.1.806 2.1.807 2.1.808 2.1.809 2.1.810 2.1.811 3.0.100 3.0.101 3.0.102 3.0.103 3.1.100 3.1.101 3.1.200 3.1.201 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403
-- Go 1.15.2
+- Go 1.15.3
- PHP 7.4.11
- julia 1.5.2
@@ -35,14 +36,14 @@
- Pip 20.2.3 (python 3.8)
- Bundler version 2.1.4
- Carthage 0.36.0
-- CocoaPods 1.9.3
-- Homebrew 2.5.6
+- CocoaPods 1.10.0
+- Homebrew 2.5.7
- NPM 6.14.8
- Yarn 1.22.5
- NuGet 5.6.0.6489
- Miniconda 4.8.3
- RubyGems 3.1.4
-- Composer 1.10.15
+- Composer 2.0.2
### Project Management
- Apache Maven 3.6.3
@@ -51,7 +52,7 @@
### Utilities
- Curl 7.73.0
-- Git: 2.28.0
+- Git: 2.29.1
- Git LFS: 2.12.0
- GitHub CLI: 1.1.0
- Hub CLI: 2.14.2
@@ -64,28 +65,28 @@
- psql (PostgreSQL) 13.0
- PostgreSQL 13.0
- aria2 1.35.0
-- azcopy 10.6.0
+- azcopy 10.6.1
- zstd 1.4.5
-- bazel 3.6.0
-- bazelisk 1.7.2
+- bazel 3.7.0
+- bazelisk 1.7.4
- helm v3.3.4+ga61ce56
- mongo v4.4.1
- mongod v4.4.1
- 7-Zip 16.02
- Newman 5.2.0
-- virtualbox 6.1.14r140239
+- virtualbox 6.1.16r140961
- Vagrant 2.2.10
-- GNU parallel 20200722
+- GNU parallel 20201022
### Tools
-- Fastlane 2.163.0
+- Fastlane 2.165.0
- Cmake 3.18.4
- App Center CLI 2.7.2
- Azure CLI 2.13.0
-- AWS CLI 2.0.57
+- AWS CLI 2.0.59
- AWS SAM CLI 1.6.2
-- AWS Session Manager CLI 1.1.61.0
+- AWS Session Manager CLI 1.2.7.0
- Aliyun CLI 3.0.60
- GHCup v0.1.11
- GHC 8.10.2
@@ -99,19 +100,19 @@
### Browsers
- Safari 14.0 (15610.1.28.1.9)
- SafariDriver 14.0 (15610.1.28.1.9)
-- Google Chrome 86.0.4240.80
+- Google Chrome 86.0.4240.111
- ChromeDriver 86.0.4240.22
-- Microsoft Edge 85.0.564.70
-- MSEdgeDriver 85.0.564.70
-- Mozilla Firefox 81.0.2
+- Microsoft Edge 86.0.622.51
+- MSEdgeDriver 86.0.622.51
+- Mozilla Firefox 82.0
- geckodriver 0.27.0
### Java
| Version | Vendor | Environment Variable |
| --------- | ------------ | -------------------- |
| 1.7.0_272 | Zulu | JAVA_HOME_7_X64 |
-| 1.8.0_265 | AdoptOpenJDK | JAVA_HOME_8_X64 |
-| 11.0.8 | AdoptOpenJDK | JAVA_HOME_11_X64 |
+| 1.8.0_272 | AdoptOpenJDK | JAVA_HOME_8_X64 |
+| 11.0.9 | AdoptOpenJDK | JAVA_HOME_11_X64 |
| 12.0.2 | AdoptOpenJDK | JAVA_HOME_12_X64 |
| 13.0.2 | AdoptOpenJDK | JAVA_HOME_13_X64 |
| 14.0.2 | AdoptOpenJDK | JAVA_HOME_14_X64 |
@@ -120,7 +121,7 @@
- 2.4.10
- 2.5.8
- 2.6.6
-- 2.7.1
+- 2.7.2
#### Python
- 2.7.18
@@ -212,21 +213,21 @@
- NUnit 3.6.1
### Xcode
-| Version | Build | Path |
-| -------------- | -------- | ------------------------------ |
-| 12.2 (beta) | 12B5035g | /Applications/Xcode_12.2.app |
-| 12.1 | 12A7403 | /Applications/Xcode_12.1.app |
-| 12.0.1 | 12A7300 | /Applications/Xcode_12.app |
-| 11.7 (default) | 11E801a | /Applications/Xcode_11.7.app |
-| 11.6 | 11E708 | /Applications/Xcode_11.6.app |
-| 11.5 | 11E608c | /Applications/Xcode_11.5.app |
-| 11.4.1 | 11E503a | /Applications/Xcode_11.4.1.app |
-| 11.4 | 11E146 | /Applications/Xcode_11.4.app |
-| 11.3.1 | 11C505 | /Applications/Xcode_11.3.1.app |
-| 11.2.1 | 11B500 | /Applications/Xcode_11.2.1.app |
-| 11.1 | 11A1027 | /Applications/Xcode_11.1.app |
-| 11.0 | 11A420a | /Applications/Xcode_11.app |
-| 10.3 | 10G8 | /Applications/Xcode_10.3.app |
+| Version | Build | Path |
+| ---------------- | -------- | ------------------------------ |
+| 12.2 (beta) | 12B5035g | /Applications/Xcode_12.2.app |
+| 12.1 | 12A7403 | /Applications/Xcode_12.1.app |
+| 12.0.1 (default) | 12A7300 | /Applications/Xcode_12.app |
+| 11.7 | 11E801a | /Applications/Xcode_11.7.app |
+| 11.6 | 11E708 | /Applications/Xcode_11.6.app |
+| 11.5 | 11E608c | /Applications/Xcode_11.5.app |
+| 11.4.1 | 11E503a | /Applications/Xcode_11.4.1.app |
+| 11.4 | 11E146 | /Applications/Xcode_11.4.app |
+| 11.3.1 | 11C505 | /Applications/Xcode_11.3.1.app |
+| 11.2.1 | 11B500 | /Applications/Xcode_11.2.1.app |
+| 11.1 | 11A1027 | /Applications/Xcode_11.1.app |
+| 11.0 | 11A420a | /Applications/Xcode_11.app |
+| 10.3 | 10G8 | /Applications/Xcode_10.3.app |
#### Xcode Support Tools
- xcpretty 0.3.0
diff --git a/images/macos/provision/assets/select-xamarin-sdk.sh b/images/macos/provision/assets/select-xamarin-sdk.sh
new file mode 100644
index 000000000..0fb4a3433
--- /dev/null
+++ b/images/macos/provision/assets/select-xamarin-sdk.sh
@@ -0,0 +1,22 @@
+#!/bin/bash -e -o pipefail
+if [ -z "$1" ]; then
+ echo "No Xamarin SDK specified."
+ exit 0
+fi
+
+XAMARIN_SDK=$1
+
+echo "Set Xamarin SDK to ${XAMARIN_SDK}"
+FOLDERS_LIST=(
+ '/Library/Frameworks/Mono.framework/Versions'
+ '/Library/Frameworks/Xamarin.iOS.framework/Versions'
+ '/Library/Frameworks/Xamarin.Android.framework/Versions'
+ '/Library/Frameworks/Xamarin.Mac.framework/Versions'
+ )
+
+for FOLDER in "${FOLDERS_LIST[@]}"
+do
+ echo "Set Current folder for ${FOLDER}"
+ sudo rm -f ${FOLDER}/Current
+ sudo ln -s ${FOLDER}/${XAMARIN_SDK} ${FOLDER}/Current
+done
\ No newline at end of file
diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh
index ef4a3714b..e3c4de7fc 100644
--- a/images/macos/provision/configuration/finalize-vm.sh
+++ b/images/macos/provision/configuration/finalize-vm.sh
@@ -16,6 +16,12 @@ fi
# Put documentation to $HOME root
cp $HOME/image-generation/output/software-report/systeminfo.txt $HOME/image-generation/output/software-report/systeminfo.md $HOME/
+# Put build vm assets scripts to proper directory
+mkdir -p /usr/local/opt/$USER/scripts
+mv $HOME/image-generation/assets/* /usr/local/opt/$USER/scripts
+
+find /usr/local/opt/$USER/scripts -type f -name "*\.sh" -exec chmod +x {} \;
+
# Clean up npm cache which collected during image-generation
# we have to do that here because `npm install` is run in a few different places during image-generation
npm cache clean --force
diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh
index c2b22bafa..afca628e8 100644
--- a/images/macos/provision/core/openjdk.sh
+++ b/images/macos/provision/core/openjdk.sh
@@ -35,7 +35,7 @@ JAVA_DEFAULT=$(get_toolset_value '.java.default')
for JAVA_VERSION in "${JAVA_VERSIONS_LIST[@]}"
do
if [[ $JAVA_VERSION == "7" ]]; then
- installAzulJDK "https://cdn.azul.com/zulu/bin/zulu7.40.0.15-ca-jdk7.0.272-macosx_x64.dmg"
+ installAzulJDK "https://cdn.azul.com/zulu/bin/zulu7.42.0.13-ca-jdk7.0.282-macosx_x64.dmg"
else
brew cask install "adoptopenjdk${JAVA_VERSION}"
fi
diff --git a/images/macos/provision/core/pipx-packages.sh b/images/macos/provision/core/pipx-packages.sh
index a101d6d78..47de190f1 100644
--- a/images/macos/provision/core/pipx-packages.sh
+++ b/images/macos/provision/core/pipx-packages.sh
@@ -1,5 +1,4 @@
#!/bin/bash -e -o pipefail
-
source ~/utils/utils.sh
export PATH="$PATH:/opt/pipx_bin"
diff --git a/images/macos/provision/core/python.sh b/images/macos/provision/core/python.sh
index 629220535..da0493199 100755
--- a/images/macos/provision/core/python.sh
+++ b/images/macos/provision/core/python.sh
@@ -10,7 +10,7 @@ brew install python@3.8
brew install python@3.9
brew unlink python@3.9
brew unlink python@3.8
-brew link python@3.8
+brew link python@3.8 --force
echo "Brew Installing Python 2"
# Create local tap with formula due to python2 formula depreciation
diff --git a/images/macos/templates/macOS-10.13.json b/images/macos/templates/macOS-10.13.json
index 9ebd56e6d..3eda456d7 100644
--- a/images/macos/templates/macOS-10.13.json
+++ b/images/macos/templates/macOS-10.13.json
@@ -43,6 +43,11 @@
"type": "shell",
"inline": "mkdir ~/image-generation"
},
+ {
+ "type": "file",
+ "source": "./provision/assets",
+ "destination": "~/image-generation/"
+ },
{
"type": "file",
"source": "./tests",
diff --git a/images/macos/templates/macOS-10.14.json b/images/macos/templates/macOS-10.14.json
index c03cc72aa..06e4dc7bd 100644
--- a/images/macos/templates/macOS-10.14.json
+++ b/images/macos/templates/macOS-10.14.json
@@ -43,6 +43,11 @@
"type": "shell",
"inline": "mkdir ~/image-generation"
},
+ {
+ "type": "file",
+ "source": "./provision/assets",
+ "destination": "~/image-generation/"
+ },
{
"type": "file",
"source": "./tests",
diff --git a/images/macos/templates/macOS-10.15.json b/images/macos/templates/macOS-10.15.json
index cf49ef571..554ad0268 100644
--- a/images/macos/templates/macOS-10.15.json
+++ b/images/macos/templates/macOS-10.15.json
@@ -43,6 +43,11 @@
"type": "shell",
"inline": "mkdir ~/image-generation"
},
+ {
+ "type": "file",
+ "source": "./provision/assets",
+ "destination": "~/image-generation/"
+ },
{
"type": "file",
"source": "./tests",
diff --git a/images/macos/templates/macOS-11.0.json b/images/macos/templates/macOS-11.0.json
index 585a93542..2a9b691b5 100644
--- a/images/macos/templates/macOS-11.0.json
+++ b/images/macos/templates/macOS-11.0.json
@@ -43,6 +43,11 @@
"type": "shell",
"inline": "mkdir ~/image-generation"
},
+ {
+ "type": "file",
+ "source": "./provision/assets",
+ "destination": "~/image-generation/"
+ },
{
"type": "file",
"source": "./tests",
diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json
index e041c15e2..229ccc794 100644
--- a/images/macos/toolsets/toolset-10.15.json
+++ b/images/macos/toolsets/toolset-10.15.json
@@ -2,7 +2,7 @@
"xcode": {
"default": "12",
"versions": [
- "12.2_beta", "12.1_GM_seed", "12", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3"
+ "12.2_beta", "12.1", "12", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3"
]
},
"xamarin": {
@@ -11,7 +11,7 @@
"6.12.0.93", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208"
],
"ios-versions": [
- "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47"
+ "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47"
],
"mac-versions": [
"6.20.2.2", "6.18.3.2", "6.16.0.13", "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47"
@@ -19,8 +19,15 @@
"android-versions": [
"11.0.2.0", "10.3.1.4", "10.2.0.100", "10.1.3.7", "10.0.6.2"
],
- "bundle-default": "latest",
+ "bundle-default": "6_12_1",
"bundles": [
+ {
+ "symlink": "6_12_2",
+ "mono":"6.12",
+ "ios": "14.2",
+ "mac": "6.20",
+ "android": "11.0"
+ },
{
"symlink": "6_12_1",
"mono":"6.12",
diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json
index cb14b3a0e..c05de28cb 100644
--- a/images/macos/toolsets/toolset-11.0.json
+++ b/images/macos/toolsets/toolset-11.0.json
@@ -11,7 +11,7 @@
"6.12.0.93"
],
"ios-versions": [
- "14.0.0.0", "13.20.2.2"
+ "14.2.0.12", "14.0.0.0", "13.20.2.2"
],
"mac-versions": [
"6.20.2.2"
@@ -21,6 +21,13 @@
],
"bundle-default": "6_12_0",
"bundles": [
+ {
+ "symlink": "6_12_2",
+ "mono":"6.12",
+ "ios": "14.2",
+ "mac": "6.20",
+ "android": "11.0"
+ },
{
"symlink": "6_12_1",
"mono":"6.12",
diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md
index f184b50ab..05e7c2d64 100644
--- a/images/win/Windows2016-Readme.md
+++ b/images/win/Windows2016-Readme.md
@@ -1,10 +1,11 @@
| Announcements |
|-|
+| [[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) |
***
# Microsoft Windows Server 2016 Datacenter
-- OS Version: 10.0.14393 Build 3930
-- Image Version: 20201012.1
+- OS Version: 10.0.14393 Build 3986
+- Image Version: 20201020.1
## Installed Software
### Language and Runtime
@@ -14,7 +15,7 @@
- Java 13.0.2
- Python 3.7.9
- Ruby 2.5.8p224
-- Go 1.14.9
+- Go 1.14.10
- PHP 7.4.11
- Julia 1.5.2
- Perl 5.32.0
@@ -25,46 +26,46 @@
- Vcpkg 2020.06.15
- NPM 6.14.8
- Yarn 1.22.10
-- pip 20.2.3 (python 3.7)
-- Miniconda 4.6.14
+- pip 20.2.4 (python 3.7)
+- Miniconda 4.8.3
- RubyGems 3.1.4
- Helm 3.3.4
-- Composer 1.10.13
+- Composer 1.10.15
- NuGet 5.7.0.6726
### Project Management
- Ant 1.10.9
- Maven 3.6.3
-- Gradle 6.6
+- Gradle 6.7
- sbt 1.4.0
### Tools
- azcopy 10.6.0
-- Bazel 3.6.0
-- Bazelisk 1.7.1
+- Bazel 3.7.0
+- Bazelisk 1.7.3
- CMake 3.18.4
-- CodeQL Action Bundle 2.2.5
+- CodeQL Action Bundle 2.3.0
- R 4.0.3
- Docker 19.03.12
-- Docker-compose 1.27.2
-- Git 2.28.0
-- Git LFS 2.11.0
-- Google Cloud SDK 313.0.1
+- Docker-compose 1.27.4
+- Git 2.29.0
+- Git LFS 2.12.0
+- Google Cloud SDK 315.0.0
- InnoSetup 6.0.5
- jq 1.6
-- Kubectl 1.19.1
+- Kubectl 1.19.3
- Kind 0.9.0
- Mingw-w64 8.1.0
- Mercurial 5.0
- NSIS v3.06.1
- Newman 5.2.0
- OpenSSL 1.1.1
-- Packer 1.6.3
-- Pulumi v2.11.2
+- Packer 1.6.4
+- Pulumi v2.12.0
- Subversion (SVN) 1.14.0
- ghc 8.10.2
- Cabal 3.2.0.0
-- Stack 2.3.3
+- Stack 2.5.1
- WinAppDriver 1.1.1809.18001
- zstd 1.4.5
- VSWhere 2.8.4
@@ -72,12 +73,12 @@
- yamllint 1.25.0
### CLI Tools
-- Azure CLI 2.12.1
+- Azure CLI 2.13.0
- Azure DevOps CLI extension 0.18.0
- Azure Dev Spaces CLI 1.0.20200921.3
-- AWS CLI 2.0.56
+- AWS CLI 2.0.57
- AWS SAM CLI 1.6.2
-- AWS Session Manager CLI 1.1.61.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
@@ -93,11 +94,11 @@
- cargo-outdated v0.9.11
### Browsers and webdrivers
-- Google Chrome 86.0.4240.75
+- Google Chrome 86.0.4240.111
- Chrome Driver 86.0.4240.22
-- Microsoft Edge 86.0.622.38
-- Microsoft Edge Driver 86.0.622.38
-- Mozilla Firefox 81.0.1
+- Microsoft Edge 86.0.622.48
+- Microsoft Edge Driver 86.0.622.48
+- Mozilla Firefox 82.0
- Gecko Driver 0.27.0
- IE Driver 3.150.1.0
@@ -137,8 +138,8 @@ 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.9 (Default) | x64 | GOROOT_1_14_X64 |
-| 1.15.2 | x64 | GOROOT_1_15_X64 |
+| 1.14.10 (Default) | x64 | GOROOT_1_14_X64 |
+| 1.15.3 | x64 | GOROOT_1_15_X64 |
#### Node
@@ -147,7 +148,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH.
| 8.17.0 | x64 |
| 10.22.1 | x64 |
| 12.19.0 | x64 |
-| 14.13.1 | x64 |
+| 14.14.0 | x64 |
#### Python
@@ -158,6 +159,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH.
| 3.6.8 | x64, x86 |
| 3.7.9 (Default) | x64, x86 |
| 3.8.6 | x64, x86 |
+| 3.9.0 | x64, x86 |
#### Ruby
@@ -200,6 +202,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH.
### Database tools
- Azure CosmosDb Emulator 2.11.6.0
+- DacFx 15.0.4897.1
- SQLPS 1.0
- MySQL 5.7.21.0
@@ -207,7 +210,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH.
### Visual Studio Enterprise 2017
| Name | Version | Path |
| ----------------------------- | --------------- | -------------------------------------------------------------- |
-| Visual Studio Enterprise 2017 | 15.9.28307.1259 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise |
+| Visual Studio Enterprise 2017 | 15.9.28307.1274 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise |
#### Workloads, components and extensions:
@@ -476,20 +479,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH.
### .NET Core SDK
`Location C:\Program Files\dotnet\sdk`
-- 1.1.14 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.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.700 2.1.701 2.1.801 2.1.802 2.1.803 2.1.804 2.1.805 2.1.806 2.1.807 2.1.808 2.1.809 2.1.810 3.1.100 3.1.101 3.1.102 3.1.103 3.1.104 3.1.105 3.1.106 3.1.107 3.1.108 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402
+- 1.1.14 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
### .NET Core Runtime
`Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All`
-- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22
+- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23
`Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App`
-- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8
+- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9
`Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App`
-- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8
+- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9
`Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App`
-- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8
+- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9
### .NET Framework
`Type: Developer Pack`
@@ -518,7 +521,7 @@ All other versions are saved but not installed.
| Pester | 3.4.0
5.0.4 |
| PowerShellGet | 1.0.0.1
2.2.4.1
2.2.5 |
| PSWindowsUpdate | 2.2.0.2 |
-| SqlServer | 21.1.18228 |
+| SqlServer | 21.1.18229 |
| VSSetup | 2.2.16 |
### Android
diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md
index a153b8d4d..0f79ae555 100644
--- a/images/win/Windows2019-Readme.md
+++ b/images/win/Windows2019-Readme.md
@@ -1,10 +1,11 @@
| Announcements |
|-|
+| [[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) |
***
# Microsoft Windows Server 2019 Datacenter
-- OS Version: 10.0.17763 Build 1457
-- Image Version: 20201011.1
+- OS Version: 10.0.17763 Build 1518
+- Image Version: 20201021.0
## Enabled windows optional features
- Windows Subsystem for Linux
@@ -17,7 +18,7 @@
- Java 13.0.2
- Python 3.7.9
- Ruby 2.5.8p224
-- Go 1.14.9
+- Go 1.14.10
- PHP 7.4.11
- Julia 1.5.2
- Perl 5.32.0
@@ -28,46 +29,46 @@
- Vcpkg 2020.06.15
- NPM 6.14.8
- Yarn 1.22.10
-- pip 20.2.3 (python 3.7)
-- Miniconda 4.6.14
+- pip 20.2.4 (python 3.7)
+- Miniconda 4.8.3
- RubyGems 3.1.4
- Helm 3.3.4
-- Composer 1.10.13
+- Composer 1.10.15
- NuGet 5.7.0.6726
### Project Management
- Ant 1.10.9
- Maven 3.6.3
-- Gradle 6.6
-- sbt 1.4.0
+- Gradle 6.7
+- sbt 1.4.1
### Tools
- azcopy 10.6.0
-- Bazel 3.6.0
-- Bazelisk 1.7.1
+- Bazel 3.7.0
+- Bazelisk 1.7.3
- CMake 3.18.4
-- CodeQL Action Bundle 2.2.5
+- CodeQL Action Bundle 2.3.0
- R 4.0.3
- Docker 19.03.12
-- Docker-compose 1.27.2
-- Git 2.28.0
-- Git LFS 2.11.0
-- Google Cloud SDK 313.0.1
+- Docker-compose 1.27.4
+- Git 2.29.0
+- Git LFS 2.12.0
+- Google Cloud SDK 315.0.0
- InnoSetup 6.0.5
- jq 1.6
-- Kubectl 1.19.1
+- Kubectl 1.19.3
- Kind 0.9.0
- Mingw-w64 8.1.0
- Mercurial 5.0
- NSIS v3.06.1
- Newman 5.2.0
- OpenSSL 1.1.1
-- Packer 1.6.3
-- Pulumi v2.11.2
+- Packer 1.6.4
+- Pulumi v2.12.0
- Subversion (SVN) 1.14.0
- ghc 8.10.2
- Cabal 3.2.0.0
-- Stack 2.3.3
+- Stack 2.5.1
- WinAppDriver 1.1.1809.18001
- zstd 1.4.5
- VSWhere 2.8.4
@@ -75,12 +76,12 @@
- yamllint 1.25.0
### CLI Tools
-- Azure CLI 2.12.1
+- Azure CLI 2.13.0
- Azure DevOps CLI extension 0.18.0
- Azure Dev Spaces CLI 1.0.20200921.3
-- AWS CLI 2.0.56
+- AWS CLI 2.0.58
- AWS SAM CLI 1.6.2
-- AWS Session Manager CLI 1.1.61.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
@@ -96,11 +97,11 @@
- cargo-outdated v0.9.11
### Browsers and webdrivers
-- Google Chrome 86.0.4240.75
+- Google Chrome 86.0.4240.111
- Chrome Driver 86.0.4240.22
-- Microsoft Edge 86.0.622.38
-- Microsoft Edge Driver 86.0.622.38
-- Mozilla Firefox 81.0.1
+- Microsoft Edge 86.0.622.48
+- Microsoft Edge Driver 86.0.622.48
+- Mozilla Firefox 82.0
- Gecko Driver 0.27.0
- IE Driver 3.150.1.0
@@ -140,8 +141,8 @@ 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.9 (Default) | x64 | GOROOT_1_14_X64 |
-| 1.15.2 | x64 | GOROOT_1_15_X64 |
+| 1.14.10 (Default) | x64 | GOROOT_1_14_X64 |
+| 1.15.3 | x64 | GOROOT_1_15_X64 |
#### Node
@@ -150,7 +151,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH.
| 8.17.0 | x64 |
| 10.22.1 | x64 |
| 12.19.0 | x64 |
-| 14.13.1 | x64 |
+| 14.14.0 | x64 |
#### Python
@@ -161,6 +162,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH.
| 3.6.8 | x64, x86 |
| 3.7.9 (Default) | x64, x86 |
| 3.8.6 | x64, x86 |
+| 3.9.0 | x64, x86 |
#### Ruby
@@ -203,20 +205,21 @@ Note: MSYS2 is pre-installed on image but not added to PATH.
### Database tools
- Azure CosmosDb Emulator 2.11.6.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.30523.141 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise |
+| Name | Version | Path |
+| ----------------------------- | ------------- | -------------------------------------------------------------- |
+| Visual Studio Enterprise 2019 | 16.7.30611.23 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise |
#### Workloads, components and extensions:
| Package | Version |
| ------------------------------------------------------------------------- | -------------- |
-| Component.Android.NDK.R16B | 16.7.30521.138 |
+| Component.Android.NDK.R16B | 16.7.30611.6 |
| Component.Android.SDK25.Private | 16.0.28625.61 |
| Component.Android.SDK28 | 16.2.29003.222 |
| Component.Ant | 1.9.3.8 |
@@ -268,10 +271,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH.
| Microsoft.Net.ComponentGroup.4.7.DeveloperTools | 16.3.29207.166 |
| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 |
| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 |
-| Microsoft.Net.Core.Component.SDK.2.1 | 16.7.30428.286 |
+| Microsoft.Net.Core.Component.SDK.2.1 | 16.7.30611.6 |
| Microsoft.NetCore.Component.DevelopmentTools | 16.5.29721.120 |
-| Microsoft.NetCore.Component.Runtime.3.1 | 16.7.30428.286 |
-| Microsoft.NetCore.Component.SDK | 16.7.30428.286 |
+| Microsoft.NetCore.Component.Runtime.3.1 | 16.7.30611.6 |
+| Microsoft.NetCore.Component.SDK | 16.7.30611.6 |
| Microsoft.NetCore.Component.Web | 16.5.29721.120 |
| Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 |
| Microsoft.VisualStudio.Component.AspNet45 | 16.0.28315.86 |
@@ -459,20 +462,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH.
### .NET Core SDK
`Location C:\Program Files\dotnet\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.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.700 2.1.701 2.1.801 2.1.802 2.1.803 2.1.804 2.1.805 2.1.806 2.1.807 2.1.808 2.1.809 2.1.810 3.1.100 3.1.101 3.1.102 3.1.103 3.1.104 3.1.105 3.1.106 3.1.107 3.1.108 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402
+- 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
### .NET Core Runtime
`Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All`
-- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22
+- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23
`Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App`
-- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8
+- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9
`Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App`
-- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8
+- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9
`Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App`
-- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8
+- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9
### .NET Framework
`Type: Developer Pack`
@@ -501,7 +504,7 @@ All other versions are saved but not installed.
| Pester | 3.4.0
5.0.4 |
| PowerShellGet | 1.0.0.1
2.2.4.1
2.2.5 |
| PSWindowsUpdate | 2.2.0.2 |
-| SqlServer | 21.1.18228 |
+| SqlServer | 21.1.18229 |
| VSSetup | 2.2.16 |
### Android
diff --git a/images/win/scripts/Installers/Configure-Shell.ps1 b/images/win/scripts/Installers/Configure-Shell.ps1
new file mode 100644
index 000000000..8eb163bcf
--- /dev/null
+++ b/images/win/scripts/Installers/Configure-Shell.ps1
@@ -0,0 +1,23 @@
+# Create shells folder
+$shellPath = "C:\shells"
+New-Item -Path $shellPath -ItemType Directory | Out-Null
+
+# sh and bash <--> C:\msys64\usr\bin\bash.exe
+New-Item -ItemType SymbolicLink -Path "$shellPath\bash.exe" -Target "C:\msys64\usr\bin\bash.exe" | Out-Null
+New-Item -ItemType SymbolicLink -Path "$shellPath\sh.exe" -Target "C:\msys64\usr\bin\sh.exe" | Out-Null
+
+# WSL is available on Windows Server 2019
+if (Test-IsWin19)
+{
+ # winbash <--> C:\Windows\System32\bash.exe
+ New-Item -ItemType SymbolicLink -Path "$shellPath\winbash.exe" -Target "$env:SystemRoot\System32\bash.exe" | Out-Null
+}
+
+# gitbash <--> C:\Program Files\Git\bin\bash.exe
+New-Item -ItemType SymbolicLink -Path "$shellPath\gitbash.exe" -Target "$env:ProgramFiles\Git\bin\bash.exe" | Out-Null
+
+# msysbash <--> C:\msys64\usr\bin\bash.exe
+New-Item -ItemType SymbolicLink -Path "$shellPath\msysbash.exe" -Target "C:\msys64\usr\bin\bash.exe" | Out-Null
+
+# Add shells to PATH
+Add-MachinePathItem $shellPath
\ No newline at end of file
diff --git a/images/win/scripts/Installers/Finalize-VM.ps1 b/images/win/scripts/Installers/Finalize-VM.ps1
index 4e7a260c4..d0bb3d26a 100644
--- a/images/win/scripts/Installers/Finalize-VM.ps1
+++ b/images/win/scripts/Installers/Finalize-VM.ps1
@@ -30,3 +30,7 @@ New-Item -Path $winInstallDir -ItemType Directory -Force
# Remove AllUsersAllHosts profile
Remove-Item $profile.AllUsersAllHosts -Force
+
+# Clean yarn and npm cache
+yarn cache clean
+npm cache clean --force
\ No newline at end of file
diff --git a/images/win/scripts/Installers/Install-Git.ps1 b/images/win/scripts/Installers/Install-Git.ps1
index 27a619695..6c89250e9 100644
--- a/images/win/scripts/Installers/Install-Git.ps1
+++ b/images/win/scripts/Installers/Install-Git.ps1
@@ -26,7 +26,7 @@ Install-Binary -Url $downloadUrl `
"/SP-", `
"/CLOSEAPPLICATIONS", `
"/RESTARTAPPLICATIONS", `
- "/o:PathOption=CmdTools", `
+ "/o:PathOption=Cmd", `
"/o:BashTerminalOption=ConHost", `
"/o:EnableSymlinks=Enabled", `
"/COMPONENTS=gitlfs")
@@ -36,15 +36,5 @@ Choco-Install -PackageName hub
# Disable GCM machine-wide
[Environment]::SetEnvironmentVariable("GCM_INTERACTIVE", "Never", [System.EnvironmentVariableTarget]::Machine)
-Add-MachinePathItem "C:\Program Files\Git\bin"
-
-if (Test-IsWin16) {
- $env:Path += ";$env:ProgramFiles\Git\usr\bin\"
-}
-
-# Add well-known SSH host keys to ssh_known_hosts
-ssh-keyscan -t rsa github.com >> "C:\Program Files\Git\etc\ssh\ssh_known_hosts"
-ssh-keyscan -t rsa ssh.dev.azure.com >> "C:\Program Files\Git\etc\ssh\ssh_known_hosts"
-
Invoke-PesterTests -TestFile "Git" -TestName "Git"
Invoke-PesterTests -TestFile "CLI.Tools" -TestName "Hub CLI"
diff --git a/images/win/scripts/Installers/Install-Mingw64.ps1 b/images/win/scripts/Installers/Install-Mingw64.ps1
index b6c860485..2b999f450 100644
--- a/images/win/scripts/Installers/Install-Mingw64.ps1
+++ b/images/win/scripts/Installers/Install-Mingw64.ps1
@@ -7,7 +7,7 @@ Choco-Install -PackageName mingw
# Make a copy of mingw32-make.exe to make.exe, which is a more discoverable name
# and so the same command line can be used on Windows as on macOS and Linux
-$path = where.exe mingw32-make.exe | Get-Item
+$path = Get-Command mingw32-make.exe -CommandType All | Where-Object { $_.Path.Contains("C:\ProgramData\Chocolatey") } | Get-Item
Copy-Item -Path $path -Destination (Join-Path $path.Directory 'make.exe')
Invoke-PesterTests -TestFile "Tools" -TestName "Mingw64"
diff --git a/images/win/scripts/Installers/Install-Msys2.ps1 b/images/win/scripts/Installers/Install-Msys2.ps1
index f0da38503..dea3b95d0 100644
--- a/images/win/scripts/Installers/Install-Msys2.ps1
+++ b/images/win/scripts/Installers/Install-Msys2.ps1
@@ -9,35 +9,19 @@
$dash = "-" * 40
-$origPath = $env:PATH
-$gitPath = "$env:ProgramFiles\Git"
-
-$msys2_release = "https://api.github.com/repos/msys2/msys2-installer/releases/latest"
-
-$msys2Uri = ((Invoke-RestMethod $msys2_release).assets | Where-Object {
- $_.name -match "x86_64" -and $_.name.EndsWith("tar.xz") }).browser_download_url
-
-# Download the latest msys2 x86_64, filename includes release date
-Write-Host "Starting msys2 download using $($msys2Uri.split('/')[-1])"
+# Downloading msys2
+$msys2Release = "https://api.github.com/repos/msys2/msys2-installer/releases/latest"
+$msys2Uri = ((Invoke-RestMethod $msys2Release).assets | Where-Object {
+ $_.name -match "x86_64" -and $_.name.EndsWith("sfx.exe") }).browser_download_url
$msys2File = Start-DownloadWithRetry -Url $msys2Uri
-Write-Host "Finished download"
-# nix style path for tar
-$msys2FileU = "/$msys2File".replace(':', '').replace('\', '/')
-
-# Git tar needs exe's from mingw64\bin
-$env:PATH = "$gitPath\usr\bin;$gitPath\mingw64\bin;$origPath"
-
-$tar = "$gitPath\usr\bin\tar.exe"
-
-# extract tar.xz to C:\
+# extract sfx.exe to C:\
Write-Host "Starting msys2 extraction"
-&$tar -xJf $msys2FileU -C /c/
-Remove-Item $msys2File
+& $msys2File -y -oC:\
Write-Host "Finished extraction"
# Add msys2 bin tools folders to PATH temporary
-$env:PATH = "C:\msys64\mingw64\bin;C:\msys64\usr\bin;$origPath"
+$env:PATH = "C:\msys64\mingw64\bin;C:\msys64\usr\bin;$env:PATH"
Write-Host "`n$dash bash pacman-key --init"
bash.exe -c "pacman-key --init 2>&1"
@@ -73,6 +57,10 @@ Write-Host "`n$dash Install mingw32 packages"
$pre = "mingw-w64-i686-"
pacman.exe -S --noconfirm --needed --noprogressbar $tools32.replace('___', $pre).split(' ')
+# install openssh
+Write-Host "`n$dash Install openssh package"
+pacman.exe -S --noconfirm --needed --noprogressbar openssh
+
# clean all packages to decrease image size
Write-Host "`n$dash Clean packages"
pacman.exe -Scc --noconfirm
@@ -88,4 +76,23 @@ pacman.exe -Q | grep -v ^mingw-w64-
Write-Host "`nMSYS2 installation completed"
+# Environment
+# add C:\msys64\mingw64\bin and C:\msys64\usr\bin to PATH
+# C:\msys64\mingw64\bin add after C:\Windows\System32 to not replace built-in tar.exe
+$regEnvKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\'
+$pathValue = Get-ItemPropertyValue -Path $regEnvKey -Name 'Path'
+$pathValue += ";C:\msys64\mingw64\bin;C:\msys64\usr\bin"
+Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $pathValue
+
+# Add well-known SSH host keys to ssh_known_hosts to Msys2
+ssh-keyscan -t rsa github.com >> "C:\msys64\etc\ssh\ssh_known_hosts"
+ssh-keyscan -t rsa ssh.dev.azure.com >> "C:\msys64\etc\ssh\ssh_known_hosts"
+
+# Add well-known SSH host keys to ssh_known_hosts to Git
+if (Test-Path "C:\Program Files\Git\etc\ssh")
+{
+ ssh-keyscan -t rsa github.com >> "C:\Program Files\Git\etc\ssh\ssh_known_hosts"
+ ssh-keyscan -t rsa ssh.dev.azure.com >> "C:\Program Files\Git\etc\ssh\ssh_known_hosts"
+}
+
Invoke-PesterTests -TestFile "MSYS2"
diff --git a/images/win/scripts/Installers/Install-SQLPowerShellTools.ps1 b/images/win/scripts/Installers/Install-SQLPowerShellTools.ps1
index 60cbbefaf..37f5ece9b 100644
--- a/images/win/scripts/Installers/Install-SQLPowerShellTools.ps1
+++ b/images/win/scripts/Installers/Install-SQLPowerShellTools.ps1
@@ -3,7 +3,7 @@
## Desc: Install SQL PowerShell tool
################################################################################
-$BaseUrl = "https://download.microsoft.com/download/8/7/2/872BCECA-C849-4B40-8EBE-21D48CDF1456/ENU/x64"
+$BaseUrl = "https://download.microsoft.com/download/B/1/7/B1783FE9-717B-4F78-A39A-A2E27E3D679D/ENU/x64"
# install required MSIs
$SQLSysClrTypesName = "SQLSysClrTypes.msi"
diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1
index 05b101aac..0ca95ee71 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1
@@ -271,6 +271,13 @@ function Get-PacmanVersion {
return "- Pacman $pacmanVersion"
}
+function Get-ShellTarget {
+ $shells = Get-ChildItem C:\shells -File | Select-Object @{n="Name";e={
+ $name = $_.Name
+ if ($name -eq 'bash.exe') {"$name (Default)"} else {$name}}},@{n="Target";e={@($_.Target)[0]}} | Sort-Object Name
+ $shells | New-MDTable -Columns ([ordered]@{Name = "left"; Target = "left";})
+}
+
function Get-YAMLLintVersion {
yamllint --version
}
\ No newline at end of file
diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index 1b3bf299a..06e1054da 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -142,14 +142,22 @@ $markdown += New-MDList -Style Unordered -Lines @(
(Get-SeleniumWebDriverVersion -Driver "iexplorer")
)
+$markdown += New-MDHeader "Shells" -Level 3
+$markdown += Get-ShellTarget
+$markdown += New-MDNewLine
+
$markdown += New-MDHeader "MSYS2" -Level 3
$markdown += Get-PacmanVersion
$markdown += New-MDNewLine
+$markdown += New-MDHeader "Notes:" -Level 5
$markdown += @'
```
Location: C:\msys64
-Note: MSYS2 is pre-installed on image but not added to PATH.
+1. MSYS2 is pre-installed on image
+2. C:\msys64\mingw64\bin is added to PATH and has lower precedence than C:\Windows\System32
+3. C:\msys64\usr\bin is added to PATH and has lower precedence than C:\Windows\System32
+4. Default bash.exe shell is set to the C:\msys64\usr\bin\bash.exe
```
'@
$markdown += New-MDNewLine
diff --git a/images/win/scripts/Tests/Git.Tests.ps1 b/images/win/scripts/Tests/Git.Tests.ps1
index 8dd159fa4..e7675ee07 100644
--- a/images/win/scripts/Tests/Git.Tests.ps1
+++ b/images/win/scripts/Tests/Git.Tests.ps1
@@ -1,5 +1,5 @@
Describe "Git" {
- $gitTools = 'bash', 'awk', 'git', 'git-lfs'
+ $gitTools = 'git', 'git-lfs'
$gitTestCases = $gitTools | ForEach-Object {
@{
toolName = $_
diff --git a/images/win/scripts/Tests/Shell.Tests.ps1 b/images/win/scripts/Tests/Shell.Tests.ps1
new file mode 100644
index 000000000..915940e2a
--- /dev/null
+++ b/images/win/scripts/Tests/Shell.Tests.ps1
@@ -0,0 +1,50 @@
+Describe "Shell" {
+ $shellTestCases = @(
+ @{Name = "C:\shells\bash.exe"; Target = "C:\msys64\usr\bin\bash.exe"},
+ @{Name = "C:\shells\sh.exe"; Target = "C:\msys64\usr\bin\sh.exe"},
+ @{Name = "C:\shells\gitbash.exe"; Target = "$env:ProgramFiles\Git\bin\bash.exe"},
+ @{Name = "C:\shells\msysbash.exe"; Target = "C:\msys64\usr\bin\bash.exe"}
+ )
+
+ $pathTestCases = @(
+ @{Path = "C:\shells"},
+ @{Path = "C:\msys64\mingw64\bin"},
+ @{Path = "C:\msys64\usr\bin"}
+ )
+
+ $IsWin16 = Test-IsWin16
+
+ It "Default bash.exe from MSYS2" {
+ (Get-Command bash).Path | Should -BeExactly "C:\shells\bash.exe"
+ }
+
+ It "Default sh.exe from MSYS2" {
+ (Get-Command sh).Path | Should -BeExactly "C:\shells\sh.exe"
+ }
+
+ It "Folder C:\shells exists" {
+ "C:\shells" | Should -Exist
+ }
+
+ It "C:\Windows\System32 before C:\msys64\mingw64\bin and C:\msys64\usr\bin" {
+ $path = $env:Path.Split(";").ToLower()
+ $indexOfSystem32 = $path.IndexOf("c:\windows\system32")
+
+ $path.IndexOf("c:\msys64\mingw64\bin") | Should -BeGreaterThan $indexOfSystem32
+ $path.IndexOf("c:\msys64\usr\bin") | Should -BeGreaterThan $indexOfSystem32
+ }
+
+ It "C:\shells\winbash.exe target to $env:SystemRoot\System32\bash.exe" -Skip:$IsWin16 {
+ $Name = "C:\shells\winbash.exe"
+ $Target = "$env:SystemRoot\System32\bash.exe"
+ (Get-Item $Name).Target | Should -BeExactly $Target
+ }
+
+ It " target to " -TestCases $shellTestCases {
+ (Get-Item $Name).Target | Should -BeExactly $Target
+ }
+
+ It " is in PATH" -TestCases $pathTestCases {
+ $env:Path.Split(";") | Should -Contain $Path
+ }
+}
\ No newline at end of file
diff --git a/images/win/windows2016.json b/images/win/windows2016.json
index 3c4b65663..8c1314d63 100644
--- a/images/win/windows2016.json
+++ b/images/win/windows2016.json
@@ -332,7 +332,8 @@
"type": "powershell",
"scripts": [
"{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1",
- "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1"
+ "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1",
+ "{{ template_dir }}/scripts/Installers/Configure-Shell.ps1"
],
"elevated_user": "{{user `install_user`}}",
"elevated_password": "{{user `install_password`}}"
diff --git a/images/win/windows2019.json b/images/win/windows2019.json
index 6b9f3a868..a002f77f5 100644
--- a/images/win/windows2019.json
+++ b/images/win/windows2019.json
@@ -330,7 +330,8 @@
"type": "powershell",
"scripts": [
"{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1",
- "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1"
+ "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1",
+ "{{ template_dir }}/scripts/Installers/Configure-Shell.ps1"
],
"elevated_user": "{{user `install_user`}}",
"elevated_password": "{{user `install_password`}}"