Skip to content

1: Change AzureRM.Profile to AzureRM.Accounts #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 6, 2018
Merged

1: Change AzureRM.Profile to AzureRM.Accounts #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3fdd885
Updated usages of AzureRM.Profile to AzureRM.Accounts. The rename of …
MiYanni Dec 5, 2018
72e1ec3
Merge branch 'master' into az-accounts
markcowl Dec 6, 2018
a2d2bd5
Addressing PR comments.
MiYanni Dec 6, 2018
5844843
Merge branch 'az-accounts' of https://github.com/MiYanni/azure-powers…
MiYanni Dec 6, 2018
bdaf52e
Merge branch 'master' into az-accounts
markcowl Dec 6, 2018
4df1b0a
Addressed PR comments.
MiYanni Dec 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Common/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/Common/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-AzDataCollection cmdlet to turn the feature Off. The cmdlet can be found in the Az.Accounts module. To disable data collection: PS &gt; Disable-AzDataCollection.
Use the Enable-AzDataCollection cmdlet to turn the feature On. The cmdlet can be found in the Az.Accounts module. To enable data collection: PS &gt; Enable-AzDataCollection.</value>
</data>
<data name="DataCollectionActivity" xml:space="preserve">
<value>Microsoft Azure PowerShell Data Collection Confirmation</value>
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/ResourceManager/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 &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-AzDataCollection cmdlet to turn the feature Off. The cmdlet can be found in the Az.Accounts module. To disable data collection: PS &gt; Disable-AzDataCollection.
Use the Enable-AzDataCollection cmdlet to turn the feature On. The cmdlet can be found in the Az.Accounts module. To enable data collection: PS &gt; Enable-AzDataCollection.</value>
</data>
<data name="DataCollectionSaveFileInformation" xml:space="preserve">
<value>The setting profile has been saved to the following path '{0}'.</value>
Expand Down
16 changes: 8 additions & 8 deletions src/ScenarioTest.ResourceManager/EnvironmentSetupHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}");
Expand All @@ -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}");
Expand Down Expand Up @@ -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"));
}
Expand All @@ -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"));
}
Expand All @@ -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"));
}
Expand Down