Merge branch 'az-accounts' into dll-clients-rename

Author: MiYanni

src/Common/Properties/Resources.Designer.cs

@@ -1473,8 +1473,8 @@ The file needs to be a PowerShell script (.ps1 or .psm1).</value>
 The data is anonymous and does not include commandline argument values.
 The data is collected by Microsoft.
 
-Use the Disable-AzureRmDataCollection cmdlet to turn the feature Off. The cmdlet can be found in the AzureRM.Profile module.  To disable data collection: PS &gt; Disable-AzureRmDataCollection.
-Use the Enable-AzureRmDataCollection cmdlet to turn the feature On. The cmdlet can be found in the AzureRM.Profile module.  To enable data collection: PS &gt; Enable-AzureRmDataCollection.</value>
+Use the Disable-AzureRmDataCollection cmdlet to turn the feature Off. The cmdlet can be found in the AzureRM.Accounts module.  To disable data collection: PS &gt; Disable-AzureRmDataCollection.
+Use the Enable-AzureRmDataCollection cmdlet to turn the feature On. The cmdlet can be found in the AzureRM.Accounts module.  To enable data collection: PS &gt; Enable-AzureRmDataCollection.</value>
   </data>
   <data name="DataCollectionActivity" xml:space="preserve">
     <value>Microsoft Azure PowerShell Data Collection Confirmation</value>

src/Common/Properties/Resources.resx

@@ -140,8 +140,8 @@
 The data is anonymous and does not include commandline argument values.
 The data is collected by Microsoft.
 
-Use the Disable-AzureRmDataCollection cmdlet to turn the feature Off. The cmdlet can be found in the AzureRM.Profile module.  To disable data collection: PS > Disable-AzureRmDataCollection.
-Use the Enable-AzureRmDataCollection cmdlet to turn the feature On. The cmdlet can be found in the AzureRM.Profile module.  To enable data collection: PS &gt; Enable-AzureRmDataCollection.</value>
+Use the Disable-AzureRmDataCollection cmdlet to turn the feature Off. The cmdlet can be found in the AzureRM.Accounts module.  To disable data collection: PS &gt; Disable-AzureRmDataCollection.
+Use the Enable-AzureRmDataCollection cmdlet to turn the feature On. The cmdlet can be found in the AzureRM.Accounts module.  To enable data collection: PS &gt; Enable-AzureRmDataCollection.</value>
   </data>
   <data name="DataCollectionSaveFileInformation" xml:space="preserve">
     <value>The setting profile has been saved to the following path '{0}'.</value>

src/ResourceManager/Properties/Resources.Designer.cs

@@ -72,13 +72,13 @@ public class EnvironmentSetupHelper
 #endif
         public EnvironmentSetupHelper()
         {
-            var module = GetModuleManifest(RmDirectory, "AzureRM.Profile");
+            var module = GetModuleManifest(RmDirectory, "AzureRM.Accounts");
             if (string.IsNullOrWhiteSpace(module))
             {
-                throw new InvalidOperationException("Could not find profile module");
+                throw new InvalidOperationException("Could not find Accounts module");
             }
 
-            LogIfNotNull($"Profile Module path: {module}");
+            LogIfNotNull($"Accounts Module path: {module}");
             RMProfileModule = module;
             module = GetModuleManifest(RmDirectory, "AzureRM.Resources");
             LogIfNotNull($"Resources Module path: {module}");
@@ -99,8 +99,8 @@ public EnvironmentSetupHelper()
             LogIfNotNull($"Network Module path: {module}");
             RMNetworkModule = module;
 
-            module = GetModuleManifest(StackRmDirectory, "AzureRM.Profile");
-            LogIfNotNull($"Stack Profile Module path: {module}");
+            module = GetModuleManifest(StackRmDirectory, "AzureRM.Accounts");
+            LogIfNotNull($"Stack Accounts Module path: {module}");
             StackRMProfileModule = module;
             module = GetModuleManifest(StackRmDirectory, "AzureRM.Resources");
             LogIfNotNull($"Stack Resources Module path: {module}");
@@ -540,7 +540,7 @@ public void SetupModules(AzureModule mode, params string[] modules)
             if (mode == AzureModule.AzureProfile)
             {
                 this.modules.Add(Path.Combine(PackageDirectory, @"ServiceManagement\Azure\Azure.psd1"));
-                this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"));
+                this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Accounts\AzureRM.Accounts.psd1"));
                 this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"));
                 this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Tags.psd1"));
             }
@@ -560,7 +560,7 @@ public void SetupModulesFromCommon(AzureModule mode, params string[] modules)
             if (mode == AzureModule.AzureProfile)
             {
                 this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ServiceManagement\Azure\Azure.psd1"));
-                this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"));
+                this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Accounts\AzureRM.Accounts.psd1"));
                 this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"));
                 this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Tags.psd1"));
             }
@@ -570,7 +570,7 @@ public void SetupModulesFromCommon(AzureModule mode, params string[] modules)
             }
             else if (mode == AzureModule.AzureResourceManager)
             {
-                this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"));
+                this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Accounts\AzureRM.Accounts.psd1"));
                 this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"));
                 this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Tags.psd1"));
             }