Skip to content

Commit ad974b7

Browse files
huangpfhuangpf
committed
Merge pull request #89 from Azure/dev
.
2 parents aa35f44 + 98d8eb3 commit ad974b7

File tree

431 files changed

+31520
-18113
lines changed

Some content is hidden

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

431 files changed

+31520
-18113
lines changed

‎src/Common/AzurePSCmdlet.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,10 @@ protected void ConfirmAction(bool force, string actionMessage, string processMes
485485

486486
protected virtual void Dispose(bool disposing)
487487
{
488-
_adalListener.Dispose();
488+
if (_adalListener != null)
489+
{
490+
_adalListener.Dispose();
491+
}
489492
}
490493

491494
public void Dispose()

‎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.1.4-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
61+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.2.2-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.1.4-preview" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common.Authentication" version="1.2.2-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.7-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.1.4-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
61+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.2.2-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/Common/ProfileClientTests.cs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ public void NewProfileWithAccessTokenReturnsProfile()
153153
Assert.Equal("AzureCloud", newProfile.DefaultSubscription.Environment);
154154
Assert.Equal(new Guid(csmSubscription1.SubscriptionId), newProfile.DefaultSubscription.Id);
155155
Assert.Equal("accountId", newProfile.DefaultSubscription.Account);
156-
Assert.Equal(AzureAccount.AccountType.AccessToken, newProfile.DefaultContext.Account.Type);
157-
Assert.Equal("accessToken", newProfile.DefaultContext.Account.Properties[AzureAccount.Property.AccessToken]);
156+
Assert.Equal(AzureAccount.AccountType.AccessToken, newProfile.Context.Account.Type);
157+
Assert.Equal("accessToken", newProfile.Context.Account.Properties[AzureAccount.Property.AccessToken]);
158158
Assert.False(newProfile.DefaultSubscription.Properties.ContainsKey(AzureSubscription.Property.StorageAccount));
159159
}
160160

@@ -703,15 +703,15 @@ public void RemoveAzureAccountRemovesInMemoryAccount()
703703

704704
client.RemoveAccount(azureAccount.Id);
705705

706-
Assert.Equal("test2", currentProfile.DefaultContext.Account.Id);
707-
Assert.Equal("test2", currentProfile.DefaultContext.Subscription.Account);
708-
Assert.Equal(azureSubscription1.Id, currentProfile.DefaultContext.Subscription.Id);
706+
Assert.Equal("test2", currentProfile.Context.Account.Id);
707+
Assert.Equal("test2", currentProfile.Context.Subscription.Account);
708+
Assert.Equal(azureSubscription1.Id, currentProfile.Context.Subscription.Id);
709709

710710
client.RemoveAccount("test2");
711711

712-
Assert.Null(currentProfile.DefaultContext.Account);
713-
Assert.Null(currentProfile.DefaultContext.Subscription);
714-
Assert.Null(currentProfile.DefaultContext.Environment);
712+
Assert.Null(currentProfile.Context.Account);
713+
Assert.Null(currentProfile.Context.Subscription);
714+
Assert.Null(currentProfile.Context.Environment);
715715
}
716716

717717
[Fact]
@@ -906,9 +906,9 @@ public void AddOrSetAzureSubscriptionUpdatesInMemory()
906906
client.AddOrSetSubscription(azureSubscription1);
907907
currentProfile.DefaultSubscription = azureSubscription1;
908908
azureSubscription1.Properties[AzureSubscription.Property.StorageAccount] = "testAccount";
909-
Assert.Equal(azureSubscription1.Id, currentProfile.DefaultContext.Subscription.Id);
909+
Assert.Equal(azureSubscription1.Id, currentProfile.Context.Subscription.Id);
910910
Assert.Equal(azureSubscription1.Properties[AzureSubscription.Property.StorageAccount],
911-
currentProfile.DefaultContext.Subscription.Properties[AzureSubscription.Property.StorageAccount]);
911+
currentProfile.Context.Subscription.Properties[AzureSubscription.Property.StorageAccount]);
912912

913913
var newSubscription = new AzureSubscription
914914
{
@@ -922,10 +922,10 @@ public void AddOrSetAzureSubscriptionUpdatesInMemory()
922922
client.AddOrSetSubscription(newSubscription);
923923
var newSubscriptionFromProfile = client.Profile.Subscriptions[newSubscription.Id];
924924

925-
Assert.Equal(newSubscription.Id, currentProfile.DefaultContext.Subscription.Id);
925+
Assert.Equal(newSubscription.Id, currentProfile.Context.Subscription.Id);
926926
Assert.Equal(newSubscription.Id, newSubscriptionFromProfile.Id);
927927
Assert.Equal(newSubscription.Properties[AzureSubscription.Property.StorageAccount],
928-
currentProfile.DefaultContext.Subscription.Properties[AzureSubscription.Property.StorageAccount]);
928+
currentProfile.Context.Subscription.Properties[AzureSubscription.Property.StorageAccount]);
929929
Assert.Equal(newSubscription.Properties[AzureSubscription.Property.StorageAccount],
930930
newSubscriptionFromProfile.Properties[AzureSubscription.Property.StorageAccount]);
931931
}
@@ -1096,9 +1096,9 @@ public void SetAzureSubscriptionAsDefaultSetsDefaultAndCurrent()
10961096
client.SetSubscriptionAsDefault(azureSubscription2.Name, azureSubscription2.Account);
10971097

10981098
Assert.Equal(azureSubscription2.Id, client.Profile.DefaultSubscription.Id);
1099-
Assert.Equal(azureSubscription2.Id, currentProfile.DefaultContext.Subscription.Id);
1100-
Assert.Equal(azureSubscription2.Account, currentProfile.DefaultContext.Account.Id);
1101-
Assert.Equal(azureSubscription2.Environment, currentProfile.DefaultContext.Environment.Name);
1099+
Assert.Equal(azureSubscription2.Id, currentProfile.Context.Subscription.Id);
1100+
Assert.Equal(azureSubscription2.Account, currentProfile.Context.Account.Id);
1101+
Assert.Equal(azureSubscription2.Environment, currentProfile.Context.Environment.Name);
11021102
var notFoundEx = Assert.Throws<ArgumentException>(() => client.SetSubscriptionAsDefault("bad", null));
11031103
var invalidEx = Assert.Throws<ArgumentException>(() => client.SetSubscriptionAsDefault(null, null));
11041104
Assert.Contains("doesn't exist", notFoundEx.Message);
@@ -1123,9 +1123,9 @@ public void ClearDefaultAzureSubscriptionClearsDefault()
11231123
client.ClearDefaultSubscription();
11241124

11251125
Assert.Null(client.Profile.DefaultSubscription);
1126-
Assert.Null(client.Profile.DefaultContext.Account);
1127-
Assert.Null(client.Profile.DefaultContext.Environment);
1128-
Assert.Null(client.Profile.DefaultContext.Subscription);
1126+
Assert.Null(client.Profile.Context.Account);
1127+
Assert.Null(client.Profile.Context.Environment);
1128+
Assert.Null(client.Profile.Context.Subscription);
11291129
}
11301130

11311131
[Fact]

‎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.1.4-preview" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common.Authentication" version="1.2.2-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />

‎src/Common/Commands.Common/AzureSMCmdlet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private get
6363

6464
protected static TokenCache DefaultMemoryTokenCache { get; set; }
6565

66-
protected override AzureContext DefaultContext { get { return CurrentProfile.DefaultContext; } }
66+
protected override AzureContext DefaultContext { get { return CurrentProfile.Context; } }
6767

6868
static AzureSMCmdlet()
6969
{

‎src/Common/Commands.Common/CloudBaseCmdlet.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ protected virtual void InitChannelCurrentSubscription(bool force)
8181

8282
protected void DoInitChannelCurrentSubscription(bool force)
8383
{
84-
if (Profile.DefaultContext.Subscription == null)
84+
if (Profile.Context.Subscription == null)
8585
{
8686
throw new ArgumentException(Resources.InvalidDefaultSubscription);
8787
}
8888

89-
if (Profile.DefaultContext.Account == null)
89+
if (Profile.Context.Account == null)
9090
{
9191
throw new ArgumentException(Resources.AccountNeedsToBeSpecified);
9292
}
@@ -127,19 +127,19 @@ protected virtual T CreateChannel()
127127
return Channel;
128128
}
129129

130-
string certificateThumbprint = Profile.DefaultContext.Account.Id;
130+
string certificateThumbprint = Profile.Context.Account.Id;
131131
Debug.Assert(Profile.Accounts[certificateThumbprint].Type == AzureAccount.AccountType.Certificate);
132132

133133
return ChannelHelper.CreateServiceManagementChannel<T>(
134134
ServiceBinding,
135-
Profile.DefaultContext.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ServiceManagement),
135+
Profile.Context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ServiceManagement),
136136
AzureSession.DataStore.GetCertificate(certificateThumbprint),
137137
new HttpRestMessageInspector(WriteDebug));
138138
}
139139

140140
protected void RetryCall(Action<string> call)
141141
{
142-
RetryCall(Profile.DefaultContext.Subscription.Id, call);
142+
RetryCall(Profile.Context.Subscription.Id, call);
143143
}
144144

145145
protected void RetryCall(Guid subsId, Action<string> call)
@@ -172,7 +172,7 @@ protected void RetryCall(Guid subsId, Action<string> call)
172172

173173
protected TResult RetryCall<TResult>(Func<string, TResult> call)
174174
{
175-
return RetryCall(Profile.DefaultContext.Subscription.Id, call);
175+
return RetryCall(Profile.Context.Subscription.Id, call);
176176
}
177177

178178
protected TResult RetryCall<TResult>(Guid subsId, Func<string, TResult> call)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
</Reference>
6666
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6767
<SpecificVersion>False</SpecificVersion>
68-
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.1.4-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
68+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.2.2-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
6969
</Reference>
7070
<Reference Include="Microsoft.Azure.Common.NetFramework">
7171
<SpecificVersion>False</SpecificVersion>

‎src/Common/Commands.Common/ProfileClient.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ public AzureAccount GetAccountOrDefault(string accountName)
371371
{
372372
if (string.IsNullOrEmpty(accountName))
373373
{
374-
return Profile.DefaultContext.Account;
374+
return Profile.Context.Account;
375375
}
376376
else if (Profile.Accounts.ContainsKey(accountName))
377377
{
@@ -1040,7 +1040,7 @@ public AzureEnvironment GetEnvironmentOrDefault(string name)
10401040
else if (string.IsNullOrEmpty(name) &&
10411041
Profile.DefaultSubscription != null)
10421042
{
1043-
return Profile.DefaultContext.Environment;
1043+
return Profile.Context.Environment;
10441044
}
10451045
else if (Profile.Environments.ContainsKey(name))
10461046
{

‎src/Common/Commands.Common/RPRegistrationAction.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ public class RPRegistrationAction : IClientAction
3131
private void RegisterResourceManagerProviders<T>(IAzureProfile profile)
3232
{
3333
var providersToRegister = RequiredResourceLookup.RequiredProvidersForResourceManager<T>();
34-
var registeredProviders = profile.DefaultContext.Subscription.GetPropertyAsArray(AzureSubscription.Property.RegisteredResourceProviders);
34+
var registeredProviders = profile.Context.Subscription.GetPropertyAsArray(AzureSubscription.Property.RegisteredResourceProviders);
3535
var unregisteredProviders = providersToRegister.Where(p => !registeredProviders.Contains(p)).ToList();
3636
var successfullyRegisteredProvider = new List<string>();
37-
SubscriptionCloudCredentials creds = AzureSession.AuthenticationFactory.GetSubscriptionCloudCredentials(profile.DefaultContext);
37+
SubscriptionCloudCredentials creds = AzureSession.AuthenticationFactory.GetSubscriptionCloudCredentials(profile.Context);
3838

3939
if (unregisteredProviders.Count > 0)
4040
{
4141
using (var client = ClientFactory.CreateCustomClient<ResourceManagementClient>(
4242
creds,
43-
profile.DefaultContext.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager)))
43+
profile.Context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager)))
4444
{
4545
foreach (string provider in unregisteredProviders)
4646
{
@@ -64,17 +64,17 @@ private void RegisterResourceManagerProviders<T>(IAzureProfile profile)
6464
/// <typeparam name="T">The client type</typeparam>
6565
private void RegisterServiceManagementProviders<T>(AzureSMProfile profile)
6666
{
67-
var credentials = AzureSession.AuthenticationFactory.GetSubscriptionCloudCredentials(profile.DefaultContext);
67+
var credentials = AzureSession.AuthenticationFactory.GetSubscriptionCloudCredentials(profile.Context);
6868
var providersToRegister = RequiredResourceLookup.RequiredProvidersForServiceManagement<T>();
69-
var registeredProviders = profile.DefaultContext.Subscription.GetPropertyAsArray(AzureSubscription.Property.RegisteredResourceProviders);
69+
var registeredProviders = profile.Context.Subscription.GetPropertyAsArray(AzureSubscription.Property.RegisteredResourceProviders);
7070
var unregisteredProviders = providersToRegister.Where(p => !registeredProviders.Contains(p)).ToList();
7171
var successfullyRegisteredProvider = new List<string>();
7272

7373
if (unregisteredProviders.Count > 0)
7474
{
7575
using (var client = new ManagementClient(
7676
credentials,
77-
profile.DefaultContext.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ServiceManagement)))
77+
profile.Context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ServiceManagement)))
7878
{
7979
foreach (var provider in unregisteredProviders)
8080
{
@@ -97,7 +97,7 @@ private void RegisterServiceManagementProviders<T>(AzureSMProfile profile)
9797
}
9898

9999
Debug.Assert(profile is AzureSMProfile);
100-
UpdateSubscriptionRegisteredProviders((AzureSMProfile)profile, profile.DefaultContext.Subscription, successfullyRegisteredProvider);
100+
UpdateSubscriptionRegisteredProviders((AzureSMProfile)profile, profile.Context.Subscription, successfullyRegisteredProvider);
101101
}
102102
}
103103

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.ApplicationInsights" version="1.1.1-beta" targetFramework="net45" />
55
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Common.Authentication" version="1.1.4-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Common.Authentication" version="1.2.2-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
1010
<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
@@ -54,7 +54,7 @@
5454
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
5555
</Reference>
5656
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57-
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.1.4-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
57+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.2.2-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
5858
<Private>True</Private>
5959
</Reference>
6060
<Reference Include="Microsoft.Azure.Common.NetFramework">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public PSAzureSubscription(AzureSubscription subscription, AzureSMProfile profil
2929
DefaultAccount = subscription.Account;
3030
Accounts = profile.Accounts.Values.Where(a => a.HasSubscription(subscription.Id)).ToArray();
3131
IsDefault = subscription.IsPropertySet(AzureSubscription.Property.Default);
32-
IsCurrent = profile.DefaultContext != null && profile.DefaultContext.Subscription.Id == subscription.Id;
32+
IsCurrent = profile.Context != null && profile.Context.Subscription.Id == subscription.Id;
3333
CurrentStorageAccountName = subscription.GetProperty(AzureSubscription.Property.StorageAccount);
3434
TenantId = subscription.GetPropertyAsArray(AzureSubscription.Property.Tenants).FirstOrDefault();
3535
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ public override void ExecuteCmdlet()
6666
{
6767
case "ByName":
6868
IEnumerable<AzureSubscription> subscriptions = new AzureSubscription[0];
69-
if (Profile.DefaultContext != null && Profile.DefaultContext.Environment != null)
69+
if (Profile.Context != null && Profile.Context.Environment != null)
7070
{
71-
subscriptions = ProfileClient.RefreshSubscriptions(Profile.DefaultContext.Environment)
71+
subscriptions = ProfileClient.RefreshSubscriptions(Profile.Context.Environment)
7272
.Where(
7373
s =>
7474
SubscriptionName == null ||
@@ -113,7 +113,7 @@ public void GetCurrent()
113113
// since current is strictly in-memory and we want the real
114114
// current subscription.
115115
//
116-
if (Profile.DefaultContext.Subscription == null)
116+
if (Profile.Context.Subscription == null)
117117
{
118118
WriteError(new ErrorRecord(
119119
new InvalidOperationException(Resources.InvalidSelectedSubscription),
@@ -122,7 +122,7 @@ public void GetCurrent()
122122
}
123123
else
124124
{
125-
WriteSubscriptions(Profile.DefaultContext.Subscription);
125+
WriteSubscriptions(Profile.Context.Subscription);
126126
}
127127
}
128128

0 commit comments

Comments
 (0)