Merge pull request #7294 from markcowl/storage-6

Update versions for AzureRM.Storage 6.0.0-preview release

Author: markcowl

src/ResourceManager/Storage/Commands.Management.Storage/AzureRM.Storage.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '5.2.0'
+ModuleVersion = '6.0.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -131,16 +131,16 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Support enable or disable FilesAadIntegration for SMB when create or update Storage account
+        ReleaseNotes = '* Support enable or disable FilesAadIntegration for SMB when creating or updating Storage account
        - New-AzureRmStorageAccount
        - Set-AzureRmStorageAccount
-* Support Kind FileStorage and BlockBlobStorage when create Storage account
+* Support Kind FileStorage and BlockBlobStorage when creating Storage account
        - New-AzureRmStorageAccount
-* Remove get global Storage usage function, and can only get location Storage usage, so parameter ""Location"" change from optional to required.
+* Remove get global Storage usage function, and can only get location Storage usage, so parameter "Location" changes from optional to required.
        - Get-AzureRmStorageUsage'
 
         # Prerelease string of this module
-        Prerelease = 'Preview'
+        Prerelease = 'preview'
 
         # Flag to indicate whether the module requires explicit user acceptance for install/update
         # RequireLicenseAcceptance = $false

src/ResourceManager/Storage/Commands.Management.Storage/ChangeLog.md

@@ -17,7 +17,7 @@
     * Overview of change #1
         - Additional information about change #1
 -->
-## Current Release
+## Version 6.0.0-preview
 * Support enable or disable FilesAadIntegration for SMB when create or update Storage account
        - New-AzureRmStorageAccount
        - Set-AzureRmStorageAccount

src/ResourceManager/Storage/Commands.Management.Storage/Properties/AssemblyInfo.cs

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

src/ServiceManagement/Azure.psd1

@@ -51,7 +51,7 @@ CLRVersion = '4.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Azure.Storage'; ModuleVersion = '4.6.0'; })
+RequiredModules = @(@{ModuleName = 'Azure.Storage'; ModuleVersion = '4.5.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 # RequiredAssemblies = @()

src/Storage/Commands.Storage/Azure.Storage.psd1

@@ -167,7 +167,7 @@ PrivateData = @{
 	- New-AzureStorageContext'
 
         # Prerelease string of this module
-        Prerelease = 'preview'
+        # Prerelease = 'preview'
 
         # Flag to indicate whether the module requires explicit user acceptance for install/update
         # RequireLicenseAcceptance = $false

tools/AzureRM/AzureRM.psd1

@@ -100,7 +100,7 @@ RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; RequiredVersion = '5.6.0';
                @{ModuleName = 'AzureRM.ServiceFabric'; RequiredVersion = '0.3.12'; }, 
                @{ModuleName = 'AzureRM.SignalR'; RequiredVersion = '1.0.0'; }, 
                @{ModuleName = 'AzureRM.Sql'; RequiredVersion = '4.11.3'; }, 
-               @{ModuleName = 'AzureRM.Storage'; RequiredVersion = '5.1.0'; }, 
+               @{ModuleName = 'AzureRM.Storage'; RequiredVersion = '5.0.4'; }, 
                @{ModuleName = 'AzureRM.StreamAnalytics'; RequiredVersion = '4.0.10'; }, 
                @{ModuleName = 'AzureRM.Tags'; RequiredVersion = '4.0.5'; }, 
                @{ModuleName = 'AzureRM.TrafficManager'; RequiredVersion = '4.1.1'; },