Merge pull request #6167 from Azure/master

[Release 6.0.1] Merge master --> preview

Author: Maddie Clayton

src/ResourceManager/Common/Commands.Common.Authentication.ResourceManager/AzureRmProfile.cs

@@ -164,6 +164,12 @@ bool SafeDeserializeObject<T>(string serialization, out T result, JsonConverter
         private void Initialize(AzureRmProfile profile)
         {
             EnvironmentTable.Clear();
+            // Adding predefined environments
+            foreach (var env in AzureEnvironment.PublicEnvironments)
+            {
+                EnvironmentTable[env.Key] = env.Value;
+            }
+
             Contexts.Clear();
             DefaultContextKey = "Default";
             if (profile != null)

src/ResourceManager/Profile/AzureRM.Profile.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '5.0.0'
+ModuleVersion = '5.0.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -146,9 +146,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Set minimum dependency of module to PowerShell 5.0
-* Enable context autosave by default
-* Add USGovernmentOperationalInsightsEndpoint and USGovernmentOperationalInsightsEndpointResourceId properties to Azure environment for US Gov.'
+        ReleaseNotes = '* Fix issue where default environments weren''t being retrieved without a default context set'
 
         # Prerelease string of this module
         # Prerelease = ''

src/ResourceManager/Profile/ChangeLog.md

@@ -19,6 +19,9 @@
 -->
 ## Current Release
 
+## Version 5.0.1
+* Fix issue where default environments weren''t being retrieved without a default context set
+
 ## Version 5.0.0
 * Set minimum dependency of module to PowerShell 5.0
 * Enable context autosave by default

tools/AzureRM/AzureRM.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '6.0.0'
+ModuleVersion = '6.0.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; RequiredVersion = '5.0.0'; }, 
+RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; RequiredVersion = '5.0.1'; }, 
                @{ModuleName = 'Azure.Storage'; RequiredVersion = '4.3.0'; }, 
                @{ModuleName = 'AzureRM.AnalysisServices'; RequiredVersion = '0.6.7'; }, 
                @{ModuleName = 'Azure.AnalysisServices'; RequiredVersion = '0.5.1'; },