Resolving CR comments

Author: pragupta-ms

src/ServiceManagement/Services/Commands.Utilities/Websites/WebsitesClient.cs

@@ -20,6 +20,7 @@
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Web;
 using System.Xml.Linq;
 using Microsoft.Build.Evaluation;
@@ -1361,25 +1362,30 @@ private DeploymentBaseOptions CreateRemoteDeploymentBaseOptions(string websiteNa
                 TempAgent = false
             };
 
-            var azureSessionUserAgent = GetUserAgentForAzureSession();
+            var azureSessionUserAgent = GetDeploymentBaseOptionsUserAgent();
             if (!string.IsNullOrEmpty(azureSessionUserAgent))
             {
                 remoteBaseOptions.UserAgent = azureSessionUserAgent;
             }
 
             return remoteBaseOptions;
         }
-        
+
         /// <summary>
-        /// Gets user agent for azure session
+        /// Gets remote deployment base options useragent using AzureSession/WebSiteManagementClient.
         /// </summary>
-        /// <returns>useragent string </returns>
-        private string GetUserAgentForAzureSession()
+        /// <returns>useragent string.</returns>
+        private string GetDeploymentBaseOptionsUserAgent()
         {
             var userAgent = string.Empty;
-            if (AzureSession.ClientFactory.UserAgents != null)
+            var managementClient = this.WebsiteManagementClient as WebSiteManagementClient;
+            var userAgents = AzureSession.ClientFactory.UserAgents.Any()
+                    ? AzureSession.ClientFactory.UserAgents as IEnumerable<ProductInfoHeaderValue>
+                    : (managementClient != null) ? managementClient.UserAgent : null;
+
+            if (userAgents != null)
             {
-                foreach (var agent in AzureSession.ClientFactory.UserAgents)
+                foreach (var agent in userAgents)
                 {
                     if (agent != null && agent.Product != null && !string.IsNullOrEmpty(agent.Product.Name))
                     {