From 7f10a5a590b81073d5d631797a4ed9df28803582 Mon Sep 17 00:00:00 2001
From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com>
Date: Fri, 16 Sep 2022 10:23:13 +0200
Subject: [PATCH] [Windows] Add ImageMagick tool (#6247)

* Add ImageMagick tool

* Add ImageMagick tool
---
 .../win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 3 ++-
 images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 6 ++++++
 images/win/scripts/Tests/ChocoPackages.Tests.ps1            | 6 ++++++
 images/win/toolsets/toolset-2019.json                       | 3 ++-
 images/win/toolsets/toolset-2022.json                       | 3 ++-
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index d659ac7b3..2decc97cf 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -119,7 +119,8 @@ $toolsList = @(
     (Get-WinAppDriver),
     (Get-WixVersion),
     (Get-ZstdVersion),
-    (Get-YAMLLintVersion)
+    (Get-YAMLLintVersion),
+    (Get-ImageMagickVersion)
 )
 if (Test-IsWin19) {
     $toolsList += @(
diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
index e85b328fe..1f553d110 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
@@ -307,3 +307,9 @@ function Get-SwigVersion {
     $swigVersion = $Matches.Version
     return "Swig $swigVersion"
 }
+
+function Get-ImageMagickVersion {
+    (magick -version | Select-String -Pattern "Version") -match "(?<version>\d+\.\d+\.\d+-\d+)" | Out-Null
+    $magickVersion = $Matches.Version
+    return "ImageMagick $magickVersion"
+}
diff --git a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 b/images/win/scripts/Tests/ChocoPackages.Tests.ps1
index 949f29ef7..b6a168284 100644
--- a/images/win/scripts/Tests/ChocoPackages.Tests.ps1
+++ b/images/win/scripts/Tests/ChocoPackages.Tests.ps1
@@ -102,4 +102,10 @@ Describe "CMake" {
     It "cmake" {
         "cmake --version" | Should -ReturnZeroExitCode
     }
+}
+
+Describe "ImageMagick" {
+    It "ImageMagick" {
+        "magick -version" | Should -ReturnZeroExitCode
+    }
 }
\ No newline at end of file
diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json
index a29fdc050..56e6a73ef 100644
--- a/images/win/toolsets/toolset-2019.json
+++ b/images/win/toolsets/toolset-2019.json
@@ -461,7 +461,8 @@
             {
                 "name": "cmake.install",
                 "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ]
-            }
+            },
+            { "name": "imagemagick" }
         ]
     },
     "node": {
diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json
index fbac8fbb0..eb0839bcb 100644
--- a/images/win/toolsets/toolset-2022.json
+++ b/images/win/toolsets/toolset-2022.json
@@ -375,7 +375,8 @@
             {
                 "name": "cmake.install",
                 "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ]
-            }
+            },
+            { "name": "imagemagick" }
         ]
     },
     "node": {