diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 610e0e9a2..1e0d7abf4 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -110,6 +110,7 @@ $toolsList = @( (Get-PackerVersion), (Get-PulumiVersion), (Get-RVersion), + (Get-ServiceFabricSDKVersion), (Get-StackVersion), (Get-SVNVersion), (Get-VSWhereVersion), @@ -122,8 +123,7 @@ $toolsList = @( if ((Test-IsWin16) -or (Test-IsWin19)) { $toolsList += @( (Get-GoogleCloudSDKVersion), - (Get-ParcelVersion), - (Get-ServiceFabricSDKVersion) + (Get-ParcelVersion) ) } $markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object) diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 27ba0da89..1773a4fb3 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -130,7 +130,7 @@ Describe "Sbt" { } } -Describe "ServiceFabricSDK" -Skip:(Test-IsWin22) { +Describe "ServiceFabricSDK" { It "PowerShell Module" { Get-Module -Name ServiceFabric -ListAvailable | Should -Not -BeNullOrEmpty } @@ -176,7 +176,7 @@ Describe "VCRedist" -Skip:(Test-IsWin22) { } } -Describe "WebPlatformInstaller" -Skip:(Test-IsWin22) { +Describe "WebPlatformInstaller" { It "WebPlatformInstaller" { "WebPICMD" | Should -ReturnZeroExitCode } diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 8e0346203..d38ce154c 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -147,7 +147,8 @@ "type": "powershell", "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", - "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1" + "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1", + "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" ] }, { @@ -180,6 +181,13 @@ "{{ template_dir }}/scripts/Installers/Install-Kotlin.ps1" ] }, + { + "type": "powershell", + "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1" + ], + "execution_policy": "remotesigned" + }, { "type": "windows-restart", "restart_timeout": "10m"