Fix access error when subscripiton has no Tags property (#15444)

* Fix access error when subscripiton has no Tags property

* Bump version for Az 6.2.1

Author: msJinLei

ChangeLog.md

@@ -51,7 +51,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.5.0'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.5.1'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = './bin/Az.ADDomainServices.private.dll'

src/ADDomainServices/Az.ADDomainServices.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 7/2/2021
+# Generated on: 7/9/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '2.5.0'
+ModuleVersion = '2.5.1'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -145,11 +145,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Added Tags, AuthorizationSource to PSAzureSusbscripiton and added TenantType, DefaultDomain, TenantBrandingLogoUrl, CountryCode to PSAzureTenant [#15220]
-* Upgraded subscription client to 2021-01-01 [#15220]
-* Removed Interactive mode check in common lib
-* Added endpoint of OperationalInsights to environment AzureChinaCloud [#15305]
-* Printed auto generated modules'' default logs to verbose stream'
+        ReleaseNotes = '* Fixed access error when subscripiton has no ''Tags'' property [#15425].'
 
         # Prerelease string of this module
         # Prerelease = ''

src/Accounts/Accounts/Az.Accounts.psd1

@@ -43,8 +43,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.5.0")]
-[assembly: AssemblyFileVersion("2.5.0")]
+[assembly: AssemblyVersion("2.5.1")]
+[assembly: AssemblyFileVersion("2.5.1")]
 #if !SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.Accounts.Test")]
 #endif

src/Accounts/Accounts/ChangeLog.md

@@ -223,7 +223,11 @@ public Dictionary<string, string> Tags
         {
             get
             {
-               return this.GetTags();
+                if (!string.IsNullOrEmpty(this.GetProperty(AzureSubscription.Property.Tags)))
+                {
+                    return this.GetTags();
+                }
+                return null;
             }
         }
     }

src/Accounts/Accounts/Properties/AssemblyInfo.cs

@@ -43,5 +43,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.0")]
-[assembly: AssemblyFileVersion("2.5.0")]
+[assembly: AssemblyVersion("2.5.1")]
+[assembly: AssemblyFileVersion("2.5.1")]

src/Accounts/Authentication.ResourceManager/Models/PSAzureSubscription.cs

@@ -48,5 +48,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.0")]
-[assembly: AssemblyFileVersion("2.5.0")]
+[assembly: AssemblyVersion("2.5.1")]
+[assembly: AssemblyFileVersion("2.5.1")]

src/Accounts/Authentication/Properties/AssemblyInfo.cs

@@ -51,7 +51,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.5.0'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.5.1'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'Microsoft.Azure.Management.Advisor.dll'

src/Accounts/Authenticators/Properties/AssemblyInfo.cs

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.2.8'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.5.1'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'YamlDotNet.dll', 'AutoMapper.dll',