From ddf7ca43281530fc204dc0556dac1b7da22347ef Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com>
Date: Mon, 27 Dec 2021 13:43:52 +0300
Subject: [PATCH] [Windows] Add Perl to windows-2022 (#4808)

* Add Perl to windows-2022 toolset

* Add missing tests and software report for perl
---
 .../win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 6 +-----
 images/win/scripts/Tests/ChocoPackages.Tests.ps1            | 2 +-
 images/win/toolsets/toolset-2022.json                       | 1 +
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index 0df5a6b0f..610e0e9a2 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -42,16 +42,12 @@ $languageTools = @(
     (Get-JuliaVersion),
     (Get-LLVMVersion),
     (Get-NodeVersion),
+    (Get-PerlVersion)
     (Get-PHPVersion),
     (Get-PythonVersion),
     (Get-RubyVersion),
     (Get-KotlinVersion)
 )
-if ((Test-IsWin16) -or (Test-IsWin19)) {
-    $languageTools += @(
-        (Get-PerlVersion)
-    )
-}
 $markdown += New-MDList -Style Unordered -Lines ($languageTools | Sort-Object)
 
 $packageManagementList = @(
diff --git a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 b/images/win/scripts/Tests/ChocoPackages.Tests.ps1
index 9debefdd3..1d30d7185 100644
--- a/images/win/scripts/Tests/ChocoPackages.Tests.ps1
+++ b/images/win/scripts/Tests/ChocoPackages.Tests.ps1
@@ -58,7 +58,7 @@ Describe "Packer" {
     }
 }
 
-Describe "Perl" -Skip:(Test-IsWin22) {
+Describe "Perl" {
     It "Perl" {
        "perl --version" | Should -ReturnZeroExitCode
     }
diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json
index 305171943..99e9edd1b 100644
--- a/images/win/toolsets/toolset-2022.json
+++ b/images/win/toolsets/toolset-2022.json
@@ -295,6 +295,7 @@
                 "args": [ "--version=1.1.1.20181020" ]
             },
             { "name": "packer" },
+            { "name": "strawberryperl" },
             { "name": "pulumi" },
             { "name": "tortoisesvn" },
             { "name": "swig" },