diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 00000000..54085c9b
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,12 @@
+# Description
+New tool, Bug fixing, or Improvement?
+Please include a summary of the change and which issue is fixed. Also include relevant motivation and context.
+**For new tools, please provide total size and installation time.**
+
+#### Related issue:
+
+## Check list
+- [ ] Related issue / work item is attached
+- [ ] Tests are written (if applicable)
+- [ ] Documentation is updated (if applicable)
+- [ ] Changes are tested and related VM images are successfully generated
diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh
index 1ca4cde2..631be190 100644
--- a/images/linux/scripts/installers/clang.sh
+++ b/images/linux/scripts/installers/clang.sh
@@ -12,13 +12,11 @@ function InstallClang {
version=$1
echo "Installing clang-$version..."
- # Clang 6.0 is not supported by automatic installation script (`llvm.sh`)
- # Thus we have to install it explicitly
- if [[ $version == 6* ]]; then
- apt-get install -y "clang-$version" "lldb-$version" "lld-$version"
- else
+ if [[ $version =~ 9 ]]; then
./llvm.sh $version
apt-get install -y "clang-format-$version"
+ else
+ apt-get install -y "clang-$version" "lldb-$version" "lld-$version" "clang-format-$version"
fi
# Run tests to determine that the software installed as expected
@@ -35,11 +33,6 @@ function InstallClang {
DocumentInstalledItem "Clang $version ($(clang-$version --version | head -n 1 | cut -d ' ' -f 3 | cut -d '-' -f 1))"
}
-# Install Clang compiler
-wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-6.0 main"
-apt-get update -y
-
# Download script for automatic installation
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh
index 61d39af0..c4586039 100644
--- a/images/linux/scripts/installers/java-tools.sh
+++ b/images/linux/scripts/installers/java-tools.sh
@@ -70,9 +70,9 @@ done
echo "Lastly, documenting what we added to the metadata file"
DocumentInstalledItem "Azul Zulu OpenJDK:"
DocumentInstalledItemIndent "7 ($(/usr/lib/jvm/zulu-7-azure-amd64/bin/java -showversion |& head -n 1))"
-DocumentInstalledItemIndent "8 ($(/usr/lib/jvm/zulu-8-azure-amd64/bin/java -showversion |& head -n 1))"
+DocumentInstalledItemIndent "8 ($(/usr/lib/jvm/zulu-8-azure-amd64/bin/java -showversion |& head -n 1)) (default)"
DocumentInstalledItemIndent "11 ($(/usr/lib/jvm/zulu-11-azure-amd64/bin/java -showversion |& head -n 1))"
-DocumentInstalledItemIndent "12 ($(/usr/lib/jvm/zulu-12-azure-amd64/bin/java -showversion |& head -n 1)) (default)"
+DocumentInstalledItemIndent "12 ($(/usr/lib/jvm/zulu-12-azure-amd64/bin/java -showversion |& head -n 1))"
DocumentInstalledItem "Ant ($(ant -version))"
DocumentInstalledItem "Gradle ${gradleVersion}"
DocumentInstalledItem "Maven ($(mvn -version | head -n 1))"
diff --git a/images/linux/scripts/installers/rust.sh b/images/linux/scripts/installers/rust.sh
index 571538a3..850868a4 100644
--- a/images/linux/scripts/installers/rust.sh
+++ b/images/linux/scripts/installers/rust.sh
@@ -12,16 +12,14 @@ set -e
export RUSTUP_HOME=/usr/share/rust/.rustup
export CARGO_HOME=/usr/share/rust/.cargo
-curl https://sh.rustup.rs -sSf | sh -s -- -y
+curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=stable --profile=minimal
# Initialize environment variables
source $CARGO_HOME/env
# Install common tools
-rustup component add rustfmt
-rustup component add clippy
-cargo install bindgen
-cargo install cbindgen
+rustup component add rustfmt clippy
+cargo install bindgen cbindgen
echo "Test installation of the Rust toochain"
diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md
index 10c9ac28..ec7f0a4e 100644
--- a/images/macos/macos-10.15-Readme.md
+++ b/images/macos/macos-10.15-Readme.md
@@ -1,5 +1,5 @@
# macOS Catalina 10.15.3 (19D76)
-The following software is installed on machines with the 20200307.2 update.
+The following software is installed on machines with the 20200321.1 update.
#### Xcode 11.3.1 set by default
## Operating System
@@ -13,37 +13,38 @@ The following software is installed on machines with the 20200307.2 update.
- Java 11: Zulu11.37+17-CA (build 11.0.6+10-LTS)
- Java 12: Zulu12.3+11-CA (build 12.0.2+3)
- Java 13: Zulu13.29+9-CA (build 13.0.2+6-MTS)
-- Rust 1.41.1
+- Java 14: Zulu14.27+1-CA (build 14+36)
+- Rust 1.42.0
- Clang/LLVM 9.0.1
-- gcc-8 (Homebrew GCC 8.3.0_2) 8.3.0
-- gcc-9 (Homebrew GCC 9.2.0_3) 9.2.0
-- GNU Fortran (Homebrew GCC 8.3.0_2) 8.3.0
-- GNU Fortran (Homebrew GCC 9.2.0_3) 9.2.0
+- gcc-8 (Homebrew GCC 8.4.0) 8.4.0
+- gcc-9 (Homebrew GCC 9.3.0) 9.3.0
+- GNU Fortran (Homebrew GCC 8.4.0) 8.4.0
+- GNU Fortran (Homebrew GCC 9.3.0) 9.3.0
- Node.js v12.16.1
- NVM 0.33.11
-- NVM - Cached node versions: v6.17.1 v8.17.0 v10.19.0 v12.16.1 v13.10.1
+- NVM - Cached node versions: v6.17.1 v8.17.0 v10.19.0 v12.16.1 v13.11.0
- PowerShell 7.0.0
- Python 2.7.17
-- Python 3.7.6
+- Python 3.7.7
- Ruby 2.6.5p114
-- .NET SDK 2.0.0 3.0.100 3.0.101 3.0.102 3.0.103 3.1.100 3.1.101
+- .NET SDK 2.0.0 3.0.100 3.0.101 3.0.102 3.0.103 3.1.100 3.1.101 3.1.200
- Go 1.14
-- PHP 7.4.3
-- julia 1.3.1
+- PHP 7.4.4
+- julia 1.4.0
### Package Management
- Rustup 1.21.1
- Vcpkg 2020.02.04
- Bundler version 2.1.4
- Carthage 0.34.0
-- CocoaPods 1.9.0
-- Homebrew 2.2.9
+- CocoaPods 1.9.1
+- Homebrew 2.2.10
- NPM 6.13.4
-- Yarn 1.22.1
+- Yarn 1.22.4
- NuGet 5.4.0.6315
- Pip 19.3.1 (python 2.7)
-- Pip 19.3.1 (python 3.7)
-- Miniconda 4.7.12
+- Pip 20.0.2 (python 3.7)
+- Miniconda 4.8.2
- RubyGems 3.1.2
### Project Management
@@ -51,9 +52,10 @@ The following software is installed on machines with the 20200307.2 update.
- Gradle 6.2.2
### Utilities
-- Curl 7.69.0
-- Git: 2.25.1
+- Curl 7.69.1
+- Git: 2.25.2
- Git LFS: 2.10.0
+- Hub CLI: 2.14.2
- GNU Wget 1.20.3
- Subversion (SVN) 1.13.0
- Packer 1.5.4
@@ -67,19 +69,23 @@ The following software is installed on machines with the 20200307.2 update.
- zstd 1.4.4
- bazel 2.2.0
- bazelisk v1.3.0
+- helm v3.1.2+gd878d4d
+- Docker 19.03.8
+- docker-machine 0.16.2
+- docker-compose 1.25.4
### Tools
- Fastlane 2.143.0
- Cmake 3.16.5
-- App Center CLI 2.3.3
-- Azure CLI 2.1.0
+- App Center CLI 2.3.4
+- Azure CLI 2.2.0
### Browsers
-- Google Chrome 80.0.3987.132
+- Google Chrome 80.0.3987.149
- ChromeDriver 80.0.3987.106
-- Microsoft Edge 80.0.361.66
+- Microsoft Edge 80.0.361.69
- MSEdgeDriver 80.0.361.66
-- Mozilla Firefox 73.0.1
+- Mozilla Firefox 74.0
- geckodriver 0.26.0
### Toolcache
diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json
index 01a51195..31405515 100644
--- a/images/win/Windows2016-Azure.json
+++ b/images/win/Windows2016-Azure.json
@@ -15,6 +15,7 @@
"virtual_network_subnet_name": "{{env `VNET_SUBNET`}}",
"private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}",
"vm_size": "Standard_DS4_v2",
+ "run_scan_antivirus": "false",
"root_folder": "C:",
"image_folder": "C:\\image",
@@ -30,8 +31,7 @@
"image_os": "win16",
"github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}",
"go_versions": "1.9, 1.10, 1.11, 1.12, 1.13, 1.14",
- "go_default": "1.14",
- "boost_default": "1.69.0"
+ "go_default": "1.14"
},
"sensitive-variables": ["install_password", "ssh_password", "client_secret", "github_feed_token"],
"builders": [
@@ -101,7 +101,8 @@
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Windows2016/Initialize-VM.ps1"
- ]
+ ],
+ "execution_policy": "unrestricted"
},
{
"type": "powershell",
@@ -525,8 +526,7 @@
{
"type": "powershell",
"environment_vars": [
- "ROOT_FOLDER={{user `root_folder`}}",
- "BOOST_DEFAULT={{user `boost_default`}}"
+ "ROOT_FOLDER={{user `root_folder`}}"
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Install-Boost.ps1"
@@ -660,8 +660,7 @@
{
"type": "powershell",
"environment_vars": [
- "ROOT_FOLDER={{user `root_folder`}}",
- "BOOST_DEFAULT={{user `boost_default`}}"
+ "ROOT_FOLDER={{user `root_folder`}}"
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Validate-Boost.ps1"
@@ -889,8 +888,17 @@
},
{
"type": "powershell",
+ "environment_vars":[
+ "RUN_SCAN_ANTIVIRUS={{user `run_scan_antivirus`}}"
+ ],
"scripts":[
- "{{ template_dir }}/scripts/Installers/Windows2016/Run-Antivirus.ps1"
+ "{{ template_dir }}/scripts/Installers/Run-Antivirus.ps1"
+ ]
+ },
+ {
+ "type": "powershell",
+ "scripts":[
+ "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1"
]
},
{
diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json
index e965b9a0..19de32ea 100644
--- a/images/win/Windows2019-Azure.json
+++ b/images/win/Windows2019-Azure.json
@@ -15,6 +15,7 @@
"virtual_network_subnet_name": "{{env `VNET_SUBNET`}}",
"private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}",
"vm_size": "Standard_DS4_v2",
+ "run_scan_antivirus": "false",
"root_folder": "C:",
"image_folder": "C:\\image",
@@ -30,8 +31,7 @@
"image_os": "win19",
"github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}",
"go_versions": "1.9, 1.10, 1.11, 1.12, 1.13, 1.14",
- "go_default": "1.14",
- "boost_default": "1.72.0"
+ "go_default": "1.14"
},
"sensitive-variables": ["install_password", "ssh_password", "client_secret", "github_feed_token"],
"builders": [
@@ -101,7 +101,8 @@
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Windows2019/Initialize-VM.ps1"
- ]
+ ],
+ "execution_policy": "unrestricted"
},
{
"type": "powershell",
@@ -506,8 +507,7 @@
{
"type": "powershell",
"environment_vars": [
- "ROOT_FOLDER={{user `root_folder`}}",
- "BOOST_DEFAULT={{user `boost_default`}}"
+ "ROOT_FOLDER={{user `root_folder`}}"
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Install-Boost.ps1"
@@ -647,8 +647,7 @@
{
"type": "powershell",
"environment_vars": [
- "ROOT_FOLDER={{user `root_folder`}}",
- "BOOST_DEFAULT={{user `boost_default`}}"
+ "ROOT_FOLDER={{user `root_folder`}}"
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Validate-Boost.ps1"
@@ -882,8 +881,17 @@
},
{
"type": "powershell",
+ "environment_vars":[
+ "RUN_SCAN_ANTIVIRUS={{user `run_scan_antivirus`}}"
+ ],
"scripts":[
- "{{ template_dir }}/scripts/Installers/Windows2019/Run-Antivirus.ps1"
+ "{{ template_dir }}/scripts/Installers/Run-Antivirus.ps1"
+ ]
+ },
+ {
+ "type": "powershell",
+ "scripts":[
+ "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1"
]
},
{
diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md
index 9819f9a8..cd716b6e 100644
--- a/images/win/Windows2019-Readme.md
+++ b/images/win/Windows2019-Readme.md
@@ -1,6 +1,6 @@
# Windows Server 2019
-The following software is installed on machines with the 20200308.0 update.
+The following software is installed on machines with the 20200319.1 update.
Components marked with **\*** have been upgraded since the previous version of the image.
@@ -23,6 +23,12 @@ _Version:_ 1.25.4
_Environment:_
* PATH: contains location of docker-compose.exe
+## Helm
+
+_Version:_ v3.1.2+gd878d4d
+_Environment:_
+* PATH: contains location of helm
+
## Powershell Core
_Version:_ 7.0.0
@@ -30,15 +36,15 @@ _Version:_ 7.0.0
## Docker images
The following container images have been cached:
-* mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 (Digest: sha256:746e54a4398bff0ad516d02fdb9eec5cba1a3b5ba0c15a82c051fc3dc753fe85)
-* mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 (Digest: sha256:708a9492c51140a07a0bd160c508dd6d17f3b061af0a3f53de607d671ee7176a)
-* mcr.microsoft.com/windows/servercore:ltsc2019 (Digest: sha256:39ba615d7a739fcdd9fc95b97882672d5af7d0861dd16b51b238c822765d2b8d)
-* mcr.microsoft.com/windows/nanoserver:1809 (Digest: sha256:4201fb07c1ece2ef0bad7b518fd487d030cd49de98b81b3ed8b98e71432df463)
+* mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 (Digest: sha256:24ffd5fad1becaf9b16f42ec6f40c90ddf56664986a87212d2d48164e3bb52ba)
+* mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 (Digest: sha256:ceaf6f000f0a0677510a5511f089071c2822dd40f34a77ca0280f96b10621858)
+* mcr.microsoft.com/windows/servercore:ltsc2019 (Digest: sha256:8dcc65367c900f06ad386da6a1e25d578232f7b15981092986ade2f2fd9468b8)
+* mcr.microsoft.com/windows/nanoserver:1809 (Digest: sha256:5de6bd32bd453d60c8f549d28845552e89ad3652566e141ac82023b6ba10374d)
* microsoft/aspnetcore-build:1.0-2.0 (Digest: sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c)
## Visual Studio 2019 Enterprise
-_Version:_ VisualStudio/16.4.5+29806.167
+_Version:_ VisualStudio/16.5.0+29911.84
_Location:_ C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise
The following workloads and components are installed with Visual Studio 2019:
@@ -132,13 +138,15 @@ The following workloads and components are installed with Visual Studio 2019:
## WIX Tools
_Toolset Version:_ 3.11.4516
-_WIX Toolset Visual Studio Extension Version:_ 1.0.0.4
+_WIX Toolset Studio 2019 Extension Version:_ 1.0.0.4
_Environment:_
* WIX: Installation root of WIX
-## Microsoft Analysis Services Projects Visual Studio Extension
+## Microsoft SSDT Visual Studio 2019 Extensions
-_Version:_ 2.9.5
+_Microsoft Analysis Services Projects Version:_ 2.9.6
+_SQL Server Integration Services Projects Version:_ 3.5
+_Microsoft Reporting Services Projects Version:_ 2.6.3
## .NET 4.8
@@ -408,7 +416,7 @@ _Description:_ .NET has been configured to use TLS 1.2 by default
## Azure CLI
-_Version:_ 2.1.0
+_Version:_ 2.2.0
_Environment:_
* PATH: contains location of az.cmd
@@ -418,7 +426,7 @@ _Version:_ azure-devops 0.17.0
## Python
-_Version:_ 2.7.17 (x64)
_Version:_ 3.5.4 (x64)
_Version:_ 3.6.8 (x64)
_Version:_ 3.7.6 (x64)
_Version:_ 3.8.2 (x64)
_Version:_ 2.7.17 (x86)
_Version:_ 3.5.4 (x86)
_Version:_ 3.6.8 (x86)
_Version:_ 3.7.6 (x86)
_Version:_ 3.8.2 (x86)
+_Version:_ 2.7.17 (x64)
_Version:_ 3.5.4 (x64)
_Version:_ 3.6.8 (x64)
_Version:_ 3.7.6 (x64)
_Version:_ 3.8.2 (x64)
_Version:_ 2.7.17 (x86)
_Version:_ 3.5.4 (x86)
_Version:_ 3.6.8 (x86)
_Version:_ 3.7.6 (x86)
_Version:_ 3.8.2 (x86)
__System default version:__ Python 3.7.6
_Environment:_
* Location: C:\hostedtoolcache\windows\Python\3.7.6\x64
* PATH: contains the location of Python 3.7.6
## PyPy
@@ -426,21 +434,15 @@ _Version:_ 2.7.13 (x86)
_Version:_ 3.6.9 (x86)
## Ruby
-_Version:_ 2.4.9 (x64)
_Version:_ 2.5.7 (x64)
_Version:_ 2.6.5 (x64)
_Version:_ 2.7.0 (x64)
+_Version:_ 2.4.9 (x64)
_Version:_ 2.5.7 (x64)
_Version:_ 2.6.5 (x64)
_Version:_ 2.7.0 (x64)
__System default version:__ Ruby 2.5.7p206
_Environment:_
* Location: C:\hostedtoolcache\windows\Ruby\2.5.7\x64\bin
* PATH: contains the location of Ruby 2.5.7p206
* Gem Version: 2.7.6.2
-## Python (64 bit)
+## OpenSSL
-#### Python 3.7.6
-_Environment:_
-* PATH: contains location of python.exe
-
-#### Python 2.7.17
-
-_Location:_ C:/hostedtoolcache/windows/Python/2.7*/x64
+_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe
_Version:_ 1.1.1d at C:\Strawberry\c\bin\openssl.exe
_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe
_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe
_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe
## Perl
-_Version:_ v5.30.1
+_Version:_ v5.30.2
## Git
@@ -455,33 +457,45 @@ _Environment:_
* PATH: contains location of git-lfs.exe
* GIT_LFS_PATH: location of git-lfs.exe
+## Hub CLI
+
+_Version:_ 2.14.2
+_Environment:_
+* PATH: contains location of hub.exe
+
## Go (x64)
-#### 1.12.7
+#### 1.14
_Environment:_
-* PATH: contains the location of go.exe version 1.12.7
-* GOROOT: root directory of the Go 1.12.7 installation
-* GOROOT_1_12_X64: root directory of the Go 1.12.7 installation
-#### 1.13
-
-_Environment:_
-* GOROOT_1_13_X64: root directory of the Go 1.13 installation
-
+* PATH: contains the location of go.exe version 1.14
+* GOROOT: root directory of the Go 1.14 installation
+* GOROOT_1_14_X64: root directory of the Go 1.14 installation
## Boost
-#### 1.69.0
+#### 1.69.0 [msvc-14.1]
_Environment:_
* BOOST_ROOT_1_69_0: root directory of the Boost version 1.69.0 installation
-#### 1.72.0
+#### 1.72.0 [msvc-14.2]
+_Environment:_
* PATH: contains the location of Boost version 1.72.0
-* BOOST_ROOT: root directory of the Boost version 1.72.0 installation
* BOOST_ROOT_1_72_0: root directory of the Boost version 1.72.0 installation
+
+#### _Notes:_
+Link: https://cmake.org/cmake/help/latest/module/FindBoost.html
+
+If Boost was built using the `boost-cmake` project or from `Boost 1.70.0` on it provides a package
+configuration file for use with find\_package's config mode. This module looks for the package
+configuration file called BoostConfig.cmake or boost-config.cmake and stores the result in CACHE entry "Boost_DIR".
+If found, the package configuration file is loaded and this module returns with no further action.
+See documentation of the Boost CMake package configuration for details on what it provides.
+
+Set `Boost_NO_BOOST_CMAKE to ON`, to disable the search for boost-cmake.
## PHP (x64)
@@ -492,17 +506,9 @@ _Environment:_
* PATH: contains the location of php.exe version 7.4.3
* PHPROOT: root directory of the PHP 7.4.3 installation
-## Ruby (x64)
-
-#### 2.5.7p206
-_Environment:_
-* Location: C:\hostedtoolcache\windows\Ruby\2.5.7\x64\bin
-* PATH: contains the location of ruby.exe version 2.5.7p206
-* Gem Version: 3.1.2
-
## Rust (64-bit)
-#### 1.41.1
+#### 1.42.0
_Location:_ C:\Rust\.cargo\bin
_Environment:_
* PATH: contains the location of rustc.exe
@@ -524,7 +530,7 @@ _Environment:_
## Google Chrome
_version:_
-80.0.3987.132
+80.0.3987.149
## Microsoft Edge
@@ -534,7 +540,7 @@ _version:_
## Mozilla Firefox
_version:_
-73.0.1
+74.0
## Selenium Web Drivers
@@ -580,7 +586,7 @@ _Environment:_
* PATH: contains location of node.exe
* Gulp CLI version: 2.2.0 Local version: Unknown
* Grunt grunt-cli v1.3.2
-* Yarn 1.22.1
+* Yarn 1.22.4
## npm
@@ -591,7 +597,7 @@ _Environment:_
## Java Development Kit
-#### 1.8.0_222
+#### 1.8.0_222 (default)
_Environment:_
* JAVA_HOME: location of JDK
@@ -645,6 +651,7 @@ _Environment:_
* PATH: contains location of dotnet.exe
_SDK:_
+* 3.1.200 C:\Program Files\dotnet\sdk\3.1.200
* 3.1.101 C:\Program Files\dotnet\sdk\3.1.101
* 3.1.100 C:\Program Files\dotnet\sdk\3.1.100
* 2.2.402 C:\Program Files\dotnet\sdk\2.2.402
@@ -702,6 +709,7 @@ _SDK:_
* 2.1.300 C:\Program Files\dotnet\sdk\2.1.300
_Runtime:_
+* 3.1.2 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.1.2
* 3.1.1 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.1.1
* 3.1.0 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.1.0
* 2.2.8 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.2.8
@@ -788,15 +796,11 @@ _Version:_ 1.4.0
## Inno Setup
-_Version:_ 6.0.3
+_Version:_ 6.0.4
## GitVersion
-_Version:_ 5.2.0.0
-
-## OpenSSL
-
-_Version:_ 1.1.1c at C:\Strawberry\c\bin\openssl.exe
_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe
_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe
_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe
_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe
+_Version:_ 5.2.4.0
## Cloud Foundry CLI
@@ -828,7 +832,7 @@ _Environment:_
## bazel
-_Version:_ bazel 2.1.0
+_Version:_ bazel 2.2.0
## bazelisk
diff --git a/images/win/scripts/Installers/Configure-Antivirus.ps1 b/images/win/scripts/Installers/Configure-Antivirus.ps1
new file mode 100644
index 00000000..650d3a98
--- /dev/null
+++ b/images/win/scripts/Installers/Configure-Antivirus.ps1
@@ -0,0 +1,2 @@
+Write-Host "Set antivirus parameters"
+Set-MpPreference -ScanAvgCPULoadFactor 5 -ExclusionPath "D:\", "C:\"
\ No newline at end of file
diff --git a/images/win/scripts/Installers/Install-Boost.ps1 b/images/win/scripts/Installers/Install-Boost.ps1
index 0931fb25..d46a150c 100644
--- a/images/win/scripts/Installers/Install-Boost.ps1
+++ b/images/win/scripts/Installers/Install-Boost.ps1
@@ -9,7 +9,6 @@ Import-Module -Name ImageHelpers
$SoftwareName = "Boost"
$BoostDirectory = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath $SoftwareName
$BoostVersions = (Get-ToolsByName -SoftwareName $SoftwareName).Versions | Foreach-Object {"{0}.0" -f $_}
-$BoostDefault = $env:BOOST_DEFAULT
foreach($BoostVersion in $BoostVersions)
{
@@ -17,11 +16,4 @@ foreach($BoostVersion in $BoostVersions)
$EnvBoostPath = "BOOST_ROOT_{0}" -f ($BoostVersion.Replace('.', '_'))
setx $EnvBoostPath $BoostInstallationDir /M | Out-Null
-
- if ($BoostVersion -eq $BoostDefault)
- {
- Write-Host "Adding Boost $BoostVersion to the path..."
- # Add the Boost binaries to the path
- Add-MachinePathItem $BoostInstallationDir | Out-Null
- }
}
diff --git a/images/win/scripts/Installers/Install-PHP.ps1 b/images/win/scripts/Installers/Install-PHP.ps1
index 02d38931..72db2ee2 100644
--- a/images/win/scripts/Installers/Install-PHP.ps1
+++ b/images/win/scripts/Installers/Install-PHP.ps1
@@ -10,8 +10,11 @@ Import-Module -Name ImageHelpers
$installDir = "c:\tools\php"
choco install php -y --force --params "/InstallDir:$installDir"
-# update path to extensions and enable curl and mbstring extensions
-((Get-Content -path $installDir\php.ini -Raw) -replace ';extension=curl','extension=curl' -replace ';extension=mbstring','extension=mbstring' -replace ';extension_dir = "ext"','extension_dir = "ext"') | Set-Content -Path $installDir\php.ini
+# Install latest Composer in chocolatey
+choco install composer --ia "/DEV=$installDir /PHP=$installDir"
+
+# update path to extensions and enable curl and mbstring extensions, and enable php openssl extensions.
+((Get-Content -path $installDir\php.ini -Raw) -replace ';extension=curl','extension=curl' -replace ';extension=mbstring','extension=mbstring' -replace ';extension_dir = "ext"','extension_dir = "ext"' -replace 'extension=";php_openssl.dll"','extension_dir = "php_openssl.dll"') | Set-Content -Path $installDir\php.ini
# Set the PHPROOT environment variable.
setx PHPROOT $installDir /M
diff --git a/images/win/scripts/Installers/Install-Rust.ps1 b/images/win/scripts/Installers/Install-Rust.ps1
index e19cd4c1..61588a86 100644
--- a/images/win/scripts/Installers/Install-Rust.ps1
+++ b/images/win/scripts/Installers/Install-Rust.ps1
@@ -14,7 +14,7 @@ $env:CARGO_HOME="C:\Rust\.cargo"
Invoke-WebRequest -UseBasicParsing -Uri "https://win.rustup.rs/x86_64" -OutFile rustup-init.exe
# Install Rust by running rustup-init.exe (disabling the confirmation prompt with -y)
-.\rustup-init.exe -y
+.\rustup-init.exe -y --default-toolchain=stable --profile=minimal
# Delete rustup-init.exe when it's no longer needed
Remove-Item -Path .\rustup-init.exe
@@ -24,10 +24,8 @@ Add-MachinePathItem "$env:CARGO_HOME\bin"
$env:Path = Get-MachinePath
# Install common tools
-rustup component add rustfmt
-rustup component add clippy
-cargo install bindgen
-cargo install cbindgen
+rustup component add rustfmt clippy
+cargo install bindgen cbindgen
# Run script at startup for all users
$cmdRustSymScript = @"
diff --git a/images/win/scripts/Installers/Run-Antivirus.ps1 b/images/win/scripts/Installers/Run-Antivirus.ps1
new file mode 100644
index 00000000..7993146a
--- /dev/null
+++ b/images/win/scripts/Installers/Run-Antivirus.ps1
@@ -0,0 +1,30 @@
+################################################################################
+## File: Run-Antivirus.ps1
+## Desc: Run a full antivirus scan.
+## Run right after cleanup before we sysprep
+################################################################################
+
+if ($env:run_scan_antivirus -eq $true) {
+ try {
+ Update-MpSignature
+ }
+ catch {
+ Write-Host "Some error was found"
+ Write-Host $_
+ }
+
+ Write-Host "Make sure windefend is going to start"
+ Start-Service windefend -ErrorAction Continue
+ Write-Host "Waiting for windefend to report as running"
+ $service = Get-Service "Windefend"
+ $service.WaitForStatus("Running","00:10:00")
+
+ Write-Host "Run antivirus"
+ # Tell Defender to use 100% of the CPU during the scan
+ Set-MpPreference -ScanAvgCPULoadFactor 100
+ # Full Scan
+ Start-Process -FilePath "C:\Program Files\Windows Defender\MpCmdRun.exe" -ArgumentList ("-Scan","-ScanType", 2) -Wait
+}
+else {
+ Write-Host "Scanning process has been skipped"
+}
\ No newline at end of file
diff --git a/images/win/scripts/Installers/Validate-Boost.ps1 b/images/win/scripts/Installers/Validate-Boost.ps1
index 6289e165..e9b7554e 100644
--- a/images/win/scripts/Installers/Validate-Boost.ps1
+++ b/images/win/scripts/Installers/Validate-Boost.ps1
@@ -18,7 +18,6 @@ function Validate-BoostVersion
if (Test-Path "$ReleasePath\b2.exe")
{
Write-Host "Boost.Build $BoostRelease is successfully installed"
-
return
}
@@ -26,17 +25,6 @@ function Validate-BoostVersion
exit 1
}
-# Verify that Boost is on the path
-if (Get-Command -Name 'b2')
-{
- Write-Host "Boost is on the path"
-}
-else
-{
- Write-Host "Boost is not on the path"
- exit 1
-}
-
# Adding description of the software to Markdown
$tmplMark = @"
#### {0} [{2}]
@@ -46,14 +34,6 @@ _Environment:_
"@
-$tmplMarkRoot = @"
-#### {0} [{2}]
-
-_Environment:_
-* PATH: contains the location of Boost version {0}
-* {1}: root directory of the Boost version {0} installation
-"@
-
$Description = New-Object System.Text.StringBuilder
$SoftwareName = 'Boost'
$BoostRootDirectory = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath $SoftwareName
@@ -68,14 +48,7 @@ foreach ($BoostTool in $BoostTools)
Validate-BoostVersion -BoostRootPath $BoostRootDirectory -BoostRelease $BoostVersion
$BoostVersionTag = "BOOST_ROOT_{0}" -f $BoostVersion.Replace('.', '_')
- if($BoostVersion -eq $env:BOOST_DEFAULT)
- {
- $null = $Description.AppendLine(($tmplMarkRoot -f $BoostVersion, $BoostVersionTag, $BoostToolsetName))
- }
- else
- {
- $null = $Description.AppendLine(($tmplMark -f $BoostVersion, $BoostVersionTag, $BoostToolsetName))
- }
+ $null = $Description.AppendLine(($tmplMark -f $BoostVersion, $BoostVersionTag, $BoostToolsetName))
}
}
diff --git a/images/win/scripts/Installers/Validate-NSIS.ps1 b/images/win/scripts/Installers/Validate-NSIS.ps1
index b38624e7..276eb139 100644
--- a/images/win/scripts/Installers/Validate-NSIS.ps1
+++ b/images/win/scripts/Installers/Validate-NSIS.ps1
@@ -28,5 +28,4 @@ $Description = @"
_Version:_ $Version
"@
-#Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
-Write-Host $description
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
diff --git a/images/win/scripts/Installers/Validate-PHP.ps1 b/images/win/scripts/Installers/Validate-PHP.ps1
index a8663617..f2f26a52 100644
--- a/images/win/scripts/Installers/Validate-PHP.ps1
+++ b/images/win/scripts/Installers/Validate-PHP.ps1
@@ -33,6 +33,32 @@ else
exit 1
}
+# Verify that composer.exe is on the path
+if(Get-Command -Name 'composer')
+{
+ Write-Host "$(composer --version) is on the path."
+}
+else
+{
+ Write-Host "composer is not on the path."
+ exit 1
+}
+
+# Get the composer version.
+$composerVersion = $(composer --version)
+
+# Add composer version details in Markdown
+$SoftwareName = "Composer"
+$Description = @"
+#### $composerVersion
+
+_Environment:_
+* PATH: contains the location of composer.exe version $composerVersion
+* PHPROOT: root directory of the Composer $composerVersion installation
+"@
+
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
+
# Get available versions of PHP
$phpVersionOnPath = Get-PHPVersion -phpRootPath "C:\tools\php72"
diff --git a/images/win/scripts/Installers/Windows2016/Run-Antivirus.ps1 b/images/win/scripts/Installers/Windows2016/Run-Antivirus.ps1
deleted file mode 100644
index 77b3b2bc..00000000
--- a/images/win/scripts/Installers/Windows2016/Run-Antivirus.ps1
+++ /dev/null
@@ -1,19 +0,0 @@
-################################################################################
-## File: Run-Antivirus.ps1
-## Desc: Run a full antivirus scan.
-## Run right after cleanup before we sysprep
-################################################################################
-
-Write-Host "Run antivirus"
-Push-Location "C:\Program Files\Windows Defender"
-
-# Tell Defender to use 100% of the CPU during the scan
-Set-MpPreference -ScanAvgCPULoadFactor 100
-
-# Full Scan
-.\MpCmdRun.exe -Scan -ScanType 2
-Pop-Location
-
-Write-Host "Set antivirus parmeters"
-Set-MpPreference -ScanAvgCPULoadFactor 5 `
- -ExclusionPath "D:\", "C:\"
diff --git a/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 b/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1
index a9658fd7..1ccd5c42 100644
--- a/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1
+++ b/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1
@@ -121,6 +121,7 @@ $WorkLoads = '--allWorkloads --includeRecommended ' + `
'--add Microsoft.VisualStudio.Component.VC.v141.MFC.ARM.Spectre ' + `
'--add Microsoft.VisualStudio.Component.VC.v141.MFC.ARM64.Spectre ' + `
'--add Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre ' + `
+ '--add Microsoft.VisualStudio.Component.Windows10SDK.14393 ' + `
'--add Microsoft.VisualStudio.Component.Windows10SDK.16299 ' + `
'--add Microsoft.VisualStudio.Component.Windows10SDK.17134 ' + `
'--add Microsoft.VisualStudio.Component.Windows10SDK.17763 ' + `
diff --git a/images/win/scripts/Installers/Windows2019/Run-Antivirus.ps1 b/images/win/scripts/Installers/Windows2019/Run-Antivirus.ps1
deleted file mode 100644
index e38126af..00000000
--- a/images/win/scripts/Installers/Windows2019/Run-Antivirus.ps1
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-## File: Run-Antivirus.ps1
-## Desc: Run a full antivirus scan.
-## Run right after cleanup before we sysprep
-################################################################################
-
-Write-Host "Make sure windefend is going to start"
-Start-Service windefend -ErrorAction Continue
-
-Write-Host "Waiting for windefend to report as running"
-$service = Get-Service "Windefend"
-$service.WaitForStatus("Running","00:10:00")
-
-Write-Host "Run antivirus"
-Push-Location "C:\Program Files\Windows Defender"
-
-# Tell Defender to use 100% of the CPU during the scan
-Set-MpPreference -ScanAvgCPULoadFactor 100
-
-# Full Scan
-.\MpCmdRun.exe -Scan -ScanType 2
-Pop-Location
-
-Update-MpSignature
-Write-Host "Set antivirus parmeters"
-Set-MpPreference -ScanAvgCPULoadFactor 5 `
- -ExclusionPath "D:\", "C:\"