Merge branch 'master' of https://github.com/nikita-bykov/virtual-environments into output-readme-step

images/linux/Ubuntu1604-README.md

@@ -1,11 +1,16 @@
 # Ubuntu 16.04.6 LTS
-The following software is installed on machines with the 20200225.0 update.
+The following software is installed on machines with the 20200301.1 update.
 ***
 - 7-Zip 9.20
 - Ansible (ansible 2.9.4)
 - AzCopy (azcopy 7.3.0-netcore)
 - Azure CLI (azure-cli                          2.1.0)
 - Azure CLI (azure-devops                      0.17.0)
+- Bazel (Build label: 2.1.1
+Build target: bazel-out/k8-opt/bin/src/main/java/com/google/devtools/build/lib/bazel/BazelServer_deploy.jar
+Build time: Fri Feb 21 14:56:47 2020 (1582297007)
+Build timestamp: 1582297007
+Build timestamp as int: 1582297007)
 - Basic CLI:
   - curl
   - dnsutils
@@ -32,15 +37,14 @@ The following software is installed on machines with the 20200225.0 update.
   - wget
   - zip
   - zstd
-- AWS CLI (aws-cli/1.18.6 Python/2.7.12 Linux/4.15.0-1071-azure botocore/1.15.6)
+- AWS CLI (aws-cli/1.18.11 Python/2.7.12 Linux/4.15.0-1071-azure botocore/1.15.11)
 - build-essential
 - Clang 6.0 (6.0.1)
 - Clang 8 (8.0.1)
 - Clang 9 (9.0.1)
 - CMake (cmake version 3.16.2)
 - Docker Compose (docker-compose version 1.22.0, build f46880fe)
-- Docker (Docker version 3.0.10+azure, build 99c5edceb48d64c1aa5d09b8c9c499d431d98bb9)
+- Docker-Moby (Docker version 3.0.10+azure, build 99c5edceb48d64c1aa5d09b8c9c499d431d98bb9)
-- Docker (Docker version 3.0.10+azure, build 99c5edceb48d64c1aa5d09b8c9c499d431d98bb9)
 - .NET Core SDK:
   - 3.1.101
   - 3.1.100
@@ -102,7 +106,7 @@ The following software is installed on machines with the 20200225.0 update.
   - 2.1.301
   - 2.1.300
 - Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 10.6.4)
-- Firefox (Mozilla Firefox 72.0.2)
+- Firefox (Mozilla Firefox 73.0.1)
 - Geckodriver (); Gecko Driver is available via GECKOWEBDRIVER environment variable
 - GNU C++ 7.4.0
 - GNU C++ 8.3.0
@@ -150,7 +154,7 @@ compiled using version 3.0.2.0 of the Cabal library )
 - Kind (kind v0.7.0 go1.13.6 linux/amd64)
 - kubectl (Client Version: v1.17.3)
 - helm (Client: v2.16.3+g1ee0254)
-- Leiningen (Leiningen 2.9.1 on Java 1.8.0_242 OpenJDK 64-Bit Server VM)
+- Leiningen (Leiningen 2.9.2 on Java 1.8.0_242 OpenJDK 64-Bit Server VM)
 - Mercurial (Mercurial Distributed SCM (version 4.4.1))
 - Miniconda (conda 4.7.12)
 - Mono (Mono JIT compiler version 6.8.0.105 (tarball Tue Feb  4 21:20:35 UTC 2020))
@@ -163,10 +167,10 @@ compiled using version 3.0.2.0 of the Cabal library )
 Local version: Unknown)
 - n (6.3.1)
 - Parcel (1.12.4)
-- TypeScript (Version 3.8.2)
+- TypeScript (Version 3.8.3)
 - Webpack (4.41.6)
 - Webpack CLI (3.3.11)
-- Yarn (1.21.1)
+- Yarn (1.22.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 ))
@@ -182,11 +186,11 @@ Local version: Unknown)
 - ruby (2.3.1p112)
 - gem (3.1.2)
 - rustup (1.21.1)
-- rust (1.41.0)
+- rust (1.41.1)
 - cargo (1.41.0)
 - rustfmt (1.4.11-stable)
 - clippy (0.0.212)
-- rustdoc (1.41.0)
+- rustdoc (1.41.1)
 - bindgen (execute
 the
 0.53.1)
@@ -262,14 +266,15 @@ the
 - Az Module (2.6.0)
 - Az Module (2.8.0)
 - Az Module (3.1.0)
+- Az Module (3.5.0)
 - Cached container images
+  - node:10 (Digest: sha256:df200903ff34c07c1b9112b4fd9d1342c11eb7d99525f2b366c487f91dda8131)
+  - node:12 (Digest: sha256:facc1cbde6e5aa3255092b1a1417451953c80bd31ab5a4403f8bcd90b90a8407)
+  - buildpack-deps:stretch (Digest: sha256:dc901bbf4b34e4ca8771c0d0773e557221452f97bcf0c732de7ecda3782bdf97)
+  - debian:9 (Digest: sha256:ddb131307ad9c70ebf8c7962ba73c20101f68c7a511915aea3ad3b7ad47b9d20)
+  - debian:8 (Digest: sha256:2c9b2323299846c5298c12db373da310f8114f2941ae3f496e95270cc8ca5ebd)
   - node:10-alpine (Digest: sha256:e8d05985dd93c380a83da00d676b081dad9cce148cb4ecdf26ed684fcff1449c)
-  - node:10 (Digest: sha256:cfc462a03d170c09332f28cb358d796575bc0ac2e2b47d97e10810f6c4acdd2e)
   - node:12-alpine (Digest: sha256:bba77d0ca8820b43af898b3c50d4e8b68dc703ebbd958319af2f21f2d3c309f5)
-  - node:12 (Digest: sha256:c185973d2d8d60d2f99abe1285e1ad0887a42f313f3befa6ae8f2429304ee09c)
-  - buildpack-deps:stretch (Digest: sha256:8bcd320ec29cf67052985f28891586fb853051f69ad0646fc7a49f47d6e3ee1a)
-  - debian:9 (Digest: sha256:da5274336981301e2c5f2edb54eaa4dccee70c39506f96d39377b46ea75e804e)
-  - debian:8 (Digest: sha256:0e7a709bdf94e15391e9658271197e28a8c993f4d6bb8ee49d370886a9893351)
   - alpine:3.8 (Digest: sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14)
   - alpine:3.9 (Digest: sha256:115731bab0862031b44766733890091c17924f9b7781b79997f5f163be262178)
   - alpine:3.10 (Digest: sha256:7c3773f7bcc969f03f8f653910001d99a9d324b4b9caa008846ad2c3089f5a5f)
@@ -281,7 +286,7 @@ the
   - Python 3.5.9
   - Python 3.6.10
   - Python 3.7.6
-  - Python 3.8.1
+  - Python 3.8.2
 - Ruby:
   - Ruby 2.4.9
   - Ruby 2.5.7

images/linux/Ubuntu1804-README.md

@@ -1,11 +1,16 @@
 # Ubuntu 18.04.4 LTS
-The following software is installed on machines with the 20200225.0 update.
+The following software is installed on machines with the 20200301.1 update.
 ***
 - 7-Zip 16.02
 - Ansible (ansible 2.9.4)
 - AzCopy (azcopy 7.3.0-netcore)
 - Azure CLI (azure-cli                          2.1.0)
 - Azure CLI (azure-devops                      0.17.0)
+- Bazel (Build label: 2.1.1
+Build target: bazel-out/k8-opt/bin/src/main/java/com/google/devtools/build/lib/bazel/BazelServer_deploy.jar
+Build time: Fri Feb 21 14:56:47 2020 (1582297007)
+Build timestamp: 1582297007
+Build timestamp as int: 1582297007)
 - Basic CLI:
   - curl
   - dnsutils
@@ -32,15 +37,14 @@ The following software is installed on machines with the 20200225.0 update.
   - wget
   - zip
   - zstd
-- AWS CLI (aws-cli/1.18.6 Python/2.7.17 Linux/5.0.0-1032-azure botocore/1.15.6)
+- AWS CLI (aws-cli/1.18.11 Python/2.7.17 Linux/5.0.0-1032-azure botocore/1.15.11)
 - build-essential
 - Clang 6.0 (6.0.1)
 - Clang 8 (8.0.1)
 - Clang 9 (9.0.0)
 - CMake (cmake version 3.16.2)
 - Docker Compose (docker-compose version 1.22.0, build f46880fe)
-- Docker (Docker version 3.0.10+azure, build 99c5edceb48d64c1aa5d09b8c9c499d431d98bb9)
+- Docker-Moby (Docker version 3.0.10+azure, build 99c5edceb48d64c1aa5d09b8c9c499d431d98bb9)
-- Docker (Docker version 3.0.10+azure, build 99c5edceb48d64c1aa5d09b8c9c499d431d98bb9)
 - .NET Core SDK:
   - 3.1.101
   - 3.1.100
@@ -102,7 +106,7 @@ The following software is installed on machines with the 20200225.0 update.
   - 2.1.301
   - 2.1.300
 - Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 10.6.4)
-- Firefox (Mozilla Firefox 73.0)
+- Firefox (Mozilla Firefox 73.0.1)
 - Geckodriver (); Gecko Driver is available via GECKOWEBDRIVER environment variable
 - GNU C++ 7.4.0
 - GNU C++ 8.3.0
@@ -148,7 +152,7 @@ compiled using version 3.0.2.0 of the Cabal library )
 - Kind (kind v0.7.0 go1.13.6 linux/amd64)
 - kubectl (Client Version: v1.17.3)
 - helm (Client: v2.16.3+g1ee0254)
-- Leiningen (Leiningen 2.9.1 on Java 1.8.0_242 OpenJDK 64-Bit Server VM)
+- Leiningen (Leiningen 2.9.2 on Java 1.8.0_242 OpenJDK 64-Bit Server VM)
 - Mercurial (Mercurial Distributed SCM (version 4.5.3))
 - Miniconda (conda 4.7.12)
 - Mono (Mono JIT compiler version 6.8.0.105 (tarball Tue Feb  4 21:20:20 UTC 2020))
@@ -161,10 +165,10 @@ compiled using version 3.0.2.0 of the Cabal library )
 Local version: Unknown)
 - n (6.3.1)
 - Parcel (1.12.4)
-- TypeScript (Version 3.8.2)
+- TypeScript (Version 3.8.3)
 - Webpack (4.41.6)
 - Webpack CLI (3.3.11)
-- Yarn (1.21.1)
+- Yarn (1.22.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 ))
@@ -178,11 +182,11 @@ Local version: Unknown)
 - ruby (2.5.1p57)
 - gem (3.1.2)
 - rustup (1.21.1)
-- rust (1.41.0)
+- rust (1.41.1)
 - cargo (1.41.0)
 - rustfmt (1.4.11-stable)
 - clippy (0.0.212)
-- rustdoc (1.41.0)
+- rustdoc (1.41.1)
 - bindgen (execute
 the
 0.53.1)
@@ -252,14 +256,15 @@ the
 - Az Module (2.6.0)
 - Az Module (2.8.0)
 - Az Module (3.1.0)
+- Az Module (3.5.0)
 - Cached container images
+  - node:10 (Digest: sha256:df200903ff34c07c1b9112b4fd9d1342c11eb7d99525f2b366c487f91dda8131)
+  - node:12 (Digest: sha256:facc1cbde6e5aa3255092b1a1417451953c80bd31ab5a4403f8bcd90b90a8407)
+  - buildpack-deps:stretch (Digest: sha256:dc901bbf4b34e4ca8771c0d0773e557221452f97bcf0c732de7ecda3782bdf97)
+  - debian:9 (Digest: sha256:ddb131307ad9c70ebf8c7962ba73c20101f68c7a511915aea3ad3b7ad47b9d20)
+  - debian:8 (Digest: sha256:2c9b2323299846c5298c12db373da310f8114f2941ae3f496e95270cc8ca5ebd)
   - node:10-alpine (Digest: sha256:e8d05985dd93c380a83da00d676b081dad9cce148cb4ecdf26ed684fcff1449c)
-  - node:10 (Digest: sha256:cfc462a03d170c09332f28cb358d796575bc0ac2e2b47d97e10810f6c4acdd2e)
   - node:12-alpine (Digest: sha256:bba77d0ca8820b43af898b3c50d4e8b68dc703ebbd958319af2f21f2d3c309f5)
-  - node:12 (Digest: sha256:c185973d2d8d60d2f99abe1285e1ad0887a42f313f3befa6ae8f2429304ee09c)
-  - buildpack-deps:stretch (Digest: sha256:8bcd320ec29cf67052985f28891586fb853051f69ad0646fc7a49f47d6e3ee1a)
-  - debian:9 (Digest: sha256:da5274336981301e2c5f2edb54eaa4dccee70c39506f96d39377b46ea75e804e)
-  - debian:8 (Digest: sha256:0e7a709bdf94e15391e9658271197e28a8c993f4d6bb8ee49d370886a9893351)
   - alpine:3.8 (Digest: sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14)
   - alpine:3.9 (Digest: sha256:115731bab0862031b44766733890091c17924f9b7781b79997f5f163be262178)
   - alpine:3.10 (Digest: sha256:7c3773f7bcc969f03f8f653910001d99a9d324b4b9caa008846ad2c3089f5a5f)
@@ -271,7 +276,7 @@ the
   - Python 3.5.9
   - Python 3.6.10
   - Python 3.7.6
-  - Python 3.8.1
+  - Python 3.8.2
 - Ruby:
   - Ruby 2.4.9
   - Ruby 2.5.7

images/linux/scripts/installers/1604/android.sh

@@ -39,6 +39,7 @@ echo "y" | ${ANDROID_ROOT}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} \
     "platforms;android-17" \
     "platforms;android-15" \
     "platforms;android-10" \
+    "build-tools;29.0.3" \
     "build-tools;29.0.2" \
     "build-tools;29.0.0" \
     "build-tools;28.0.3" \
@@ -110,6 +111,7 @@ DocumentInstalledItem "Android SDK Platform 17"
 DocumentInstalledItem "Android SDK Platform 15"
 DocumentInstalledItem "Android SDK Platform 10"
 DocumentInstalledItem "Android SDK Patch Applier v4"
+DocumentInstalledItem "Android SDK Build-Tools 29.0.3"
 DocumentInstalledItem "Android SDK Build-Tools 29.0.2"
 DocumentInstalledItem "Android SDK Build-Tools 29.0.0"
 DocumentInstalledItem "Android SDK Build-Tools 28.0.3"

images/linux/scripts/installers/1604/basic.sh

@@ -19,6 +19,8 @@ apt-fast install -y --no-install-recommends \
     iproute2 \
     iputils-ping \
     jq \
+    libc++-dev \
+    libc++abi-dev \
     libcurl3 \
     libicu55 \
     libunwind8 \
@@ -75,6 +77,8 @@ DocumentInstalledItemIndent "ftp"
 DocumentInstalledItemIndent "iproute2"
 DocumentInstalledItemIndent "iputils-ping"
 DocumentInstalledItemIndent "jq"
+DocumentInstalledItemIndent "libc++-dev"
+DocumentInstalledItemIndent "libc++abi-dev"
 DocumentInstalledItemIndent "libcurl3"
 DocumentInstalledItemIndent "libicu55"
 DocumentInstalledItemIndent "libunwind8"

images/linux/scripts/installers/1604/go.sh

@@ -1,36 +0,0 @@
-#!/bin/bash
-################################################################################
-##  File:  go.sh
-##  Desc:  Installs go, configures GOROOT, and adds go to the path
-################################################################################
-
-# Source the helpers for use with the script
-source $HELPER_SCRIPTS/document.sh
-
-# This function installs Go using the specified arguments:
-#   $1=MajorVersion (1.11)
-#   $2=MajorAndMinorVersion (1.11.1)
-#   $3=IsDefaultVersion (true or false)
-function InstallGo () {
-    curl -sL https://dl.google.com/go/go$2.linux-amd64.tar.gz -o go$2.linux-amd64.tar.gz
-    mkdir -p /usr/local/go$1
-    tar -C /usr/local/go$1 -xzf go$2.linux-amd64.tar.gz --strip-components=1 go
-    rm go$2.linux-amd64.tar.gz
-    echo "GOROOT_${1//./_}_X64=/usr/local/go$1" | tee -a /etc/environment
-    DocumentInstalledItem "Go $1 ($(/usr/local/go$1/bin/go version))"
-
-    # If this version of Go is to be the default version,
-    # symlink it into the path and point GOROOT to it.
-    if [ $3 = true ]
-    then
-        ln -s /usr/local/go$1/bin/* /usr/bin/
-        echo "GOROOT=/usr/local/go$1" | tee -a /etc/environment
-    fi
-}
-
-# Install Go versions
-InstallGo 1.9 1.9.7 false
-InstallGo 1.10 1.10.8 false
-InstallGo 1.11 1.11.12 false
-InstallGo 1.12 1.12.7 true
-InstallGo 1.13 1.13 false

images/linux/scripts/installers/1604/kubernetes-tools.sh

@@ -17,7 +17,7 @@ apt-get update
 apt-get install -y kubectl
 
 # Install Helm
-curl -L https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash
+curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
 
 # Run tests to determine that the software installed as expected
 echo "Testing to make sure that script performed as expected, and basic scenarios work"

images/linux/scripts/installers/1804/android.sh

@@ -37,6 +37,7 @@ echo "y" | ${ANDROID_ROOT}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} \
     "platforms;android-21" \
     "platforms;android-19" \
     "platforms;android-17" \
+    "build-tools;29.0.3" \
     "build-tools;29.0.2" \
     "build-tools;29.0.0" \
     "build-tools;28.0.3" \
@@ -100,6 +101,7 @@ DocumentInstalledItem "Android SDK Platform 21"
 DocumentInstalledItem "Android SDK Platform 19"
 DocumentInstalledItem "Android SDK Platform 17"
 DocumentInstalledItem "Android SDK Patch Applier v4"
+DocumentInstalledItem "Android SDK Build-Tools 29.0.3"
 DocumentInstalledItem "Android SDK Build-Tools 29.0.2"
 DocumentInstalledItem "Android SDK Build-Tools 29.0.0"
 DocumentInstalledItem "Android SDK Build-Tools 28.0.3"

images/linux/scripts/installers/1804/go.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-################################################################################
-##  File:  go.sh
-##  Desc:  Installs go, configures GOROOT, and adds go to the path
-################################################################################
-
-# Source the helpers for use with the script
-source $HELPER_SCRIPTS/document.sh
-
-# This function installs Go using the specified arguments:
-#   $1=MajorVersion (1.11)
-#   $2=MajorAndMinorVersion (1.11.1)
-#   $3=IsDefaultVersion (true or false)
-function InstallGo () {
-    curl -sL https://dl.google.com/go/go$2.linux-amd64.tar.gz -o go$2.linux-amd64.tar.gz
-    mkdir -p /usr/local/go$1
-    tar -C /usr/local/go$1 -xzf go$2.linux-amd64.tar.gz --strip-components=1 go
-    rm go$2.linux-amd64.tar.gz
-    echo "GOROOT_${1//./_}_X64=/usr/local/go$1" | tee -a /etc/environment
-    DocumentInstalledItem "Go $1 ($(/usr/local/go$1/bin/go version))"
-
-    # If this version of Go is to be the default version,
-    # symlink it into the path and point GOROOT to it.
-    if [ $3 = true ]
-    then
-        ln -s /usr/local/go$1/bin/* /usr/bin/
-        echo "GOROOT=/usr/local/go$1" | tee -a /etc/environment
-    fi
-}
-
-# Install Go versions
-InstallGo 1.11 1.11.12 false
-InstallGo 1.12 1.12.7 true
-InstallGo 1.13 1.13 false

images/linux/scripts/installers/1804/kubernetes-tools.sh

@@ -19,7 +19,7 @@ apt-get update
 apt-get install -y kubectl
 
 # Install Helm
-curl -L https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash
+curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
 
 # Run tests to determine that the software installed as expected
 echo "Testing to make sure that script performed as expected, and basic scenarios work"

images/linux/scripts/installers/1804/powershellcore.sh

@@ -1,31 +0,0 @@
-#!/bin/bash
-################################################################################
-##  File:  powershellcore.sh
-##  Desc:  Installs powershellcore
-################################################################################
-
-# Source the helpers for use with the script
-source $HELPER_SCRIPTS/document.sh
-
-# libicu64, which comes with php-intl module, has powershell breaking issue https://github.com/PowerShell/PowerShell/issues/9746
-# Fix - install additional libicu65 where the issue is fixed
-echo "install libicu65"
-apt get install libicu65
-
-# Install Powershell
-apt-get install -y powershell
-
-# Run tests to determine that the software installed as expected
-echo "Testing to make sure that script performed as expected, and basic scenarios work"
-if ! command -v pwsh; then
-    echo "pwsh was not installed"
-    exit 1
-fi
-if ! pwsh -c 'Write-Host Hello world'; then
-    echo "pwsh failed to run"
-    exit 1
-fi
-
-# Document what was added to the image
-echo "Lastly, documenting what we added to the metadata file"
-DocumentInstalledItem "Powershell ($(pwsh --version))"

images/linux/scripts/installers/bazel.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 ################################################################################
 ##  File:  bazel.sh
-##  Desc:  Installs bazel
+##  Desc:  Installs Bazel and Bazelisk (A user-friendly launcher for Bazel)
 ################################################################################
 
 # Source the helpers for use with the script
@@ -13,6 +13,9 @@ echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" |
 apt-get update -y
 apt-get install -y bazel
 
+# Install bazelisk
+npm install -g @bazel/bazelisk
+
 # 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 bazel; then
@@ -20,6 +23,14 @@ if ! command -v bazel; then
     exit 1
 fi
 
+if ! command -v bazelisk; then
+    echo "Bazelisk was not installed"
+    exit 1
+fi
+
 # Document what was added to the image
+bazelisk_version="$(bazelisk version 2>null | grep "Bazelisk version:" | cut -d "v" -f 3)"
+
 echo "Lastly, documenting what we added to the metadata file"
-DocumentInstalledItem "Bazel ($(bazel version))"
+DocumentInstalledItem "Bazel ($(bazel --version))"
+DocumentInstalledItem "Bazelisk ($bazelisk_version)"

images/linux/scripts/installers/clang.sh

@@ -18,6 +18,7 @@ function InstallClang {
         apt-get install -y "clang-$version" "lldb-$version" "lld-$version"
     else
         ./llvm.sh $version
+        apt-get install -y "clang-format-$version"
     fi
 
     # Run tests to determine that the software installed as expected
@@ -59,3 +60,4 @@ rm llvm.sh
 # Make Clang 9 default
 update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-9 100
 update-alternatives --install /usr/bin/clang clang /usr/bin/clang-9 100
+update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-9 100

images/linux/scripts/installers/docker-compose.sh

@@ -7,7 +7,7 @@
 source $HELPER_SCRIPTS/apt.sh
 source $HELPER_SCRIPTS/document.sh
 
-version="1.22.0"
+version="1.25.4"
 
 # Install latest docker-compose from releases
 curl -L "https://github.com/docker/compose/releases/download/$version/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose

images/linux/scripts/installers/firefox.sh

@@ -49,5 +49,5 @@ if ! command -v geckodriver; then
 fi
 
 echo "Lastly, documenting what we added to the metadata file"
-ver=`./geckodriver --version|head -1|awk '{print $2}'`
+ver=`geckodriver --version | head -1 |awk '{print $2}'`
 DocumentInstalledItem "Geckodriver (${ver}); Gecko Driver is available via GECKOWEBDRIVER environment variable"

images/linux/scripts/installers/go.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+################################################################################
+##  File:  go.sh
+##  Desc:  Installs go, configures GOROOT, and adds go to the path
+################################################################################
+
+# Source the helpers for use with the script
+source $HELPER_SCRIPTS/document.sh
+golangTags="/tmp/golang_tags.json"
+
+# This function installs Go using the specified arguments:
+#   $1=MajorVersion (1.11)
+#   $2=IsDefaultVersion (true or false)
+function InstallGo () {
+    version=$( getFullGoVersion $1 )
+    downloadVersion=$version.linux-amd64.tar.gz
+    goFolder=/usr/local/go$1
+
+    echo "Install Go $version"
+    curl -sL https://dl.google.com/go/${downloadVersion} -o ${downloadVersion}
+    mkdir -p $goFolder
+    tar -C $goFolder -xzf $downloadVersion --strip-components=1 go
+    rm $downloadVersion
+    echo "GOROOT_${1//./_}_X64=$goFolder" | tee -a /etc/environment
+    DocumentInstalledItem "Go $1 ($($goFolder/bin/go version))"
+
+    # If this version of Go is to be the default version,
+    # symlink it into the path and point GOROOT to it.
+    if [ $2 = true ]
+    then
+        ln -s $goFolder/bin/* /usr/bin/
+        echo "GOROOT=$goFolder" | tee -a /etc/environment
+    fi
+}
+
+function getFullGoVersion () {
+    local pattern="refs/tags/go$1([.0-9]{0,3})$"
+    local query='[.[] | select( .ref | test($pattern))] | .[-1] | .ref'
+    refValue=$(jq --arg pattern "$pattern" "$query" $golangTags)
+    version=$(echo "$refValue" | cut -d '/' -f 3)
+    version=$(echo "${version//\"}") # go1.12.17
+    echo $version
+}
+
+# load golang_tags.json file
+curl -s 'https://api.github.com/repos/golang/go/git/refs/tags' >> $golangTags
+# Install Go versions
+for go in ${GO_VERSIONS}; do
+    echo "Installing Go ${go}"
+    if [[ $go == $GO_DEFAULT ]]; then
+        InstallGo $go true
+    else
+        InstallGo $go false
+    fi
+done

images/linux/scripts/installers/google-chrome.sh

@@ -56,4 +56,4 @@ if ! command -v chromedriver; then
 fi
 
 echo "Lastly, documenting what we added to the metadata file"
-DocumentInstalledItem "Chromedriver ($(chromedriver --version)); Chrome Driver is available via CHROMEWEBDRIVER environment variable"
+DocumentInstalledItem "$(chromedriver --version); Chrome Driver is available via CHROMEWEBDRIVER environment variable"

images/linux/scripts/installers/haskell.sh

@@ -25,6 +25,7 @@ apt-get install -y \
     ghc-8.6.5 \
     ghc-8.8.1 \
     ghc-8.8.2 \
+    ghc-8.8.3 \
     cabal-install-2.0 \
     cabal-install-2.2 \
     cabal-install-2.4 \
@@ -36,7 +37,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; 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; do
     if ! command -v /opt/ghc/$version/bin/ghc; then
         echo "ghc $version was not installed"
         exit 1
@@ -59,7 +60,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; 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; do
     DocumentInstalledItem "GHC ($(/opt/ghc/$version/bin/ghc --version))"
 done
 DocumentInstalledItem "Haskell Stack ($(stack --version))"

images/linux/scripts/installers/mysql.sh

@@ -44,3 +44,7 @@ echo "Lastly, documenting what we added to the metadata file"
 DocumentInstalledItem "MySQL ($(mysql --version))"
 DocumentInstalledItem "MySQL Server (user:root password:root)"
 DocumentInstalledItem "MS SQL Server Client Tools"
+
+# Disable mysql.service
+systemctl is-active --quiet mysql.service && systemctl stop mysql.service 
+systemctl disable mysql.service 

images/linux/scripts/installers/packer.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+################################################################################
+##  File:  packer.sh
+##  Desc:  Installs packer
+################################################################################
+# Source the helpers for use with the script
+source $HELPER_SCRIPTS/document.sh
+source $HELPER_SCRIPTS/apt.sh
+
+# Install Packer
+PACKER_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | jq -r .current_version)
+curl -LO "https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip"
+unzip "packer_${PACKER_VERSION}_linux_amd64.zip" -d /usr/local/bin
+rm -f "packer_${PACKER_VERSION}_linux_amd64.zip"
+
+# 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 packer; then
+    echo "Packer was not installed or found on PATH"
+    exit 1
+fi
+
+# Document what was added to the image
+echo "Lastly, documenting what we added to the metadata file"
+DocumentInstalledItem "Packer ($(packer --version))"

images/linux/scripts/installers/preimagedata.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+imagedata_file=$IMAGEDATA_FILE
+image_version=$IMAGE_VERSION
+os_name=$(lsb_release -ds | sed "s/ /\\\n/g")
+image_label="ubuntu-$(lsb_release -rs)"
+github_url="https://github.com/actions/virtual-environments/blob"
+
+if [[ "$image_label" =~ "ubuntu-18" ]]; then
+    software_url="${github_url}/ubuntu18/${image_version}/images/linux/Ubuntu1804-README.md"
+fi
+
+if [[ "$image_label" =~ "ubuntu-16" ]]; then
+    software_url="${github_url}/ubuntu16/${image_version}/images/linux/Ubuntu1604-README.md"
+fi
+
+cat <<EOF > $imagedata_file
+[
+  {
+    "group": "Operating System",
+    "detail": "${os_name}"
+  },
+  {
+    "group": "Virtual Environment",
+    "detail": "Environment: ${image_label}\nVersion: ${image_version}\nIncluded Software: ${software_url}"
+  }
+]
+EOF

images/linux/ubuntu1604.json

@@ -15,6 +15,7 @@
         "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}",
         "image_folder": "/imagegeneration",
         "commit_file": "/imagegeneration/commit.txt",
+        "imagedata_file": "/imagegeneration/imagedata.json",
         "metadata_file": "/imagegeneration/metadatafile",
         "installer_script_folder": "/imagegeneration/installers",
         "helper_script_folder": "/imagegeneration/helpers",
@@ -22,7 +23,9 @@
         "capture_name_prefix": "packer",
         "image_version": "dev",
         "image_os": "ubuntu16",
-        "github_feed_token": null
+        "github_feed_token": null,
+        "go_default": "1.14",
+        "go_versions": "1.11 1.12 1.13 1.14"
     },
     "sensitive-variables": ["client_secret", "github_feed_token"],
     "builders": [
@@ -107,6 +110,17 @@
             ],
             "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
         },
+        {
+            "type": "shell",
+            "scripts":[
+                "{{template_dir}}/scripts/installers/preimagedata.sh"
+            ],
+            "environment_vars": [
+                "IMAGE_VERSION={{user `image_version`}}",
+                "IMAGEDATA_FILE={{user `imagedata_file`}}"
+            ],
+            "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
+        },
         {
             "type": "shell",
             "inline": [
@@ -123,7 +137,6 @@
                 "{{template_dir}}/scripts/installers/azcopy.sh",
                 "{{template_dir}}/scripts/installers/azure-cli.sh",
                 "{{template_dir}}/scripts/installers/azure-devops-cli.sh",
-                "{{template_dir}}/scripts/installers/bazel.sh",
                 "{{template_dir}}/scripts/installers/1604/basic.sh",
                 "{{template_dir}}/scripts/installers/aws.sh",
                 "{{template_dir}}/scripts/installers/build-essential.sh",
@@ -137,7 +150,6 @@
                 "{{template_dir}}/scripts/installers/gcc.sh",
                 "{{template_dir}}/scripts/installers/gfortran.sh",
                 "{{template_dir}}/scripts/installers/git.sh",
-                "{{template_dir}}/scripts/installers/1604/go.sh",
                 "{{template_dir}}/scripts/installers/google-chrome.sh",
                 "{{template_dir}}/scripts/installers/google-cloud-sdk.sh",
                 "{{template_dir}}/scripts/installers/haskell.sh",
@@ -153,11 +165,12 @@
                 "{{template_dir}}/scripts/installers/mono.sh",
                 "{{template_dir}}/scripts/installers/mysql.sh",
                 "{{template_dir}}/scripts/installers/nodejs.sh",
+                "{{template_dir}}/scripts/installers/bazel.sh",
                 "{{template_dir}}/scripts/installers/phantomjs.sh",
                 "{{template_dir}}/scripts/installers/1604/php.sh",
                 "{{template_dir}}/scripts/installers/pollinate.sh",
                 "{{template_dir}}/scripts/installers/postgresql.sh",
-                "{{template_dir}}/scripts/installers/1604/powershellcore.sh",
+                "{{template_dir}}/scripts/installers/powershellcore.sh",
                 "{{template_dir}}/scripts/installers/ruby.sh",
                 "{{template_dir}}/scripts/installers/rust.sh",
                 "{{template_dir}}/scripts/installers/julia.sh",
@@ -166,6 +179,7 @@
                 "{{template_dir}}/scripts/installers/sphinx.sh",
                 "{{template_dir}}/scripts/installers/subversion.sh",
                 "{{template_dir}}/scripts/installers/terraform.sh",
+                "{{template_dir}}/scripts/installers/packer.sh",
                 "{{template_dir}}/scripts/installers/vcpkg.sh",
                 "{{template_dir}}/scripts/installers/zeit-now.sh",
                 "{{template_dir}}/scripts/installers/updatepath.sh",
@@ -179,6 +193,19 @@
             ],
             "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
         },
+        {
+            "type": "shell",
+            "scripts": [
+                "{{template_dir}}/scripts/installers/go.sh"
+            ],
+            "environment_vars": [
+                "METADATA_FILE={{user `metadata_file`}}",
+                "HELPER_SCRIPTS={{user `helper_script_folder`}}",
+                "GO_VERSIONS={{user `go_versions`}}",
+                "GO_DEFAULT={{user `go_default`}}"
+            ],
+            "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}"
+        },
         {
             "type": "file",
             "source": "{{template_dir}}/toolcache-1604.json",

images/linux/ubuntu1804.json

@@ -15,6 +15,7 @@
         "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}",
         "image_folder": "/imagegeneration",
         "commit_file": "/imagegeneration/commit.txt",
+        "imagedata_file": "/imagegeneration/imagedata.json",
         "metadata_file": "/imagegeneration/metadatafile",
         "installer_script_folder": "/imagegeneration/installers",
         "helper_script_folder": "/imagegeneration/helpers",
@@ -22,7 +23,9 @@
         "capture_name_prefix": "packer",
         "image_version": "dev",
         "image_os": "ubuntu18",
-        "github_feed_token": null
+        "github_feed_token": null,
+        "go_default": "1.14",
+        "go_versions": "1.11 1.12 1.13 1.14"
     },
     "sensitive-variables": ["client_secret", "github_feed_token"],
     "builders": [
@@ -110,6 +113,17 @@
             ],
             "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
         },
+        {
+            "type": "shell",
+            "scripts":[
+                "{{template_dir}}/scripts/installers/preimagedata.sh"
+            ],
+            "environment_vars": [
+                "IMAGE_VERSION={{user `image_version`}}",
+                "IMAGEDATA_FILE={{user `imagedata_file`}}"
+            ],
+            "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
+        },
         {
             "type": "shell",
             "inline": [
@@ -126,7 +140,6 @@
                 "{{template_dir}}/scripts/installers/azcopy.sh",
                 "{{template_dir}}/scripts/installers/azure-cli.sh",
                 "{{template_dir}}/scripts/installers/azure-devops-cli.sh",
-                "{{template_dir}}/scripts/installers/bazel.sh",
                 "{{template_dir}}/scripts/installers/1804/basic.sh",
                 "{{template_dir}}/scripts/installers/aws.sh",
                 "{{template_dir}}/scripts/installers/build-essential.sh",
@@ -140,7 +153,6 @@
                 "{{template_dir}}/scripts/installers/gcc.sh",
                 "{{template_dir}}/scripts/installers/gfortran.sh",
                 "{{template_dir}}/scripts/installers/git.sh",
-                "{{template_dir}}/scripts/installers/1804/go.sh",
                 "{{template_dir}}/scripts/installers/google-chrome.sh",
                 "{{template_dir}}/scripts/installers/google-cloud-sdk.sh",
                 "{{template_dir}}/scripts/installers/haskell.sh",
@@ -156,11 +168,12 @@
                 "{{template_dir}}/scripts/installers/mono.sh",
                 "{{template_dir}}/scripts/installers/mysql.sh",
                 "{{template_dir}}/scripts/installers/nodejs.sh",
+                "{{template_dir}}/scripts/installers/bazel.sh",
                 "{{template_dir}}/scripts/installers/phantomjs.sh",
                 "{{template_dir}}/scripts/installers/1804/php.sh",
                 "{{template_dir}}/scripts/installers/pollinate.sh",
                 "{{template_dir}}/scripts/installers/postgresql.sh",
-                "{{template_dir}}/scripts/installers/1804/powershellcore.sh",
+                "{{template_dir}}/scripts/installers/powershellcore.sh",
                 "{{template_dir}}/scripts/installers/ruby.sh",
                 "{{template_dir}}/scripts/installers/rust.sh",
                 "{{template_dir}}/scripts/installers/julia.sh",
@@ -169,6 +182,7 @@
                 "{{template_dir}}/scripts/installers/sphinx.sh",
                 "{{template_dir}}/scripts/installers/subversion.sh",
                 "{{template_dir}}/scripts/installers/terraform.sh",
+                "{{template_dir}}/scripts/installers/packer.sh",
                 "{{template_dir}}/scripts/installers/vcpkg.sh",
                 "{{template_dir}}/scripts/installers/zeit-now.sh",
                 "{{template_dir}}/scripts/installers/updatepath.sh",
@@ -181,6 +195,19 @@
             ],
             "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
         },
+        {
+            "type": "shell",
+            "scripts": [
+                "{{template_dir}}/scripts/installers/go.sh"
+            ],
+            "environment_vars": [
+                "METADATA_FILE={{user `metadata_file`}}",
+                "HELPER_SCRIPTS={{user `helper_script_folder`}}",
+                "GO_VERSIONS={{user `go_versions`}}",
+                "GO_DEFAULT={{user `go_default`}}"
+            ],
+            "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}"
+        },
         {
             "type": "file",
             "source": "{{template_dir}}/toolcache-1804.json",

images/macos/macos-10.15-Readme.md

@@ -13,7 +13,7 @@ The following software is installed on machines with the 20200224.1 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.0
+- Rust 1.41.1
 - 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
@@ -25,28 +25,29 @@ The following software is installed on machines with the 20200224.1 update.
 - PowerShell 6.2.4
 - Python 2.7.17
 - Python 3.7.6
-- Ruby 2.7.0p0
+- 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
-- Go 1.13.8
+- Go 1.14
 - PHP 7.4.3
 
 ### Package Management
 - Rustup 1.21.1
 - Bundler version 2.1.4
 - Carthage 0.34.0
-- CocoaPods 1.8.4
+- CocoaPods 1.9.0
 - Homebrew 2.2.6
 - NPM 6.13.4
 - Yarn 1.22.0
-- NuGet 5.3.1.6268
+- NuGet 5.4.0.6315
 - Pip 19.3.1 (python 2.7)
 - Pip 19.3.1 (python 3.7)
 - Miniconda 4.7.12
 - RubyGems 3.1.2
+- Vcpkg 2020.02.04
 
 ### Project Management
 - Apache Maven 3.6.3
-- Gradle 6.2
+- Gradle 6.2.1
 
 ### Utilities
 - Curl 7.68.0
@@ -61,6 +62,7 @@ The following software is installed on machines with the 20200224.1 update.
 - psql (PostgreSQL) 12.2
 - aria2 1.35.0
 - azcopy 10.3.4
+- zstd 1.4.4
 
 ### Tools
 - Fastlane 2.142.0
@@ -71,8 +73,8 @@ The following software is installed on machines with the 20200224.1 update.
 ### Browsers
 - Google Chrome 80.0.3987.122
 - ChromeDriver 80.0.3987.106
-- Microsoft Edge 80.0.361.57
+- Microsoft Edge 80.0.361.62
-- MSEdgeDriver 80.0.361.57
+- MSEdgeDriver 80.0.361.62
 - Mozilla Firefox 73.0.1
 - geckodriver 0.26.0
 
@@ -88,7 +90,7 @@ The following software is installed on machines with the 20200224.1 update.
 - 3.5.9
 - 3.6.10
 - 3.7.6
-- 3.8.1
+- 3.8.2
 
 #### PyPy
 - 2.7.17
@@ -96,20 +98,20 @@ The following software is installed on machines with the 20200224.1 update.
 
 ### Xamarin
 #### Visual Studio for Mac
-- 8.4.6.36
+- 8.4.7.17
 
 #### Mono
-- 6.6.0.155
+- 6.6.0.166
 - 6.4.0.208
 
 #### Xamarin.iOS
-- 13.10.0.17
+- 13.10.0.21
 - 13.8.3.0
 - 13.6.0.12
 - 13.4.0.2
 
 #### Xamarin.Mac
-- 6.10.0.17
+- 6.10.0.21
 - 6.8.3.0
 - 6.6.0.12
 - 6.4.0.2
@@ -122,15 +124,15 @@ The following software is installed on machines with the 20200224.1 update.
 - NUnit 3.6.1
 
 ### Xcode
-| Version                           | Build                             | Path                              |
+| Version          | Build   | Path                              |
-| --------------------------------- | --------------------------------- | --------------------------------- |
+| ---------------- | ------- | --------------------------------- |
-| 11.4 (beta)                       | 11N123k                           | /Applications/Xcode_11.4_beta.app |
+| 11.4 (beta)      | 11N123k | /Applications/Xcode_11.4_beta.app |
-| 11.3.1 (default)                  | 11C505                            | /Applications/Xcode_11.3.1.app    |
+| 11.3.1 (default) | 11C505  | /Applications/Xcode_11.3.1.app    |
-| 11.3                              | 11C29                             | /Applications/Xcode_11.3.app      |
+| 11.3             | 11C29   | /Applications/Xcode_11.3.app      |
-| 11.2.1                            | 11B500                            | /Applications/Xcode_11.2.1.app    |
+| 11.2.1           | 11B500  | /Applications/Xcode_11.2.1.app    |
-| 11.2                              | 11B52                             | /Applications/Xcode_11.2.app      |
+| 11.2             | 11B52   | /Applications/Xcode_11.2.app      |
-| 11.1                              | 11A1027                           | /Applications/Xcode_11.1.app      |
+| 11.1             | 11A1027 | /Applications/Xcode_11.1.app      |
-| 11.0                              | 11A420a                           | /Applications/Xcode_11.app        |
+| 11.0             | 11A420a | /Applications/Xcode_11.app        |
 
 #### Xcode Support Tools
 - Nomad CLI 3.1.2
@@ -140,46 +142,46 @@ The following software is installed on machines with the 20200224.1 update.
 - xcversion 2.6.3
 
 #### Installed SDKs
-| SDK                                          | SDK Name                                     | Xcode Version                                |
+| SDK                     | SDK Name             | Xcode Version                                |
-| -------------------------------------------- | -------------------------------------------- | -------------------------------------------- |
+| ----------------------- | -------------------- | -------------------------------------------- |
-| macOS 10.15                                  | macosx10.15                                  | 11.0, 11.1, 11.2, 11.2.1, 11.3, 11.3.1, 11.4 |
+| macOS 10.15             | macosx10.15          | 11.0, 11.1, 11.2, 11.2.1, 11.3, 11.3.1, 11.4 |
-| iOS 13.0                                     | iphoneos13.0                                 | 11.0                                         |
+| iOS 13.0                | iphoneos13.0         | 11.0                                         |
-| iOS 13.1                                     | iphoneos13.1                                 | 11.1                                         |
+| iOS 13.1                | iphoneos13.1         | 11.1                                         |
-| iOS 13.2                                     | iphoneos13.2                                 | 11.2, 11.2.1, 11.3, 11.3.1                   |
+| iOS 13.2                | iphoneos13.2         | 11.2, 11.2.1, 11.3, 11.3.1                   |
-| iOS 13.4                                     | iphoneos13.4                                 | 11.4                                         |
+| iOS 13.4                | iphoneos13.4         | 11.4                                         |
-| Simulator - iOS 13.0                         | iphonesimulator13.0                          | 11.0                                         |
+| Simulator - iOS 13.0    | iphonesimulator13.0  | 11.0                                         |
-| Simulator - iOS 13.1                         | iphonesimulator13.1                          | 11.1                                         |
+| Simulator - iOS 13.1    | iphonesimulator13.1  | 11.1                                         |
-| Simulator - iOS 13.2                         | iphonesimulator13.2                          | 11.2, 11.2.1, 11.3, 11.3.1                   |
+| Simulator - iOS 13.2    | iphonesimulator13.2  | 11.2, 11.2.1, 11.3, 11.3.1                   |
-| Simulator - iOS 13.4                         | iphonesimulator13.4                          | 11.4                                         |
+| Simulator - iOS 13.4    | iphonesimulator13.4  | 11.4                                         |
-| tvOS 13.0                                    | appletvos13.0                                | 11.0, 11.1                                   |
+| tvOS 13.0               | appletvos13.0        | 11.0, 11.1                                   |
-| tvOS 13.2                                    | appletvos13.2                                | 11.2, 11.2.1, 11.3, 11.3.1                   |
+| tvOS 13.2               | appletvos13.2        | 11.2, 11.2.1, 11.3, 11.3.1                   |
-| tvOS 13.4                                    | appletvos13.4                                | 11.4                                         |
+| tvOS 13.4               | appletvos13.4        | 11.4                                         |
-| Simulator - tvOS 13.0                        | appletvsimulator13.0                         | 11.0, 11.1                                   |
+| Simulator - tvOS 13.0   | appletvsimulator13.0 | 11.0, 11.1                                   |
-| Simulator - tvOS 13.2                        | appletvsimulator13.2                         | 11.2, 11.2.1, 11.3, 11.3.1                   |
+| Simulator - tvOS 13.2   | appletvsimulator13.2 | 11.2, 11.2.1, 11.3, 11.3.1                   |
-| Simulator - tvOS 13.4                        | appletvsimulator13.4                         | 11.4                                         |
+| Simulator - tvOS 13.4   | appletvsimulator13.4 | 11.4                                         |
-| watchOS 6.0                                  | watchos6.0                                   | 11.0, 11.1                                   |
+| watchOS 6.0             | watchos6.0           | 11.0, 11.1                                   |
-| watchOS 6.1                                  | watchos6.1                                   | 11.2, 11.2.1, 11.3, 11.3.1                   |
+| watchOS 6.1             | watchos6.1           | 11.2, 11.2.1, 11.3, 11.3.1                   |
-| watchOS 6.2                                  | watchos6.2                                   | 11.4                                         |
+| watchOS 6.2             | watchos6.2           | 11.4                                         |
-| Simulator - watchOS 6.0                      | watchsimulator6.0                            | 11.0, 11.1                                   |
+| Simulator - watchOS 6.0 | watchsimulator6.0    | 11.0, 11.1                                   |
-| Simulator - watchOS 6.1                      | watchsimulator6.1                            | 11.2, 11.2.1, 11.3, 11.3.1                   |
+| Simulator - watchOS 6.1 | watchsimulator6.1    | 11.2, 11.2.1, 11.3, 11.3.1                   |
-| Simulator - watchOS 6.2                      | watchsimulator6.2                            | 11.4                                         |
+| Simulator - watchOS 6.2 | watchsimulator6.2    | 11.4                                         |
-| DriverKit 19.0                               | driverkit.macosx19.0                         | 11.0, 11.1, 11.2, 11.2.1, 11.3, 11.3.1, 11.4 |
+| 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                                                                                                                                                                                                               |
+| 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.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.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.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.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) |
+| 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.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.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.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)                                                                                                                                                                        |
+| 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.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.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                                                                                                 |
+| 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
@@ -188,71 +190,71 @@ The following software is installed on machines with the 20200224.1 update.
 | tools                              | Android SDK Tools, Revision 26.1.1 |
 
 #### Android SDK Platform-Tools
-| Package Name                                | Description                                 |
+| Package Name   | Description                                 |
-| ------------------------------------------- | ------------------------------------------- |
+| -------------- | ------------------------------------------- |
-| platform-tools                              | Android SDK Platform-Tools, Revision 29.0.6 |
+| platform-tools | Android SDK Platform-Tools, Revision 29.0.6 |
 
 #### Android SDK Platforms
-| Package Name                        | Description                         |
+| Package Name | Description                         |
-| ----------------------------------- | ----------------------------------- |
+| ------------ | ----------------------------------- |
-| android-24                          | Android SDK Platform 24, Revision 2 |
+| android-24   | Android SDK Platform 24, Revision 2 |
-| android-25                          | Android SDK Platform 25, Revision 3 |
+| android-25   | Android SDK Platform 25, Revision 3 |
-| android-26                          | Android SDK Platform 26, Revision 2 |
+| android-26   | Android SDK Platform 26, Revision 2 |
-| android-27                          | Android SDK Platform 27, Revision 3 |
+| android-27   | Android SDK Platform 27, Revision 3 |
-| android-28                          | Android SDK Platform 28, Revision 6 |
+| android-28   | Android SDK Platform 28, Revision 6 |
-| android-29                          | Android SDK Platform 29, Revision 4 |
+| android-29   | Android SDK Platform 29, Revision 4 |
 
 #### Android SDK Build-Tools
-| Package Name                                 | Description                                  |
+| Package Name           | Description                                  |
-| -------------------------------------------- | -------------------------------------------- |
+| ---------------------- | -------------------------------------------- |
-| build-tools-24.0.0                           | Android SDK Build-Tools, Revision 24.0.0     |
+| build-tools-24.0.0     | Android SDK Build-Tools, Revision 24.0.0     |
-| build-tools-24.0.1                           | Android SDK Build-Tools, Revision 24.0.1     |
+| build-tools-24.0.1     | Android SDK Build-Tools, Revision 24.0.1     |
-| build-tools-24.0.2                           | Android SDK Build-Tools, Revision 24.0.2     |
+| build-tools-24.0.2     | Android SDK Build-Tools, Revision 24.0.2     |
-| build-tools-24.0.3                           | Android SDK Build-Tools, Revision 24.0.3     |
+| build-tools-24.0.3     | Android SDK Build-Tools, Revision 24.0.3     |
-| build-tools-25.0.0                           | Android SDK Build-Tools, Revision 25.0.0     |
+| build-tools-25.0.0     | Android SDK Build-Tools, Revision 25.0.0     |
-| build-tools-25.0.1                           | Android SDK Build-Tools, Revision 25.0.1     |
+| build-tools-25.0.1     | Android SDK Build-Tools, Revision 25.0.1     |
-| build-tools-25.0.2                           | Android SDK Build-Tools, Revision 25.0.2     |
+| build-tools-25.0.2     | Android SDK Build-Tools, Revision 25.0.2     |
-| build-tools-25.0.3                           | Android SDK Build-Tools, Revision 25.0.3     |
+| build-tools-25.0.3     | Android SDK Build-Tools, Revision 25.0.3     |
-| build-tools-26.0.0                           | Android SDK Build-Tools, Revision 26.0.0     |
+| build-tools-26.0.0     | Android SDK Build-Tools, Revision 26.0.0     |
-| build-tools-26.0.1                           | Android SDK Build-Tools, Revision 26.0.1     |
+| build-tools-26.0.1     | Android SDK Build-Tools, Revision 26.0.1     |
-| build-tools-26.0.2                           | Android SDK Build-Tools, Revision 26.0.2     |
+| build-tools-26.0.2     | Android SDK Build-Tools, Revision 26.0.2     |
-| build-tools-26.0.3                           | Android SDK Build-Tools, Revision 26.0.3     |
+| build-tools-26.0.3     | Android SDK Build-Tools, Revision 26.0.3     |
-| build-tools-27.0.0                           | Android SDK Build-Tools, Revision 27.0.0     |
+| build-tools-27.0.0     | Android SDK Build-Tools, Revision 27.0.0     |
-| build-tools-27.0.1                           | Android SDK Build-Tools, Revision 27.0.1     |
+| build-tools-27.0.1     | Android SDK Build-Tools, Revision 27.0.1     |
-| build-tools-27.0.2                           | Android SDK Build-Tools, Revision 27.0.2     |
+| build-tools-27.0.2     | Android SDK Build-Tools, Revision 27.0.2     |
-| build-tools-27.0.3                           | Android SDK Build-Tools, Revision 27.0.3     |
+| build-tools-27.0.3     | Android SDK Build-Tools, Revision 27.0.3     |
-| build-tools-28.0.0                           | Android SDK Build-Tools, Revision 28.0.0     |
+| build-tools-28.0.0     | Android SDK Build-Tools, Revision 28.0.0     |
-| build-tools-28.0.1                           | Android SDK Build-Tools, Revision 28.0.1     |
+| build-tools-28.0.1     | Android SDK Build-Tools, Revision 28.0.1     |
-| build-tools-28.0.2                           | Android SDK Build-Tools, Revision 28.0.2     |
+| build-tools-28.0.2     | Android SDK Build-Tools, Revision 28.0.2     |
-| build-tools-28.0.3                           | Android SDK Build-Tools, Revision 28.0.3     |
+| build-tools-28.0.3     | Android SDK Build-Tools, Revision 28.0.3     |
-| build-tools-29.0.0                           | Android SDK Build-Tools, Revision 29.0.0     |
+| build-tools-29.0.0     | Android SDK Build-Tools, Revision 29.0.0     |
-| build-tools-29.0.1                           | Android SDK Build-Tools, Revision 29.0.1     |
+| build-tools-29.0.1     | Android SDK Build-Tools, Revision 29.0.1     |
-| build-tools-29.0.2                           | Android SDK Build-Tools, Revision 29.0.2     |
+| build-tools-29.0.2     | Android SDK Build-Tools, Revision 29.0.2     |
-| build-tools-29.0.3                           | Android SDK Build-Tools, Revision 29.0.3     |
+| build-tools-29.0.3     | Android SDK Build-Tools, Revision 29.0.3     |
-| build-tools-30.0.0-rc1                       | Android SDK Build-Tools, Revision 30.0.0 rc1 |
+| build-tools-30.0.0-rc1 | Android SDK Build-Tools, Revision 30.0.0 rc1 |
 
 #### Android Utils
-| Package Name     | Version          |
+| Package Name     | Version      |
-| ---------------- | ---------------- |
+| ---------------- | ------------ |
-| cmake            | 3.6.4111459      |
+| cmake            | 3.6.4111459  |
-| lldb             | 3.1.4508709      |
+| lldb             | 3.1.4508709  |
-| ndk-bundle       | 18.1.5063045     |
+| ndk-bundle       | 18.1.5063045 |
-| Android Emulator | 30.0.0           |
+| Android Emulator | 30.0.0       |
 
 #### Android Google APIs
-| Package Name                | Description                 |
+| Package Name                | Description             |
-| --------------------------- | --------------------------- |
+| --------------------------- | ----------------------- |
-| addon-google_apis-google-21 | Google APIs, Revision 1     |
+| addon-google_apis-google-21 | Google APIs, Revision 1 |
-| addon-google_apis-google-22 | Google APIs, Revision 1     |
+| addon-google_apis-google-22 | Google APIs, Revision 1 |
-| addon-google_apis-google-23 | Google APIs, Revision 1     |
+| addon-google_apis-google-23 | Google APIs, Revision 1 |
-| addon-google_apis-google-24 | Google APIs, Revision 1     |
+| addon-google_apis-google-24 | Google APIs, Revision 1 |
 
 #### Extra Packages
-| Package Name                                    | Version                                         |
+| Package Name                                    | Version |
-| ----------------------------------------------- | ----------------------------------------------- |
+| ----------------------------------------------- | ------- |
-| Android Support Repository                      | 47.0.0                                          |
+| Android Support Repository                      | 47.0.0  |
-| Google Play services                            | 49                                              |
+| Google Play services                            | 49      |
-| Google Repository                               | 58                                              |
+| Google Repository                               | 58      |
-| Intel x86 Emulator Accelerator (HAXM installer) | 7.5.1                                           |
+| Intel x86 Emulator Accelerator (HAXM installer) | 7.5.1   |
 
 

images/win/Windows2016-Azure.json

@@ -19,6 +19,7 @@
         "root_folder": "C:",
         "image_folder": "C:\\image",
         "commit_file": "C:\\image\\commit.txt",
+        "imagedata_file": "C:\\imagedata.json",
         "metadata_file": "C:\\image\\metadata.txt",
         "helper_script_folder": "C:\\Program Files\\WindowsPowerShell\\Modules\\",
         "commit_url": "LATEST",
@@ -120,6 +121,16 @@
               "setx ImageOS {{user `image_os` }} /m"
             ]
         },
+        {
+            "type": "powershell",
+            "environment_vars": [
+                "IMAGE_VERSION={{user `image_version`}}",
+                "IMAGEDATA_FILE={{user `imagedata_file`}}"
+            ],
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1"
+            ]
+        },
         {
             "type": "powershell",
             "scripts":[
@@ -277,11 +288,23 @@
                 "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1"
             ]
         },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1"
+            ]
+        },
         {
             "type": "powershell",
             "scripts":[
                 "{{ template_dir }}/scripts/Installers/Install-7zip.ps1"
             ]
+        },
+          {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-Packer.ps1"
+            ]
         },
         {
             "type": "file",
@@ -304,6 +327,12 @@
                 "{{ template_dir }}/scripts/Installers/Windows2016/Install-Python.ps1"
             ]
         },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-Perl.ps1"
+            ]
+        },
         {
             "type": "powershell",
             "scripts":[
@@ -383,7 +412,7 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-SeleniumWebDrivers.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1"
             ]
         },
         {
@@ -522,12 +551,6 @@
                 "{{ template_dir }}/scripts/Installers/Install-InnoSetup.ps1"
             ]
         },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Perl.ps1"
-            ]
-        },
         {
             "type": "powershell",
             "scripts":[
@@ -570,12 +593,6 @@
                 "{{ template_dir }}/scripts/Installers/Install-Kind.ps1"
             ]
         },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1"
-            ]
-        },
         {
             "type": "windows-restart",
             "restart_timeout": "30m"
@@ -619,6 +636,12 @@
                 "{{ template_dir }}/scripts/Installers/Validate-Python.ps1"
             ]
         },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Validate-Perl.ps1"
+            ]
+        },
         {
             "type": "powershell",
             "scripts":[
@@ -711,6 +734,12 @@
                 "{{ template_dir }}/scripts/Installers/Validate-NodeLts.ps1"
             ]
         },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Validate-Bazel.ps1"
+            ]
+        },
         {
             "type": "powershell",
             "scripts":[
@@ -777,6 +806,12 @@
                 "{{ template_dir }}/scripts/Installers/Validate-7zip.ps1"
             ]
         },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Validate-Packer.ps1"
+            ]
+        },
         {
             "type": "powershell",
             "scripts":[
@@ -801,12 +836,6 @@
                 "{{ template_dir }}/scripts/Installers/Validate-InnoSetup.ps1"
             ]
         },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Validate-Perl.ps1"
-            ]
-        },
         {
             "type": "powershell",
             "scripts":[
@@ -849,12 +878,6 @@
                 "{{ template_dir }}/scripts/Installers/Validate-Kind.ps1"
             ]
         },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Validate-Bazel.ps1"
-            ]
-        },
         {
             "type": "file",
             "source": "C:\\InstalledSoftware.md",

images/win/Windows2016-Readme.md

@@ -1,6 +1,6 @@
 # Windows Server 2016
 
-The following software is installed on machines with the 20200225.0 update.
+The following software is installed on machines with the 20200301.1 update.
 
 Components marked with **\*** have been upgraded since the previous version of the image.
 
@@ -328,7 +328,7 @@ _Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-21
 _Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-19
 
 
-## Azure/AzureRM Powershell modules
+## AzureRM PowerShell module
 
 #### 2.1.0
 
@@ -337,22 +337,72 @@ This version is installed and is available via `Get-Module -ListAvailable`
 
 This version is saved but not installed
 _Location:_ C:\Modules\azurerm_3.8.0\AzureRM\3.8.0\AzureRM.psd1
-
 #### 4.2.1
 
 This version is saved but not installed
 _Location:_ C:\Modules\azurerm_4.2.1\AzureRM\4.2.1\AzureRM.psd1
-
 #### 5.1.1
 
 This version is saved but not installed
 _Location:_ C:\Modules\azurerm_5.1.1\AzureRM\5.1.1\AzureRM.psd1
-
 #### 6.7.0
 
 This version is saved but not installed
 _Location:_ C:\Modules\azurerm_6.7.0\AzureRM\6.7.0\AzureRM.psd1
+#### 6.13.1
 
+This version is saved but not installed
+_Location:_ C:\Modules\azurerm_6.13.1\AzureRM\6.13.1\AzureRM.psd1
+
+## Azure PowerShell module
+
+#### 2.1.0
+
+This version is installed and is available via `Get-Module -ListAvailable`
+#### 3.8.0
+
+This version is saved but not installed
+_Location:_ C:\Modules\azure_3.8.0\Azure\3.8.0\Azure.psd1
+#### 4.2.1
+
+This version is saved but not installed
+_Location:_ C:\Modules\azure_4.2.1\Azure\4.2.1\Azure.psd1
+#### 5.1.1
+
+This version is saved but not installed
+_Location:_ C:\Modules\azure_5.1.1\Azure\5.1.1\Azure.psd1
+#### 5.3.0
+
+This version is saved but not installed
+_Location:_ C:\Modules\azure_5.3.0\Azure\5.3.0\Azure.psd1
+
+## Az PowerShell module
+
+
+#### 1.0.0
+
+This version is saved but not installed
+_Location:_ C:\Modules\az_1.0.0\Az\1.0.0\Az.psd1
+#### 1.6.0
+
+This version is saved but not installed
+_Location:_ C:\Modules\az_1.6.0\Az\1.6.0\Az.psd1
+#### 2.3.2
+
+This version is saved but not installed
+_Location:_ C:\Modules\az_2.3.2\Az\2.3.2\Az.psd1
+#### 2.6.0
+
+This version is saved but not installed
+_Location:_ C:\Modules\az_2.6.0\Az\2.6.0\Az.psd1
+#### 3.1.0
+
+This version is saved but not installed
+_Location:_ C:\Modules\az_3.1.0\Az\3.1.0\Az.psd1
+#### 3.5.0
+
+This version is saved but not installed
+_Location:_ C:\Modules\az_3.5.0\Az\3.5.0\Az.psd1
 
 ## TLS12
 
@@ -371,7 +421,7 @@ _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.1 (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.1 (x86)<br/>
+_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/>
 
 ## PyPy
 
@@ -393,13 +443,13 @@ _Location:_ C:/hostedtoolcache/windows/Python/2.7*/x64
 
 ## Git
 
-_Version:_ 2.25.0<br/>
+_Version:_ 2.25.1<br/>
 _Environment:_
 * PATH: contains location of git.exe
 
 ## Git Large File Storage (LFS)
 
-_Version:_ 2.9.2<br/>
+_Version:_ 2.10.0<br/>
 _Environment:_
 * PATH: contains location of git-lfs.exe
 * GIT_LFS_PATH: location of git-lfs.exe
@@ -466,7 +516,7 @@ _Environment:_
 
 ## Rust (64-bit)
 
-#### 1.41.0
+#### 1.41.1
 _Location:_ C:\Rust\.cargo\bin
 _Environment:_
 * PATH: contains the location of rustc.exe
@@ -726,7 +776,7 @@ _Environment:_
 
 ## TypeScript
 
-_Version:_ Version 3.8.2<br/>
+_Version:_ Version 3.8.3<br/>
 
 ## Miniconda
 
@@ -736,7 +786,7 @@ _Environment:_
 
 ## Azure CosmosDb Emulator
 
-_Version:_ 2.9.1.0<br/>
+_Version:_ 2.9.2.0<br/>
 _Location:_ C:\Program Files\Azure Cosmos DB Emulator\
 
 ## 7zip
@@ -769,7 +819,7 @@ _Version:_ 5.1.3.0<br/>
 
 ## OpenSSL
 
-_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe<br/>_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe<br/>_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe<br/>_Version:_ 1.1.1c at C:\Strawberry\c\bin\openssl.exe<br/>_Version:_ 1.1.1 at C:\Program Files\OpenSSL\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/>_Version:_ 1.1.1c at C:\Strawberry\c\bin\openssl.exe<br/>_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe<br/>
 
 ## Cloud Foundry CLI
 
@@ -793,3 +843,7 @@ _Environment:_
 _Version:_ kind v0.7.0 go1.13.6 windows/amd64<br/>
 _Environment:_
 * PATH: contains location of kind.exe
+
+## bazel
+
+_Version:_ bazel 2.1.0<br/>

images/win/Windows2019-Azure.json

@@ -19,6 +19,7 @@
         "root_folder": "C:",
         "image_folder": "C:\\image",
         "commit_file": "C:\\image\\commit.txt",
+        "imagedata_file": "C:\\imagedata.json",
         "metadata_file": "C:\\image\\metadata.txt",
         "helper_script_folder": "C:\\Program Files\\WindowsPowerShell\\Modules\\",
         "commit_id": "LATEST",
@@ -120,6 +121,16 @@
               "setx ImageOS {{user `image_os` }} /m"
             ]
         },
+        {
+            "type": "powershell",
+            "environment_vars": [
+                "IMAGE_VERSION={{user `image_version`}}",
+                "IMAGEDATA_FILE={{user `imagedata_file`}}"
+            ],
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1"
+            ]
+        },
         {
             "type": "powershell",
             "scripts":[
@@ -172,6 +183,12 @@
                 "{{ template_dir }}/scripts/Installers/Windows2019/Install-Wix.ps1"
             ]
         },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Windows2019/Install-AnalysisExtenstion.ps1"
+            ]
+        },
         {
             "type": "powershell",
             "valid_exit_codes": [
@@ -204,6 +221,12 @@
                 "{{ template_dir }}/scripts/Installers/Windows2019/Validate-Wix.ps1"
             ]
         },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Windows2019/Validate-AnalysisExtenstion.ps1"
+            ]
+        },
         {
             "type": "powershell",
             "scripts":[
@@ -252,6 +275,12 @@
                 "{{ template_dir }}/scripts/Installers/Install-7zip.ps1"
             ]
         },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-Packer.ps1"
+            ]
+        },
         {
             "type": "file",
             "source": "{{template_dir}}/toolcache-2019.json",
@@ -273,6 +302,12 @@
                 "{{ template_dir }}/scripts/Installers/Windows2019/Install-Python.ps1"
             ]
         },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-Perl.ps1"
+            ]
+        },
         {
             "type": "powershell",
             "scripts":[
@@ -352,7 +387,7 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-SeleniumWebDrivers.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1"
             ]
         },
         {
@@ -488,13 +523,13 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-InnoSetup.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1"
             ]
         },
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Perl.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-InnoSetup.ps1"
             ]
         },
         {
@@ -588,6 +623,12 @@
                 "{{ template_dir }}/scripts/Installers/Validate-Python.ps1"
             ]
         },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Validate-Perl.ps1"
+            ]
+        },
         {
             "type": "powershell",
             "scripts":[
@@ -745,6 +786,12 @@
             "scripts":[
                 "{{ template_dir }}/scripts/Installers/Validate-7zip.ps1"
             ]
+        },
+         {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Validate-Packer.ps1"
+            ]
         },
         {
             "type": "powershell",
@@ -761,13 +808,13 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Validate-InnoSetup.ps1"
+                "{{ template_dir }}/scripts/Installers/Validate-Zstd.ps1"
             ]
         },
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Validate-Perl.ps1"
+                "{{ template_dir }}/scripts/Installers/Validate-InnoSetup.ps1"
             ]
         },
         {

images/win/Windows2019-Readme.md

@@ -1,6 +1,6 @@
 # Windows Server 2019
 
-The following software is installed on machines with the 20200225.0 update.
+The following software is installed on machines with the 20200301.1 update.
 
 Components marked with **\*** have been upgraded since the previous version of the image.
 
@@ -308,7 +308,7 @@ _Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-21
 _Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-19
 
 
-## Azure/AzureRM Powershell modules
+## AzureRM PowerShell module
 
 #### 2.1.0
 
@@ -317,22 +317,72 @@ This version is installed and is available via `Get-Module -ListAvailable`
 
 This version is saved but not installed
 _Location:_ C:\Modules\azurerm_3.8.0\AzureRM\3.8.0\AzureRM.psd1
-
 #### 4.2.1
 
 This version is saved but not installed
 _Location:_ C:\Modules\azurerm_4.2.1\AzureRM\4.2.1\AzureRM.psd1
-
 #### 5.1.1
 
 This version is saved but not installed
 _Location:_ C:\Modules\azurerm_5.1.1\AzureRM\5.1.1\AzureRM.psd1
-
 #### 6.7.0
 
 This version is saved but not installed
 _Location:_ C:\Modules\azurerm_6.7.0\AzureRM\6.7.0\AzureRM.psd1
+#### 6.13.1
 
+This version is saved but not installed
+_Location:_ C:\Modules\azurerm_6.13.1\AzureRM\6.13.1\AzureRM.psd1
+
+## Azure PowerShell module
+
+#### 2.1.0
+
+This version is installed and is available via `Get-Module -ListAvailable`
+#### 3.8.0
+
+This version is saved but not installed
+_Location:_ C:\Modules\azure_3.8.0\Azure\3.8.0\Azure.psd1
+#### 4.2.1
+
+This version is saved but not installed
+_Location:_ C:\Modules\azure_4.2.1\Azure\4.2.1\Azure.psd1
+#### 5.1.1
+
+This version is saved but not installed
+_Location:_ C:\Modules\azure_5.1.1\Azure\5.1.1\Azure.psd1
+#### 5.3.0
+
+This version is saved but not installed
+_Location:_ C:\Modules\azure_5.3.0\Azure\5.3.0\Azure.psd1
+
+## Az PowerShell module
+
+
+#### 1.0.0
+
+This version is saved but not installed
+_Location:_ C:\Modules\az_1.0.0\Az\1.0.0\Az.psd1
+#### 1.6.0
+
+This version is saved but not installed
+_Location:_ C:\Modules\az_1.6.0\Az\1.6.0\Az.psd1
+#### 2.3.2
+
+This version is saved but not installed
+_Location:_ C:\Modules\az_2.3.2\Az\2.3.2\Az.psd1
+#### 2.6.0
+
+This version is saved but not installed
+_Location:_ C:\Modules\az_2.6.0\Az\2.6.0\Az.psd1
+#### 3.1.0
+
+This version is saved but not installed
+_Location:_ C:\Modules\az_3.1.0\Az\3.1.0\Az.psd1
+#### 3.5.0
+
+This version is saved but not installed
+_Location:_ C:\Modules\az_3.5.0\Az\3.5.0\Az.psd1
 
 ## TLS12
 
@@ -351,7 +401,7 @@ _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.1 (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.1 (x86)<br/>
+_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/>
 
 ## PyPy
 
@@ -373,13 +423,13 @@ _Location:_ C:/hostedtoolcache/windows/Python/2.7*/x64
 
 ## Git
 
-_Version:_ 2.25.0<br/>
+_Version:_ 2.25.1<br/>
 _Environment:_
 * PATH: contains location of git.exe
 
 ## Git Large File Storage (LFS)
 
-_Version:_ 2.9.2<br/>
+_Version:_ 2.10.0<br/>
 _Environment:_
 * PATH: contains location of git-lfs.exe
 * GIT_LFS_PATH: location of git-lfs.exe
@@ -441,7 +491,7 @@ _Environment:_
 
 ## Rust (64-bit)
 
-#### 1.41.0
+#### 1.41.1
 _Location:_ C:\Rust\.cargo\bin
 _Environment:_
 * PATH: contains the location of rustc.exe
@@ -464,7 +514,7 @@ _version:_
 ## Microsoft Edge
 
 _version:_
-80.0.361.57
+80.0.361.62
 
 ## Mozilla Firefox
 
@@ -696,7 +746,7 @@ _Environment:_
 
 ## TypeScript
 
-_Version:_ Version 3.8.2<br/>
+_Version:_ Version 3.8.3<br/>
 
 ## Miniconda
 
@@ -706,7 +756,7 @@ _Environment:_
 
 ## Azure CosmosDb Emulator
 
-_Version:_ 2.9.1.0<br/>
+_Version:_ 2.9.2.0<br/>
 _Location:_ C:\Program Files\Azure Cosmos DB Emulator\
 
 ## 7zip
@@ -735,7 +785,7 @@ _Version:_ 5.1.3.0<br/>
 
 ## OpenSSL
 
-_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe<br/>_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe<br/>_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe<br/>_Version:_ 1.1.1c at C:\Strawberry\c\bin\openssl.exe<br/>_Version:_ 1.1.1 at C:\Program Files\OpenSSL\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/>_Version:_ 1.1.1c at C:\Strawberry\c\bin\openssl.exe<br/>_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe<br/>
 
 ## Cloud Foundry CLI
 
@@ -750,7 +800,7 @@ _Environment:_
 
 ## VSWhere
 
-_Version_: Visual Studio Locator version 2.8.4+ff0de50053 [query version 2.3.2200.14893] Copyright (C) Microsoft Corporation. All rights reserved.  instanceId: 3ca3779b installDate: 2/25/2020 4:54:08 PM installationName: VisualStudio/16.4.5+29806.167 installationPath: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise installationVersion: 16.4.29806.167 productId: Microsoft.VisualStudio.Product.Enterprise productPath: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\devenv.exe state: 4294967295 isComplete: 1 isLaunchable: 1 isPrerelease: 0 isRebootRequired: 0 displayName: Visual Studio Enterprise 2019 description: Scalable, end-to-end solution for teams of any size channelId: VisualStudio.16.Release channelUri: https://aka.ms/vs/16/release/channel enginePath: C:\Program Files (x86)\Microsoft Visual Studio\Installer\resources\app\ServiceHub\Services\Microsoft.VisualStudio.Setup.Service releaseNotes: https://go.microsoft.com/fwlink/?LinkId=660893#16.4.5 thirdPartyNotices: https://go.microsoft.com/fwlink/?LinkId=660909 updateDate: 2020-02-25T16:54:08.9471413Z catalog_buildBranch: d16.4 catalog_buildVersion: 16.4.29806.167 catalog_id: VisualStudio/16.4.5+29806.167 catalog_localBuild: build-lab catalog_manifestName: VisualStudio catalog_manifestType: installer catalog_productDisplayVersion: 16.4.5 catalog_productLine: Dev16 catalog_productLineVersion: 2019 catalog_productMilestone: RTW catalog_productMilestoneIsPreRelease: False catalog_productName: Visual Studio catalog_productPatchVersion: 5 catalog_productPreReleaseMilestoneSuffix: 1.0 catalog_productSemanticVersion: 16.4.5+29806.167 catalog_requiredEngineVersion: 2.4.1111.43337 properties_campaignId:  properties_channelManifestId: VisualStudio.16.Release/16.4.5+29806.167 properties_nickname:  properties_setupEngineFilePath: C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installershell.exe<br/>
+_Version_: Visual Studio Locator version 2.8.4+ff0de50053 [query version 2.3.2200.14893] Copyright (C) Microsoft Corporation. All rights reserved.  instanceId: 34bc4745 installDate: 3/1/2020 6:49:00 AM installationName: VisualStudio/16.4.5+29806.167 installationPath: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise installationVersion: 16.4.29806.167 productId: Microsoft.VisualStudio.Product.Enterprise productPath: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\devenv.exe state: 4294967295 isComplete: 1 isLaunchable: 1 isPrerelease: 0 isRebootRequired: 0 displayName: Visual Studio Enterprise 2019 description: Scalable, end-to-end solution for teams of any size channelId: VisualStudio.16.Release channelUri: https://aka.ms/vs/16/release/channel enginePath: C:\Program Files (x86)\Microsoft Visual Studio\Installer\resources\app\ServiceHub\Services\Microsoft.VisualStudio.Setup.Service releaseNotes: https://go.microsoft.com/fwlink/?LinkId=660893#16.4.5 thirdPartyNotices: https://go.microsoft.com/fwlink/?LinkId=660909 updateDate: 2020-03-01T06:49:00.926083Z catalog_buildBranch: d16.4 catalog_buildVersion: 16.4.29806.167 catalog_id: VisualStudio/16.4.5+29806.167 catalog_localBuild: build-lab catalog_manifestName: VisualStudio catalog_manifestType: installer catalog_productDisplayVersion: 16.4.5 catalog_productLine: Dev16 catalog_productLineVersion: 2019 catalog_productMilestone: RTW catalog_productMilestoneIsPreRelease: False catalog_productName: Visual Studio catalog_productPatchVersion: 5 catalog_productPreReleaseMilestoneSuffix: 1.0 catalog_productSemanticVersion: 16.4.5+29806.167 catalog_requiredEngineVersion: 2.4.1111.43337 properties_campaignId:  properties_channelManifestId: VisualStudio.16.Release/16.4.5+29806.167 properties_nickname:  properties_setupEngineFilePath: C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installershell.exe<br/>
 * PATH: contains location of vswhere.exe
 
 ## Kubectl
@@ -764,3 +814,7 @@ _Environment:_
 _Version:_ kind v0.7.0 go1.13.6 windows/amd64<br/>
 _Environment:_
 * PATH: contains location of kind.exe
+
+## bazel
+
+_Version:_ bazel 2.1.0<br/>

images/win/scripts/Installers/Install-Bazel.ps1

@@ -1,6 +1,8 @@
 ################################################################################
 ##  File:  Install-Bazel.ps1
-##  Desc:  Install Bazel
+##  Desc:  Install Bazel and Bazelisk (A user-friendly launcher for Bazel)
 ################################################################################
 
 choco install bazel -y
+
+npm install -g @bazel/bazelisk

images/win/scripts/Installers/Install-Chrome.ps1

@@ -39,4 +39,44 @@ $regGoogleParameters | ForEach-Object {
     New-ItemProperty @Arguments;
 }
 
+# Reinstall Chrome Web Driver
+Write-Host "Install Chrome WebDriver"
+$DestinationPath = "$($env:SystemDrive)\";
+$ChromeDriverPath = "${DestinationPath}SeleniumWebDrivers\ChromeDriver";
 
+if (-not (Test-Path -Path $ChromeDriverPath)) {
+    New-Item -Path $ChromeDriverPath -ItemType "directory"
+}
+
+$RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths"
+$ChromePath = (Get-ItemProperty "$RegistryPath\chrome.exe").'(default)';
+[version]$ChromeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($ChromePath).ProductVersion;
+Write-Host "Chrome version: [$ChromeVersion]";
+
+$ChromeDriverVersionUri = "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$($ChromeVersion.Major).$($ChromeVersion.Minor).$($ChromeVersion.Build)";
+Write-Host "Chrome driver version Uri [$ChromeDriverVersionUri]";
+Write-Host "Getting the Chrome driver version...";
+$ChromeDriverVersion = Invoke-WebRequest -Uri $ChromeDriverVersionUri;
+Write-Host "Current Chrome driver version: [$ChromeDriverVersion]";
+
+$ChromeDriverZipDownloadUri = "https://chromedriver.storage.googleapis.com/$($ChromeDriverVersion.ToString())/chromedriver_win32.zip";
+Write-Host "Chrome driver zip file download Uri: [$ChromeDriverZipDownloadUri]";
+
+$DestFile= "$ChromeDriverPath\chromedriver_win32.zip";
+$ChromeDriverVersion.Content | Out-File -FilePath "$ChromeDriverPath\versioninfo.txt" -Force;
+
+Write-Host "Chrome driver download....";
+Invoke-WebRequest -Uri $ChromeDriverZipDownloadUri -OutFile $DestFile;
+
+Write-Host "Chrome driver install....";
+Expand-Archive -Path "$ChromeDriverPath\chromedriver_win32.zip" -DestinationPath $ChromeDriverPath -Force;
+Remove-Item -Path "$ChromeDriverPath\chromedriver_win32.zip" -Force;
+
+Write-Host "Setting the environment variables"
+
+setx ChromeWebDriver "$ChromeDriverPath" /M;
+
+$regEnvKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\';
+$PathValue = Get-ItemPropertyValue -Path $regEnvKey -Name 'Path';
+$PathValue += ";$ChromeDriverPath\";
+Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue;

images/win/scripts/Installers/Install-Edge.ps1

@@ -4,3 +4,38 @@
 ################################################################################
 
 choco install microsoft-edge -y
+
+# Install Microsoft Edge Web Driver
+Write-Host "Install Edge WebDriver"
+$DestinationPath = "$($env:SystemDrive)\";
+
+$EdgeDriverPath = "${DestinationPath}SeleniumWebDrivers\EdgeDriver"
+if (-not (Test-Path -Path $EdgeDriverPath)) {
+    New-Item -Path $EdgeDriverPath -ItemType "directory"
+}
+
+$RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths"
+$EdgePath = (Get-ItemProperty "$RegistryPath\msedge.exe").'(default)'
+[version]$EdgeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($EdgePath).ProductVersion
+$EdgeDriverVersionUrl = "https://msedgedriver.azureedge.net/LATEST_RELEASE_$($EdgeVersion.Major)"
+$EdgeDriverVersionFile = "$EdgeDriverPath\versioninfo.txt"
+Invoke-WebRequest -Uri $EdgeDriverVersionUrl -OutFile $EdgeDriverVersionFile
+
+Write-Host "Microsoft Edge driver download started"
+$EdgeDriverLatestVersion = Get-Content -Path $EdgeDriverVersionFile
+$EdgeDriverDownloadUrl="https://msedgedriver.azureedge.net/${EdgeDriverLatestVersion}/edgedriver_win64.zip"
+$DestFile = "$EdgeDriverPath\edgedriver_win64.zip"
+Invoke-WebRequest -Uri $EdgeDriverDownloadUrl -OutFile $DestFile
+
+Write-Host "Microsoft Edge driver installation started"
+Expand-Archive -Path $DestFile -DestinationPath $EdgeDriverPath -Force
+Remove-Item -Path $DestFile -Force
+
+Write-Host "Setting the environment variables"
+
+setx EdgeWebDriver "$EdgeDriverPath" /M;
+
+$regEnvKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\';
+$PathValue = Get-ItemPropertyValue -Path $regEnvKey -Name 'Path';
+$PathValue += ";$EdgeDriverPath\";
+Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue;

images/win/scripts/Installers/Install-Firefox.ps1

@@ -26,18 +26,27 @@ $firefoxPreferencesFolder = Join-Path $firefoxDirectoryPath "defaults\pref"
 New-Item -path $firefoxPreferencesFolder -Name 'local-settings.js' -Value 'pref("general.config.obscure_value", 0);
 pref("general.config.filename", "mozilla.cfg");' -ItemType file -force
 
+# Install Firefox gecko Web Driver
 Write-Host "Install Firefox WebDriver"
+$DestinationPath = "$($env:SystemDrive)\";
+$SeleniumWebDriverPath = Join-Path $DestinationPath "SeleniumWebDrivers"
 
 $geckodriverJson = Invoke-RestMethod "https://api.github.com/repos/mozilla/geckodriver/releases/latest"
 $geckodriverWindowsAsset = $geckodriverJson.assets | Where-Object { $_.name -Match "win64" } | Select-Object -First 1
 
-Write-Host "Geckodriver version: $($geckodriverJson.tag_name)"
+$geckodriverVersion = $geckodriverJson.tag_name
-
+Write-Host "Geckodriver version: $geckodriverVersion"
 
 $DriversZipFile = $geckodriverWindowsAsset.name
 Write-Host "Selenium drivers download and install..."
 
-$FirefoxDriverPath = Join-Path $env:SystemDrive "SeleniumWebDrivers\GeckoDriver"
+$FirefoxDriverPath = Join-Path $SeleniumWebDriverPath "GeckoDriver"
+
+if (-not (Test-Path -Path $FirefoxDriverPath)) {
+    New-Item -Path $FirefoxDriverPath -ItemType "directory"
+}
+
+$geckodriverVersion.Substring(1) | Out-File -FilePath "$FirefoxDriverPath\versioninfo.txt" -Force;
 
 # Install Firefox Web Driver
 Write-Host "FireFox driver download...."

images/win/scripts/Installers/Install-IEWebDriver.ps1

@@ -0,0 +1,32 @@
+################################################################################
+##  File:  Install-SeleniumWebDrivers.ps1
+##  Desc:  Install Selenium Web Drivers
+################################################################################
+$DestinationPath = "$($env:SystemDrive)\";
+$DriversZipFile = "SeleniumWebDrivers.zip"
+Write-Host "Destination path: [$DestinationPath]";
+Write-Host "Selenium drivers download and install...";
+try {
+    Invoke-WebRequest -UseBasicParsing -Uri "https://seleniumwebdrivers.blob.core.windows.net/seleniumwebdrivers/${DriversZipFile}" -OutFile $DriversZipFile;
+}
+catch {
+    Write-Error "[!] Failed to download $DriversZipFile";
+    exit 1;
+}
+
+$TempSeleniumDir = Join-Path $Env:TEMP "SeleniumWebDrivers"
+Expand-Archive -Path $DriversZipFile -DestinationPath $Env:TEMP -Force;
+Remove-Item $DriversZipFile;
+
+$SeleniumWebDriverPath = Join-Path $DestinationPath "SeleniumWebDrivers"
+$IEDriverPathTemp = Join-Path $TempSeleniumDir 'IEDriver'
+
+if (-not (Test-Path -Path $SeleniumWebDriverPath)) {
+    New-Item -Path $SeleniumWebDriverPath -ItemType "directory"
+}
+
+Move-Item -Path "$IEDriverPathTemp" -Destination $SeleniumWebDriverPath
+
+Write-Host "Setting the environment variables"
+
+setx IEWebDriver "C:\SeleniumWebDrivers\IEDriver" /M;

images/win/scripts/Installers/Install-Packer.ps1

@@ -0,0 +1,6 @@
+################################################################################
+##  File:  Install-Packer.ps1
+##  Desc:  Install Packer
+################################################################################
+
+choco install packer -y

images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1

@@ -1,96 +0,0 @@
-################################################################################
-##  File:  Install-SeleniumWebDrivers.ps1
-##  Desc:  Install Selenium Web Drivers
-################################################################################
-$DestinationPath = "$($env:SystemDrive)\";
-$DriversZipFile = "SeleniumWebDrivers.zip"
-Write-Host "Destination path: [$DestinationPath]";
-Write-Host "Selenium drivers download and install...";
-try {
-    Invoke-WebRequest -UseBasicParsing -Uri "https://seleniumwebdrivers.blob.core.windows.net/seleniumwebdrivers/${DriversZipFile}" -OutFile $DriversZipFile;
-}
-catch {
-    Write-Error "[!] Failed to download $DriversZipFile";
-    exit 1;
-}
-
-$TempSeleniumDir = Join-Path $Env:TEMP "SeleniumWebDrivers"
-Expand-Archive -Path $DriversZipFile -DestinationPath $Env:TEMP -Force;
-Remove-Item $DriversZipFile;
-
-$SeleniumWebDriverPath = Join-Path $DestinationPath "SeleniumWebDrivers"
-$IEDriverPathTemp = Join-Path $TempSeleniumDir 'IEDriver'
-
-if (-not (Test-Path -Path $SeleniumWebDriverPath)) {
-    New-Item -Path $SeleniumWebDriverPath -ItemType "directory"
-}
-
-Move-Item -Path "$IEDriverPathTemp" -Destination $SeleniumWebDriverPath
-
-
-# Reinstall Chrome Web Driver
-$ChromeDriverPath = "${DestinationPath}SeleniumWebDrivers\ChromeDriver";
-
-if (-not (Test-Path -Path $ChromeDriverPath)) {
-    New-Item -Path $ChromeDriverPath -ItemType "directory"
-}
-
-$RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths"
-$ChromePath = (Get-ItemProperty "$RegistryPath\chrome.exe").'(default)';
-[version]$ChromeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($ChromePath).ProductVersion;
-Write-Host "Chrome version: [$ChromeVersion]";
-
-$ChromeDriverVersionUri = "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$($ChromeVersion.Major).$($ChromeVersion.Minor).$($ChromeVersion.Build)";
-Write-Host "Chrome driver version Uri [$ChromeDriverVersionUri]";
-Write-Host "Getting the Chrome driver version...";
-$ChromeDriverVersion = Invoke-WebRequest -Uri $ChromeDriverVersionUri;
-Write-Host "Current Chrome driver version: [$ChromeDriverVersion]";
-
-$ChromeDriverZipDownloadUri = "https://chromedriver.storage.googleapis.com/$($ChromeDriverVersion.ToString())/chromedriver_win32.zip";
-Write-Host "Chrome driver zip file download Uri: [$ChromeDriverZipDownloadUri]";
-
-$DestFile= "$ChromeDriverPath\chromedriver_win32.zip";
-$ChromeDriverVersion.Content | Out-File -FilePath "$ChromeDriverPath\versioninfo.txt" -Force;
-
-Write-Host "Chrome driver download....";
-Invoke-WebRequest -Uri $ChromeDriverZipDownloadUri -OutFile $DestFile;
-
-Write-Host "Chrome driver install....";
-Expand-Archive -Path "$ChromeDriverPath\chromedriver_win32.zip" -DestinationPath $ChromeDriverPath -Force;
-Remove-Item -Path "$ChromeDriverPath\chromedriver_win32.zip" -Force;
-
-# Install Microsoft Edge Web Driver
-Write-Host "Microsoft Edge driver download...."
-$EdgeDriverPath = "${DestinationPath}SeleniumWebDrivers\EdgeDriver"
-if (-not (Test-Path -Path $EdgeDriverPath)) {
-    New-Item -Path $EdgeDriverPath -ItemType "directory"
-}
-
-$EdgePath = (Get-ItemProperty "$RegistryPath\msedge.exe").'(default)'
-[version]$EdgeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($EdgePath).ProductVersion
-$EdgeDriverVersionUrl = "https://msedgedriver.azureedge.net/LATEST_RELEASE_$($EdgeVersion.Major)"
-$EdgeDriverVersionFile = "$EdgeDriverPath\versioninfo.txt"
-Invoke-WebRequest -Uri $EdgeDriverVersionUrl -OutFile $EdgeDriverVersionFile
-
-$EdgeDriverLatestVersion = Get-Content -Path $EdgeDriverVersionFile
-$EdgeDriverDownloadUrl="https://msedgedriver.azureedge.net/${EdgeDriverLatestVersion}/edgedriver_win64.zip"
-$DestFile = "$EdgeDriverPath\edgedriver_win64.zip"
-Invoke-WebRequest -Uri $EdgeDriverDownloadUrl -OutFile $DestFile
-
-Write-Host "Microsoft Edge driver install...."
-Expand-Archive -Path $DestFile -DestinationPath $EdgeDriverPath -Force
-Remove-Item -Path $DestFile -Force
-
-Write-Host "Setting the environment variables"
-
-setx IEWebDriver "C:\SeleniumWebDrivers\IEDriver" /M;
-setx ChromeWebDriver "$ChromeDriverPath" /M;
-setx EdgeWebDriver "$EdgeDriverPath" /M;
-
-$regEnvKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\';
-$PathValue = Get-ItemPropertyValue -Path $regEnvKey -Name 'Path';
-$PathValue += ";$ChromeDriverPath\";
-$PathValue += ";$EdgeDriverPath\";
-Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue;
-
-exit 0;

images/win/scripts/Installers/Update-AndroidSDK.ps1

@@ -68,6 +68,7 @@ Push-Location -Path $sdk.FullName
     "platforms;android-22" `
     "platforms;android-21" `
     "platforms;android-19" `
+    "build-tools;29.0.3" `
     "build-tools;29.0.2" `
     "build-tools;29.0.0" `
     "build-tools;28.0.3" `

images/win/scripts/Installers/Update-ImageData.ps1

@@ -0,0 +1,35 @@
+$os = Get-CimInstance -ClassName Win32_OperatingSystem
+$caption = $os.Caption
+$osName = $caption.Substring(0, $caption.LastIndexOf(" "))
+$osEdition = $caption.Substring($caption.LastIndexOf(" ")+1)
+$osVersion = $os.Version
+$imageVersion = $env:IMAGE_VERSION
+$imageDataFile = $env:IMAGEDATA_FILE
+$githubUrl="https://github.com/actions/virtual-environments/blob"
+
+if ($caption -match "2019")
+{
+    $imageLabel = "windows-2019"
+    $softwareUrl = "${githubUrl}/win19/${imageVersion}/images/win/Windows2019-Readme.md"
+}
+
+if ($caption -match "2016")
+{
+    $imageLabel = "windows-2016"
+    $softwareUrl = "${githubUrl}/win16/${imageVersion}/images/win/Windows2016-Readme.md"
+}
+
+$json = @"
+[
+  {
+    "group": "Operating System",
+    "detail": "${osName}\n${osVersion}\n${osEdition}"
+  },
+  {
+    "group": "Virtual Environment",
+    "detail": "Environment: ${imageLabel}\nVersion: ${imageVersion}\nIncluded Software: ${softwareUrl}"
+  }
+]
+"@
+
+$json | Out-File -FilePath $imageDataFile

images/win/scripts/Installers/Validate-Bazel.ps1

@@ -1,6 +1,6 @@
 ################################################################################
 ##  File:  Validate-Bazel.ps1
-##  Desc:  Validate Bazel
+##  Desc:  Validate Bazel and Bazelisk (A user-friendly launcher for Bazel)
 ################################################################################
 
 if (Get-Command -Name 'bazel')
@@ -13,7 +13,17 @@ else
     exit 1
 }
 
-# Adding description of the software to Markdown
+if (Get-Command -Name 'bazelisk')
+{
+    Write-Host "bazelisk on path"
+}
+else
+{
+    Write-Host 'bazelisk is not on path'
+    exit 1
+}
+
+# Adding description of Bazel to Markdown
 $SoftwareName = "bazel"
 
 $Description = @"
@@ -22,3 +32,14 @@ _Version:_ $(bazel --version)<br/>
 
 Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
 Add-SoftwareDetailsToMarkdown -SoftwareName "Test Software" -DescriptionMarkdown "Test Software"
+
+# Adding description of Bazelisk to Markdown
+$bazelisk_version = ((bazelisk version | Select-String "Bazelisk version:") -Split(" v"))[2]
+
+$SoftwareName = "bazelisk"
+
+$Description = @"
+_Version:_ $bazelisk_version<br/>
+"@
+
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description

images/win/scripts/Installers/Validate-Mercurial.ps1

@@ -15,7 +15,7 @@ else
 
 # Adding description of the software to Markdown
 $SoftwareName = "Mercurial"
-$(hg --version).Split([System.Environment]::NewLine)[0] -match "\d+\.\d+\.\d+"
+$(hg --version).Split([System.Environment]::NewLine)[0] -match "\d+\.\d+"
 $MercurialVersion = $matches[0]
 
 $Description = @"

images/win/scripts/Installers/Validate-Packer.ps1

@@ -0,0 +1,24 @@
+################################################################################
+##  File:  Validate-Packer.ps1
+##  Desc:  Validate Packer
+################################################################################
+
+if (Get-Command -Name 'packer')
+{
+    Write-Host "Packer is on path"
+}
+else
+{
+    Write-Host 'Packer is not on path'
+    exit 1
+}
+
+# Adding description of the software to Markdown
+$SoftwareName = "Packer"
+$PackerVersion = packer --version
+
+$Description = @"
+_Version:_ $PackerVersion<br/>
+"@
+
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description

images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1

@@ -36,9 +36,9 @@ if (
 	(Get-Item "$EdgeDriverPath\msedgedriver.exe").VersionInfo
 
 	$versionFileName = "versioninfo.txt";
-	$chromedriverversion = Get-Content -Path "$IEDriverPath\$versionFileName"
+	$chromedriverversion = Get-Content -Path "$ChromeDriverPath\$versionFileName"
 	$geckodriverversion = Get-Content -Path "$GeckoDriverPath\$versionFileName"
-	$iedriverversion = Get-Content -Path "$ChromeDriverPath\$versionFileName"
+	$iedriverversion = Get-Content -Path "$IEDriverPath\$versionFileName"
 	$edgedriverversion = Get-Content -Path "$EdgeDriverPath\$versionFileName"
 
 	# Adding description of the software to Markdown

images/win/scripts/Installers/Validate-VSWhere.ps1

@@ -15,7 +15,7 @@ else
 
 # Adding description of the software to Markdown
 $SoftwareName = "VSWhere"
-$VswhereVersion = $(vswhere)
+$VswhereVersion = (Get-Command -Name vswhere).FileVersionInfo.ProductVersion
 
 $Description = @"
 _Version_: $VswhereVersion<br/>

images/win/scripts/Installers/Validate-Zstd.ps1

@@ -15,7 +15,7 @@ else
 
 # Adding description of the software to Markdown
 $SoftwareName = "zstd"
-$zstdVersion = $(zstd --version).Split(' ')[6].Split(',')[0]
+$zstdVersion = $(zstd --version).Split(' ')[6].Split(',')[0].Substring(1)
 
 $Description = @"
 _Version:_ $zstdVersion<br/>

images/win/scripts/Installers/Windows2016/Install-SSDT.ps1

@@ -5,8 +5,8 @@
 
 Import-Module -Name ImageHelpers -Force
 
-#SSDT for Visual Studio 2017 (15.8.2)
+#SSDT for Visual Studio 2017 (15.9.3)
-$InstallerURI = 'https://download.microsoft.com/download/D/F/8/DF8B51B9-8E9F-47F3-A27B-33EEDADD8966/SSDT-Setup-ENU.exe'
+$InstallerURI = 'https://download.microsoft.com/download/5/2/D/52DEF429-5B17-470C-82D9-654116080B15/SSDT-Setup-ENU.exe'
 $InstallerName = 'SSDT-Setup-ENU.exe'
 $logFilePath = "$env:TEMP\ssdtlog.txt"
 $ArgumentList = ('/install', 'INSTALLALL', '/passive', '/norestart', "/log `"$logFilePath`"")

images/win/scripts/Installers/Windows2019/Install-AnalysisExtenstion.ps1

@@ -0,0 +1,44 @@
+###################################################################################
+##  File:  Install-AnalysisExtenstion.ps1
+##  Desc:  Install the Microsoft Analysis Services Projects Visual Studio extension
+###################################################################################
+
+
+$extensionUrl = "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/ProBITools/vsextensions/MicrosoftAnalysisServicesModelingProjects/2.9.5/vspackage"
+$extensionDownloadPath = Join-Path $Env:TEMP "Microsoft.DataTools.AnalysisServices.vsix"
+Write-Host "Downloading Microsoft.DataTools.AnalysisServices.vsix extension"
+(New-Object System.Net.WebClient).DownloadFile($extensionUrl, $extensionDownloadPath)
+
+Write-Host "Installing Microsoft.DataTools.AnalysisServices.vsix extension"
+try
+{
+     $process = Start-Process `
+    -FilePath "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\VSIXInstaller.exe" `
+    -ArgumentList ("/quiet", "$extensionDownloadPath") `
+    -Wait `
+    -PassThru
+}
+catch
+{
+    Write-Host "There is an error during Microsoft.DataTools.AnalysisServices.vsix installation"
+    $_
+    exit 1
+}
+
+
+$exitCode = $process.ExitCode
+
+if ($exitCode -eq 0 -or $exitCode -eq 1001) # 1001 means the extension is already installed
+{
+    Write-Host "Microsoft.DataTools.AnalysisServices.vsix installed successfully"
+}
+else
+{
+    Write-Host "Unsuccessful exit code returned by the installation process: $exitCode."
+    exit 1
+}
+
+#Cleanup installation files
+Remove-Item -Force -Confirm:$false $extensionDownloadPath
+
+exit $exitCode

images/win/scripts/Installers/Windows2019/Install-VS2019.ps1

@@ -112,6 +112,15 @@ $WorkLoads = '--allWorkloads --includeRecommended ' + `
               '--add Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest ' + `
               '--add Microsoft.VisualStudio.Component.VC.v141 ' + `
               '--add Microsoft.VisualStudio.Component.VC.v141.x86.x64 ' + `
+              '--add Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre ' + `
+              '--add Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre ' + `
+              '--add Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre ' + `
+              '--add Microsoft.VisualStudio.Component.VC.v141.ATL.ARM.Spectre ' + `
+              '--add Microsoft.VisualStudio.Component.VC.v141.ATL.ARM64.Spectre ' + `
+              '--add Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre ' + `
+              '--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.16299 ' + `
               '--add Microsoft.VisualStudio.Component.Windows10SDK.17134 ' + `
               '--add Microsoft.VisualStudio.Component.Windows10SDK.17763 ' + `

images/win/scripts/Installers/Windows2019/Validate-AnalysisExtenstion.ps1

@@ -0,0 +1,18 @@
+################################################################################
+##  File:  Validate-AnalysisExtenstion.ps1
+##  Desc:  Validate Microsoft Analysis Services Projects Visual Studio extension
+################################################################################
+
+Import-Module -Name ImageHelpers -Force
+
+#AnalysisPackage doesn't have any proper name in the state.packages.json file, only id is available
+$AnalysisPackageVersion = Get-VS19ExtensionVersion -packageName "04a86fc2-dbd5-4222-848e-911638e487fe"
+
+# Adding description of the software to Markdown
+$SoftwareName = "Microsoft Analysis Services Projects Visual Studio Extension"
+
+$Description = @"
+_Version:_ $AnalysisPackageVersion<br/>
+"@
+
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description