From c90c5e0bafd24733e2fd206a6b711136a12c04fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Andr=C3=A9-Chang?= Date: Sat, 22 Feb 2020 14:52:47 +0000 Subject: [PATCH 01/35] Install clang-format --- images/linux/scripts/installers/clang.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh index 0a7f2252f..4d3373c9a 100644 --- a/images/linux/scripts/installers/clang.sh +++ b/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 From 693f0c23be2cb1c46f6a1cbe9eb71f14b32e20d7 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Wed, 18 Dec 2019 11:44:32 -0800 Subject: [PATCH 02/35] Update to helm 3 xref: https://helm.sh/docs/intro/install/#from-script Signed-off-by: Tamal Saha --- images/linux/scripts/installers/1604/kubernetes-tools.sh | 2 +- images/linux/scripts/installers/1804/kubernetes-tools.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/1604/kubernetes-tools.sh b/images/linux/scripts/installers/1604/kubernetes-tools.sh index 448ecd05b..4855dc716 100644 --- a/images/linux/scripts/installers/1604/kubernetes-tools.sh +++ b/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" diff --git a/images/linux/scripts/installers/1804/kubernetes-tools.sh b/images/linux/scripts/installers/1804/kubernetes-tools.sh index ba6f0aa03..38659028f 100644 --- a/images/linux/scripts/installers/1804/kubernetes-tools.sh +++ b/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" From cce8e66567e75b17398c09ce0182a6557a8db259 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Mon, 2 Mar 2020 17:55:37 +0300 Subject: [PATCH 03/35] Add v141 spectre mitigations --- .../win/scripts/Installers/Windows2019/Install-VS2019.ps1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 b/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 index 6e631c4bb..006eb8687 100644 --- a/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 +++ b/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 @@ -112,6 +112,12 @@ $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.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 ' + ` From 270b2c92af744e59019dd64e2269a4d13df18bc3 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Tue, 3 Mar 2020 10:56:56 +0300 Subject: [PATCH 04/35] add Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre --- images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 b/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 index 006eb8687..cbf828774 100644 --- a/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 +++ b/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 @@ -112,6 +112,7 @@ $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.ATL.ARM.Spectre ' + ` '--add Microsoft.VisualStudio.Component.VC.v141.ATL.ARM64.Spectre ' + ` '--add Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre ' + ` From 7223f36f155c0eb9887834b1ce5af9c1fd2ee16b Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Tue, 3 Mar 2020 23:19:34 +0300 Subject: [PATCH 05/35] change perl installation order --- images/win/Windows2016-Azure.json | 12 ++++++------ images/win/Windows2019-Azure.json | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index cef6db8db..988f05c36 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -304,6 +304,12 @@ "{{ template_dir }}/scripts/Installers/Windows2016/Install-Python.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Perl.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -522,12 +528,6 @@ "{{ template_dir }}/scripts/Installers/Install-InnoSetup.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Install-Perl.ps1" - ] - }, { "type": "powershell", "scripts":[ diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index f143d07bd..1e2450d56 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -273,6 +273,12 @@ "{{ template_dir }}/scripts/Installers/Windows2019/Install-Python.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Perl.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -491,12 +497,6 @@ "{{ template_dir }}/scripts/Installers/Install-InnoSetup.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Install-Perl.ps1" - ] - }, { "type": "powershell", "scripts":[ From 50e5c3fed07f7e3ac3747e81a8ce429013b1acb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Sicard-Ram=C3=ADrez?= Date: Wed, 4 Mar 2020 00:31:14 -0500 Subject: [PATCH 06/35] Supported GHC 8.8.3. (#483) --- images/linux/scripts/installers/haskell.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/haskell.sh b/images/linux/scripts/installers/haskell.sh index 14429e92d..05e430df0 100644 --- a/images/linux/scripts/installers/haskell.sh +++ b/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))" From 53e3f34f60a0b41fd9c7dab634a14cc71afd0990 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Wed, 4 Mar 2020 17:06:38 +0300 Subject: [PATCH 07/35] add v141 ARM + ARM64 spectre --- images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 b/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 index cbf828774..a9658fd72 100644 --- a/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 +++ b/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 @@ -113,6 +113,8 @@ $WorkLoads = '--allWorkloads --includeRecommended ' + ` '--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 ' + ` From 0c87ef9fff0605c4038b577263f14f225fd5d63f Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Wed, 4 Mar 2020 17:14:02 +0300 Subject: [PATCH 08/35] move perl validation scripts for consistency --- images/win/Windows2016-Azure.json | 12 ++++++------ images/win/Windows2019-Azure.json | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index 988f05c36..b427acf8e 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -619,6 +619,12 @@ "{{ template_dir }}/scripts/Installers/Validate-Python.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Perl.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -801,12 +807,6 @@ "{{ template_dir }}/scripts/Installers/Validate-InnoSetup.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Validate-Perl.ps1" - ] - }, { "type": "powershell", "scripts":[ diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index 1e2450d56..1db1d6a1f 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -588,6 +588,12 @@ "{{ template_dir }}/scripts/Installers/Validate-Python.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Perl.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -764,12 +770,6 @@ "{{ template_dir }}/scripts/Installers/Validate-InnoSetup.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Validate-Perl.ps1" - ] - }, { "type": "powershell", "scripts":[ From c6bf6c3b7bfd405d3ad1b65c821bf3707f2e9a58 Mon Sep 17 00:00:00 2001 From: Niels <12247711+nielsvbrecht@users.noreply.github.com> Date: Wed, 4 Mar 2020 15:42:36 +0100 Subject: [PATCH 09/35] Install packer on build agent - issue #280 (#295) * create packer.sh deployment file Copy from terraform.sh * add packer.sh to provisioner add packer.sh script to provisioner to install packer. * add packer.sh to provisioner Add packer.sh script to provisioner to install packer * remove blank lines removed blank lines as requested in feedback by alepauly. * remove additional blank lines * Add Install-Packer.ps1 This script installs packer on Windows through chocolatey * Create Validate-Packer.ps1 This script validates the installation of Packer from Install-Packer.ps1 and adds the software details to the markdown files. * Add Packer install and validate script Added Packer install script and validate script to provisioners. * Add Packer install script and validation script Add Packer install and validation script to provisioners. --- images/linux/scripts/installers/packer.sh | 25 +++++++++++++++++++ images/linux/ubuntu1604.json | 1 + images/linux/ubuntu1804.json | 1 + images/win/Windows2016-Azure.json | 12 +++++++++ images/win/Windows2019-Azure.json | 12 +++++++++ .../win/scripts/Installers/Install-Packer.ps1 | 6 +++++ .../scripts/Installers/Validate-Packer.ps1 | 24 ++++++++++++++++++ 7 files changed, 81 insertions(+) create mode 100644 images/linux/scripts/installers/packer.sh create mode 100644 images/win/scripts/Installers/Install-Packer.ps1 create mode 100644 images/win/scripts/Installers/Validate-Packer.ps1 diff --git a/images/linux/scripts/installers/packer.sh b/images/linux/scripts/installers/packer.sh new file mode 100644 index 000000000..cba8dfb7b --- /dev/null +++ b/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))" diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 7cedc0c8c..62700c4b9 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -166,6 +166,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", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index beec3c29f..d825cc858 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -169,6 +169,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", diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index cef6db8db..f5632891c 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -282,6 +282,12 @@ "scripts":[ "{{ template_dir }}/scripts/Installers/Install-7zip.ps1" ] + }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Packer.ps1" + ] }, { "type": "file", @@ -777,6 +783,12 @@ "{{ template_dir }}/scripts/Installers/Validate-7zip.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Packer.ps1" + ] + }, { "type": "powershell", "scripts":[ diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index f143d07bd..4bf69c257 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -252,6 +252,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", @@ -745,6 +751,12 @@ "scripts":[ "{{ template_dir }}/scripts/Installers/Validate-7zip.ps1" ] + }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Packer.ps1" + ] }, { "type": "powershell", diff --git a/images/win/scripts/Installers/Install-Packer.ps1 b/images/win/scripts/Installers/Install-Packer.ps1 new file mode 100644 index 000000000..4374175d1 --- /dev/null +++ b/images/win/scripts/Installers/Install-Packer.ps1 @@ -0,0 +1,6 @@ +################################################################################ +## File: Install-Packer.ps1 +## Desc: Install Packer +################################################################################ + +choco install packer -y diff --git a/images/win/scripts/Installers/Validate-Packer.ps1 b/images/win/scripts/Installers/Validate-Packer.ps1 new file mode 100644 index 000000000..250c6f696 --- /dev/null +++ b/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).Split("") + +$Description = @" +_Version:_ $PackerVersion.Item(1)
+"@ + +Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description From 15f15ddc7203e17bd309d0a075d3326e642346e6 Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Wed, 4 Mar 2020 15:48:43 +0000 Subject: [PATCH 10/35] Updating readme file for AzP.20200301.ubuntu18.1 version 20200301 --- images/linux/Ubuntu1804-README.md | 37 ++++++++++++++++++------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index d21aac883..4b35378c3 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/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 (Docker version 3.0.10+azure, build 99c5edceb48d64c1aa5d09b8c9c499d431d98bb9) +- Docker-Moby (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 From 35dfbf86785ac2227c6ed260a0d7e028aec0d6d1 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Wed, 4 Mar 2020 20:54:00 +0300 Subject: [PATCH 11/35] Update Android SDK Build-Tools to 29.0.3 in Ubuntu and Windows (#495) * Added Android SDK Build-Tools 29.0.3 * Android-SDK build-tools have been added --- images/linux/scripts/installers/1604/android.sh | 2 ++ images/linux/scripts/installers/1804/android.sh | 2 ++ images/win/scripts/Installers/Update-AndroidSDK.ps1 | 1 + 3 files changed, 5 insertions(+) diff --git a/images/linux/scripts/installers/1604/android.sh b/images/linux/scripts/installers/1604/android.sh index a2017cc3b..95a44edcf 100644 --- a/images/linux/scripts/installers/1604/android.sh +++ b/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" diff --git a/images/linux/scripts/installers/1804/android.sh b/images/linux/scripts/installers/1804/android.sh index 0c1fcad88..716f8bb19 100644 --- a/images/linux/scripts/installers/1804/android.sh +++ b/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" diff --git a/images/win/scripts/Installers/Update-AndroidSDK.ps1 b/images/win/scripts/Installers/Update-AndroidSDK.ps1 index 559f69c14..0487bb4ee 100644 --- a/images/win/scripts/Installers/Update-AndroidSDK.ps1 +++ b/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" ` From 8abaa49b2e06dd5f29096d15bc37da880e0ff78f Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Wed, 4 Mar 2020 20:08:27 +0000 Subject: [PATCH 12/35] Updating readme file for AzP.20200301.ubuntu16.1 version 20200301 --- images/linux/Ubuntu1604-README.md | 37 ++++++++++++++++++------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index ded40bfd5..a00a4084a 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/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 (Docker version 3.0.10+azure, build 99c5edceb48d64c1aa5d09b8c9c499d431d98bb9) +- Docker-Moby (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 From a94c37ae3ed3a0cf19d48a1a00deda8b75d355c5 Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Wed, 4 Mar 2020 22:39:49 +0000 Subject: [PATCH 13/35] Updating readme file for AzP.20200301.win16.1 version 20200301 --- images/win/Windows2016-Readme.md | 86 ++++++++++++++++++++++++++------ 1 file changed, 70 insertions(+), 16 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index effe0c220..a130be1b3 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2016 -The following software is installed on machines with the 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 @@ -336,23 +336,73 @@ 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 - +_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 - +_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 - +_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 +_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)
_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)
+_Version:_ 2.7.17 (x64)
_Version:_ 3.5.4 (x64)
_Version:_ 3.6.8 (x64)
_Version:_ 3.7.6 (x64)
_Version:_ 3.8.2 (x64)
_Version:_ 2.7.17 (x86)
_Version:_ 3.5.4 (x86)
_Version:_ 3.6.8 (x86)
_Version:_ 3.7.6 (x86)
_Version:_ 3.8.2 (x86)
## PyPy @@ -393,13 +443,13 @@ _Location:_ C:/hostedtoolcache/windows/Python/2.7*/x64 ## Git -_Version:_ 2.25.0
+_Version:_ 2.25.1
_Environment:_ * PATH: contains location of git.exe ## Git Large File Storage (LFS) -_Version:_ 2.9.2
+_Version:_ 2.10.0
_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
+_Version:_ Version 3.8.3
## Miniconda @@ -736,7 +786,7 @@ _Environment:_ ## Azure CosmosDb Emulator -_Version:_ 2.9.1.0
+_Version:_ 2.9.2.0
_Location:_ C:\Program Files\Azure Cosmos DB Emulator\ ## 7zip @@ -769,7 +819,7 @@ _Version:_ 5.1.3.0
## OpenSSL -_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe
_Version:_ 1.1.1d 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.1c at C:\Strawberry\c\bin\openssl.exe
_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe
+_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe
_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe
_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe
_Version:_ 1.1.1c at C:\Strawberry\c\bin\openssl.exe
_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe
## Cloud Foundry CLI @@ -793,3 +843,7 @@ _Environment:_ _Version:_ kind v0.7.0 go1.13.6 windows/amd64
_Environment:_ * PATH: contains location of kind.exe + +## bazel + +_Version:_ bazel 2.1.0
From 5a2acbc6f0d775b70570ce19a3453e251c77a390 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 5 Mar 2020 10:30:24 +0300 Subject: [PATCH 14/35] Add Bazelisk support to Linux and Windows (#490) * added bazelisk * moved bazelisk installation to bazel * changed Validate-Bazel.ps1 * removed Install-Bazelisk.ps1 * changed bazel and bazelisk version output * fixed Validate-Bazel.ps1 * removed the extra "$" character --- images/linux/scripts/installers/bazel.sh | 15 +++++++++-- images/linux/ubuntu1604.json | 2 +- images/linux/ubuntu1804.json | 2 +- images/win/Windows2016-Azure.json | 24 +++++++++--------- .../win/scripts/Installers/Install-Bazel.ps1 | 6 +++-- .../win/scripts/Installers/Validate-Bazel.ps1 | 25 +++++++++++++++++-- 6 files changed, 54 insertions(+), 20 deletions(-) diff --git a/images/linux/scripts/installers/bazel.sh b/images/linux/scripts/installers/bazel.sh index fcc8f03dd..d6649fcee 100644 --- a/images/linux/scripts/installers/bazel.sh +++ b/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 | grep "Bazelisk version:" | cut -d ":" -f 2) + echo "Lastly, documenting what we added to the metadata file" -DocumentInstalledItem "Bazel ($(bazel version))" +DocumentInstalledItem "Bazel ($(bazel --version))" +DocumentInstalledItem "Bazelisk ($bazelisk_version)" diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 62700c4b9..5317804de 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -123,7 +123,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", @@ -153,6 +152,7 @@ "{{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", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index d825cc858..121a11090 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -126,7 +126,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", @@ -156,6 +155,7 @@ "{{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", diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index f5632891c..c1db38b6d 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -277,6 +277,12 @@ "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -576,12 +582,6 @@ "{{ template_dir }}/scripts/Installers/Install-Kind.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1" - ] - }, { "type": "windows-restart", "restart_timeout": "30m" @@ -717,6 +717,12 @@ "{{ template_dir }}/scripts/Installers/Validate-NodeLts.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Bazel.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -861,12 +867,6 @@ "{{ template_dir }}/scripts/Installers/Validate-Kind.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Validate-Bazel.ps1" - ] - }, { "type": "file", "source": "C:\\InstalledSoftware.md", diff --git a/images/win/scripts/Installers/Install-Bazel.ps1 b/images/win/scripts/Installers/Install-Bazel.ps1 index 1973c06f6..fb14a856b 100644 --- a/images/win/scripts/Installers/Install-Bazel.ps1 +++ b/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 \ No newline at end of file +choco install bazel -y + +npm install -g @bazel/bazelisk \ No newline at end of file diff --git a/images/win/scripts/Installers/Validate-Bazel.ps1 b/images/win/scripts/Installers/Validate-Bazel.ps1 index 71af7df72..3fc0e3d69 100644 --- a/images/win/scripts/Installers/Validate-Bazel.ps1 +++ b/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,11 +13,32 @@ 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 = @" _Version:_ $(bazel --version)
"@ +Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description + +# Adding description of Bazelisk to Markdown +$bazelisk_version = (bazelisk version | Select-String "Bazelisk version:").Split(":")[1] + +$SoftwareName = "bazelisk" + +$Description = @" +_Version:_ $bazelisk_version
+"@ + Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description \ No newline at end of file From 8d788f5c09b470a7d01c9489eb608f943e3f9ed4 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 5 Mar 2020 10:37:23 +0300 Subject: [PATCH 15/35] fix packer version (#496) --- images/win/scripts/Installers/Validate-Packer.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Validate-Packer.ps1 b/images/win/scripts/Installers/Validate-Packer.ps1 index 250c6f696..85473557e 100644 --- a/images/win/scripts/Installers/Validate-Packer.ps1 +++ b/images/win/scripts/Installers/Validate-Packer.ps1 @@ -15,10 +15,10 @@ else # Adding description of the software to Markdown $SoftwareName = "Packer" -$PackerVersion = (packer version).Split("") +$PackerVersion = packer --version $Description = @" -_Version:_ $PackerVersion.Item(1)
+_Version:_ $PackerVersion
"@ Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description From d655e7d8195d6728d03445ef1c0f64ad58aaa66a Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 5 Mar 2020 10:57:16 +0300 Subject: [PATCH 16/35] Disable mysql.service --- images/linux/scripts/installers/mysql.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/linux/scripts/installers/mysql.sh b/images/linux/scripts/installers/mysql.sh index 63474e39f..3eda07335 100644 --- a/images/linux/scripts/installers/mysql.sh +++ b/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 service && systemctl stop mysql.service +systemctl disable mysql.service From 5f35cc550b3998281bd34d9887f11f675c35287a Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 5 Mar 2020 11:27:02 +0300 Subject: [PATCH 17/35] Disable mysql.service --- images/linux/scripts/installers/mysql.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/mysql.sh b/images/linux/scripts/installers/mysql.sh index 3eda07335..98d0d665a 100644 --- a/images/linux/scripts/installers/mysql.sh +++ b/images/linux/scripts/installers/mysql.sh @@ -46,5 +46,5 @@ DocumentInstalledItem "MySQL Server (user:root password:root)" DocumentInstalledItem "MS SQL Server Client Tools" # Disable mysql.service -systemctl is-active --quiet service && systemctl stop mysql.service +systemctl is-active --quiet mysql.service && systemctl stop mysql.service systemctl disable mysql.service From a04b35b9e947fd3ab82fb8e55c976cb2e6f69d35 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Thu, 5 Mar 2020 13:02:18 +0300 Subject: [PATCH 18/35] fix vswhere version output --- images/win/scripts/Installers/Validate-VSWhere.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Validate-VSWhere.ps1 b/images/win/scripts/Installers/Validate-VSWhere.ps1 index 7b41519c4..c44ba7d41 100644 --- a/images/win/scripts/Installers/Validate-VSWhere.ps1 +++ b/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
From 17235787ae2c3636fdcc4664368b005a1bd61e19 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Thu, 5 Mar 2020 15:14:00 +0300 Subject: [PATCH 19/35] Unite powershell installation scripts --- .../scripts/installers/1604/powershellcore.sh | 26 ------------------- .../installers/{1804 => }/powershellcore.sh | 10 ++++--- images/linux/ubuntu1604.json | 2 +- images/linux/ubuntu1804.json | 2 +- 4 files changed, 9 insertions(+), 31 deletions(-) delete mode 100644 images/linux/scripts/installers/1604/powershellcore.sh rename images/linux/scripts/installers/{1804 => }/powershellcore.sh (82%) diff --git a/images/linux/scripts/installers/1604/powershellcore.sh b/images/linux/scripts/installers/1604/powershellcore.sh deleted file mode 100644 index 5c615ae31..000000000 --- a/images/linux/scripts/installers/1604/powershellcore.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -################################################################################ -## File: powershellcore.sh -## Desc: Installs powershellcore -################################################################################ - -# Source the helpers for use with the script -source $HELPER_SCRIPTS/document.sh - -# 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))" diff --git a/images/linux/scripts/installers/1804/powershellcore.sh b/images/linux/scripts/installers/powershellcore.sh similarity index 82% rename from images/linux/scripts/installers/1804/powershellcore.sh rename to images/linux/scripts/installers/powershellcore.sh index 2f1922493..e41e604c8 100644 --- a/images/linux/scripts/installers/1804/powershellcore.sh +++ b/images/linux/scripts/installers/powershellcore.sh @@ -7,10 +7,14 @@ # 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 +LSB_RELEASE=$(lsb_release -rs) + +# libicu64, which comes with php-intl module, has powershell breaking issue on Ubuntu 16.04 https://github.com/PowerShell/PowerShell/issues/9746 # Fix - install additional libicu65 where the issue is fixed -echo "install libicu65" -apt get install libicu65 +if [ $LSB_RELEASE == "16.04" ]; then + echo "install libicu65" + apt get install libicu65 +fi # Install Powershell apt-get install -y powershell diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 5317804de..7cd93f76f 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -157,7 +157,7 @@ "{{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", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 121a11090..4153b200a 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -160,7 +160,7 @@ "{{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", From 86613701db97918bfe6a043660f2a62c03ec157a Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 5 Mar 2020 19:05:00 +0300 Subject: [PATCH 20/35] Update SSDT to 15.9.3 (#493) --- images/win/scripts/Installers/Windows2016/Install-SSDT.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Windows2016/Install-SSDT.ps1 b/images/win/scripts/Installers/Windows2016/Install-SSDT.ps1 index f51f49d39..9362c9bd6 100644 --- a/images/win/scripts/Installers/Windows2016/Install-SSDT.ps1 +++ b/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) -$InstallerURI = 'https://download.microsoft.com/download/D/F/8/DF8B51B9-8E9F-47F3-A27B-33EEDADD8966/SSDT-Setup-ENU.exe' +#SSDT for Visual Studio 2017 (15.9.3) +$InstallerURI = 'https://download.microsoft.com/download/5/2/D/52DEF429-5B17-470C-82D9-654116080B15/SSDT-Setup-ENU.exe' $InstallerName = 'SSDT-Setup-ENU.exe' $logFilePath = "$env:TEMP\ssdtlog.txt" $ArgumentList = ('/install', 'INSTALLALL', '/passive', '/norestart', "/log `"$logFilePath`"") From 49887f2d2a2456c4934caf47d07c5e8d1292832e Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Thu, 5 Mar 2020 19:19:11 +0300 Subject: [PATCH 21/35] remove workaround --- images/linux/scripts/installers/powershellcore.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/images/linux/scripts/installers/powershellcore.sh b/images/linux/scripts/installers/powershellcore.sh index e41e604c8..5c615ae31 100644 --- a/images/linux/scripts/installers/powershellcore.sh +++ b/images/linux/scripts/installers/powershellcore.sh @@ -7,15 +7,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/document.sh -LSB_RELEASE=$(lsb_release -rs) - -# libicu64, which comes with php-intl module, has powershell breaking issue on Ubuntu 16.04 https://github.com/PowerShell/PowerShell/issues/9746 -# Fix - install additional libicu65 where the issue is fixed -if [ $LSB_RELEASE == "16.04" ]; then - echo "install libicu65" - apt get install libicu65 -fi - # Install Powershell apt-get install -y powershell From c0cc1e10b4c238ed1628f8b2f4e4a9f0a372e423 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 5 Mar 2020 19:40:10 +0300 Subject: [PATCH 22/35] Software updates week 10 (#492) --- images/macos/macos-10.15-Readme.md | 234 +++++++++++++++-------------- 1 file changed, 118 insertions(+), 116 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 20a70b63a..aae451696 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/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 -- MSEdgeDriver 80.0.361.57 +- Microsoft Edge 80.0.361.62 +- 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 | -| --------------------------------- | --------------------------------- | --------------------------------- | -| 11.4 (beta) | 11N123k | /Applications/Xcode_11.4_beta.app | -| 11.3.1 (default) | 11C505 | /Applications/Xcode_11.3.1.app | -| 11.3 | 11C29 | /Applications/Xcode_11.3.app | -| 11.2.1 | 11B500 | /Applications/Xcode_11.2.1.app | -| 11.2 | 11B52 | /Applications/Xcode_11.2.app | -| 11.1 | 11A1027 | /Applications/Xcode_11.1.app | -| 11.0 | 11A420a | /Applications/Xcode_11.app | +| Version | Build | Path | +| ---------------- | ------- | --------------------------------- | +| 11.4 (beta) | 11N123k | /Applications/Xcode_11.4_beta.app | +| 11.3.1 (default) | 11C505 | /Applications/Xcode_11.3.1.app | +| 11.3 | 11C29 | /Applications/Xcode_11.3.app | +| 11.2.1 | 11B500 | /Applications/Xcode_11.2.1.app | +| 11.2 | 11B52 | /Applications/Xcode_11.2.app | +| 11.1 | 11A1027 | /Applications/Xcode_11.1.app | +| 11.0 | 11A420a | /Applications/Xcode_11.app | #### 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 | -| -------------------------------------------- | -------------------------------------------- | -------------------------------------------- | -| 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.1 | iphoneos13.1 | 11.1 | -| iOS 13.2 | iphoneos13.2 | 11.2, 11.2.1, 11.3, 11.3.1 | -| iOS 13.4 | iphoneos13.4 | 11.4 | -| Simulator - iOS 13.0 | iphonesimulator13.0 | 11.0 | -| 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.4 | iphonesimulator13.4 | 11.4 | -| 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.4 | appletvos13.4 | 11.4 | -| 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.4 | appletvsimulator13.4 | 11.4 | -| 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.2 | watchos6.2 | 11.4 | -| 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.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 | +| 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 | +| iOS 13.0 | iphoneos13.0 | 11.0 | +| iOS 13.1 | iphoneos13.1 | 11.1 | +| iOS 13.2 | iphoneos13.2 | 11.2, 11.2.1, 11.3, 11.3.1 | +| iOS 13.4 | iphoneos13.4 | 11.4 | +| Simulator - iOS 13.0 | iphonesimulator13.0 | 11.0 | +| 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.4 | iphonesimulator13.4 | 11.4 | +| 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.4 | appletvos13.4 | 11.4 | +| 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.4 | appletvsimulator13.4 | 11.4 | +| 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.2 | watchos6.2 | 11.4 | +| 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.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 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| iOS 13.0 | 11.0 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | -| iOS 13.1 | 11.1 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | -| iOS 13.2 | 11.2
11.2.1 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | -| iOS 13.3 | 11.3
11.3.1 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad (7th generation)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | -| iOS 13.4 | 11.4 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad (7th generation)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | -| tvOS 13.0 | 11.0
11.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 13.2 | 11.2
11.2.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 13.3 | 11.3
11.3.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 13.4 | 11.4 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| watchOS 6.0 | 11.0
11.1 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | -| watchOS 6.1 | 11.2
11.2.1
11.3
11.3.1 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | -| watchOS 6.2 | 11.4 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | +| OS | Xcode Version | Simulators | +| ----------- | -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| iOS 13.0 | 11.0 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | +| iOS 13.1 | 11.1 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | +| iOS 13.2 | 11.2
11.2.1 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | +| iOS 13.3 | 11.3
11.3.1 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad (7th generation)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | +| iOS 13.4 | 11.4 | iPhone 8
iPhone 8 Plus
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPad Pro (9.7-inch)
iPad (7th generation)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Air (3rd generation) | +| tvOS 13.0 | 11.0
11.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 13.2 | 11.2
11.2.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 13.3 | 11.3
11.3.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 13.4 | 11.4 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| watchOS 6.0 | 11.0
11.1 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | +| watchOS 6.1 | 11.2
11.2.1
11.3
11.3.1 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | +| watchOS 6.2 | 11.4 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
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 | -| ------------------------------------------- | ------------------------------------------- | -| platform-tools | Android SDK Platform-Tools, Revision 29.0.6 | +| Package Name | Description | +| -------------- | ------------------------------------------- | +| platform-tools | Android SDK Platform-Tools, Revision 29.0.6 | #### Android SDK Platforms -| Package Name | Description | -| ----------------------------------- | ----------------------------------- | -| android-24 | Android SDK Platform 24, Revision 2 | -| android-25 | Android SDK Platform 25, Revision 3 | -| android-26 | Android SDK Platform 26, Revision 2 | -| android-27 | Android SDK Platform 27, Revision 3 | -| android-28 | Android SDK Platform 28, Revision 6 | -| android-29 | Android SDK Platform 29, Revision 4 | +| Package Name | Description | +| ------------ | ----------------------------------- | +| android-24 | Android SDK Platform 24, Revision 2 | +| android-25 | Android SDK Platform 25, Revision 3 | +| android-26 | Android SDK Platform 26, Revision 2 | +| android-27 | Android SDK Platform 27, Revision 3 | +| android-28 | Android SDK Platform 28, Revision 6 | +| android-29 | Android SDK Platform 29, Revision 4 | #### Android SDK Build-Tools -| Package Name | Description | -| -------------------------------------------- | -------------------------------------------- | -| 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.2 | Android SDK Build-Tools, Revision 24.0.2 | -| 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.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.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.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.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.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.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.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.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.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.3 | Android SDK Build-Tools, Revision 29.0.3 | -| build-tools-30.0.0-rc1 | Android SDK Build-Tools, Revision 30.0.0 rc1 | +| Package Name | Description | +| ---------------------- | -------------------------------------------- | +| 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.2 | Android SDK Build-Tools, Revision 24.0.2 | +| 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.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.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.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.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.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.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.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.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.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.3 | Android SDK Build-Tools, Revision 29.0.3 | +| build-tools-30.0.0-rc1 | Android SDK Build-Tools, Revision 30.0.0 rc1 | #### Android Utils -| Package Name | Version | -| ---------------- | ---------------- | -| cmake | 3.6.4111459 | -| lldb | 3.1.4508709 | -| ndk-bundle | 18.1.5063045 | -| Android Emulator | 30.0.0 | +| Package Name | Version | +| ---------------- | ------------ | +| cmake | 3.6.4111459 | +| lldb | 3.1.4508709 | +| ndk-bundle | 18.1.5063045 | +| Android Emulator | 30.0.0 | #### Android Google APIs -| Package Name | Description | -| --------------------------- | --------------------------- | -| addon-google_apis-google-21 | 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-24 | Google APIs, Revision 1 | +| Package Name | Description | +| --------------------------- | ----------------------- | +| addon-google_apis-google-21 | 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-24 | Google APIs, Revision 1 | #### Extra Packages -| Package Name | Version | -| ----------------------------------------------- | ----------------------------------------------- | -| Android Support Repository | 47.0.0 | -| Google Play services | 49 | -| Google Repository | 58 | -| Intel x86 Emulator Accelerator (HAXM installer) | 7.5.1 | +| Package Name | Version | +| ----------------------------------------------- | ------- | +| Android Support Repository | 47.0.0 | +| Google Play services | 49 | +| Google Repository | 58 | +| Intel x86 Emulator Accelerator (HAXM installer) | 7.5.1 | From 09ba151b88d6194a3ce864dd0a53bb43d62ee067 Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Thu, 5 Mar 2020 21:38:59 +0000 Subject: [PATCH 23/35] Updating readme file for AzP.20200301.win19.1 version 20200301 --- images/win/Windows2019-Readme.md | 90 +++++++++++++++++++++++++------- 1 file changed, 72 insertions(+), 18 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 334c21e0c..7eab9d90e 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2019 -The following software is installed on machines with the 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 @@ -316,23 +316,73 @@ 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 - +_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 - +_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 - +_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 +_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)
_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)
+_Version:_ 2.7.17 (x64)
_Version:_ 3.5.4 (x64)
_Version:_ 3.6.8 (x64)
_Version:_ 3.7.6 (x64)
_Version:_ 3.8.2 (x64)
_Version:_ 2.7.17 (x86)
_Version:_ 3.5.4 (x86)
_Version:_ 3.6.8 (x86)
_Version:_ 3.7.6 (x86)
_Version:_ 3.8.2 (x86)
## PyPy @@ -373,13 +423,13 @@ _Location:_ C:/hostedtoolcache/windows/Python/2.7*/x64 ## Git -_Version:_ 2.25.0
+_Version:_ 2.25.1
_Environment:_ * PATH: contains location of git.exe ## Git Large File Storage (LFS) -_Version:_ 2.9.2
+_Version:_ 2.10.0
_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
+_Version:_ Version 3.8.3
## Miniconda @@ -706,7 +756,7 @@ _Environment:_ ## Azure CosmosDb Emulator -_Version:_ 2.9.1.0
+_Version:_ 2.9.2.0
_Location:_ C:\Program Files\Azure Cosmos DB Emulator\ ## 7zip @@ -735,7 +785,7 @@ _Version:_ 5.1.3.0
## OpenSSL -_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe
_Version:_ 1.1.1d 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.1c at C:\Strawberry\c\bin\openssl.exe
_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe
+_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe
_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe
_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe
_Version:_ 1.1.1c at C:\Strawberry\c\bin\openssl.exe
_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe
## 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
+_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
* PATH: contains location of vswhere.exe ## Kubectl @@ -764,3 +814,7 @@ _Environment:_ _Version:_ kind v0.7.0 go1.13.6 windows/amd64
_Environment:_ * PATH: contains location of kind.exe + +## bazel + +_Version:_ bazel 2.1.0
From e9e5323c93a8aa2bd854b18513eeb3a6172108b3 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Fri, 6 Mar 2020 01:04:14 +0300 Subject: [PATCH 24/35] fix geckodriver output --- images/linux/scripts/installers/firefox.sh | 2 +- .../linux/scripts/installers/google-chrome.sh | 2 +- .../scripts/Installers/Install-Firefox.ps1 | 39 ------------------ .../Installers/Install-SeleniumWebDrivers.ps1 | 41 +++++++++++++++++++ 4 files changed, 43 insertions(+), 41 deletions(-) diff --git a/images/linux/scripts/installers/firefox.sh b/images/linux/scripts/installers/firefox.sh index aa920774a..c98f43c54 100644 --- a/images/linux/scripts/installers/firefox.sh +++ b/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" diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 979e2b376..892380ce7 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/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" diff --git a/images/win/scripts/Installers/Install-Firefox.ps1 b/images/win/scripts/Installers/Install-Firefox.ps1 index eb6cea70d..7408b7289 100644 --- a/images/win/scripts/Installers/Install-Firefox.ps1 +++ b/images/win/scripts/Installers/Install-Firefox.ps1 @@ -25,42 +25,3 @@ pref("app.update.enabled", false);' -ItemType file -force $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 - -Write-Host "Install Firefox WebDriver" - -$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)" - - -$DriversZipFile = $geckodriverWindowsAsset.name -Write-Host "Selenium drivers download and install..." - -$FirefoxDriverPath = Join-Path $env:SystemDrive "SeleniumWebDrivers\GeckoDriver" - -# Install Firefox Web Driver -Write-Host "FireFox driver download...." -if (-not (Test-Path -Path $FireFoxDriverPath)) { - New-Item -Path $FireFoxDriverPath -ItemType "directory" -} - -$DestFile = Join-Path $FireFoxDriverPath $DriversZipFile -$FireFoxDriverDownloadUrl = $geckodriverWindowsAsset.browser_download_url -try{ - Invoke-WebRequest -Uri $FireFoxDriverDownloadUrl -OutFile $DestFile -} catch { - Write-Error "[!] Failed to download $DriversZipFile" - exit 1 -} - -Write-Host "FireFox driver install...." -Expand-Archive -Path $DestFile -DestinationPath $FireFoxDriverPath -Force -Remove-Item -Path $DestFile -Force - - -Write-Host "Setting the environment variables" -Add-MachinePathItem -PathItem $FireFoxDriverPath -setx GeckoWebDriver "$FirefoxDriverPath" /M; - -exit 0 \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 b/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 index 6170a83e5..31cec6515 100644 --- a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 +++ b/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 @@ -94,3 +94,44 @@ $PathValue += ";$EdgeDriverPath\"; Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue; exit 0; + +# Install Firefox gecko Web Driver +Write-Host "Install Firefox WebDriver" + +$geckodriverJson = Invoke-RestMethod "https://api.github.com/repos/mozilla/geckodriver/releases/latest" +$geckodriverWindowsAsset = $geckodriverJson.assets | Where-Object { $_.name -Match "win64" } | Select-Object -First 1 + +$geckodriverVersion = $geckodriverJson.tag_name +Write-Host "Geckodriver version: $geckodriverVersion" + +$DriversZipFile = $geckodriverWindowsAsset.name +Write-Host "Selenium drivers download and install..." + +$FirefoxDriverPath = Join-Path $SeleniumWebDriverPath "GeckoDriver" +$geckodriverVersion.Substring(1) | Out-File -FilePath "$FirefoxDriverPath\versioninfo.txt" -Force; + +# Install Firefox Web Driver +Write-Host "FireFox driver download...." +if (-not (Test-Path -Path $FireFoxDriverPath)) { + New-Item -Path $FireFoxDriverPath -ItemType "directory" +} + +$DestFile = Join-Path $FireFoxDriverPath $DriversZipFile +$FireFoxDriverDownloadUrl = $geckodriverWindowsAsset.browser_download_url +try{ + Invoke-WebRequest -Uri $FireFoxDriverDownloadUrl -OutFile $DestFile +} catch { + Write-Error "[!] Failed to download $DriversZipFile" + exit 1 +} + +Write-Host "FireFox driver install...." +Expand-Archive -Path $DestFile -DestinationPath $FireFoxDriverPath -Force +Remove-Item -Path $DestFile -Force + + +Write-Host "Setting the environment variables" +Add-MachinePathItem -PathItem $FireFoxDriverPath +setx GeckoWebDriver "$FirefoxDriverPath" /M; + +exit 0 From e031fd36fdf15e1fea684eceb0867619f32e36a9 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Fri, 6 Mar 2020 08:54:33 +0300 Subject: [PATCH 25/35] remove exit 0 --- images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 b/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 index 31cec6515..2e5368ff1 100644 --- a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 +++ b/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 @@ -93,8 +93,6 @@ $PathValue += ";$ChromeDriverPath\"; $PathValue += ";$EdgeDriverPath\"; Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue; -exit 0; - # Install Firefox gecko Web Driver Write-Host "Install Firefox WebDriver" From 5435d9a850f98115a09ca338e03fdd1e1f3b88f5 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Fri, 6 Mar 2020 11:03:01 +0300 Subject: [PATCH 26/35] add zstd to win19 --- images/win/Windows2019-Azure.json | 12 ++++++++++++ images/win/scripts/Installers/Validate-Zstd.ps1 | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index c1dc9252d..378801dd1 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -497,6 +497,12 @@ "{{ template_dir }}/scripts/Installers/Install-Jq.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -776,6 +782,12 @@ "{{ template_dir }}/scripts/Installers/Validate-Jq.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Zstd.ps1" + ] + }, { "type": "powershell", "scripts":[ diff --git a/images/win/scripts/Installers/Validate-Zstd.ps1 b/images/win/scripts/Installers/Validate-Zstd.ps1 index 18f3a3343..afb6a030f 100644 --- a/images/win/scripts/Installers/Validate-Zstd.ps1 +++ b/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
From c647d2d4ef048c2bb9d98df65a3a05686a095d8e Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Fri, 6 Mar 2020 13:33:25 +0300 Subject: [PATCH 27/35] moved Selenium drivers installation to respective browsers --- images/win/Windows2016-Azure.json | 2 +- images/win/Windows2019-Azure.json | 2 +- .../win/scripts/Installers/Install-Chrome.ps1 | 42 +++++- .../win/scripts/Installers/Install-Edge.ps1 | 35 +++++ .../scripts/Installers/Install-Firefox.ps1 | 43 ++++++ .../Installers/Install-IEWebDriver.ps1 | 32 +++++ .../Installers/Install-SeleniumWebDrivers.ps1 | 135 ------------------ 7 files changed, 153 insertions(+), 138 deletions(-) create mode 100644 images/win/scripts/Installers/Install-IEWebDriver.ps1 delete mode 100644 images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index 6f749dbed..944bed8c6 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -401,7 +401,7 @@ { "type": "powershell", "scripts":[ - "{{ template_dir }}/scripts/Installers/Install-SeleniumWebDrivers.ps1" + "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1" ] }, { diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index c1dc9252d..c8c308478 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -364,7 +364,7 @@ { "type": "powershell", "scripts":[ - "{{ template_dir }}/scripts/Installers/Install-SeleniumWebDrivers.ps1" + "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1" ] }, { diff --git a/images/win/scripts/Installers/Install-Chrome.ps1 b/images/win/scripts/Installers/Install-Chrome.ps1 index aac913e71..44b58abb7 100644 --- a/images/win/scripts/Installers/Install-Chrome.ps1 +++ b/images/win/scripts/Installers/Install-Chrome.ps1 @@ -18,7 +18,7 @@ $GoogleSvcs | Set-SvcWithErrHandling -Arguments @{StartupType = "Disabled"}; $regGoogleUpdatePath = "HKLM:\SOFTWARE\Policies\Google\Update"; $regGoogleUpdateChrome = "HKLM:\SOFTWARE\Policies\Google\Chrome"; -($regGoogleUpdatePath, $regGoogleUpdateChrome) | ForEach-Object { +($regGoogleUpdatePath, $regGoogleUpdateChrome) | ForEach-Object { New-Item -Path $_ -Force; } @@ -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; diff --git a/images/win/scripts/Installers/Install-Edge.ps1 b/images/win/scripts/Installers/Install-Edge.ps1 index e5a641a1b..b84f0fc14 100644 --- a/images/win/scripts/Installers/Install-Edge.ps1 +++ b/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; diff --git a/images/win/scripts/Installers/Install-Firefox.ps1 b/images/win/scripts/Installers/Install-Firefox.ps1 index 7408b7289..78e886cd7 100644 --- a/images/win/scripts/Installers/Install-Firefox.ps1 +++ b/images/win/scripts/Installers/Install-Firefox.ps1 @@ -25,3 +25,46 @@ pref("app.update.enabled", false);' -ItemType file -force $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 + +$geckodriverVersion = $geckodriverJson.tag_name +Write-Host "Geckodriver version: $geckodriverVersion" + +$DriversZipFile = $geckodriverWindowsAsset.name +Write-Host "Selenium drivers download and install..." + +$FirefoxDriverPath = Join-Path $SeleniumWebDriverPath "GeckoDriver" +$geckodriverVersion.Substring(1) | Out-File -FilePath "$FirefoxDriverPath\versioninfo.txt" -Force; + +# Install Firefox Web Driver +Write-Host "FireFox driver download...." +if (-not (Test-Path -Path $FireFoxDriverPath)) { + New-Item -Path $FireFoxDriverPath -ItemType "directory" +} + +$DestFile = Join-Path $FireFoxDriverPath $DriversZipFile +$FireFoxDriverDownloadUrl = $geckodriverWindowsAsset.browser_download_url +try{ + Invoke-WebRequest -Uri $FireFoxDriverDownloadUrl -OutFile $DestFile +} catch { + Write-Error "[!] Failed to download $DriversZipFile" + exit 1 +} + +Write-Host "FireFox driver install...." +Expand-Archive -Path $DestFile -DestinationPath $FireFoxDriverPath -Force +Remove-Item -Path $DestFile -Force + + +Write-Host "Setting the environment variables" +Add-MachinePathItem -PathItem $FireFoxDriverPath +setx GeckoWebDriver "$FirefoxDriverPath" /M; + +exit 0 diff --git a/images/win/scripts/Installers/Install-IEWebDriver.ps1 b/images/win/scripts/Installers/Install-IEWebDriver.ps1 new file mode 100644 index 000000000..7dfd8b42f --- /dev/null +++ b/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; diff --git a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 b/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 deleted file mode 100644 index 2e5368ff1..000000000 --- a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 +++ /dev/null @@ -1,135 +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; - -# Install Firefox gecko Web Driver -Write-Host "Install Firefox WebDriver" - -$geckodriverJson = Invoke-RestMethod "https://api.github.com/repos/mozilla/geckodriver/releases/latest" -$geckodriverWindowsAsset = $geckodriverJson.assets | Where-Object { $_.name -Match "win64" } | Select-Object -First 1 - -$geckodriverVersion = $geckodriverJson.tag_name -Write-Host "Geckodriver version: $geckodriverVersion" - -$DriversZipFile = $geckodriverWindowsAsset.name -Write-Host "Selenium drivers download and install..." - -$FirefoxDriverPath = Join-Path $SeleniumWebDriverPath "GeckoDriver" -$geckodriverVersion.Substring(1) | Out-File -FilePath "$FirefoxDriverPath\versioninfo.txt" -Force; - -# Install Firefox Web Driver -Write-Host "FireFox driver download...." -if (-not (Test-Path -Path $FireFoxDriverPath)) { - New-Item -Path $FireFoxDriverPath -ItemType "directory" -} - -$DestFile = Join-Path $FireFoxDriverPath $DriversZipFile -$FireFoxDriverDownloadUrl = $geckodriverWindowsAsset.browser_download_url -try{ - Invoke-WebRequest -Uri $FireFoxDriverDownloadUrl -OutFile $DestFile -} catch { - Write-Error "[!] Failed to download $DriversZipFile" - exit 1 -} - -Write-Host "FireFox driver install...." -Expand-Archive -Path $DestFile -DestinationPath $FireFoxDriverPath -Force -Remove-Item -Path $DestFile -Force - - -Write-Host "Setting the environment variables" -Add-MachinePathItem -PathItem $FireFoxDriverPath -setx GeckoWebDriver "$FirefoxDriverPath" /M; - -exit 0 From 908235e3ee91f11e5eade668602f065327e43cc3 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Fri, 6 Mar 2020 17:04:48 +0300 Subject: [PATCH 28/35] Add Analysis extension installation --- images/win/Windows2019-Azure.json | 12 +++++ .../Install-AnalysisExtenstion.ps1 | 44 +++++++++++++++++++ .../Validate-AnalysisExtenstion.ps1 | 18 ++++++++ 3 files changed, 74 insertions(+) create mode 100644 images/win/scripts/Installers/Windows2019/Install-AnalysisExtenstion.ps1 create mode 100644 images/win/scripts/Installers/Windows2019/Validate-AnalysisExtenstion.ps1 diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index c1dc9252d..7b0352263 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -172,6 +172,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 +210,12 @@ "{{ template_dir }}/scripts/Installers/Windows2019/Validate-Wix.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Windows2019/Validate-AnalysisExtenstion.ps1" + ] + }, { "type": "powershell", "scripts":[ diff --git a/images/win/scripts/Installers/Windows2019/Install-AnalysisExtenstion.ps1 b/images/win/scripts/Installers/Windows2019/Install-AnalysisExtenstion.ps1 new file mode 100644 index 000000000..43bfb6030 --- /dev/null +++ b/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 diff --git a/images/win/scripts/Installers/Windows2019/Validate-AnalysisExtenstion.ps1 b/images/win/scripts/Installers/Windows2019/Validate-AnalysisExtenstion.ps1 new file mode 100644 index 000000000..fad85d512 --- /dev/null +++ b/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
+"@ + +Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description \ No newline at end of file From db34108d0693695663d2eecfec8d6166aa18fb70 Mon Sep 17 00:00:00 2001 From: Nils Date: Fri, 6 Mar 2020 10:56:17 +0000 Subject: [PATCH 29/35] Make `clang-format-9` the default `clang-format` --- images/linux/scripts/installers/clang.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh index 4d3373c9a..1ca4cde2c 100644 --- a/images/linux/scripts/installers/clang.sh +++ b/images/linux/scripts/installers/clang.sh @@ -60,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 From 531fe345a299af8661bf509af6c2d914afd3bff4 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sun, 8 Mar 2020 09:28:50 +0000 Subject: [PATCH 30/35] Fix bazelisk and mercurial output in readme (#518) * fix output * fix bazelisk output on ubuntu --- images/linux/scripts/installers/bazel.sh | 2 +- images/win/scripts/Installers/Validate-Bazel.ps1 | 2 +- images/win/scripts/Installers/Validate-Mercurial.ps1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/bazel.sh b/images/linux/scripts/installers/bazel.sh index d6649fcee..d058d5764 100644 --- a/images/linux/scripts/installers/bazel.sh +++ b/images/linux/scripts/installers/bazel.sh @@ -29,7 +29,7 @@ if ! command -v bazelisk; then fi # Document what was added to the image -bazelisk_version = $(bazelisk version | grep "Bazelisk version:" | cut -d ":" -f 2) +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))" diff --git a/images/win/scripts/Installers/Validate-Bazel.ps1 b/images/win/scripts/Installers/Validate-Bazel.ps1 index 3fc0e3d69..9cdccda4d 100644 --- a/images/win/scripts/Installers/Validate-Bazel.ps1 +++ b/images/win/scripts/Installers/Validate-Bazel.ps1 @@ -33,7 +33,7 @@ _Version:_ $(bazel --version)
Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description # Adding description of Bazelisk to Markdown -$bazelisk_version = (bazelisk version | Select-String "Bazelisk version:").Split(":")[1] +$bazelisk_version = ((bazelisk version | Select-String "Bazelisk version:") -Split(" v"))[2] $SoftwareName = "bazelisk" diff --git a/images/win/scripts/Installers/Validate-Mercurial.ps1 b/images/win/scripts/Installers/Validate-Mercurial.ps1 index 6212d5f28..74299f06f 100644 --- a/images/win/scripts/Installers/Validate-Mercurial.ps1 +++ b/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 = @" From 42417eb98fff5f9d9e7bc071a2ab16fd81f1340d Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Sun, 8 Mar 2020 17:41:55 +0300 Subject: [PATCH 31/35] Add additional agent info (#499) * add agent additional info * add agent additional info * add agent additional info --- .../linux/scripts/installers/preimagedata.sh | 28 +++++++++++++++ images/linux/ubuntu1604.json | 12 +++++++ images/linux/ubuntu1804.json | 12 +++++++ images/win/Windows2016-Azure.json | 11 ++++++ images/win/Windows2019-Azure.json | 11 ++++++ .../scripts/Installers/Update-ImageData.ps1 | 35 +++++++++++++++++++ 6 files changed, 109 insertions(+) create mode 100644 images/linux/scripts/installers/preimagedata.sh create mode 100644 images/win/scripts/Installers/Update-ImageData.ps1 diff --git a/images/linux/scripts/installers/preimagedata.sh b/images/linux/scripts/installers/preimagedata.sh new file mode 100644 index 000000000..91b36a9cb --- /dev/null +++ b/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 < $imagedata_file +[ + { + "group": "Operating System", + "detail": "${os_name}" + }, + { + "group": "Virtual Environment", + "detail": "Environment: ${image_label}\nVersion: ${image_version}\nIncluded Software: ${software_url}" + } +] +EOF \ No newline at end of file diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 7cd93f76f..381c12245 100644 --- a/images/linux/ubuntu1604.json +++ b/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", @@ -107,6 +108,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": [ diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 4153b200a..81c39eaeb 100644 --- a/images/linux/ubuntu1804.json +++ b/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", @@ -110,6 +111,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": [ diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index 944bed8c6..e24bd75e8 100644 --- a/images/win/Windows2016-Azure.json +++ b/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":[ diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index a8deb702d..668451eb5 100644 --- a/images/win/Windows2019-Azure.json +++ b/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":[ diff --git a/images/win/scripts/Installers/Update-ImageData.ps1 b/images/win/scripts/Installers/Update-ImageData.ps1 new file mode 100644 index 000000000..7cbffec0d --- /dev/null +++ b/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 From 6b03ec0d5878fe78face92caa6829ee0345a1cf7 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sun, 8 Mar 2020 14:43:37 +0000 Subject: [PATCH 32/35] Fix docs for gecko, swap chrome and ie drivers (#519) --- images/win/scripts/Installers/Install-Firefox.ps1 | 5 +++++ .../win/scripts/Installers/Validate-SeleniumWebDrivers.ps1 | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-Firefox.ps1 b/images/win/scripts/Installers/Install-Firefox.ps1 index 78e886cd7..6f1dc218b 100644 --- a/images/win/scripts/Installers/Install-Firefox.ps1 +++ b/images/win/scripts/Installers/Install-Firefox.ps1 @@ -41,6 +41,11 @@ $DriversZipFile = $geckodriverWindowsAsset.name Write-Host "Selenium drivers download and install..." $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 diff --git a/images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1 b/images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1 index e4979bd78..dd74b95e6 100644 --- a/images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1 +++ b/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 From a6afca3c57a8f2b7970aa6a61ea05cd0c94ffcd7 Mon Sep 17 00:00:00 2001 From: Nelly Kiboi Date: Wed, 11 Mar 2020 07:30:39 +0000 Subject: [PATCH 33/35] Update docker compose to v1.25.4 (#524) * feat(docker-compose): update docker-compose to 1.25.4 * feat(docker-compose): remove updates to readme --- images/linux/scripts/installers/docker-compose.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/docker-compose.sh b/images/linux/scripts/installers/docker-compose.sh index cd8f09ebd..1ba93f99d 100644 --- a/images/linux/scripts/installers/docker-compose.sh +++ b/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 From 05585de03b803aab81a2f023603d2428394ffcc4 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Wed, 11 Mar 2020 11:08:20 +0300 Subject: [PATCH 34/35] Install latest patch versions of golang for linux (#501) * install golang for linux --- images/linux/scripts/installers/1604/go.sh | 36 -------------- images/linux/scripts/installers/1804/go.sh | 34 ------------- images/linux/scripts/installers/go.sh | 55 ++++++++++++++++++++++ images/linux/ubuntu1604.json | 18 ++++++- images/linux/ubuntu1804.json | 18 ++++++- 5 files changed, 87 insertions(+), 74 deletions(-) delete mode 100644 images/linux/scripts/installers/1604/go.sh delete mode 100644 images/linux/scripts/installers/1804/go.sh create mode 100644 images/linux/scripts/installers/go.sh diff --git a/images/linux/scripts/installers/1604/go.sh b/images/linux/scripts/installers/1604/go.sh deleted file mode 100644 index 00aa8274b..000000000 --- a/images/linux/scripts/installers/1604/go.sh +++ /dev/null @@ -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 diff --git a/images/linux/scripts/installers/1804/go.sh b/images/linux/scripts/installers/1804/go.sh deleted file mode 100644 index 6109faf2a..000000000 --- a/images/linux/scripts/installers/1804/go.sh +++ /dev/null @@ -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 diff --git a/images/linux/scripts/installers/go.sh b/images/linux/scripts/installers/go.sh new file mode 100644 index 000000000..8a16eef84 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 381c12245..51e1bb51b 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -23,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": [ @@ -148,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", @@ -192,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", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 81c39eaeb..33800251c 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -23,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": [ @@ -151,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", @@ -194,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", From 9bc9285a028aa39fa510148136c8037615903061 Mon Sep 17 00:00:00 2001 From: nikita-bykov <49442273+nikita-bykov@users.noreply.github.com> Date: Wed, 11 Mar 2020 11:16:52 +0300 Subject: [PATCH 35/35] Added installation of libc++-dev and libc++abi-dev to Ubuntu 1604 (#513) Co-authored-by: Nikita Bykov --- images/linux/scripts/installers/1604/basic.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/linux/scripts/installers/1604/basic.sh b/images/linux/scripts/installers/1604/basic.sh index 99c80a313..adc1e8098 100644 --- a/images/linux/scripts/installers/1604/basic.sh +++ b/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"