diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
deleted file mode 100644
index 40ed12063..000000000
--- a/.github/workflows/stale.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Mark stale issues and pull requests
-
-on:
- schedule:
- - cron: "0 3 * * *"
-
-jobs:
- stale:
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/stale@v1
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
- stale-issue-message: 'This issue has not had any activity for 45 days and will be closed in 45 days if there continues to be no activity.'
- stale-issue-label: 'no-issue-activity'
- days-before-stale: 45
- days-before-close: 45
diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml
index 332f34add..03b084ca8 100644
--- a/images.CI/azure-pipelines/image-generation.yml
+++ b/images.CI/azure-pipelines/image-generation.yml
@@ -55,6 +55,14 @@ jobs:
-ImageName ${{ parameters.image_type }} `
-AccessToken $(RELEASE_TARGET_TOKEN)
+ - task: PowerShell@2
+ displayName: 'Output Readme file content'
+ inputs:
+ targetType: 'inline'
+ script: |
+ $docsPath = Get-ChildItem -Path "images" -Include ${{ parameters.image_readme_name }} -Recurse -Depth 1 | Select-Object -First 1
+ Get-Content -Path $docsPath
+
- task: PowerShell@2
displayName: 'Clean up resources'
condition: always()
diff --git a/images.CI/azure-pipelines/ubuntu1604.yml b/images.CI/azure-pipelines/ubuntu1604.yml
index 8f6dcef22..b2c99337f 100644
--- a/images.CI/azure-pipelines/ubuntu1604.yml
+++ b/images.CI/azure-pipelines/ubuntu1604.yml
@@ -16,4 +16,5 @@ pr:
jobs:
- template: image-generation.yml
parameters:
- image_type: ubuntu1604
\ No newline at end of file
+ image_type: ubuntu1604
+ image_readme_name: Ubuntu1604-README.md
\ No newline at end of file
diff --git a/images.CI/azure-pipelines/ubuntu1804.yml b/images.CI/azure-pipelines/ubuntu1804.yml
index 998ba42e6..d07bbade4 100644
--- a/images.CI/azure-pipelines/ubuntu1804.yml
+++ b/images.CI/azure-pipelines/ubuntu1804.yml
@@ -16,4 +16,5 @@ pr:
jobs:
- template: image-generation.yml
parameters:
- image_type: ubuntu1804
\ No newline at end of file
+ image_type: ubuntu1804
+ image_readme_name: Ubuntu1804-README.md
\ No newline at end of file
diff --git a/images.CI/azure-pipelines/windows2016.yml b/images.CI/azure-pipelines/windows2016.yml
index 667b30bd7..f164a096d 100644
--- a/images.CI/azure-pipelines/windows2016.yml
+++ b/images.CI/azure-pipelines/windows2016.yml
@@ -16,4 +16,5 @@ pr:
jobs:
- template: image-generation.yml
parameters:
- image_type: Windows2016-Azure
\ No newline at end of file
+ image_type: Windows2016-Azure
+ image_readme_name: Windows2016-Readme.md
\ No newline at end of file
diff --git a/images.CI/azure-pipelines/windows2019.yml b/images.CI/azure-pipelines/windows2019.yml
index 508fa12b3..f35a4f7ac 100644
--- a/images.CI/azure-pipelines/windows2019.yml
+++ b/images.CI/azure-pipelines/windows2019.yml
@@ -16,4 +16,5 @@ pr:
jobs:
- template: image-generation.yml
parameters:
- image_type: Windows2019-Azure
\ No newline at end of file
+ image_type: Windows2019-Azure
+ image_readme_name: Windows2019-Readme.md
\ No newline at end of file
diff --git a/images.CI/build-image.ps1 b/images.CI/build-image.ps1
index 54748e417..24d4a4d54 100644
--- a/images.CI/build-image.ps1
+++ b/images.CI/build-image.ps1
@@ -36,6 +36,9 @@ $SensitiveData = @(
': ->'
)
+Write-Host "Show Packer Version"
+packer --version
+
Write-Host "Build $Image VM"
packer build -var "capture_name_prefix=$ResourcesNamePrefix" `
-var "client_id=$ClientId" `
diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md
index a00a4084a..8af4c531d 100644
--- a/images/linux/Ubuntu1604-README.md
+++ b/images/linux/Ubuntu1604-README.md
@@ -1,16 +1,11 @@
# Ubuntu 16.04.6 LTS
-The following software is installed on machines with the 20200301.1 update.
+The following software is installed on machines with the 20200315.1 update.
***
- 7-Zip 9.20
-- Ansible (ansible 2.9.4)
+- Ansible (ansible 2.9.6)
- AzCopy (azcopy 7.3.0-netcore)
-- Azure CLI (azure-cli 2.1.0)
+- Azure CLI (azure-cli 2.2.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
@@ -19,6 +14,8 @@ Build timestamp as int: 1582297007)
- iproute2
- iputils-ping
- jq
+ - libc++-dev
+ - libc++abi-dev
- libcurl3
- libicu55
- libunwind8
@@ -37,14 +34,14 @@ Build timestamp as int: 1582297007)
- wget
- zip
- zstd
-- AWS CLI (aws-cli/1.18.11 Python/2.7.12 Linux/4.15.0-1071-azure botocore/1.15.11)
+- AWS CLI (aws-cli/1.18.21 Python/2.7.12 Linux/4.15.0-1071-azure botocore/1.15.21)
- 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-Moby (Docker version 3.0.10+azure, build 99c5edceb48d64c1aa5d09b8c9c499d431d98bb9)
+- Docker Compose (docker-compose version 1.25.4, build 8d51620a)
+- Docker-Moby (Docker version 3.0.11+azure, build eb310fca49568dccd87c6136f774ef6fff2a1b51)
- .NET Core SDK:
- 3.1.101
- 3.1.100
@@ -106,8 +103,8 @@ Build timestamp as int: 1582297007)
- 2.1.301
- 2.1.300
- Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 10.6.4)
-- Firefox (Mozilla Firefox 73.0.1)
-- Geckodriver (); Gecko Driver is available via GECKOWEBDRIVER environment variable
+- Firefox (Mozilla Firefox 74.0)
+- Geckodriver (0.26.0); Gecko Driver is available via GECKOWEBDRIVER environment variable
- GNU C++ 7.4.0
- GNU C++ 8.3.0
- GNU C++ 9.2.1
@@ -115,14 +112,9 @@ Build timestamp as int: 1582297007)
- GNU Fortran 9.2.1
- Git (2.25.1)
- Git Large File Storage (LFS) (2.10.0)
-- Go 1.9 (go version go1.9.7 linux/amd64)
-- Go 1.10 (go version go1.10.8 linux/amd64)
-- Go 1.11 (go version go1.11.12 linux/amd64)
-- Go 1.12 (go version go1.12.7 linux/amd64)
-- Go 1.13 (go version go1.13 linux/amd64)
-- Google Chrome (Google Chrome 80.0.3987.122 )
-- Chromedriver (ChromeDriver 80.0.3987.106 (f68069574609230cf9b635cd784cfb1bf81bb53a-refs/branch-heads/3987@{#882})); Chrome Driver is available via CHROMEWEBDRIVER environment variable
-- Google Cloud SDK (282.0.0)
+- Google Chrome (Google Chrome 80.0.3987.132 )
+- ChromeDriver 80.0.3987.106 (f68069574609230cf9b635cd784cfb1bf81bb53a-refs/branch-heads/3987@{#882}); Chrome Driver is available via CHROMEWEBDRIVER environment variable
+- Google Cloud SDK (284.0.0)
- Haskell Cabal (cabal-install version 2.0.0.1
compiled using version 2.0.1.1 of the Cabal library )
- Haskell Cabal (cabal-install version 2.2.0.0
@@ -140,23 +132,24 @@ compiled using version 3.0.2.0 of the Cabal library )
- GHC (The Glorious Glasgow Haskell Compilation System, version 8.6.5)
- GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.1)
- GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.2)
+- GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.3)
- Haskell Stack (Version 2.1.3, Git revision 636e3a759d51127df2b62f90772def126cdf6d1f (7735 commits) x86_64 hpack-0.31.2)
-- Heroku (heroku/7.38.2 linux-x64 node-v12.13.0)
-- HHVM (HipHop VM 4.46.0 (rel))
+- Heroku (heroku/7.39.0 linux-x64 node-v12.13.0)
+- HHVM (HipHop VM 4.48.0 (rel))
- ImageMagick
- Azul Zulu OpenJDK (7) (openjdk version "1.7.0_252")
- Azul Zulu OpenJDK (8) (openjdk version "1.8.0_242")
- Azul Zulu OpenJDK (11) (openjdk version "11.0.6" 2020-01-14 LTS)
- Azul Zulu OpenJDK (12) (openjdk version "12.0.2" 2019-07-16)
- Ant (Apache Ant(TM) version 1.9.6 compiled on July 20 2018)
-- Gradle 6.2.1
+- Gradle 6.2.2
- Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f))
- Kind (kind v0.7.0 go1.13.6 linux/amd64)
-- kubectl (Client Version: v1.17.3)
-- helm (Client: v2.16.3+g1ee0254)
-- Leiningen (Leiningen 2.9.2 on Java 1.8.0_242 OpenJDK 64-Bit Server VM)
+- kubectl (Client Version: v1.17.4)
+- helm (v3.1.2+gd878d4d)
+- Leiningen (Leiningen 2.9.1 on Java 1.8.0_242 OpenJDK 64-Bit Server VM)
- Mercurial (Mercurial Distributed SCM (version 4.4.1))
-- Miniconda (conda 4.7.12)
+- Miniconda (conda 4.8.2)
- Mono (Mono JIT compiler version 6.8.0.105 (tarball Tue Feb 4 21:20:35 UTC 2020))
- MySQL (mysql Ver 14.14 Distrib 5.7.29, for Linux (x86_64) using EditLine wrapper)
- MySQL Server (user:root password:root)
@@ -165,12 +158,14 @@ compiled using version 3.0.2.0 of the Cabal library )
- Grunt (grunt-cli v1.2.0)
- Gulp (CLI version: 2.2.0
Local version: Unknown)
-- n (6.3.1)
+- n (6.4.0)
- Parcel (1.12.4)
- TypeScript (Version 3.8.3)
-- Webpack (4.41.6)
+- Webpack (4.42.0)
- Webpack CLI (3.3.11)
-- Yarn (1.22.0)
+- Yarn (1.22.4)
+- Bazel (bazel 2.2.0)
+- Bazelisk (1.3.0)
- PhantomJS (2.1.1)
- PHP 5.6 (PHP 5.6.40-24+ubuntu16.04.1+deb.sury.org+1 (cli) )
- PHP 7.0 (PHP 7.0.33-23+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:20:42) ( NTS ))
@@ -178,30 +173,34 @@ Local version: Unknown)
- PHP 7.2 (PHP 7.2.28-3+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:23:01) ( NTS ))
- PHP 7.3 (PHP 7.3.15-3+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:23:10) ( NTS ))
- PHP 7.4 (PHP 7.4.3 (cli) (built: Feb 23 2020 07:24:02) ( NTS ))
-- Composer (Composer version 1.9.3 2020-02-04 12:58:49)
+- Composer (Composer version 1.10.1 2020-03-13 20:34:27)
- PHPUnit (PHPUnit 7.5.20 by Sebastian Bergmann and contributors.)
- Pollinate
- psql (PostgreSQL) 9.5.19
-- Powershell (PowerShell 6.2.4)
+- Powershell (PowerShell 7.0.0)
- ruby (2.3.1p112)
- gem (3.1.2)
- rustup (1.21.1)
-- rust (1.41.1)
-- cargo (1.41.0)
+- rust (1.42.0)
+- cargo (1.42.0)
- rustfmt (1.4.11-stable)
- clippy (0.0.212)
-- rustdoc (1.41.1)
-- bindgen (execute
-the
-0.53.1)
+- rustdoc (1.42.0)
+- bindgen (0.53.2)
- cbindgen (0.13.1)
+- Julia (julia version 1.3.1)
- sbt (1.3.8)
- Selenium server standalone (available via SELENIUM_JAR_PATH environment variable)
- Sphinx Open Source Search Server
- Subversion (svn, version 1.9.3 (r1718519))
-- Terraform (Terraform v0.12.21)
+- Terraform (Terraform v0.12.23)
+- Packer (1.5.4)
- Vcpkg 2020.02.04-unknownhash
- Zeit Now CLI (17.0.4)
+- Go 1.11 (go version go1.11.13 linux/amd64)
+- Go 1.12 (go version go1.12.17 linux/amd64)
+- Go 1.13 (go version go1.13.8 linux/amd64)
+- Go 1.14 (go version go1.14 linux/amd64)
- Google Repository 58
- Google Play services 49
- Google APIs 24
@@ -227,6 +226,7 @@ the
- Android SDK Platform 15
- Android SDK Platform 10
- Android SDK Patch Applier v4
+- Android SDK Build-Tools 29.0.3
- Android SDK Build-Tools 29.0.2
- Android SDK Build-Tools 29.0.0
- Android SDK Build-Tools 28.0.3
diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md
index 4b35378c3..61577a940 100644
--- a/images/linux/Ubuntu1804-README.md
+++ b/images/linux/Ubuntu1804-README.md
@@ -1,16 +1,11 @@
# Ubuntu 18.04.4 LTS
-The following software is installed on machines with the 20200301.1 update.
+The following software is installed on machines with the 20200316.1 update.
***
- 7-Zip 16.02
-- Ansible (ansible 2.9.4)
+- Ansible (ansible 2.9.6)
- AzCopy (azcopy 7.3.0-netcore)
-- Azure CLI (azure-cli 2.1.0)
+- Azure CLI (azure-cli 2.2.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
@@ -37,14 +32,14 @@ Build timestamp as int: 1582297007)
- wget
- zip
- zstd
-- AWS CLI (aws-cli/1.18.11 Python/2.7.17 Linux/5.0.0-1032-azure botocore/1.15.11)
+- AWS CLI (aws-cli/1.18.21 Python/2.7.17 Linux/5.0.0-1032-azure botocore/1.15.21)
- 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-Moby (Docker version 3.0.10+azure, build 99c5edceb48d64c1aa5d09b8c9c499d431d98bb9)
+- Docker Compose (docker-compose version 1.25.4, build 8d51620a)
+- Docker-Moby (Docker version 3.0.11+azure, build eb310fca49568dccd87c6136f774ef6fff2a1b51)
- .NET Core SDK:
- 3.1.101
- 3.1.100
@@ -106,21 +101,18 @@ Build timestamp as int: 1582297007)
- 2.1.301
- 2.1.300
- Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 10.6.4)
-- Firefox (Mozilla Firefox 73.0.1)
-- Geckodriver (); Gecko Driver is available via GECKOWEBDRIVER environment variable
-- GNU C++ 7.4.0
+- Firefox (Mozilla Firefox 74.0)
+- Geckodriver (0.26.0); Gecko Driver is available via GECKOWEBDRIVER environment variable
+- GNU C++ 7.5.0
- GNU C++ 8.3.0
- GNU C++ 9.2.1
- GNU Fortran 8.3.0
- GNU Fortran 9.2.1
- Git (2.25.1)
- Git Large File Storage (LFS) (2.10.0)
-- Go 1.11 (go version go1.11.12 linux/amd64)
-- Go 1.12 (go version go1.12.7 linux/amd64)
-- Go 1.13 (go version go1.13 linux/amd64)
-- Google Chrome (Google Chrome 80.0.3987.122 )
-- Chromedriver (ChromeDriver 80.0.3987.106 (f68069574609230cf9b635cd784cfb1bf81bb53a-refs/branch-heads/3987@{#882})); Chrome Driver is available via CHROMEWEBDRIVER environment variable
-- Google Cloud SDK (282.0.0)
+- Google Chrome (Google Chrome 80.0.3987.132 )
+- ChromeDriver 80.0.3987.106 (f68069574609230cf9b635cd784cfb1bf81bb53a-refs/branch-heads/3987@{#882}); Chrome Driver is available via CHROMEWEBDRIVER environment variable
+- Google Cloud SDK (284.0.0)
- Haskell Cabal (cabal-install version 2.0.0.1
compiled using version 2.0.1.1 of the Cabal library )
- Haskell Cabal (cabal-install version 2.2.0.0
@@ -138,23 +130,24 @@ compiled using version 3.0.2.0 of the Cabal library )
- GHC (The Glorious Glasgow Haskell Compilation System, version 8.6.5)
- GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.1)
- GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.2)
+- GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.3)
- Haskell Stack (Version 2.1.3, Git revision 636e3a759d51127df2b62f90772def126cdf6d1f (7735 commits) x86_64 hpack-0.31.2)
-- Heroku (heroku/7.38.2 linux-x64 node-v12.13.0)
-- HHVM (HipHop VM 4.46.0 (rel))
+- Heroku (heroku/7.39.0 linux-x64 node-v12.13.0)
+- HHVM (HipHop VM 4.48.0 (rel))
- ImageMagick
- Azul Zulu OpenJDK (7) (openjdk version "1.7.0_252")
- Azul Zulu OpenJDK (8) (openjdk version "1.8.0_242")
- Azul Zulu OpenJDK (11) (openjdk version "11.0.6" 2020-01-14 LTS)
- Azul Zulu OpenJDK (12) (openjdk version "12.0.2" 2019-07-16)
- Ant (Apache Ant(TM) version 1.10.5 compiled on March 28 2019)
-- Gradle 6.2.1
+- Gradle 6.2.2
- Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f))
- Kind (kind v0.7.0 go1.13.6 linux/amd64)
-- kubectl (Client Version: v1.17.3)
-- helm (Client: v2.16.3+g1ee0254)
-- Leiningen (Leiningen 2.9.2 on Java 1.8.0_242 OpenJDK 64-Bit Server VM)
+- kubectl (Client Version: v1.17.4)
+- helm (v3.1.2+gd878d4d)
+- Leiningen (Leiningen 2.9.1 on Java 1.8.0_242 OpenJDK 64-Bit Server VM)
- Mercurial (Mercurial Distributed SCM (version 4.5.3))
-- Miniconda (conda 4.7.12)
+- Miniconda (conda 4.8.2)
- Mono (Mono JIT compiler version 6.8.0.105 (tarball Tue Feb 4 21:20:20 UTC 2020))
- MySQL (mysql Ver 14.14 Distrib 5.7.29, for Linux (x86_64) using EditLine wrapper)
- MySQL Server (user:root password:root)
@@ -163,41 +156,47 @@ compiled using version 3.0.2.0 of the Cabal library )
- Grunt (grunt-cli v1.2.0)
- Gulp (CLI version: 2.2.0
Local version: Unknown)
-- n (6.3.1)
+- n (6.4.0)
- Parcel (1.12.4)
- TypeScript (Version 3.8.3)
-- Webpack (4.41.6)
+- Webpack (4.42.0)
- Webpack CLI (3.3.11)
-- Yarn (1.22.0)
+- Yarn (1.22.4)
+- Bazel (bazel 2.2.0)
+- Bazelisk (1.3.0)
- PhantomJS (2.1.1)
- PHP 7.1 (PHP 7.1.33-12+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:22:16) ( NTS ))
- PHP 7.2 (PHP 7.2.28-3+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:23:25) ( NTS ))
- PHP 7.3 (PHP 7.3.15-3+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:23:33) ( NTS ))
- PHP 7.4 (PHP 7.4.3 (cli) (built: Feb 23 2020 07:24:28) ( NTS ))
-- Composer (Composer version 1.9.3 2020-02-04 12:58:49)
+- Composer (Composer version 1.10.1 2020-03-13 20:34:27)
- PHPUnit (PHPUnit 7.5.20 by Sebastian Bergmann and contributors.)
- Pollinate
- psql (PostgreSQL) 10.12
-- Powershell (PowerShell 6.2.4)
+- Powershell (PowerShell 7.0.0)
- ruby (2.5.1p57)
- gem (3.1.2)
- rustup (1.21.1)
-- rust (1.41.1)
-- cargo (1.41.0)
+- rust (1.42.0)
+- cargo (1.42.0)
- rustfmt (1.4.11-stable)
- clippy (0.0.212)
-- rustdoc (1.41.1)
-- bindgen (execute
-the
-0.53.1)
+- rustdoc (1.42.0)
+- bindgen (0.53.2)
- cbindgen (0.13.1)
+- Julia (julia version 1.3.1)
- sbt (1.3.8)
- Selenium server standalone (available via SELENIUM_JAR_PATH environment variable)
- Sphinx Open Source Search Server
- Subversion (svn, version 1.9.7 (r1800392))
-- Terraform (Terraform v0.12.21)
+- Terraform (Terraform v0.12.23)
+- Packer (1.5.4)
- Vcpkg 2020.02.04-unknownhash
- Zeit Now CLI (17.0.4)
+- Go 1.11 (go version go1.11.13 linux/amd64)
+- Go 1.12 (go version go1.12.17 linux/amd64)
+- Go 1.13 (go version go1.13.8 linux/amd64)
+- Go 1.14 (go version go1.14 linux/amd64)
- Google Repository 58
- Google Play services 49
- Google APIs 24
@@ -219,6 +218,7 @@ the
- Android SDK Platform 19
- Android SDK Platform 17
- Android SDK Patch Applier v4
+- Android SDK Build-Tools 29.0.3
- Android SDK Build-Tools 29.0.2
- Android SDK Build-Tools 29.0.0
- Android SDK Build-Tools 28.0.3
diff --git a/images/linux/scripts/installers/1604/android.sh b/images/linux/scripts/installers/1604/android.sh
index 95a44edcf..8dd2d6fa4 100644
--- a/images/linux/scripts/installers/1604/android.sh
+++ b/images/linux/scripts/installers/1604/android.sh
@@ -4,6 +4,8 @@
## Desc: Installs Android SDK
################################################################################
+set -e
+
# Source the helpers for use with the script
source $HELPER_SCRIPTS/document.sh
source $HELPER_SCRIPTS/apt.sh
@@ -16,14 +18,28 @@ source $HELPER_SCRIPTS/apt.sh
# ANDROID_HOME is deprecated, but older versions of Gradle rely on it
echo "ANDROID_HOME=${ANDROID_SDK_ROOT}" | tee -a /etc/environment
+# Create android sdk directory
+mkdir -p ${ANDROID_SDK_ROOT}
+
# Download the latest command line tools so that we can accept all of the licenses.
# See https://developer.android.com/studio/#command-tools
wget -O android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip
-unzip android-sdk.zip -d ${ANDROID_ROOT}
+unzip android-sdk.zip -d ${ANDROID_SDK_ROOT}
rm -f android-sdk.zip
+# Check sdk manager installation
+/usr/local/lib/android/sdk/tools/bin/sdkmanager --list 1>/dev/null
+if [ $? -eq 0 ]
+then
+ echo "Android SDK manager was installed"
+else
+ echo "Android SDK manager was not installed"
+ exit 1
+fi
+
+
# Install the following SDKs and build tools, passing in "y" to accept licenses.
-echo "y" | ${ANDROID_ROOT}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} \
+echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager \
"ndk-bundle" \
"platform-tools" \
"platforms;android-29" \
@@ -82,6 +98,7 @@ echo "y" | ${ANDROID_ROOT}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} \
"add-ons;addon-google_apis-google-22" \
"add-ons;addon-google_apis-google-21" \
"cmake;3.6.4111459" \
+ "cmake;3.10.2.4988404" \
"patcher;v4"
# Document what was added to the image
diff --git a/images/linux/scripts/installers/1804/android.sh b/images/linux/scripts/installers/1804/android.sh
index 716f8bb19..0bb58fb8e 100644
--- a/images/linux/scripts/installers/1804/android.sh
+++ b/images/linux/scripts/installers/1804/android.sh
@@ -4,6 +4,8 @@
## Desc: Installs Android SDK
################################################################################
+set -e
+
# Source the helpers for use with the script
source $HELPER_SCRIPTS/document.sh
source $HELPER_SCRIPTS/apt.sh
@@ -16,14 +18,27 @@ echo "ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}" | tee -a /etc/environment
# ANDROID_HOME is deprecated, but older versions of Gradle rely on it
echo "ANDROID_HOME=${ANDROID_SDK_ROOT}" | tee -a /etc/environment
+# Create android sdk directory
+mkdir -p ${ANDROID_SDK_ROOT}
+
# Download the latest command line tools so that we can accept all of the licenses.
# See https://developer.android.com/studio/#command-tools
wget -O android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip
-unzip android-sdk.zip -d ${ANDROID_ROOT}
+unzip android-sdk.zip -d ${ANDROID_SDK_ROOT}
rm -f android-sdk.zip
+# Check sdk manager installation
+/usr/local/lib/android/sdk/tools/bin/sdkmanager --list 1>/dev/null
+if [ $? -eq 0 ]
+then
+ echo "Android SDK manager was installed"
+else
+ echo "Android SDK manager was not installed"
+ exit 1
+fi
+
# Install the following SDKs and build tools, passing in "y" to accept licenses.
-echo "y" | ${ANDROID_ROOT}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} \
+echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager \
"ndk-bundle" \
"platform-tools" \
"platforms;android-29" \
@@ -76,6 +91,7 @@ echo "y" | ${ANDROID_ROOT}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} \
"add-ons;addon-google_apis-google-22" \
"add-ons;addon-google_apis-google-21" \
"cmake;3.6.4111459" \
+ "cmake;3.10.2.4988404" \
"patcher;v4"
# Document what was added to the image
diff --git a/images/linux/scripts/installers/boost.sh b/images/linux/scripts/installers/boost.sh
index 673b1f61e..5cdae6a0c 100644
--- a/images/linux/scripts/installers/boost.sh
+++ b/images/linux/scripts/installers/boost.sh
@@ -7,18 +7,16 @@
# Source the helpers for use with the script
source $HELPER_SCRIPTS/document.sh
+TOOLSET_PATH="$INSTALLER_SCRIPT_FOLDER/toolcache.json"
BOOST_LIB=/usr/local/share/boost
+BOOST_VERSIONS=$(cat $TOOLSET_PATH | jq -r 'to_entries[] | select(.key | match("boost")) | .value[] +".0"')
# Install Boost
-for BOOST_VERSION in ${BOOST_VERSIONS//,/ }
+for BOOST_VERSION in ${BOOST_VERSIONS}
do
- BOOST_SYMLINK_VER=`echo "${BOOST_VERSION//[.]/_}"`
- BOOST_ROOT="BOOST_ROOT_$BOOST_SYMLINK_VER"
-
- echo "$BOOST_ROOT=$BOOST_LIB/$BOOST_VERSION" | tee -a /etc/environment
- if [[ $BOOST_VERSION == $BOOST_DEFAULT ]]; then
- echo "BOOST_ROOT=$BOOST_LIB/$BOOST_VERSION" | tee -a /etc/environment
- fi
+ BOOST_SYMLINK_VER=$(echo "${BOOST_VERSION//[.]/_}")
+ BOOST_ROOT_VERSION="BOOST_ROOT_$BOOST_SYMLINK_VER"
+ echo "$BOOST_ROOT_VERSION=$BOOST_LIB/$BOOST_VERSION" | tee -a /etc/environment
DocumentInstalledItem "Boost C++ Libraries $BOOST_VERSION"
done
diff --git a/images/linux/scripts/installers/configure-environment.sh b/images/linux/scripts/installers/configure-environment.sh
new file mode 100644
index 000000000..35e3dba6b
--- /dev/null
+++ b/images/linux/scripts/installers/configure-environment.sh
@@ -0,0 +1,7 @@
+#Set ImageVersion and ImageOS env variables
+echo ImageVersion=$IMAGE_VERSION | tee -a /etc/environment
+echo ImageOS=$IMAGE_OS | tee -a /etc/environment
+
+# This directory is supposed to be created in $HOME and owned by user(https://github.com/actions/virtual-environments/issues/491)
+mkdir -p /etc/skel/.config/configstore
+echo 'export XDG_CONFIG_HOME=$HOME/.config' | tee -a /etc/skel/.bashrc
diff --git a/images/linux/scripts/installers/git.sh b/images/linux/scripts/installers/git.sh
index 026e73cd9..1d8e58a14 100644
--- a/images/linux/scripts/installers/git.sh
+++ b/images/linux/scripts/installers/git.sh
@@ -35,3 +35,13 @@ echo "Lastly, document the installed versions"
DocumentInstalledItem "Git ($(git --version 2>&1 | cut -d ' ' -f 3))"
# git-lfs/2.6.1 (GitHub; linux amd64; go 1.11.1)
DocumentInstalledItem "Git Large File Storage (LFS) ($(git-lfs --version 2>&1 | cut -d ' ' -f 1 | cut -d '/' -f 2))"
+
+#Install hub
+snap install hub --classic
+if command -v hub; then
+ echo "hub CLI was installed successfully"
+ DocumentInstalledItem "Hub CLI ($(hub --version | grep "hub version" | cut -d ' ' -f 3))"
+else
+ echo "[!] Hub CLI was not installed"
+ exit 1
+fi
diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh
index c979613e8..61d39af0a 100644
--- a/images/linux/scripts/installers/java-tools.sh
+++ b/images/linux/scripts/installers/java-tools.sh
@@ -68,10 +68,11 @@ done
# Document what was added to the image
echo "Lastly, documenting what we added to the metadata file"
-DocumentInstalledItem "Azul Zulu OpenJDK (7) ($(/usr/lib/jvm/zulu-7-azure-amd64/bin/java -showversion |& head -n 1))"
-DocumentInstalledItem "Azul Zulu OpenJDK (8) ($(/usr/lib/jvm/zulu-8-azure-amd64/bin/java -showversion |& head -n 1))"
-DocumentInstalledItem "Azul Zulu OpenJDK (11) ($(/usr/lib/jvm/zulu-11-azure-amd64/bin/java -showversion |& head -n 1))"
-DocumentInstalledItem "Azul Zulu OpenJDK (12) ($(/usr/lib/jvm/zulu-12-azure-amd64/bin/java -showversion |& head -n 1))"
+DocumentInstalledItem "Azul Zulu OpenJDK:"
+DocumentInstalledItemIndent "7 ($(/usr/lib/jvm/zulu-7-azure-amd64/bin/java -showversion |& head -n 1))"
+DocumentInstalledItemIndent "8 ($(/usr/lib/jvm/zulu-8-azure-amd64/bin/java -showversion |& head -n 1))"
+DocumentInstalledItemIndent "11 ($(/usr/lib/jvm/zulu-11-azure-amd64/bin/java -showversion |& head -n 1))"
+DocumentInstalledItemIndent "12 ($(/usr/lib/jvm/zulu-12-azure-amd64/bin/java -showversion |& head -n 1)) (default)"
DocumentInstalledItem "Ant ($(ant -version))"
DocumentInstalledItem "Gradle ${gradleVersion}"
DocumentInstalledItem "Maven ($(mvn -version | head -n 1))"
diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json
index 51e1bb51b..e604b0581 100644
--- a/images/linux/ubuntu1604.json
+++ b/images/linux/ubuntu1604.json
@@ -123,9 +123,12 @@
},
{
"type": "shell",
- "inline": [
- "echo ImageVersion={{user `image_version`}} | tee -a /etc/environment",
- "echo ImageOS={{user `image_os`}} | tee -a /etc/environment"
+ "scripts": [
+ "{{template_dir}}/scripts/installers/configure-environment.sh"
+ ],
+ "environment_vars": [
+ "IMAGE_VERSION={{user `image_version`}}",
+ "IMAGE_OS={{user `image_os`}}"
],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},
@@ -237,8 +240,7 @@
"environment_vars": [
"METADATA_FILE={{user `metadata_file`}}",
"HELPER_SCRIPTS={{user `helper_script_folder`}}",
- "BOOST_VERSIONS=1.69.0",
- "BOOST_DEFAULT=1.69.0"
+ "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}"
],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},
diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json
index 33800251c..6396229d7 100644
--- a/images/linux/ubuntu1804.json
+++ b/images/linux/ubuntu1804.json
@@ -126,9 +126,12 @@
},
{
"type": "shell",
- "inline": [
- "echo ImageVersion={{user `image_version`}} | tee -a /etc/environment",
- "echo ImageOS={{user `image_os`}} | tee -a /etc/environment"
+ "scripts": [
+ "{{template_dir}}/scripts/installers/configure-environment.sh"
+ ],
+ "environment_vars": [
+ "IMAGE_VERSION={{user `image_version`}}",
+ "IMAGE_OS={{user `image_os`}}"
],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},
@@ -239,8 +242,7 @@
"environment_vars": [
"METADATA_FILE={{user `metadata_file`}}",
"HELPER_SCRIPTS={{user `helper_script_folder`}}",
- "BOOST_VERSIONS=1.69.0",
- "BOOST_DEFAULT=1.69.0"
+ "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}"
],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},
diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md
index aae451696..10c9ac286 100644
--- a/images/macos/macos-10.15-Readme.md
+++ b/images/macos/macos-10.15-Readme.md
@@ -1,5 +1,5 @@
# macOS Catalina 10.15.3 (19D76)
-The following software is installed on machines with the 20200224.1 update.
+The following software is installed on machines with the 20200307.2 update.
#### Xcode 11.3.1 set by default
## Operating System
@@ -21,40 +21,42 @@ The following software is installed on machines with the 20200224.1 update.
- GNU Fortran (Homebrew GCC 9.2.0_3) 9.2.0
- Node.js v12.16.1
- NVM 0.33.11
-- NVM - Cached node versions: v6.17.1 v8.17.0 v10.19.0 v12.16.1 v13.9.0
-- PowerShell 6.2.4
+- NVM - Cached node versions: v6.17.1 v8.17.0 v10.19.0 v12.16.1 v13.10.1
+- PowerShell 7.0.0
- Python 2.7.17
- Python 3.7.6
- 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.14
- PHP 7.4.3
+- julia 1.3.1
### Package Management
- Rustup 1.21.1
+- Vcpkg 2020.02.04
- Bundler version 2.1.4
- Carthage 0.34.0
- CocoaPods 1.9.0
-- Homebrew 2.2.6
+- Homebrew 2.2.9
- NPM 6.13.4
-- Yarn 1.22.0
+- Yarn 1.22.1
- 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.1
+- Gradle 6.2.2
### Utilities
-- Curl 7.68.0
-- Git: 2.25.0
+- Curl 7.69.0
+- Git: 2.25.1
- Git LFS: 2.10.0
- GNU Wget 1.20.3
- Subversion (SVN) 1.13.0
+- Packer 1.5.4
- GNU parallel 20200222
- OpenSSL 1.0.2t 10 Sep 2019
- jq 1.6
@@ -63,18 +65,20 @@ The following software is installed on machines with the 20200224.1 update.
- aria2 1.35.0
- azcopy 10.3.4
- zstd 1.4.4
+- bazel 2.2.0
+- bazelisk v1.3.0
### Tools
-- Fastlane 2.142.0
-- Cmake 3.16.4
+- Fastlane 2.143.0
+- Cmake 3.16.5
- App Center CLI 2.3.3
- Azure CLI 2.1.0
### Browsers
-- Google Chrome 80.0.3987.122
+- Google Chrome 80.0.3987.132
- ChromeDriver 80.0.3987.106
-- Microsoft Edge 80.0.361.62
-- MSEdgeDriver 80.0.361.62
+- Microsoft Edge 80.0.361.66
+- MSEdgeDriver 80.0.361.66
- Mozilla Firefox 73.0.1
- geckodriver 0.26.0
@@ -98,7 +102,7 @@ The following software is installed on machines with the 20200224.1 update.
### Xamarin
#### Visual Studio for Mac
-- 8.4.7.17
+- 8.4.8.2
#### Mono
- 6.6.0.166
@@ -126,7 +130,7 @@ The following software is installed on machines with the 20200224.1 update.
### Xcode
| Version | Build | Path |
| ---------------- | ------- | --------------------------------- |
-| 11.4 (beta) | 11N123k | /Applications/Xcode_11.4_beta.app |
+| 11.4 (beta) | 11N132i | /Applications/Xcode_11.4_beta.app |
| 11.3.1 (default) | 11C505 | /Applications/Xcode_11.3.1.app |
| 11.3 | 11C29 | /Applications/Xcode_11.3.app |
| 11.2.1 | 11B500 | /Applications/Xcode_11.2.1.app |
@@ -185,9 +189,9 @@ The following software is installed on machines with the 20200224.1 update.
### Android
#### Android SDK Tools
-| Package Name | Description |
-| ---------------------------------- | ---------------------------------- |
-| tools | Android SDK Tools, Revision 26.1.1 |
+| Package Name | Description |
+| ------------ | ---------------------------------- |
+| tools | Android SDK Tools, Revision 26.1.1 |
#### Android SDK Platform-Tools
| Package Name | Description |
@@ -257,4 +261,3 @@ The following software is installed on machines with the 20200224.1 update.
| Google Repository | 58 |
| Intel x86 Emulator Accelerator (HAXM installer) | 7.5.1 |
-
diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json
index df58ba849..01a51195e 100644
--- a/images/win/Windows2016-Azure.json
+++ b/images/win/Windows2016-Azure.json
@@ -30,7 +30,8 @@
"image_os": "win16",
"github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}",
"go_versions": "1.9, 1.10, 1.11, 1.12, 1.13, 1.14",
- "go_default": "1.14"
+ "go_default": "1.14",
+ "boost_default": "1.69.0"
},
"sensitive-variables": ["install_password", "ssh_password", "client_secret", "github_feed_token"],
"builders": [
@@ -102,6 +103,12 @@
"{{ template_dir }}/scripts/Installers/Windows2016/Initialize-VM.ps1"
]
},
+ {
+ "type": "powershell",
+ "scripts":[
+ "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1"
+ ]
+ },
{
"type": "windows-restart",
"restart_timeout": "30m"
@@ -207,7 +214,7 @@
{
"type": "powershell",
"scripts":[
- "{{ template_dir }}/scripts/Installers/Windows2016/Install-Wix.ps1"
+ "{{ template_dir }}/scripts/Installers/Install-Wix.ps1"
]
},
{
@@ -223,7 +230,7 @@
{
"type": "powershell",
"scripts":[
- "{{ template_dir }}/scripts/Installers/Windows2016/Install-WDK.ps1"
+ "{{ template_dir }}/scripts/Installers/Install-WDK.ps1"
]
},
{
@@ -245,7 +252,7 @@
{
"type": "powershell",
"scripts":[
- "{{ template_dir }}/scripts/Installers/Windows2016/Validate-Wix.ps1"
+ "{{ template_dir }}/scripts/Installers/Validate-Wix.ps1"
]
},
{
@@ -257,7 +264,7 @@
{
"type": "powershell",
"scripts":[
- "{{ template_dir }}/scripts/Installers/Windows2016/Validate-WDK.ps1"
+ "{{ template_dir }}/scripts/Installers/Validate-WDK.ps1"
]
},
{
@@ -266,12 +273,6 @@
"{{ template_dir }}/scripts/Installers/Validate-ServiceFabricSDK.ps1"
]
},
- {
- "type": "powershell",
- "scripts":[
- "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1"
- ]
- },
{
"type": "powershell",
"scripts":[
@@ -323,6 +324,12 @@
"{{ template_dir }}/scripts/Installers/Download-ToolCache.ps1"
]
},
+ {
+ "type": "powershell",
+ "scripts":[
+ "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1"
+ ]
+ },
{
"type": "powershell",
"scripts":[
@@ -518,8 +525,8 @@
{
"type": "powershell",
"environment_vars": [
- "BOOST_VERSIONS=1.69.0,1.72.0",
- "BOOST_DEFAULT=1.69.0"
+ "ROOT_FOLDER={{user `root_folder`}}",
+ "BOOST_DEFAULT={{user `boost_default`}}"
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Install-Boost.ps1"
@@ -555,12 +562,6 @@
"{{ template_dir }}/scripts/Installers/Install-GitVersion.ps1"
]
},
- {
- "type": "powershell",
- "scripts":[
- "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1"
- ]
- },
{
"type": "powershell",
"scripts":[
@@ -628,6 +629,12 @@
"{{ template_dir }}/scripts/Installers/Validate-ToolCache.ps1"
]
},
+ {
+ "type": "powershell",
+ "scripts":[
+ "{{ template_dir }}/scripts/Installers/Validate-OpenSSL.ps1"
+ ]
+ },
{
"type": "powershell",
"scripts":[
@@ -653,8 +660,8 @@
{
"type": "powershell",
"environment_vars": [
- "BOOST_VERSIONS=1.69.0,1.72.0",
- "BOOST_DEFAULT=1.69.0"
+ "ROOT_FOLDER={{user `root_folder`}}",
+ "BOOST_DEFAULT={{user `boost_default`}}"
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Validate-Boost.ps1"
@@ -834,12 +841,6 @@
"{{ template_dir }}/scripts/Installers/Validate-GitVersion.ps1"
]
},
- {
- "type": "powershell",
- "scripts":[
- "{{ template_dir }}/scripts/Installers/Validate-OpenSSL.ps1"
- ]
- },
{
"type": "powershell",
"scripts":[
diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md
index c60d1ffa7..e81702625 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 20200308.0 update.
+The following software is installed on machines with the 20200316.1 update.
Components marked with **\*** have been upgraded since the previous version of the image.
@@ -30,15 +30,15 @@ _Version:_ 7.0.0
## Docker images
The following container images have been cached:
-* mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 (Digest: sha256:2053602020c89ff2d6c0d4005372ebc6cebcf866fb5785e562d91389aa467943)
-* mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 (Digest: sha256:ca895ab76f1d3ab95f022cbca076e06b62daebafe61af34212bb3ed1fe982d78)
-* mcr.microsoft.com/windows/servercore:ltsc2016 (Digest: sha256:10e43e24be6eb5f3e19e705a88adb9794b569028f0e0d715d40f25e53e04c3fc)
+* mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 (Digest: sha256:e53049e13aa29b2df35642fa827c532ceaa78745e6ca72be2cbe74b1d75b5b99)
+* mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 (Digest: sha256:9d34bebe71fdebfd288b3e87a9b8372e47a9291782c09fbaeb657f8f78817779)
+* mcr.microsoft.com/windows/servercore:ltsc2016 (Digest: sha256:5bd97dbab1afe8d3200f5d5c974df3b0130e74e8a69fddcd427699c4c8cb5037)
* microsoft/aspnetcore-build:1.0-2.0 (Digest: sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c)
* mcr.microsoft.com/windows/nanoserver:10.0.14393.953 (Digest: sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268)
## Visual Studio 2017 Enterprise
-_Version:_ VisualStudio/15.9.20+28307.1033
+_Version:_ VisualStudio/15.9.21+28307.1064
_Location:_ C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise
The following workloads including required and recommended components are installed with Visual Studio 2017:
@@ -415,7 +415,7 @@ _Description:_ .NET has been configured to use TLS 1.2 by default
## Azure CLI
-_Version:_ 2.1.0
+_Version:_ 2.2.0
_Environment:_
* PATH: contains location of az.cmd
@@ -425,7 +425,7 @@ _Version:_ azure-devops 0.17.0
## Python
-_Version:_ 2.7.17 (x64)
_Version:_ 3.5.4 (x64)
_Version:_ 3.6.8 (x64)
_Version:_ 3.7.6 (x64)
_Version:_ 3.8.2 (x64)
_Version:_ 2.7.17 (x86)
_Version:_ 3.5.4 (x86)
_Version:_ 3.6.8 (x86)
_Version:_ 3.7.6 (x86)
_Version:_ 3.8.2 (x86)
+_Version:_ 2.7.17 (x64)
_Version:_ 3.5.4 (x64)
_Version:_ 3.6.8 (x64)
_Version:_ 3.7.6 (x64)
_Version:_ 3.8.2 (x64)
_Version:_ 2.7.17 (x86)
_Version:_ 3.5.4 (x86)
_Version:_ 3.6.8 (x86)
_Version:_ 3.7.6 (x86)
_Version:_ 3.8.2 (x86)
__System default version:__ Python 3.7.6
_Environment:_
* Location: C:\hostedtoolcache\windows\Python\3.7.6\x64
* PATH: contains the location of Python 3.7.6
## PyPy
@@ -433,17 +433,11 @@ _Version:_ 2.7.13 (x86)
_Version:_ 3.6.9 (x86)
## Ruby
-_Version:_ 2.4.9 (x64)
_Version:_ 2.5.7 (x64)
_Version:_ 2.6.5 (x64)
_Version:_ 2.7.0 (x64)
+_Version:_ 2.4.9 (x64)
_Version:_ 2.5.7 (x64)
_Version:_ 2.6.5 (x64)
_Version:_ 2.7.0 (x64)
__System default version:__ Ruby 2.5.7p206
_Environment:_
* Location: C:\hostedtoolcache\windows\Ruby\2.5.7\x64\bin
* PATH: contains the location of Ruby 2.5.7p206
* Gem Version: 2.7.6.2
-## Python (64 bit)
+## OpenSSL
-#### Python 3.6.8
-_Environment:_
-* PATH: contains location of python.exe
-
-#### Python 2.7.17
-
-_Location:_ C:/hostedtoolcache/windows/Python/2.7*/x64
+_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe
_Version:_ 1.1.1c at C:\Strawberry\c\bin\openssl.exe
_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe
_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe
_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe
## Perl
@@ -464,32 +458,12 @@ _Environment:_
## Go (x64)
-#### 1.9.7
+#### 1.14
_Environment:_
-* GOROOT_1_9_X64: root directory of the Go 1.9.7 installation
-
-#### 1.10.8
-
-_Environment:_
-* GOROOT_1_10_X64: root directory of the Go 1.10.8 installation
-
-#### 1.11.12
-
-_Environment:_
-* GOROOT_1_11_X64: root directory of the Go 1.11.12 installation
-
-#### 1.12.7
-
-_Environment:_
-* PATH: contains the location of go.exe version 1.12.7
-* GOROOT: root directory of the Go 1.12.7 installation
-* GOROOT_1_12_X64: root directory of the Go 1.12.7 installation
-#### 1.13
-
-_Environment:_
-* GOROOT_1_13_X64: root directory of the Go 1.13 installation
-
+* PATH: contains the location of go.exe version 1.14
+* GOROOT: root directory of the Go 1.14 installation
+* GOROOT_1_14_X64: root directory of the Go 1.14 installation
## Boost
@@ -514,17 +488,9 @@ _Environment:_
* PATH: contains the location of php.exe version 7.4.3
* PHPROOT: root directory of the PHP 7.4.3 installation
-## Ruby (x64)
-
-#### 2.5.7p206
-_Environment:_
-* Location: C:\hostedtoolcache\windows\Ruby\2.5.7\x64\bin
-* PATH: contains the location of ruby.exe version 2.5.7p206
-* Gem Version: 3.1.2
-
## Rust (64-bit)
-#### 1.41.1
+#### 1.42.0
_Location:_ C:\Rust\.cargo\bin
_Environment:_
* PATH: contains the location of rustc.exe
@@ -556,7 +522,7 @@ _version:_
## Mozilla Firefox
_version:_
-73.0.1
+74.0
## Selenium Web Drivers
@@ -602,7 +568,7 @@ _Environment:_
* PATH: contains location of node.exe
* Gulp CLI version: 2.2.0 Local version: Unknown
* Grunt grunt-cli v1.3.2
-* Yarn 1.22.1
+* Yarn 1.22.4
## npm
@@ -823,15 +789,11 @@ _Version:_ 1.4.0
## Inno Setup
-_Version:_ 6.0.3
+_Version:_ 6.0.4
## GitVersion
-_Version:_ 5.2.0.0
-
-## OpenSSL
-
-_Version:_ 1.1.1c at C:\Strawberry\c\bin\openssl.exe
_Version:_ 1.1.1d at C:\Program Files\Git\mingw64\bin\openssl.exe
_Version:_ 1.1.1d at C:\Program Files\Git\usr\bin\openssl.exe
_Version:_ 1.0.2j at C:\Program Files (x86)\Subversion\bin\openssl.exe
_Version:_ 1.1.1 at C:\Program Files\OpenSSL\bin\openssl.exe
+_Version:_ 5.2.3.0
## Cloud Foundry CLI
diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json
index 7e7df2348..399758f5a 100644
--- a/images/win/Windows2019-Azure.json
+++ b/images/win/Windows2019-Azure.json
@@ -30,7 +30,8 @@
"image_os": "win19",
"github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}",
"go_versions": "1.9, 1.10, 1.11, 1.12, 1.13, 1.14",
- "go_default": "1.14"
+ "go_default": "1.14",
+ "boost_default": "1.72.0"
},
"sensitive-variables": ["install_password", "ssh_password", "client_secret", "github_feed_token"],
"builders": [
@@ -102,6 +103,12 @@
"{{ template_dir }}/scripts/Installers/Windows2019/Initialize-VM.ps1"
]
},
+ {
+ "type": "powershell",
+ "scripts":[
+ "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1"
+ ]
+ },
{
"type": "windows-restart",
"restart_timeout": "10m"
@@ -182,13 +189,13 @@
{
"type": "powershell",
"scripts":[
- "{{ template_dir }}/scripts/Installers/Windows2019/Install-Wix.ps1"
+ "{{ template_dir }}/scripts/Installers/Install-Wix.ps1"
]
},
{
"type": "powershell",
"scripts":[
- "{{ template_dir }}/scripts/Installers/Windows2019/Install-AnalysisExtenstion.ps1"
+ "{{ template_dir }}/scripts/Installers/Windows2019/Install-SSDTExtensions.ps1"
]
},
{
@@ -204,7 +211,7 @@
{
"type": "powershell",
"scripts": [
- "{{ template_dir }}/scripts/Installers/Windows2019/Install-WDK.ps1"
+ "{{ template_dir }}/scripts/Installers/Install-WDK.ps1"
]
},
{
@@ -220,13 +227,13 @@
{
"type": "powershell",
"scripts":[
- "{{ template_dir }}/scripts/Installers/Windows2019/Validate-Wix.ps1"
+ "{{ template_dir }}/scripts/Installers/Validate-Wix.ps1"
]
},
{
"type": "powershell",
"scripts":[
- "{{ template_dir }}/scripts/Installers/Windows2019/Validate-AnalysisExtenstion.ps1"
+ "{{ template_dir }}/scripts/Installers/Windows2019/Validate-SSDTExtensions.ps1"
]
},
{
@@ -238,7 +245,7 @@
{
"type": "powershell",
"scripts":[
- "{{ template_dir }}/scripts/Installers/Windows2019/Validate-WDK.ps1"
+ "{{ template_dir }}/scripts/Installers/Validate-WDK.ps1"
]
},
{
@@ -247,12 +254,6 @@
"{{ template_dir }}/scripts/Installers/Validate-ServiceFabricSDK.ps1"
]
},
- {
- "type": "powershell",
- "scripts":[
- "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1"
- ]
- },
{
"type": "powershell",
"scripts":[
@@ -298,6 +299,12 @@
"{{ template_dir }}/scripts/Installers/Download-ToolCache.ps1"
]
},
+ {
+ "type": "powershell",
+ "scripts":[
+ "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1"
+ ]
+ },
{
"type": "powershell",
"scripts":[
@@ -499,8 +506,8 @@
{
"type": "powershell",
"environment_vars": [
- "BOOST_VERSIONS=1.69.0,1.72.0",
- "BOOST_DEFAULT=1.72.0"
+ "ROOT_FOLDER={{user `root_folder`}}",
+ "BOOST_DEFAULT={{user `boost_default`}}"
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Install-Boost.ps1"
@@ -536,12 +543,6 @@
"{{ template_dir }}/scripts/Installers/Install-GitVersion.ps1"
]
},
- {
- "type": "powershell",
- "scripts":[
- "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1"
- ]
- },
{
"type": "powershell",
"scripts":[
@@ -615,6 +616,12 @@
"{{ template_dir }}/scripts/Installers/Validate-ToolCache.ps1"
]
},
+ {
+ "type": "powershell",
+ "scripts":[
+ "{{ template_dir }}/scripts/Installers/Validate-OpenSSL.ps1"
+ ]
+ },
{
"type": "powershell",
"scripts":[
@@ -640,8 +647,8 @@
{
"type": "powershell",
"environment_vars": [
- "BOOST_VERSIONS=1.69.0,1.72.0",
- "BOOST_DEFAULT=1.72.0"
+ "ROOT_FOLDER={{user `root_folder`}}",
+ "BOOST_DEFAULT={{user `boost_default`}}"
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Validate-Boost.ps1"
@@ -815,12 +822,6 @@
"{{ template_dir }}/scripts/Installers/Validate-GitVersion.ps1"
]
},
- {
- "type": "powershell",
- "scripts":[
- "{{ template_dir }}/scripts/Installers/Validate-OpenSSL.ps1"
- ]
- },
{
"type": "powershell",
"scripts":[
diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/win/scripts/ImageHelpers/ImageHelpers.psm1
index ae58a9818..743dc7a18 100644
--- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1
+++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1
@@ -14,9 +14,15 @@ Export-ModuleMember -Function @(
'Set-SystemVariable'
'Install-MSI'
'Install-EXE'
+ 'Get-ToolcachePackages'
+ 'Get-ToolsByName'
'Add-ContentToMarkdown'
'Add-SoftwareDetailsToMarkdown'
'Stop-SvcWithErrHandling'
'Set-SvcWithErrHandling'
- 'Get-VS19ExtensionVersion'
+ 'Install-VsixExtension'
+ 'Get-VSExtensionVersion'
+ 'Get-WinVersion'
+ 'Test-IsWin19'
+ 'Test-IsWin16'
)
diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1
index 5ce11dede..0f965f74c 100644
--- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1
+++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1
@@ -161,6 +161,7 @@ Hashtable for service arguments
}
}
+<<<<<<< HEAD
function Start-DownloadWithRetry
{
param (
@@ -201,6 +202,8 @@ function Start-DownloadWithRetry
}
+=======
+>>>>>>> upstream/master
function Install-VsixExtension
{
Param
@@ -351,3 +354,7 @@ function Test-IsWin16
{
(Get-WinVersion) -match "2016"
}
+<<<<<<< HEAD
+=======
+
+>>>>>>> upstream/master
diff --git a/images/win/scripts/Installers/Install-Boost.ps1 b/images/win/scripts/Installers/Install-Boost.ps1
index 907f82d93..0931fb25a 100644
--- a/images/win/scripts/Installers/Install-Boost.ps1
+++ b/images/win/scripts/Installers/Install-Boost.ps1
@@ -4,8 +4,11 @@
## Desc: Install boost using tool cache
################################################################################
-$BoostDirectory = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Boost"
-$BoostVersions = $env:BOOST_VERSIONS.split(',')
+Import-Module -Name ImageHelpers
+
+$SoftwareName = "Boost"
+$BoostDirectory = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath $SoftwareName
+$BoostVersions = (Get-ToolsByName -SoftwareName $SoftwareName).Versions | Foreach-Object {"{0}.0" -f $_}
$BoostDefault = $env:BOOST_DEFAULT
foreach($BoostVersion in $BoostVersions)
@@ -20,7 +23,5 @@ foreach($BoostVersion in $BoostVersions)
Write-Host "Adding Boost $BoostVersion to the path..."
# Add the Boost binaries to the path
Add-MachinePathItem $BoostInstallationDir | Out-Null
- # Set the BOOSTROOT environment variable
- setx BOOST_ROOT $BoostInstallationDir /M | Out-Null
}
}
diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/win/scripts/Installers/Install-Docker.ps1
index cd1f96969..ec4f0d895 100644
--- a/images/win/scripts/Installers/Install-Docker.ps1
+++ b/images/win/scripts/Installers/Install-Docker.ps1
@@ -14,3 +14,7 @@ Install-Package -Name docker -ProviderName DockerMsftProvider -Force
Start-Service docker
choco install docker-compose -y
+
+# Install helm
+Write-Host "Install Helm"
+choco install kubernetes-helm
\ No newline at end of file
diff --git a/images/win/scripts/Installers/Install-Git.ps1 b/images/win/scripts/Installers/Install-Git.ps1
index a67d7c998..24efc5bd0 100644
--- a/images/win/scripts/Installers/Install-Git.ps1
+++ b/images/win/scripts/Installers/Install-Git.ps1
@@ -8,6 +8,7 @@ Import-Module -Name ImageHelpers
# Install the latest version of Git which is bundled with Git LFS.
# See https://chocolatey.org/packages/git
choco install git -y --package-parameters="/GitAndUnixToolsOnPath /WindowsTerminal /NoShellIntegration"
+choco install hub
# Disable GCM machine-wide
[Environment]::SetEnvironmentVariable("GCM_INTERACTIVE", "Never", [System.EnvironmentVariableTarget]::Machine)
diff --git a/images/win/scripts/Installers/Windows2019/Install-WDK.ps1 b/images/win/scripts/Installers/Install-WDK.ps1
similarity index 55%
rename from images/win/scripts/Installers/Windows2019/Install-WDK.ps1
rename to images/win/scripts/Installers/Install-WDK.ps1
index b70644370..9df64d914 100644
--- a/images/win/scripts/Installers/Windows2019/Install-WDK.ps1
+++ b/images/win/scripts/Installers/Install-WDK.ps1
@@ -4,8 +4,24 @@
################################################################################
# Requires Windows SDK with the same version number as the WDK
-$winSdkUrl = "https://go.microsoft.com/fwlink/p/?linkid=2083338"
-$wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2085767"
+
+Import-Module -Name ImageHelpers -Force
+
+if(Test-IsWin19)
+{
+ $winSdkUrl = "https://go.microsoft.com/fwlink/p/?linkid=2083338"
+ $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2085767"
+ $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix"
+ $VSver = "2019"
+}
+else
+{
+ $winSdkUrl = "https://go.microsoft.com/fwlink/p/?LinkID=2023014"
+ $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2026156"
+ $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\WDK.vsix"
+ $VSver = "2017"
+}
+
# `winsdksetup.exe /features + /quiet` installs all features without showing the GUI
$sdkExitCode = Install-EXE -Url $winSdkUrl -Name "winsdksetup.exe" -ArgumentList ("/features", "+", "/quiet")
@@ -26,32 +42,4 @@ if ($wdkExitCode -ne 0)
}
# Need to install the VSIX to get the build targets when running VSBuild
-# Write-Host "Installing WDK.vsix"
-try
-{
- $process = Start-Process `
- -FilePath "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\VSIXInstaller.exe" `
- -ArgumentList ("/quiet", '"C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix"') `
- -Wait `
- -PassThru
-}
-catch
-{
- Write-Host "There is an error during WDK.vsix installation"
- $_
- exit 1
-}
-
-
- $exitCode = $process.ExitCode
-
-if ($exitCode -eq 0 -or $exitCode -eq 1001) # 1001 means the extension is already installed
-{
- Write-Host "WDK.vsix installed successfully"
-}
-else
-{
- Write-Host "Unsuccessful exit code returned by the installation process: $exitCode."
-}
-
-exit $exitCode
+Install-VsixExtension -FilePath $FilePath -Name "WDK.vsix" -VSversion $VSver -InstallOnly
diff --git a/images/win/scripts/Installers/Install-Wix.ps1 b/images/win/scripts/Installers/Install-Wix.ps1
new file mode 100644
index 000000000..076be86c9
--- /dev/null
+++ b/images/win/scripts/Installers/Install-Wix.ps1
@@ -0,0 +1,23 @@
+################################################################################
+## File: Install-Wix.ps1
+## Desc: Install WIX.
+################################################################################
+
+Import-Module -Name ImageHelpers -Force;
+
+choco install wixtoolset -y --force
+
+if(Test-IsWin19)
+{
+ $extensionUrl = "https://wixtoolset.gallerycdn.vsassets.io/extensions/wixtoolset/wixtoolsetvisualstudio2019extension/1.0.0.4/1563296438961/Votive2019.vsix"
+ $VSver = "2019"
+}
+else
+{
+ $extensionUrl = "https://robmensching.gallerycdn.vsassets.io/extensions/robmensching/wixtoolsetvisualstudio2017extension/0.9.21.62588/1494013210879/250616/4/Votive2017.vsix"
+ $VSver = "2017"
+}
+
+$extensionName = "Votive$VSver.vsix"
+#Installing VS extension 'Wix Toolset Visual Studio Extension'
+Install-VsixExtension -Url $extensionUrl -Name $extensionName -VSversion $VSver
diff --git a/images/win/scripts/Installers/Update-AndroidSDK.ps1 b/images/win/scripts/Installers/Update-AndroidSDK.ps1
index 0487bb4ee..4a04b0b6f 100644
--- a/images/win/scripts/Installers/Update-AndroidSDK.ps1
+++ b/images/win/scripts/Installers/Update-AndroidSDK.ps1
@@ -110,6 +110,7 @@ Push-Location -Path $sdk.FullName
"add-ons;addon-google_apis-google-22" `
"add-ons;addon-google_apis-google-21" `
"cmake;3.6.4111459" `
+ "cmake;3.10.2.4988404" `
"patcher;v4"
Pop-Location
diff --git a/images/win/scripts/Installers/Validate-Bazel.ps1 b/images/win/scripts/Installers/Validate-Bazel.ps1
index 9cdccda4d..1728a9a6c 100644
--- a/images/win/scripts/Installers/Validate-Bazel.ps1
+++ b/images/win/scripts/Installers/Validate-Bazel.ps1
@@ -41,4 +41,4 @@ $Description = @"
_Version:_ $bazelisk_version
"@
-Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
\ No newline at end of file
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
diff --git a/images/win/scripts/Installers/Validate-Boost.ps1 b/images/win/scripts/Installers/Validate-Boost.ps1
index 9c97c28dc..6289e1652 100644
--- a/images/win/scripts/Installers/Validate-Boost.ps1
+++ b/images/win/scripts/Installers/Validate-Boost.ps1
@@ -3,6 +3,8 @@
## Desc: Validate Boost
################################################################################
+Import-Module -Name ImageHelpers
+
function Validate-BoostVersion
{
Param
@@ -37,7 +39,7 @@ else
# Adding description of the software to Markdown
$tmplMark = @"
-#### {0}
+#### {0} [{2}]
_Environment:_
* {1}: root directory of the Boost version {0} installation
@@ -45,31 +47,51 @@ _Environment:_
"@
$tmplMarkRoot = @"
-#### {0}
+#### {0} [{2}]
+_Environment:_
* PATH: contains the location of Boost version {0}
-* BOOST_ROOT: root directory of the Boost version {0} installation
* {1}: root directory of the Boost version {0} installation
"@
-$SoftwareName = 'Boost'
$Description = New-Object System.Text.StringBuilder
-$BoostRootDirectory = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Boost"
-$BoostVersionsToInstall = $env:BOOST_VERSIONS.split(",")
+$SoftwareName = 'Boost'
+$BoostRootDirectory = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath $SoftwareName
+$BoostTools = Get-ToolsByName -SoftwareName $SoftwareName
-foreach($BoostVersion in $BoostVersionsToInstall)
+foreach ($BoostTool in $BoostTools)
{
- Validate-BoostVersion -BoostRootPath $BoostRootDirectory -BoostRelease $BoostVersion
- $BoostVersionTag = "BOOST_ROOT_{0}" -f $BoostVersion.Replace('.', '_')
+ $BoostToolsetName = $BoostTool.Architecture
+ $BoostVersionsToInstall = $BoostTool.Versions | Foreach-Object {"{0}.0" -f $_}
+ foreach($BoostVersion in $BoostVersionsToInstall)
+ {
+ Validate-BoostVersion -BoostRootPath $BoostRootDirectory -BoostRelease $BoostVersion
+ $BoostVersionTag = "BOOST_ROOT_{0}" -f $BoostVersion.Replace('.', '_')
- if($BoostVersion -eq $env:BOOST_DEFAULT)
- {
- $null = $Description.AppendLine(($tmplMarkRoot -f $BoostVersion, $BoostVersionTag))
- }
- else
- {
- $null = $Description.AppendLine(($tmplMark -f $BoostVersion, $BoostVersionTag))
+ if($BoostVersion -eq $env:BOOST_DEFAULT)
+ {
+ $null = $Description.AppendLine(($tmplMarkRoot -f $BoostVersion, $BoostVersionTag, $BoostToolsetName))
+ }
+ else
+ {
+ $null = $Description.AppendLine(($tmplMark -f $BoostVersion, $BoostVersionTag, $BoostToolsetName))
+ }
}
}
+$CMakeFindBoostInfo = @"
+
+#### _Notes:_
+Link: https://cmake.org/cmake/help/latest/module/FindBoost.html
+
+If Boost was built using the ``boost-cmake`` project or from ``Boost 1.70.0`` on it provides a package
+configuration file for use with find\_package's config mode. This module looks for the package
+configuration file called BoostConfig.cmake or boost-config.cmake and stores the result in CACHE entry "Boost_DIR".
+If found, the package configuration file is loaded and this module returns with no further action.
+See documentation of the Boost CMake package configuration for details on what it provides.
+
+Set ``Boost_NO_BOOST_CMAKE to ON``, to disable the search for boost-cmake.
+"@
+
+$null = $Description.AppendLine($CMakeFindBoostInfo)
Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description.ToString()
diff --git a/images/win/scripts/Installers/Validate-Docker.ps1 b/images/win/scripts/Installers/Validate-Docker.ps1
index cc9d496ef..9dab4f460 100644
--- a/images/win/scripts/Installers/Validate-Docker.ps1
+++ b/images/win/scripts/Installers/Validate-Docker.ps1
@@ -44,3 +44,25 @@ _Environment:_
"@
Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
+
+# Validate helm
+if (Get-Command -Name 'helm')
+{
+ Write-Host "helm on path"
+}
+else
+{
+ Write-Host 'helm is not on path'
+ exit 1
+}
+
+$version = $(helm version --short)
+$SoftwareName = "Helm"
+
+$Description = @"
+_Version:_ $version
+_Environment:_
+* PATH: contains location of helm
+"@
+
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
\ No newline at end of file
diff --git a/images/win/scripts/Installers/Validate-Git.ps1 b/images/win/scripts/Installers/Validate-Git.ps1
index 6f2bb33f1..1927a6ad9 100644
--- a/images/win/scripts/Installers/Validate-Git.ps1
+++ b/images/win/scripts/Installers/Validate-Git.ps1
@@ -2,48 +2,61 @@
## File: Validate-Git.ps1
## Desc: Validate Git for Windows
################################################################################
-
-if((Get-Command -Name 'git') -and (Get-Command -Name 'bash') -and (Get-Command -Name 'awk') -and (Get-Command -Name 'git-lfs'))
-{
- Write-Host "$(git version) on path"
- Write-Host "$(git-lfs version) on path"
+function Test-CommandName {
+ param(
+ [parameter(Mandatory)][string] $CommandName
+ )
+ Write-Host "Checking the [$CommandName]"
+ if(-not (Get-Command $CommandName -ErrorAction "Continue")) {
+ Write-Host "[!] $CommandName is not found"
+ exit 1
+ }
}
-else
-{
- Write-Host "git or git-lfs are not on path."
- exit 1
+function Test-Command {
+ param(
+ [parameter(Mandatory)][string] $CommandName,
+ [parameter(Mandatory)][string] $CommandDescription,
+ [parameter(Mandatory)][string] $VersionCmd,
+ [parameter(Mandatory)][string] $regexVersion,
+ [parameter(Mandatory)][string] $DescriptionMarkdown
+ )
+ Test-CommandName -CommandName $CommandName
+
+ $strVersion = Invoke-Expression $VersionCmd
+ Write-Host "$strVersion on path"
+ if($strVersion -match $regexVersion) {
+ $Version = $Matches.version
+ }
+ else {
+ Write-Host "[!] $CommandName version detection failed"
+ exit 1
+ }
+ # Adding description of the software to Markdown
+ $DescriptionMarkdown = $DescriptionMarkdown -f $Version
+ Add-SoftwareDetailsToMarkdown -SoftwareName $CommandDescription -DescriptionMarkdown $DescriptionMarkdown
}
+Test-CommandName -CommandName 'bash'
+Test-CommandName -CommandName 'awk'
-if( $(git version) -match 'git version (?.*).win.*' )
-{
- $gitVersion = $Matches.version
-}
-
-if( $(git-lfs version) -match 'git-lfs\/(?.*) \(Git.*' )
-{
- $gitLfsVersion = $Matches.version
-}
-
-# Adding description of the software to Markdown
-$SoftwareName = "Git"
-
-$Description = @"
-_Version:_ $gitVersion
+$GitDescription = @"
+_Version:_ {0}
_Environment:_
* PATH: contains location of git.exe
"@
+Test-Command -CommandName 'git' -CommandDescription 'Git' -VersionCmd "git version" -regexVersion 'git version (?.*).win.*' -DescriptionMarkdown $GitDescription
-Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
-
-# Adding description of the software to Markdown
-$SoftwareName = "Git Large File Storage (LFS)"
-
-$Description = @"
-_Version:_ $gitLfsVersion
+$GitLfsDescription = @"
+_Version:_ {0}
_Environment:_
* PATH: contains location of git-lfs.exe
* GIT_LFS_PATH: location of git-lfs.exe
"@
+Test-Command -CommandName 'git-lfs' -CommandDescription 'Git Large File Storage (LFS)' -VersionCmd "git-lfs version" -regexVersion 'git-lfs\/(?.*) \(Git.*' -DescriptionMarkdown $GitLfsDescription
-Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
+$HubCliDescription = @"
+_Version:_ {0}
+_Environment:_
+* PATH: contains location of hub.exe
+"@
+Test-Command -CommandName 'hub' -CommandDescription 'Hub CLI' -VersionCmd "hub version | Select-String 'hub version'" -regexVersion 'hub version (?.*)' -DescriptionMarkdown $HubCliDescription
\ No newline at end of file
diff --git a/images/win/scripts/Installers/Validate-JavaTools.ps1 b/images/win/scripts/Installers/Validate-JavaTools.ps1
index 0fdd5c82a..714776890 100644
--- a/images/win/scripts/Installers/Validate-JavaTools.ps1
+++ b/images/win/scripts/Installers/Validate-JavaTools.ps1
@@ -56,7 +56,7 @@ if( $( $(gradle -version) | Out-String) -match 'Gradle (?.*)' )
$SoftwareName = "Java Development Kit"
$Description = @"
-#### $javaVersion
+#### $javaVersion (default)
_Environment:_
* JAVA_HOME: location of JDK
diff --git a/images/win/scripts/Installers/Windows2019/Validate-WDK.ps1 b/images/win/scripts/Installers/Validate-WDK.ps1
similarity index 90%
rename from images/win/scripts/Installers/Windows2019/Validate-WDK.ps1
rename to images/win/scripts/Installers/Validate-WDK.ps1
index c3c6a8f04..ee64f20b5 100644
--- a/images/win/scripts/Installers/Windows2019/Validate-WDK.ps1
+++ b/images/win/scripts/Installers/Validate-WDK.ps1
@@ -19,7 +19,7 @@ function Get-WDKVersion
}
$WDKVersion = Get-WDKVersion
-$WDKPackageVersion = Get-VS19ExtensionVersion -packageName "Microsoft.Windows.DriverKit"
+$WDKPackageVersion = Get-VSExtensionVersion -packageName "Microsoft.Windows.DriverKit"
# Adding description of the software to Markdown
$SoftwareName = "Windows Driver Kit"
diff --git a/images/win/scripts/Installers/Windows2019/Validate-Wix.ps1 b/images/win/scripts/Installers/Validate-Wix.ps1
similarity index 76%
rename from images/win/scripts/Installers/Windows2019/Validate-Wix.ps1
rename to images/win/scripts/Installers/Validate-Wix.ps1
index 4334beb14..d755939d1 100644
--- a/images/win/scripts/Installers/Windows2019/Validate-Wix.ps1
+++ b/images/win/scripts/Installers/Validate-Wix.ps1
@@ -4,6 +4,7 @@
################################################################################
Import-Module -Name ImageHelpers -Force
+
function Get-WixVersion {
$regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*"
$installedApplications = Get-ItemProperty -Path $regKey
@@ -21,14 +22,23 @@ else {
exit 1
}
-$WixPackageVersion = Get-VS19ExtensionVersion -packageName "WixToolset.VisualStudioExtension.Dev16"
+if(Test-IsWin19)
+{
+ $WixPackageVersion = Get-VSExtensionVersion -packageName "WixToolset.VisualStudioExtension.Dev16"
+ $VSver = "2019"
+}
+else
+{
+ $WixPackageVersion = Get-VSExtensionVersion -packageName "WixToolset.VisualStudioExtension.Dev15"
+ $VSver = "2017"
+}
# Adding description of the software to Markdown
$SoftwareName = "WIX Tools"
$Description = @"
_Toolset Version:_ $WixToolSetVersion
-_WIX Toolset Visual Studio Extension Version:_ $WixPackageVersion
+_WIX Toolset Studio $VSver Extension Version:_ $WixPackageVersion
_Environment:_
* WIX: Installation root of WIX
"@
diff --git a/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1 b/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1
index 7998f1cb7..d92105714 100644
--- a/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1
+++ b/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1
@@ -8,7 +8,13 @@ function Disable-InternetExplorerESC {
$UserKey = "HKLM:\SOFTWARE\Microsoft\Active Setup\Installed Components\{A509B1A8-37EF-4b3f-8CFC-4F3A74704073}"
Set-ItemProperty -Path $AdminKey -Name "IsInstalled" -Value 0 -Force
Set-ItemProperty -Path $UserKey -Name "IsInstalled" -Value 0 -Force
- Stop-Process -Name Explorer -Force -ErrorAction Continue
+
+ $ieProcess = Get-Process -Name Explorer -ErrorAction SilentlyContinue
+
+ if ($ieProcess){
+ Stop-Process -Name Explorer -Force -ErrorAction Continue
+ }
+
Write-Host "IE Enhanced Security Configuration (ESC) has been disabled."
}
diff --git a/images/win/scripts/Installers/Windows2016/Install-WDK.ps1 b/images/win/scripts/Installers/Windows2016/Install-WDK.ps1
deleted file mode 100644
index 58707f973..000000000
--- a/images/win/scripts/Installers/Windows2016/Install-WDK.ps1
+++ /dev/null
@@ -1,51 +0,0 @@
-################################################################################
-## File: Install-WDK.ps1
-## Desc: Install the Windows Driver Kit
-################################################################################
-
-# Version: 10.0.17763.0
-# Update Validate-WDK.ps1 if the version changes!
-# There doesn't seem to be any way to check the version programmatically
-
-# Requires Windows SDK with the same version number as the WDK
-$winSdkUrl = "https://go.microsoft.com/fwlink/p/?LinkID=2023014"
-$wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2026156"
-
-# `winsdksetup.exe /features + /quiet` installs all features without showing the GUI
-$sdkExitCode = Install-EXE -Url $winSdkUrl -Name "winsdksetup.exe" -ArgumentList ("/features", "+", "/quiet")
-
-if ($sdkExitCode -ne 0)
-{
- Write-Host "Failed to install the Windows SDK."
- exit $sdkExitCode
-}
-
-# `wdksetup.exe /features + /quiet` installs all features without showing the GUI
-$wdkExitCode = Install-EXE -Url $wdkUrl -Name "wdksetup.exe" -ArgumentList ("/features", "+", "/quiet")
-
-if ($wdkExitCode -ne 0)
-{
- Write-Host "Failed to install the Windows Driver Kit."
- exit $wdkExitCode
-}
-
-# Need to install the VSIX to get the build targets when running VSBuild
-Write-Host "Installing WDK.vsix"
-$process = Start-Process `
- -FilePath "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\VSIXInstaller.exe" `
- -ArgumentList ("/quiet", '"C:\Program Files (x86)\Windows Kits\10\Vsix\WDK.vsix"') `
- -Wait `
- -PassThru
-
-$exitCode = $process.ExitCode
-
-if ($exitCode -eq 0 -or $exitCode -eq 1001) # 1001 means the extension is already installed
-{
- Write-Host "WDK.vsix installed successfully"
-}
-else
-{
- Write-Host "Unsuccessful exit code returned by the installation process: $exitCode."
-}
-
-exit $exitCode
diff --git a/images/win/scripts/Installers/Windows2016/Install-Wix.ps1 b/images/win/scripts/Installers/Windows2016/Install-Wix.ps1
deleted file mode 100644
index 44ee25c2c..000000000
--- a/images/win/scripts/Installers/Windows2016/Install-Wix.ps1
+++ /dev/null
@@ -1,53 +0,0 @@
-################################################################################
-## File: Install-Wix.ps1
-## Desc: Install WIX.
-################################################################################
-function Install-VsixExtension
-{
- Param
- (
- [String]$Url,
- [String]$Name
- )
-
- $exitCode = -1
-
- try
- {
- Write-Host "Downloading $Name..."
- $FilePath = "${env:Temp}\$Name"
-
- Invoke-WebRequest -Uri $Url -OutFile $FilePath
-
- $ArgumentList = ('/quiet', $FilePath)
-
- Write-Host "Starting Install $Name..."
- $process = Start-Process -FilePath 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\VSIXInstaller.exe' -ArgumentList $ArgumentList -Wait -PassThru
- $exitCode = $process.ExitCode
-
- if ($exitCode -eq 0 -or $exitCode -eq 3010)
- {
- Write-Host -Object 'Installation successful'
- return $exitCode
- }
- else
- {
- Write-Host -Object "Non zero exit code returned by the installation process : $exitCode."
- return $exitCode
- }
- }
- catch
- {
- Write-Host -Object "Failed to install the Extension $Name"
- Write-Host -Object $_.Exception.Message
- return -1
- }
-}
-
-
-choco install wixtoolset -y --force
-
-#Installing VS extension 'Wix Toolset Visual Studio 2017 Extension'
-$exitCode = Install-VsixExtension -Url 'https://robmensching.gallerycdn.vsassets.io/extensions/robmensching/wixtoolsetvisualstudio2017extension/0.9.21.62588/1494013210879/250616/4/Votive2017.vsix' -Name 'Votive2017.vsix'
-
-return $exitCode
diff --git a/images/win/scripts/Installers/Windows2016/Validate-SSDT.ps1 b/images/win/scripts/Installers/Windows2016/Validate-SSDT.ps1
index 9d9a1c4a4..40444ee17 100644
--- a/images/win/scripts/Installers/Windows2016/Validate-SSDT.ps1
+++ b/images/win/scripts/Installers/Windows2016/Validate-SSDT.ps1
@@ -5,39 +5,13 @@
Import-Module -Name ImageHelpers -Force
-function Get-SSDTExtensionPackage {
- $vsProgramData = Get-Item -Path "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances"
- $instanceFolders = Get-ChildItem -Path $vsProgramData.FullName
-
- if($instanceFolders -is [array])
- {
- Write-Host "More than one instance installed"
- exit 1
- }
-
- $stateContent = Get-Content -Path ($instanceFolders.FullName + '\state.packages.json')
- $state = $stateContent | ConvertFrom-Json
- $SsdtPackage = $state.packages | where { $_.id -eq "SSDT" }
- return $SsdtPackage
-}
-
-
-$SsdtPackage = Get-SSDTExtensionPackage
-
-if($SsdtPackage){
- Write-Host "SSDT version" $SsdtPackage.version "installed"
-}
-else {
- Write-Host "SSDT is not installed"
- exit 1
-}
-
+$SSDTPackageVersion = Get-VSExtensionVersion -packageName "SSDT"
# Adding description of the software to Markdown
$SoftwareName = "SQL Server Data Tools for VS 2017"
$Description = @"
-_Version:_ $($SsdtPackage.version)
+_Version:_ $SSDTPackageVersion
The following components are installed:
diff --git a/images/win/scripts/Installers/Windows2016/Validate-WDK.ps1 b/images/win/scripts/Installers/Windows2016/Validate-WDK.ps1
deleted file mode 100644
index f9edf1609..000000000
--- a/images/win/scripts/Installers/Windows2016/Validate-WDK.ps1
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-## File: Validate-WDK.ps1
-## Desc: Validate the installation of the Windows Driver Kit
-################################################################################
-
-# Adding description of the software to Markdown
-$SoftwareName = "Windows Driver Kit"
-
-$Description = @"
-_Version:_ 10.0.17763.0
-"@
-
-Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
diff --git a/images/win/scripts/Installers/Windows2016/Validate-Wix.ps1 b/images/win/scripts/Installers/Windows2016/Validate-Wix.ps1
deleted file mode 100644
index 090df37a9..000000000
--- a/images/win/scripts/Installers/Windows2016/Validate-Wix.ps1
+++ /dev/null
@@ -1,62 +0,0 @@
-################################################################################
-## File: Validate-Wix.ps1
-## Desc: Validate WIX.
-################################################################################
-
-Import-Module -Name ImageHelpers -Force
-function Get-WixVersion {
- $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*"
- $installedApplications = Get-ItemProperty -Path $regKey
- $Version = ($installedApplications | Where-Object { $_.DisplayName -and $_.DisplayName.toLower().Contains("wix") } | Select-Object -First 1).DisplayVersion
- return $Version
-}
-
-#Gets the extension details from state.json
-function Get-WixExtensionPackage {
- $vsProgramData = Get-Item -Path "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances"
- $instanceFolders = Get-ChildItem -Path $vsProgramData.FullName
-
- if($instanceFolders -is [array])
- {
- Write-Host "More than one instance installed"
- exit 1
- }
-
- $stateContent = Get-Content -Path ($instanceFolders.FullName + '\state.packages.json')
- $state = $stateContent | ConvertFrom-Json
- $WixPackage = $state.packages | where { $_.id -eq "WixToolset.VisualStudioExtension.Dev15" }
- return $WixPackage
-}
-
-$WixToolSetVersion = Get-WixVersion
-
-if($WixToolSetVersion) {
- Write-Host "Wix Toolset version" $WixPackage.version "installed"
-}
-else {
- Write-Host "Wix Toolset is not installed"
- exit 1
-}
-
-$WixPackage = Get-WixExtensionPackage
-
-if($WixPackage) {
- Write-Host "Wix Extension version" $WixPackage.version "installed"
-}
-else {
- Write-Host "Wix Extension is not installed"
- exit 1
-}
-
-
-# Adding description of the software to Markdown
-$SoftwareName = "WIX Tools"
-
-$Description = @"
-_Toolset Version:_ $WixToolSetVersion
-_WIX Toolset Studio 2017 Extension Version:_ $($WixPackage.version)
-_Environment:_
-* WIX: Installation root of WIX
-"@
-
-Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
diff --git a/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1 b/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1
index 9930e6a6d..46574d7c0 100644
--- a/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1
+++ b/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1
@@ -8,7 +8,13 @@ function Disable-InternetExplorerESC {
$UserKey = "HKLM:\SOFTWARE\Microsoft\Active Setup\Installed Components\{A509B1A8-37EF-4b3f-8CFC-4F3A74704073}"
Set-ItemProperty -Path $AdminKey -Name "IsInstalled" -Value 0 -Force
Set-ItemProperty -Path $UserKey -Name "IsInstalled" -Value 0 -Force
- Stop-Process -Name Explorer -Force -ErrorAction Continue
+
+ $ieProcess = Get-Process -Name Explorer -ErrorAction SilentlyContinue
+
+ if ($ieProcess){
+ Stop-Process -Name Explorer -Force -ErrorAction Continue
+ }
+
Write-Host "IE Enhanced Security Configuration (ESC) has been disabled."
}
diff --git a/images/win/scripts/Installers/Windows2019/Install-AnalysisExtenstion.ps1 b/images/win/scripts/Installers/Windows2019/Install-AnalysisExtenstion.ps1
deleted file mode 100644
index 43bfb6030..000000000
--- a/images/win/scripts/Installers/Windows2019/Install-AnalysisExtenstion.ps1
+++ /dev/null
@@ -1,44 +0,0 @@
-###################################################################################
-## 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/Install-SSDTExtensions.ps1 b/images/win/scripts/Installers/Windows2019/Install-SSDTExtensions.ps1
new file mode 100644
index 000000000..8c2a6cd7c
--- /dev/null
+++ b/images/win/scripts/Installers/Windows2019/Install-SSDTExtensions.ps1
@@ -0,0 +1,11 @@
+###################################################################################
+## File: Install-SSDTExtensions.ps1
+## Desc: Install the extensions previously known as SSDT package
+###################################################################################
+
+Import-Module -Name ImageHelpers -Force
+
+Install-VsixExtension -Url 'https://marketplace.visualstudio.com/_apis/public/gallery/publishers/ProBITools/vsextensions/MicrosoftAnalysisServicesModelingProjects/2.9.5/vspackage' -Name 'Microsoft.DataTools.AnalysisServices.vsix' -VSversion "2019"
+Install-VsixExtension -Url 'https://marketplace.visualstudio.com/_apis/public/gallery/publishers/SSIS/vsextensions/SqlServerIntegrationServicesProjects/3.4/vspackage' -Name 'Microsoft.DataTools.IntegrationServices.exe' -VSversion "2019"
+Install-VsixExtension -Url 'https://marketplace.visualstudio.com/_apis/public/gallery/publishers/ProBITools/vsextensions/MicrosoftReportProjectsforVisualStudio/2.6.3/vspackage' -Name 'Microsoft.DataTools.ReportingServices.vsix' -VSversion "2019"
+
diff --git a/images/win/scripts/Installers/Windows2019/Install-Wix.ps1 b/images/win/scripts/Installers/Windows2019/Install-Wix.ps1
deleted file mode 100644
index 8fc79bc49..000000000
--- a/images/win/scripts/Installers/Windows2019/Install-Wix.ps1
+++ /dev/null
@@ -1,53 +0,0 @@
-################################################################################
-## File: Install-Wix.ps1
-## Desc: Install WIX.
-################################################################################
-function Install-VsixExtension
-{
- Param
- (
- [String]$Url,
- [String]$Name
- )
-
- $ReleaseInPath = 'Enterprise'
- $exitCode = -1
-
- try
- {
- Write-Host "Downloading $Name..."
- $FilePath = "${env:Temp}\$Name"
-
- Invoke-WebRequest -Uri $Url -OutFile $FilePath
-
- $ArgumentList = ('/quiet', $FilePath)
-
- Write-Host "Starting Install $Name..."
- $process = Start-Process -FilePath "C:\Program Files (x86)\Microsoft Visual Studio\2019\$ReleaseInPath\Common7\IDE\VSIXInstaller.exe" -ArgumentList $ArgumentList -Wait -PassThru
- $exitCode = $process.ExitCode
-
- if ($exitCode -eq 0 -or $exitCode -eq 3010)
- {
- Write-Host -Object 'Installation successful'
- return $exitCode
- }
- else
- {
- Write-Host -Object "Non zero exit code returned by the installation process : $exitCode."
- return $exitCode
- }
- }
- catch
- {
- Write-Host -Object "Failed to install the Extension $Name"
- Write-Host -Object $_.Exception.Message
- return -1
- }
-}
-
-
-choco install wixtoolset -y --force
-
-#Installing VS extension 'Wix Toolset Visual Studio 2019 Extension'
-$exitCode = Install-VsixExtension -Url 'https://wixtoolset.gallerycdn.vsassets.io/extensions/wixtoolset/wixtoolsetvisualstudio2019extension/1.0.0.4/1563296438961/Votive2019.vsix' -Name 'Votive2019.vsix'
-#return $exitCode
diff --git a/images/win/scripts/Installers/Windows2019/Validate-AnalysisExtenstion.ps1 b/images/win/scripts/Installers/Windows2019/Validate-AnalysisExtenstion.ps1
deleted file mode 100644
index fad85d512..000000000
--- a/images/win/scripts/Installers/Windows2019/Validate-AnalysisExtenstion.ps1
+++ /dev/null
@@ -1,18 +0,0 @@
-################################################################################
-## 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
diff --git a/images/win/scripts/Installers/Windows2019/Validate-SSDTExtensions.ps1 b/images/win/scripts/Installers/Windows2019/Validate-SSDTExtensions.ps1
new file mode 100644
index 000000000..731c10edc
--- /dev/null
+++ b/images/win/scripts/Installers/Windows2019/Validate-SSDTExtensions.ps1
@@ -0,0 +1,22 @@
+################################################################################
+## File: Validate-SSDTExtensions.ps1
+## Desc: Validate SQL Server Data Tools Visual Studio extensions
+################################################################################
+
+Import-Module -Name ImageHelpers -Force
+
+#These extensions don't have any proper name in the state.packages.json file, only id is available, which can be found on extension marketplace download page
+$AnalysisPackageVersion = Get-VSExtensionVersion -packageName "04a86fc2-dbd5-4222-848e-911638e487fe"
+$IntegrationPackageVersion = Get-VSExtensionVersion -packageName "851E7A09-7B2B-4F06-A15D-BABFCB26B970"
+$ReportingPackageVersion = Get-VSExtensionVersion -packageName "717ad572-c4b7-435c-c166-c2969777f718"
+
+# Adding description of the software to Markdown
+$SoftwareName = "Microsoft SSDT Visual Studio 2019 Extensions"
+
+$Description = @"
+_Microsoft Analysis Services Projects Version:_ $AnalysisPackageVersion
+_SQL Server Integration Services Projects Version:_ $IntegrationPackageVersion
+_Microsoft Reporting Services Projects Version:_ $ReportingPackageVersion
+"@
+
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description