diff --git a/images/linux/scripts/installers/1604/basic.sh b/images/linux/scripts/installers/1604/basic.sh index 3b2350049..9248e0c0b 100644 --- a/images/linux/scripts/installers/1604/basic.sh +++ b/images/linux/scripts/installers/1604/basic.sh @@ -25,6 +25,7 @@ apt-fast install -y --no-install-recommends \ locales \ netcat \ openssh-client \ + parallel \ rsync \ shellcheck \ sudo \ @@ -55,7 +56,7 @@ apt-fast install -y --no-install-recommends \ # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" -for cmd in curl file ftp jq netcat ssh rsync shellcheck sudo telnet time unzip upx wget zip; do +for cmd in curl file ftp jq netcat ssh parallel rsync shellcheck sudo telnet time unzip upx wget zip; do if ! command -v $cmd; then echo "$cmd was not installed" exit 1 @@ -78,6 +79,7 @@ DocumentInstalledItemIndent "libunwind8" DocumentInstalledItemIndent "locales" DocumentInstalledItemIndent "netcat" DocumentInstalledItemIndent "openssh-client" +DocumentInstalledItemIndent "parallel" DocumentInstalledItemIndent "rsync" DocumentInstalledItemIndent "shellcheck" DocumentInstalledItemIndent "sudo" diff --git a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh index b2f1bc0d3..e772d924c 100644 --- a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh @@ -7,7 +7,7 @@ source $HELPER_SCRIPTS/apt.sh source $HELPER_SCRIPTS/document.sh -LATEST_DOTNET_PACKAGE=dotnet-sdk-3.0 +LATEST_DOTNET_PACKAGES=("dotnet-sdk-3.0" "dotnet-sdk-3.1") LSB_RELEASE=$(lsb_release -rs) @@ -30,21 +30,23 @@ mksamples() set -e -echo "Determing if .NET Core ($LATEST_DOTNET_PACKAGE) is installed" -if ! IsInstalled $LATEST_DOTNET_PACKAGE; then - echo "Could not find .NET Core ($LATEST_DOTNET_PACKAGE), installing..." - wget -q https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb - dpkg -i packages-microsoft-prod.deb - apt-get update - apt-get install apt-transport-https - apt-get update - apt-get install $LATEST_DOTNET_PACKAGE -else - echo ".NET Core ($LATEST_DOTNET_PACKAGE) is already installed" -fi +for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do + echo "Determing if .NET Core ($latest_package) is installed" + if ! IsInstalled $latest_package; then + echo "Could not find .NET Core ($latest_package), installing..." + curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg + mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg + sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' + apt-get install apt-transport-https + apt-get update + apt-get install $latest_package -y + else + echo ".NET Core ($latest_package) is already installed" + fi +done # Get list of all released SDKs from channels which are not end-of-life or preview -release_urls=("https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.2/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json") +release_urls=("https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.2/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.0/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json") sdks=() for release_url in ${release_urls[@]}; do echo "${release_url}" diff --git a/images/linux/scripts/installers/1804/basic.sh b/images/linux/scripts/installers/1804/basic.sh index ad3584e25..d9c57b275 100644 --- a/images/linux/scripts/installers/1804/basic.sh +++ b/images/linux/scripts/installers/1804/basic.sh @@ -118,9 +118,12 @@ apt-get install -y --no-install-recommends zsync echo "Install curl" apt-get install -y --no-install-recommends curl +echo "Install parallel" +apt-get install -y --no-install-recommends parallel + # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" -for cmd in curl file ftp jq netcat ssh rsync shellcheck sudo telnet time unzip wget zip; do +for cmd in curl file ftp jq netcat ssh parallel rsync shellcheck sudo telnet time unzip wget zip; do if ! command -v $cmd; then echo "$cmd was not installed" exit 1 @@ -143,6 +146,7 @@ DocumentInstalledItemIndent "libunwind8" DocumentInstalledItemIndent "locales" DocumentInstalledItemIndent "netcat" DocumentInstalledItemIndent "openssh-client" +DocumentInstalledItemIndent "parallel" DocumentInstalledItemIndent "rsync" DocumentInstalledItemIndent "shellcheck" DocumentInstalledItemIndent "sudo" diff --git a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh index 16f65edf7..e772d924c 100644 --- a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh @@ -7,7 +7,7 @@ source $HELPER_SCRIPTS/apt.sh source $HELPER_SCRIPTS/document.sh -LATEST_DOTNET_PACKAGE=dotnet-sdk-3.0 +LATEST_DOTNET_PACKAGES=("dotnet-sdk-3.0" "dotnet-sdk-3.1") LSB_RELEASE=$(lsb_release -rs) @@ -30,21 +30,23 @@ mksamples() set -e -echo "Determing if .NET Core ($LATEST_DOTNET_PACKAGE) is installed" -if ! IsInstalled $LATEST_DOTNET_PACKAGE; then - echo "Could not find .NET Core ($LATEST_DOTNET_PACKAGE), installing..." - curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg - mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg - sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' - apt-get install apt-transport-https - apt-get update - apt-get install $LATEST_DOTNET_PACKAGE -y -else - echo ".NET Core ($LATEST_DOTNET_PACKAGE) is already installed" -fi +for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do + echo "Determing if .NET Core ($latest_package) is installed" + if ! IsInstalled $latest_package; then + echo "Could not find .NET Core ($latest_package), installing..." + curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg + mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg + sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' + apt-get install apt-transport-https + apt-get update + apt-get install $latest_package -y + else + echo ".NET Core ($latest_package) is already installed" + fi +done # Get list of all released SDKs from channels which are not end-of-life or preview -release_urls=("https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.2/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.0/releases.json") +release_urls=("https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.2/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.0/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json") sdks=() for release_url in ${release_urls[@]}; do echo "${release_url}" diff --git a/images/linux/scripts/installers/haskell.sh b/images/linux/scripts/installers/haskell.sh index 3d47ad2f2..14429e92d 100644 --- a/images/linux/scripts/installers/haskell.sh +++ b/images/linux/scripts/installers/haskell.sh @@ -24,6 +24,7 @@ apt-get install -y \ ghc-8.6.4 \ ghc-8.6.5 \ ghc-8.8.1 \ + ghc-8.8.2 \ cabal-install-2.0 \ cabal-install-2.2 \ cabal-install-2.4 \ @@ -35,7 +36,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; 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; do if ! command -v /opt/ghc/$version/bin/ghc; then echo "ghc $version was not installed" exit 1 @@ -58,7 +59,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; 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; do DocumentInstalledItem "GHC ($(/opt/ghc/$version/bin/ghc --version))" done DocumentInstalledItem "Haskell Stack ($(stack --version))" diff --git a/images/linux/scripts/installers/mysql.sh b/images/linux/scripts/installers/mysql.sh index 7750fd3d9..63474e39f 100644 --- a/images/linux/scripts/installers/mysql.sh +++ b/images/linux/scripts/installers/mysql.sh @@ -12,6 +12,9 @@ export ACCEPT_EULA=Y # Install MySQL Client apt-get install mysql-client -y +# InstallMySQL database development files +apt-get install libmysqlclient-dev -y + # Install MySQL Server MYSQL_ROOT_PASSWORD=root echo "mysql-server mysql-server/root_password password $MYSQL_ROOT_PASSWORD" | debconf-set-selections diff --git a/images/linux/scripts/installers/postgresql.sh b/images/linux/scripts/installers/postgresql.sh new file mode 100644 index 000000000..9f2988a84 --- /dev/null +++ b/images/linux/scripts/installers/postgresql.sh @@ -0,0 +1,16 @@ +#!/bin/bash +################################################################################ +## File: postgresql.sh +## Desc: Installs Postgresql +################################################################################ + +# Source the helpers for use with the script +source $HELPER_SCRIPTS/document.sh + +echo "Install libpq-dev" +apt-get install libpq-dev + +echo "Install Postgresql Client" +apt-get install postgresql-client + +DocumentInstalledItem "$(psql -V 2>&1 | cut -d ' ' -f 1,2,3)" \ No newline at end of file diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 815fb264c..0d82058d8 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -77,9 +77,10 @@ "systemctl disable apt-daily.timer", "systemctl disable apt-daily-upgrade.timer", "systemctl disable apt-daily-upgrade.service", - "echo '* soft nofile 50000 \n* hard nofile 50000' >> /etc/security/limits.conf", + "echo '* soft nofile 65536 \n* hard nofile 65536' >> /etc/security/limits.conf", "echo 'session required pam_limits.so' >> /etc/pam.d/common-session", - "echo 'session required pam_limits.so' >> /etc/pam.d/common-session-noninteractive" + "echo 'session required pam_limits.so' >> /etc/pam.d/common-session-noninteractive", + "echo 'DefaultLimitNOFILE=65536' >> /etc/systemd/system.conf" ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, @@ -153,6 +154,7 @@ "{{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/ruby.sh", "{{template_dir}}/scripts/installers/rust.sh", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 745922f66..de07cc56c 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -80,9 +80,10 @@ "systemctl disable apt-daily.timer", "systemctl disable apt-daily-upgrade.timer", "systemctl disable apt-daily-upgrade.service", - "echo '* soft nofile 50000 \n* hard nofile 50000' >> /etc/security/limits.conf", + "echo '* soft nofile 65536 \n* hard nofile 65536' >> /etc/security/limits.conf", "echo 'session required pam_limits.so' >> /etc/pam.d/common-session", - "echo 'session required pam_limits.so' >> /etc/pam.d/common-session-noninteractive" + "echo 'session required pam_limits.so' >> /etc/pam.d/common-session-noninteractive", + "echo 'DefaultLimitNOFILE=65536' >> /etc/systemd/system.conf" ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, @@ -156,6 +157,7 @@ "{{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/ruby.sh", "{{template_dir}}/scripts/installers/rust.sh", diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index cc15ba495..1530e4866 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -354,6 +354,12 @@ "{{ template_dir }}/scripts/Installers/Install-Chrome.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Edge.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -661,6 +667,12 @@ "{{ template_dir }}/scripts/Installers/Validate-Chrome.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Edge.ps1" + ] + }, { "type": "powershell", "scripts":[ diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 1e6a51df1..509c4f397 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,69 +1,68 @@ -# Windows Server 2016 +# Windows Server 2016 + +The following software is installed on machines with the 20200120.1 update. + +Components marked with **\*** have been upgraded since the previous version of the image. -The following software is installed on machines with the 20191009.1 update. - -Components marked with **\*** have been upgraded since the previous version of the image. - - -## Chocolatey - -_Version:_ 0.10.15
-_Environment:_ + +## Chocolatey + +_Version:_ 0.10.15
+_Environment:_ * PATH: contains location for choco.exe - -## Docker - -_Version:_ 19.03.3
-_Environment:_ + +## Docker + +_Version:_ 19.03.5
+_Environment:_ * PATH: contains location of docker.exe - -## Docker-compose - -_Version:_ 1.24.0
-_Environment:_ + +## Docker-compose + +_Version:_ 1.25.1
+_Environment:_ * PATH: contains location of docker-compose.exe - -## Powershell Core - -_Version:_ 6.2.3 -
- -## Docker images - + +## Powershell Core + +_Version:_ 6.2.3
+ +## Docker images + The following container images have been cached: -* mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 (Digest: sha256:f247ce2cdad4711b6a597bf3a84581278251e13176a2129158e3138fa7c6730d) -* mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 (Digest: sha256:ebb0693431d47cbd070f8b6473b5a3b79896e8a146d202f78b92cabf6ceb4b3d) -* mcr.microsoft.com/windows/servercore:ltsc2016 (Digest: sha256:45469202b1d2630e502330c0c4e977fac9b4540611c9778dedfc140f683f8f68) +* mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 (Digest: sha256:a1bd1a6dc00f2734b5071b9295f715f36a653e4b2d259c1a4a4d9e8cd6f3ade8) +* mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 (Digest: sha256:7e81f462be36ba1362062306426c65547e6d63b2eab0b5583808581081393a79) +* mcr.microsoft.com/windows/servercore:ltsc2016 (Digest: sha256:42be24b8810c861cc1b3fe75c5e99f75061cb45fdbae1de46d151c18cc8e6a9a) * microsoft/aspnetcore-build:1.0-2.0 (Digest: sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c) * mcr.microsoft.com/windows/nanoserver:10.0.14393.953 (Digest: sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268) - -## Visual Studio 2017 Enterprise - -_Version:_ VisualStudio/15.9.16+28307.858
-_Location:_ C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise - -The following workloads including required and recommended components are installed with Visual Studio 2017: - -* Universal Windows Platform development -* .NET desktop development -* Desktop development with C++ -* ASP.NET and web development -* Azure development -* Node.js development -* Data storage and processing -* Data science and analytical applications * -* Game development with Unity * -* Linux development with C++ * -* Game development with C++ * -* Mobile development with C++ * -* Office/SharePoint development -* Mobile development with .NET -* .NET Core cross-platform development -* Visual Studio extension development * -* Python development * -* Mobile development with JavaScript * - -In addition the following optional components are installed: + +## Visual Studio 2017 Enterprise + +_Version:_ VisualStudio/15.9.19+28307.1000
+_Location:_ C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise + +The following workloads including required and recommended components are installed with Visual Studio 2017: + +* Universal Windows Platform development +* .NET desktop development +* Desktop development with C++ +* ASP.NET and web development +* Azure development +* Node.js development +* Data storage and processing +* Data science and analytical applications * +* Game development with Unity * +* Linux development with C++ * +* Game development with C++ * +* Mobile development with C++ * +* Office/SharePoint development +* Mobile development with .NET +* .NET Core cross-platform development +* Visual Studio extension development * +* Python development * +* Mobile development with JavaScript * + +In addition the following optional components are installed: * Microsoft.Net.Component.4.6.2.SDK * Microsoft.Net.Component.4.6.2.TargetingPack @@ -128,467 +127,455 @@ In addition the following optional components are installed: * Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre * Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre * Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre - -## SQL Server Data Tools for VS 2017 - -_Version:_ 15.1.61906.3130
- -The following components are installed: - -* SQL Server Data Tools -* SQL Server Analysis Services Designer -* SQL Server Integration Services Designer + +## SQL Server Data Tools for VS 2017 + +_Version:_ 15.1.61906.3130
+ +The following components are installed: + +* SQL Server Data Tools +* SQL Server Analysis Services Designer +* SQL Server Integration Services Designer * SQL Server Reporting Services Designers - -## WIX Tools - -_Toolset Version:_ 3.11.4516
-_WIX Toolset Studio 2017 Extension Version:_ 0.9.21.62588
-_Environment:_ + +## WIX Tools + +_Toolset Version:_ 3.11.4516
+_WIX Toolset Studio 2017 Extension Version:_ 0.9.21.62588
+_Environment:_ * WIX: Installation root of WIX - -## .NET 4.8 - + +## .NET 4.8 + _Version:_ 4.8.03761 - -## Windows Driver Kit - + +## Windows Driver Kit + _Version:_ 10.0.17763.0
- -## Azure Service Fabric - -_SDK Version:_ 3.3.617.9590
-_Runtime Version:_ 6.4.617.9590 - -## WinAppDriver - + +## Azure Service Fabric + +_SDK Version:_ 4.0.457.9590
+_Runtime Version:_ 7.0.457.9590 + +## WinAppDriver + _Version:_ 1.1.1809.18001
+ +## Android SDK Build Tools -## Android SDK Build Tools +#### 29.0.2 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\29.0.2 -#### 29.0.2 +#### 29.0.0 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\29.0.0 -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\29.0.2 +#### 28.0.3 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\28.0.3 -#### 29.0.0 +#### 28.0.2 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\28.0.2 -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\29.0.0 +#### 28.0.1 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\28.0.1 -#### 28.0.3 +#### 28.0.0 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\28.0.0 -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\28.0.3 +#### 27.0.3 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\27.0.3 -#### 28.0.2 +#### 27.0.2 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\27.0.2 -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\28.0.2 +#### 27.0.1 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\27.0.1 -#### 28.0.1 +#### 27.0.0 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\27.0.0 -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\28.0.1 +#### 26.0.3 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\26.0.3 -#### 28.0.0 +#### 26.0.2 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\26.0.2 -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\28.0.0 +#### 26.0.1 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\26.0.1 -#### 27.0.3 +#### 26.0.0 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\26.0.0 -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\27.0.3 +#### 25.0.3 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\25.0.3 -#### 27.0.2 +#### 25.0.2 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\25.0.2 -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\27.0.2 +#### 25.0.1 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\25.0.1 -#### 27.0.1 +#### 25.0.0 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\25.0.0 -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\27.0.1 +#### 24.0.3 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\24.0.3 -#### 27.0.0 +#### 24.0.2 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\24.0.2 -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\27.0.0 +#### 24.0.1 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\24.0.1 -#### 26.0.3 +#### 24.0.0 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\24.0.0 -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\26.0.3 +#### 23.0.3 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\23.0.3 -#### 26.0.2 +#### 23.0.2 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\23.0.2 -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\26.0.2 +#### 23.0.1 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\23.0.1 -#### 26.0.1 +#### 22.0.1 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\22.0.1 -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\26.0.1 +#### 21.1.2 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\21.1.2 -#### 26.0.0 +#### 20.0.0 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\20.0.0 -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\26.0.0 +#### 19.1.0 + +_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\19.1.0 -#### 25.0.3 + +## Android SDK Platforms -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\25.0.3 +#### 10 (API 29) + +_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-29 -#### 25.0.2 +#### 9 (API 28) + +_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-28 -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\25.0.2 +#### 8.1.0 (API 27) + +_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-27 -#### 25.0.1 +#### 8.0.0 (API 26) + +_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-26 -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\25.0.1 +#### 7.1.1 (API 25) + +_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-25 -#### 25.0.0 +#### 7.0 (API 24) + +_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-24 -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\25.0.0 +#### 6.0 (API 23) + +_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-23 -#### 24.0.3 +#### 5.1.1 (API 22) + +_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-22 -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\24.0.3 +#### 5.0.1 (API 21) + +_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-21 -#### 24.0.2 +#### 4.4.2 (API 19) + +_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-19 -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\24.0.2 - -#### 24.0.1 - -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\24.0.1 - -#### 24.0.0 - -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\24.0.0 - -#### 23.0.3 - -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\23.0.3 - -#### 23.0.2 - -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\23.0.2 - -#### 23.0.1 - -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\23.0.1 - -#### 22.0.1 - -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\22.0.1 - -#### 21.1.2 - -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\21.1.2 - -#### 20.0.0 - -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\20.0.0 - -#### 19.1.0 - -_Location:_ C:\Program Files (x86)\Android\android-sdk\build-tools\19.1.0 - - -## Android SDK Platforms - -#### 10 (API 29) - -_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-29 - -#### 9 (API 28) - -_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-28 - -#### 8.1.0 (API 27) - -_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-27 - -#### 8.0.0 (API 26) - -_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-26 - -#### 7.1.1 (API 25) - -_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-25 - -#### 7.0 (API 24) - -_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-24 - -#### 6.0 (API 23) - -_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-23 - -#### 5.1.1 (API 22) - -_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-22 - -#### 5.0.1 (API 21) - -_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-21 - -#### 4.4.2 (API 19) - -_Location:_ C:\Program Files (x86)\Android\android-sdk\platforms\android-19 - - -## Azure/AzureRM Powershell modules - -#### 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\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 - - -## TLS12 - -_Version:_ 1.2
+ +## TLS12 + +_Version:_ 1.2
_Description:_ .NET has been configured to use TLS 1.2 by default - -## Azure CLI - -_Version:_ 2.0.74 -_Environment:_ + +## Azure CLI + +_Version:_ 2.0.80 +_Environment:_ * PATH: contains location of az.cmd - -## Azure DevOps Cli extension - -_Version:_ azure-devops 0.13.0 - -## Python - -_Version:_ 2.7.16 (x64)
_Version:_ 2.7.16 (x86)
_Version:_ 3.4.4 (x64)
_Version:_ 3.4.4 (x86)
_Version:_ 3.5.4 (x64)
_Version:_ 3.5.4 (x86)
_Version:_ 3.6.8 (x64)
_Version:_ 3.6.8 (x86)
_Version:_ 3.7.4 (x64)
_Version:_ 3.7.4 (x86)

- -## PyPy - -_Version:_ 2.7.13 (x86)
_Version:_ 3.5.3 (x86)

- -## Ruby - -_Version:_ 2.4.6 (x64)
_Version:_ 2.5.5 (x64)
_Version:_ 2.6.3 (x64)

- -## Python (64 bit) - -#### Python 3.6.8 -_Environment:_ -* PATH: contains location of python.exe - -#### Python 2.7.16 - + +## Azure DevOps Cli extension + +_Version:_ azure-devops 0.17.0 + +## Python + +_Version:_ 2.7.17 (x64)
_Version:_ 3.5.4 (x64)
_Version:_ 3.6.8 (x64)
_Version:_ 3.7.6 (x64)
_Version:_ 3.8.1 (x64)
+ +## Python + +_Version:_ 2.7.17 (x64)
_Version:_ 3.5.4 (x64)
_Version:_ 3.6.8 (x64)
_Version:_ 3.7.6 (x64)
_Version:_ 3.8.1 (x64)
_Version:_ 2.7.17 (x86)
_Version:_ 3.5.4 (x86)
_Version:_ 3.6.8 (x86)
_Version:_ 3.7.6 (x86)
_Version:_ 3.8.1 (x86)
+ +## PyPy + +_Version:_ 2.7.13 (x86)
_Version:_ 3.6.9 (x86)
+ +## Ruby + +_Version:_ 2.4.9 (x64)
_Version:_ 2.5.7 (x64)
_Version:_ 2.6.5 (x64)
_Version:_ 2.7.0 (x64)
+ +## Python (64 bit) + +#### Python 3.6.8 +_Environment:_ +* PATH: contains location of python.exe + +#### Python 2.7.17 + _Location:_ C:/hostedtoolcache/windows/Python/2.7*/x64 - -## Git - -_Version:_ 2.23.0
-_Environment:_ + +## Git + +_Version:_ 2.25.0
+_Environment:_ * PATH: contains location of git.exe - -## Git Large File Storage (LFS) - -_Version:_ 2.8.0
-_Environment:_ -* PATH: contains location of git-lfs.exe + +## Git Large File Storage (LFS) + +_Version:_ 2.9.2
+_Environment:_ +* PATH: contains location of git-lfs.exe * GIT_LFS_PATH: location of git-lfs.exe + +## Go (x64) + +#### 1.9.7 + +_Environment:_ +* GOROOT_1_9_X64: root directory of the Go 1.9.7 installation -## Go (x64) +#### 1.10.8 + +_Environment:_ +* GOROOT_1_10_X64: root directory of the Go 1.10.8 installation -#### 1.9.7 +#### 1.11.12 + +_Environment:_ +* GOROOT_1_11_X64: root directory of the Go 1.11.12 installation -_Environment:_ -* GOROOT_1_9_X64: root directory of the Go 1.9.7 installation - -#### 1.10.8 - -_Environment:_ -* GOROOT_1_10_X64: root directory of the Go 1.10.8 installation - -#### 1.11.12 - -_Environment:_ -* GOROOT_1_11_X64: root directory of the Go 1.11.12 installation - -#### 1.12.7 - -_Environment:_ -* PATH: contains the location of go.exe version 1.12.7 -* GOROOT: root directory of the Go 1.12.7 installation +#### 1.12.7 + +_Environment:_ +* PATH: contains the location of go.exe version 1.12.7 +* GOROOT: root directory of the Go 1.12.7 installation * GOROOT_1_12_X64: root directory of the Go 1.12.7 installation -#### 1.13 - -_Environment:_ -* GOROOT_1_13_X64: root directory of the Go 1.13 installation +#### 1.13 + +_Environment:_ +* GOROOT_1_13_X64: root directory of the Go 1.13 installation - -## Boost - -#### - -* PATH: contains the location of Boost version -* BOOST_ROOT: root directory of the Boost version installation + +## Boost + +#### + +* PATH: contains the location of Boost version +* BOOST_ROOT: root directory of the Boost version installation * BOOST_ROOT_1_69_0: root directory of the Boost version installation - -## PHP (x64) - -#### 7.3.10 - -_Environment:_ -* PATH: contains the location of php.exe version 7.3.10 -* PHPROOT: root directory of the PHP 7.3.10 installation - -## Ruby (x64) - -#### 2.5.5p157 -_Environment:_ -* Location: C:\hostedtoolcache\windows\Ruby\2.5.5\x64\bin -* PATH: contains the location of ruby.exe version 2.5.5p157 - -## Rust (64-bit) - -#### 1.38.0 -_Location:_ C:\Rust\.cargo\bin -_Environment:_ + +## PHP (x64) + +#### 7.4.1 + +_Environment:_ +* PATH: contains the location of php.exe version 7.4.1 +* PHPROOT: root directory of the PHP 7.4.1 installation + +## Ruby (x64) + +#### 2.5.7p206 +_Environment:_ +* Location: C:\hostedtoolcache\windows\Ruby\2.5.7\x64\bin +* PATH: contains the location of ruby.exe version 2.5.7p206 + +## Rust (64-bit) + +#### 1.40.0 +_Location:_ C:\Rust\.cargo\bin +_Environment:_ * PATH: contains the location of rustc.exe + +## sbt + -## Subversion - -_Version:_ 1.8.17
-_Environment:_ + +## Subversion + +_Version:_ 1.8.17
+_Environment:_ * PATH: contains location of svn.exe + +## Google Chrome + +_version:_ +79.0.3945.130 + +## Mozilla Firefox + +_version:_ +72.0.1 + +## Selenium Web Drivers + + +#### Chrome Driver + +_version:_ +79.0.3945.36 + +_Environment:_ +* ChromeWebDriver: location of chromedriver.exe + +#### Gecko Driver + +_version:_ +0.24.0 + +_Environment:_ +* GeckoWebDriver: location of geckodriver.exe + +#### IE Driver + +_version:_ +3.8.0.0 + +_Environment:_ +* IEWebDriver: location of IEDriverServer.exe -## Google Chrome + +## Node.js + +_Version:_ 12.14.1
+_Architecture:_ x64
+_Environment:_ +* PATH: contains location of node.exe
+* Gulp CLI version: 2.2.0 Local version: Unknown
+* Grunt grunt-cli v1.3.2
+* Yarn 1.21.1
-_version:_ -77.0.3865.90 - -## Mozilla Firefox - -_version:_ -69.0.1 - -## Selenium Web Drivers - - -#### Chrome Driver - -_version:_ -77.0.3865.40 - -_Environment:_ -* ChromeWebDriver: location of chromedriver.exe - -#### Gecko Driver - -_version:_ -0.24.0 - -_Environment:_ -* GeckoWebDriver: location of geckodriver.exe - -#### IE Driver - -_version:_ -3.8.0.0 - -_Environment:_ -* IEWebDriver: location of IEDriverServer.exe - - -## Node.js - -_Version:_ 10.16.3
-_Architecture:_ x64
-_Environment:_ -* PATH: contains location of node.exe
-* Gulp CLI version: 2.2.0 Local version: Unknown
-* Grunt grunt-cli v1.3.2
-* Bower 1.8.8
-* Yarn 1.19.1
- -## npm - -_Version:_ 6.9.0
-_Environment:_ + +## npm + +_Version:_ 6.13.4
+_Environment:_ * PATH: contains location of npm.cmd - -## Java Development Kit - -#### 1.8.0_222 - -_Environment:_ -* JAVA_HOME: location of JDK -* PATH: contains bin folder of JDK - -#### 1.7.0_232 - -_Location:_ C:\Program Files\Java\zulu-7-azure-jdk_7.31.0.5-7.0.232-win_x64 - -#### 11.0.4 - -_Location:_ C:\Program Files\Java\zulu-11-azure-jdk_11.33.15-11.0.4-win_x64 - -## Ant - -_Version:_ 1.10.5
-_Environment:_ -* PATH: contains location of ant.cmd -* ANT_HOME: location of ant.cmd + +## Java Development Kit + +#### 1.8.0_222 + +_Environment:_ +* JAVA_HOME: location of JDK +* PATH: contains bin folder of JDK + +#### 1.7.0_232 + +_Location:_ C:\Program Files\Java\zulu-7-azure-jdk_7.31.0.5-7.0.232-win_x64 + +#### 1.7.0_232 + +_Location:_ + +## Ant + +_Version:_ 1.10.5
+_Environment:_ +* PATH: contains location of ant.cmd +* ANT_HOME: location of ant.cmd * COBERTURA_HOME: location of cobertura-2.1.1.jar - -## Maven - -_Version:_ 3.6.2
-_Environment:_ -* PATH: contains location of mvn.bat + +## Maven + +_Version:_ 3.6.2
+_Environment:_ +* PATH: contains location of mvn.bat * M2_HOME: Maven installation root - -## Gradle - -_Version:_ 5.6.2
-_Environment:_ + +## Gradle + +_Version:_ 6.0.1
+_Environment:_ * PATH: contains location of gradle - -## Cmake - -_Version:_ 3.15.4
-_Environment:_ + +## Cmake + +_Version:_ 3.16.2
+_Environment:_ * PATH: contains location of cmake.exe - -## SQL Server Data Tier Application Framework (x64) - + +## SQL Server Data Tier Application Framework (x64) + _Version:_ 15.0.4538.1
- -## .NET Core - -The following runtimes and SDKs are installed: - -_Environment:_ -* PATH: contains location of dotnet.exe - + +## .NET Core + +The following runtimes and SDKs are installed: + +_Environment:_ +* PATH: contains location of dotnet.exe + _SDK:_ +* 3.1.101 C:\Program Files\dotnet\sdk\3.1.101 +* 3.1.100 C:\Program Files\dotnet\sdk\3.1.100 +* 3.0.102 C:\Program Files\dotnet\sdk\3.0.102 +* 3.0.101 C:\Program Files\dotnet\sdk\3.0.101 +* 3.0.100 C:\Program Files\dotnet\sdk\3.0.100 * 2.2.402 C:\Program Files\dotnet\sdk\2.2.402 * 2.2.401 C:\Program Files\dotnet\sdk\2.2.401 * 2.2.301 C:\Program Files\dotnet\sdk\2.2.301 * 2.2.300 C:\Program Files\dotnet\sdk\2.2.300 +* 2.2.207 C:\Program Files\dotnet\sdk\2.2.207 * 2.2.206 C:\Program Files\dotnet\sdk\2.2.206 * 2.2.205 C:\Program Files\dotnet\sdk\2.2.205 * 2.2.204 C:\Program Files\dotnet\sdk\2.2.204 * 2.2.203 C:\Program Files\dotnet\sdk\2.2.203 * 2.2.202 C:\Program Files\dotnet\sdk\2.2.202 +* 2.2.110 C:\Program Files\dotnet\sdk\2.2.110 * 2.2.109 C:\Program Files\dotnet\sdk\2.2.109 * 2.2.108 C:\Program Files\dotnet\sdk\2.2.108 * 2.2.107 C:\Program Files\dotnet\sdk\2.2.107 @@ -599,15 +586,20 @@ _SDK:_ * 2.2.102 C:\Program Files\dotnet\sdk\2.2.102 * 2.2.101 C:\Program Files\dotnet\sdk\2.2.101 * 2.2.100 C:\Program Files\dotnet\sdk\2.2.100 +* 2.1.803 C:\Program Files\dotnet\sdk\2.1.803 * 2.1.802 C:\Program Files\dotnet\sdk\2.1.802 * 2.1.801 C:\Program Files\dotnet\sdk\2.1.801 * 2.1.701 C:\Program Files\dotnet\sdk\2.1.701 * 2.1.700 C:\Program Files\dotnet\sdk\2.1.700 +* 2.1.608 C:\Program Files\dotnet\sdk\2.1.608 +* 2.1.607 C:\Program Files\dotnet\sdk\2.1.607 * 2.1.606 C:\Program Files\dotnet\sdk\2.1.606 * 2.1.605 C:\Program Files\dotnet\sdk\2.1.605 * 2.1.604 C:\Program Files\dotnet\sdk\2.1.604 * 2.1.603 C:\Program Files\dotnet\sdk\2.1.603 * 2.1.602 C:\Program Files\dotnet\sdk\2.1.602 +* 2.1.511 C:\Program Files\dotnet\sdk\2.1.511 +* 2.1.510 C:\Program Files\dotnet\sdk\2.1.510 * 2.1.509 C:\Program Files\dotnet\sdk\2.1.509 * 2.1.508 C:\Program Files\dotnet\sdk\2.1.508 * 2.1.507 C:\Program Files\dotnet\sdk\2.1.507 @@ -625,8 +617,14 @@ _SDK:_ * 2.1.300 C:\Program Files\dotnet\sdk\2.1.300 * 2.1.202 C:\Program Files\dotnet\sdk\2.1.202 * 1.1.14 C:\Program Files\dotnet\sdk\1.1.14 - + _Runtime:_ +* 3.1.1 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.1.1 +* 3.1.0 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.1.0 +* 3.0.2 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.0.2 +* 3.0.1 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.0.1 +* 3.0.0 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.0.0 +* 2.2.8 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.2.8 * 2.2.7 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.2.7 * 2.2.6 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.2.6 * 2.2.5 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.2.5 @@ -643,6 +641,8 @@ _Runtime:_ * 2.1.4 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.4 * 2.1.3 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.3 * 2.1.2 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.2 +* 2.1.15 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.15 +* 2.1.14 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.14 * 2.1.13 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.13 * 2.1.12 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.12 * 2.1.11 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.1.11 @@ -652,77 +652,89 @@ _Runtime:_ * 2.0.9 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.0.9 * 1.1.13 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\1.1.13 * 1.0.16 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\1.0.16 - -## Mysql - -_Version:_ 5.7.21.0
-_Environment:_ + +## Mysql + +_Version:_ 5.7.21.0
+_Environment:_ * PATH: contains location of mysql.exe - -## SQLPS - + +## SQLPS + _Version:_ 1.0 - -## SQLServer PS - -_Version:_ 21.1.18179 - -## MinGW - -_Version:_ 8.1.0
-_Environment:_ + +## SQLServer PS + +_Version:_ 21.1.18218 + +## MinGW + +_Version:_ 8.1.0
+_Environment:_ * PATH: contains location of the MinGW 'bin' directory - -## TypeScript - -_Version:_ Version 3.6.3
- -## Miniconda - -_Version:_ conda 4.6.14
-_Environment:_ + +## TypeScript + +_Version:_ Version 3.7.5
+ +## Miniconda + +_Version:_ conda 4.6.14
+_Environment:_ * CONDA: contains location of the root of the Miniconda installation - -## Azure CosmosDb Emulator - -_Version:_ 2.5.7.0
+ +## Azure CosmosDb Emulator + +_Version:_ 2.7.2.0
_Location:_ C:\Program Files\Azure Cosmos DB Emulator\ - -## 7zip - + +## 7zip + _Version:_ 19.00
- -## Mercurial - + +## Mercurial + _Version:_
- -## jq - + +## jq + _Version:_ jq-1.6
- -## Inno Setup - -_Version:_ 6.0.2
- -## Perl - + +## Inno Setup + +_Version:_ 6.0.3
+ +## Perl + _Version:_ v5.26.2
- -## GitVersion - -_Version:_ 5.0.1.0
- -## OpenSSL - -_Version:_ 1.1.1c at C:\Program Files\Git\usr\bin\openssl.exe
_Version:_ 1.1.1c at C:\Program Files\Git\mingw64\bin\openssl.exe
_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe
_Version:_ 1.1.1b at C:\Strawberry\c\bin\openssl.exe
_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe
- -## Cloud Foundry CLI - -_Version:_ 6.46.1
- -## Vcpkg - -_Version:_ 2019.09.12-nohash
-_Environment:_ -* PATH: contains location of the vcpkg directory + +## GitVersion + +_Version:_ 5.1.3.0
+ +## OpenSSL + +_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe
_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe
_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe
_Version:_ 1.1.1c at C:\Strawberry\c\bin\openssl.exe
_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe
+ +## Cloud Foundry CLI + +_Version:_ 6.49.0
+ +## Vcpkg + +_Version:_ 2020.01.17-nohash
+_Environment:_ +* PATH: contains location of the vcpkg directory * VCPKG_INSTALLATION_ROOT: root directory of the vcpkg installation + +## Kubectl + +_Version:_ Client Version: v1.17.1
+_Environment:_ +* PATH: contains location of kubectl.exe + +## Kind + +_Version:_ v0.5.1
+_Environment:_ +* PATH: contains location of kind.exe diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index 24cae0e11..657f76b77 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -323,6 +323,12 @@ "{{ template_dir }}/scripts/Installers/Install-Chrome.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Edge.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -349,6 +355,12 @@ "elevated_user": "{{user `install_user`}}", "elevated_password": "{{user `install_password`}}" }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -630,6 +642,12 @@ "{{ template_dir }}/scripts/Installers/Validate-Chrome.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Edge.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -774,6 +792,12 @@ "{{ template_dir }}/scripts/Installers/Validate-Vcpkg.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-VSWhere.ps1" + ] + }, { "type": "powershell", "scripts":[ diff --git a/images/win/scripts/Installers/Install-Edge.ps1 b/images/win/scripts/Installers/Install-Edge.ps1 new file mode 100644 index 000000000..e5a641a1b --- /dev/null +++ b/images/win/scripts/Installers/Install-Edge.ps1 @@ -0,0 +1,6 @@ +################################################################################ +## File: Install-Edge.ps1 +## Desc: Install latest stable version of Microsoft Edge browser +################################################################################ + +choco install microsoft-edge -y diff --git a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 b/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 index 1ea4fa84d..c6e1b3c24 100644 --- a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 +++ b/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 @@ -17,11 +17,13 @@ catch { Expand-Archive -Path $DriversZipFile -DestinationPath $DestinationPath -Force; Remove-Item $DriversZipFile; -$ChromeDriverPath = "$DestinationPath\SeleniumWebDrivers\ChromeDriver"; +$ChromeDriverPath = "${DestinationPath}SeleniumWebDrivers\ChromeDriver"; Write-Host "Chrome driver path: [$ChromeDriverPath]"; Remove-Item -Path "$ChromeDriverPath\*" -Force; -$ChromePath = (Get-ItemProperty 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\chrome.exe').'(default)'; +# Reinstall Chrome Web Driver +$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]"; @@ -44,16 +46,39 @@ 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"; +# 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 GeckoWebDriver "C:\SeleniumWebDrivers\GeckoDriver" /M; -setx ChromeWebDriver "C:\SeleniumWebDrivers\ChromeDriver" /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 += ";C:\SeleniumWebDrivers\ChromeDriver\"; +$PathValue += ";$ChromeDriverPath\"; +$PathValue += ";$EdgeDriverPath\"; Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue; exit 0; - diff --git a/images/win/scripts/Installers/Install-VSWhere.ps1 b/images/win/scripts/Installers/Install-VSWhere.ps1 new file mode 100644 index 000000000..d60986540 --- /dev/null +++ b/images/win/scripts/Installers/Install-VSWhere.ps1 @@ -0,0 +1,6 @@ +################################################################################ +## File: Install-VSWhere.ps1 +## Desc: Install latest stable version of VSWhere +################################################################################ + +choco install vswhere -y diff --git a/images/win/scripts/Installers/Validate-Edge.ps1 b/images/win/scripts/Installers/Validate-Edge.ps1 new file mode 100644 index 000000000..7ca51da59 --- /dev/null +++ b/images/win/scripts/Installers/Validate-Edge.ps1 @@ -0,0 +1,25 @@ +################################################################################ +## File: Validate-Edge.ps1 +## Desc: Validate Microsoft Edge installation. +################################################################################ + +$RegistryKey = "HKLM:SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\msedge.exe" +if (Test-Path $RegistryKey) +{ + $SoftwareName = "Microsoft Edge" + $VersionInfo = (Get-Item (Get-ItemProperty $RegistryKey).'(Default)').VersionInfo + $VersionInfo + $Description = @" +_version:_ +$($VersionInfo.FileVersion) +"@ + + Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description + + exit 0 +} +else +{ + Write-Host "Microsoft Edge is not installed." + exit 1 +} diff --git a/images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1 b/images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1 index 44c69ef2e..9a68c72bd 100644 --- a/images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1 +++ b/images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1 @@ -6,24 +6,36 @@ $IEDriverPath = $env:IEWebDriver $GeckoDriverPath = $env:GeckoWebDriver $ChromeDriverPath = $env:ChromeWebDriver +$EdgeDriverPath = $env:EdgeWebDriver + +if ( + ($IEDriverPath -like "C:\SeleniumWebDrivers\IEDriver") -and + ($GeckoDriverPath -like "C:\SeleniumWebDrivers\GeckoDriver") -and + ($ChromeDriverPath -like "C:\SeleniumWebDrivers\ChromeDriver") -and + ($EdgeDriverPath -like "C:\SeleniumWebDrivers\EdgeDriver") +) +{ -if(($IEDriverPath -like "C:\SeleniumWebDrivers\IEDriver") -and ($GeckoDriverPath -like "C:\SeleniumWebDrivers\GeckoDriver") -and ($ChromeDriverPath -like "C:\SeleniumWebDrivers\ChromeDriver")) -{ - Write-Host "IEDriver installed at " - (Get-Item "C:\SeleniumWebDrivers\IEDriver\IEDriverServer.exe").VersionInfo - - + (Get-Item "$IEDriverPath\IEDriverServer.exe").VersionInfo + + Write-Host "Gecko Driver installed at " - (Get-Item "C:\SeleniumWebDrivers\GeckoDriver\geckodriver.exe").VersionInfo - - + (Get-Item "$GeckoDriverPath\geckodriver.exe").VersionInfo + + Write-Host "Chrome Driver installed at " - (Get-Item "C:\SeleniumWebDrivers\ChromeDriver\chromedriver.exe").VersionInfo - - $chromedriverversion = Get-Content -Path "C:\SeleniumWebDrivers\ChromeDriver\versioninfo.txt" - $geckodriverversion = Get-Content -Path "C:\SeleniumWebDrivers\GeckoDriver\versioninfo.txt" - $iedriverversion = Get-Content -Path "C:\SeleniumWebDrivers\IEDriver\versioninfo.txt" + (Get-Item "$ChromeDriverPath\chromedriver.exe").VersionInfo + + + Write-Host "Edge Driver installed at " + (Get-Item "$EdgeDriverPath\msedgedriver.exe").VersionInfo + + $versionFileName = "versioninfo.txt"; + $chromedriverversion = Get-Content -Path "$IEDriverPath\$versionFileName" + $geckodriverversion = Get-Content -Path "$GeckoDriverPath\$versionFileName" + $iedriverversion = Get-Content -Path "$ChromeDriverPath\$versionFileName" + $edgedriverversion = Get-Content -Path "$EdgeDriverPath\$versionFileName" # Adding description of the software to Markdown $SoftwareName = "Selenium Web Drivers" @@ -54,10 +66,18 @@ $iedriverversion _Environment:_ * IEWebDriver: location of IEDriverServer.exe +#### Microsoft Edge Driver + +_version:_ +$edgedriverversion + +_Environment:_ +* EdgeWebDriver: location of msedgedriver.exe + "@ Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description - + exit 0 } else diff --git a/images/win/scripts/Installers/Validate-VSWhere.ps1 b/images/win/scripts/Installers/Validate-VSWhere.ps1 new file mode 100644 index 000000000..7b41519c4 --- /dev/null +++ b/images/win/scripts/Installers/Validate-VSWhere.ps1 @@ -0,0 +1,25 @@ +################################################################################ +## File: Validate-VSWhere.ps1 +## Desc: Validate vswhere +################################################################################ + +if(Get-Command -Name 'vswhere') +{ + Write-Host "vswhere $(vswhere) on path" +} +else +{ + Write-Host "vswhere is not on path" + exit 1 +} + +# Adding description of the software to Markdown +$SoftwareName = "VSWhere" +$VswhereVersion = $(vswhere) + +$Description = @" +_Version_: $VswhereVersion
+* PATH: contains location of vswhere.exe +"@ + +Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description \ No newline at end of file diff --git a/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1 b/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1 index e22d9da8d..7998f1cb7 100644 --- a/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1 +++ b/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1 @@ -92,6 +92,7 @@ else { } # Run the installer +[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" Invoke-Expression ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')) # Turn off confirmation diff --git a/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1 b/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1 index 09567e71a..9930e6a6d 100644 --- a/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1 +++ b/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1 @@ -92,6 +92,7 @@ else { } # Run the installer +[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" Invoke-Expression ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')) # Turn off confirmation diff --git a/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 b/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 index 59a192d52..ac76288b8 100644 --- a/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 +++ b/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 @@ -113,6 +113,7 @@ $WorkLoads = '--allWorkloads --includeRecommended ' + ` '--add Microsoft.VisualStudio.Component.Windows10SDK.17134 ' + ` '--add Microsoft.VisualStudio.Component.Windows10SDK.17763 ' + ` '--add Microsoft.VisualStudio.Component.Windows10SDK.18362 ' + ` + '--add Microsoft.VisualStudio.Component.WinXP ' + ` '--add Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices ' + ` '--add Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools ' + ` '--add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang ' + `