From 8a77fdb2a1dd14a0ac790fccd8815125c4a9560b Mon Sep 17 00:00:00 2001 From: Nikita Bykov <49442273+nikita-bykov@users.noreply.github.com> Date: Thu, 8 Jul 2021 06:23:07 -0700 Subject: [PATCH] [Windows] Move choco installation list into toolset (#3688) * Move choco installation list into toolset * Add a condition to Install-CommonUtils.ps1 * Rename tests and revert Bazel to single script * Return Install-Bazel.ps1 to windows2016.json and windows2019.json * Remove condition and Write-Host command from Install-CommonUtils.ps1 * Reset Install-Bazel.ps1 to be the same as in main * Update choco.common_packages in toolset-2016.json and toolset-2019.json Co-authored-by: Nikita Bykov --- .../win/scripts/Installers/Install-7zip.ps1 | 8 -- .../win/scripts/Installers/Install-AzCopy.ps1 | 8 -- .../win/scripts/Installers/Install-Bicep.ps1 | 8 -- .../win/scripts/Installers/Install-Cmake.ps1 | 8 -- .../Installers/Install-CommonUtils.ps1 | 8 ++ .../scripts/Installers/Install-GitVersion.ps1 | 8 -- .../scripts/Installers/Install-InnoSetup.ps1 | 8 -- images/win/scripts/Installers/Install-Jq.ps1 | 8 -- .../win/scripts/Installers/Install-Julia.ps1 | 8 -- .../win/scripts/Installers/Install-Nuget.ps1 | 8 -- .../scripts/Installers/Install-OpenSSL.ps1 | 8 -- .../win/scripts/Installers/Install-Packer.ps1 | 8 -- .../win/scripts/Installers/Install-Perl.ps1 | 8 -- .../win/scripts/Installers/Install-Pulumi.ps1 | 8 -- images/win/scripts/Installers/Install-Svn.ps1 | 8 -- .../win/scripts/Installers/Install-Swig.ps1 | 8 -- .../scripts/Installers/Install-VSWhere.ps1 | 8 -- .../win/scripts/Tests/ChocoPackages.Tests.ps1 | 99 +++++++++++++++++++ images/win/scripts/Tests/Git.Tests.ps1 | 6 -- images/win/scripts/Tests/Tools.Tests.ps1 | 94 ------------------ images/win/toolsets/toolset-2016.json | 26 +++++ images/win/toolsets/toolset-2019.json | 26 +++++ images/win/windows2016.json | 19 +--- images/win/windows2019.json | 19 +--- 24 files changed, 163 insertions(+), 262 deletions(-) delete mode 100644 images/win/scripts/Installers/Install-7zip.ps1 delete mode 100644 images/win/scripts/Installers/Install-AzCopy.ps1 delete mode 100644 images/win/scripts/Installers/Install-Bicep.ps1 delete mode 100644 images/win/scripts/Installers/Install-Cmake.ps1 create mode 100644 images/win/scripts/Installers/Install-CommonUtils.ps1 delete mode 100644 images/win/scripts/Installers/Install-GitVersion.ps1 delete mode 100644 images/win/scripts/Installers/Install-InnoSetup.ps1 delete mode 100644 images/win/scripts/Installers/Install-Jq.ps1 delete mode 100644 images/win/scripts/Installers/Install-Julia.ps1 delete mode 100644 images/win/scripts/Installers/Install-Nuget.ps1 delete mode 100644 images/win/scripts/Installers/Install-OpenSSL.ps1 delete mode 100644 images/win/scripts/Installers/Install-Packer.ps1 delete mode 100644 images/win/scripts/Installers/Install-Perl.ps1 delete mode 100644 images/win/scripts/Installers/Install-Pulumi.ps1 delete mode 100644 images/win/scripts/Installers/Install-Svn.ps1 delete mode 100644 images/win/scripts/Installers/Install-Swig.ps1 delete mode 100644 images/win/scripts/Installers/Install-VSWhere.ps1 create mode 100644 images/win/scripts/Tests/ChocoPackages.Tests.ps1 diff --git a/images/win/scripts/Installers/Install-7zip.ps1 b/images/win/scripts/Installers/Install-7zip.ps1 deleted file mode 100644 index 9ad1e2045..000000000 --- a/images/win/scripts/Installers/Install-7zip.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-7zip.ps1 -## Desc: Install 7zip -################################################################################ - -Choco-Install -PackageName 7zip.install - -Invoke-PesterTests -TestFile "Tools" -TestName "7-Zip" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-AzCopy.ps1 b/images/win/scripts/Installers/Install-AzCopy.ps1 deleted file mode 100644 index 7e2e5c141..000000000 --- a/images/win/scripts/Installers/Install-AzCopy.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-AzCopy.ps1 -## Desc: Install AzCopy10 -################################################################################ - -Choco-Install -PackageName azcopy10 - -Invoke-PesterTests -TestFile "Tools" -TestName "AzCopy" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Bicep.ps1 b/images/win/scripts/Installers/Install-Bicep.ps1 deleted file mode 100644 index 21a66ce23..000000000 --- a/images/win/scripts/Installers/Install-Bicep.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Bicep.ps1 -## Desc: Install Bicep -################################################################################ - -Choco-Install -PackageName Bicep - -Invoke-PesterTests -TestFile "Tools" -TestName "Bicep" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Cmake.ps1 b/images/win/scripts/Installers/Install-Cmake.ps1 deleted file mode 100644 index 8baa82e2a..000000000 --- a/images/win/scripts/Installers/Install-Cmake.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Cmake.ps1 -## Desc: Install Cmake -################################################################################ - -Choco-Install -PackageName cmake.install -ArgumentList "--installargs",'ADD_CMAKE_TO_PATH=""System""' - -Invoke-PesterTests -TestFile "Tools" -TestName "CMake" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-CommonUtils.ps1 b/images/win/scripts/Installers/Install-CommonUtils.ps1 new file mode 100644 index 000000000..815d04f3e --- /dev/null +++ b/images/win/scripts/Installers/Install-CommonUtils.ps1 @@ -0,0 +1,8 @@ +$commonPackages = (Get-ToolsetContent).choco.common_packages + +foreach ($package in $commonPackages) +{ + Choco-Install -PackageName $package.name -ArgumentList $package.args +} + +Invoke-PesterTests -TestFile "ChocoPackages" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-GitVersion.ps1 b/images/win/scripts/Installers/Install-GitVersion.ps1 deleted file mode 100644 index d59dd67ed..000000000 --- a/images/win/scripts/Installers/Install-GitVersion.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-GitVersion.ps1 -## Desc: Install GitVersion -################################################################################ - -Choco-Install -PackageName gitversion.portable - -Invoke-PesterTests -TestFile "Git" -TestName "GitVersion" diff --git a/images/win/scripts/Installers/Install-InnoSetup.ps1 b/images/win/scripts/Installers/Install-InnoSetup.ps1 deleted file mode 100644 index 0bbbc9250..000000000 --- a/images/win/scripts/Installers/Install-InnoSetup.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-InnoSetup.ps1 -## Desc: Install Inno Setup -################################################################################ - -Choco-Install -PackageName innosetup - -Invoke-PesterTests -TestFile "Tools" -TestName "InnoSetup" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Jq.ps1 b/images/win/scripts/Installers/Install-Jq.ps1 deleted file mode 100644 index 50a05a5fd..000000000 --- a/images/win/scripts/Installers/Install-Jq.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Jq.ps1 -## Desc: Install jq -################################################################################ - -Choco-Install -PackageName jq - -Invoke-PesterTests -TestFile "Tools" -TestName "Jq" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Julia.ps1 b/images/win/scripts/Installers/Install-Julia.ps1 deleted file mode 100644 index c44321012..000000000 --- a/images/win/scripts/Installers/Install-Julia.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Julia.ps1 -## Desc: Install Julia -################################################################################ - -Choco-Install -PackageName julia -ArgumentList "--ia","/DIR=C:\Julia" - -Invoke-PesterTests -TestFile "Tools" -TestName "Julia" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Nuget.ps1 b/images/win/scripts/Installers/Install-Nuget.ps1 deleted file mode 100644 index fe10961d4..000000000 --- a/images/win/scripts/Installers/Install-Nuget.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Nuget.ps1 -## Desc: Install NuGet.CommandLine -################################################################################ - -Choco-Install -PackageName NuGet.CommandLine - -Invoke-PesterTests -TestFile "Tools" -TestName "Nuget" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-OpenSSL.ps1 b/images/win/scripts/Installers/Install-OpenSSL.ps1 deleted file mode 100644 index 77965ccb6..000000000 --- a/images/win/scripts/Installers/Install-OpenSSL.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-OpenSSL.ps1 -## Desc: Install OpenSSL -################################################################################ - -Choco-Install -PackageName openssl.light - -Invoke-PesterTests -TestFile "Tools" -TestName "OpenSSL" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Packer.ps1 b/images/win/scripts/Installers/Install-Packer.ps1 deleted file mode 100644 index 7b39e7271..000000000 --- a/images/win/scripts/Installers/Install-Packer.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Packer.ps1 -## Desc: Install Packer -################################################################################ - -Choco-Install -PackageName packer - -Invoke-PesterTests -TestFile "Tools" -TestName "Packer" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Perl.ps1 b/images/win/scripts/Installers/Install-Perl.ps1 deleted file mode 100644 index fb831bf00..000000000 --- a/images/win/scripts/Installers/Install-Perl.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Perl.ps1 -## Desc: Install Perl -################################################################################ - -Choco-Install -PackageName strawberryperl - -Invoke-PesterTests -TestFile "Tools" -TestName "Perl" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Pulumi.ps1 b/images/win/scripts/Installers/Install-Pulumi.ps1 deleted file mode 100644 index 5ba1851f1..000000000 --- a/images/win/scripts/Installers/Install-Pulumi.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Pulumi.ps1 -## Desc: Install Pulumi -################################################################################ - -Choco-Install -PackageName pulumi - -Invoke-PesterTests -TestFile "Tools" -TestName "Pulumi" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Svn.ps1 b/images/win/scripts/Installers/Install-Svn.ps1 deleted file mode 100644 index 3f939bf65..000000000 --- a/images/win/scripts/Installers/Install-Svn.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Svn.ps1 -## Desc: Install Subversion -################################################################################ - -Choco-Install -PackageName tortoisesvn - -Invoke-PesterTests -TestFile "Tools" -TestName "Svn" diff --git a/images/win/scripts/Installers/Install-Swig.ps1 b/images/win/scripts/Installers/Install-Swig.ps1 deleted file mode 100644 index 92cdd576a..000000000 --- a/images/win/scripts/Installers/Install-Swig.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Swig.ps1 -## Desc: Install Swig -################################################################################ - -Choco-Install -PackageName swig - -Invoke-PesterTests -TestFile "Tools" -TestName "Swig" diff --git a/images/win/scripts/Installers/Install-VSWhere.ps1 b/images/win/scripts/Installers/Install-VSWhere.ps1 deleted file mode 100644 index 641adedb8..000000000 --- a/images/win/scripts/Installers/Install-VSWhere.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-VSWhere.ps1 -## Desc: Install latest stable version of VSWhere -################################################################################ - -Choco-Install -PackageName vswhere - -Invoke-PesterTests -TestFile "Tools" -TestName "VSWhere" diff --git a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 new file mode 100644 index 000000000..ce90ac79e --- /dev/null +++ b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 @@ -0,0 +1,99 @@ +Describe "7-Zip" { + It "7z" { + "7z" | Should -ReturnZeroExitCode + } +} + +Describe "AzCopy" { + It "AzCopy" { + "azcopy --version" | Should -ReturnZeroExitCode + } +} + +Describe "Bicep" { + It "Bicep" { + "bicep --version" | Should -ReturnZeroExitCode + } +} + +Describe "GitVersion" { + It "gitversion is installed" { + "gitversion /version" | Should -ReturnZeroExitCode + } +} + +Describe "InnoSetup" { + It "InnoSetup" { + (Get-Command -Name iscc).CommandType | Should -BeExactly "Application" + } +} + +Describe "Jq" { + It "Jq" { + "jq -n ." | Should -ReturnZeroExitCode + } +} + +Describe "Nuget" { + It "Nuget" { + "nuget" | Should -ReturnZeroExitCode + } +} + +Describe "OpenSSL" { + It "OpenSSL" { + "openssl version" | Should -ReturnZeroExitCode + } +} + +Describe "Packer" { + It "Packer" { + "packer --version" | Should -ReturnZeroExitCode + } +} + +Describe "Perl" { + It "Perl" { + "perl --version" | Should -ReturnZeroExitCode + } +} + +Describe "Pulumi" { + It "pulumi" { + "pulumi version" | Should -ReturnZeroExitCode + } +} + +Describe "Svn" { + It "svn" { + "svn --version --quiet" | Should -ReturnZeroExitCode + } +} + +Describe "Swig" { + It "Swig" { + "swig -version" | Should -ReturnZeroExitCode + } +} + +Describe "VSWhere" { + It "vswhere" { + "vswhere" | Should -ReturnZeroExitCode + } +} + +Describe "Julia" { + It "Julia path exists" { + "C:\Julia" | Should -Exist + } + + It "Julia" { + "julia --version" | Should -ReturnZeroExitCode + } +} + +Describe "CMake" { + It "cmake" { + "cmake --version" | Should -ReturnZeroExitCode + } +} \ No newline at end of file diff --git a/images/win/scripts/Tests/Git.Tests.ps1 b/images/win/scripts/Tests/Git.Tests.ps1 index 8dd159fa4..9b71aa0b8 100644 --- a/images/win/scripts/Tests/Git.Tests.ps1 +++ b/images/win/scripts/Tests/Git.Tests.ps1 @@ -23,9 +23,3 @@ Describe "Git" { $env:GCM_INTERACTIVE | Should -BeExactly Never } } - -Describe "GitVersion" { - It "gitversion is installed" { - "gitversion /version" | Should -ReturnZeroExitCode - } -} \ No newline at end of file diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 62f5846fa..0827a4cce 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -1,17 +1,5 @@ Import-Module (Join-Path $PSScriptRoot "..\SoftwareReport\SoftwareReport.Common.psm1") -DisableNameChecking -Describe "7-Zip" { - It "7z" { - "7z" | Should -ReturnZeroExitCode - } -} - -Describe "AzCopy" { - It "AzCopy" { - "azcopy --version" | Should -ReturnZeroExitCode - } -} - Describe "Azure Cosmos DB Emulator" { $cosmosDbEmulatorRegKey = Get-ChildItem "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\*" | Get-ItemProperty | Where-Object { $_.DisplayName -eq 'Azure Cosmos DB Emulator' } $installDir = $cosmosDbEmulatorRegKey.InstallLocation @@ -35,18 +23,6 @@ Describe "Bazel" { } } -Describe "Bicep" { - It "Bicep" { - "bicep --version" | Should -ReturnZeroExitCode - } -} - -Describe "CMake" { - It "cmake" { - "cmake --version" | Should -ReturnZeroExitCode - } -} - Describe "CodeQLBundle" { It "CodeQLBundle" { $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "codeql" | Join-Path -ChildPath "*" @@ -78,22 +54,6 @@ Describe "DotnetTLS" { } } -Describe "Jq" { - It "Jq" { - "jq -n ." | Should -ReturnZeroExitCode - } -} - -Describe "Julia" { - It "Julia path exists" { - "C:\Julia" | Should -Exist - } - - It "Julia" { - "julia --version" | Should -ReturnZeroExitCode - } -} - Describe "Mercurial" { It "Mercurial" { "hg --version" | Should -ReturnZeroExitCode @@ -128,12 +88,6 @@ Describe "Mingw64" { } } -Describe "InnoSetup" { - It "InnoSetup" { - (Get-Command -Name iscc).CommandType | Should -BeExactly "Application" - } -} - Describe "GoogleCloudSDK" { It "" -TestCases @( @{ ToolName = "bq" } @@ -157,30 +111,6 @@ Describe "NSIS" { } } -Describe "Nuget" { - It "Nuget" { - "nuget" | Should -ReturnZeroExitCode - } -} - -Describe "OpenSSL" { - It "OpenSSL" { - "openssl version" | Should -ReturnZeroExitCode - } -} - -Describe "Packer" { - It "Packer" { - "packer --version" | Should -ReturnZeroExitCode - } -} - -Describe "Perl" { - It "Perl" { - "perl --version" | Should -ReturnZeroExitCode - } -} - Describe "PowerShell Core" { It "pwsh" { "pwsh --version" | Should -ReturnZeroExitCode @@ -191,12 +121,6 @@ Describe "PowerShell Core" { } } -Describe "Pulumi" { - It "pulumi" { - "pulumi version" | Should -ReturnZeroExitCode - } -} - Describe "Sbt" { It "sbt" { "sbt --version" | Should -ReturnZeroExitCode @@ -209,12 +133,6 @@ Describe "ServiceFabricSDK" { } } -Describe "Svn" { - It "svn" { - "svn --version --quiet" | Should -ReturnZeroExitCode - } -} - Describe "Stack" { It "Stack" { "stack --version" | Should -ReturnZeroExitCode @@ -241,12 +159,6 @@ Describe "Vcpkg" { } } -Describe "VSWhere" { - It "vswhere" { - "vswhere" | Should -ReturnZeroExitCode - } -} - Describe "WebPlatformInstaller" { It "WebPlatformInstaller" { "WebPICMD" | Should -ReturnZeroExitCode @@ -264,9 +176,3 @@ Describe "Pipx" { "pipx --version" | Should -ReturnZeroExitCode } } - -Describe "Swig" { - It "Swig" { - "swig -version" | Should -ReturnZeroExitCode - } -} diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index d09291525..21ae256ad 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -345,5 +345,31 @@ "3.1", "5.0" ] + }, + "choco": { + "common_packages": [ + { "name": "7zip.install" }, + { "name": "azcopy10" }, + { "name": "Bicep" }, + { "name": "gitversion.portable" }, + { "name": "innosetup" }, + { "name": "jq" }, + { "name": "NuGet.CommandLine" }, + { "name": "openssl.light" }, + { "name": "packer" }, + { "name": "strawberryperl" }, + { "name": "pulumi" }, + { "name": "tortoisesvn" }, + { "name": "swig" }, + { "name": "vswhere" }, + { + "name": "julia", + "args": [ "--ia", "/DIR=C:\\Julia" ] + }, + { + "name": "cmake.install", + "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ] + } + ] } } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index a409a24ea..b99ab73db 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -373,5 +373,31 @@ "3.1", "5.0" ] + }, + "choco": { + "common_packages": [ + { "name": "7zip.install" }, + { "name": "azcopy10" }, + { "name": "Bicep" }, + { "name": "gitversion.portable" }, + { "name": "innosetup" }, + { "name": "jq" }, + { "name": "NuGet.CommandLine" }, + { "name": "openssl.light" }, + { "name": "packer" }, + { "name": "strawberryperl" }, + { "name": "pulumi" }, + { "name": "tortoisesvn" }, + { "name": "swig" }, + { "name": "vswhere" }, + { + "name": "julia", + "args": [ "--ia", "/DIR=C:\\Julia" ] + }, + { + "name": "cmake.install", + "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ] + } + ] } } diff --git a/images/win/windows2016.json b/images/win/windows2016.json index b61fefa84..aa2990783 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -183,7 +183,6 @@ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-Nuget.ps1", "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", "{{ template_dir }}/scripts/Installers/Install-WDK.ps1", "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1" @@ -208,14 +207,11 @@ "scripts": [ "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1", "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1", - "{{ template_dir }}/scripts/Installers/Install-7zip.ps1", + "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1", "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1", - "{{ template_dir }}/scripts/Installers/Install-Packer.ps1", - "{{ template_dir }}/scripts/Installers/Install-Pulumi.ps1", "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1" ] }, @@ -239,23 +235,17 @@ "type": "powershell", "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1", - "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1", - "{{ template_dir }}/scripts/Installers/Install-Perl.ps1", "{{ template_dir }}/scripts/Installers/Install-Git.ps1", "{{ template_dir }}/scripts/Installers/Install-GitHub-CLI.ps1", "{{ template_dir }}/scripts/Installers/Install-PHP.ps1", "{{ template_dir }}/scripts/Installers/Install-Rust.ps1", - "{{ template_dir }}/scripts/Installers/Install-Julia.ps1", - "{{ template_dir }}/scripts/Installers/Install-Svn.ps1", "{{ template_dir }}/scripts/Installers/Install-Chrome.ps1", "{{ template_dir }}/scripts/Installers/Install-Edge.ps1", "{{ template_dir }}/scripts/Installers/Install-Firefox.ps1", "{{ template_dir }}/scripts/Installers/Install-Selenium.ps1", "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-Apache.ps1", - "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1", - "{{ template_dir }}/scripts/Installers/Install-Swig.ps1", - "{{ template_dir }}/scripts/Installers/Install-Bicep.ps1" + "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1" ] }, { @@ -288,9 +278,7 @@ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1", "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1", - "{{ template_dir }}/scripts/Installers/Install-Cmake.ps1", "{{ template_dir }}/scripts/Installers/Install-R.ps1", "{{ template_dir }}/scripts/Installers/Install-AWS.ps1", "{{ template_dir }}/scripts/Installers/Install-DACFx.ps1", @@ -318,10 +306,7 @@ "{{ template_dir }}/scripts/Installers/Install-Miniconda.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCosmosDbEmulator.ps1", "{{ template_dir }}/scripts/Installers/Install-Mercurial.ps1", - "{{ template_dir }}/scripts/Installers/Install-Jq.ps1", "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1", - "{{ template_dir }}/scripts/Installers/Install-InnoSetup.ps1", - "{{ template_dir }}/scripts/Installers/Install-GitVersion.ps1", "{{ template_dir }}/scripts/Installers/Install-NSIS.ps1", "{{ template_dir }}/scripts/Installers/Install-CloudFoundryCli.ps1", "{{ template_dir }}/scripts/Installers/Install-Vcpkg.ps1", diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 5bec04255..73963e6b6 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -190,17 +190,13 @@ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-Nuget.ps1", "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", "{{ template_dir }}/scripts/Installers/Install-WDK.ps1", "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1", "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", - "{{ template_dir }}/scripts/Installers/Install-7zip.ps1", - "{{ template_dir }}/scripts/Installers/Install-Packer.ps1", - "{{ template_dir }}/scripts/Installers/Install-Pulumi.ps1", + "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1" ] }, @@ -242,24 +238,18 @@ { "type": "powershell", "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1", - "{{ template_dir }}/scripts/Installers/Install-Perl.ps1", "{{ template_dir }}/scripts/Installers/Install-Git.ps1", "{{ template_dir }}/scripts/Installers/Install-GitHub-CLI.ps1", "{{ template_dir }}/scripts/Installers/Install-PHP.ps1", "{{ template_dir }}/scripts/Installers/Install-Rust.ps1", - "{{ template_dir }}/scripts/Installers/Install-Julia.ps1", "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1", - "{{ template_dir }}/scripts/Installers/Install-Svn.ps1", "{{ template_dir }}/scripts/Installers/Install-Chrome.ps1", "{{ template_dir }}/scripts/Installers/Install-Edge.ps1", "{{ template_dir }}/scripts/Installers/Install-Firefox.ps1", "{{ template_dir }}/scripts/Installers/Install-Selenium.ps1", "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-Apache.ps1", - "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1", - "{{ template_dir }}/scripts/Installers/Install-Swig.ps1", - "{{ template_dir }}/scripts/Installers/Install-Bicep.ps1" + "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1" ] }, { @@ -285,9 +275,7 @@ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1", "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1", - "{{ template_dir }}/scripts/Installers/Install-Cmake.ps1", "{{ template_dir }}/scripts/Installers/Install-R.ps1", "{{ template_dir }}/scripts/Installers/Install-AWS.ps1", "{{ template_dir }}/scripts/Installers/Install-DACFx.ps1", @@ -301,10 +289,7 @@ "{{ template_dir }}/scripts/Installers/Install-Miniconda.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCosmosDbEmulator.ps1", "{{ template_dir }}/scripts/Installers/Install-Mercurial.ps1", - "{{ template_dir }}/scripts/Installers/Install-Jq.ps1", "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1", - "{{ template_dir }}/scripts/Installers/Install-InnoSetup.ps1", - "{{ template_dir }}/scripts/Installers/Install-GitVersion.ps1", "{{ template_dir }}/scripts/Installers/Install-NSIS.ps1", "{{ template_dir }}/scripts/Installers/Install-CloudFoundryCli.ps1", "{{ template_dir }}/scripts/Installers/Install-Vcpkg.ps1",