Skip to content

Clu #328

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 2 commits into from
Jan 14, 2016
Merged

Clu #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a1048d
Fix bad warning message.
Jan 14, 2016
473f58f
Merge pull request #1658 from hovsepm/clu
Jan 14, 2016
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
1 change: 0 additions & 1 deletion src/CLU/Commands.ResourceManager.Cmdlets/Extensions/ResourceExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ internal static PSResourceObject ToPSResourceObject(this Resource<JToken> resour
psObject.SubscriptionId = string.IsNullOrEmpty(resource.Id) ? null : ResourceIdUtility.GetSubscriptionId(resource.Id);
psObject.Tags = TagsHelper.GetTagsHashtables(resource.Tags);


var objectProperties = objectDefinition.Where(kvp => kvp.Value != null).SelectManyArray(kvp => new[] { kvp.Key, kvp.Value });

for(int i=0; i< objectProperties.Length; i+=2)
Expand Down
3 changes: 1 addition & 2 deletions src/CLU/Microsoft.Azure.Commands.Profile/Models/RMProfileClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,8 +513,7 @@ private bool TryGetTenantSubscription(IAccessToken accessToken,
if (subscriptions.Any())
{
WriteWarningMessage(string.Format(
"TenantId '{0}' contains more than one subscription. First one will be selected for further use. " +
"To select another subscription, use Set-AzureRmContext.",
Resources.TooManyTenants,
tenantId));
}
subscriptionFromServer = subscriptions.First();
Expand Down
9 changes: 9 additions & 0 deletions src/CLU/Microsoft.Azure.Commands.Profile/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.

3 changes: 3 additions & 0 deletions src/CLU/Microsoft.Azure.Commands.Profile/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@
<data name="TenantIdNotFound" xml:space="preserve">
<value>Unable to find tenant '{0}'.</value>
</data>
<data name="TooManyTenants" xml:space="preserve">
<value>TenantId '{0}' contains more than one subscription. First one will be selected for further use. To select another subscription, use 'context set' cmdlet.</value>
</data>
<data name="TypeNotAccessToken" xml:space="preserve">
<value>To create an access token credential, you must provide an access token account.</value>
</data>
Expand Down