Fixed help information for Set-AzureRmContext

Author: Hovsep Mkrtchyan

src/ResourceManager/Profile/Commands.Profile/Context/SetAzureRMContext.cs

@@ -57,8 +57,19 @@ protected override void ProcessRecord()
                 AzureRmProfileProvider.Instance.Profile.SetContextWithCache(new AzureContext(Context.Subscription, Context.Account,
                     Context.Environment, Context.Tenant));
             }
+            else if (ParameterSetName == SubscriptionIdParameterSet)
+            {
+                var profileClient = new RMProfileClient(AzureRmProfileProvider.Instance.Profile);
+                profileClient.SetCurrentContext(SubscriptionId, TenantId);
+            }
             else if (ParameterSetName == SubscriptionNameParameterSet)
             {
+                if(string.IsNullOrWhiteSpace(TenantId) &&
+                   string.IsNullOrWhiteSpace(SubscriptionName))
+                {
+                    throw new PSInvalidOperationException(Resources.SetAzureRmContextNoParameterSet);
+                }
+
                 var profileClient = new RMProfileClient(AzureRmProfileProvider.Instance.Profile);
                 AzureSubscription subscription = null;
                 string tenantId = AzureRmProfileProvider.Instance.Profile.Context.Tenant.Id.ToString();
@@ -94,14 +105,10 @@ protected override void ProcessRecord()
                 {
                     // authenticate with just tenant id
                     var accessToken = profileClient.AcureAccessToken(tenantId);
-                    profileClient.SetCurrentContext(tenantId);
+                    profileClient.SetCurrentContext(accessToken.TenantId);
                 }
             }
-            else if (ParameterSetName == SubscriptionIdParameterSet)
-            {
-                var profileClient = new RMProfileClient(AzureRmProfileProvider.Instance.Profile);
-                profileClient.SetCurrentContext(SubscriptionId, TenantId);
-            }
+            
             WriteObject((PSAzureContext)AzureRmProfileProvider.Instance.Profile.Context);
         }
     }

src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.xml

@@ -2109,7 +2109,7 @@ Subscription Name: Contoso Subscription 1</maml:para>
           </maml:description>
           <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
         </command:parameter>
-        <command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
+        <command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
           <maml:name>SubscriptionId</maml:name>
           <maml:description>
             <maml:para>The Subscription Id for executed cmdlets to use.</maml:para>
@@ -2189,7 +2189,7 @@ Subscription Name: Contoso Subscription 1</maml:para>
           <command:parameterValue required="true" variableLength="false">AzureTenant</command:parameterValue>
         </command:parameter>
         <command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
-          <maml:name>Subscription</maml:name>
+          <maml:name>SubscriptionId</maml:name>
           <maml:description>
             <maml:para>The subscription to target in this session.</maml:para>
           </maml:description>

src/ResourceManager/Profile/Commands.Profile/Properties/Resources.Designer.cs

@@ -144,6 +144,9 @@
   <data name="NoValidTenant" xml:space="preserve">
     <value>Please provide a valid tenant Id on the command line or execute Login-AzureRmAccount.</value>
   </data>
+  <data name="SetAzureRmContextNoParameterSet" xml:space="preserve">
+    <value>Please provide either a subscription ID, subscription name, tenant Id or domain.</value>
+  </data>
   <data name="SubscriptionNameNotFoundError" xml:space="preserve">
     <value>Unable to find subscription with name '{0}'.</value>
   </data>