Skip to content

Commit decd71e

Browse files
BethanyZhouBethanyZhou
authored
Fix issues for AzPreview and update description of Az.psd1 (#15052)
1 parent e3a2249 commit decd71e

File tree

5 files changed

+32
-27
lines changed

5 files changed

+32
-27
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ launchSettings.json
226226
/ModuleMappings.json
227227
/tools/Modules/tmp
228228
/tools/Az/Az.psm1
229+
/tools/AzPreview/AzPreview.psm1
229230
/Azure.PowerShell.sln
230231

231232
# Added due to scan

‎tools/Az/Az.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ CompanyName = 'Microsoft Corporation'
3030
Copyright = 'Microsoft Corporation. All rights reserved.'
3131

3232
# Description of the functionality provided by this module
33-
Description = 'Microsoft Azure PowerShell - Cmdlets to manage resources in Azure. This module is compatible with WindowsPowerShell and PowerShell Core.
34-
For more information about the Az module, please visit the following: https://docs.microsoft.com/en-us/powershell/azure/'
33+
Description = 'Microsoft Azure PowerShell - Cmdlets to manage resources in Azure. This module is compatible with PowerShell and Windows PowerShell.
34+
For more information about the Az module, please visit the following: https://docs.microsoft.com/powershell/azure/'
3535

3636
# Minimum version of the PowerShell engine required by this module
3737
PowerShellVersion = '5.1'

‎tools/AzPreview/AzPreview.psd1.template renamed to ‎tools/AzPreview.psd1.template

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ CompanyName = 'Microsoft Corporation'
3030
Copyright = 'Microsoft Corporation. All rights reserved.'
3131

3232
# Description of the functionality provided by this module
33-
Description = 'Microsoft Azure PowerShell - Including stable version and preview version of Azure PowerShell modules. This module is compatible with WindowsPowerShell and PowerShell Core.
34-
For more information about the AzPreview module, please visit the following: https://docs.microsoft.com/en-us/powershell/azure/'
33+
Description = 'Microsoft Azure PowerShell - Including stable version and preview version of Azure PowerShell modules. This module is compatible with PowerShell and Windows PowerShell.
34+
For more information about the AzPreview module, please visit the following: https://docs.microsoft.com/powershell/azure/'
3535

3636
# Minimum version of the PowerShell engine required by this module
3737
PowerShellVersion = '5.1'
@@ -108,7 +108,7 @@ PrivateData = @{
108108
# IconUri = ''
109109

110110
# ReleaseNotes of this module
111-
ReleaseNotes = ''
111+
ReleaseNotes = 'https://aka.ms/azpspreview'
112112

113113
# Prerelease string of this module
114114
# Prerelease = ''

‎tools/AzPreview/AzPreview.psd1

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ CompanyName = 'Microsoft Corporation'
3030
Copyright = 'Microsoft Corporation. All rights reserved.'
3131

3232
# Description of the functionality provided by this module
33-
Description = 'Microsoft Azure PowerShell - Cmdlets to manage resources in Azure. This module is compatible with WindowsPowerShell and PowerShell Core.
34-
For more information about the Az module, please visit the following: https://docs.microsoft.com/en-us/powershell/azure/'
33+
Description = 'Microsoft Azure PowerShell - Including stable version and preview version of Azure PowerShell modules. This module is compatible with PowerShell and Windows PowerShell.
34+
For more information about the AzPreview module, please visit the following: https://docs.microsoft.com/powershell/azure/'
3535

3636
# Minimum version of the PowerShell engine required by this module
3737
PowerShellVersion = '5.1'
@@ -52,7 +52,7 @@ DotNetFrameworkVersion = '4.7.2'
5252
# ProcessorArchitecture = ''
5353

5454
# Modules that must be imported into the global environment prior to importing this module
55-
RequiredModules = @(@{ModuleName = 'Az.Accounts'; RequiredVersion = '2.3.0'; },
55+
RequiredModules = @(@{ModuleName = 'Az.Accounts'; RequiredVersion = '2.2.8'; },
5656
@{ModuleName = 'Az.ADDomainServices'; RequiredVersion = '0.1.0'; },
5757
@{ModuleName = 'Az.Advisor'; RequiredVersion = '1.1.1'; },
5858
@{ModuleName = 'Az.Aks'; RequiredVersion = '2.1.0'; },
@@ -72,13 +72,13 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; RequiredVersion = '2.3.0'; },
7272
@{ModuleName = 'Az.CloudService'; RequiredVersion = '0.3.0'; },
7373
@{ModuleName = 'Az.CognitiveServices'; RequiredVersion = '1.8.0'; },
7474
@{ModuleName = 'Az.Communication'; RequiredVersion = '0.1.0'; },
75-
@{ModuleName = 'Az.Compute'; RequiredVersion = '4.13.0'; },
75+
@{ModuleName = 'Az.Compute'; RequiredVersion = '4.12.0'; },
7676
@{ModuleName = 'Az.Confluent'; RequiredVersion = '0.1.0'; },
7777
@{ModuleName = 'Az.ConnectedKubernetes'; RequiredVersion = '0.2.0'; },
7878
@{ModuleName = 'Az.ConnectedMachine'; RequiredVersion = '0.2.0'; },
79-
@{ModuleName = 'Az.ContainerInstance'; RequiredVersion = '1.0.3'; },
80-
@{ModuleName = 'Az.ContainerRegistry'; RequiredVersion = '2.2.3'; },
81-
@{ModuleName = 'Az.CosmosDB'; RequiredVersion = '1.2.0'; },
79+
@{ModuleName = 'Az.ContainerInstance'; RequiredVersion = '1.1.0'; },
80+
@{ModuleName = 'Az.ContainerRegistry'; RequiredVersion = '2.2.2'; },
81+
@{ModuleName = 'Az.CosmosDB'; RequiredVersion = '1.1.0'; },
8282
@{ModuleName = 'Az.CostManagement'; RequiredVersion = '0.2.0'; },
8383
@{ModuleName = 'Az.CustomProviders'; RequiredVersion = '0.1.0'; },
8484
@{ModuleName = 'Az.DataBox'; RequiredVersion = '0.1.1'; },
@@ -101,7 +101,7 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; RequiredVersion = '2.3.0'; },
101101
@{ModuleName = 'Az.EventGrid'; RequiredVersion = '1.3.0'; },
102102
@{ModuleName = 'Az.EventHub'; RequiredVersion = '1.7.2'; },
103103
@{ModuleName = 'Az.FrontDoor'; RequiredVersion = '1.8.0'; },
104-
@{ModuleName = 'Az.Functions'; RequiredVersion = '2.0.0'; },
104+
@{ModuleName = 'Az.Functions'; RequiredVersion = '2.1.0'; },
105105
@{ModuleName = 'Az.GuestConfiguration'; RequiredVersion = '0.10.8'; },
106106
@{ModuleName = 'Az.HanaOnAzure'; RequiredVersion = '0.3.0'; },
107107
@{ModuleName = 'Az.HDInsight'; RequiredVersion = '4.2.1'; },
@@ -113,11 +113,11 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; RequiredVersion = '2.3.0'; },
113113
@{ModuleName = 'Az.IotCentral'; RequiredVersion = '0.9.0'; },
114114
@{ModuleName = 'Az.IotHub'; RequiredVersion = '2.7.3'; },
115115
@{ModuleName = 'Az.KeyVault'; RequiredVersion = '3.4.3'; },
116-
@{ModuleName = 'Az.KubernetesConfiguration'; RequiredVersion = '0.3.0'; },
116+
@{ModuleName = 'Az.KubernetesConfiguration'; RequiredVersion = '0.4.0'; },
117117
@{ModuleName = 'Az.Kusto'; RequiredVersion = '1.0.1'; },
118118
@{ModuleName = 'Az.LogicApp'; RequiredVersion = '1.5.0'; },
119119
@{ModuleName = 'Az.MachineLearning'; RequiredVersion = '1.1.3'; },
120-
@{ModuleName = 'Az.Maintenance'; RequiredVersion = '1.1.1'; },
120+
@{ModuleName = 'Az.Maintenance'; RequiredVersion = '1.1.0'; },
121121
@{ModuleName = 'Az.ManagedServiceIdentity'; RequiredVersion = '0.7.3'; },
122122
@{ModuleName = 'Az.ManagedServices'; RequiredVersion = '2.0.0'; },
123123
@{ModuleName = 'Az.ManagementPartner'; RequiredVersion = '0.7.2'; },
@@ -132,7 +132,7 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; RequiredVersion = '2.3.0'; },
132132
@{ModuleName = 'Az.MonitoringSolutions'; RequiredVersion = '0.1.0'; },
133133
@{ModuleName = 'Az.MySql'; RequiredVersion = '0.6.0'; },
134134
@{ModuleName = 'Az.NetAppFiles'; RequiredVersion = '0.5.0'; },
135-
@{ModuleName = 'Az.Network'; RequiredVersion = '4.8.0'; },
135+
@{ModuleName = 'Az.Network'; RequiredVersion = '4.7.0'; },
136136
@{ModuleName = 'Az.NotificationHubs'; RequiredVersion = '1.1.1'; },
137137
@{ModuleName = 'Az.OperationalInsights'; RequiredVersion = '2.3.0'; },
138138
@{ModuleName = 'Az.Peering'; RequiredVersion = '0.3.0'; },
@@ -142,28 +142,28 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; RequiredVersion = '2.3.0'; },
142142
@{ModuleName = 'Az.PowerBIEmbedded'; RequiredVersion = '1.1.2'; },
143143
@{ModuleName = 'Az.PrivateDns'; RequiredVersion = '1.0.3'; },
144144
@{ModuleName = 'Az.ProviderHub'; RequiredVersion = '0.1.0'; },
145-
@{ModuleName = 'Az.RecoveryServices'; RequiredVersion = '3.7.0'; },
145+
@{ModuleName = 'Az.RecoveryServices'; RequiredVersion = '3.6.0'; },
146146
@{ModuleName = 'Az.RedisCache'; RequiredVersion = '1.4.0'; },
147147
@{ModuleName = 'Az.RedisEnterpriseCache'; RequiredVersion = '1.0.0'; },
148148
@{ModuleName = 'Az.Relay'; RequiredVersion = '1.0.3'; },
149149
@{ModuleName = 'Az.Reservations'; RequiredVersion = '0.9.0'; },
150150
@{ModuleName = 'Az.ResourceGraph'; RequiredVersion = '0.10.0'; },
151151
@{ModuleName = 'Az.ResourceMover'; RequiredVersion = '1.0.0'; },
152-
@{ModuleName = 'Az.Resources'; RequiredVersion = '3.6.0'; },
152+
@{ModuleName = 'Az.Resources'; RequiredVersion = '3.5.0'; },
153153
@{ModuleName = 'Az.Search'; RequiredVersion = '0.8.0'; },
154154
@{ModuleName = 'Az.Security'; RequiredVersion = '0.11.0'; },
155-
@{ModuleName = 'Az.SecurityInsights'; RequiredVersion = '1.0.0'; },
155+
@{ModuleName = 'Az.SecurityInsights'; RequiredVersion = '0.2.0'; },
156156
@{ModuleName = 'Az.ServiceBus'; RequiredVersion = '1.5.0'; },
157-
@{ModuleName = 'Az.ServiceFabric'; RequiredVersion = '2.5.0'; },
157+
@{ModuleName = 'Az.ServiceFabric'; RequiredVersion = '2.4.0'; },
158158
@{ModuleName = 'Az.SignalR'; RequiredVersion = '1.2.0'; },
159159
@{ModuleName = 'Az.SpringCloud'; RequiredVersion = '0.2.0'; },
160-
@{ModuleName = 'Az.Sql'; RequiredVersion = '2.18.0'; },
160+
@{ModuleName = 'Az.Sql'; RequiredVersion = '2.17.1'; },
161161
@{ModuleName = 'Az.SqlVirtualMachine'; RequiredVersion = '1.1.0'; },
162162
@{ModuleName = 'Az.StackEdge'; RequiredVersion = '0.1.0'; },
163-
@{ModuleName = 'Az.StackHCI'; RequiredVersion = '0.5.0'; },
163+
@{ModuleName = 'Az.StackHCI'; RequiredVersion = '0.6.0'; },
164164
@{ModuleName = 'Az.Storage'; RequiredVersion = '3.6.0'; },
165-
@{ModuleName = 'Az.StorageSync'; RequiredVersion = '1.5.0'; },
166-
@{ModuleName = 'Az.StreamAnalytics'; RequiredVersion = '2.2.0'; },
165+
@{ModuleName = 'Az.StorageSync'; RequiredVersion = '1.4.0'; },
166+
@{ModuleName = 'Az.StreamAnalytics'; RequiredVersion = '2.0.0'; },
167167
@{ModuleName = 'Az.Subscription'; RequiredVersion = '0.8.0'; },
168168
@{ModuleName = 'Az.Support'; RequiredVersion = '1.0.0'; },
169169
@{ModuleName = 'Az.Synapse'; RequiredVersion = '0.11.0'; },
@@ -227,7 +227,7 @@ PrivateData = @{
227227
# IconUri = ''
228228

229229
# ReleaseNotes of this module
230-
ReleaseNotes = ''
230+
ReleaseNotes = 'https://aka.ms/azpspreview'
231231

232232
# Prerelease string of this module
233233
# Prerelease = ''

‎tools/RunVersionController.ps1

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,11 @@ function Get-ReleaseNotes
146146
$_.FullName -notlike "*Netcore*" -and `
147147
$_.FullName -notlike "*dll-Help.psd1*" -and `
148148
(-not [Tools.Common.Utilities.ModuleFilter]::IsAzureStackModule($_.FullName)) } }
149-
149+
150+
if($ModuleManifestFile.Count -gt 1)
151+
{
152+
$ModuleManifestFile = $ModuleManifestFile[0]
153+
}
150154
Import-LocalizedData -BindingVariable ModuleMetadata -BaseDirectory $ModuleManifestFile.DirectoryName -FileName $ModuleManifestFile.Name
151155
return $ModuleMetadata.PrivateData.PSData.ReleaseNotes
152156
}
@@ -291,7 +295,7 @@ function Generate-AzPreview
291295
$requiredModulesString = $requiredModulesString.Trim()
292296
$requiredModulesString = $requiredModulesString.TrimEnd(",")
293297

294-
$AzPrviewTemplate = Get-Item -Path "$PSScriptRoot\AzPreview\AzPreview.psd1.template"
298+
$AzPrviewTemplate = Get-Item -Path "$PSScriptRoot\AzPreview.psd1.template"
295299
$AzPrviewTemplateContent = Get-Content -Path $AzPrviewTemplate.FullName
296300
$AzPreviewPsd1Content = $AzPrviewTemplateContent | % {
297301
$_ -replace "ModuleVersion = 'x.x.x'", "ModuleVersion = '$AzPrviewVersion'"

0 commit comments

Comments
 (0)