[Windows 19 & 22] Remove AzureRM and Azure powershell modules from wi…

…ndows images (#11548) * remove azure poswershell modules * Update helper scripts
actions · Mar 3, 2025 · f0e516b · f0e516b
1 parent a88fc4d
commit f0e516b
Showing 4 changed files with 1 addition and 50 deletions.
diff --git a/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1
@@ -235,14 +235,6 @@ $psTools.AddToolVersion("PowerShell", $(Get-PowershellCoreVersion))
 $psModules = $psTools.AddHeader("Powershell Modules")
 $psModules.AddNodes($(Get-PowerShellModules))
 
-$azPsNotes = @'
-Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed
-and are available via 'Get-Module -ListAvailable'.
-All other versions are saved but not installed.
-'@
-if (-not (Test-IsWin25)) {
-    $psModules.AddNote($azPsNotes)
-}
 
 # Android
 $android = $installedSoftware.AddHeader("Android")

diff --git a/images/windows/scripts/tests/Helpers.psm1 b/images/windows/scripts/tests/Helpers.psm1
@@ -191,8 +191,7 @@ function Get-ModuleVersionAsJob {
             $modulePath,
             $moduleName
         )
-        # Disable warning messages to prevent additional warnings about Az and Azurerm modules in the same session
-        $WarningPreference = "SilentlyContinue"
+        # No need to suppress AzureRM warnings now, only Az module is considered
         $env:PsModulePath = "$modulePath;$env:PsModulePath"
         Import-Module -Name $moduleName
         (Get-Module -Name $moduleName).Version.ToString()

diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json
@@ -93,26 +93,6 @@
         {"name": "AWSPowershell"}
     ],
     "azureModules": [
-        {
-            "name": "azurerm",
-            "versions": [
-                "6.13.1"
-            ],
-            "zip_versions": [
-                "6.7.0"
-            ],
-            "default": "6.13.1"
-        },
-        {
-            "name": "azure",
-            "versions": [
-                "5.3.0"
-            ],
-            "zip_versions": [
-                "5.1.1"
-            ],
-            "default": "5.3.0"
-        },
         {
             "name": "az",
             "versions": [

diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json
@@ -92,26 +92,6 @@
         {"name": "AWSPowershell"}
     ],
     "azureModules": [
-        {
-            "name": "azurerm",
-            "versions": [
-                "6.13.1"
-            ],
-            "zip_versions": [
-                "6.7.0"
-            ],
-            "default": "6.13.1"
-        },
-        {
-            "name": "azure",
-            "versions": [
-                "5.3.0"
-            ],
-            "zip_versions": [
-                "5.1.1"
-            ],
-            "default": "5.3.0"
-        },
         {
             "name": "az",
             "versions": [