Merge pull request #2 from actions/master

Merge upstream
2025-12-26 11:28:17 +08:00 · 2020-04-03 13:23:15 +05:00
parent a9fdfbccf0 fa6814bca4
commit 0db006580b
24 changed files with 581 additions and 262 deletions
--- a/.github/workflows/issue-triager.yml
+++ b/.github/workflows/issue-triager.yml
@@ -13,28 +13,20 @@ jobs:

    steps:
    - uses: actions/checkout@v1
-      
+
    - uses: damccorm/tag-ur-it@master
      with:
        repo-token: "${{ secrets.GITHUB_TOKEN }}"
        configuration-path: "./triage-rules.yml"

-    - if: failure()
+    - if: always()
      uses: actions/github-script@0.4.0
      with:
        github-token: ${{secrets.GITHUB_TOKEN}}
        script: |
          github.issues.addLabels({
-            issue_number: context.issue,
-            owner: context.owner,
-            repo: context.repo,
+            issue_number: context.issue.number,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
            labels: ['needs triage']
-          })
-
-    - name: Set Node.js 10.x
-      uses: actions/setup-node@master
-      with:
-        version: 10.x
-
-    # Need to explicitly install @octokit/rest separately or else it will mess with our typings.
-    - run: npm install && npm install @octokit/rest
+          })
--- a/images/linux/Ubuntu1604-README.md
+++ b/images/linux/Ubuntu1604-README.md
@@ -1,5 +1,5 @@
 # Ubuntu 16.04.6 LTS
-The following software is installed on machines with the 20200315.1 update.
+The following software is installed on machines with the 20200323.1 update.
 ***
 - 7-Zip 9.20
 - Ansible (ansible 2.9.6)
@@ -34,7 +34,7 @@ The following software is installed on machines with the 20200315.1 update.
  - wget
  - zip
  - zstd
- AWS CLI (aws-cli/1.18.21 Python/2.7.12 Linux/4.15.0-1071-azure botocore/1.15.21)
+- AWS CLI (aws-cli/1.18.26 Python/2.7.12 Linux/4.15.0-1071-azure botocore/1.15.26)
 - build-essential
 - Clang 6.0 (6.0.1)
 - Clang 8 (8.0.1)
@@ -43,6 +43,7 @@ The following software is installed on machines with the 20200315.1 update.
 - Docker Compose (docker-compose version 1.25.4, build 8d51620a)
 - Docker-Moby (Docker version 3.0.11+azure, build eb310fca49568dccd87c6136f774ef6fff2a1b51)
 - .NET Core SDK:
+  - 3.1.200
  - 3.1.101
  - 3.1.100
  - 3.0.103
@@ -102,7 +103,7 @@ The following software is installed on machines with the 20200315.1 update.
  - 2.1.302
  - 2.1.301
  - 2.1.300
- Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 10.6.4)
+- Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 10.7)
 - Firefox (Mozilla Firefox 74.0)
 - Geckodriver (0.26.0); Gecko Driver is available via GECKOWEBDRIVER environment variable
 - GNU C++ 7.4.0
@@ -110,11 +111,12 @@ The following software is installed on machines with the 20200315.1 update.
 - GNU C++ 9.2.1
 - GNU Fortran 8.3.0
 - GNU Fortran 9.2.1
- Git (2.25.1)
+- Git (2.25.2)
 - Git Large File Storage (LFS) (2.10.0)
- Google Chrome (Google Chrome 80.0.3987.132 )
+- Hub CLI (2.14.2)
+- Google Chrome (Google Chrome 80.0.3987.149 )
 - ChromeDriver 80.0.3987.106 (f68069574609230cf9b635cd784cfb1bf81bb53a-refs/branch-heads/3987@{#882}); Chrome Driver is available via CHROMEWEBDRIVER environment variable
- Google Cloud SDK (284.0.0)
+- Google Cloud SDK (285.0.1)
 - Haskell Cabal (cabal-install version 2.0.0.1
 compiled using version 2.0.1.1 of the Cabal library )
 - Haskell Cabal (cabal-install version 2.2.0.0
@@ -134,20 +136,21 @@ compiled using version 3.0.2.0 of the Cabal library )
 - GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.2)
 - GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.3)
 - Haskell Stack (Version 2.1.3, Git revision 636e3a759d51127df2b62f90772def126cdf6d1f (7735 commits) x86_64 hpack-0.31.2)
- Heroku (heroku/7.39.0 linux-x64 node-v12.13.0)
- HHVM (HipHop VM 4.48.0 (rel))
+- Heroku (heroku/7.39.1 linux-x64 node-v12.13.0)
+- HHVM (HipHop VM 4.49.0 (rel))
 - ImageMagick
- Azul Zulu OpenJDK (7) (openjdk version "1.7.0_252")
- Azul Zulu OpenJDK (8) (openjdk version "1.8.0_242")
- Azul Zulu OpenJDK (11) (openjdk version "11.0.6" 2020-01-14 LTS)
- Azul Zulu OpenJDK (12) (openjdk version "12.0.2" 2019-07-16)
+- Azul Zulu OpenJDK:
+  - 7 (openjdk version "1.7.0_252")
+  - 8 (openjdk version "1.8.0_242") (default)
+  - 11 (openjdk version "11.0.6" 2020-01-14 LTS)
+  - 12 (openjdk version "12.0.2" 2019-07-16)
 - Ant (Apache Ant(TM) version 1.9.6 compiled on July 20 2018)
 - Gradle 6.2.2
 - Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f))
 - Kind (kind v0.7.0 go1.13.6 linux/amd64)
 - kubectl (Client Version: v1.17.4)
 - helm (v3.1.2+gd878d4d)
- Leiningen (Leiningen 2.9.1 on Java 1.8.0_242 OpenJDK 64-Bit Server VM)
+- Leiningen (Leiningen 2.9.3 on Java 1.8.0_242 OpenJDK 64-Bit Server VM)
 - Mercurial (Mercurial Distributed SCM (version 4.4.1))
 - Miniconda (conda 4.8.2)
 - Mono (Mono JIT compiler version 6.8.0.105 (tarball Tue Feb  4 21:20:35 UTC 2020))
@@ -167,12 +170,12 @@ Local version: Unknown)
 - Bazel (bazel 2.2.0)
 - Bazelisk (1.3.0)
 - PhantomJS (2.1.1)
- PHP 5.6 (PHP 5.6.40-24+ubuntu16.04.1+deb.sury.org+1 (cli) )
- PHP 7.0 (PHP 7.0.33-23+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:20:42) ( NTS ))
- PHP 7.1 (PHP 7.1.33-12+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:21:57) ( NTS ))
- PHP 7.2 (PHP 7.2.28-3+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:23:01) ( NTS ))
- PHP 7.3 (PHP 7.3.15-3+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:23:10) ( NTS ))
- PHP 7.4 (PHP 7.4.3 (cli) (built: Feb 23 2020 07:24:02) ( NTS ))
+- PHP 5.6 (PHP 5.6.40-26+ubuntu16.04.1+deb.sury.org+1 (cli) )
+- PHP 7.0 (PHP 7.0.33-26+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Mar 20 2020 15:00:31) ( NTS ))
+- PHP 7.1 (PHP 7.1.33-14+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Mar 20 2020 13:57:17) ( NTS ))
+- PHP 7.2 (PHP 7.2.29-1+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Mar 20 2020 13:54:16) ( NTS ))
+- PHP 7.3 (PHP 7.3.16-1+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Mar 20 2020 13:51:21) ( NTS ))
+- PHP 7.4 (PHP 7.4.4 (cli) (built: Mar 20 2020 13:47:17) ( NTS ))
 - Composer  (Composer version 1.10.1 2020-03-13 20:34:27)
 - PHPUnit (PHPUnit 7.5.20 by Sebastian Bergmann and contributors.)
 - Pollinate
@@ -187,27 +190,28 @@ Local version: Unknown)
 - clippy (0.0.212)
 - rustdoc (1.42.0)
 - bindgen (0.53.2)
- cbindgen (0.13.1)
- Julia (julia version 1.3.1)
+- cbindgen (0.13.2)
+- Julia (julia version 1.4.0)
 - sbt (1.3.8)
 - Selenium server standalone (available via SELENIUM_JAR_PATH environment variable)
 - Sphinx Open Source Search Server
 - Subversion (svn, version 1.9.3 (r1718519))
- Terraform (Terraform v0.12.23)
+- Terraform (Terraform v0.12.24)
 - Packer (1.5.4)
 - Vcpkg 2020.02.04-unknownhash
 - Zeit Now CLI (17.0.4)
 - Go 1.11 (go version go1.11.13 linux/amd64)
 - Go 1.12 (go version go1.12.17 linux/amd64)
- Go 1.13 (go version go1.13.8 linux/amd64)
- Go 1.14 (go version go1.14 linux/amd64)
+- Go 1.13 (go version go1.13.9 linux/amd64)
+- Go 1.14 (go version go1.14.1 linux/amd64)
 - Google Repository 58
 - Google Play services 49
 - Google APIs 24
 - Google APIs 23
 - Google APIs 22
 - Google APIs 21
- CMake 3.6.4111459
+- CMake 3.10.2.4988404
+3.6.4111459
 - Android Support Repository 47.0.0
 - Android Solver for ConstraintLayout 1.0.2
 - Android Solver for ConstraintLayout 1.0.1
@@ -300,3 +304,4 @@ Local version: Unknown)
 - Python3 (Python 3.5.2)
 - pip3 (pip 8.1.1 from /usr/lib/python3/dist-packages (python 3.5))
 - Boost C++ Libraries 1.69.0
+- Boost C++ Libraries 1.72.0
--- a/images/linux/Ubuntu1804-README.md
+++ b/images/linux/Ubuntu1804-README.md
@@ -1,5 +1,5 @@
 # Ubuntu 18.04.4 LTS
-The following software is installed on machines with the 20200316.1 update.
+The following software is installed on machines with the 20200323.1 update.
 ***
 - 7-Zip 16.02
 - Ansible (ansible 2.9.6)
@@ -32,7 +32,7 @@ The following software is installed on machines with the 20200316.1 update.
  - wget
  - zip
  - zstd
- AWS CLI (aws-cli/1.18.21 Python/2.7.17 Linux/5.0.0-1032-azure botocore/1.15.21)
+- AWS CLI (aws-cli/1.18.26 Python/2.7.17 Linux/5.0.0-1032-azure botocore/1.15.26)
 - build-essential
 - Clang 6.0 (6.0.1)
 - Clang 8 (8.0.1)
@@ -41,6 +41,7 @@ The following software is installed on machines with the 20200316.1 update.
 - Docker Compose (docker-compose version 1.25.4, build 8d51620a)
 - Docker-Moby (Docker version 3.0.11+azure, build eb310fca49568dccd87c6136f774ef6fff2a1b51)
 - .NET Core SDK:
+  - 3.1.200
  - 3.1.101
  - 3.1.100
  - 3.0.103
@@ -100,7 +101,7 @@ The following software is installed on machines with the 20200316.1 update.
  - 2.1.302
  - 2.1.301
  - 2.1.300
- Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 10.6.4)
+- Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 10.7)
 - Firefox (Mozilla Firefox 74.0)
 - Geckodriver (0.26.0); Gecko Driver is available via GECKOWEBDRIVER environment variable
 - GNU C++ 7.5.0
@@ -108,11 +109,12 @@ The following software is installed on machines with the 20200316.1 update.
 - GNU C++ 9.2.1
 - GNU Fortran 8.3.0
 - GNU Fortran 9.2.1
- Git (2.25.1)
+- Git (2.25.2)
 - Git Large File Storage (LFS) (2.10.0)
- Google Chrome (Google Chrome 80.0.3987.132 )
+- Hub CLI (2.14.2)
+- Google Chrome (Google Chrome 80.0.3987.149 )
 - ChromeDriver 80.0.3987.106 (f68069574609230cf9b635cd784cfb1bf81bb53a-refs/branch-heads/3987@{#882}); Chrome Driver is available via CHROMEWEBDRIVER environment variable
- Google Cloud SDK (284.0.0)
+- Google Cloud SDK (285.0.1)
 - Haskell Cabal (cabal-install version 2.0.0.1
 compiled using version 2.0.1.1 of the Cabal library )
 - Haskell Cabal (cabal-install version 2.2.0.0
@@ -132,20 +134,21 @@ compiled using version 3.0.2.0 of the Cabal library )
 - GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.2)
 - GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.3)
 - Haskell Stack (Version 2.1.3, Git revision 636e3a759d51127df2b62f90772def126cdf6d1f (7735 commits) x86_64 hpack-0.31.2)
- Heroku (heroku/7.39.0 linux-x64 node-v12.13.0)
- HHVM (HipHop VM 4.48.0 (rel))
+- Heroku (heroku/7.39.1 linux-x64 node-v12.13.0)
+- HHVM (HipHop VM 4.49.0 (rel))
 - ImageMagick
- Azul Zulu OpenJDK (7) (openjdk version "1.7.0_252")
- Azul Zulu OpenJDK (8) (openjdk version "1.8.0_242")
- Azul Zulu OpenJDK (11) (openjdk version "11.0.6" 2020-01-14 LTS)
- Azul Zulu OpenJDK (12) (openjdk version "12.0.2" 2019-07-16)
+- Azul Zulu OpenJDK:
+  - 7 (openjdk version "1.7.0_252")
+  - 8 (openjdk version "1.8.0_242") (default)
+  - 11 (openjdk version "11.0.6" 2020-01-14 LTS)
+  - 12 (openjdk version "12.0.2" 2019-07-16)
 - Ant (Apache Ant(TM) version 1.10.5 compiled on March 28 2019)
 - Gradle 6.2.2
 - Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f))
 - Kind (kind v0.7.0 go1.13.6 linux/amd64)
 - kubectl (Client Version: v1.17.4)
 - helm (v3.1.2+gd878d4d)
- Leiningen (Leiningen 2.9.1 on Java 1.8.0_242 OpenJDK 64-Bit Server VM)
+- Leiningen (Leiningen 2.9.3 on Java 1.8.0_242 OpenJDK 64-Bit Server VM)
 - Mercurial (Mercurial Distributed SCM (version 4.5.3))
 - Miniconda (conda 4.8.2)
 - Mono (Mono JIT compiler version 6.8.0.105 (tarball Tue Feb  4 21:20:20 UTC 2020))
@@ -165,10 +168,10 @@ Local version: Unknown)
 - Bazel (bazel 2.2.0)
 - Bazelisk (1.3.0)
 - PhantomJS (2.1.1)
- PHP 7.1 (PHP 7.1.33-12+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:22:16) ( NTS ))
- PHP 7.2 (PHP 7.2.28-3+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:23:25) ( NTS ))
- PHP 7.3 (PHP 7.3.15-3+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:23:33) ( NTS ))
- PHP 7.4 (PHP 7.4.3 (cli) (built: Feb 23 2020 07:24:28) ( NTS ))
+- PHP 7.1 (PHP 7.1.33-14+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Mar 20 2020 13:57:43) ( NTS ))
+- PHP 7.2 (PHP 7.2.29-1+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Mar 20 2020 13:54:39) ( NTS ))
+- PHP 7.3 (PHP 7.3.16-1+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Mar 20 2020 13:51:46) ( NTS ))
+- PHP 7.4 (PHP 7.4.4 (cli) (built: Mar 20 2020 13:47:45) ( NTS ))
 - Composer  (Composer version 1.10.1 2020-03-13 20:34:27)
 - PHPUnit (PHPUnit 7.5.20 by Sebastian Bergmann and contributors.)
 - Pollinate
@@ -183,27 +186,28 @@ Local version: Unknown)
 - clippy (0.0.212)
 - rustdoc (1.42.0)
 - bindgen (0.53.2)
- cbindgen (0.13.1)
- Julia (julia version 1.3.1)
+- cbindgen (0.13.2)
+- Julia (julia version 1.4.0)
 - sbt (1.3.8)
 - Selenium server standalone (available via SELENIUM_JAR_PATH environment variable)
 - Sphinx Open Source Search Server
 - Subversion (svn, version 1.9.7 (r1800392))
- Terraform (Terraform v0.12.23)
+- Terraform (Terraform v0.12.24)
 - Packer (1.5.4)
 - Vcpkg 2020.02.04-unknownhash
 - Zeit Now CLI (17.0.4)
 - Go 1.11 (go version go1.11.13 linux/amd64)
 - Go 1.12 (go version go1.12.17 linux/amd64)
- Go 1.13 (go version go1.13.8 linux/amd64)
- Go 1.14 (go version go1.14 linux/amd64)
+- Go 1.13 (go version go1.13.9 linux/amd64)
+- Go 1.14 (go version go1.14.1 linux/amd64)
 - Google Repository 58
 - Google Play services 49
 - Google APIs 24
 - Google APIs 23
 - Google APIs 22
 - Google APIs 21
- CMake 3.6.4111459
+- CMake 3.10.2.4988404
+3.6.4111459
 - Android Support Repository 47.0.0
 - Android SDK Platform-Tools 29.0.6
 - Android SDK Platform 29
@@ -290,3 +294,4 @@ Local version: Unknown)
 - Python3 (Python 3.6.9)
 - pip3 (pip 9.0.1 from /usr/lib/python3/dist-packages (python 3.6))
 - Boost C++ Libraries 1.69.0
+- Boost C++ Libraries 1.72.0
--- a/images/linux/scripts/helpers/os.sh
+++ b/images/linux/scripts/helpers/os.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+################################################################################
+##  File:  install-helpers.sh
+##  Desc:  Helper functions for installing tools
+################################################################################
+
+function isUbuntu16
+{
+    lsb_release -d|grep 'Ubuntu 16' > /dev/null
+}
+
+function isUbuntu18
+{
+    lsb_release -d|grep 'Ubuntu 18' > /dev/null
+}
+
+function getOSVersionLabel
+{
+    isUbuntu16 && echo xenial || echo bionic
+}
--- a/images/linux/scripts/installers/haskell.sh
+++ b/images/linux/scripts/installers/haskell.sh
@@ -26,6 +26,7 @@ apt-get install -y \
    ghc-8.8.1 \
    ghc-8.8.2 \
    ghc-8.8.3 \
+    ghc-8.10.1 \
    cabal-install-2.0 \
    cabal-install-2.2 \
    cabal-install-2.4 \
@@ -37,7 +38,7 @@ curl -sSL https://raw.githubusercontent.com/commercialhaskell/stack/v2.1.3/etc/s
 # Run tests to determine that the software installed as expected
 echo "Testing to make sure that script performed as expected, and basic scenarios work"
 # Check all ghc versions
-for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3; do
+for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.10.1; do
    if ! command -v /opt/ghc/$version/bin/ghc; then
        echo "ghc $version was not installed"
        exit 1
@@ -60,7 +61,7 @@ echo "Lastly, documenting what we added to the metadata file"
 for version in 2.0 2.2 2.4 3.0; do
    DocumentInstalledItem "Haskell Cabal ($(/opt/cabal/$version/bin/cabal --version))"
 done
-for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3; do
+for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.10.1; do
    DocumentInstalledItem "GHC ($(/opt/ghc/$version/bin/ghc --version))"
 done
 DocumentInstalledItem "Haskell Stack ($(stack --version))"
--- a/images/linux/scripts/installers/mongodb.sh
+++ b/images/linux/scripts/installers/mongodb.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+################################################################################
+##  File:  homebrew.sh
+##  Desc:  Installs Mongo DB
+################################################################################
+
+# Source the helpers
+source $HELPER_SCRIPTS/os.sh
+source $HELPER_SCRIPTS/document.sh
+
+#  Install Mongo DB
+wget -qO - https://www.mongodb.org/static/pgp/server-4.2.asc | sudo apt-key add -
+version=$(getOSVersionLabel)
+echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu $version/mongodb-org/4.2 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.2.list
+sudo apt-get update
+sudo apt-get install -y mongodb-org
+
+# Validate the installation
+echo "Validate the installation"
+if ! command -v mongod; then
+    echo "mongodb was not installed"
+    exit 1
+fi
+
+# Document the installed version
+echo "Document the installed version"
+DocumentInstalledItem "MongoDB on Linux ($(mongod -v|grep -i version 2>&1))"
--- a/images/linux/scripts/installers/swift.sh
+++ b/images/linux/scripts/installers/swift.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+################################################################################
+##  File:  swift.sh
+##  Desc:  Installs Swift
+################################################################################
+
+# Source the helpers for use with the script
+source $HELPER_SCRIPTS/document.sh
+
+# Install
+image_label="$(lsb_release -rs)"
+swift_version=$(curl -s https://swift.org/download/ | grep -m1 "id=\"swift-" | awk -F"[ <]" '{print $4}')
+
+wget -P /tmp https://swift.org/builds/swift-$swift_version-release/ubuntu${image_label//./}/swift-$swift_version-RELEASE/swift-$swift_version-RELEASE-ubuntu$image_label.tar.gz
+tar xzf /tmp/swift-$swift_version-RELEASE-ubuntu$image_label.tar.gz
+mv swift-$swift_version-RELEASE-ubuntu$image_label /usr/share/swift
+
+SWIFT_PATH="/usr/share/swift/usr/bin"
+SWIFT_BIN="$SWIFT_PATH/swift"
+ln -s "$SWIFT_BIN" /usr/local/bin/swift
+echo "SWIFT_PATH=$SWIFT_PATH" | tee -a /etc/environment
+
+# Run tests to determine that the software installed as expected
+echo "Testing to make sure that script performed as expected, and basic scenarios work"
+if ! command -v swift; then
+    echo "Swift was not installed"
+    exit 1
+fi
+
+# Document what was added to the image
+echo "Lastly, documenting what we added to the metadata file"
+DocumentInstalledItem "$(swift --version)"
--- a/images/linux/ubuntu1604.json
+++ b/images/linux/ubuntu1604.json
@@ -144,6 +144,7 @@
                "{{template_dir}}/scripts/installers/aws.sh",
                "{{template_dir}}/scripts/installers/build-essential.sh",
                "{{template_dir}}/scripts/installers/clang.sh",
+                "{{template_dir}}/scripts/installers/swift.sh",
                "{{template_dir}}/scripts/installers/cmake.sh",
                "{{template_dir}}/scripts/installers/docker-compose.sh",
                "{{template_dir}}/scripts/installers/docker-moby.sh",
@@ -186,7 +187,8 @@
                "{{template_dir}}/scripts/installers/vcpkg.sh",
                "{{template_dir}}/scripts/installers/zeit-now.sh",
                "{{template_dir}}/scripts/installers/updatepath.sh",
-                "{{template_dir}}/scripts/installers/dpkg-config.sh"
+                "{{template_dir}}/scripts/installers/dpkg-config.sh",
+                "{{template_dir}}/scripts/installers/mongodb.sh"

            ],
            "environment_vars": [
--- a/images/linux/ubuntu1804.json
+++ b/images/linux/ubuntu1804.json
@@ -147,6 +147,7 @@
                "{{template_dir}}/scripts/installers/aws.sh",
                "{{template_dir}}/scripts/installers/build-essential.sh",
                "{{template_dir}}/scripts/installers/clang.sh",
+                "{{template_dir}}/scripts/installers/swift.sh",
                "{{template_dir}}/scripts/installers/cmake.sh",
                "{{template_dir}}/scripts/installers/docker-compose.sh",
                "{{template_dir}}/scripts/installers/docker-moby.sh",
@@ -189,7 +190,8 @@
                "{{template_dir}}/scripts/installers/vcpkg.sh",
                "{{template_dir}}/scripts/installers/zeit-now.sh",
                "{{template_dir}}/scripts/installers/updatepath.sh",
-                "{{template_dir}}/scripts/installers/dpkg-config.sh"
+                "{{template_dir}}/scripts/installers/dpkg-config.sh",
+                "{{template_dir}}/scripts/installers/mongodb.sh"
            ],
            "environment_vars": [
                "METADATA_FILE={{user `metadata_file`}}",
--- a/images/macos/macos-10.15-Readme.md
+++ b/images/macos/macos-10.15-Readme.md
@@ -1,10 +1,10 @@
-# macOS Catalina 10.15.3 (19D76)
-The following software is installed on machines with the 20200321.1 update.
+# macOS Catalina 10.15.4 (19E266)
+The following software is installed on machines with the 20200328.1 update.

 #### Xcode 11.3.1 set by default
 ## Operating System

- OS X 10.15.3 (19D76) **Catalina**
+- OS X 10.15.4 (19E266) **Catalina**

 ## Installed Software
 ### Language and Runtime
@@ -22,13 +22,13 @@ The following software is installed on machines with the 20200321.1 update.
 - 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.11.0
+- NVM - Cached node versions: v6.17.1 v8.17.0 v10.19.0 v12.16.1 v13.12.0
 - PowerShell 7.0.0
 - Python 2.7.17
 - 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 3.1.200
- Go 1.14
+- .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 3.1.201
+- Go 1.14.1
 - PHP 7.4.4
 - julia 1.4.0

@@ -38,10 +38,10 @@ The following software is installed on machines with the 20200321.1 update.
 - Bundler version 2.1.4
 - Carthage 0.34.0
 - CocoaPods 1.9.1
- Homebrew 2.2.10
+- Homebrew 2.2.11
 - NPM 6.13.4
 - Yarn 1.22.4
- NuGet 5.4.0.6315
+- NuGet 5.5.0.6382
 - Pip 19.3.1 (python 2.7)
 - Pip 20.0.2 (python 3.7)
 - Miniconda 4.8.2
@@ -49,20 +49,20 @@ The following software is installed on machines with the 20200321.1 update.

 ### Project Management
 - Apache Maven 3.6.3
- Gradle 6.2.2
+- Gradle 6.3

 ### Utilities
 - Curl 7.69.1
- Git: 2.25.2
+- Git: 2.26.0
 - Git LFS: 2.10.0
 - Hub CLI: 2.14.2
 - GNU Wget 1.20.3
 - Subversion (SVN) 1.13.0
- Packer 1.5.4
- GNU parallel 20200222
+- Packer 1.5.5
+- GNU parallel 20200322
 - OpenSSL 1.0.2t  10 Sep 2019
 - jq 1.6
- gpg (GnuPG) 2.2.19
+- gpg (GnuPG) 2.2.20
 - psql (PostgreSQL) 12.2
 - aria2 1.35.0
 - azcopy 10.3.4
@@ -75,16 +75,17 @@ The following software is installed on machines with the 20200321.1 update.
 - docker-compose 1.25.4

 ### Tools
- Fastlane 2.143.0
- Cmake 3.16.5
- App Center CLI 2.3.4
+- Fastlane 2.144.0
+- Cmake 3.17.0
+- App Center CLI 2.3.5
 - Azure CLI 2.2.0
+- AWS CLI 2.0.5

 ### Browsers
 - Google Chrome 80.0.3987.149
 - ChromeDriver 80.0.3987.106
 - Microsoft Edge 80.0.361.69
- MSEdgeDriver 80.0.361.66
+- MSEdgeDriver 80.0.361.69
 - Mozilla Firefox 74.0
 - geckodriver 0.26.0

@@ -108,25 +109,29 @@ The following software is installed on machines with the 20200321.1 update.

 ### Xamarin
 #### Visual Studio for Mac
- 8.4.8.2
+- 8.5.0.3183

 #### Mono
+- 6.8.0.123
 - 6.6.0.166
 - 6.4.0.208

 #### Xamarin.iOS
+- 13.14.1.39
 - 13.10.0.21
 - 13.8.3.0
 - 13.6.0.12
 - 13.4.0.2

 #### Xamarin.Mac
+- 6.14.1.39
 - 6.10.0.21
 - 6.8.3.0
 - 6.6.0.12
 - 6.4.0.2

 #### Xamarin.Android
+- 10.2.0
 - 10.1.3
 - 10.0.6

@@ -134,15 +139,15 @@ The following software is installed on machines with the 20200321.1 update.
 - NUnit 3.6.1

 ### Xcode
-| Version          | Build   | Path                              |
-| ---------------- | ------- | --------------------------------- |
-| 11.4 (beta)      | 11N132i | /Applications/Xcode_11.4_beta.app |
-| 11.3.1 (default) | 11C505  | /Applications/Xcode_11.3.1.app    |
-| 11.3             | 11C29   | /Applications/Xcode_11.3.app      |
-| 11.2.1           | 11B500  | /Applications/Xcode_11.2.1.app    |
-| 11.2             | 11B52   | /Applications/Xcode_11.2.app      |
-| 11.1             | 11A1027 | /Applications/Xcode_11.1.app      |
-| 11.0             | 11A420a | /Applications/Xcode_11.app        |
+| Version          | Build   | Path                           |
+| ---------------- | ------- | ------------------------------ |
+| 11.4             | 11E146  | /Applications/Xcode_11.4.app   |
+| 11.3.1 (default) | 11C505  | /Applications/Xcode_11.3.1.app |
+| 11.3             | 11C29   | /Applications/Xcode_11.3.app   |
+| 11.2.1           | 11B500  | /Applications/Xcode_11.2.1.app |
+| 11.2             | 11B52   | /Applications/Xcode_11.2.app   |
+| 11.1             | 11A1027 | /Applications/Xcode_11.1.app   |
+| 11.0             | 11A420a | /Applications/Xcode_11.app     |

 #### Xcode Support Tools
 - Nomad CLI 3.1.2
@@ -178,20 +183,20 @@ The following software is installed on machines with the 20200321.1 update.
 | DriverKit 19.0          | driverkit.macosx19.0 | 11.0, 11.1, 11.2, 11.2.1, 11.3, 11.3.1, 11.4 |

 #### Installed Simulators
-| OS          | Xcode Version                    | Simulators                                                                                                                                                                                                               |
-| ----------- | -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| iOS 13.0    | 11.0                             | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Air (3rd generation)                          |
-| iOS 13.1    | 11.1                             | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Air (3rd generation)                          |
-| iOS 13.2    | 11.2<br>11.2.1                   | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Air (3rd generation)                          |
-| iOS 13.3    | 11.3<br>11.3.1                   | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad (7th generation)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Air (3rd generation) |
-| iOS 13.4    | 11.4                             | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad (7th generation)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Air (3rd generation) |
-| tvOS 13.0   | 11.0<br>11.1                     | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                        |
-| tvOS 13.2   | 11.2<br>11.2.1                   | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                        |
-| tvOS 13.3   | 11.3<br>11.3.1                   | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                        |
-| tvOS 13.4   | 11.4                             | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                        |
-| watchOS 6.0 | 11.0<br>11.1                     | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm                                                                                                 |
-| watchOS 6.1 | 11.2<br>11.2.1<br>11.3<br>11.3.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm                                                                                                 |
-| watchOS 6.2 | 11.4                             | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm                                                                                                 |
+| OS          | Xcode Version                    | Simulators                                                                                                                                                                                                                                                      |
+| ----------- | -------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| iOS 13.0    | 11.0                             | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Air (3rd generation)                                                                 |
+| iOS 13.1    | 11.1                             | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Air (3rd generation)                                                                 |
+| iOS 13.2    | 11.2<br>11.2.1                   | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Air (3rd generation)                                                                 |
+| iOS 13.3    | 11.3<br>11.3.1                   | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad (7th generation)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (1st generation) |
+| iOS 13.4    | 11.4                             | iPhone 8<br>iPhone 8 Plus<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPad Pro (9.7-inch)<br>iPad (7th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Air (3rd generation)                       |
+| tvOS 13.0   | 11.0<br>11.1                     | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                               |
+| tvOS 13.2   | 11.2<br>11.2.1                   | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                               |
+| tvOS 13.3   | 11.3<br>11.3.1                   | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                               |
+| tvOS 13.4   | 11.4                             | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                               |
+| watchOS 6.0 | 11.0<br>11.1                     | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm                                                                                                                                        |
+| watchOS 6.1 | 11.2<br>11.2.1<br>11.3<br>11.3.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm                                                                                                                                        |
+| watchOS 6.2 | 11.4                             | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm                                                                                                                                        |

 ### Android
 #### Android SDK Tools
@@ -249,7 +254,7 @@ The following software is installed on machines with the 20200321.1 update.
 | cmake            | 3.6.4111459  |
 | lldb             | 3.1.4508709  |
 | ndk-bundle       | 18.1.5063045 |
-| Android Emulator | 30.0.0       |
+| Android Emulator | 30.0.5       |

 #### Android Google APIs
 | Package Name                | Description             |
--- a/images/win/Windows2016-Azure.json
+++ b/images/win/Windows2016-Azure.json
@@ -238,7 +238,8 @@
            "type": "powershell",
            "scripts":[
                "{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1"
-            ]
+            ],
+            "execution_policy": "remotesigned"
        },
        {
            "type": "windows-restart",
@@ -445,6 +446,12 @@
                "{{ template_dir }}/scripts/Installers/Install-Cmake.ps1"
            ]
        },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-AWS.ps1"
+            ]
+        },
        {
            "type": "powershell",
            "scripts":[
@@ -463,6 +470,14 @@
                "{{ template_dir }}/scripts/Installers/Install-MysqlCli.ps1"
            ]
        },
+        {
+            "type": "powershell",
+            "elevated_user": "SYSTEM",
+            "elevated_password": "",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-SQLExpress.ps1"
+            ]
+        },
        {
            "type": "powershell",
            "scripts":[
@@ -724,6 +739,12 @@
                "{{ template_dir }}/scripts/Installers/Validate-Bazel.ps1"
            ]
        },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Validate-SQLExpress.ps1"
+            ]
+        },
        {
            "type": "powershell",
            "scripts":[
--- a/images/win/Windows2016-Readme.md
+++ b/images/win/Windows2016-Readme.md
@@ -1,6 +1,6 @@
 # Windows Server 2016

-The following software is installed on machines with the 20200316.1 update.
+The following software is installed on machines with the 20200323.1 update.

 Components marked with **\*** have been upgraded since the previous version of the image.

@@ -23,6 +23,12 @@ _Version:_ 1.25.4<br/>
 _Environment:_
 * PATH: contains location of docker-compose.exe

+## Helm
+
+_Version:_ v3.1.2+gd878d4d<br/>
+_Environment:_
+* PATH: contains location of helm
+
 ## Powershell Core

 _Version:_ 7.0.0
@@ -30,8 +36,8 @@ _Version:_ 7.0.0
<br/>

 ## Docker images

-The following container images have been cached:
-* mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 (Digest: sha256:e53049e13aa29b2df35642fa827c532ceaa78745e6ca72be2cbe74b1d75b5b99)
+The following container images have been cached:
+* mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 (Digest: sha256:7bf99ba791cce2c51091ac0c6922ff98e5a448c1046ba046fab3760070173e0d)
 * mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 (Digest: sha256:000d639c6c287bf0e69b27c008f2d411a9e161093dd1855667a8e6189f9adac8)
 * mcr.microsoft.com/windows/servercore:ltsc2016 (Digest: sha256:5bd97dbab1afe8d3200f5d5c974df3b0130e74e8a69fddcd427699c4c8cb5037)
 * microsoft/aspnetcore-build:1.0-2.0 (Digest: sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c)
@@ -155,7 +161,8 @@ _Path:_ C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools
 _Path:_ C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools

 ## Windows Driver Kit
-
+
+_WDK Version:_ 10.1.17763.1<br/>
 _WDK Visual Studio Extension Version:_ 10.0.17740.0<br/>

 ## Azure Service Fabric
@@ -437,11 +444,11 @@ _Version:_ 2.4.9 (x64)<br/>_Version:_ 2.5.7 (x64)<br/>_Version:_ 2.6.5 (x64)<br/
 _Version:_ 2.4.9 (x64)<br/>_Version:_ 2.5.7 (x64)<br/>_Version:_ 2.6.5 (x64)<br/>_Version:_ 2.7.0 (x64)<br/><br/>__System default version:__ Ruby 2.5.7p206<br/>_Environment:_<br/>* Location: C:\hostedtoolcache\windows\Ruby\2.5.7\x64\bin<br/>* PATH: contains the location of Ruby 2.5.7p206<br/>* Gem Version: 2.7.6.2<br/>

 ## OpenSSL
-
+
 _Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe<br/>_Version:_ 1.1.1d at C:\Strawberry\c\bin\openssl.exe<br/>_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe<br/>_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe<br/>_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe<br/>

 ## Perl
-
+
 _Version:_ v5.30.2<br/>

 ## Git
@@ -456,28 +463,39 @@ _Environment:_
 _Environment:_
 * PATH: contains location of git-lfs.exe
 * GIT_LFS_PATH: location of git-lfs.exe
+
+## Hub CLI
+
+_Version:_ 2.14.2<br/>
+_Environment:_
+* PATH: contains location of hub.exe

 ## Go (x64)
-
-#### 1.14
-
-_Environment:_
-* PATH: contains the location of go.exe version 1.14
-* GOROOT: root directory of the Go 1.14 installation



 ## Boost
-
+
 #### 1.69.0 [msvc-14.1]
+
 _Environment:_
-* PATH: contains the location of Boost version 1.69.0
 * PATH: contains the location of Boost version 1.69.0
-* BOOST_ROOT_1_69_0: root directory of the Boost version 1.69.0 installation
+* BOOST_ROOT_1_69_0: root directory of the Boost version 1.69.0 installation
 #### 1.72.0 [msvc-14.1]

 _Environment:_
 * 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.


@@ -512,12 +530,12 @@ _Environment:_

 ## Google Chrome

-_version:_
+_version:_
 80.0.3987.149

 ## Microsoft Edge

-_version:_
+_version:_
 80.0.361.69

 ## Mozilla Firefox
@@ -554,7 +572,7 @@ _Environment:_

 #### Microsoft Edge Driver

-_version:_
+_version:_
 80.0.361.69

 _Environment:_
@@ -579,7 +597,7 @@ _Environment:_
 * PATH: contains location of npm.cmd

 ## bazel
-
+
 _Version:_ bazel 2.2.0<br/>

 ## bazelisk
@@ -587,7 +605,7 @@ _Version:_ 1.3.0<br/>
 _Version:_ 1.3.0<br/>

 ## Java Development Kit
-
+
 #### 1.8.0_222 (default)

 _Environment:_
@@ -624,7 +642,7 @@ _Environment:_
 * PATH: contains location of gradle

 ## Cmake
-
+
 _Version:_ 3.17.0<br/>
 _Environment:_
 * PATH: contains location of cmake.exe
@@ -744,7 +762,7 @@ _Version:_ 1.0
 _Version:_ 1.0

 ## SQLServer PS
-
+
 _Version:_ 21.1.18221

 ## MinGW
@@ -793,7 +811,7 @@ _Version:_ 6.0.4<br/>
 _Version:_ 6.0.4<br/>

 ## GitVersion
-
+
 _Version:_ 5.2.4.0<br/>

 ## Cloud Foundry CLI
--- a/images/win/Windows2019-Azure.json
+++ b/images/win/Windows2019-Azure.json
@@ -219,7 +219,8 @@
            "type": "powershell",
            "scripts":[
                "{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1"
-            ]
+            ],
+            "execution_policy": "remotesigned"
        },
        {
            "type": "windows-restart",
@@ -426,6 +427,12 @@
                "{{ template_dir }}/scripts/Installers/Install-Cmake.ps1"
            ]
        },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-AWS.ps1"
+            ]
+        },
        {
            "type": "powershell",
            "scripts":[
@@ -444,6 +451,14 @@
                "{{ template_dir }}/scripts/Installers/Install-MysqlCli.ps1"
            ]
        },
+        {
+            "type": "powershell",
+            "elevated_user": "SYSTEM",
+            "elevated_password": "",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-SQLExpress.ps1"
+            ]
+        },
        {
            "type": "powershell",
            "scripts":[
@@ -571,6 +586,12 @@
                "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1"
            ]
        },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-RootCA.ps1"
+            ]
+        },
        {
            "type": "windows-restart",
            "restart_timeout": "10m"
@@ -735,6 +756,12 @@
                "{{ template_dir }}/scripts/Installers/Validate-MysqlCli.ps1"
            ]
        },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Validate-SQLExpress.ps1"
+            ]
+        },
        {
            "type": "powershell",
            "scripts":[
@@ -889,4 +916,4 @@
            ]
        }
    ]
-}
+}
--- 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<br/>
 _Environment:_
 * PATH: contains location of docker-compose.exe

+## Helm
+
+_Version:_ v3.1.2+gd878d4d<br/>
+_Environment:_
+* PATH: contains location of helm
+
 ## Powershell Core

 _Version:_ 7.0.0
@@ -30,15 +36,15 @@ _Version:_ 7.0.0
<br/>

 ## 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)
+The following container images have been cached:
+* 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.5.0+29911.84<br/>
 _Location:_ C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise

@@ -132,13 +138,15 @@ The following workloads and components are installed with Visual Studio 2019:

 ## WIX Tools

-_Toolset Version:_ 3.11.4516<br/>
+_Toolset Version:_ 3.11.4516<br/>
 _WIX Toolset Studio 2019 Extension Version:_ 1.0.0.4<br/>
 _Environment:_
 * WIX: Installation root of WIX
-
+
 ## Microsoft SSDT Visual Studio 2019 Extensions
-
+
+_Microsoft Analysis Services Projects Version:_ 2.9.6<br/>
+_SQL Server Integration Services Projects Version:_ 3.5<br/>
 _Microsoft Reporting Services Projects Version:_ 2.6.3<br/>

 ## .NET 4.8
@@ -408,7 +416,7 @@ _Description:_ .NET has been configured to use TLS 1.2 by default
 _Description:_ .NET has been configured to use TLS 1.2 by default

 ## Azure CLI
-
+
 _Version:_ 2.2.0
 _Environment:_
 * PATH: contains location of az.cmd
@@ -418,7 +426,7 @@ _Version:_ azure-devops                      0.17.0
 _Version:_ azure-devops                      0.17.0

 ## Python
-
+
 _Version:_ 2.7.17 (x64)<br/>_Version:_ 3.5.4 (x64)<br/>_Version:_ 3.6.8 (x64)<br/>_Version:_ 3.7.6 (x64)<br/>_Version:_ 3.8.2 (x64)<br/>_Version:_ 2.7.17 (x86)<br/>_Version:_ 3.5.4 (x86)<br/>_Version:_ 3.6.8 (x86)<br/>_Version:_ 3.7.6 (x86)<br/>_Version:_ 3.8.2 (x86)<br/><br/>__System default version:__ Python 3.7.6<br/>_Environment:_<br/>* Location: C:\hostedtoolcache\windows\Python\3.7.6\x64<br/>* PATH: contains the location of Python 3.7.6<br/>

 ## PyPy
@@ -426,21 +434,15 @@ _Version:_ 2.7.13 (x86)<br/>_Version:_ 3.6.9 (x86)<br/>
 _Version:_ 2.7.13 (x86)<br/>_Version:_ 3.6.9 (x86)<br/>

 ## Ruby
-
+
 _Version:_ 2.4.9 (x64)<br/>_Version:_ 2.5.7 (x64)<br/>_Version:_ 2.6.5 (x64)<br/>_Version:_ 2.7.0 (x64)<br/><br/>__System default version:__ Ruby 2.5.7p206<br/>_Environment:_<br/>* Location: C:\hostedtoolcache\windows\Ruby\2.5.7\x64\bin<br/>* PATH: contains the location of Ruby 2.5.7p206<br/>* Gem Version: 2.7.6.2<br/>
-
+
 ## OpenSSL
-
-#### Python 3.7.6
-_Environment:_
-* PATH: contains location of python.exe
-
-#### Python 2.7.17
-
+
 _Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe<br/>_Version:_ 1.1.1d at C:\Strawberry\c\bin\openssl.exe<br/>_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe<br/>_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe<br/>_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe<br/>

 ## Perl
-
+
 _Version:_ v5.30.2<br/>

 ## Git
@@ -455,33 +457,45 @@ _Environment:_
 _Environment:_
 * PATH: contains location of git-lfs.exe
 * GIT_LFS_PATH: location of git-lfs.exe
+
+## Hub CLI
+
+_Version:_ 2.14.2<br/>
+_Environment:_
+* PATH: contains location of hub.exe

 ## Go (x64)
-
+
 #### 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
+_Environment:_
+* 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 [msvc-14.1]

 _Environment:_
 * BOOST_ROOT_1_69_0: root directory of the Boost version 1.69.0 installation
-
+
 #### 1.72.0 [msvc-14.2]
+
 _Environment:_
-* PATH: contains the location of Boost version 1.72.0
 * PATH: contains the location of Boost version 1.72.0
+* 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.


@@ -492,17 +506,9 @@ _Environment:_
 _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.42.0
 _Location:_ C:\Rust\.cargo\bin
 _Environment:_
@@ -524,7 +530,7 @@ _Environment:_

 ## Google Chrome

-_version:_
+_version:_
 80.0.3987.149

 ## Microsoft Edge
@@ -534,7 +540,7 @@ _version:_

 ## Mozilla Firefox

-_version:_
+_version:_
 74.0

 ## Selenium Web Drivers
@@ -580,7 +586,7 @@ _Environment:_
 _Environment:_
 * PATH: contains location of node.exe<br/>
 * Gulp CLI version: 2.2.0 Local version: Unknown<br/>
-* Grunt grunt-cli v1.3.2<br/>
+* Grunt grunt-cli v1.3.2<br/>
 * Yarn 1.22.4<br/>


@@ -591,7 +597,7 @@ _Environment:_
 * PATH: contains location of npm.cmd

 ## Java Development Kit
-
+
 #### 1.8.0_222 (default)

 _Environment:_
@@ -645,6 +651,7 @@ _Environment:_
 _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
@@ -702,6 +709,7 @@ _SDK:_
 * 2.1.301 C:\Program Files\dotnet\sdk\2.1.301
 * 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
@@ -788,15 +796,11 @@ _Version:_ 1.4.0<br/>
 _Version:_ 1.4.0<br/>

 ## Inno Setup
-
+
 _Version:_ 6.0.4<br/>

 ## GitVersion
-
-_Version:_ 5.2.0.0<br/>
-
-## OpenSSL
-
+
 _Version:_ 5.2.4.0<br/>

 ## Cloud Foundry CLI
@@ -828,7 +832,7 @@ _Environment:_
 * PATH: contains location of kind.exe

 ## bazel
-
+
 _Version:_ bazel 2.2.0<br/>

 ## bazelisk
--- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1
+++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1
@@ -20,6 +20,7 @@ Export-ModuleMember -Function @(
    'Add-SoftwareDetailsToMarkdown'
    'Stop-SvcWithErrHandling'
    'Set-SvcWithErrHandling'
+    'Start-DownloadWithRetry'
    'Install-VsixExtension'
    'Get-VSExtensionVersion'
    'Get-WinVersion'
--- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1
+++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1
@@ -161,6 +161,46 @@ Hashtable for service arguments
    }
 }

+function Start-DownloadWithRetry
+{
+    param (
+        [Parameter(Mandatory)]
+        [string] $Url,
+        [Parameter(Mandatory)]
+        [string] $Name,
+        [string] $DownloadPath = "${env:Temp}",
+        [int] $retries = 20
+        )
+    $FilePath = Join-Path $DownloadPath $Name
+    #Default retry logic for the package.
+    while($retries -gt 0)
+        {
+            try
+            {
+                Write-Host "Downloading package from: $Url to path $FilePath ."
+                (New-Object System.Net.WebClient).DownloadFile($Url, $FilePath)
+                break
+            }
+            catch
+            {
+                Write-Host "There is an error during package downloading"
+                $_
+                $retries--
+
+                if ($retries -eq 0)
+                {
+                    Write-Host "File can't be downloaded. Please try later or check that file exists by url: $Url"
+                    $_
+                    exit 1
+                }
+                Write-Host "Waiting 30 seconds before retrying. Retries left: $retries"
+                Start-Sleep -Seconds 30
+            }
+        }
+   return $FilePath
+}
+
+
 function Install-VsixExtension
 {
    Param
@@ -177,34 +217,7 @@ function Install-VsixExtension

    if (!$InstallOnly)
    {
-        $FilePath = "${env:Temp}\$Name"
-
-        while($retries -gt 0)
-        {
-            try
-            {
-                Write-Host "Downloading $Name..."
-                (New-Object System.Net.WebClient).DownloadFile($Url, $FilePath)
-                break
-            }
-            catch
-            {
-                Write-Host "There is an error during $Name downloading"
-                $_
-
-                $retries--
-
-                if ($retries -eq 0)
-                {
-                    Write-Host "File can't be downloaded"
-                    $_
-                    exit 1
-                }
-
-                Write-Host "Waiting 30 seconds before retrying. Retries left: $retries"
-                Start-Sleep -Seconds 30
-            }
-        }
+        $FilePath = Start-DownloadWithRetry -Url $Url -Name $Name
    }

    $ArgumentList = ('/quiet', "`"$FilePath`"")
@@ -311,4 +324,3 @@ function Test-IsWin16
 {
    (Get-WinVersion) -match "2016"
 }
-
--- a/images/win/scripts/Installers/Install-AWS.ps1
+++ b/images/win/scripts/Installers/Install-AWS.ps1
@@ -0,0 +1,31 @@
+################################################################################
+##  File:  Install-awscli.ps1
+##  Desc:  Install awscli
+################################################################################
+
+choco install awscli -y
+
+$env:PATH =$env:PATH + ";$Env:Programfiles\Amazon\AWSCLIV2"
+
+$command = Get-Command -Name 'aws'
+
+if ($command)
+{
+    Write-Host "awscli on path"
+}
+else
+{
+    Write-Host 'awscli is not on path'
+    exit 1
+}
+
+# Adding description of the software to Markdown
+$SoftwareName = "AWS CLI"
+
+$version = (aws --version).Split(" ")[0].Replace("/"," ")
+
+$Description = @"
+_Version:_ $version<br/>
+"@
+
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
--- a/images/win/scripts/Installers/Install-DotnetSDK.ps1
+++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1
@@ -100,16 +100,10 @@ function RunPostInstallationSteps()
 {
    Add-MachinePathItem "C:\Program Files\dotnet"
    # Run script at startup for all users
-    $cmdDotNetPath = @"
-@echo off
-SETX PATH "%USERPROFILE%\.dotnet\tools;%PATH%"
-"@
-
-    $cmdPath = "C:\Program Files\dotnet\userpath.bat"
-    $cmdDotNetPath | Out-File -Encoding ascii -FilePath $cmdPath
+    $cmdDotNet = 'C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -NoProfile -Command "[System.Environment]::SetEnvironmentVariable(''PATH'',"""$env:USERPROFILE\.dotnet\tools;$env:PATH""", ''USER'')"'

    # Update Run key to run a script at logon
-    Set-ItemProperty -Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Run" -Name "DOTNETUSERPATH" -Value $cmdPath
+    Set-ItemProperty -Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Run" -Name "DOTNETUSERPATH" -Value $cmdDotNet
 }

 InstallAllValidSdks
--- a/images/win/scripts/Installers/Install-RootCA.ps1
+++ b/images/win/scripts/Installers/Install-RootCA.ps1
@@ -0,0 +1,22 @@
+# Serialized Certificate Store File
+$sstFile = "$env:TEMP\roots.sst"
+# Generate SST from Windows Update
+$result = certutil.exe -generateSSTFromWU $sstFile
+if ($LASTEXITCODE -ne 0) {
+    Write-Host "[Error]: failed to generate $sstFile sst file`n$result"
+    exit $LASTEXITCODE
+}
+
+$result = certutil.exe -dump $sstFile
+if ($LASTEXITCODE -ne 0) {
+    Write-Host "[Error]: failed to dump $sstFile sst file`n$result"
+    exit $LASTEXITCODE
+}
+
+try {
+    Import-Certificate -FilePath $sstFile -CertStoreLocation Cert:\LocalMachine\Root
+} catch {
+    Write-Host "[Error]: failed to import ROOT CA`n$_"
+    exit 1
+}
+
--- a/images/win/scripts/Installers/Install-SQLExpress.ps1
+++ b/images/win/scripts/Installers/Install-SQLExpress.ps1
@@ -0,0 +1,78 @@
+################################################################################
+##  File:  Install-SQLExpress.ps1
+##  Desc:  Install SQL Express for Windows
+################################################################################
+Import-Module -Name ImageHelpers -Force;
+
+function Download-FullSQLPackage {
+    param(
+        [String]$InstallerPath,
+        [String]$DownloadPath,
+        [String]$Arguments = ("/MEDIAPATH=$DownloadPath", "/MEDIATYPE=Core","/Action=Download", "/QUIET")
+    )
+    Write-Host "Downloading full package to $DownloadPath..."
+    $process = Start-Process -FilePath $InstallerPath -ArgumentList $Arguments -Wait -PassThru
+    $exitCode = $process.ExitCode
+    if ($exitCode -eq 0)
+    {
+      Write-Host -Object "Full SQL Express package has been successfully downloaded to $DownloadPath : ExitCode: $exitCode"
+    }
+    else
+    {
+      Write-Host -Object "Full package downloading process was unsuccessful. Exit code: $exitCode."
+      exit $exitCode
+    }
+}
+
+function Unpack-SQLInstaller {
+    param(
+        [String]$InstallPath,
+        [String]$Arguments = ("/Q", "/IACCEPTSQLSERVERLICENSETERMS")
+    )
+    Write-Host "Start unpacking procedure to $InstallPath..."
+    $process = Start-Process -FilePath $InstallPath -ArgumentList $Arguments -Wait -PassThru
+    $exitCode = $process.ExitCode
+# Exit code -2067529716 is added since SQL Unpack procedure returns it on success.
+    if ($exitCode -eq 0 -or $exitCode -eq -2067529716)
+    {
+      Write-Host -Object "SQL installer unpacking has been completed."
+    }
+    else
+    {
+      Write-Host -Object "SQL installer unpacking was interrupted : $exitCode."
+      exit $exitCode
+    }
+}
+
+function Start-Installer {
+    param(
+        [String]$InstallerPath,
+        [String]$Arguments = ("/Q", "/IACCEPTSQLSERVERLICENSETERMS", "/Action=Install", "/INSTANCEID=SQL2019", "/INSTANCENAME=SQL2019", "/SECURITYMODE=SQL", "/SAPWD=P@ssword!!", "/TCPENABLED=1")
+    )
+    Write-Host "Installating SQL Express..."
+    $process = Start-Process -FilePath $InstallerPath -ArgumentList $Arguments -Wait -PassThru
+    $exitCode = $process.ExitCode
+    if ($exitCode -eq 0)
+    {
+      Write-Host -Object "SQL Express has been successfully installed: ExitCode: $exitCode"
+    }
+    else
+    {
+      Write-Host -Object "Installation procedure was not correctly completed. Exit code: $exitCode."
+      exit $exitCode
+    }
+}
+#Main function
+$installerUrl = "https://go.microsoft.com/fwlink/?linkid=866658"
+$downloadPath = "C:\SQLInstall"
+$setupPath = Join-Path $downloadPath "SQLEXPR_x64_ENU"
+#Create directory for temporary files
+New-Item -Path $downloadPath -ItemType Directory
+Set-Location -Path $downloadPath
+$installerPath = Start-DownloadWithRetry -Url $installerUrl -DownloadPath $downloadPath -Name "SQL2019-SSEI-Expr.exe"
+Download-FullSQLPackage -InstallerPath $installerPath -DownloadPath $downloadPath
+Unpack-SQLInstaller -InstallPath "$setupPath.exe"
+$resultPath = Join-Path $setupPath "SETUP.exe"
+Start-Installer -InstallerPath $resultPath
+#Cleanup folder with installation packages.
+Remove-Item $downloadPath -Recurse -Force
--- a/images/win/scripts/Installers/Validate-Cmake.ps1
+++ b/images/win/scripts/Installers/Validate-Cmake.ps1
@@ -5,11 +5,11 @@

 if(Get-Command -Name 'cmake')
 {
-    Write-Host "Cmake $(cmake -version) on path"
+    Write-Host "CMake $(cmake -version) on path"
 }
 else
 {
-    Write-Host 'cmake not on path'
+    Write-Host 'CMake not on path'
    exit 1
 }

@@ -20,7 +20,7 @@ if( $( $(cmake -version) | Out-String) -match  'cmake version (?<version>.*).*'
 }

 # Adding description of the software to Markdown
-$SoftwareName = "Cmake"
+$SoftwareName = "CMake"

 $Description = @"
 _Version:_ $cmakeVersion<br/>
--- a/images/win/scripts/Installers/Validate-SQLExpress.ps1
+++ b/images/win/scripts/Installers/Validate-SQLExpress.ps1
@@ -0,0 +1,52 @@
+################################################################################
+##  File:  Validate-SQLExpress.ps1
+##  Desc:  Validate Microsoft SQL Express installation
+################################################################################
+
+#Parameters for database access
+$sqlUser = "sa"
+$sqlPassword = "P@ssword!!"
+$sqlInstance = "SQL2019"
+
+function Test-SqlConnection {
+    param(
+        [Parameter(Mandatory)]
+        [string]$ServerName,
+        [Parameter(Mandatory)]
+        [string]$IntegratedSecurity,
+        [Parameter(Mandatory)]
+        [string]$UserName,
+        [Parameter(Mandatory)]
+        [string]$Password
+    )
+    $ErrorActionPreference = 'Stop'
+    try {
+        $connectionString = 'Server={0};Integrated Security={1};User ID={2};Password={3}' -f $ServerName,$IntegratedSecurity,$UserName,$Password
+        $sqlConnection = New-Object System.Data.SqlClient.SqlConnection $connectionString
+        $sqlConnection.Open()
+        Write-Host -Object "Connection to SQL Express was successful."
+        return $sqlConnection.ServerVersion
+
+    } catch {
+        Write-Host -Object "Connection to SQL Express cannot be established."
+        exit 1
+
+    } finally {
+        ## Close the connection when we're done
+        $sqlConnection.Close()
+    }
+}
+$instanceName = "$env:computername\$sqlInstance"
+$version = Test-SqlConnection -ServerName $instanceName -IntegratedSecurity "false" -UserName $sqlUser -Password $sqlPassword
+
+# Adding description of the software to Markdown
+$SoftwareName = "Git"
+$Description = @"
+_Version:_ $version<br/>
+_InstanceName:_ $sqlInstance<br/>
+_Username:_ $sqlUser<br/>
+_Password:_ $sqlPassword<br/>
+_Default Path:_ C:\Program Files (x86)\Microsoft SQL Server
+"@
+
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
--- a/images/win/scripts/Installers/Windows2016/Install-SSDT.ps1
+++ b/images/win/scripts/Installers/Windows2016/Install-SSDT.ps1
@@ -5,8 +5,9 @@

 Import-Module -Name ImageHelpers -Force

-#SSDT for Visual Studio 2017 (15.9.3)
-$InstallerURI = 'https://download.microsoft.com/download/5/2/D/52DEF429-5B17-470C-82D9-654116080B15/SSDT-Setup-ENU.exe'
+#SSDT for Visual Studio 2017
+#The link down below points to the latest version of SSDT for Visual Studio 2017
+$InstallerURI = 'https://go.microsoft.com/fwlink/?linkid=2124518'
 $InstallerName = 'SSDT-Setup-ENU.exe'
 $logFilePath = "$env:TEMP\ssdtlog.txt"
 $ArgumentList = ('/install', 'INSTALLALL', '/passive', '/norestart', "/log `"$logFilePath`"")
--- a/triage-rules.yml
+++ b/triage-rules.yml
@@ -7,157 +7,131 @@ rules:
 - valueFor: '**Area for Triage**'
  contains: '.NET Core'
  addLabels: ['Area: .NET Core']
-  assign: ['bishal-pdmsft', 'pulkitaggarwl']

 # Area: .NET Framework
 - valueFor: '**Area for Triage**'
  contains: '.NET Framework'
  addLabels: ['Area: .NET Framework']
-  assign: ['azuredaveops', 'wnjenkin']

 # Area: Android
 - valueFor: '**Area for Triage**'
  contains: 'Android'
  addLabels: ['Area: Android']
-  assign: ['madhurig']

 # Area: Apple
 - valueFor: '**Area for Triage**'
  contains: 'Apple'
  addLabels: ['Area: Apple']
-  assign: ['sergey-akhalkov']

 # Area: Artifacts
 - valueFor: '**Area for Triage**'
  contains: 'Artifacts'
  addLabels: ['Area: Artifacts']
-  assign: ['animania4ka']

 # Area: C/C++
 - valueFor: '**Area for Triage**'
  contains: 'C/C++'
  addLabels: ['Area: C/C++']
-  assign: ['azuredaveops', 'wnjenkin']

 # Area: Containers
 - valueFor: '**Area for Triage**'
  contains: 'Containers'
  addLabels: ['Area: Containers']
-  assign: ['bryanmacfarlane']

 # Area: Databases
 - valueFor: '**Area for Triage**'
  contains: 'Databases'
  addLabels: ['Area: Databases']
-  assign: ['kmkumaran', 'RoopeshNair']

 # Area: Deployment/Release
 - valueFor: '**Area for Triage**'
  contains: 'Deployment/Release'
  addLabels: ['Area: Deployment/Release']
-  assign: ['kmkumaran', 'RoopeshNair']

 # Area: Erlang / Elixir
 - valueFor: '**Area for Triage**'
  contains: 'Erlang / Elixir'
  addLabels: ['Area: Erlang / Elixir']
-  assign: ['andymckay']

 # Area: Git
 - valueFor: '**Area for Triage**'
  contains: 'Git'
  addLabels: ['Area: Git']
-  assign: ['alepauly','thejoebourneidentity']

 # Area: Go
 - valueFor: '**Area for Triage**'
  contains: 'Go'
  addLabels: ['Area: Go']
-  assign: ['bishal-pdmsft', 'pulkitaggarwl']

 # Area: Haskell
 - valueFor: '**Area for Triage**'
  contains: 'Haskell'
  addLabels: ['Area: Haskell']
-  assign: ['andymckay']

 # Area: Java
 - valueFor: '**Area for Triage**'
  contains: 'Java'
  addLabels: ['Area: Java']
-  assign: ['leantk','vijayma']

 # Area: JavaScript and Node.js
 - valueFor: '**Area for Triage**'
  contains: 'JavaScript and Node.js'
  addLabels: ['Area: JavaScript and Node.js']
-  assign: ['bryanmacfarlane']

 # Area: Packages
 - valueFor: '**Area for Triage**'
  contains: 'Packages'
  addLabels: ['Area: Packages']
-  assign: ['johnterickson', 'animania4ka']

 # Area: PHP
 - valueFor: '**Area for Triage**'
  contains: 'PHP'
  addLabels: ['Area: PHP']
-  assign: ['alepauly', 'thejoebourneidentity']

 # Area: Python
 - valueFor: '**Area for Triage**'
  contains: 'Python'
  addLabels: ['Area: Python']
-  assign: ['madhurig']

 # Area: Ruby
 - valueFor: '**Area for Triage**'
  contains: 'Ruby'
  addLabels: ['Area: Ruby']
-  assign: ['zachariahcox']

 # Area: Rust
 - valueFor: '**Area for Triage**'
  contains: 'Rust'
  addLabels: ['Area: Rust']
-  assign: ['sergey-akhalkov']

 # Area: Scala
 - valueFor: '**Area for Triage**'
  contains: 'Scala'
  addLabels: ['Area: Scala']
-  assign: ['leantk','vijayma']

 # Area: Scripting and command line
 - valueFor: '**Area for Triage**'
  contains: 'Scripting and command line'
  addLabels: ['Area: Scripting and command line']
-  assign: ['zachariahcox','vtbassmatt']

 # Area: Servers
 - valueFor: '**Area for Triage**'
  contains: 'Servers'
  addLabels: ['Area: Servers']
-  assign: ['kmkumaran', 'RoopeshNair']

 # Area: SSH
 - valueFor: '**Area for Triage**'
  contains: 'SSH'
  addLabels: ['Area: SSH']
-  assign: ['zachariahcox','vtbassmatt']

 # Area: Testing and code coverage (incl. browser testing)
 - valueFor: '**Area for Triage**'
  contains: 'Testing and code coverage'
  addLabels: ['Area: Testing and code coverage']
-  assign: ['sadagopanrajaram','PBoraMSFT']

 # Area: Xamarin
 - valueFor: '**Area for Triage**'
  contains: 'Xamarin'
  addLabels: ['Area: Xamarin']
-  assign: ['sergey-akhalkov']

 # Types
 - valueFor: '**Question, Bug, or Feature?**'
@@ -183,10 +157,3 @@ nomatches:
  addLabels: ['Area: Packages']
 - contains: 'Docker'
  addLabels: ['Area: Deployment/Release']
-
-# always runs after rules.  look for missing or invalid sets of tags
-tags:
- noneIn: ['bug', 'enhancement', 'question']
-  addLabels: ['needs triage']
- noneMatch: '\s*Area:\s*([^]*)'
-  addLabels: ['needs triage']