Skip to content

Commit f0e516b

Browse files
[Windows 19 & 22] Remove AzureRM and Azure powershell modules from windows images (actions#11548)
* remove azure poswershell modules * Update helper scripts
1 parent a88fc4d commit f0e516b

4 files changed

Lines changed: 1 addition & 50 deletions

File tree

images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -235,14 +235,6 @@ $psTools.AddToolVersion("PowerShell", $(Get-PowershellCoreVersion))
235235
$psModules = $psTools.AddHeader("Powershell Modules")
236236
$psModules.AddNodes($(Get-PowerShellModules))
237237

238-
$azPsNotes = @'
239-
Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed
240-
and are available via 'Get-Module -ListAvailable'.
241-
All other versions are saved but not installed.
242-
'@
243-
if (-not (Test-IsWin25)) {
244-
$psModules.AddNote($azPsNotes)
245-
}
246238

247239
# Android
248240
$android = $installedSoftware.AddHeader("Android")

images/windows/scripts/tests/Helpers.psm1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,7 @@ function Get-ModuleVersionAsJob {
191191
$modulePath,
192192
$moduleName
193193
)
194-
# Disable warning messages to prevent additional warnings about Az and Azurerm modules in the same session
195-
$WarningPreference = "SilentlyContinue"
194+
# No need to suppress AzureRM warnings now, only Az module is considered
196195
$env:PsModulePath = "$modulePath;$env:PsModulePath"
197196
Import-Module -Name $moduleName
198197
(Get-Module -Name $moduleName).Version.ToString()

images/windows/toolsets/toolset-2019.json

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -93,26 +93,6 @@
9393
{"name": "AWSPowershell"}
9494
],
9595
"azureModules": [
96-
{
97-
"name": "azurerm",
98-
"versions": [
99-
"6.13.1"
100-
],
101-
"zip_versions": [
102-
"6.7.0"
103-
],
104-
"default": "6.13.1"
105-
},
106-
{
107-
"name": "azure",
108-
"versions": [
109-
"5.3.0"
110-
],
111-
"zip_versions": [
112-
"5.1.1"
113-
],
114-
"default": "5.3.0"
115-
},
11696
{
11797
"name": "az",
11898
"versions": [

images/windows/toolsets/toolset-2022.json

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -92,26 +92,6 @@
9292
{"name": "AWSPowershell"}
9393
],
9494
"azureModules": [
95-
{
96-
"name": "azurerm",
97-
"versions": [
98-
"6.13.1"
99-
],
100-
"zip_versions": [
101-
"6.7.0"
102-
],
103-
"default": "6.13.1"
104-
},
105-
{
106-
"name": "azure",
107-
"versions": [
108-
"5.3.0"
109-
],
110-
"zip_versions": [
111-
"5.1.1"
112-
],
113-
"default": "5.3.0"
114-
},
11595
{
11696
"name": "az",
11797
"versions": [

0 commit comments

Comments
 (0)