From ff37068951591328f151559a696fcddca12aaad4 Mon Sep 17 00:00:00 2001 From: Andrew King <4885461+andrew-r-king@users.noreply.github.com> Date: Thu, 16 Dec 2021 02:57:04 -0500 Subject: [PATCH] Update Install-NSIS.ps1 (#4740) * Update Install-NSIS.ps1 Update NSIS to 3.08 See notes in #4739 * use in Install-NSIS.ps1, added nsis to toolset files --- images/win/scripts/Installers/Install-NSIS.ps1 | 5 +++-- images/win/toolsets/toolset-2016.json | 3 +++ images/win/toolsets/toolset-2019.json | 3 +++ images/win/toolsets/toolset-2022.json | 3 +++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-NSIS.ps1 b/images/win/scripts/Installers/Install-NSIS.ps1 index 47165ef14..49a58fc52 100644 --- a/images/win/scripts/Installers/Install-NSIS.ps1 +++ b/images/win/scripts/Installers/Install-NSIS.ps1 @@ -3,10 +3,11 @@ ## Desc: Install NSIS ################################################################################ -Install-Binary -Url 'https://downloads.sourceforge.net/project/nsis/NSIS%203/3.06.1/nsis-3.06.1-setup.exe' -Name nsis-3.06.1-setup.exe -ArgumentList ('/S') +$NsisVersion = (Get-ToolsetContent).nsis.version +Install-Binary -Url "https://downloads.sourceforge.net/project/nsis/NSIS%203/${NsisVersion}/nsis-${NsisVersion}-setup.exe" -Name "nsis-${NsisVersion}-setup.exe" -ArgumentList ('/S') $NsisPath = "${env:ProgramFiles(x86)}\NSIS\" Add-MachinePathItem $NsisPath $env:Path = Get-MachinePath -Invoke-PesterTests -TestFile "Tools" -TestName "NSIS" \ No newline at end of file +Invoke-PesterTests -TestFile "Tools" -TestName "NSIS" diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 28981b3d8..83259ed94 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -427,6 +427,9 @@ "mongodb": { "version": "5.0" }, + "nsis": { + "version": "3.08" + }, "php": { "version": "8.1" }, diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 51fc9bc13..c7d19fe1a 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -459,6 +459,9 @@ "mongodb": { "version": "5.0" }, + "nsis": { + "version": "3.08" + }, "php": { "version": "8.1" }, diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 2e6151a44..124cb77b8 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -317,6 +317,9 @@ "mongodb": { "version": "5.0" }, + "nsis": { + "version": "3.08" + }, "php": { "version": "8.1" },