diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000000000..54085c9b9
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,12 @@
+# Description
+New tool, Bug fixing, or Improvement?
+Please include a summary of the change and which issue is fixed. Also include relevant motivation and context.
+**For new tools, please provide total size and installation time.**
+
+#### Related issue:
+
+## Check list
+- [ ] Related issue / work item is attached
+- [ ] Tests are written (if applicable)
+- [ ] Documentation is updated (if applicable)
+- [ ] Changes are tested and related VM images are successfully generated
diff --git a/.github/workflows/issue-triager.yml b/.github/workflows/issue-triager.yml
index d28b1080c..12d04db5a 100644
--- a/.github/workflows/issue-triager.yml
+++ b/.github/workflows/issue-triager.yml
@@ -13,28 +13,20 @@ jobs:
steps:
- uses: actions/checkout@v1
-
+
- uses: damccorm/tag-ur-it@master
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: "./triage-rules.yml"
- - if: failure()
+ - if: always()
uses: actions/github-script@0.4.0
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
github.issues.addLabels({
- issue_number: context.issue,
- owner: context.owner,
- repo: context.repo,
+ issue_number: context.issue.number,
+ owner: context.repo.owner,
+ repo: context.repo.repo,
labels: ['needs triage']
- })
-
- - name: Set Node.js 10.x
- uses: actions/setup-node@master
- with:
- version: 10.x
-
- # Need to explicitly install @octokit/rest separately or else it will mess with our typings.
- - run: npm install && npm install @octokit/rest
+ })
\ No newline at end of file
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/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md
index 7b5be1247..708681f39 100644
--- a/images/linux/Ubuntu1604-README.md
+++ b/images/linux/Ubuntu1604-README.md
@@ -1,10 +1,10 @@
# Ubuntu 16.04.6 LTS
-The following software is installed on machines with the 20200308.0 update.
+The following software is installed on machines with the 20200330.1 update.
***
- 7-Zip 9.20
- 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)
- Basic CLI:
- curl
@@ -14,6 +14,8 @@ The following software is installed on machines with the 20200308.0 update.
- iproute2
- iputils-ping
- jq
+ - libc++-dev
+ - libc++abi-dev
- libcurl3
- libicu55
- libunwind8
@@ -32,15 +34,20 @@ The following software is installed on machines with the 20200308.0 update.
- wget
- zip
- zstd
-- AWS CLI (aws-cli/1.18.16 Python/2.7.12 Linux/4.15.0-1071-azure botocore/1.15.16)
+- AWS CLI (aws-cli/1.18.31 Python/2.7.12 Linux/4.15.0-1071-azure botocore/1.15.31)
- build-essential
-- Clang 6.0 (6.0.1)
-- Clang 8 (8.0.1)
+- Clang 6.0 (6.0.0)
+- Clang 8 (8.0.0)
- Clang 9 (9.0.1)
+- Swift version 5.2 (swift-5.2-RELEASE)
+Target: x86_64-unknown-linux-gnu
- 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.201
+ - 3.1.200
+ - 3.1.103
- 3.1.101
- 3.1.100
- 3.0.103
@@ -68,12 +75,14 @@ The following software is installed on machines with the 20200308.0 update.
- 2.2.102
- 2.2.101
- 2.2.100
+ - 2.1.805
- 2.1.804
- 2.1.803
- 2.1.802
- 2.1.801
- 2.1.701
- 2.1.700
+ - 2.1.610
- 2.1.609
- 2.1.608
- 2.1.607
@@ -82,6 +91,7 @@ The following software is installed on machines with the 20200308.0 update.
- 2.1.604
- 2.1.603
- 2.1.602
+ - 2.1.513
- 2.1.512
- 2.1.511
- 2.1.510
@@ -100,24 +110,20 @@ The following software is installed on machines with the 20200308.0 update.
- 2.1.302
- 2.1.301
- 2.1.300
-- Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 10.6.4)
-- Firefox (Mozilla Firefox 73.0.1)
+- Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 10.7)
+- Firefox (Mozilla Firefox 74.0)
- Geckodriver (0.26.0); Gecko Driver is available via GECKOWEBDRIVER environment variable
- GNU C++ 7.4.0
- 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 (2.26.0)
- 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.132 )
+- Hub CLI (2.14.2)
+- Google Chrome (Google Chrome 80.0.3987.149 )
- ChromeDriver 80.0.3987.106 (f68069574609230cf9b635cd784cfb1bf81bb53a-refs/branch-heads/3987@{#882}); Chrome Driver is available via CHROMEWEBDRIVER environment variable
-- Google Cloud SDK (283.0.0)
+- Google Cloud SDK (286.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
@@ -137,22 +143,23 @@ compiled using version 3.0.2.0 of the Cabal library )
- GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.2)
- GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.3)
- Haskell Stack (Version 2.1.3, Git revision 636e3a759d51127df2b62f90772def126cdf6d1f (7735 commits) x86_64 hpack-0.31.2)
-- Heroku (heroku/7.39.0 linux-x64 node-v12.13.0)
-- HHVM (HipHop VM 4.47.0 (rel))
+- Heroku (heroku/7.39.1 linux-x64 node-v12.13.0)
+- HHVM (HipHop VM 4.50.0 (rel))
- ImageMagick
-- Azul Zulu OpenJDK (7) (openjdk version "1.7.0_252")
-- Azul Zulu OpenJDK (8) (openjdk version "1.8.0_242")
-- Azul Zulu OpenJDK (11) (openjdk version "11.0.6" 2020-01-14 LTS)
-- Azul Zulu OpenJDK (12) (openjdk version "12.0.2" 2019-07-16)
+- Azul Zulu OpenJDK:
+ - 7 (openjdk version "1.7.0_252")
+ - 8 (openjdk version "1.8.0_242") (default)
+ - 11 (openjdk version "11.0.6" 2020-01-14 LTS)
+ - 12 (openjdk version "12.0.2" 2019-07-16)
- Ant (Apache Ant(TM) version 1.9.6 compiled on July 20 2018)
-- Gradle 6.2.2
+- Gradle 6.3
- Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f))
- Kind (kind v0.7.0 go1.13.6 linux/amd64)
-- kubectl (Client Version: v1.17.3)
-- helm (v3.1.1+gafe7058)
-- Leiningen (Leiningen 2.9.1 on Java 1.8.0_242 OpenJDK 64-Bit Server VM)
+- kubectl (error: Missing or incomplete configuration info. Please point to an existing, complete config file:)
+- helm (v3.1.2+gd878d4d)
+- Leiningen (Leiningen 2.9.3 on Java 1.8.0_242 OpenJDK 64-Bit Server VM)
- Mercurial (Mercurial Distributed SCM (version 4.4.1))
-- Miniconda (conda 4.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)
@@ -161,54 +168,57 @@ 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.42.0)
+- Webpack (4.42.1)
- Webpack CLI (3.3.11)
-- Yarn (1.22.1)
+- 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 ))
-- PHP 7.1 (PHP 7.1.33-12+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:21:57) ( NTS ))
-- PHP 7.2 (PHP 7.2.28-3+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:23:01) ( NTS ))
-- PHP 7.3 (PHP 7.3.15-3+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Feb 23 2020 07:23:10) ( NTS ))
-- PHP 7.4 (PHP 7.4.3 (cli) (built: Feb 23 2020 07:24:02) ( NTS ))
-- Composer (Composer version 1.9.3 2020-02-04 12:58:49)
+- PHP 5.6 (PHP 5.6.40-26+ubuntu16.04.1+deb.sury.org+1 (cli) )
+- PHP 7.0 (PHP 7.0.33-26+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Mar 20 2020 15:00:31) ( NTS ))
+- PHP 7.1 (PHP 7.1.33-14+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Mar 20 2020 13:57:17) ( NTS ))
+- PHP 7.2 (PHP 7.2.29-1+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Mar 20 2020 13:54:16) ( NTS ))
+- PHP 7.3 (PHP 7.3.16-1+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Mar 20 2020 13:51:21) ( NTS ))
+- PHP 7.4 (PHP 7.4.4 (cli) (built: Mar 20 2020 13:47:17) ( NTS ))
+- Composer (Composer version 1.10.1 2020-03-13 20:34:27)
- PHPUnit (PHPUnit 7.5.20 by Sebastian Bergmann and contributors.)
- Pollinate
-- psql (PostgreSQL) 9.5.19
+- psql (PostgreSQL) 9.5.21
- 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)
-- cbindgen (0.13.1)
-- Julia (julia version 1.3.1)
+- rustdoc (1.42.0)
+- bindgen (0.53.2)
+- cbindgen (0.13.2)
+- Julia (julia version 1.4.0)
- sbt (1.3.8)
- Selenium server standalone (available via SELENIUM_JAR_PATH environment variable)
- Sphinx Open Source Search Server
- Subversion (svn, version 1.9.3 (r1718519))
-- Terraform (Terraform v0.12.23)
-- Packer (1.5.4)
+- Terraform (Terraform v0.12.24)
+- Packer (1.5.5)
- Vcpkg 2020.02.04-unknownhash
-- Zeit Now CLI (17.0.4)
+- Zeit Now CLI (17.1.1)
+- 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.9 linux/amd64)
+- Go 1.14 (go version go1.14.1 linux/amd64)
- Google Repository 58
- Google Play services 49
- Google APIs 24
- Google APIs 23
- Google APIs 22
- Google APIs 21
-- CMake 3.6.4111459
+- CMake 3.10.2.4988404
+3.6.4111459
- Android Support Repository 47.0.0
- Android Solver for ConstraintLayout 1.0.2
- Android Solver for ConstraintLayout 1.0.1
@@ -269,13 +279,13 @@ the
- Az Module (3.1.0)
- Az Module (3.5.0)
- Cached container images
+ - node:10-alpine (Digest: sha256:9a88e3bc3f845b74d2fd8adcbc64608736a8be4a3e9dc7aa34fa743e3677a552)
+ - node:12-alpine (Digest: sha256:6b5b783c9cfe229af0bd5b0b677dd32005bb22d58465f3d0fe7fbd1c60ce068c)
- 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:12-alpine (Digest: sha256:bba77d0ca8820b43af898b3c50d4e8b68dc703ebbd958319af2f21f2d3c309f5)
- alpine:3.8 (Digest: sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14)
- alpine:3.9 (Digest: sha256:115731bab0862031b44766733890091c17924f9b7781b79997f5f163be262178)
- alpine:3.10 (Digest: sha256:7c3773f7bcc969f03f8f653910001d99a9d324b4b9caa008846ad2c3089f5a5f)
@@ -301,3 +311,4 @@ the
- Python3 (Python 3.5.2)
- pip3 (pip 8.1.1 from /usr/lib/python3/dist-packages (python 3.5))
- Boost C++ Libraries 1.69.0
+- Boost C++ Libraries 1.72.0
diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md
index 94f3547f9..1adbc7407 100644
--- a/images/linux/Ubuntu1804-README.md
+++ b/images/linux/Ubuntu1804-README.md
@@ -1,10 +1,10 @@
# Ubuntu 18.04.4 LTS
-The following software is installed on machines with the 20200308.0 update.
+The following software is installed on machines with the 20200330.1 update.
***
- 7-Zip 16.02
- 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)
- Basic CLI:
- curl
@@ -32,15 +32,20 @@ The following software is installed on machines with the 20200308.0 update.
- wget
- zip
- zstd
-- AWS CLI (aws-cli/1.18.16 Python/2.7.17 Linux/5.0.0-1032-azure botocore/1.15.16)
+- AWS CLI (aws-cli/1.18.31 Python/2.7.17 Linux/5.0.0-1032-azure botocore/1.15.31)
- build-essential
-- Clang 6.0 (6.0.1)
-- Clang 8 (8.0.1)
+- Clang 6.0 (6.0.0)
+- Clang 8 (8.0.0)
- Clang 9 (9.0.0)
+- Swift version 5.2 (swift-5.2-RELEASE)
+Target: x86_64-unknown-linux-gnu
- 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.201
+ - 3.1.200
+ - 3.1.103
- 3.1.101
- 3.1.100
- 3.0.103
@@ -68,12 +73,14 @@ The following software is installed on machines with the 20200308.0 update.
- 2.2.102
- 2.2.101
- 2.2.100
+ - 2.1.805
- 2.1.804
- 2.1.803
- 2.1.802
- 2.1.801
- 2.1.701
- 2.1.700
+ - 2.1.610
- 2.1.609
- 2.1.608
- 2.1.607
@@ -82,6 +89,7 @@ The following software is installed on machines with the 20200308.0 update.
- 2.1.604
- 2.1.603
- 2.1.602
+ - 2.1.513
- 2.1.512
- 2.1.511
- 2.1.510
@@ -100,22 +108,20 @@ The following software is installed on machines with the 20200308.0 update.
- 2.1.302
- 2.1.301
- 2.1.300
-- Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 10.6.4)
-- Firefox (Mozilla Firefox 73.0.1)
+- Erlang (Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 10.7)
+- Firefox (Mozilla Firefox 74.0)
- Geckodriver (0.26.0); Gecko Driver is available via GECKOWEBDRIVER environment variable
-- GNU C++ 7.4.0
+- 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 (2.26.0)
- 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.132 )
+- Hub CLI (2.14.2)
+- Google Chrome (Google Chrome 80.0.3987.149 )
- ChromeDriver 80.0.3987.106 (f68069574609230cf9b635cd784cfb1bf81bb53a-refs/branch-heads/3987@{#882}); Chrome Driver is available via CHROMEWEBDRIVER environment variable
-- Google Cloud SDK (283.0.0)
+- Google Cloud SDK (286.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
@@ -135,22 +141,23 @@ compiled using version 3.0.2.0 of the Cabal library )
- GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.2)
- GHC (The Glorious Glasgow Haskell Compilation System, version 8.8.3)
- Haskell Stack (Version 2.1.3, Git revision 636e3a759d51127df2b62f90772def126cdf6d1f (7735 commits) x86_64 hpack-0.31.2)
-- Heroku (heroku/7.39.0 linux-x64 node-v12.13.0)
-- HHVM (HipHop VM 4.47.0 (rel))
+- Heroku (heroku/7.39.1 linux-x64 node-v12.13.0)
+- HHVM (HipHop VM 4.50.0 (rel))
- ImageMagick
-- Azul Zulu OpenJDK (7) (openjdk version "1.7.0_252")
-- Azul Zulu OpenJDK (8) (openjdk version "1.8.0_242")
-- Azul Zulu OpenJDK (11) (openjdk version "11.0.6" 2020-01-14 LTS)
-- Azul Zulu OpenJDK (12) (openjdk version "12.0.2" 2019-07-16)
+- Azul Zulu OpenJDK:
+ - 7 (openjdk version "1.7.0_252")
+ - 8 (openjdk version "1.8.0_242") (default)
+ - 11 (openjdk version "11.0.6" 2020-01-14 LTS)
+ - 12 (openjdk version "12.0.2" 2019-07-16)
- Ant (Apache Ant(TM) version 1.10.5 compiled on March 28 2019)
-- Gradle 6.2.2
+- Gradle 6.3
- Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f))
- Kind (kind v0.7.0 go1.13.6 linux/amd64)
-- kubectl (Client Version: v1.17.3)
-- helm (v3.1.1+gafe7058)
-- Leiningen (Leiningen 2.9.1 on Java 1.8.0_242 OpenJDK 64-Bit Server VM)
+- kubectl (error: Missing or incomplete configuration info. Please point to an existing, complete config file:)
+- helm (v3.1.2+gd878d4d)
+- Leiningen (Leiningen 2.9.3 on Java 1.8.0_242 OpenJDK 64-Bit Server VM)
- Mercurial (Mercurial Distributed SCM (version 4.5.3))
-- Miniconda (conda 4.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)
@@ -159,20 +166,20 @@ 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.42.0)
+- Webpack (4.42.1)
- Webpack CLI (3.3.11)
-- Yarn (1.22.1)
+- 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)
+- PHP 7.1 (PHP 7.1.33-14+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Mar 20 2020 13:57:43) ( NTS ))
+- PHP 7.2 (PHP 7.2.29-1+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Mar 20 2020 13:54:39) ( NTS ))
+- PHP 7.3 (PHP 7.3.16-1+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Mar 20 2020 13:51:46) ( NTS ))
+- PHP 7.4 (PHP 7.4.4 (cli) (built: Mar 20 2020 13:47:45) ( NTS ))
+- Composer (Composer version 1.10.1 2020-03-13 20:34:27)
- PHPUnit (PHPUnit 7.5.20 by Sebastian Bergmann and contributors.)
- Pollinate
- psql (PostgreSQL) 10.12
@@ -180,31 +187,34 @@ Local version: Unknown)
- 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)
-- cbindgen (0.13.1)
-- Julia (julia version 1.3.1)
+- rustdoc (1.42.0)
+- bindgen (0.53.2)
+- cbindgen (0.13.2)
+- Julia (julia version 1.4.0)
- sbt (1.3.8)
- Selenium server standalone (available via SELENIUM_JAR_PATH environment variable)
- Sphinx Open Source Search Server
- Subversion (svn, version 1.9.7 (r1800392))
-- Terraform (Terraform v0.12.23)
-- Packer (1.5.4)
+- Terraform (Terraform v0.12.24)
+- Packer (1.5.5)
- Vcpkg 2020.02.04-unknownhash
-- Zeit Now CLI (17.0.4)
+- Zeit Now CLI (17.1.1)
+- 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.9 linux/amd64)
+- Go 1.14 (go version go1.14.1 linux/amd64)
- Google Repository 58
- Google Play services 49
- Google APIs 24
- Google APIs 23
- Google APIs 22
- Google APIs 21
-- CMake 3.6.4111459
+- CMake 3.10.2.4988404
+3.6.4111459
- Android Support Repository 47.0.0
- Android SDK Platform-Tools 29.0.6
- Android SDK Platform 29
@@ -259,13 +269,13 @@ the
- Az Module (3.1.0)
- Az Module (3.5.0)
- Cached container images
+ - node:10-alpine (Digest: sha256:9a88e3bc3f845b74d2fd8adcbc64608736a8be4a3e9dc7aa34fa743e3677a552)
+ - node:12-alpine (Digest: sha256:6b5b783c9cfe229af0bd5b0b677dd32005bb22d58465f3d0fe7fbd1c60ce068c)
- 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:12-alpine (Digest: sha256:bba77d0ca8820b43af898b3c50d4e8b68dc703ebbd958319af2f21f2d3c309f5)
- alpine:3.8 (Digest: sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14)
- alpine:3.9 (Digest: sha256:115731bab0862031b44766733890091c17924f9b7781b79997f5f163be262178)
- alpine:3.10 (Digest: sha256:7c3773f7bcc969f03f8f653910001d99a9d324b4b9caa008846ad2c3089f5a5f)
@@ -291,3 +301,4 @@ the
- Python3 (Python 3.6.9)
- pip3 (pip 9.0.1 from /usr/lib/python3/dist-packages (python 3.6))
- Boost C++ Libraries 1.69.0
+- Boost C++ Libraries 1.72.0
diff --git a/images/linux/scripts/helpers/os.sh b/images/linux/scripts/helpers/os.sh
new file mode 100644
index 000000000..fa2d4cf44
--- /dev/null
+++ b/images/linux/scripts/helpers/os.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+################################################################################
+## File: install-helpers.sh
+## Desc: Helper functions for installing tools
+################################################################################
+
+function isUbuntu16
+{
+ lsb_release -d|grep 'Ubuntu 16' > /dev/null
+}
+
+function isUbuntu18
+{
+ lsb_release -d|grep 'Ubuntu 18' > /dev/null
+}
+
+function getOSVersionLabel
+{
+ isUbuntu16 && echo xenial || echo bionic
+}
\ No newline at end of file
diff --git a/images/linux/scripts/installers/1604/android.sh b/images/linux/scripts/installers/1604/android.sh
index aaf2ad390..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" \
diff --git a/images/linux/scripts/installers/1804/android.sh b/images/linux/scripts/installers/1804/android.sh
index a0fbb2eb1..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" \
diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh
index 1ca4cde2c..631be1909 100644
--- a/images/linux/scripts/installers/clang.sh
+++ b/images/linux/scripts/installers/clang.sh
@@ -12,13 +12,11 @@ function InstallClang {
version=$1
echo "Installing clang-$version..."
- # Clang 6.0 is not supported by automatic installation script (`llvm.sh`)
- # Thus we have to install it explicitly
- if [[ $version == 6* ]]; then
- apt-get install -y "clang-$version" "lldb-$version" "lld-$version"
- else
+ if [[ $version =~ 9 ]]; then
./llvm.sh $version
apt-get install -y "clang-format-$version"
+ else
+ apt-get install -y "clang-$version" "lldb-$version" "lld-$version" "clang-format-$version"
fi
# Run tests to determine that the software installed as expected
@@ -35,11 +33,6 @@ function InstallClang {
DocumentInstalledItem "Clang $version ($(clang-$version --version | head -n 1 | cut -d ' ' -f 3 | cut -d '-' -f 1))"
}
-# Install Clang compiler
-wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-6.0 main"
-apt-get update -y
-
# Download script for automatic installation
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
diff --git a/images/linux/scripts/installers/firefox.sh b/images/linux/scripts/installers/firefox.sh
index c98f43c54..8a849c851 100644
--- a/images/linux/scripts/installers/firefox.sh
+++ b/images/linux/scripts/installers/firefox.sh
@@ -25,8 +25,8 @@ HOME=/root
DocumentInstalledItem "Firefox ($(firefox --version))"
# Download and unpack latest release of geckodriver
-URL=$(curl -s https://api.github.com/repos/mozilla/geckodriver/releases/latest|grep 'browser_download_url.*linux64.tar.gz'|sed -E 's/^.*(https:.+)".*/\1/g')
-echo "Downloading geckodriver $URL..."
+URL=$(curl -s https://api.github.com/repos/mozilla/geckodriver/releases/latest | jq -r '.assets[].browser_download_url | select(contains("linux64.tar.gz"))')
+echo "Downloading geckodriver $URL"
wget "$URL" -O geckodriver.tar.gz
tar -xzf geckodriver.tar.gz
rm geckodriver.tar.gz
diff --git a/images/linux/scripts/installers/haskell.sh b/images/linux/scripts/installers/haskell.sh
index 05e430df0..1e36069a6 100644
--- a/images/linux/scripts/installers/haskell.sh
+++ b/images/linux/scripts/installers/haskell.sh
@@ -26,10 +26,12 @@ apt-get install -y \
ghc-8.8.1 \
ghc-8.8.2 \
ghc-8.8.3 \
+ ghc-8.10.1 \
cabal-install-2.0 \
cabal-install-2.2 \
cabal-install-2.4 \
- cabal-install-3.0
+ cabal-install-3.0 \
+ cabal-install-3.2
# Install haskell stack, pinned to v2.1.3
curl -sSL https://raw.githubusercontent.com/commercialhaskell/stack/v2.1.3/etc/scripts/get-stack.sh | sh
@@ -37,14 +39,14 @@ curl -sSL https://raw.githubusercontent.com/commercialhaskell/stack/v2.1.3/etc/s
# Run tests to determine that the software installed as expected
echo "Testing to make sure that script performed as expected, and basic scenarios work"
# Check all ghc versions
-for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3; do
+for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.10.1; do
if ! command -v /opt/ghc/$version/bin/ghc; then
echo "ghc $version was not installed"
exit 1
fi
done
# Check all cabal versions
-for version in 2.0 2.2 2.4 3.0; do
+for version in 2.0 2.2 2.4 3.0 3.2; do
if ! command -v /opt/cabal/$version/bin/cabal; then
echo "cabal $version was not installed"
exit 1
@@ -57,10 +59,10 @@ fi
# Document what was added to the image
echo "Lastly, documenting what we added to the metadata file"
-for version in 2.0 2.2 2.4 3.0; do
+for version in 2.0 2.2 2.4 3.0 3.2; do
DocumentInstalledItem "Haskell Cabal ($(/opt/cabal/$version/bin/cabal --version))"
done
-for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3; do
+for version in 8.0.2 8.2.2 8.4.4 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.10.1; do
DocumentInstalledItem "GHC ($(/opt/ghc/$version/bin/ghc --version))"
done
DocumentInstalledItem "Haskell Stack ($(stack --version))"
diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh
index c979613e8..c4586039b 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)) (default)"
+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))"
DocumentInstalledItem "Ant ($(ant -version))"
DocumentInstalledItem "Gradle ${gradleVersion}"
DocumentInstalledItem "Maven ($(mvn -version | head -n 1))"
diff --git a/images/linux/scripts/installers/mongodb.sh b/images/linux/scripts/installers/mongodb.sh
new file mode 100644
index 000000000..545253e5a
--- /dev/null
+++ b/images/linux/scripts/installers/mongodb.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+################################################################################
+## File: homebrew.sh
+## Desc: Installs Mongo DB
+################################################################################
+
+# Source the helpers
+source $HELPER_SCRIPTS/os.sh
+source $HELPER_SCRIPTS/document.sh
+
+# Install Mongo DB
+wget -qO - https://www.mongodb.org/static/pgp/server-4.2.asc | sudo apt-key add -
+version=$(getOSVersionLabel)
+echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu $version/mongodb-org/4.2 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.2.list
+sudo apt-get update
+sudo apt-get install -y mongodb-org
+
+# Validate the installation
+echo "Validate the installation"
+if ! command -v mongod; then
+ echo "mongodb was not installed"
+ exit 1
+fi
+
+# Document the installed version
+echo "Document the installed version"
+DocumentInstalledItem "MongoDB on Linux ($(mongod -v|grep -i version 2>&1))"
diff --git a/images/linux/scripts/installers/nvm.sh b/images/linux/scripts/installers/nvm.sh
new file mode 100644
index 000000000..cbfab1a89
--- /dev/null
+++ b/images/linux/scripts/installers/nvm.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+################################################################################
+## File: nvm.sh
+## Desc: Installs Nvm
+################################################################################
+
+# Source the helpers for use with the script
+source $HELPER_SCRIPTS/document.sh
+
+export NVM_DIR="/etc/skel/.nvm"
+mkdir $NVM_DIR
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
+echo 'export NVM_DIR=$HOME/.nvm' | tee -a /etc/skel/.bash_profile
+echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm' | tee -a /etc/skel/.bash_profile
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+
+if ! command -v nvm; then
+ echo "nvm was not installed"
+ exit 1
+fi
+
+DocumentInstalledItem "nvm ($(nvm --version))"
\ No newline at end of file
diff --git a/images/linux/scripts/installers/rust.sh b/images/linux/scripts/installers/rust.sh
index 571538a30..850868a4d 100644
--- a/images/linux/scripts/installers/rust.sh
+++ b/images/linux/scripts/installers/rust.sh
@@ -12,16 +12,14 @@ set -e
export RUSTUP_HOME=/usr/share/rust/.rustup
export CARGO_HOME=/usr/share/rust/.cargo
-curl https://sh.rustup.rs -sSf | sh -s -- -y
+curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=stable --profile=minimal
# Initialize environment variables
source $CARGO_HOME/env
# Install common tools
-rustup component add rustfmt
-rustup component add clippy
-cargo install bindgen
-cargo install cbindgen
+rustup component add rustfmt clippy
+cargo install bindgen cbindgen
echo "Test installation of the Rust toochain"
diff --git a/images/linux/scripts/installers/swift.sh b/images/linux/scripts/installers/swift.sh
new file mode 100644
index 000000000..ca97606e9
--- /dev/null
+++ b/images/linux/scripts/installers/swift.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+################################################################################
+## File: swift.sh
+## Desc: Installs Swift
+################################################################################
+
+# Source the helpers for use with the script
+source $HELPER_SCRIPTS/document.sh
+
+# Install
+image_label="$(lsb_release -rs)"
+swift_version=$(curl -s https://swift.org/download/ | grep -m1 "id=\"swift-" | awk -F"[ <]" '{print $4}')
+
+wget -P /tmp https://swift.org/builds/swift-$swift_version-release/ubuntu${image_label//./}/swift-$swift_version-RELEASE/swift-$swift_version-RELEASE-ubuntu$image_label.tar.gz
+tar xzf /tmp/swift-$swift_version-RELEASE-ubuntu$image_label.tar.gz
+mv swift-$swift_version-RELEASE-ubuntu$image_label /usr/share/swift
+
+SWIFT_PATH="/usr/share/swift/usr/bin"
+SWIFT_BIN="$SWIFT_PATH/swift"
+ln -s "$SWIFT_BIN" /usr/local/bin/swift
+echo "SWIFT_PATH=$SWIFT_PATH" | tee -a /etc/environment
+
+# Run tests to determine that the software installed as expected
+echo "Testing to make sure that script performed as expected, and basic scenarios work"
+if ! command -v swift; then
+ echo "Swift was not installed"
+ exit 1
+fi
+
+# Document what was added to the image
+echo "Lastly, documenting what we added to the metadata file"
+DocumentInstalledItem "$(swift --version)"
\ No newline at end of file
diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json
index e604b0581..5b1e2688c 100644
--- a/images/linux/ubuntu1604.json
+++ b/images/linux/ubuntu1604.json
@@ -143,7 +143,9 @@
"{{template_dir}}/scripts/installers/1604/basic.sh",
"{{template_dir}}/scripts/installers/aws.sh",
"{{template_dir}}/scripts/installers/build-essential.sh",
+ "{{template_dir}}/scripts/installers/nvm.sh",
"{{template_dir}}/scripts/installers/clang.sh",
+ "{{template_dir}}/scripts/installers/swift.sh",
"{{template_dir}}/scripts/installers/cmake.sh",
"{{template_dir}}/scripts/installers/docker-compose.sh",
"{{template_dir}}/scripts/installers/docker-moby.sh",
@@ -186,7 +188,8 @@
"{{template_dir}}/scripts/installers/vcpkg.sh",
"{{template_dir}}/scripts/installers/zeit-now.sh",
"{{template_dir}}/scripts/installers/updatepath.sh",
- "{{template_dir}}/scripts/installers/dpkg-config.sh"
+ "{{template_dir}}/scripts/installers/dpkg-config.sh",
+ "{{template_dir}}/scripts/installers/mongodb.sh"
],
"environment_vars": [
diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json
index 6396229d7..cb7e88195 100644
--- a/images/linux/ubuntu1804.json
+++ b/images/linux/ubuntu1804.json
@@ -147,6 +147,7 @@
"{{template_dir}}/scripts/installers/aws.sh",
"{{template_dir}}/scripts/installers/build-essential.sh",
"{{template_dir}}/scripts/installers/clang.sh",
+ "{{template_dir}}/scripts/installers/swift.sh",
"{{template_dir}}/scripts/installers/cmake.sh",
"{{template_dir}}/scripts/installers/docker-compose.sh",
"{{template_dir}}/scripts/installers/docker-moby.sh",
@@ -170,6 +171,7 @@
"{{template_dir}}/scripts/installers/miniconda.sh",
"{{template_dir}}/scripts/installers/mono.sh",
"{{template_dir}}/scripts/installers/mysql.sh",
+ "{{template_dir}}/scripts/installers/nvm.sh",
"{{template_dir}}/scripts/installers/nodejs.sh",
"{{template_dir}}/scripts/installers/bazel.sh",
"{{template_dir}}/scripts/installers/phantomjs.sh",
@@ -189,7 +191,8 @@
"{{template_dir}}/scripts/installers/vcpkg.sh",
"{{template_dir}}/scripts/installers/zeit-now.sh",
"{{template_dir}}/scripts/installers/updatepath.sh",
- "{{template_dir}}/scripts/installers/dpkg-config.sh"
+ "{{template_dir}}/scripts/installers/dpkg-config.sh",
+ "{{template_dir}}/scripts/installers/mongodb.sh"
],
"environment_vars": [
"METADATA_FILE={{user `metadata_file`}}",
diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md
index 10c9ac286..62a849314 100644
--- a/images/macos/macos-10.15-Readme.md
+++ b/images/macos/macos-10.15-Readme.md
@@ -1,10 +1,10 @@
-# macOS Catalina 10.15.3 (19D76)
-The following software is installed on machines with the 20200307.2 update.
+# macOS Catalina 10.15.4 (19E266)
+The following software is installed on machines with the 20200328.1 update.
#### Xcode 11.3.1 set by default
## Operating System
-- OS X 10.15.3 (19D76) **Catalina**
+- OS X 10.15.4 (19E266) **Catalina**
## Installed Software
### Language and Runtime
@@ -13,73 +13,80 @@ The following software is installed on machines with the 20200307.2 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.1
+- Java 14: Zulu14.27+1-CA (build 14+36)
+- Rust 1.42.0
- 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
-- GNU Fortran (Homebrew GCC 8.3.0_2) 8.3.0
-- GNU Fortran (Homebrew GCC 9.2.0_3) 9.2.0
+- gcc-8 (Homebrew GCC 8.4.0) 8.4.0
+- gcc-9 (Homebrew GCC 9.3.0) 9.3.0
+- GNU Fortran (Homebrew GCC 8.4.0) 8.4.0
+- GNU Fortran (Homebrew GCC 9.3.0) 9.3.0
- Node.js v12.16.1
- NVM 0.33.11
-- NVM - Cached node versions: v6.17.1 v8.17.0 v10.19.0 v12.16.1 v13.10.1
+- NVM - Cached node versions: v6.17.1 v8.17.0 v10.19.0 v12.16.1 v13.12.0
- PowerShell 7.0.0
- Python 2.7.17
-- Python 3.7.6
+- Python 3.7.7
- Ruby 2.6.5p114
-- .NET SDK 2.0.0 3.0.100 3.0.101 3.0.102 3.0.103 3.1.100 3.1.101
-- Go 1.14
-- PHP 7.4.3
-- julia 1.3.1
+- .NET SDK 2.0.0 3.0.100 3.0.101 3.0.102 3.0.103 3.1.100 3.1.101 3.1.200 3.1.201
+- Go 1.14.1
+- PHP 7.4.4
+- julia 1.4.0
### 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.9
+- CocoaPods 1.9.1
+- Homebrew 2.2.11
- NPM 6.13.4
-- Yarn 1.22.1
-- NuGet 5.4.0.6315
+- Yarn 1.22.4
+- NuGet 5.5.0.6382
- Pip 19.3.1 (python 2.7)
-- Pip 19.3.1 (python 3.7)
-- Miniconda 4.7.12
+- Pip 20.0.2 (python 3.7)
+- Miniconda 4.8.2
- RubyGems 3.1.2
### Project Management
- Apache Maven 3.6.3
-- Gradle 6.2.2
+- Gradle 6.3
### Utilities
-- Curl 7.69.0
-- Git: 2.25.1
+- Curl 7.69.1
+- Git: 2.26.0
- Git LFS: 2.10.0
+- Hub CLI: 2.14.2
- GNU Wget 1.20.3
- Subversion (SVN) 1.13.0
-- Packer 1.5.4
-- GNU parallel 20200222
+- Packer 1.5.5
+- GNU parallel 20200322
- OpenSSL 1.0.2t 10 Sep 2019
- jq 1.6
-- gpg (GnuPG) 2.2.19
+- gpg (GnuPG) 2.2.20
- psql (PostgreSQL) 12.2
- aria2 1.35.0
- azcopy 10.3.4
- zstd 1.4.4
- bazel 2.2.0
- bazelisk v1.3.0
+- helm v3.1.2+gd878d4d
+- Docker 19.03.8
+- docker-machine 0.16.2
+- docker-compose 1.25.4
### Tools
-- Fastlane 2.143.0
-- Cmake 3.16.5
-- App Center CLI 2.3.3
-- Azure CLI 2.1.0
+- Fastlane 2.144.0
+- Cmake 3.17.0
+- App Center CLI 2.3.5
+- Azure CLI 2.2.0
+- AWS CLI 2.0.5
### Browsers
-- Google Chrome 80.0.3987.132
+- Google Chrome 80.0.3987.149
- ChromeDriver 80.0.3987.106
-- Microsoft Edge 80.0.361.66
-- MSEdgeDriver 80.0.361.66
-- Mozilla Firefox 73.0.1
+- Microsoft Edge 80.0.361.69
+- MSEdgeDriver 80.0.361.69
+- Mozilla Firefox 74.0
- geckodriver 0.26.0
### Toolcache
@@ -102,25 +109,29 @@ The following software is installed on machines with the 20200307.2 update.
### Xamarin
#### Visual Studio for Mac
-- 8.4.8.2
+- 8.5.0.3183
#### Mono
+- 6.8.0.123
- 6.6.0.166
- 6.4.0.208
#### Xamarin.iOS
+- 13.14.1.39
- 13.10.0.21
- 13.8.3.0
- 13.6.0.12
- 13.4.0.2
#### Xamarin.Mac
+- 6.14.1.39
- 6.10.0.21
- 6.8.3.0
- 6.6.0.12
- 6.4.0.2
#### Xamarin.Android
+- 10.2.0
- 10.1.3
- 10.0.6
@@ -128,15 +139,15 @@ The following software is installed on machines with the 20200307.2 update.
- NUnit 3.6.1
### Xcode
-| Version | Build | Path |
-| ---------------- | ------- | --------------------------------- |
-| 11.4 (beta) | 11N132i | /Applications/Xcode_11.4_beta.app |
-| 11.3.1 (default) | 11C505 | /Applications/Xcode_11.3.1.app |
-| 11.3 | 11C29 | /Applications/Xcode_11.3.app |
-| 11.2.1 | 11B500 | /Applications/Xcode_11.2.1.app |
-| 11.2 | 11B52 | /Applications/Xcode_11.2.app |
-| 11.1 | 11A1027 | /Applications/Xcode_11.1.app |
-| 11.0 | 11A420a | /Applications/Xcode_11.app |
+| Version | Build | Path |
+| ---------------- | ------- | ------------------------------ |
+| 11.4 | 11E146 | /Applications/Xcode_11.4.app |
+| 11.3.1 (default) | 11C505 | /Applications/Xcode_11.3.1.app |
+| 11.3 | 11C29 | /Applications/Xcode_11.3.app |
+| 11.2.1 | 11B500 | /Applications/Xcode_11.2.1.app |
+| 11.2 | 11B52 | /Applications/Xcode_11.2.app |
+| 11.1 | 11A1027 | /Applications/Xcode_11.1.app |
+| 11.0 | 11A420a | /Applications/Xcode_11.app |
#### Xcode Support Tools
- Nomad CLI 3.1.2
@@ -172,20 +183,20 @@ The following software is installed on machines with the 20200307.2 update.
| DriverKit 19.0 | driverkit.macosx19.0 | 11.0, 11.1, 11.2, 11.2.1, 11.3, 11.3.1, 11.4 |
#### Installed Simulators
-| OS | Xcode Version | Simulators |
-| ----------- | -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| iOS 13.0 | 11.0 | iPhone 8
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)
iPad Pro (11-inch) (1st 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) (2nd generation)
iPad Pro (12.9-inch) (4th 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
@@ -243,7 +254,7 @@ The following software is installed on machines with the 20200307.2 update.
| cmake | 3.6.4111459 |
| lldb | 3.1.4508709 |
| ndk-bundle | 18.1.5063045 |
-| Android Emulator | 30.0.0 |
+| Android Emulator | 30.0.5 |
#### Android Google APIs
| Package Name | Description |
diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json
index 0ad1e3f42..f7753eb9a 100644
--- a/images/win/Windows2016-Azure.json
+++ b/images/win/Windows2016-Azure.json
@@ -15,6 +15,7 @@
"virtual_network_subnet_name": "{{env `VNET_SUBNET`}}",
"private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}",
"vm_size": "Standard_DS4_v2",
+ "run_scan_antivirus": "false",
"root_folder": "C:",
"image_folder": "C:\\image",
@@ -30,8 +31,7 @@
"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",
- "boost_default": "1.69.0"
+ "go_default": "1.14"
},
"sensitive-variables": ["install_password", "ssh_password", "client_secret", "github_feed_token"],
"builders": [
@@ -101,7 +101,8 @@
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Windows2016/Initialize-VM.ps1"
- ]
+ ],
+ "execution_policy": "unrestricted"
},
{
"type": "powershell",
@@ -237,7 +238,8 @@
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1"
- ]
+ ],
+ "execution_policy": "remotesigned"
},
{
"type": "windows-restart",
@@ -444,6 +446,12 @@
"{{ template_dir }}/scripts/Installers/Install-Cmake.ps1"
]
},
+ {
+ "type": "powershell",
+ "scripts":[
+ "{{ template_dir }}/scripts/Installers/Install-AWS.ps1"
+ ]
+ },
{
"type": "powershell",
"scripts":[
@@ -462,6 +470,14 @@
"{{ template_dir }}/scripts/Installers/Install-MysqlCli.ps1"
]
},
+ {
+ "type": "powershell",
+ "elevated_user": "SYSTEM",
+ "elevated_password": "",
+ "scripts":[
+ "{{ template_dir }}/scripts/Installers/Install-SQLExpress.ps1"
+ ]
+ },
{
"type": "powershell",
"scripts":[
@@ -517,8 +533,7 @@
{
"type": "powershell",
"environment_vars": [
- "ROOT_FOLDER={{user `root_folder`}}",
- "BOOST_DEFAULT={{user `boost_default`}}"
+ "ROOT_FOLDER={{user `root_folder`}}"
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Install-Boost.ps1"
@@ -652,8 +667,7 @@
{
"type": "powershell",
"environment_vars": [
- "ROOT_FOLDER={{user `root_folder`}}",
- "BOOST_DEFAULT={{user `boost_default`}}"
+ "ROOT_FOLDER={{user `root_folder`}}"
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Validate-Boost.ps1"
@@ -725,6 +739,12 @@
"{{ template_dir }}/scripts/Installers/Validate-Bazel.ps1"
]
},
+ {
+ "type": "powershell",
+ "scripts":[
+ "{{ template_dir }}/scripts/Installers/Validate-SQLExpress.ps1"
+ ]
+ },
{
"type": "powershell",
"scripts":[
@@ -875,8 +895,17 @@
},
{
"type": "powershell",
+ "environment_vars":[
+ "RUN_SCAN_ANTIVIRUS={{user `run_scan_antivirus`}}"
+ ],
"scripts":[
- "{{ template_dir }}/scripts/Installers/Windows2016/Run-Antivirus.ps1"
+ "{{ template_dir }}/scripts/Installers/Run-Antivirus.ps1"
+ ]
+ },
+ {
+ "type": "powershell",
+ "scripts":[
+ "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1"
]
},
{
diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md
index c60d1ffa7..f20e48706 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 20200323.1 update.
Components marked with **\*** have been upgraded since the previous version of the image.
@@ -23,6 +23,12 @@ _Version:_ 1.25.4
_Environment:_
* PATH: contains location of docker-compose.exe
+## Helm
+
+_Version:_ v3.1.2+gd878d4d
+_Environment:_
+* PATH: contains location of helm
+
## Powershell Core
_Version:_ 7.0.0
@@ -30,15 +36,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:7bf99ba791cce2c51091ac0c6922ff98e5a448c1046ba046fab3760070173e0d)
+* mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 (Digest: sha256:000d639c6c287bf0e69b27c008f2d411a9e161093dd1855667a8e6189f9adac8)
+* mcr.microsoft.com/windows/servercore:ltsc2016 (Digest: sha256:5bd97dbab1afe8d3200f5d5c974df3b0130e74e8a69fddcd427699c4c8cb5037)
* microsoft/aspnetcore-build:1.0-2.0 (Digest: sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c)
* 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:
@@ -155,7 +161,8 @@ _Path:_ C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools
## Windows Driver Kit
-_Version:_ 10.0.17763.0
+_WDK Version:_ 10.1.17763.1
+_WDK Visual Studio Extension Version:_ 10.0.17740.0
## Azure Service Fabric
@@ -415,7 +422,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 +432,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,21 +440,15 @@ _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.1d 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
-_Version:_ v5.30.1
+_Version:_ v5.30.2
## Git
@@ -462,48 +463,39 @@ _Environment:_
* PATH: contains location of git-lfs.exe
* GIT_LFS_PATH: location of git-lfs.exe
+## Hub CLI
+
+_Version:_ 2.14.2
+_Environment:_
+* PATH: contains location of hub.exe
+
## Go (x64)
-#### 1.9.7
-
-_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
-
## Boost
-#### 1.69.0
+#### 1.69.0 [msvc-14.1]
+_Environment:_
* PATH: contains the location of Boost version 1.69.0
-* BOOST_ROOT: root directory of the Boost version 1.69.0 installation
* BOOST_ROOT_1_69_0: root directory of the Boost version 1.69.0 installation
-#### 1.72.0
+#### 1.72.0 [msvc-14.1]
_Environment:_
* BOOST_ROOT_1_72_0: root directory of the Boost version 1.72.0 installation
+
+#### _Notes:_
+Link: https://cmake.org/cmake/help/latest/module/FindBoost.html
+
+If Boost was built using the `boost-cmake` project or from `Boost 1.70.0` on it provides a package
+configuration file for use with find\_package's config mode. This module looks for the package
+configuration file called BoostConfig.cmake or boost-config.cmake and stores the result in CACHE entry "Boost_DIR".
+If found, the package configuration file is loaded and this module returns with no further action.
+See documentation of the Boost CMake package configuration for details on what it provides.
+
+Set `Boost_NO_BOOST_CMAKE to ON`, to disable the search for boost-cmake.
## PHP (x64)
@@ -514,17 +506,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
@@ -546,17 +530,17 @@ _Environment:_
## Google Chrome
_version:_
-80.0.3987.132
+80.0.3987.149
## Microsoft Edge
_version:_
-80.0.361.66
+80.0.361.69
## Mozilla Firefox
_version:_
-73.0.1
+74.0
## Selenium Web Drivers
@@ -588,7 +572,7 @@ _Environment:_
#### Microsoft Edge Driver
_version:_
-80.0.361.66
+80.0.361.69
_Environment:_
* EdgeWebDriver: location of msedgedriver.exe
@@ -602,7 +586,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
@@ -613,7 +597,7 @@ _Environment:_
## bazel
-_Version:_ bazel 2.1.0
+_Version:_ bazel 2.2.0
## bazelisk
@@ -621,7 +605,7 @@ _Version:_ 1.3.0
## Java Development Kit
-#### 1.8.0_222
+#### 1.8.0_222 (default)
_Environment:_
* JAVA_HOME: location of JDK
@@ -658,7 +642,7 @@ _Environment:_
## Cmake
-_Version:_ 3.16.5
+_Version:_ 3.17.0
_Environment:_
* PATH: contains location of cmake.exe
@@ -778,7 +762,7 @@ _Version:_ 1.0
## SQLServer PS
-_Version:_ 21.1.18218
+_Version:_ 21.1.18221
## MinGW
@@ -823,15 +807,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.4.0
## Cloud Foundry CLI
diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json
index 2023be503..1698c5507 100644
--- a/images/win/Windows2019-Azure.json
+++ b/images/win/Windows2019-Azure.json
@@ -14,7 +14,8 @@
"virtual_network_resource_group_name": "{{env `VNET_RESOURCE_GROUP`}}",
"virtual_network_subnet_name": "{{env `VNET_SUBNET`}}",
"private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}",
- "vm_size": "Standard_DS4_v2",
+ "vm_size": "Standard_D4_v2",
+ "run_scan_antivirus": "false",
"root_folder": "C:",
"image_folder": "C:\\image",
@@ -30,8 +31,7 @@
"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",
- "boost_default": "1.72.0"
+ "go_default": "1.14"
},
"sensitive-variables": ["install_password", "ssh_password", "client_secret", "github_feed_token"],
"builders": [
@@ -101,7 +101,8 @@
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Windows2019/Initialize-VM.ps1"
- ]
+ ],
+ "execution_policy": "unrestricted"
},
{
"type": "powershell",
@@ -218,7 +219,8 @@
"type": "powershell",
"scripts":[
"{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1"
- ]
+ ],
+ "execution_policy": "remotesigned"
},
{
"type": "windows-restart",
@@ -425,6 +427,12 @@
"{{ template_dir }}/scripts/Installers/Install-Cmake.ps1"
]
},
+ {
+ "type": "powershell",
+ "scripts":[
+ "{{ template_dir }}/scripts/Installers/Install-AWS.ps1"
+ ]
+ },
{
"type": "powershell",
"scripts":[
@@ -443,6 +451,14 @@
"{{ template_dir }}/scripts/Installers/Install-MysqlCli.ps1"
]
},
+ {
+ "type": "powershell",
+ "elevated_user": "SYSTEM",
+ "elevated_password": "",
+ "scripts":[
+ "{{ template_dir }}/scripts/Installers/Install-SQLExpress.ps1"
+ ]
+ },
{
"type": "powershell",
"scripts":[
@@ -498,8 +514,7 @@
{
"type": "powershell",
"environment_vars": [
- "ROOT_FOLDER={{user `root_folder`}}",
- "BOOST_DEFAULT={{user `boost_default`}}"
+ "ROOT_FOLDER={{user `root_folder`}}"
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Install-Boost.ps1"
@@ -571,6 +586,12 @@
"{{ template_dir }}/scripts/Installers/Install-Bazel.ps1"
]
},
+ {
+ "type": "powershell",
+ "scripts":[
+ "{{ template_dir }}/scripts/Installers/Install-RootCA.ps1"
+ ]
+ },
{
"type": "windows-restart",
"restart_timeout": "10m"
@@ -639,8 +660,7 @@
{
"type": "powershell",
"environment_vars": [
- "ROOT_FOLDER={{user `root_folder`}}",
- "BOOST_DEFAULT={{user `boost_default`}}"
+ "ROOT_FOLDER={{user `root_folder`}}"
],
"scripts":[
"{{ template_dir }}/scripts/Installers/Validate-Boost.ps1"
@@ -736,6 +756,12 @@
"{{ template_dir }}/scripts/Installers/Validate-MysqlCli.ps1"
]
},
+ {
+ "type": "powershell",
+ "scripts":[
+ "{{ template_dir }}/scripts/Installers/Validate-SQLExpress.ps1"
+ ]
+ },
{
"type": "powershell",
"scripts":[
@@ -868,8 +894,17 @@
},
{
"type": "powershell",
+ "environment_vars":[
+ "RUN_SCAN_ANTIVIRUS={{user `run_scan_antivirus`}}"
+ ],
"scripts":[
- "{{ template_dir }}/scripts/Installers/Windows2019/Run-Antivirus.ps1"
+ "{{ template_dir }}/scripts/Installers/Run-Antivirus.ps1"
+ ]
+ },
+ {
+ "type": "powershell",
+ "scripts":[
+ "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1"
]
},
{
@@ -881,4 +916,4 @@
]
}
]
-}
+}
\ No newline at end of file
diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md
index 9819f9a84..cd716b6e1 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 20200308.0 update.
+The following software is installed on machines with the 20200319.1 update.
Components marked with **\*** have been upgraded since the previous version of the image.
@@ -23,6 +23,12 @@ _Version:_ 1.25.4
_Environment:_
* PATH: contains location of docker-compose.exe
+## Helm
+
+_Version:_ v3.1.2+gd878d4d
+_Environment:_
+* PATH: contains location of helm
+
## Powershell Core
_Version:_ 7.0.0
@@ -30,15 +36,15 @@ _Version:_ 7.0.0
## Docker images
The following container images have been cached:
-* mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 (Digest: sha256:746e54a4398bff0ad516d02fdb9eec5cba1a3b5ba0c15a82c051fc3dc753fe85)
-* mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 (Digest: sha256:708a9492c51140a07a0bd160c508dd6d17f3b061af0a3f53de607d671ee7176a)
-* mcr.microsoft.com/windows/servercore:ltsc2019 (Digest: sha256:39ba615d7a739fcdd9fc95b97882672d5af7d0861dd16b51b238c822765d2b8d)
-* mcr.microsoft.com/windows/nanoserver:1809 (Digest: sha256:4201fb07c1ece2ef0bad7b518fd487d030cd49de98b81b3ed8b98e71432df463)
+* mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 (Digest: sha256:24ffd5fad1becaf9b16f42ec6f40c90ddf56664986a87212d2d48164e3bb52ba)
+* mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 (Digest: sha256:ceaf6f000f0a0677510a5511f089071c2822dd40f34a77ca0280f96b10621858)
+* mcr.microsoft.com/windows/servercore:ltsc2019 (Digest: sha256:8dcc65367c900f06ad386da6a1e25d578232f7b15981092986ade2f2fd9468b8)
+* mcr.microsoft.com/windows/nanoserver:1809 (Digest: sha256:5de6bd32bd453d60c8f549d28845552e89ad3652566e141ac82023b6ba10374d)
* microsoft/aspnetcore-build:1.0-2.0 (Digest: sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c)
## Visual Studio 2019 Enterprise
-_Version:_ VisualStudio/16.4.5+29806.167
+_Version:_ VisualStudio/16.5.0+29911.84
_Location:_ C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise
The following workloads and components are installed with Visual Studio 2019:
@@ -132,13 +138,15 @@ The following workloads and components are installed with Visual Studio 2019:
## WIX Tools
_Toolset Version:_ 3.11.4516
-_WIX Toolset Visual Studio Extension Version:_ 1.0.0.4
+_WIX Toolset Studio 2019 Extension Version:_ 1.0.0.4
_Environment:_
* WIX: Installation root of WIX
-## Microsoft Analysis Services Projects Visual Studio Extension
+## Microsoft SSDT Visual Studio 2019 Extensions
-_Version:_ 2.9.5
+_Microsoft Analysis Services Projects Version:_ 2.9.6
+_SQL Server Integration Services Projects Version:_ 3.5
+_Microsoft Reporting Services Projects Version:_ 2.6.3
## .NET 4.8
@@ -408,7 +416,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
@@ -418,7 +426,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
@@ -426,21 +434,15 @@ _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.7.6
-_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.1d 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
-_Version:_ v5.30.1
+_Version:_ v5.30.2
## Git
@@ -455,33 +457,45 @@ _Environment:_
* PATH: contains location of git-lfs.exe
* GIT_LFS_PATH: location of git-lfs.exe
+## Hub CLI
+
+_Version:_ 2.14.2
+_Environment:_
+* PATH: contains location of hub.exe
+
## Go (x64)
-#### 1.12.7
+#### 1.14
_Environment:_
-* PATH: contains the location of go.exe version 1.12.7
-* GOROOT: root directory of the Go 1.12.7 installation
-* GOROOT_1_12_X64: root directory of the Go 1.12.7 installation
-#### 1.13
-
-_Environment:_
-* GOROOT_1_13_X64: root directory of the Go 1.13 installation
-
+* PATH: contains the location of go.exe version 1.14
+* GOROOT: root directory of the Go 1.14 installation
+* GOROOT_1_14_X64: root directory of the Go 1.14 installation
## Boost
-#### 1.69.0
+#### 1.69.0 [msvc-14.1]
_Environment:_
* BOOST_ROOT_1_69_0: root directory of the Boost version 1.69.0 installation
-#### 1.72.0
+#### 1.72.0 [msvc-14.2]
+_Environment:_
* PATH: contains the location of Boost version 1.72.0
-* BOOST_ROOT: root directory of the Boost version 1.72.0 installation
* BOOST_ROOT_1_72_0: root directory of the Boost version 1.72.0 installation
+
+#### _Notes:_
+Link: https://cmake.org/cmake/help/latest/module/FindBoost.html
+
+If Boost was built using the `boost-cmake` project or from `Boost 1.70.0` on it provides a package
+configuration file for use with find\_package's config mode. This module looks for the package
+configuration file called BoostConfig.cmake or boost-config.cmake and stores the result in CACHE entry "Boost_DIR".
+If found, the package configuration file is loaded and this module returns with no further action.
+See documentation of the Boost CMake package configuration for details on what it provides.
+
+Set `Boost_NO_BOOST_CMAKE to ON`, to disable the search for boost-cmake.
## PHP (x64)
@@ -492,17 +506,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
@@ -524,7 +530,7 @@ _Environment:_
## Google Chrome
_version:_
-80.0.3987.132
+80.0.3987.149
## Microsoft Edge
@@ -534,7 +540,7 @@ _version:_
## Mozilla Firefox
_version:_
-73.0.1
+74.0
## Selenium Web Drivers
@@ -580,7 +586,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
@@ -591,7 +597,7 @@ _Environment:_
## Java Development Kit
-#### 1.8.0_222
+#### 1.8.0_222 (default)
_Environment:_
* JAVA_HOME: location of JDK
@@ -645,6 +651,7 @@ _Environment:_
* PATH: contains location of dotnet.exe
_SDK:_
+* 3.1.200 C:\Program Files\dotnet\sdk\3.1.200
* 3.1.101 C:\Program Files\dotnet\sdk\3.1.101
* 3.1.100 C:\Program Files\dotnet\sdk\3.1.100
* 2.2.402 C:\Program Files\dotnet\sdk\2.2.402
@@ -702,6 +709,7 @@ _SDK:_
* 2.1.300 C:\Program Files\dotnet\sdk\2.1.300
_Runtime:_
+* 3.1.2 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.1.2
* 3.1.1 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.1.1
* 3.1.0 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\3.1.0
* 2.2.8 C:\Program Files\dotnet\shared\Microsoft.NETCore.App\2.2.8
@@ -788,15 +796,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.4.0
## Cloud Foundry CLI
@@ -828,7 +832,7 @@ _Environment:_
## bazel
-_Version:_ bazel 2.1.0
+_Version:_ bazel 2.2.0
## bazelisk
diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/win/scripts/ImageHelpers/ImageHelpers.psm1
index 743dc7a18..c40b10989 100644
--- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1
+++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1
@@ -20,6 +20,7 @@ Export-ModuleMember -Function @(
'Add-SoftwareDetailsToMarkdown'
'Stop-SvcWithErrHandling'
'Set-SvcWithErrHandling'
+ 'Start-DownloadWithRetry'
'Install-VsixExtension'
'Get-VSExtensionVersion'
'Get-WinVersion'
diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1
index 61dce5628..a016e5fd7 100644
--- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1
+++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1
@@ -161,6 +161,47 @@ Hashtable for service arguments
}
}
+function Start-DownloadWithRetry
+{
+ param (
+ [Parameter(Mandatory)]
+ [string] $Url,
+ [Parameter(Mandatory)]
+ [string] $Name,
+ [string] $DownloadPath = "${env:Temp}",
+ [int] $Retries = 20
+ )
+
+ $FilePath = Join-Path -Path $DownloadPath -ChildPath $Name
+ #Default retry logic for the package.
+ while ($retries -gt 0)
+ {
+ try
+ {
+ Write-Host "Downloading package from: $Url to path $FilePath ."
+ (New-Object System.Net.WebClient).DownloadFile($Url, $FilePath)
+ break
+ }
+ catch
+ {
+ Write-Host "There is an error during package downloading:`n $_"
+ $retries--
+
+ if ($retries -eq 0)
+ {
+ Write-Host "File can't be downloaded. Please try later or check that file exists by url: $Url"
+ exit 1
+ }
+
+ Write-Host "Waiting 30 seconds before retrying. Retries left: $retries"
+ Start-Sleep -Seconds 30
+ }
+ }
+
+ return $FilePath
+}
+
+
function Install-VsixExtension
{
Param
@@ -177,34 +218,7 @@ function Install-VsixExtension
if (!$InstallOnly)
{
- $FilePath = "${env:Temp}\$Name"
-
- while($retries -gt 0)
- {
- try
- {
- Write-Host "Downloading $Name..."
- (New-Object System.Net.WebClient).DownloadFile($Url, $FilePath)
- break
- }
- catch
- {
- Write-Host "There is an error during $Name downloading"
- $_
-
- $retries--
-
- if ($retries -eq 0)
- {
- Write-Host "File can't be downloaded"
- $_
- exit 1
- }
-
- Write-Host "Waiting 30 seconds before retrying. Retries left: $retries"
- Start-Sleep -Seconds 30
- }
- }
+ $FilePath = Start-DownloadWithRetry -Url $Url -Name $Name
}
$ArgumentList = ('/quiet', "`"$FilePath`"")
@@ -311,4 +325,3 @@ function Test-IsWin16
{
(Get-WinVersion) -match "2016"
}
-
diff --git a/images/win/scripts/Installers/Configure-Antivirus.ps1 b/images/win/scripts/Installers/Configure-Antivirus.ps1
new file mode 100644
index 000000000..650d3a982
--- /dev/null
+++ b/images/win/scripts/Installers/Configure-Antivirus.ps1
@@ -0,0 +1,2 @@
+Write-Host "Set antivirus parameters"
+Set-MpPreference -ScanAvgCPULoadFactor 5 -ExclusionPath "D:\", "C:\"
\ No newline at end of file
diff --git a/images/win/scripts/Installers/Install-AWS.ps1 b/images/win/scripts/Installers/Install-AWS.ps1
new file mode 100644
index 000000000..124f32d20
--- /dev/null
+++ b/images/win/scripts/Installers/Install-AWS.ps1
@@ -0,0 +1,31 @@
+################################################################################
+## File: Install-awscli.ps1
+## Desc: Install awscli
+################################################################################
+
+choco install awscli -y
+
+$env:PATH =$env:PATH + ";$Env:Programfiles\Amazon\AWSCLIV2"
+
+$command = Get-Command -Name 'aws'
+
+if ($command)
+{
+ Write-Host "awscli on path"
+}
+else
+{
+ Write-Host 'awscli is not on path'
+ exit 1
+}
+
+# Adding description of the software to Markdown
+$SoftwareName = "AWS CLI"
+
+$version = (aws --version).Split(" ")[0].Replace("/"," ")
+
+$Description = @"
+_Version:_ $version
+"@
+
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
\ No newline at end of file
diff --git a/images/win/scripts/Installers/Install-Boost.ps1 b/images/win/scripts/Installers/Install-Boost.ps1
index 0931fb25a..d46a150c8 100644
--- a/images/win/scripts/Installers/Install-Boost.ps1
+++ b/images/win/scripts/Installers/Install-Boost.ps1
@@ -9,7 +9,6 @@ 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)
{
@@ -17,11 +16,4 @@ foreach($BoostVersion in $BoostVersions)
$EnvBoostPath = "BOOST_ROOT_{0}" -f ($BoostVersion.Replace('.', '_'))
setx $EnvBoostPath $BoostInstallationDir /M | Out-Null
-
- if ($BoostVersion -eq $BoostDefault)
- {
- Write-Host "Adding Boost $BoostVersion to the path..."
- # Add the Boost binaries to the path
- Add-MachinePathItem $BoostInstallationDir | 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-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1
index 996887885..5fe03e9b6 100644
--- a/images/win/scripts/Installers/Install-DotnetSDK.ps1
+++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1
@@ -100,16 +100,10 @@ function RunPostInstallationSteps()
{
Add-MachinePathItem "C:\Program Files\dotnet"
# Run script at startup for all users
- $cmdDotNetPath = @"
-@echo off
-SETX PATH "%USERPROFILE%\.dotnet\tools;%PATH%"
-"@
-
- $cmdPath = "C:\Program Files\dotnet\userpath.bat"
- $cmdDotNetPath | Out-File -Encoding ascii -FilePath $cmdPath
+ $cmdDotNet = 'C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -NoProfile -Command "[System.Environment]::SetEnvironmentVariable(''PATH'',"""$env:USERPROFILE\.dotnet\tools;$env:PATH""", ''USER'')"'
# Update Run key to run a script at logon
- Set-ItemProperty -Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Run" -Name "DOTNETUSERPATH" -Value $cmdPath
+ Set-ItemProperty -Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Run" -Name "DOTNETUSERPATH" -Value $cmdDotNet
}
InstallAllValidSdks
diff --git a/images/win/scripts/Installers/Install-PHP.ps1 b/images/win/scripts/Installers/Install-PHP.ps1
index 02d38931d..72db2ee27 100644
--- a/images/win/scripts/Installers/Install-PHP.ps1
+++ b/images/win/scripts/Installers/Install-PHP.ps1
@@ -10,8 +10,11 @@ Import-Module -Name ImageHelpers
$installDir = "c:\tools\php"
choco install php -y --force --params "/InstallDir:$installDir"
-# update path to extensions and enable curl and mbstring extensions
-((Get-Content -path $installDir\php.ini -Raw) -replace ';extension=curl','extension=curl' -replace ';extension=mbstring','extension=mbstring' -replace ';extension_dir = "ext"','extension_dir = "ext"') | Set-Content -Path $installDir\php.ini
+# Install latest Composer in chocolatey
+choco install composer --ia "/DEV=$installDir /PHP=$installDir"
+
+# update path to extensions and enable curl and mbstring extensions, and enable php openssl extensions.
+((Get-Content -path $installDir\php.ini -Raw) -replace ';extension=curl','extension=curl' -replace ';extension=mbstring','extension=mbstring' -replace ';extension_dir = "ext"','extension_dir = "ext"' -replace 'extension=";php_openssl.dll"','extension_dir = "php_openssl.dll"') | Set-Content -Path $installDir\php.ini
# Set the PHPROOT environment variable.
setx PHPROOT $installDir /M
diff --git a/images/win/scripts/Installers/Install-RootCA.ps1 b/images/win/scripts/Installers/Install-RootCA.ps1
new file mode 100644
index 000000000..cd3a46425
--- /dev/null
+++ b/images/win/scripts/Installers/Install-RootCA.ps1
@@ -0,0 +1,22 @@
+# Serialized Certificate Store File
+$sstFile = "$env:TEMP\roots.sst"
+# Generate SST from Windows Update
+$result = certutil.exe -generateSSTFromWU $sstFile
+if ($LASTEXITCODE -ne 0) {
+ Write-Host "[Error]: failed to generate $sstFile sst file`n$result"
+ exit $LASTEXITCODE
+}
+
+$result = certutil.exe -dump $sstFile
+if ($LASTEXITCODE -ne 0) {
+ Write-Host "[Error]: failed to dump $sstFile sst file`n$result"
+ exit $LASTEXITCODE
+}
+
+try {
+ Import-Certificate -FilePath $sstFile -CertStoreLocation Cert:\LocalMachine\Root
+} catch {
+ Write-Host "[Error]: failed to import ROOT CA`n$_"
+ exit 1
+}
+
diff --git a/images/win/scripts/Installers/Install-Rust.ps1 b/images/win/scripts/Installers/Install-Rust.ps1
index e19cd4c14..61588a86f 100644
--- a/images/win/scripts/Installers/Install-Rust.ps1
+++ b/images/win/scripts/Installers/Install-Rust.ps1
@@ -14,7 +14,7 @@ $env:CARGO_HOME="C:\Rust\.cargo"
Invoke-WebRequest -UseBasicParsing -Uri "https://win.rustup.rs/x86_64" -OutFile rustup-init.exe
# Install Rust by running rustup-init.exe (disabling the confirmation prompt with -y)
-.\rustup-init.exe -y
+.\rustup-init.exe -y --default-toolchain=stable --profile=minimal
# Delete rustup-init.exe when it's no longer needed
Remove-Item -Path .\rustup-init.exe
@@ -24,10 +24,8 @@ Add-MachinePathItem "$env:CARGO_HOME\bin"
$env:Path = Get-MachinePath
# Install common tools
-rustup component add rustfmt
-rustup component add clippy
-cargo install bindgen
-cargo install cbindgen
+rustup component add rustfmt clippy
+cargo install bindgen cbindgen
# Run script at startup for all users
$cmdRustSymScript = @"
diff --git a/images/win/scripts/Installers/Install-SQLExpress.ps1 b/images/win/scripts/Installers/Install-SQLExpress.ps1
new file mode 100644
index 000000000..f1913088e
--- /dev/null
+++ b/images/win/scripts/Installers/Install-SQLExpress.ps1
@@ -0,0 +1,78 @@
+################################################################################
+## File: Install-SQLExpress.ps1
+## Desc: Install SQL Express for Windows
+################################################################################
+Import-Module -Name ImageHelpers -Force;
+
+function Download-FullSQLPackage {
+ param(
+ [String]$InstallerPath,
+ [String]$DownloadPath,
+ [String]$Arguments = ("/MEDIAPATH=$DownloadPath", "/MEDIATYPE=Core","/Action=Download", "/QUIET")
+ )
+ Write-Host "Downloading full package to $DownloadPath..."
+ $process = Start-Process -FilePath $InstallerPath -ArgumentList $Arguments -Wait -PassThru
+ $exitCode = $process.ExitCode
+ if ($exitCode -eq 0)
+ {
+ Write-Host -Object "Full SQL Express package has been successfully downloaded to $DownloadPath : ExitCode: $exitCode"
+ }
+ else
+ {
+ Write-Host -Object "Full package downloading process was unsuccessful. Exit code: $exitCode."
+ exit $exitCode
+ }
+}
+
+function Unpack-SQLInstaller {
+ param(
+ [String]$InstallPath,
+ [String]$Arguments = ("/Q", "/IACCEPTSQLSERVERLICENSETERMS")
+ )
+ Write-Host "Start unpacking procedure to $InstallPath..."
+ $process = Start-Process -FilePath $InstallPath -ArgumentList $Arguments -Wait -PassThru
+ $exitCode = $process.ExitCode
+# Exit code -2067529716 is added since SQL Unpack procedure returns it on success.
+ if ($exitCode -eq 0 -or $exitCode -eq -2067529716)
+ {
+ Write-Host -Object "SQL installer unpacking has been completed."
+ }
+ else
+ {
+ Write-Host -Object "SQL installer unpacking was interrupted : $exitCode."
+ exit $exitCode
+ }
+}
+
+function Start-Installer {
+ param(
+ [String]$InstallerPath,
+ [String]$Arguments = ("/Q", "/IACCEPTSQLSERVERLICENSETERMS", "/Action=Install", "/INSTANCEID=SQL2019", "/INSTANCENAME=SQL2019", "/SECURITYMODE=SQL", "/SAPWD=P@ssword!!", "/TCPENABLED=1")
+ )
+ Write-Host "Installating SQL Express..."
+ $process = Start-Process -FilePath $InstallerPath -ArgumentList $Arguments -Wait -PassThru
+ $exitCode = $process.ExitCode
+ if ($exitCode -eq 0)
+ {
+ Write-Host -Object "SQL Express has been successfully installed: ExitCode: $exitCode"
+ }
+ else
+ {
+ Write-Host -Object "Installation procedure was not correctly completed. Exit code: $exitCode."
+ exit $exitCode
+ }
+}
+#Main function
+$installerUrl = "https://go.microsoft.com/fwlink/?linkid=866658"
+$downloadPath = "C:\SQLInstall"
+$setupPath = Join-Path $downloadPath "SQLEXPR_x64_ENU"
+#Create directory for temporary files
+New-Item -Path $downloadPath -ItemType Directory
+Set-Location -Path $downloadPath
+$installerPath = Start-DownloadWithRetry -Url $installerUrl -DownloadPath $downloadPath -Name "SQL2019-SSEI-Expr.exe"
+Download-FullSQLPackage -InstallerPath $installerPath -DownloadPath $downloadPath
+Unpack-SQLInstaller -InstallPath "$setupPath.exe"
+$resultPath = Join-Path $setupPath "SETUP.exe"
+Start-Installer -InstallerPath $resultPath
+#Cleanup folder with installation packages.
+Remove-Item $downloadPath -Recurse -Force
diff --git a/images/win/scripts/Installers/Run-Antivirus.ps1 b/images/win/scripts/Installers/Run-Antivirus.ps1
new file mode 100644
index 000000000..7993146ae
--- /dev/null
+++ b/images/win/scripts/Installers/Run-Antivirus.ps1
@@ -0,0 +1,30 @@
+################################################################################
+## File: Run-Antivirus.ps1
+## Desc: Run a full antivirus scan.
+## Run right after cleanup before we sysprep
+################################################################################
+
+if ($env:run_scan_antivirus -eq $true) {
+ try {
+ Update-MpSignature
+ }
+ catch {
+ Write-Host "Some error was found"
+ Write-Host $_
+ }
+
+ Write-Host "Make sure windefend is going to start"
+ Start-Service windefend -ErrorAction Continue
+ Write-Host "Waiting for windefend to report as running"
+ $service = Get-Service "Windefend"
+ $service.WaitForStatus("Running","00:10:00")
+
+ Write-Host "Run antivirus"
+ # Tell Defender to use 100% of the CPU during the scan
+ Set-MpPreference -ScanAvgCPULoadFactor 100
+ # Full Scan
+ Start-Process -FilePath "C:\Program Files\Windows Defender\MpCmdRun.exe" -ArgumentList ("-Scan","-ScanType", 2) -Wait
+}
+else {
+ Write-Host "Scanning process has been skipped"
+}
\ No newline at end of file
diff --git a/images/win/scripts/Installers/Validate-Boost.ps1 b/images/win/scripts/Installers/Validate-Boost.ps1
index 6289e1652..e9b7554e3 100644
--- a/images/win/scripts/Installers/Validate-Boost.ps1
+++ b/images/win/scripts/Installers/Validate-Boost.ps1
@@ -18,7 +18,6 @@ function Validate-BoostVersion
if (Test-Path "$ReleasePath\b2.exe")
{
Write-Host "Boost.Build $BoostRelease is successfully installed"
-
return
}
@@ -26,17 +25,6 @@ function Validate-BoostVersion
exit 1
}
-# Verify that Boost is on the path
-if (Get-Command -Name 'b2')
-{
- Write-Host "Boost is on the path"
-}
-else
-{
- Write-Host "Boost is not on the path"
- exit 1
-}
-
# Adding description of the software to Markdown
$tmplMark = @"
#### {0} [{2}]
@@ -46,14 +34,6 @@ _Environment:_
"@
-$tmplMarkRoot = @"
-#### {0} [{2}]
-
-_Environment:_
-* PATH: contains the location of Boost version {0}
-* {1}: root directory of the Boost version {0} installation
-"@
-
$Description = New-Object System.Text.StringBuilder
$SoftwareName = 'Boost'
$BoostRootDirectory = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath $SoftwareName
@@ -68,14 +48,7 @@ foreach ($BoostTool in $BoostTools)
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, $BoostToolsetName))
- }
- else
- {
- $null = $Description.AppendLine(($tmplMark -f $BoostVersion, $BoostVersionTag, $BoostToolsetName))
- }
+ $null = $Description.AppendLine(($tmplMark -f $BoostVersion, $BoostVersionTag, $BoostToolsetName))
}
}
diff --git a/images/win/scripts/Installers/Validate-Cmake.ps1 b/images/win/scripts/Installers/Validate-Cmake.ps1
index 1d887d359..bacd0d2f0 100644
--- a/images/win/scripts/Installers/Validate-Cmake.ps1
+++ b/images/win/scripts/Installers/Validate-Cmake.ps1
@@ -5,11 +5,11 @@
if(Get-Command -Name 'cmake')
{
- Write-Host "Cmake $(cmake -version) on path"
+ Write-Host "CMake $(cmake -version) on path"
}
else
{
- Write-Host 'cmake not on path'
+ Write-Host 'CMake not on path'
exit 1
}
@@ -20,7 +20,7 @@ if( $( $(cmake -version) | Out-String) -match 'cmake version (?.*).*'
}
# Adding description of the software to Markdown
-$SoftwareName = "Cmake"
+$SoftwareName = "CMake"
$Description = @"
_Version:_ $cmakeVersion
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-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/Validate-NSIS.ps1 b/images/win/scripts/Installers/Validate-NSIS.ps1
index b38624e75..276eb139f 100644
--- a/images/win/scripts/Installers/Validate-NSIS.ps1
+++ b/images/win/scripts/Installers/Validate-NSIS.ps1
@@ -28,5 +28,4 @@ $Description = @"
_Version:_ $Version
"@
-#Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
-Write-Host $description
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
diff --git a/images/win/scripts/Installers/Validate-PHP.ps1 b/images/win/scripts/Installers/Validate-PHP.ps1
index a8663617f..f2f26a526 100644
--- a/images/win/scripts/Installers/Validate-PHP.ps1
+++ b/images/win/scripts/Installers/Validate-PHP.ps1
@@ -33,6 +33,32 @@ else
exit 1
}
+# Verify that composer.exe is on the path
+if(Get-Command -Name 'composer')
+{
+ Write-Host "$(composer --version) is on the path."
+}
+else
+{
+ Write-Host "composer is not on the path."
+ exit 1
+}
+
+# Get the composer version.
+$composerVersion = $(composer --version)
+
+# Add composer version details in Markdown
+$SoftwareName = "Composer"
+$Description = @"
+#### $composerVersion
+
+_Environment:_
+* PATH: contains the location of composer.exe version $composerVersion
+* PHPROOT: root directory of the Composer $composerVersion installation
+"@
+
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
+
# Get available versions of PHP
$phpVersionOnPath = Get-PHPVersion -phpRootPath "C:\tools\php72"
diff --git a/images/win/scripts/Installers/Validate-SQLExpress.ps1 b/images/win/scripts/Installers/Validate-SQLExpress.ps1
new file mode 100644
index 000000000..1b5a35783
--- /dev/null
+++ b/images/win/scripts/Installers/Validate-SQLExpress.ps1
@@ -0,0 +1,52 @@
+################################################################################
+## File: Validate-SQLExpress.ps1
+## Desc: Validate Microsoft SQL Express installation
+################################################################################
+
+#Parameters for database access
+$sqlUser = "sa"
+$sqlPassword = "P@ssword!!"
+$sqlInstance = "SQL2019"
+
+function Test-SqlConnection {
+ param(
+ [Parameter(Mandatory)]
+ [string]$ServerName,
+ [Parameter(Mandatory)]
+ [string]$IntegratedSecurity,
+ [Parameter(Mandatory)]
+ [string]$UserName,
+ [Parameter(Mandatory)]
+ [string]$Password
+ )
+ $ErrorActionPreference = 'Stop'
+ try {
+ $connectionString = 'Server={0};Integrated Security={1};User ID={2};Password={3}' -f $ServerName,$IntegratedSecurity,$UserName,$Password
+ $sqlConnection = New-Object System.Data.SqlClient.SqlConnection $connectionString
+ $sqlConnection.Open()
+ Write-Host -Object "Connection to SQL Express was successful."
+ return $sqlConnection.ServerVersion
+
+ } catch {
+ Write-Host -Object "Connection to SQL Express cannot be established."
+ exit 1
+
+ } finally {
+ ## Close the connection when we're done
+ $sqlConnection.Close()
+ }
+}
+$instanceName = "$env:computername\$sqlInstance"
+$version = Test-SqlConnection -ServerName $instanceName -IntegratedSecurity "false" -UserName $sqlUser -Password $sqlPassword
+
+# Adding description of the software to Markdown
+$SoftwareName = "Git"
+$Description = @"
+_Version:_ $version
+_InstanceName:_ $sqlInstance
+_Username:_ $sqlUser
+_Password:_ $sqlPassword
+_Default Path:_ C:\Program Files (x86)\Microsoft SQL Server
+"@
+
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
diff --git a/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1 b/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1
index d92105714..6f7dd13e8 100644
--- a/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1
+++ b/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1
@@ -30,6 +30,9 @@ function Disable-UserAccessControl {
Write-Host "User Access Control (UAC) has been disabled."
}
+# Set TLS1.2
+[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12"
+
Import-Module -Name ImageHelpers -Force
Write-Host "Setup PowerShellGet"
@@ -98,12 +101,15 @@ else {
}
# Run the installer
-[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12"
Invoke-Expression ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))
# Turn off confirmation
choco feature enable -n allowGlobalConfirmation
+# https://github.com/chocolatey/choco/issues/89
+# Remove some of the command aliases, like `cpack` #89
+Remove-Item -Path $env:ChocolateyInstall\bin\cpack.exe -Force
+
# Install webpi
choco install webpicmd -y
diff --git a/images/win/scripts/Installers/Windows2016/Install-SSDT.ps1 b/images/win/scripts/Installers/Windows2016/Install-SSDT.ps1
index 9362c9bd6..132734c81 100644
--- a/images/win/scripts/Installers/Windows2016/Install-SSDT.ps1
+++ b/images/win/scripts/Installers/Windows2016/Install-SSDT.ps1
@@ -5,8 +5,9 @@
Import-Module -Name ImageHelpers -Force
-#SSDT for Visual Studio 2017 (15.9.3)
-$InstallerURI = 'https://download.microsoft.com/download/5/2/D/52DEF429-5B17-470C-82D9-654116080B15/SSDT-Setup-ENU.exe'
+#SSDT for Visual Studio 2017
+#The link down below points to the latest version of SSDT for Visual Studio 2017
+$InstallerURI = 'https://go.microsoft.com/fwlink/?linkid=2124518'
$InstallerName = 'SSDT-Setup-ENU.exe'
$logFilePath = "$env:TEMP\ssdtlog.txt"
$ArgumentList = ('/install', 'INSTALLALL', '/passive', '/norestart', "/log `"$logFilePath`"")
diff --git a/images/win/scripts/Installers/Windows2016/Run-Antivirus.ps1 b/images/win/scripts/Installers/Windows2016/Run-Antivirus.ps1
deleted file mode 100644
index 77b3b2bc9..000000000
--- a/images/win/scripts/Installers/Windows2016/Run-Antivirus.ps1
+++ /dev/null
@@ -1,19 +0,0 @@
-################################################################################
-## File: Run-Antivirus.ps1
-## Desc: Run a full antivirus scan.
-## Run right after cleanup before we sysprep
-################################################################################
-
-Write-Host "Run antivirus"
-Push-Location "C:\Program Files\Windows Defender"
-
-# Tell Defender to use 100% of the CPU during the scan
-Set-MpPreference -ScanAvgCPULoadFactor 100
-
-# Full Scan
-.\MpCmdRun.exe -Scan -ScanType 2
-Pop-Location
-
-Write-Host "Set antivirus parmeters"
-Set-MpPreference -ScanAvgCPULoadFactor 5 `
- -ExclusionPath "D:\", "C:\"
diff --git a/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1 b/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1
index 46574d7c0..4f05935c9 100644
--- a/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1
+++ b/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1
@@ -104,6 +104,10 @@ Invoke-Expression ((new-object net.webclient).DownloadString('https://chocolatey
# Turn off confirmation
choco feature enable -n allowGlobalConfirmation
+# https://github.com/chocolatey/choco/issues/89
+# Remove some of the command aliases, like `cpack` #89
+Remove-Item -Path $env:ChocolateyInstall\bin\cpack.exe -Force
+
# Install webpi
choco install webpicmd -y
diff --git a/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1 b/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1
index a9658fd72..1ccd5c422 100644
--- a/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1
+++ b/images/win/scripts/Installers/Windows2019/Install-VS2019.ps1
@@ -121,6 +121,7 @@ $WorkLoads = '--allWorkloads --includeRecommended ' + `
'--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.14393 ' + `
'--add Microsoft.VisualStudio.Component.Windows10SDK.16299 ' + `
'--add Microsoft.VisualStudio.Component.Windows10SDK.17134 ' + `
'--add Microsoft.VisualStudio.Component.Windows10SDK.17763 ' + `
diff --git a/images/win/scripts/Installers/Windows2019/Run-Antivirus.ps1 b/images/win/scripts/Installers/Windows2019/Run-Antivirus.ps1
deleted file mode 100644
index e38126af0..000000000
--- a/images/win/scripts/Installers/Windows2019/Run-Antivirus.ps1
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-## File: Run-Antivirus.ps1
-## Desc: Run a full antivirus scan.
-## Run right after cleanup before we sysprep
-################################################################################
-
-Write-Host "Make sure windefend is going to start"
-Start-Service windefend -ErrorAction Continue
-
-Write-Host "Waiting for windefend to report as running"
-$service = Get-Service "Windefend"
-$service.WaitForStatus("Running","00:10:00")
-
-Write-Host "Run antivirus"
-Push-Location "C:\Program Files\Windows Defender"
-
-# Tell Defender to use 100% of the CPU during the scan
-Set-MpPreference -ScanAvgCPULoadFactor 100
-
-# Full Scan
-.\MpCmdRun.exe -Scan -ScanType 2
-Pop-Location
-
-Update-MpSignature
-Write-Host "Set antivirus parmeters"
-Set-MpPreference -ScanAvgCPULoadFactor 5 `
- -ExclusionPath "D:\", "C:\"
diff --git a/triage-rules.yml b/triage-rules.yml
index 20d1edce6..f56e910f7 100644
--- a/triage-rules.yml
+++ b/triage-rules.yml
@@ -7,157 +7,131 @@ rules:
- valueFor: '**Area for Triage**'
contains: '.NET Core'
addLabels: ['Area: .NET Core']
- assign: ['bishal-pdmsft', 'pulkitaggarwl']
# Area: .NET Framework
- valueFor: '**Area for Triage**'
contains: '.NET Framework'
addLabels: ['Area: .NET Framework']
- assign: ['azuredaveops', 'wnjenkin']
# Area: Android
- valueFor: '**Area for Triage**'
contains: 'Android'
addLabels: ['Area: Android']
- assign: ['madhurig']
# Area: Apple
- valueFor: '**Area for Triage**'
contains: 'Apple'
addLabels: ['Area: Apple']
- assign: ['sergey-akhalkov']
# Area: Artifacts
- valueFor: '**Area for Triage**'
contains: 'Artifacts'
addLabels: ['Area: Artifacts']
- assign: ['animania4ka']
# Area: C/C++
- valueFor: '**Area for Triage**'
contains: 'C/C++'
addLabels: ['Area: C/C++']
- assign: ['azuredaveops', 'wnjenkin']
# Area: Containers
- valueFor: '**Area for Triage**'
contains: 'Containers'
addLabels: ['Area: Containers']
- assign: ['bryanmacfarlane']
# Area: Databases
- valueFor: '**Area for Triage**'
contains: 'Databases'
addLabels: ['Area: Databases']
- assign: ['kmkumaran', 'RoopeshNair']
# Area: Deployment/Release
- valueFor: '**Area for Triage**'
contains: 'Deployment/Release'
addLabels: ['Area: Deployment/Release']
- assign: ['kmkumaran', 'RoopeshNair']
# Area: Erlang / Elixir
- valueFor: '**Area for Triage**'
contains: 'Erlang / Elixir'
addLabels: ['Area: Erlang / Elixir']
- assign: ['andymckay']
# Area: Git
- valueFor: '**Area for Triage**'
contains: 'Git'
addLabels: ['Area: Git']
- assign: ['alepauly','thejoebourneidentity']
# Area: Go
- valueFor: '**Area for Triage**'
contains: 'Go'
addLabels: ['Area: Go']
- assign: ['bishal-pdmsft', 'pulkitaggarwl']
# Area: Haskell
- valueFor: '**Area for Triage**'
contains: 'Haskell'
addLabels: ['Area: Haskell']
- assign: ['andymckay']
# Area: Java
- valueFor: '**Area for Triage**'
contains: 'Java'
addLabels: ['Area: Java']
- assign: ['leantk','vijayma']
# Area: JavaScript and Node.js
- valueFor: '**Area for Triage**'
contains: 'JavaScript and Node.js'
addLabels: ['Area: JavaScript and Node.js']
- assign: ['bryanmacfarlane']
# Area: Packages
- valueFor: '**Area for Triage**'
contains: 'Packages'
addLabels: ['Area: Packages']
- assign: ['johnterickson', 'animania4ka']
# Area: PHP
- valueFor: '**Area for Triage**'
contains: 'PHP'
addLabels: ['Area: PHP']
- assign: ['alepauly', 'thejoebourneidentity']
# Area: Python
- valueFor: '**Area for Triage**'
contains: 'Python'
addLabels: ['Area: Python']
- assign: ['madhurig']
# Area: Ruby
- valueFor: '**Area for Triage**'
contains: 'Ruby'
addLabels: ['Area: Ruby']
- assign: ['zachariahcox']
# Area: Rust
- valueFor: '**Area for Triage**'
contains: 'Rust'
addLabels: ['Area: Rust']
- assign: ['sergey-akhalkov']
# Area: Scala
- valueFor: '**Area for Triage**'
contains: 'Scala'
addLabels: ['Area: Scala']
- assign: ['leantk','vijayma']
# Area: Scripting and command line
- valueFor: '**Area for Triage**'
contains: 'Scripting and command line'
addLabels: ['Area: Scripting and command line']
- assign: ['zachariahcox','vtbassmatt']
# Area: Servers
- valueFor: '**Area for Triage**'
contains: 'Servers'
addLabels: ['Area: Servers']
- assign: ['kmkumaran', 'RoopeshNair']
# Area: SSH
- valueFor: '**Area for Triage**'
contains: 'SSH'
addLabels: ['Area: SSH']
- assign: ['zachariahcox','vtbassmatt']
# Area: Testing and code coverage (incl. browser testing)
- valueFor: '**Area for Triage**'
contains: 'Testing and code coverage'
addLabels: ['Area: Testing and code coverage']
- assign: ['sadagopanrajaram','PBoraMSFT']
# Area: Xamarin
- valueFor: '**Area for Triage**'
contains: 'Xamarin'
addLabels: ['Area: Xamarin']
- assign: ['sergey-akhalkov']
# Types
- valueFor: '**Question, Bug, or Feature?**'
@@ -183,10 +157,3 @@ nomatches:
addLabels: ['Area: Packages']
- contains: 'Docker'
addLabels: ['Area: Deployment/Release']
-
-# always runs after rules. look for missing or invalid sets of tags
-tags:
-- noneIn: ['bug', 'enhancement', 'question']
- addLabels: ['needs triage']
-- noneMatch: '\s*Area:\s*([^]*)'
- addLabels: ['needs triage']