Skip to content

Commit 8fdd3ef

Browse files
huangpfhuangpf
committed
Merge branch 'crp2' of https://github.com/huangpf/azure-powershell-pr into crp2
2 parents d5b21e4 + b3bc453 commit 8fdd3ef

File tree

531 files changed

+98869
-20054
lines changed

Some content is hidden

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

531 files changed

+98869
-20054
lines changed

‎ChangeLog.txt

Lines changed: 112 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,102 @@
1-
2015.04.28 version 0.8.17
1+
2015.05.17 version 0.8.18
2+
* Azure HDInsight:
3+
* Added support for creating WindowsPaas cluster with RDP Access Enabled by default
4+
* Added cmdlets
5+
* Grant-AzureHdinsightRdpAccess
6+
* Revoke-AzureHdinsightRdpAccess
7+
* Azure Network
8+
* Added Cmdlets
9+
* Get-AzureVirtualNetwork
10+
* New-AzureVirtualNetwork
11+
* Remove-AzureVirtualNetwork
12+
* Set-AzureVirtualNetwork
13+
* Get-AzureVirtualNetworkSubnetConfig
14+
* New-AzureVirtualNetworkSubnetConfig
15+
* Add-AzureVirtualNetworkSubnetConfig
16+
* Set-AzureVirtualNetworkSubnetConfig
17+
* Remove-AzureVirtualNetworkSubnetConfig
18+
* Get-AzureNetworkInterface
19+
* New-AzureNetworkInterface
20+
* Remove-AzureNetworkInterface
21+
* Set-AzureNetworkInterface
22+
* Get-AzurePublicIpAddress
23+
* New-AzurePublicIpAddress
24+
* Remove-AzurePublicIpAddress
25+
* Set-AzurePublicIpAddress
26+
* Add-AzureLoadBalancerBackendAddressPoolConfig
27+
* Add-AzureLoadBalancerFrontendIpConfig
28+
* Add-AzureLoadBalancerInboundNatRuleConfig
29+
* Add-AzureLoadBalancerProbeConfig
30+
* Add-AzureLoadBalancerRuleConfig
31+
* Get-AzureLoadBalancer
32+
* Get-AzureLoadBalancerBackendAddressPoolConfig
33+
* Get-AzureLoadBalancerFrontendIpConfig
34+
* Get-AzureLoadBalancerInboundNatRuleConfig
35+
* Get-AzureLoadBalancerProbeConfig
36+
* Get-AzureLoadBalancerRuleConfig
37+
* New-AzureLoadBalancer
38+
* New-AzureLoadBalancerBackendAddressPoolConfig
39+
* New-AzureLoadBalancerFrontendIpConfig
40+
* New-AzureLoadBalancerInboundNatRuleConfig
41+
* New-AzureLoadBalancerProbeConfig
42+
* New-AzureLoadBalancerRuleConfig
43+
* Remove-AzureLoadBalancer
44+
* Remove-AzureLoadBalancerBackendAddressPoolConfig
45+
* Remove-AzureLoadBalancerFrontendIpConfig
46+
* Remove-AzureLoadBalancerInboundNatRuleConfig
47+
* Remove-AzureLoadBalancerProbeConfig
48+
* Remove-AzureLoadBalancerRuleConfig
49+
* Set-AzureLoadBalancer
50+
* Set-AzureLoadBalancerFrontendIpConfig
51+
* Set-AzureLoadBalancerInboundNatRuleConfig
52+
* Set-AzureLoadBalancerProbeConfig
53+
* Set-AzureLoadBalancerRuleConfig
54+
* Get-AzureNetworkSecurityGroup
55+
* New-AzureNetworkSecurityGroup
56+
* Remove-AzureNetworkSecurityGroup
57+
* Set-AzureNetworkSecurityGroup
58+
* Get-AzureNetworkSecurityRuleConfig
59+
* New-AzureNetworkSecurityRuleConfig
60+
* Remove-AzureNetworkSecurityRuleConfig
61+
* Add-AzureNetworkSecurityRuleConfig
62+
* Set-AzureNetworkSecurityRuleConfig
63+
* Get-AzureRemoteDesktopFile
64+
* Azure Storage
65+
* Added cmdlets in AzureResourceManager Mode
66+
* New-AzureStorageAccount
67+
* Get-AzureStorageAccount
68+
* Set-AzureStorageAccount
69+
* Remove-AzureStorageAccount
70+
* New-AzureStorageAccountKey
71+
* Get-AzureStorageAccountKey
72+
* Made Azure Storage data cmdlets work in AzureResourceManager Mode
73+
74+
2015.04.28 version 0.8.17
275
* Azure Batch
376
* Added cmdlets
477
* New-AzureBatchVMUser
578
* Remove-AzureBatchVMUser
679
* Get-AzureBatchRDPFile
780
* Get-AzureBatchVMFileContents
81+
* StorSimple: New StorSimple commands in AzureServiceManagement mode
82+
* Added cmdlets
83+
* Confirm-AzureStorSimpleLegacyVolumeContainerStatus
84+
* Get-AzureStorSimpleLegacyVolumeContainerConfirmStatus
85+
* Get-AzureStorSimpleLegacyVolumeContainerMigrationPlan
86+
* Get-AzureStorSimpleLegacyVolumeContainerStatus
87+
* Import-AzureStorSimpleLegacyApplianceConfig
88+
* Import-AzureStorSimpleLegacyVolumeContainer
89+
* Start-AzureStorSimpleLegacyVolumeContainerMigrationPlan
90+
* New-AzureStorSimpleVirtualDeviceCommand
91+
* Get-AzureStorSimpleJob
92+
* Stop-AzureStorSimpleJob
93+
* Start-AzureStorSimpleBackupCloneJob
94+
* Get-AzureStorSimpleFailoverVolumeContainers
95+
* Start-AzureStorSimpleDeviceFailoverJob
96+
* New-AzureStorSimpleNetworkConfig
97+
* Set-AzureStorSimpleDevice
98+
* Set-AzureStorSimpleVirtualDevice
99+
8100

9101
2015.03.31 version 0.8.16
10102
* Azure Data Factory:
@@ -76,9 +168,9 @@
76168
* Set-AzureRemoteAppWorkspace
77169
* Unpublish-AzureRemoteAppProgram
78170
* Update-AzureRemoteAppCollection
79-
171+
80172
* Storage: new cmdlets
81-
* Get-AzureStorageContainerStoredAccessPolicy
173+
* Get-AzureStorageContainerStoredAccessPolicy
82174
* Get-AzureStorageQueueStoredAccessPolicy
83175
* Get-AzureStorageTableStoredAccessPolicy
84176
* New-AzureStorageContainerStoredAccessPolicy
@@ -122,7 +214,7 @@
122214
* Start-AzureSiteRecoveryCommitFailoverJob
123215
* Start-AzureSiteRecoveryPlannedFailoverJob
124216
* Start-AzureSiteRecoveryTestFailoverJob
125-
217+
126218
* Azure ExpressRoute cmdlet updates
127219
* Fixed bugs in:
128220
* New-AzureDedicatedCircuit
@@ -135,12 +227,12 @@
135227
* Update-AzureDedicatedCircuitBandwidth
136228

137229
* Azure SQL Database: new cmdlets for managing database dynamic data masking policies:
138-
* Get-AzureSqlDatabaseDataMaskingPolicy
139-
* Set-AzureSqlDatabaseDataMaskingPolicy
140-
* New-AzureSqlDatabaseDataMaskingRule
141-
* Get-AzureSqlDatabaseDataMaskingRule
142-
* Set-AzureSqlDatabaseDataMaskingRule
143-
* Remove-AzureSqlDatabaseDataMaskingRule
230+
* Get-AzureSqlDatabaseDataMaskingPolicy
231+
* Set-AzureSqlDatabaseDataMaskingPolicy
232+
* New-AzureSqlDatabaseDataMaskingRule
233+
* Get-AzureSqlDatabaseDataMaskingRule
234+
* Set-AzureSqlDatabaseDataMaskingRule
235+
* Remove-AzureSqlDatabaseDataMaskingRule
144236

145237
* Azure Batch: new cmdlets:
146238
* Get-AzureBatchPool
@@ -158,22 +250,22 @@
158250
* Update-AzureDisk
159251
* Set-AzureOSDisk
160252
* Set-AzureDataDisk (DiskName parameter is also added along with ResizedSizeInGB)
161-
162-
* AzureProfile:
253+
254+
* AzureProfile:
163255
* New cmdlets to manage in-memory profiles
164256
* New-AzureProfile: Create a new in-memory Profile
165257
* Select-AzureProfile: Select the profile to be used in the current session
166258
* Added -Profile parameter to every cmdlet - the cmdlet will use the passed-in profile to authenticate with Azure
167-
259+
168260
2015.02.12 version 0.8.14
169261
* StorSimple: New StorSimple commands in AzureServiceManagement mode:
170262
* GetAzureStorSimpleAccessControlRecord
171263
* GetAzureStorSimpleStorageAccountCredential
172264
* RemoveAzureStorSimpleAccessControlRecord
173265
* RemoveAzureStorSimpleStorageAccountCredential
174266
* SetAzureStorSimpleAccessControlRecord
175-
* GetAzureStorSimpleDeviceVolume
176-
* RemoveAzureStorSimpleDeviceVolume
267+
* GetAzureStorSimpleDeviceVolume
268+
* RemoveAzureStorSimpleDeviceVolume
177269
* GetAzureStorSimpleDeviceVolumeContainer
178270
* RemoveAzureStorSimpleDeviceVolumeContainer
179271
* GetAzureStorSimpleDevice
@@ -205,19 +297,19 @@
205297
* ClusterType (update): New value (Spark) can be specified as cluster type
206298
* Add-AzureHDInsightConfigValues cmdlet:
207299
* Spark (new): collection of configuration properties can be passed in to customize the Spark service
208-
300+
209301
* Azure Insights cmdlets in AzureResourceManager Mode:
210302
* Get-AzureCrrelationLogId
211303
* Get-AzureResourceGroupLog
212304
* Get-AzureResourceLog
213305
* Get-AzureResourceProviderLog
214306
* Get-AzureSubscriptionIdLog
215-
307+
216308
* Azure VM cmdlets
217309
* Get-AzureVMDscExtentionStatus: Get the DSC Extension status for a cloud service or VM
218-
310+
219311
* Updates and bug fixes for AzureAutomation and AzureDataFactory cmdlets
220-
312+
221313
2015.01.08 version 0.8.13
222314
* Key Vault Service - new cmdlets in AzureResourceManager mode:
223315
* Keys:
@@ -299,7 +391,7 @@
299391
* Remove-AzureSqlDatabaseServerAuditing
300392
* Use-AzureSqlDatabaseServerAuditingPolicy
301393
* Allow users to define which storage account key (Primary or Secondary) to use when defining audit policy, using the “StorageKeyType” parameter.
302-
394+
303395
2014.10.27 Version 0.8.10
304396
* Azure Data Factory cmdlets in AzureResourceManager mode
305397
* New-AzureDataFactory

‎README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ For detail descriptions and examples of the cmdlets, type
122122
* ```help azure``` to get all the cmdlets.
123123
* ```help node-dev``` to get all Node.js development related cmdlets.
124124
* ```help php-dev``` to get all PHP development related cmdlets.
125-
* ```help python-dev``` to get all Python development related cmdlets.
126125
* ```help <cmdlet name>``` to get the details of a specific cmdlet.
127126

128127
## Supported Environments

‎setup/azurecmd.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
33

4-
<?define productName="Microsoft Azure PowerShell - March 2015" ?>
4+
<?define productName="Microsoft Azure PowerShell - April 2015" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="0.8.16.1" ?>
8+
<?define version="0.9.0" ?>
99
<?define versionedStartMenuFolder="Microsoft Azure" ?>
1010
<?define staleStartMenuFolder="Windows Azure" ?>
1111

‎setup/azurecmdfiles.wxi

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1306,6 +1306,38 @@
13061306
<File Id="fil658EB945BB104A3BB6E54EB9D7CC76AE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Tags\System.Spatial.dll" />
13071307
</Component>
13081308
</Directory>
1309+
<Directory Id="dirD9530EC10CD28141F082E5C4FD29B000" Name="TrafficManager">
1310+
<Component Id="cmp77866191B1413E61D7B880F54093D6E9" Guid="*">
1311+
<File Id="fil47028FDF13A3C62054C9F61D64B81C1B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\TrafficManager\Hyak.Common.dll" />
1312+
</Component>
1313+
<Component Id="cmp7F18AD3C425F41CE8DB8E07CE509DAEA" Guid="*">
1314+
<File Id="fil5FF694D6373108F299202DD982297B14" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\TrafficManager\Microsoft.Azure.Commands.TrafficManager.dll" />
1315+
</Component>
1316+
<Component Id="cmp0A1CE29CE32BA5CB7B808FB79F598545" Guid="*">
1317+
<File Id="fil59A6C3AA449C5C5C0ECE64549427DA2B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\TrafficManager\Microsoft.Azure.Commands.TrafficManager.dll-help.xml" />
1318+
</Component>
1319+
<Component Id="cmpD2BE076C47F8E3FBE7F08523A849CE97" Guid="*">
1320+
<File Id="filE0F844EEB58C5CD073B9E55FD8EE0F3B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\TrafficManager\Microsoft.Azure.Common.Authentication.dll" />
1321+
</Component>
1322+
<Component Id="cmpA3BD6FFFE2A4A8906122B0CFCDD774A6" Guid="*">
1323+
<File Id="fil62D73AC54CEAF7CAB45B054BA44F0C55" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\TrafficManager\Microsoft.Azure.Common.dll" />
1324+
</Component>
1325+
<Component Id="cmp99392DCBDE8044C2016FF93700B983EB" Guid="*">
1326+
<File Id="fil9A36FC098B4DD67347F5599B2C6E0B49" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\TrafficManager\Microsoft.Azure.Management.TrafficManager.dll" />
1327+
</Component>
1328+
<Component Id="cmpF7B36B0AC5A53D62F461D739E7A0CD7F" Guid="*">
1329+
<File Id="filC265B633228818419FDBE0FDD7C0EB31" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\TrafficManager\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
1330+
</Component>
1331+
<Component Id="cmp2BC5CD3EEAB03215BAF80C8D91B316F1" Guid="*">
1332+
<File Id="filB061F4ED4F741048AA7F5AF7B3800BC7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\TrafficManager\Microsoft.WindowsAzure.Commands.Common.dll" />
1333+
</Component>
1334+
<Component Id="cmp44E9CD59264367064398F4E0170F73B3" Guid="*">
1335+
<File Id="fil92456941883D58DA275F3B6B3A67C9AE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\TrafficManager\Newtonsoft.Json.dll" />
1336+
</Component>
1337+
<Component Id="cmp166C9307AB9128CC171F02474EBC9F38" Guid="*">
1338+
<File Id="fil2EE4D727387984593EACCF967C5A417A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\TrafficManager\System.Net.Http.Formatting.dll" />
1339+
</Component>
1340+
</Directory>
13091341
<Directory Id="dirC50ADFE5CD118426F389B9B2CD995BF6" Name="Websites">
13101342
<Component Id="cmpCB9C95BF2FE6D784EC47F78CEA8714FE" Guid="*">
13111343
<File Id="fil6C3554ACEEBC9EA8063C3E75065A9154" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Websites\Hyak.Common.dll" />
@@ -3433,6 +3465,16 @@
34333465
<ComponentRef Id="cmp73F733B6769D6142F627750A4BF8A304" />
34343466
<ComponentRef Id="cmp1B114EC22E279C9430B23AB28AEE58EC" />
34353467
<ComponentRef Id="cmp82A0A44868270FCB8A12BD4E0346621F" />
3468+
<ComponentRef Id="cmp77866191B1413E61D7B880F54093D6E9" />
3469+
<ComponentRef Id="cmp7F18AD3C425F41CE8DB8E07CE509DAEA" />
3470+
<ComponentRef Id="cmp0A1CE29CE32BA5CB7B808FB79F598545" />
3471+
<ComponentRef Id="cmpD2BE076C47F8E3FBE7F08523A849CE97" />
3472+
<ComponentRef Id="cmpA3BD6FFFE2A4A8906122B0CFCDD774A6" />
3473+
<ComponentRef Id="cmp99392DCBDE8044C2016FF93700B983EB" />
3474+
<ComponentRef Id="cmpF7B36B0AC5A53D62F461D739E7A0CD7F" />
3475+
<ComponentRef Id="cmp2BC5CD3EEAB03215BAF80C8D91B316F1" />
3476+
<ComponentRef Id="cmp44E9CD59264367064398F4E0170F73B3" />
3477+
<ComponentRef Id="cmp166C9307AB9128CC171F02474EBC9F38" />
34363478
<ComponentRef Id="cmpCB9C95BF2FE6D784EC47F78CEA8714FE" />
34373479
<ComponentRef Id="cmpAA3B522375D7F8190EF55B87EB1EB8D4" />
34383480
<ComponentRef Id="cmp1A3E551E9A3F632A9FF29E4347C0E07F" />

‎src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
</Reference>
5959
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6060
<SpecificVersion>False</SpecificVersion>
61-
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.22-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
61+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.25-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
6262
</Reference>
6363
<Reference Include="Microsoft.Azure.Common.NetFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6464
<SpecificVersion>False</SpecificVersion>

‎src/Common/Commands.Common.Storage/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
5-
<package id="Microsoft.Azure.Common.Authentication" version="1.0.22-preview" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common.Authentication" version="1.0.25-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
88
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

‎src/Common/Commands.Common.Test/Commands.Common.Test.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,9 @@
5656
<Reference Include="Microsoft.Azure.Common">
5757
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
5858
</Reference>
59-
<Reference Include="Microsoft.Azure.Common.Authentication">
60-
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.22-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
59+
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60+
<SpecificVersion>False</SpecificVersion>
61+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.25-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
6162
</Reference>
6263
<Reference Include="Microsoft.Azure.Common.NetFramework">
6364
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>

‎src/Common/Commands.Common.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
5-
<package id="Microsoft.Azure.Common.Authentication" version="1.0.22-preview" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common.Authentication" version="1.0.25-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5562.19686-prerelease" targetFramework="net45" />

‎src/Common/Commands.Common/AzurePowerShell.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ public class AzurePowerShell
2727

2828
public const string AssemblyCopyright = "Copyright © Microsoft";
2929

30-
public const string AssemblyVersion = "0.8.16.1";
30+
public const string AssemblyVersion = "0.9.0";
3131

32-
public const string AssemblyFileVersion = "0.8.16.1";
32+
public const string AssemblyFileVersion = "0.9.0";
3333

3434
public const string ProfileFile = "AzureProfile.json";
3535

‎src/Common/Commands.Common/Commands.Common.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
</Reference>
6161
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6262
<SpecificVersion>False</SpecificVersion>
63-
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.22-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
63+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.25-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
6464
</Reference>
6565
<Reference Include="Microsoft.Azure.Common.NetFramework">
6666
<SpecificVersion>False</SpecificVersion>

‎src/Common/Commands.Common/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
44
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
6-
<package id="Microsoft.Azure.Common.Authentication" version="1.0.22-preview" targetFramework="net45" />
6+
<package id="Microsoft.Azure.Common.Authentication" version="1.0.25-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

‎src/Common/Commands.Profile/Account/AddAzureAccount.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,14 @@ public class AddAzureAccount : SubscriptionCmdletBase
3232
public string Environment { get; set; }
3333

3434
[Parameter(ParameterSetName = "User", Mandatory = false, HelpMessage = "Optional credential")]
35-
[Parameter(ParameterSetName = "ServicePrincipal", Mandatory = true, HelpMessage = "Optional credential")]
35+
[Parameter(ParameterSetName = "ServicePrincipal", Mandatory = true, HelpMessage = "Credential")]
3636
public PSCredential Credential { get; set; }
3737

3838
[Parameter(ParameterSetName = "ServicePrincipal", Mandatory = true)]
3939
public SwitchParameter ServicePrincipal { get; set; }
4040

41-
[Parameter(ParameterSetName = "ServicePrincipal", Mandatory = true, HelpMessage = "Optional tenant name or ID")]
41+
[Parameter(ParameterSetName = "User", Mandatory = false, HelpMessage = "Optional tenant name or ID")]
42+
[Parameter(ParameterSetName = "ServicePrincipal", Mandatory = true, HelpMessage = "Tenant name or ID")]
4243
public string Tenant { get; set; }
4344

4445
public AddAzureAccount() : base(true)

0 commit comments

Comments
 (0)