Update userAgent of autogen cmdlet (#15939)

Author: dingmeng-xue

src/Accounts/Accounts/CommonModule/UserAgent.cs

@@ -12,13 +12,14 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using System;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Management.Automation;
 using System.Net.Http;
-using Microsoft.Azure.Commands.Common.Authentication;
 using System.Net.Http.Headers;
-using System.Management.Automation;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace Microsoft.Azure.Commands.Common
 {
@@ -30,16 +31,18 @@ namespace Microsoft.Azure.Commands.Common
     /// </summary>
     public class UserAgent
     {
-        Version _version;
+        private ProductInfoHeaderValue[] _userAgents;
 
         public UserAgent(InvocationInfo invocation)
-            : this(invocation?.MyCommand?.Module?.Version ?? new Version("1.0.0"))
         {
-        }
-
-        public UserAgent(Version moduleVersion)
-        {
-            _version = moduleVersion;
+            List<ProductInfoHeaderValue> list = new List<ProductInfoHeaderValue>();
+            string azVersion = (String.IsNullOrWhiteSpace(AzurePSCmdlet.AzVersion)) ? "0.0.0" : AzurePSCmdlet.AzVersion;
+            list.Add(new ProductInfoHeaderValue("AzurePowershell", $"v{azVersion}"));
+            if(!String.IsNullOrWhiteSpace(AzurePSCmdlet.PowerShellVersion))
+            {
+                list.Add(new ProductInfoHeaderValue("PSVersion", $"v{AzurePSCmdlet.PowerShellVersion}"));
+            }
+            _userAgents = list.ToArray();
         }
 
         /// <summary>
@@ -53,10 +56,7 @@ public UserAgent(Version moduleVersion)
         /// <returns>Amended pipeline for retrieving a response</returns>
         public Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken token, Action cancel, SignalDelegate signal, NextDelegate next)
         {
-            var userAgents = new ProductInfoHeaderValue[] { new ProductInfoHeaderValue("AzurePowershell", $"Az4.0.0-preview") };
-            // add user agent headers
-
-            foreach (var userAgent in userAgents)
+            foreach (var userAgent in _userAgents)
             {
                 request.Headers.UserAgent.Add(userAgent);
             }