Add support for HttpClient HTTP version 2.0 and 3.0 values (#1042)

* Add support for HttpClient HTTP version 2.0 and 3.0 values

* Fix build error.

* Add trace message for custom HttpVersion.

* SendAsync is required for httpVersion 2.0 in httpclient.

Author: claudiamurialdo

dotnet/src/dotnetframework/GxClasses/Domain/GxHttpClient.cs

@@ -814,15 +814,23 @@ void InferContentType(string contentType, HttpRequestMessage req)
 			}
 		}
 
-		void setHttpVersion(HttpRequestMessage req)
+		void SetHttpVersion(HttpRequestMessage req)
 		{
 			string httpVersion;
 			if (Config.GetValueOf("HttpClientHttpVersion", out httpVersion))
 			{
 				if (httpVersion == "1.0")
 					req.Version = HttpVersion.Version10;
+#if NETCORE
+				else if (httpVersion == "2.0")
+					req.Version = HttpVersion.Version20;
+				else if (httpVersion == "3.0")
+					req.Version = HttpVersion.Version30;
+#endif
 				else
 					req.Version = HttpVersion.Version11;
+
+				GXLogging.Debug(log, "Setting HTTPClient request version to ", req.Version.ToString());
 			}
 			else
 				req.Version = HttpVersion.Version11;
@@ -845,7 +853,7 @@ HttpResponseMessage ExecuteRequest(string method, string requestUrl, bool contex
 				Method = new HttpMethod(method),
 			};
 			setHeaders(request, cookies, out string contentType);
-			setHttpVersion(request);
+			SetHttpVersion(request);
 			bool disposableInstance = true;
 			try
 			{
@@ -873,7 +881,7 @@ HttpResponseMessage ExecuteRequest(string method, string requestUrl, bool contex
 					request.Content = new ByteArrayContent(reqStream.ToArray());
 					setContentHeaders(request, contentType);
 #if NETCORE
-					response = client.Send(request, HttpCompletionOption.ResponseHeadersRead);
+					response = client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead).GetAwaiter().GetResult();
 					response.ExtractCookies(cookies);
 #else
 					response = client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead).GetAwaiter().GetResult();
@@ -907,7 +915,7 @@ async Task<HttpResponseMessage> ExecuteRequestAsync(string method, string reques
 				Method = new HttpMethod(method),
 			};
 			setHeaders(request, cookies, out string contentType);
-			setHttpVersion(request);
+			SetHttpVersion(request);
 			bool disposableInstance = true;
 			try
 			{
@@ -1361,14 +1369,20 @@ static WebProxy getProxy(string proxyHost, int proxyPort, ArrayList authenticati
 			return null;
 		}
 
-		private void setHttpVersion(HttpWebRequest req)
+		private void SetHttpVersion(HttpWebRequest req)
 		{
 
 			string httpVersion;
 			if (Config.GetValueOf("HttpClientHttpVersion", out httpVersion))
 			{
 				if (httpVersion == "1.0")
 					req.ProtocolVersion = HttpVersion.Version10;
+#if NETCORE
+				else if (httpVersion == "2.0")
+					req.ProtocolVersion = HttpVersion.Version20;
+				else if (httpVersion == "3.0")
+					req.ProtocolVersion = HttpVersion.Version30;
+#endif
 				else
 					req.ProtocolVersion = HttpVersion.Version11;
 			}
@@ -1430,7 +1444,7 @@ async Task<HttpWebRequest> buildRequestAsync(string method, string requestUrl, C
 				req.ClientCertificates.Add(cert);
 			req.Method = method.Trim();
 			req.Timeout = _timeout;
-			setHttpVersion(req);
+			SetHttpVersion(req);
 			WebProxy proxy = getProxy(_proxyHost, _proxyPort, _authProxyCollection);
 			if (proxy != null)
 				req.Proxy = proxy;
@@ -1482,7 +1496,7 @@ HttpWebRequest buildRequest(string method, string requestUrl, CookieContainer co
 				req.ClientCertificates.Add(cert);
 			req.Method = method.Trim();
 			req.Timeout = _timeout;
-			setHttpVersion(req);
+			SetHttpVersion(req);
 			WebProxy proxy = getProxy(_proxyHost, _proxyPort, _authProxyCollection);
 			if (proxy != null)
 				req.Proxy = proxy;

dotnet/test/DotNetCoreUnitTest/appsettings.json

@@ -50,6 +50,7 @@
 		"CACHE_INVALIDATION_TOKEN": "20216211291931",
 		"CORS_ALLOW_ORIGIN": "https://normal-website.com",
 		"USE_JAYROCK": "0",
+		"HttpClientHttpVersion": "2.0",
 		"MY_CUSTOM_PTY": "DEFAULT_VALUE"
 	},
   "languages": {