diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 6d5e8afa9..2b8194722 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -111,6 +111,7 @@ $toolsList = @( (Get-MercurialVersion), (Get-MinGWVersion), (Get-NewmanVersion), + (Get-NSISVersion), (Get-OpenSSLVersion), (Get-PackerVersion), (Get-PulumiVersion), @@ -125,7 +126,6 @@ $toolsList = @( ) if ((Test-IsWin16) -or (Test-IsWin19)) { $toolsList += @( - (Get-NSISVersion), (Get-GoogleCloudSDKVersion) ) } diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 3eb532258..5bf24fb51 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -117,7 +117,7 @@ Describe "NET48" { } } -Describe "NSIS" -Skip:(Test-IsWin22) { +Describe "NSIS" { It "NSIS" { "makensis /VERSION" | Should -ReturnZeroExitCode } diff --git a/images/win/windows2022.json b/images/win/windows2022.json index d35c0c637..69068512e 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -223,6 +223,7 @@ "{{ template_dir }}/scripts/Installers/Install-AzureCosmosDbEmulator.ps1", "{{ template_dir }}/scripts/Installers/Install-Mercurial.ps1", "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1", + "{{ template_dir }}/scripts/Installers/Install-NSIS.ps1", "{{ template_dir }}/scripts/Installers/Install-Vcpkg.ps1", "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1", "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1",