Merge pull request #16 from Microsoft/users/aldoms/userAgent

Users/aldoms/user agent

Author: aldoms

CredentialProvider.Microsoft.VSIX/Microsoft.CredentialProvider.swixproj

@@ -3,7 +3,7 @@
   <Import Project="packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props" />
 
   <PropertyGroup>
-    <ProductVersion>0.1.1</ProductVersion>
+    <ProductVersion>0.1.2</ProductVersion>
     <ProjectGuid>4966bd57-3289-44a3-9698-f750a35b726b</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
     <OutputArchitecture>neutral</OutputArchitecture>

CredentialProvider.Microsoft.VSIX/Microsoft.CredentialProvider.swr

@@ -1,7 +1,7 @@
 use vs
 
 package name=Microsoft.CredentialProvider
-        version=0.1.1
+        version=0.1.2
 
 folder InstallDir:\Common7\IDE\CommonExtensions\Microsoft\NuGet\Plugins\CredentialProvider.Microsoft
   file source=$(PluginBinPath)\CredentialProvider.Microsoft.exe

CredentialProvider.Microsoft/CredentialProvider.Microsoft.csproj

@@ -5,7 +5,7 @@
     <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <ApplicationIcon>helpericons.ico</ApplicationIcon>
-    <Version>0.1.1</Version>
+    <Version>0.1.2</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

CredentialProvider.Microsoft/CredentialProvider.Microsoft.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Microsoft.NuGet.CredentialProvider</id>
-    <version>0.1.1$VersionSuffix$</version>
+    <version>0.1.2$VersionSuffix$</version>
     <title>Microsoft Credential Provider for NuGet</title>
     <authors>Microsoft</authors>
     <owners>microsoft,nugetvss</owners>

CredentialProvider.Microsoft/CredentialProviders/Vsts/IAuthUtil.cs

@@ -115,6 +115,12 @@ protected virtual async Task<HttpResponseHeaders> GetResponseHeadersAsync(Uri ur
             using (var httpClient = new HttpClient())
             using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
             {
+                foreach (var userAgent in Program.UserAgent)
+                {
+                    httpClient.DefaultRequestHeaders.UserAgent.Add(userAgent);
+                }
+
+
                 logger.Verbose($"GET {uri}");
                 using (var response = await httpClient.SendAsync(request, cancellationToken))
                 {

CredentialProvider.Microsoft/CredentialProviders/Vsts/VstsSessionTokenClient.cs

@@ -38,6 +38,11 @@ public async Task<string> CreateSessionTokenAsync(DateTime validTo, Cancellation
                 httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
                 httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", bearerToken);
 
+                foreach (var userAgent in Program.UserAgent)
+                {
+                    httpClient.DefaultRequestHeaders.UserAgent.Add(userAgent);
+                }
+
                 var content = new StringContent(
                     JsonConvert.SerializeObject(
                         new VstsSessionToken()

CredentialProvider.Microsoft/Program.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net.Http.Headers;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
@@ -22,6 +23,35 @@ namespace NuGetCredentialProvider
 {
     public static class Program
     {
+        internal static string Name => name.Value;
+        internal static string Version => version.Value;
+
+        internal static IList<ProductInfoHeaderValue> UserAgent
+        {
+            get
+            {
+                return new List<ProductInfoHeaderValue>()
+                {
+                    new ProductInfoHeaderValue(Name, Version),
+#if NETFRAMEWORK
+                    new ProductInfoHeaderValue("(netfx)"),
+#else
+                    new ProductInfoHeaderValue("(netcore)"),
+#endif
+                };
+            }
+        }
+
+        private static Lazy<string> name = new Lazy<string>(() =>
+        {
+            return typeof(Program).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyProductAttribute>()?.Product ?? "CredentialProvider.Microsoft";
+        });
+
+        private static Lazy<string> version = new Lazy<string>(() =>
+        {
+            return typeof(Program).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "";
+        });
+
         public static async Task<int> Main(string[] args)
         {
             CancellationTokenSource tokenSource = new CancellationTokenSource();
@@ -57,13 +87,12 @@ public static async Task<int> Main(string[] args)
                     { MessageMethod.SetCredentials, new SetCredentialsRequestHandler(multiLogger) },
                 };
 
-                var version = typeof(Program).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
-                multiLogger.Verbose(string.Format(Resources.CommandLineArgs, version.InformationalVersion, Environment.CommandLine));
+                multiLogger.Verbose(string.Format(Resources.CommandLineArgs, Program.Version, Environment.CommandLine));
 
                 // Help
                 if (parsedArgs.Help)
                 {
-                    Console.WriteLine(string.Format(Resources.CommandLineArgs, version.InformationalVersion, Environment.CommandLine));
+                    Console.WriteLine(string.Format(Resources.CommandLineArgs, Program.Version, Environment.CommandLine));
                     Console.WriteLine(ArgUsage.GenerateUsageFromTemplate<CredentialProviderArgs>());
                     Console.WriteLine(
                         string.Format(