Fix issues for AzPreview and update description of Az.psd1 (#15052)

Azure · May 20, 2021 · decd71e · decd71e
1 parent e3a2249
commit decd71e
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -226,6 +226,7 @@ launchSettings.json
 /ModuleMappings.json
 /tools/Modules/tmp
 /tools/Az/Az.psm1
+/tools/AzPreview/AzPreview.psm1
 /Azure.PowerShell.sln
 
 # Added due to scan

diff --git a/tools/Az/Az.psd1 b/tools/Az/Az.psd1
@@ -30,8 +30,8 @@ CompanyName = 'Microsoft Corporation'
 Copyright = 'Microsoft Corporation. All rights reserved.'
 
 # Description of the functionality provided by this module
-Description = 'Microsoft Azure PowerShell - Cmdlets to manage resources in Azure. This module is compatible with WindowsPowerShell and PowerShell Core.
-For more information about the Az module, please visit the following: https://docs.microsoft.com/en-us/powershell/azure/'
+Description = 'Microsoft Azure PowerShell - Cmdlets to manage resources in Azure. This module is compatible with PowerShell and Windows PowerShell.
+For more information about the Az module, please visit the following: https://docs.microsoft.com/powershell/azure/'
 
 # Minimum version of the PowerShell engine required by this module
 PowerShellVersion = '5.1'

diff --git a/tools/AzPreview/AzPreview.psd1.template → tools/AzPreview.psd1.template b/tools/AzPreview/AzPreview.psd1.template → tools/AzPreview.psd1.template
@@ -30,8 +30,8 @@ CompanyName = 'Microsoft Corporation'
 Copyright = 'Microsoft Corporation. All rights reserved.'
 
 # Description of the functionality provided by this module
-Description = 'Microsoft Azure PowerShell - Including stable version and preview version of Azure PowerShell modules. This module is compatible with WindowsPowerShell and PowerShell Core.
-For more information about the AzPreview module, please visit the following: https://docs.microsoft.com/en-us/powershell/azure/'
+Description = 'Microsoft Azure PowerShell - Including stable version and preview version of Azure PowerShell modules. This module is compatible with PowerShell and Windows PowerShell.
+For more information about the AzPreview module, please visit the following: https://docs.microsoft.com/powershell/azure/'
 
 # Minimum version of the PowerShell engine required by this module
 PowerShellVersion = '5.1'
@@ -108,7 +108,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = ''
+        ReleaseNotes = 'https://aka.ms/azpspreview'
 
         # Prerelease string of this module
         # Prerelease = ''

diff --git a/tools/AzPreview/AzPreview.psd1 b/tools/AzPreview/AzPreview.psd1
@@ -30,8 +30,8 @@ CompanyName = 'Microsoft Corporation'
 Copyright = 'Microsoft Corporation. All rights reserved.'
 
 # Description of the functionality provided by this module
-Description = 'Microsoft Azure PowerShell - Cmdlets to manage resources in Azure. This module is compatible with WindowsPowerShell and PowerShell Core.
-For more information about the Az module, please visit the following: https://docs.microsoft.com/en-us/powershell/azure/'
+Description = 'Microsoft Azure PowerShell - Including stable version and preview version of Azure PowerShell modules. This module is compatible with PowerShell and Windows PowerShell.
+For more information about the AzPreview module, please visit the following: https://docs.microsoft.com/powershell/azure/'
 
 # Minimum version of the PowerShell engine required by this module
 PowerShellVersion = '5.1'
@@ -52,7 +52,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; RequiredVersion = '2.3.0'; }, 
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; RequiredVersion = '2.2.8'; }, 
             @{ModuleName = 'Az.ADDomainServices'; RequiredVersion = '0.1.0'; }, 
             @{ModuleName = 'Az.Advisor'; RequiredVersion = '1.1.1'; }, 
             @{ModuleName = 'Az.Aks'; RequiredVersion = '2.1.0'; }, 
@@ -72,13 +72,13 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; RequiredVersion = '2.3.0'; },
             @{ModuleName = 'Az.CloudService'; RequiredVersion = '0.3.0'; }, 
             @{ModuleName = 'Az.CognitiveServices'; RequiredVersion = '1.8.0'; }, 
             @{ModuleName = 'Az.Communication'; RequiredVersion = '0.1.0'; }, 
-            @{ModuleName = 'Az.Compute'; RequiredVersion = '4.13.0'; }, 
+            @{ModuleName = 'Az.Compute'; RequiredVersion = '4.12.0'; }, 
             @{ModuleName = 'Az.Confluent'; RequiredVersion = '0.1.0'; }, 
             @{ModuleName = 'Az.ConnectedKubernetes'; RequiredVersion = '0.2.0'; }, 
             @{ModuleName = 'Az.ConnectedMachine'; RequiredVersion = '0.2.0'; }, 
-            @{ModuleName = 'Az.ContainerInstance'; RequiredVersion = '1.0.3'; }, 
-            @{ModuleName = 'Az.ContainerRegistry'; RequiredVersion = '2.2.3'; }, 
-            @{ModuleName = 'Az.CosmosDB'; RequiredVersion = '1.2.0'; }, 
+            @{ModuleName = 'Az.ContainerInstance'; RequiredVersion = '1.1.0'; }, 
+            @{ModuleName = 'Az.ContainerRegistry'; RequiredVersion = '2.2.2'; }, 
+            @{ModuleName = 'Az.CosmosDB'; RequiredVersion = '1.1.0'; }, 
             @{ModuleName = 'Az.CostManagement'; RequiredVersion = '0.2.0'; }, 
             @{ModuleName = 'Az.CustomProviders'; RequiredVersion = '0.1.0'; }, 
             @{ModuleName = 'Az.DataBox'; RequiredVersion = '0.1.1'; }, 
@@ -101,7 +101,7 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; RequiredVersion = '2.3.0'; },
             @{ModuleName = 'Az.EventGrid'; RequiredVersion = '1.3.0'; }, 
             @{ModuleName = 'Az.EventHub'; RequiredVersion = '1.7.2'; }, 
             @{ModuleName = 'Az.FrontDoor'; RequiredVersion = '1.8.0'; }, 
-            @{ModuleName = 'Az.Functions'; RequiredVersion = '2.0.0'; }, 
+            @{ModuleName = 'Az.Functions'; RequiredVersion = '2.1.0'; }, 
             @{ModuleName = 'Az.GuestConfiguration'; RequiredVersion = '0.10.8'; }, 
             @{ModuleName = 'Az.HanaOnAzure'; RequiredVersion = '0.3.0'; }, 
             @{ModuleName = 'Az.HDInsight'; RequiredVersion = '4.2.1'; }, 
@@ -113,11 +113,11 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; RequiredVersion = '2.3.0'; },
             @{ModuleName = 'Az.IotCentral'; RequiredVersion = '0.9.0'; }, 
             @{ModuleName = 'Az.IotHub'; RequiredVersion = '2.7.3'; }, 
             @{ModuleName = 'Az.KeyVault'; RequiredVersion = '3.4.3'; }, 
-            @{ModuleName = 'Az.KubernetesConfiguration'; RequiredVersion = '0.3.0'; }, 
+            @{ModuleName = 'Az.KubernetesConfiguration'; RequiredVersion = '0.4.0'; }, 
             @{ModuleName = 'Az.Kusto'; RequiredVersion = '1.0.1'; }, 
             @{ModuleName = 'Az.LogicApp'; RequiredVersion = '1.5.0'; }, 
             @{ModuleName = 'Az.MachineLearning'; RequiredVersion = '1.1.3'; }, 
-            @{ModuleName = 'Az.Maintenance'; RequiredVersion = '1.1.1'; }, 
+            @{ModuleName = 'Az.Maintenance'; RequiredVersion = '1.1.0'; }, 
             @{ModuleName = 'Az.ManagedServiceIdentity'; RequiredVersion = '0.7.3'; }, 
             @{ModuleName = 'Az.ManagedServices'; RequiredVersion = '2.0.0'; }, 
             @{ModuleName = 'Az.ManagementPartner'; RequiredVersion = '0.7.2'; }, 
@@ -132,7 +132,7 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; RequiredVersion = '2.3.0'; },
             @{ModuleName = 'Az.MonitoringSolutions'; RequiredVersion = '0.1.0'; }, 
             @{ModuleName = 'Az.MySql'; RequiredVersion = '0.6.0'; }, 
             @{ModuleName = 'Az.NetAppFiles'; RequiredVersion = '0.5.0'; }, 
-            @{ModuleName = 'Az.Network'; RequiredVersion = '4.8.0'; }, 
+            @{ModuleName = 'Az.Network'; RequiredVersion = '4.7.0'; }, 
             @{ModuleName = 'Az.NotificationHubs'; RequiredVersion = '1.1.1'; }, 
             @{ModuleName = 'Az.OperationalInsights'; RequiredVersion = '2.3.0'; }, 
             @{ModuleName = 'Az.Peering'; RequiredVersion = '0.3.0'; }, 
@@ -142,28 +142,28 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; RequiredVersion = '2.3.0'; },
             @{ModuleName = 'Az.PowerBIEmbedded'; RequiredVersion = '1.1.2'; }, 
             @{ModuleName = 'Az.PrivateDns'; RequiredVersion = '1.0.3'; }, 
             @{ModuleName = 'Az.ProviderHub'; RequiredVersion = '0.1.0'; }, 
-            @{ModuleName = 'Az.RecoveryServices'; RequiredVersion = '3.7.0'; }, 
+            @{ModuleName = 'Az.RecoveryServices'; RequiredVersion = '3.6.0'; }, 
             @{ModuleName = 'Az.RedisCache'; RequiredVersion = '1.4.0'; }, 
             @{ModuleName = 'Az.RedisEnterpriseCache'; RequiredVersion = '1.0.0'; }, 
             @{ModuleName = 'Az.Relay'; RequiredVersion = '1.0.3'; }, 
             @{ModuleName = 'Az.Reservations'; RequiredVersion = '0.9.0'; }, 
             @{ModuleName = 'Az.ResourceGraph'; RequiredVersion = '0.10.0'; }, 
             @{ModuleName = 'Az.ResourceMover'; RequiredVersion = '1.0.0'; }, 
-            @{ModuleName = 'Az.Resources'; RequiredVersion = '3.6.0'; }, 
+            @{ModuleName = 'Az.Resources'; RequiredVersion = '3.5.0'; }, 
             @{ModuleName = 'Az.Search'; RequiredVersion = '0.8.0'; }, 
             @{ModuleName = 'Az.Security'; RequiredVersion = '0.11.0'; }, 
-            @{ModuleName = 'Az.SecurityInsights'; RequiredVersion = '1.0.0'; }, 
+            @{ModuleName = 'Az.SecurityInsights'; RequiredVersion = '0.2.0'; }, 
             @{ModuleName = 'Az.ServiceBus'; RequiredVersion = '1.5.0'; }, 
-            @{ModuleName = 'Az.ServiceFabric'; RequiredVersion = '2.5.0'; }, 
+            @{ModuleName = 'Az.ServiceFabric'; RequiredVersion = '2.4.0'; }, 
             @{ModuleName = 'Az.SignalR'; RequiredVersion = '1.2.0'; }, 
             @{ModuleName = 'Az.SpringCloud'; RequiredVersion = '0.2.0'; }, 
-            @{ModuleName = 'Az.Sql'; RequiredVersion = '2.18.0'; }, 
+            @{ModuleName = 'Az.Sql'; RequiredVersion = '2.17.1'; }, 
             @{ModuleName = 'Az.SqlVirtualMachine'; RequiredVersion = '1.1.0'; }, 
             @{ModuleName = 'Az.StackEdge'; RequiredVersion = '0.1.0'; }, 
-            @{ModuleName = 'Az.StackHCI'; RequiredVersion = '0.5.0'; }, 
+            @{ModuleName = 'Az.StackHCI'; RequiredVersion = '0.6.0'; }, 
             @{ModuleName = 'Az.Storage'; RequiredVersion = '3.6.0'; }, 
-            @{ModuleName = 'Az.StorageSync'; RequiredVersion = '1.5.0'; }, 
-            @{ModuleName = 'Az.StreamAnalytics'; RequiredVersion = '2.2.0'; }, 
+            @{ModuleName = 'Az.StorageSync'; RequiredVersion = '1.4.0'; }, 
+            @{ModuleName = 'Az.StreamAnalytics'; RequiredVersion = '2.0.0'; }, 
             @{ModuleName = 'Az.Subscription'; RequiredVersion = '0.8.0'; }, 
             @{ModuleName = 'Az.Support'; RequiredVersion = '1.0.0'; }, 
             @{ModuleName = 'Az.Synapse'; RequiredVersion = '0.11.0'; }, 
@@ -227,7 +227,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = ''
+        ReleaseNotes = 'https://aka.ms/azpspreview'
 
         # Prerelease string of this module
         # Prerelease = ''

diff --git a/tools/RunVersionController.ps1 b/tools/RunVersionController.ps1
@@ -146,7 +146,11 @@ function Get-ReleaseNotes
                                                                                                           $_.FullName -notlike "*Netcore*" -and `
                                                                                                           $_.FullName -notlike "*dll-Help.psd1*" -and `
                                                                                                           (-not [Tools.Common.Utilities.ModuleFilter]::IsAzureStackModule($_.FullName)) } }
-
+
+    if($ModuleManifestFile.Count -gt 1)
+    {
+        $ModuleManifestFile = $ModuleManifestFile[0]
+    }                                                                                                      
     Import-LocalizedData -BindingVariable ModuleMetadata -BaseDirectory $ModuleManifestFile.DirectoryName -FileName $ModuleManifestFile.Name
     return $ModuleMetadata.PrivateData.PSData.ReleaseNotes
 }
@@ -291,7 +295,7 @@ function Generate-AzPreview
     $requiredModulesString = $requiredModulesString.Trim()
     $requiredModulesString = $requiredModulesString.TrimEnd(",")
 
-    $AzPrviewTemplate = Get-Item -Path "$PSScriptRoot\AzPreview\AzPreview.psd1.template"
+    $AzPrviewTemplate = Get-Item -Path "$PSScriptRoot\AzPreview.psd1.template"
     $AzPrviewTemplateContent = Get-Content -Path $AzPrviewTemplate.FullName
     $AzPreviewPsd1Content = $AzPrviewTemplateContent | % {
         $_ -replace "ModuleVersion = 'x.x.x'", "ModuleVersion = '$AzPrviewVersion'"