Skip to content

Commit aa13711

Browse files
author
Hovsep
committed
Merge pull request Azure#444 from Azure/release-0.9.2
Merging Release 0.9.2 to Master branch
2 parents efefc4d + 839e03f commit aa13711

File tree

503 files changed

+54063
-21972
lines changed

Some content is hidden

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

503 files changed

+54063
-21972
lines changed

‎ChangeLog.txt

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
2015.05.29 version 0.9.2
2+
* Deprecated Switch-AzureMode
3+
* Profile
4+
* Fixed bug in Get-AzureSubscription and Select-AzureSubscription cmdlets
5+
* Added Automation cmdlets
6+
* Get-AzureAutomationWebhook
7+
* New-AzureAutomationWebhook
8+
* Remove-AzureAutomationWebhook
9+
* Set-AzureAutomationWebhook
10+
* Azure Compute
11+
* Get-AzureVMImage and Get-AzureVMImageDetail are combined (Get-AzureVMImageDetail gives a warning message for future deprecation)
12+
* Get-AzureVMExtensionImage and Get-AzureVMExtensionImageDetail are combined (Get-AzureVMExtensionImageDetail gives a warning message for future deprecation)
13+
* Tags are added in VM resources
14+
* Get-AzureVM now gets resource group name from piping
15+
* -All switch is removed from Get-AzureVM
16+
* Get-AzureVM -Status output is updated
17+
* -Force parameter is added for Remove-AzureAvailabilitySet
18+
* Outputs of New-AzureAvailabilitySet, Get-AzureAvailabilitySet, and Remove-AzureAvailabilitySet are updated
19+
* Azure Key Vault
20+
* Update Set-AzureKeyVaultAccessPolicy and Remove-AzureKeyVaultAccessPolicy cmdlets
21+
* Fixed bugs
22+
* Azure Data Factories
23+
* Base cmdlet type switch to use Profile
24+
* New-AzureDataFactoryEncryptedValue cmdlet supporting M data sources
25+
* Azure Resource Manager
26+
* Fixed bug in Move-AzureResource cmdlet
27+
* Fixed bug in Set-AzureResource cmdlet
28+
129
2015.05.04 version 0.9.1
230
* Azure SQL Database: new support for configuring audit retention.
331
* Azure Automation
@@ -332,7 +360,7 @@
332360
* Set-AzureVMCustomScriptExtension
333361
* Set-AzureVMAccessExtension
334362
* Show 'Regions' property for Get-AzureVMAvailableExtensions cmdlet
335-
* Add 'ResizedSizeInGB' pramater for the following cmdlets
363+
* Add 'ResizedSizeInGB' parameter for the following cmdlets
336364
* Update-AzureDisk
337365
* Set-AzureOSDisk
338366
* Set-AzureDataDisk (DiskName parameter is also added along with ResizedSizeInGB)
@@ -437,7 +465,7 @@
437465
* Compute
438466
* Set-AzureVMImage cmdlets - added IconUri, SmallIconUri, and ShowInGui parameters
439467
* Sql
440-
* Added Sql Servver v12 support to SQL authentication context for SqlAzure cmdlets
468+
* Added Sql Server v12 support to SQL authentication context for SqlAzure cmdlets
441469

442470
2014.11.14 Version 0.8.11
443471
* Profile
@@ -760,7 +788,7 @@
760788
* Remove-AzureVMImageOSDiskConfig
761789
* Set-AzureVMImageDataDiskConfig
762790
* Remove-AzureVMImageDataDiskConfig
763-
* Virtual network improvments
791+
* Virtual network improvements
764792
* Set-AzureVnetGatewayKey
765793
* Azure Automation cmdlets
766794
* Get-AzureAutomationAccount

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<meta name="google-site-verification" content="tZgbB2s-hTI0IePQQRCjHqL_Vf0j_XJmehXAHJerrn4" />
12
# Microsoft Azure PowerShell
23

34
This repository contains a set of PowerShell cmdlets for developers and administrators to develop, deploy and manage Microsoft Azure applications.

‎setup/azurecmd.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

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

‎setup/azurecmdfiles.wxi

Lines changed: 190 additions & 8 deletions
Large diffs are not rendered by default.

‎src/AzurePowershell.sln

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.31101.0
3+
VisualStudioVersion = 12.0.21005.1
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8531411A-0137-4E27-9C5E-49E07C245048}"
66
ProjectSection(SolutionItems) = preProject
@@ -210,6 +210,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ApiManagement", "R
210210
EndProject
211211
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ApiManagement.Test", "ResourceManager\ApiManagement\Commands.ApiManagement.Test\Commands.ApiManagement.Test.csproj", "{BEC9ECE9-A3D6-4B24-A682-1FA890647D9D}"
212212
EndProject
213+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Management.Storage", "ResourceManager\Storage\Commands.Management.Storage\Commands.Management.Storage.csproj", "{A50AB133-5C04-4A17-9054-F8343683EC23}"
214+
EndProject
215+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Management.Storage.Test", "ResourceManager\Storage\Commands.Management.Storage.Test\Commands.Management.Storage.Test.csproj", "{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}"
216+
EndProject
213217
Global
214218
GlobalSection(SolutionConfigurationPlatforms) = preSolution
215219
Debug|Any CPU = Debug|Any CPU
@@ -512,12 +516,19 @@ Global
512516
{BEC9ECE9-A3D6-4B24-A682-1FA890647D9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
513517
{BEC9ECE9-A3D6-4B24-A682-1FA890647D9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
514518
{BEC9ECE9-A3D6-4B24-A682-1FA890647D9D}.Release|Any CPU.Build.0 = Release|Any CPU
519+
{A50AB133-5C04-4A17-9054-F8343683EC23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
520+
{A50AB133-5C04-4A17-9054-F8343683EC23}.Debug|Any CPU.Build.0 = Debug|Any CPU
521+
{A50AB133-5C04-4A17-9054-F8343683EC23}.Release|Any CPU.ActiveCfg = Release|Any CPU
522+
{A50AB133-5C04-4A17-9054-F8343683EC23}.Release|Any CPU.Build.0 = Release|Any CPU
523+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
524+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
525+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
526+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|Any CPU.Build.0 = Release|Any CPU
515527
EndGlobalSection
516528
GlobalSection(SolutionProperties) = preSolution
517529
HideSolutionNode = FALSE
518530
EndGlobalSection
519531
GlobalSection(NestedProjects) = preSolution
520-
{B7FD03F6-98BC-4F54-9A14-0455E579FCD4} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
521532
{37455286-D8A7-4E0C-8B4D-C517D20C641A} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
522533
{D6F470A6-7395-4B8B-9D29-44DF0EC8F624} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
523534
{A3965B66-5A3E-4B8C-9574-28E5958D4828} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
@@ -528,6 +539,7 @@ Global
528539
{4BC0E3D3-6EDD-43AA-8F15-DCFED8ACC93D} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
529540
{9D5A40CA-5594-4F5C-8230-7ADF7CC0558E} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
530541
{3B48A77B-5956-4A62-9081-92BA04B02B27} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
542+
{B7FD03F6-98BC-4F54-9A14-0455E579FCD4} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
531543
{4C2FE49A-09E1-4979-AD46-CD64FD04C8F7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
532544
{374D4000-DEDE-4995-9B63-E3B9FE0C4D29} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
533545
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
@@ -553,5 +565,6 @@ Global
553565
{5764A3A4-586C-4536-8481-13007CAC111B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
554566
{59D1B5DC-9175-43EC-90C6-CBA601B3565F} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
555567
{BEC9ECE9-A3D6-4B24-A682-1FA890647D9D} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
568+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
556569
EndGlobalSection
557570
EndGlobal

‎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.25-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
61+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.26-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.25-preview" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common.Authentication" version="1.0.26-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: 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.25-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
61+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.26-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
6262
</Reference>
6363
<Reference Include="Microsoft.Azure.Common.NetFramework">
6464
<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.25-preview" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common.Authentication" version="1.0.26-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.9.1";
30+
public const string AssemblyVersion = "0.9.2";
3131

32-
public const string AssemblyFileVersion = "0.9.1";
32+
public const string AssemblyFileVersion = "0.9.2";
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.25-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
63+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.26-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/Properties/Resources.Designer.cs

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,4 +1358,7 @@ use and privacy statement at &lt;url&gt; and (c) agree to sharing my contact inf
13581358
<data name="AzureProfileMustNotBeNull" xml:space="preserve">
13591359
<value>Selected profile must not be null.</value>
13601360
</data>
1361+
<data name="SwitchAzureModeDeprecated" xml:space="preserve">
1362+
<value>The Switch-AzureMode cmdlet is deprecated and will be removed in a future release.</value>
1363+
</data>
13611364
</root>

‎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.25-preview" targetFramework="net45" />
6+
<package id="Microsoft.Azure.Common.Authentication" version="1.0.26-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/Commands.Profile.csproj

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

‎src/Common/Commands.Profile/Models/PsAzureSubscription.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,29 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15+
using System.Linq;
16+
using Microsoft.Azure.Common.Authentication;
1517
using Microsoft.Azure.Common.Authentication.Models;
1618

1719
namespace Microsoft.WindowsAzure.Commands.Profile.Models
1820
{
1921
public class PSAzureSubscription
2022
{
23+
public PSAzureSubscription() {}
24+
public PSAzureSubscription(AzureSubscription subscription, AzureProfile profile)
25+
{
26+
SubscriptionId = subscription.Id.ToString();
27+
SubscriptionName = subscription.Name;
28+
Environment = subscription.Environment;
29+
SupportedModes = subscription.GetProperty(AzureSubscription.Property.SupportedModes);
30+
DefaultAccount = subscription.Account;
31+
Accounts = profile.Accounts.Values.Where(a => a.HasSubscription(subscription.Id)).ToArray();
32+
IsDefault = subscription.IsPropertySet(AzureSubscription.Property.Default);
33+
IsCurrent = profile.Context.Subscription != null && profile.Context.Subscription.Id == subscription.Id;
34+
CurrentStorageAccountName = subscription.GetProperty(AzureSubscription.Property.StorageAccount);
35+
TenantId = subscription.GetPropertyAsArray(AzureSubscription.Property.Tenants).FirstOrDefault();
36+
}
37+
2138
public string SubscriptionId { get; set; }
2239
public string SubscriptionName { get; set; }
2340
public string Environment { get; set; }

‎src/Common/Commands.Profile/Models/PsAzureSubscriptionExtended.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public PSAzureSubscriptionExtended(PSAzureSubscription subscription)
2929
base.Accounts = subscription.Accounts;
3030
base.IsDefault = subscription.IsDefault;
3131
base.IsCurrent = subscription.IsCurrent;
32+
base.TenantId = subscription.TenantId;
3233
}
3334
public string ActiveDirectoryUserId { get; set; }
3435
public AzureAccount Account { get; set; }

‎src/Common/Commands.Profile/Subscription/GetAzureSubscription.cs

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace Microsoft.WindowsAzure.Commands.Profile
3232
/// the AzureProfile layer.
3333
/// </summary>
3434
[Cmdlet(VerbsCommon.Get, "AzureSubscription", DefaultParameterSetName = "ByName")]
35-
[OutputType(typeof(AzureSubscription))]
35+
[OutputType(typeof(PSAzureSubscription))]
3636
public class GetAzureSubscriptionCommand : SubscriptionCmdletBase
3737
{
3838
public GetAzureSubscriptionCommand()
@@ -141,29 +141,12 @@ private void WriteSubscriptions(IEnumerable<AzureSubscription> subscriptions)
141141
}
142142
else
143143
{
144-
subscriptionOutput = subscriptions.Select(ConstructPsAzureSubscription);
144+
subscriptionOutput = subscriptions.Select(s => new PSAzureSubscription(s, ProfileClient.Profile));
145145
}
146146

147147
WriteObject(subscriptionOutput, true);
148148
}
149149

150-
private PSAzureSubscription ConstructPsAzureSubscription(AzureSubscription subscription)
151-
{
152-
PSAzureSubscription psObject = new PSAzureSubscription();
153-
154-
psObject.SubscriptionId = subscription.Id.ToString();
155-
psObject.SubscriptionName = subscription.Name;
156-
psObject.Environment = subscription.Environment;
157-
psObject.SupportedModes = subscription.GetProperty(AzureSubscription.Property.SupportedModes);
158-
psObject.DefaultAccount = subscription.Account;
159-
psObject.Accounts = ProfileClient.Profile.Accounts.Values.Where(a => a.HasSubscription(subscription.Id)).ToArray();
160-
psObject.IsDefault = subscription.IsPropertySet(AzureSubscription.Property.Default);
161-
psObject.IsCurrent = Profile.Context.Subscription != null && Profile.Context.Subscription.Id == subscription.Id;
162-
psObject.CurrentStorageAccountName = subscription.GetProperty(AzureSubscription.Property.StorageAccount);
163-
psObject.TenantId = subscription.GetPropertyAsArray(AzureSubscription.Property.Tenants).FirstOrDefault();
164-
return psObject;
165-
}
166-
167150
private PSAzureSubscriptionExtended ConstructPsAzureSubscriptionExtended(AzureSubscription subscription, IClientFactory clientFactory)
168151
{
169152
using (var client = clientFactory.CreateClient<ManagementClient>(Profile, subscription, AzureEnvironment.Endpoint.ServiceManagement))
@@ -172,8 +155,8 @@ private PSAzureSubscriptionExtended ConstructPsAzureSubscriptionExtended(AzureSu
172155
var environment = ProfileClient.GetEnvironmentOrDefault(subscription.Environment);
173156
var account = ProfileClient.Profile.Accounts[subscription.Account];
174157
bool isCert = account.Type == AzureAccount.AccountType.Certificate;
175-
176-
PSAzureSubscriptionExtended result = new PSAzureSubscriptionExtended(ConstructPsAzureSubscription(subscription))
158+
var psAzureSubscription = new PSAzureSubscription(subscription, ProfileClient.Profile);
159+
PSAzureSubscriptionExtended result = new PSAzureSubscriptionExtended(psAzureSubscription)
177160
{
178161
AccountAdminLiveEmailId = response.AccountAdminLiveEmailId,
179162
ActiveDirectoryUserId = subscription.Account,

‎src/Common/Commands.Profile/Subscription/SelectAzureSubscription.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@
2020
using Microsoft.WindowsAzure.Commands.Common.Properties;
2121
using Microsoft.WindowsAzure.Commands.Utilities.Profile;
2222
using Microsoft.Azure.Common.Authentication;
23+
using Microsoft.WindowsAzure.Commands.Profile.Models;
2324

2425
namespace Microsoft.WindowsAzure.Commands.Profile
2526
{
2627

2728

2829
[Cmdlet(VerbsCommon.Select, "AzureSubscription", DefaultParameterSetName = SelectSubscriptionByNameParameterSet)]
29-
[OutputType(typeof(AzureSubscription))]
30+
[OutputType(typeof(PSAzureSubscription))]
3031
public class SelectAzureSubscriptionCommand : SubscriptionCmdletBase
3132
{
3233
private const string SelectSubscriptionByIdParameterSet = "SelectSubscriptionByIdParameterSet";
@@ -123,7 +124,7 @@ public override void ExecuteCmdlet()
123124

124125
if (PassThru.IsPresent && azureSubscription != null)
125126
{
126-
WriteObject(azureSubscription);
127+
WriteObject(new PSAzureSubscription(azureSubscription, ProfileClient.Profile));
127128
}
128129
}
129130

0 commit comments

Comments
 (0)