Skip to content

Commit fd2a7a8

Browse files
cormacpaynecormacpayne
authored
Merge branch 'preview' into TestOnBuild
2 parents 586c2da + 4b63d47 commit fd2a7a8

File tree

142 files changed

+13402
-123666
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+13402
-123666
lines changed

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ If you use both mechanisms on the same subscription, Microsoft Azure Active Dire
132132

133133
```powershell
134134
# Interactive login - you will get a dialog box asking for your Azure credentials
135-
Add-AzureRmAccount
135+
Connect-AzureRmAccount
136136
137137
# Non-interactive login - use service principals
138-
Add-AzureRmAccount -ServicePrincipal -ApplicationId "http://my-app" -Credential $pscredential -TenantId $tenantid
138+
Connect-AzureRmAccount -ServicePrincipal -ApplicationId "http://my-app" -Credential $pscredential -TenantId $tenantid
139139
140140
# Use the cmdlets to manage your services/applications
141141
New-AzureRmResourceGroup -Name myresourceGroup -Location "West US"
@@ -144,7 +144,7 @@ New-AzureRmResourceGroup -Name myresourceGroup -Location "West US"
144144
### Microsoft Azure China
145145

146146
```powershell
147-
Add-AzureRmAccount -EnvironmentName AzureChinaCloud
147+
Connect-AzureRmAccount -EnvironmentName AzureChinaCloud
148148
149149
# Use the cmdlets to manage your services/applications
150150
New-AzureRmResourceGroup -Name myresourceGroup -Location "China East"
@@ -153,7 +153,7 @@ New-AzureRmResourceGroup -Name myresourceGroup -Location "China East"
153153
### Microsoft Azure US Government
154154

155155
```powershell
156-
Add-AzureRmAccount -EnvironmentName AzureUSGovernment
156+
Connect-AzureRmAccount -EnvironmentName AzureUSGovernment
157157
158158
# Use the cmdlets to manage your services/applications
159159
New-AzureRmResourceGroup -Name myresourceGroup -Location "US Gov Virginia"
@@ -162,7 +162,7 @@ New-AzureRmResourceGroup -Name myresourceGroup -Location "US Gov Virginia"
162162
### Microsoft Azure Germany
163163

164164
```powershell
165-
Add-AzureRmAccount -EnvironmentName AzureGermanCloud
165+
Connect-AzureRmAccount -EnvironmentName AzureGermanCloud
166166
167167
# Use the cmdlets to manage your services/applications
168168
New-AzureRmResourceGroup -Name myresourceGroup -Location "Germany Central"

‎documentation/breaking-changes/breaking-changes-tool-help.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,24 +42,26 @@ Below are descriptions and remediations for each of the errors that can be seen
4242
| 3040 | [Changed Generic Type Argument](#3040---changed-generic-type-argument) |
4343
| 3050 | [Different Generic Type Argument Size](#3050---different-generic-type-argument-size) |
4444

45-
## 1000 - Removed Cmdlet
45+
## 1000 - Removed or Renamed Cmdlet
4646

4747
### Description
4848

4949
_The cmdlet '`<cmdlet>`' has been removed and no alias was found for the original cmdlet name._
5050

51-
When a user can no longer use a cmdlet that was previously available in a module, that is a breaking change. This can occur when the cmdlet is deleted, or the name of the cmdlet was changed with no alias to the original cmdlet name.
51+
When a user can no longer use a cmdlet that was previously available in a module, that is a breaking change. This can occur when the cmdlet is deleted, or when the name of the cmdlet was changed with no alias to the original cmdlet name.
5252

5353
### Remediation
5454

5555
_Add the cmdlet '`<cmdlet>`' back to the module, or add an alias to the original cmdlet name._
5656

5757
To add an alias to the original cmdlet name, use the `Alias` attribute for the cmdlet.
5858

59+
If you need to, you can add multiple aliases for cmdlets that need to be renamed twice.
60+
5961
```cs
60-
[Alias("Login-AzureRmAccount")]
61-
[Cmdlet(VerbsCommon.Add, "AzureRmAccount")]
62-
public class AddAzureRmAccount : Cmdlet
62+
[Cmdlet(VerbsCommunications.Connect, "AzureRmAccount")]
63+
[Alias("Login-AzureRmAccount", "Login-AzAccount", "Add-AzureRmAccount")]
64+
public class ConnectAzureRmAccount : Cmdlet
6365
{
6466
protected override void BeginProcessing()
6567
{
@@ -383,8 +385,8 @@ _Add the parameter '`<parameter>`' back to the cmdlet '`<cmdlet>`', or add an al
383385
To add an alias to the original parameter name, use the `Alias` attribute for the parameter.
384386

385387
```cs
386-
[Cmdlet(VerbsCommon.Add, "AzureRmAccount")]
387-
public class AddAzureRmAccount : Cmdlet
388+
[Cmdlet(VerbsCommunications.Connect, "AzureRmAccount")]
389+
public class ConnectAzureRmAccount : Cmdlet
388390
{
389391
[Alias("Domain")]
390392
[Parameter(ParameterSetName = "...", Mandatory = false)

‎src/Common/Commands.Common.Authentication/Properties/Resources.resx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
<value>The environment name '{0}' is not found.</value>
143143
</data>
144144
<data name="ExpiredRefreshToken" xml:space="preserve">
145-
<value>Your Microsoft Azure credential in the Windows PowerShell session has expired. Please log in again. In PowerShell, execute Login-AzureRMAccount for Azure Resource Manager cmdlets or Add-AzureAccount for service management cmdlets.</value>
145+
<value>Your Microsoft Azure credential in the Windows PowerShell session has expired. Please log in again. In PowerShell, execute Connect-AzureRmAccount for Azure Resource Manager cmdlets or Add-AzureAccount for service management cmdlets.</value>
146146
</data>
147147
<data name="FilePathIsNotValid" xml:space="preserve">
148148
<value>File path is not valid</value>
@@ -193,7 +193,7 @@
193193
<value>Removing public environment is not supported.</value>
194194
</data>
195195
<data name="ServiceKeyNotFound" xml:space="preserve">
196-
<value>Unable to retrieve service key for ServicePrincipal account {0}. Please log in again to supply the credentials for this service principal. In PowerShell, execute Login-AzureRMAccount for Azure Resource Manager cmdlets or Add-AzureAccount for service management cmdlets.</value>
196+
<value>Unable to retrieve service key for ServicePrincipal account {0}. Please log in again to supply the credentials for this service principal. In PowerShell, execute Connect-AzureRmAccount for Azure Resource Manager cmdlets or Add-AzureAccount for service management cmdlets.</value>
197197
</data>
198198
<data name="ServiceNameExists" xml:space="preserve">
199199
<value>The provided service name {0} already exists, please pick another name</value>
@@ -259,7 +259,7 @@
259259
<value>Multiple tokens were found for this user. Please clear your token cache using, Clear-AzureProfile and try this command again.</value>
260260
</data>
261261
<data name="AdalUserInteractionRequired" xml:space="preserve">
262-
<value>User Interaction is required to authenticate this user. Please authenticate using the log in dialog. In PowerShell, execute Login-AzureRMAccount for Azure Resource Manager cmdlets or Add-AzureAccount for service management cmdlets.</value>
262+
<value>User Interaction is required to authenticate this user. Please authenticate using the log in dialog. In PowerShell, execute Connect-AzureRmAccount for Azure Resource Manager cmdlets or Add-AzureAccount for service management cmdlets.</value>
263263
</data>
264264
<data name="TenantNotFound" xml:space="preserve">
265265
<value>No tenant was found for this subscription. Please execute Clear-AzureProfile and then execute Add-AzureAccount.</value>
@@ -283,19 +283,19 @@
283283
<value>[Common.Authentication]: Authenticating for account {0} with single tenant {1}</value>
284284
</data>
285285
<data name="ArmAccountNotFound" xml:space="preserve">
286-
<value>No account found in the context. Please login using Login-AzureRMAccount.</value>
286+
<value>No account found in the context. Please login using Connect-AzureRmAccount.</value>
287287
</data>
288288
<data name="ArmUserInteractionRequired" xml:space="preserve">
289-
<value>User Interaction is required to authenticate this user. Please execute Login-AzureRMAccount without parameters and enter your credentials.</value>
289+
<value>User Interaction is required to authenticate this user. Please execute Connect-AzureRmAccount without parameters and enter your credentials.</value>
290290
</data>
291291
<data name="InvalidArmContext" xml:space="preserve">
292-
<value>Your Azure credentials have not been set up or have expired, please run Login-AzureRMAccount to set up your Azure credentials.</value>
292+
<value>Your Azure credentials have not been set up or have expired, please run Connect-AzureRmAccount to set up your Azure credentials.</value>
293293
</data>
294294
<data name="NoSubscriptionInContext" xml:space="preserve">
295-
<value>No subscription found in the context. Please ensure that the credentials you provided are authorized to access an Azure subscription, then run Login-AzureRMAccount to login.</value>
295+
<value>No subscription found in the context. Please ensure that the credentials you provided are authorized to access an Azure subscription, then run Connect-AzureRmAccount to login.</value>
296296
</data>
297297
<data name="NoTenantInContext" xml:space="preserve">
298-
<value>No tenant found in the context. Please ensure that the credentials you provided are authorized to access an Azure subscription, then run Login-AzureRMAccount to login.</value>
298+
<value>No tenant found in the context. Please ensure that the credentials you provided are authorized to access an Azure subscription, then run Connect-AzureRmAccount to login.</value>
299299
</data>
300300
<data name="UnsupportedCredentialType" xml:space="preserve">
301301
<value>Certificate authentication is not supported for account type {0}.</value>

‎src/Common/Commands.Common/Properties/Resources.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1537,10 +1537,10 @@ Use the Enable-AzureRmDataCollection cmdlet to turn the feature On. The cmdlet c
15371537
<value>User name needs to be specified.</value>
15381538
</data>
15391539
<data name="NoCurrentContextForDataCmdlet" xml:space="preserve">
1540-
<value>"There is no current context, please log in using Login-AzureRmAccount for Azure Resource Manager or Add-AzureAccount for Azure Service Management."</value>
1540+
<value>"There is no current context, please log in using Connect-AzureRmAccount for Azure Resource Manager or Add-AzureAccount for Azure Service Management."</value>
15411541
</data>
15421542
<data name="NoSubscriptionFoundForTenant" xml:space="preserve">
1543-
<value>No subscriptions are associated with the logged in account in Azure Service Management (RDFE). This means that the logged in user is not an administrator or co-administrator for any account.\r\nDid you mean to execute Login-AzureRmAccount?</value>
1543+
<value>No subscriptions are associated with the logged in account in Azure Service Management (RDFE). This means that the logged in user is not an administrator or co-administrator for any account.\r\nDid you mean to execute Connect-AzureRmAccount?</value>
15441544
</data>
15451545
<data name="CertificateNotFoundInStore" xml:space="preserve">
15461546
<value>No certificate was found in the certificate store with thumbprint {0}</value>

‎src/ResourceManager/AnalysisServices/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Corrected usage of `Login-AzureRmAccount` to use `Connect-AzureRmAccount`
2122

2223
## Version 0.6.2
2324
* Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Properties/Resources.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
<value>AnalysisServices server operation failed with the following error code: {0} and message: {1}</value>
140140
</data>
141141
<data name="NoSubscriptionInContext" xml:space="preserve">
142-
<value>No subscription found in the context. Please ensure that the credentials you provided are authorized to access an Azure subscription, then run Login-AzureRMAccount to login.</value>
142+
<value>No subscription found in the context. Please ensure that the credentials you provided are authorized to access an Azure subscription, then run Connect-AzureRMAccount to login.</value>
143143
</data>
144144
<data name="RemoveAnalysisServicesServer" xml:space="preserve">
145145
<value>Are you sure you want to remove Analysis Services server: '{0}'?</value>

‎src/ResourceManager/Common/Commands.ResourceManager.Common/AzureRMCmdlet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ protected override IAzureContext DefaultContext
102102
{
103103
if (DefaultProfile == null || DefaultProfile.DefaultContext == null || DefaultProfile.DefaultContext.Account == null)
104104
{
105-
throw new PSInvalidOperationException("Run Login-AzureRmAccount to login.");
105+
throw new PSInvalidOperationException(Resources.RunConnectAccount);
106106
}
107107

108108
return DefaultProfile.DefaultContext;

‎src/ResourceManager/Common/Commands.ResourceManager.Common/Properties/Resources.Designer.cs

Lines changed: 11 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/ResourceManager/Common/Commands.ResourceManager.Common/Properties/Resources.resx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<value>Can not remove tag/tag value because it's being referenced by other resources.</value>
122122
</data>
123123
<data name="ContextCannotBeNull" xml:space="preserve">
124-
<value>Context cannot be null. Please log in using Add-AzureRmAccount.</value>
124+
<value>Context cannot be null. Please log in using Connect-AzureRmAccount.</value>
125125
</data>
126126
<data name="DataCollectionActivity" xml:space="preserve">
127127
<value>Microsoft Azure PowerShell Data Collection Confirmation</value>
@@ -165,7 +165,7 @@ Use the Enable-AzureRmDataCollection cmdlet to turn the feature On. The cmdlet c
165165
<value>No valid ResourceType given to LocationCompleter.</value>
166166
</data>
167167
<data name="ProfileCannotBeNull" xml:space="preserve">
168-
<value>Profile cannot be null. Please run Add-AzureRmAccount.</value>
168+
<value>Profile cannot be null. Please run Connect-AzureRmAccount.</value>
169169
</data>
170170
<data name="RemoveTagMessage" xml:space="preserve">
171171
<value>Removing tag ....</value>
@@ -219,4 +219,7 @@ Use the Enable-AzureDataCollection cmdlet to turn the feature On. The cmdlet can
219219
<data name="DefaultResourceGroupKey" xml:space="preserve">
220220
<value>Default Resource Group</value>
221221
</data>
222+
<data name="RunConnectAccount" xml:space="preserve">
223+
<value>Run Connect-AzureRmAccount to login.</value>
224+
</data>
222225
</root>

‎src/ResourceManager/Compute/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Corrected usage of `Login-AzureRmAccount` to use `Connect-AzureRmAccount`
2122

2223
## Version 4.2.0
2324
* Added simplified parameter set to New-AzureRmVmss, which creates a Virtual Machine Scale Set and all required resources using smart defaults

‎src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/Scripts/AzureDiskEncryptionPreRequisiteSetup.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ $ErrorActionPreference = "Stop"
7272
if(-not $SvcPrincipals)
7373
{
7474
# AAD app wasn't created
75-
Write-Error "Failed to create AAD app $aadAppName. Please log-in to Azure using Login-AzureRmAccount and try again";
75+
Write-Error "Failed to create AAD app $aadAppName. Please log in to Azure using Connect-AzureRmAccount and try again";
7676
return;
7777
}
7878
$aadClientID = $servicePrincipal.ApplicationId;

‎src/ResourceManager/Compute/Commands.Compute/Extension/VmssDiskEncryption/Scripts/AzureDiskEncryption_VMSS.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ $ErrorActionPreference = “Stop”;
3838
########################################################################################################################
3939

4040
#Write-Host 'Please log into Azure now' -foregroundcolor Green;
41-
#Login-AzureRmAccount -ErrorAction "Stop" 1> $null;
41+
#Connect-AzureRmAccount -ErrorAction "Stop" 1> $null;
4242

4343
if($subscriptionId)
4444
{

‎src/ResourceManager/Compute/Stack/Commands.Compute/Extension/AzureDiskEncryption/Scripts/AzureDiskEncryptionPreRequisiteSetup.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Param(
4343

4444

4545
Write-Host 'Please log into Azure now' -foregroundcolor Green;
46-
Login-AzureRmAccount -ErrorAction "Stop" 1> $null;
46+
Connect-AzureRmAccount -ErrorAction "Stop" 1> $null;
4747

4848
if($subscriptionId)
4949
{
@@ -74,7 +74,7 @@ Param(
7474
if(-not $SvcPrincipals)
7575
{
7676
# AAD app wasn't created
77-
Write-Error "Failed to create AAD app $aadAppName. Please log-in to Azure using Login-AzureRmAccount and try again";
77+
Write-Error "Failed to create AAD app $aadAppName. Please log-in to Azure using Connect-AzureRmAccount and try again";
7878
return;
7979
}
8080
$aadClientID = $servicePrincipal.ApplicationId;

‎src/ResourceManager/DataLakeAnalytics/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Corrected usage of `Login-AzureRmAccount` to use `Connect-AzureRmAccount`
2122

2223
## Version 4.2.0
2324
* Added Location Completer to -Location parameters allowing tab completion through valid Locations

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Properties/Resources.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@
256256
<value>No default subscription has been designated. Use Select-AzureSubscription -Default &lt;subscriptionName&gt; to set the default subscription.</value>
257257
</data>
258258
<data name="NoSubscriptionInContext" xml:space="preserve">
259-
<value>No subscription found in the context. Please ensure that the credentials you provided are authorized to access an Azure subscription, then run Login-AzureRMAccount to login.</value>
259+
<value>No subscription found in the context. Please ensure that the credentials you provided are authorized to access an Azure subscription, then run Connect-AzureRMAccount to login.</value>
260260
</data>
261261
<data name="MissingComputePolicyField" xml:space="preserve">
262262
<value>-MaxAnalyticsUnitsPerJob or -MinPriorityPerJob or both must be specified when creating or updating a compute policy.</value>

‎src/ResourceManager/DataLakeStore/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Corrected usage of `Login-AzureRmAccount` to use `Connect-AzureRmAccount`
2122

2223
## Version 5.1.0
2324
* Added Location Completer to -Location parameters allowing tab completion through valid Locations

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Properties/Resources.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
<value>Failed to move source: '{0}' to destination: '{1}'. Please ensure the file or folder exists at the source and that the destination does not or force was used.</value>
227227
</data>
228228
<data name="NoSubscriptionInContext" xml:space="preserve">
229-
<value>No subscription found in the context. Please ensure that the credentials you provided are authorized to access an Azure subscription, then run Login-AzureRMAccount to login.</value>
229+
<value>No subscription found in the context. Please ensure that the credentials you provided are authorized to access an Azure subscription, then run Connect-AzureRMAccount to login.</value>
230230
</data>
231231
<data name="ObsoleteWarningForAclObjects" xml:space="preserve">
232232
<value>The existing DataLakeStoreItemAcl object will be deprecated in a future release. At that time, this cmdlet will instead accept the output of, and objects in the same format as, Get-AzureRMDataLakeStoreItemAclEntry</value>

‎src/ResourceManager/EventGrid/Commands.EventGrid.Test/Commands.EventGrid.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<HintPath>..\..\..\packages\Microsoft.Azure.Management.EventGrid.1.1.0-preview\lib\net452\Microsoft.Azure.Management.EventGrid.dll</HintPath>
6161
</Reference>
6262
<Reference Include="Microsoft.Azure.Management.EventHub">
63-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.EventHub.2.0.0\lib\net452\Microsoft.Azure.Management.EventHub.dll</HintPath>
63+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.EventHub.2.0.3\lib\net452\Microsoft.Azure.Management.EventHub.dll</HintPath>
6464
</Reference>
6565
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6666
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
@@ -251,4 +251,4 @@
251251
<PostBuildEvent>
252252
</PostBuildEvent>
253253
</PropertyGroup>
254-
</Project>
254+
</Project>

0 commit comments

Comments
 (0)