Merge remote-tracking branch 'upstream/dev' into dev

Author: akurmi

src/Common/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs

@@ -73,7 +73,7 @@ public class NewAzureStorageContext : AzureDataCmdlet
         /// </summary>
         private const string AnonymousEnvironmentParameterSet = "AnonymousAccountEnvironment";
 
-        private const string StorageAccountNameHelpMessage = "Azure Storage Acccount Name";
+        private const string StorageAccountNameHelpMessage = "Azure Storage Account Name";
         [Parameter(Position = 0, HelpMessage = StorageAccountNameHelpMessage,
             Mandatory = true, ParameterSetName = AccountNameKeyParameterSet)]
         [Parameter(Position = 0, HelpMessage = StorageAccountNameHelpMessage,
@@ -283,7 +283,7 @@ internal CloudStorageAccount GetAnonymousStorageAccountFromAzureEnvironment(stri
         /// <summary>
         /// Get storage account and use specific end point
         /// </summary>
-        /// <param name="credential">Storage credentail</param>
+        /// <param name="credential">Storage credential</param>
         /// <param name="storageAccountName">Storage account name, it's used for build end point</param>
         /// <param name="useHttps"></param>
         /// <param name="endPoint"></param>
@@ -350,6 +350,19 @@ internal CloudStorageAccount GetStorageAccountWithAzureEnvironment(StorageCreden
                     }
                 }
 
+                if(null == azureEnvironment)
+                {
+                    try
+                    {
+                        var profileClient = new ProfileClient(new AzureSMProfile());
+                        azureEnvironment = profileClient.GetEnvironmentOrDefault(azureEnvironmentName);
+                    }
+                    catch(ArgumentException e)
+                    {
+                        throw new ArgumentException(e.Message + " " + string.Format(CultureInfo.CurrentCulture, Resources.ValidEnvironmentName, EnvironmentName.AzureCloud, EnvironmentName.AzureChinaCloud));
+                    }
+                }
+
             }
 
             if (null != azureEnvironment)