From a914ed2f95e6d1f585fedee2a011c0d6052bb3d6 Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com>
Date: Tue, 13 Jul 2021 10:41:55 +0300
Subject: [PATCH] [Windows] Fix image generation error related to zipped az
 modules (#3720)

---
 images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1
index d8a6c1032..7b612a26b 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1
@@ -230,7 +230,7 @@ function Get-PowerShellAzureModules {
     $modulesPath = "C:\Modules"
     $modules = Get-ChildItem -Path $modulesPath | Sort-Object Name |  Group-Object {$_.Name.Split('_')[0]}
     $modules | ForEach-Object {
-        $group = $_.group | Sort-Object {[Version]$_.Name.Split('_')[1]}
+        $group = $_.group | Sort-Object {[Version]$_.Name.Split('_')[1].Replace(".zip","")}
         $moduleName = $names[$_.Name]
         $moduleVersions = $group | ForEach-Object {$_.Name.Split('_')[1]}
         $moduleVersions = $moduleVersions -join '<br>'