Fix for User-Agent header duplication on each http request (#83)

* Fix for User-Agent header duplication on each http request

* Cleanup

* Removing changes that will go into other PRs

Author: daletskyi

Analytics/Request/BlockingRequestHandler.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Net;
 #if NET35
@@ -107,6 +107,15 @@ internal BlockingRequestHandler(Client client, TimeSpan timeout)
 #if NET35
 #else
 			_httpClient = new HttpClient(handler) { Timeout = Timeout };
+#endif
+			// Send user agent in the form of {library_name}/{library_version} as per RFC 7231.
+			var context = new Context();
+			var library = context["library"] as Dict;
+			string szUserAgent = string.Format("{0}/{1}", library["name"], library["version"]);
+#if NET35
+			_httpClient.Headers.Add("User-Agent", szUserAgent);
+#else
+			_httpClient.DefaultRequestHeaders.Add("User-Agent", szUserAgent);
 #endif
 		}
 
@@ -132,16 +141,6 @@ public async Task MakeRequest(Batch batch)
 				_httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", BasicAuthHeader(batch.WriteKey, string.Empty));
 #endif
 
-				// Send user agent in the form of {library_name}/{library_version} as per RFC 7231.
-				var context = new Context();
-				var library = context["library"] as Dict;
-				string szUserAgent = string.Format("{0}/{1}", library["name"], library["version"]);
-#if NET35
-				_httpClient.Headers.Add("User-Agent", szUserAgent);
-#else
-				_httpClient.DefaultRequestHeaders.Add("User-Agent", szUserAgent);
-#endif
-
 				// Prepare request data;
 				var requestData = Encoding.UTF8.GetBytes(json);
 

Test.Net45/Test.Net45.csproj

@@ -36,8 +36,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />