Minor changes for interactive subscription selection (#24873)

* Minor changes for interactive subscription selection

* remove extra line

Author: BethanyZhou

src/Accounts/Accounts/Account/ConnectAzureRmAccount.cs

@@ -591,8 +591,8 @@ public override void ExecuteCmdlet()
                     }
                 });
 
-                WriteInformation($"[Announcements]{System.Environment.NewLine}Share your feedback regarding your experience with `Connect-AzAccount` at: https://aka.ms/azloginfeedback{System.Environment.NewLine}");
-                WriteInformation($"If you encounter any problem, please open an issue at: https://aka.ms/azpsissue{System.Environment.NewLine}");
+                WriteInformation($"{Resources.AnnouncementsHeader}{System.Environment.NewLine}{Resources.AnnouncementsMessage}{System.Environment.NewLine}");
+                WriteInformation($"{Resources.ReportIssue}{System.Environment.NewLine}");
             }
         }
 

src/Accounts/Accounts/Models/RMProfileClient.cs

@@ -148,8 +148,8 @@ public AzureRmProfile Login(
             List<AzureSubscription> tempSubscriptions = null;
             string tenantName = null;
 
-            var lastUsedSubscription = isInteractiveAuthenticationFlow && string.IsNullOrEmpty(subscriptionId) && string.IsNullOrEmpty(subscriptionName) ? _profile?.DefaultContext?.Subscription : null;
-            bool selectSubscriptionFromList = isInteractiveAuthenticationFlow && IsInteractiveContextSelectionEnabled;
+            bool selectSubscriptionFromList = isInteractiveAuthenticationFlow && IsInteractiveContextSelectionEnabled && string.IsNullOrEmpty(subscriptionId) && string.IsNullOrEmpty(subscriptionName);
+            var lastUsedSubscription = selectSubscriptionFromList ? _profile?.DefaultContext?.Subscription : null;
 
             string promptBehavior =
                 (password == null &&
@@ -402,7 +402,7 @@ public AzureRmProfile Login(
             if (shouldPopulateContextList && maxContextPopulation != 0)
             {
                 var defaultContext = _profile.DefaultContext;
-                var populatedSubscriptions = maxContextPopulation > 0 && !isInteractiveAuthenticationFlow ? ListSubscriptions(tenantIdOrName).Take(maxContextPopulation) : ListSubscriptions(tenantIdOrName);
+                var populatedSubscriptions = (maxContextPopulation < 0 || selectSubscriptionFromList) ? ListSubscriptions(tenantIdOrName) : ListSubscriptions(tenantIdOrName).Take(maxContextPopulation);
 
                 foreach (var subscription in populatedSubscriptions)
                 {

src/Accounts/Accounts/Properties/Resources.Designer.cs

@@ -622,4 +622,13 @@
   <data name="TypedSubscriptionNotNumber" xml:space="preserve">
     <value>Typed subscription is not a number.</value>
   </data>
+  <data name="AnnouncementsHeader" xml:space="preserve">
+    <value>[Announcements]</value>
+  </data>
+  <data name="AnnouncementsMessage" xml:space="preserve">
+    <value>With the new Azure PowerShell login experience, you can select the subscription you want to use more easily. Learn more about it and its configuration at https://go.microsoft.com/fwlink/?linkid=2271236. Share your feedback regarding your experience with `Connect-AzAccount` at: https://aka.ms/azloginfeedback</value>
+  </data>
+  <data name="ReportIssue" xml:space="preserve">
+    <value>If you encounter any problem, please open an issue at: https://aka.ms/azpsissue</value>
+  </data>
 </root>