Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Windows 19 & 22] Remove AzureRM and Azure powershell modules from windows images #11548

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[Windows 19 & 22] Remove AzureRM and Azure powershell modules from windows images #11548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8d413b
remove azure poswershell modules
kishorekumar-anchala Feb 5, 2025
0ded6e9
Update helper scripts
kishorekumar-anchala Feb 6, 2025
d424127
Update the branch with the latest code
kishorekumar-anchala Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 1 addition & 2 deletions images/windows/scripts/tests/Helpers.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
20 changes: 0 additions & 20 deletions images/windows/toolsets/toolset-2019.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
20 changes: 0 additions & 20 deletions images/windows/toolsets/toolset-2022.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down