diff --git a/DemoCoreWeb.ClientApi/WebApiClientAuto.cs b/DemoCoreWeb.ClientApi/WebApiClientAuto.cs
index 1836e564..e2f66f34 100644
--- a/DemoCoreWeb.ClientApi/WebApiClientAuto.cs
+++ b/DemoCoreWeb.ClientApi/WebApiClientAuto.cs
@@ -146,7 +146,7 @@ public System.DateOnly GetDateOnlyMin(Action<System.Net.Http.Headers.HttpRequest
 			var requestUri = "api/DateTypes/GetDateOnlyMin";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -193,7 +193,7 @@ public System.DateOnly GetDateOnlyMin(Action<System.Net.Http.Headers.HttpRequest
 			var requestUri = "api/DateTypes/NullableDatetime/"+hasValue;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -242,7 +242,7 @@ public System.DateTimeOffset GetDateTimeOffset(Action<System.Net.Http.Headers.Ht
 			var requestUri = "api/DateTypes/ForDateTimeOffset";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -288,7 +288,7 @@ public System.DateTimeOffset GetNextHour(System.DateTimeOffset dt, Action<System
 			var requestUri = "api/DateTypes/NextHour/"+dt.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ");
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -336,7 +336,7 @@ public System.DateTimeOffset GetNextHourNullable(int n, System.Nullable<System.D
 			var requestUri = "api/DateTypes/NextHourNullable?n="+n+(dt.HasValue?"&dt="+dt.Value.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ"):String.Empty);
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -382,7 +382,7 @@ public System.DateTime GetNextYear(System.DateTime dt, Action<System.Net.Http.He
 			var requestUri = "api/DateTypes/NextYear/"+dt.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ");
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -430,7 +430,7 @@ public System.DateTime GetNextYearNullable(int n, System.Nullable<System.DateTim
 			var requestUri = "api/DateTypes/NextYearNullable?n="+n+(dt.HasValue?"&dt="+dt.Value.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ"):String.Empty);
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -489,7 +489,7 @@ public System.DateTime GetNextYearNullable(int n, System.Nullable<System.DateTim
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -547,7 +547,7 @@ public System.DateTime GetNextYearNullable(int n, System.Nullable<System.DateTim
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -604,7 +604,7 @@ public System.DateOnly PostDateOnly(System.DateOnly d, Action<System.Net.Http.He
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -661,7 +661,7 @@ public System.DateOnly PostDateOnly(System.DateOnly d, Action<System.Net.Http.He
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -718,7 +718,7 @@ public System.DateTime PostDateTime(System.DateTime d, Action<System.Net.Http.He
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -775,7 +775,7 @@ public System.DateTime PostDateTime(System.DateTime d, Action<System.Net.Http.He
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -834,7 +834,7 @@ public System.DateTimeOffset PostDateTimeOffset(System.DateTimeOffset d, Action<
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -892,7 +892,7 @@ public string PostDateTimeOffsetForO(System.DateTimeOffset d, Action<System.Net.
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -948,7 +948,7 @@ public System.TimeSpan PostDateTimeOffsetForOffset(System.DateTimeOffset d, Acti
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1007,7 +1007,7 @@ public System.TimeSpan PostDateTimeOffsetForOffset(System.DateTimeOffset d, Acti
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1064,7 +1064,7 @@ public System.TimeSpan PostDateTimeOffsetStringForOffset(string s, Action<System
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1120,7 +1120,7 @@ public System.DateTime PostNextYear(System.DateTime dt, Action<System.Net.Http.H
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1166,7 +1166,7 @@ public System.DateOnly QueryDateOnlyAsString(string d, Action<System.Net.Http.He
 			var requestUri = "api/DateTypes/DateOnlyStringQuery?d="+(d == null ? "" : Uri.EscapeDataString(d));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1212,7 +1212,7 @@ public System.DateTimeOffset RouteDateTimeOffset(System.DateTimeOffset d, Action
 			var requestUri = "api/DateTypes/RouteDateTimeOffset/"+d.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ");
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1265,7 +1265,7 @@ public System.DateTimeOffset RouteDateTimeOffset(System.DateTimeOffset d, Action
 			var requestUri = "api/DateTypes/SearchDateRange?"+(startDate.HasValue?"startDate="+startDate.Value.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ"):String.Empty)+(endDate.HasValue?"&endDate="+endDate.Value.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ"):String.Empty);
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1347,7 +1347,7 @@ public DemoWebApi.DemoData.Client.Company CreateCompany(DemoWebApi.DemoData.Clie
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1403,7 +1403,7 @@ public long CreatePerson(DemoWebApi.DemoData.Client.Person p, Action<System.Net.
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1459,7 +1459,7 @@ public DemoWebApi.DemoData.Client.Person CreatePerson2(DemoWebApi.DemoData.Clien
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1517,7 +1517,7 @@ public DemoWebApi.DemoData.Client.Person CreatePerson3(DemoWebApi.DemoData.Clien
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1577,7 +1577,7 @@ public DemoWebApi.DemoData.Client.Person CreatePersonByAdmin(DemoWebApi.DemoData
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1637,7 +1637,7 @@ public DemoWebApi.DemoData.Client.Person CreatePersonWeak(DemoWebApi.DemoData.Cl
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1697,7 +1697,7 @@ public DemoWebApi.DemoData.Client.Person CreatePersonWithNotFound(DemoWebApi.Dem
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1757,7 +1757,7 @@ public DemoWebApi.DemoData.Client.Person CreatePersonWithStatuses(DemoWebApi.Dem
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1800,7 +1800,7 @@ public void Delete(long id, Action<System.Net.Http.Headers.HttpRequestHeaders> h
 			var requestUri = "api/Entities/"+id;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Delete, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1843,7 +1843,7 @@ public DemoWebApi.DemoData.Client.Company GetCompany(long id, Action<System.Net.
 			var requestUri = "api/Entities/Company/"+id;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1901,7 +1901,7 @@ public DemoWebApi.DemoData.Client.MimsResult<string> GetMims(DemoWebApi.DemoData
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1961,7 +1961,7 @@ public DemoWebApi.DemoData.Client.MyGeneric<string, decimal, double> GetMyGeneri
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2021,7 +2021,7 @@ public DemoWebApi.DemoData.Client.MyGeneric<string, decimal, double> GetMyGeneri
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2073,7 +2073,7 @@ public DemoWebApi.DemoData.Client.Company GetNullCompany(Action<System.Net.Http.
 			var requestUri = "api/Entities/NullCompany";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2129,7 +2129,7 @@ public DemoWebApi.DemoData.Client.Person GetPerson(long id, Action<System.Net.Ht
 			var requestUri = "api/Entities/getPerson/"+id;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2177,7 +2177,7 @@ public DemoWebApi.DemoData.Client.Person GetPerson2(long id, Action<System.Net.H
 			var requestUri = "api/Entities/getPerson2/"+id;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2233,7 +2233,7 @@ public bool LinkPerson(long id, string relationship, DemoWebApi.DemoData.Client.
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2290,7 +2290,7 @@ public string PatchPerson(DemoWebApi.DemoData.Client.Person person, Action<Syste
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2347,7 +2347,7 @@ public DemoWebApi.DemoData.Client.IdMap PostIdMap(DemoWebApi.DemoData.Client.IdM
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2404,7 +2404,7 @@ public string UpdatePerson(DemoWebApi.DemoData.Client.Person person, Action<Syst
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2469,7 +2469,7 @@ public void Delete(long id, Action<System.Net.Http.Headers.HttpRequestHeaders> h
 			var requestUri = "api/Heroes/"+id;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Delete, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2511,7 +2511,7 @@ public DemoWebApi.Controllers.Client.Hero[] GetAsyncHeroes(Action<System.Net.Htt
 			var requestUri = "api/Heroes/asyncHeroes";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2562,7 +2562,7 @@ public DemoWebApi.Controllers.Client.Hero GetHero(long id, Action<System.Net.Htt
 			var requestUri = "api/Heroes/"+id;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2612,7 +2612,7 @@ public DemoWebApi.Controllers.Client.Hero[] GetHeroes(Action<System.Net.Http.Hea
 			var requestUri = "api/Heroes";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2664,7 +2664,7 @@ public DemoWebApi.Controllers.Client.SuperHero GetSuperHero(long id, Action<Syst
 			var requestUri = "api/Heroes/super?id="+id;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2722,7 +2722,7 @@ public DemoWebApi.Controllers.Client.Hero Post(string name, Action<System.Net.Ht
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2774,7 +2774,7 @@ public DemoWebApi.Controllers.Client.Hero PostWithQuery(string name, Action<Syst
 		{
 			var requestUri = "api/Heroes/q?name="+(name == null ? "" : Uri.EscapeDataString(name));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2834,7 +2834,7 @@ public DemoWebApi.Controllers.Client.Hero Put(DemoWebApi.Controllers.Client.Hero
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2888,7 +2888,7 @@ public DemoWebApi.Controllers.Client.Hero[] Search(string name, Action<System.Ne
 			var requestUri = "api/Heroes/search/"+(name == null ? "" : Uri.EscapeDataString(name));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2957,7 +2957,7 @@ public byte GetByte(byte d, Action<System.Net.Http.Headers.HttpRequestHeaders> h
 			var requestUri = "api/Numbers/byte?d="+d;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3007,7 +3007,7 @@ public byte GetByteWithRange(byte d, Action<System.Net.Http.Headers.HttpRequestH
 			var requestUri = "api/Numbers/byteWithRange?d="+d;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3061,7 +3061,7 @@ public byte Post(byte d, Action<System.Net.Http.Headers.HttpRequestHeaders> hand
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3115,7 +3115,7 @@ public sbyte Post(sbyte d, Action<System.Net.Http.Headers.HttpRequestHeaders> ha
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3169,7 +3169,7 @@ public short Post(short d, Action<System.Net.Http.Headers.HttpRequestHeaders> ha
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3223,7 +3223,7 @@ public ushort Post(ushort d, Action<System.Net.Http.Headers.HttpRequestHeaders>
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3277,7 +3277,7 @@ public int Post(int d, Action<System.Net.Http.Headers.HttpRequestHeaders> handle
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3331,7 +3331,7 @@ public long Post(long d, Action<System.Net.Http.Headers.HttpRequestHeaders> hand
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3385,7 +3385,7 @@ public ulong Post(ulong d, Action<System.Net.Http.Headers.HttpRequestHeaders> ha
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3440,7 +3440,7 @@ public System.Numerics.BigInteger PostBigInteger(System.Numerics.BigInteger bigI
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3496,7 +3496,7 @@ public string PostBigIntegralAsStringForJs(string bigIntegral, Action<System.Net
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3553,7 +3553,7 @@ public DemoWebApi.DemoData.Client.BigNumbers PostBigNumbers(DemoWebApi.DemoData.
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3610,7 +3610,7 @@ public System.Int128 PostInt128(System.Int128 int128, Action<System.Net.Http.Hea
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3665,7 +3665,7 @@ public long PostInt64(long int64, Action<System.Net.Http.Headers.HttpRequestHead
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3721,7 +3721,7 @@ public DemoWebApi.DemoData.Client.IntegralEntity PostIntegralEntity(DemoWebApi.D
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3779,7 +3779,7 @@ public DemoWebApi.DemoData.Client.IntegralEntity PostIntegralEntityMustBeValid(D
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3837,7 +3837,7 @@ public int PostIntWithRange(int d, Action<System.Net.Http.Headers.HttpRequestHea
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3895,7 +3895,7 @@ public long PostLongWithRange(long d, Action<System.Net.Http.Headers.HttpRequest
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3950,7 +3950,7 @@ public System.UInt128 PostUint128(System.UInt128 uint128, Action<System.Net.Http
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4005,7 +4005,7 @@ public ulong PostUint64(ulong uint64, Action<System.Net.Http.Headers.HttpRequest
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4081,7 +4081,7 @@ public string AthletheSearch(System.Nullable<int> take, int skip, string order,
 			var requestUri = "api/StringData/AthletheSearch?"+(take.HasValue?"take="+take.Value.ToString():String.Empty)+"&skip="+skip+"&order="+(order == null ? "" : Uri.EscapeDataString(order))+"&sort="+(sort == null ? "" : Uri.EscapeDataString(sort))+"&search="+(search == null ? "" : Uri.EscapeDataString(search));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4127,7 +4127,7 @@ public string GetABCDE(Action<System.Net.Http.Headers.HttpRequestHeaders> handle
 			var requestUri = "api/StringData/String";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4175,7 +4175,7 @@ public string GetEmptyString(Action<System.Net.Http.Headers.HttpRequestHeaders>
 			var requestUri = "api/StringData/EmptyString";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4225,7 +4225,7 @@ public string GetNullString(Action<System.Net.Http.Headers.HttpRequestHeaders> h
 			var requestUri = "api/StringData/NullString";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4284,7 +4284,7 @@ public System.Net.Http.HttpResponseMessage GetActionResult(Action<System.Net.Htt
 			var requestUri = "api/SuperDemo/ActionResult";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			responseMessage.EnsureSuccessStatusCodeEx();
 			return responseMessage;
 		}
@@ -4310,7 +4310,7 @@ public System.Net.Http.HttpResponseMessage GetActionResult2(Action<System.Net.Ht
 			var requestUri = "api/SuperDemo/ActionResult2";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			responseMessage.EnsureSuccessStatusCodeEx();
 			return responseMessage;
 		}
@@ -4348,7 +4348,7 @@ public string GetActionStringResult(Action<System.Net.Http.Headers.HttpRequestHe
 			var requestUri = "api/SuperDemo/ActionStringResult";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4384,7 +4384,7 @@ public System.Net.Http.HttpResponseMessage GetBadRequest(Action<System.Net.Http.
 			var requestUri = "api/SuperDemo/BadRequest";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			responseMessage.EnsureSuccessStatusCodeEx();
 			return responseMessage;
 		}
@@ -4410,7 +4410,7 @@ public System.Net.Http.HttpResponseMessage GetBadRequest2(Action<System.Net.Http
 			var requestUri = "api/SuperDemo/BadRequest2";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			responseMessage.EnsureSuccessStatusCodeEx();
 			return responseMessage;
 		}
@@ -4445,7 +4445,7 @@ public bool GetBool(Action<System.Net.Http.Headers.HttpRequestHeaders> handleHea
 			var requestUri = "api/SuperDemo/bool";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4489,7 +4489,7 @@ public byte Getbyte(Action<System.Net.Http.Headers.HttpRequestHeaders> handleHea
 			var requestUri = "api/SuperDemo/byte";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4535,7 +4535,7 @@ public byte[] GetByteArray(Action<System.Net.Http.Headers.HttpRequestHeaders> ha
 			var requestUri = "api/SuperDemo/ByteArray";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4582,7 +4582,7 @@ public char GetChar(Action<System.Net.Http.Headers.HttpRequestHeaders> handleHea
 			var requestUri = "api/SuperDemo/char";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4629,7 +4629,7 @@ public char GetChar(Action<System.Net.Http.Headers.HttpRequestHeaders> handleHea
 			var requestUri = "api/SuperDemo/Collection";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4676,7 +4676,7 @@ public DemoWebApi.DemoData.Client.Days GetDay(DemoWebApi.DemoData.Client.Days d,
 			var requestUri = "api/SuperDemo/enumGet?d="+d;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4722,7 +4722,7 @@ public decimal GetDecimal(Action<System.Net.Http.Headers.HttpRequestHeaders> han
 			var requestUri = "api/SuperDemo/decimal";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4771,7 +4771,7 @@ public decimal[] GetDecimalArrayQ(decimal[] a, Action<System.Net.Http.Headers.Ht
 			var requestUri = "api/SuperDemo/decimalArrayQ?"+String.Join("&", a.Select(k => $"a={Uri.EscapeDataString(k.ToString())}"));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4818,7 +4818,7 @@ public decimal GetDecimalSquare(decimal d, Action<System.Net.Http.Headers.HttpRe
 			var requestUri = "api/SuperDemo/decimal/"+d;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4864,7 +4864,7 @@ public decimal GetDecimalZero(Action<System.Net.Http.Headers.HttpRequestHeaders>
 			var requestUri = "api/SuperDemo/DecimalZero";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4910,7 +4910,7 @@ public System.Collections.Generic.IDictionary<string, string> GetDictionary(Acti
 			var requestUri = "api/SuperDemo/StringStringDic";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4956,7 +4956,7 @@ public System.Collections.Generic.IDictionary<string, string> GetDictionary(Acti
 			var requestUri = "api/SuperDemo/StringPersonDic";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5003,7 +5003,7 @@ public System.Collections.Generic.IDictionary<string, string> GetDictionary(Acti
 			var requestUri = "api/SuperDemo/StringPersonDic2";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5049,7 +5049,7 @@ public double Getdouble(Action<System.Net.Http.Headers.HttpRequestHeaders> handl
 			var requestUri = "api/SuperDemo/doulbe";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5095,7 +5095,7 @@ public double GetDoubleZero(Action<System.Net.Http.Headers.HttpRequestHeaders> h
 			var requestUri = "api/SuperDemo/DoubleZero";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5143,7 +5143,7 @@ public DemoWebApi.DemoData.Client.Days[] GetEnumArrayDays(System.Collections.Gen
 			var requestUri = "api/SuperDemo/enumArrayDays?"+String.Join("&", a.Select(k => $"a={Uri.EscapeDataString(k.ToString())}"));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5191,7 +5191,7 @@ public System.DayOfWeek[] GetEnumArrayQ2(System.Collections.Generic.List<System.
 			var requestUri = "api/SuperDemo/enumArrayQ2?"+String.Join("&", a.Select(k => $"a={Uri.EscapeDataString(k.ToString())}"));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5237,7 +5237,7 @@ public float GetFloatZero(Action<System.Net.Http.Headers.HttpRequestHeaders> han
 			var requestUri = "api/SuperDemo/FloatZero";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5282,7 +5282,7 @@ public float GetFloatZero(Action<System.Net.Http.Headers.HttpRequestHeaders> han
 			var requestUri = "api/SuperDemo/ICollection";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5328,7 +5328,7 @@ public float GetFloatZero(Action<System.Net.Http.Headers.HttpRequestHeaders> han
 			var requestUri = "api/SuperDemo/IList";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5375,7 +5375,7 @@ public async Task<int[,]> GetInt2DAsync(Action<System.Net.Http.Headers.HttpReque
 			var requestUri = "api/SuperDemo/int2d";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5423,7 +5423,7 @@ public int[][] GetInt2DJagged(Action<System.Net.Http.Headers.HttpRequestHeaders>
 			var requestUri = "api/SuperDemo/int2dJagged";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5471,7 +5471,7 @@ public int[] GetIntArray(Action<System.Net.Http.Headers.HttpRequestHeaders> hand
 			var requestUri = "api/SuperDemo/intArray";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5521,7 +5521,7 @@ public int[] GetIntArrayQ(int[] a, Action<System.Net.Http.Headers.HttpRequestHea
 			var requestUri = "api/SuperDemo/intArrayQ?"+String.Join("&", a.Select(k => $"a={Uri.EscapeDataString(k.ToString())}"));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5571,7 +5571,7 @@ public long[] GetIntArrayQ2(System.Collections.Generic.IEnumerable<long> a, Acti
 			var requestUri = "api/SuperDemo/intArrayQ2?"+String.Join("&", a.Select(k => $"a={Uri.EscapeDataString(k.ToString())}"));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5617,7 +5617,7 @@ public int GetIntSquare(int d, Action<System.Net.Http.Headers.HttpRequestHeaders
 			var requestUri = "api/SuperDemo/int/"+d;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5662,7 +5662,7 @@ public int GetIntSquare(int d, Action<System.Net.Http.Headers.HttpRequestHeaders
 			var requestUri = "api/SuperDemo/IReadOnlyCollection";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5708,7 +5708,7 @@ public int GetIntSquare(int d, Action<System.Net.Http.Headers.HttpRequestHeaders
 			var requestUri = "api/SuperDemo/IReadOnlyList";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5754,7 +5754,7 @@ public int GetIntSquare(int d, Action<System.Net.Http.Headers.HttpRequestHeaders
 			var requestUri = "api/SuperDemo/KeyValuePair";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5801,7 +5801,7 @@ public int GetIntSquare(int d, Action<System.Net.Http.Headers.HttpRequestHeaders
 			var requestUri = "api/SuperDemo/List";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5851,7 +5851,7 @@ public System.Nullable<decimal> GetNullableDecimal(bool hasValue, Action<System.
 			var requestUri = "api/SuperDemo/NullableDecimal/"+hasValue;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5903,7 +5903,7 @@ public DemoWebApi.DemoData.Client.Person GetNullPerson(Action<System.Net.Http.He
 			var requestUri = "api/SuperDemo/NullObject";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5951,7 +5951,7 @@ public DemoWebApi.DemoData.Client.Person GetNullPerson(Action<System.Net.Http.He
 			var requestUri = "api/SuperDemo/DoubleNullable?location="+(location == null ? "" : Uri.EscapeDataString(location))+(dd.HasValue?"&dd="+dd.Value.ToString():String.Empty)+(de.HasValue?"&de="+de.Value.ToString():String.Empty);
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5999,7 +5999,7 @@ public DemoWebApi.DemoData.Client.Person GetNullPerson(Action<System.Net.Http.He
 			var requestUri = "api/SuperDemo/DoubleNullable2?"+(dd.HasValue?"dd="+dd.Value.ToString():String.Empty)+(de.HasValue?"&de="+de.Value.ToString():String.Empty);
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6045,7 +6045,7 @@ public sbyte Getsbyte(Action<System.Net.Http.Headers.HttpRequestHeaders> handleH
 			var requestUri = "api/SuperDemo/sbyte";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6089,7 +6089,7 @@ public short GetShort(Action<System.Net.Http.Headers.HttpRequestHeaders> handleH
 			var requestUri = "api/SuperDemo/short";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6137,7 +6137,7 @@ public string[] GetStringArrayQ(string[] a, Action<System.Net.Http.Headers.HttpR
 			var requestUri = "api/SuperDemo/stringArrayQ?"+String.Join("&", a.Select(k => $"a={Uri.EscapeDataString(k.ToString())}"));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6187,7 +6187,7 @@ public string[] GetStringArrayQ2(System.Collections.Generic.List<string> a, Acti
 			var requestUri = "api/SuperDemo/stringArrayQ2?"+String.Join("&", a.Select(k => $"a={Uri.EscapeDataString(k.ToString())}"));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6226,7 +6226,7 @@ public System.Net.Http.HttpResponseMessage GetTextStream(Action<System.Net.Http.
 			var requestUri = "api/SuperDemo/TextStream";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			responseMessage.EnsureSuccessStatusCodeEx();
 			return responseMessage;
 		}
@@ -6261,7 +6261,7 @@ public uint GetUint(Action<System.Net.Http.Headers.HttpRequestHeaders> handleHea
 			var requestUri = "api/SuperDemo/uint";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6305,7 +6305,7 @@ public ulong Getulong(Action<System.Net.Http.Headers.HttpRequestHeaders> handleH
 			var requestUri = "api/SuperDemo/ulong";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6349,7 +6349,7 @@ public ushort GetUShort(Action<System.Net.Http.Headers.HttpRequestHeaders> handl
 			var requestUri = "api/SuperDemo/ushort";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6382,7 +6382,7 @@ public System.Net.Http.HttpResponseMessage PostActionResult(Action<System.Net.Ht
 		{
 			var requestUri = "api/SuperDemo/ActionResult";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			responseMessage.EnsureSuccessStatusCodeEx();
 			return responseMessage;
 		}
@@ -6418,7 +6418,7 @@ public System.Net.Http.HttpResponseMessage PostActionResult2(string s, Action<Sy
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			responseMessage.EnsureSuccessStatusCodeEx();
 			return responseMessage;
 		}
@@ -6454,7 +6454,7 @@ public System.Net.Http.HttpResponseMessage PostActionResult3(DemoWebApi.DemoData
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			responseMessage.EnsureSuccessStatusCodeEx();
 			return responseMessage;
 		}
@@ -6501,7 +6501,7 @@ public int PostCollection(System.Collections.ObjectModel.Collection<DemoWebApi.D
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6557,7 +6557,7 @@ public DemoWebApi.DemoData.Client.Days[] PostDay(DemoWebApi.DemoData.Client.Days
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6615,7 +6615,7 @@ public int PostDictionary(System.Collections.Generic.IDictionary<string, DemoWeb
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6671,7 +6671,7 @@ public System.Guid[] PostGuids(System.Guid[] guids, Action<System.Net.Http.Heade
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6729,7 +6729,7 @@ public int PostICollection(System.Collections.Generic.ICollection<DemoWebApi.Dem
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6785,7 +6785,7 @@ public int PostIList(System.Collections.Generic.IList<DemoWebApi.DemoData.Client
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6839,7 +6839,7 @@ public bool PostInt2D(int[,] a, Action<System.Net.Http.Headers.HttpRequestHeader
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6895,7 +6895,7 @@ public bool PostInt2DJagged(int[][] a, Action<System.Net.Http.Headers.HttpReques
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6957,7 +6957,7 @@ public bool PostIntArray(int[] a, Action<System.Net.Http.Headers.HttpRequestHead
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7013,7 +7013,7 @@ public int PostIReadOnlyCollection(System.Collections.Generic.IReadOnlyCollectio
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7069,7 +7069,7 @@ public int PostIReadOnlyList(System.Collections.Generic.IReadOnlyList<DemoWebApi
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7125,7 +7125,7 @@ public int PostList(System.Collections.Generic.List<DemoWebApi.DemoData.Client.P
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7181,7 +7181,7 @@ public System.Tuple<string, int> PostWithQueryButEmptyBody(string s, int i, Acti
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7251,7 +7251,7 @@ public string AthletheSearch(System.Nullable<int> take, int skip, string order,
 			var requestUri = "api/TextData/AthletheSearch?"+(take.HasValue?"take="+take.Value.ToString():String.Empty)+"&skip="+skip+"&order="+(order == null ? "" : Uri.EscapeDataString(order))+"&sort="+(sort == null ? "" : Uri.EscapeDataString(sort))+"&search="+(search == null ? "" : Uri.EscapeDataString(search));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7297,7 +7297,7 @@ public string GetABCDE(Action<System.Net.Http.Headers.HttpRequestHeaders> handle
 			var requestUri = "api/TextData/String";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7345,7 +7345,7 @@ public string GetEmptyString(Action<System.Net.Http.Headers.HttpRequestHeaders>
 			var requestUri = "api/TextData/EmptyString";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7395,7 +7395,7 @@ public string GetNullableString(Action<System.Net.Http.Headers.HttpRequestHeader
 			var requestUri = "api/TextData/NullableString";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7445,7 +7445,7 @@ public string GetNullString(Action<System.Net.Http.Headers.HttpRequestHeaders> h
 			var requestUri = "api/TextData/NullString";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7522,7 +7522,7 @@ public void A1TupleArray(System.Tuple<System.Guid, int>[] idAndOrderArray, Actio
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7572,7 +7572,7 @@ public void A2TupleIEnumerable(System.Collections.Generic.IEnumerable<System.Tup
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7627,7 +7627,7 @@ public DemoWebApi.DemoData.Client.Person ChangeName(System.Tuple<string, DemoWeb
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7679,7 +7679,7 @@ public DemoWebApi.DemoData.Client.Person ChangeName(System.Tuple<string, DemoWeb
 			var requestUri = "api/Tuple/PeopleCompany4";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7731,7 +7731,7 @@ public DemoWebApi.DemoData.Client.Person ChangeName(System.Tuple<string, DemoWeb
 			var requestUri = "api/Tuple/PeopleCompany5";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7779,7 +7779,7 @@ public System.Tuple<int> GetTuple1(Action<System.Net.Http.Headers.HttpRequestHea
 			var requestUri = "api/Tuple/Tuple1";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7827,7 +7827,7 @@ public System.Tuple<string, int> GetTuple2(Action<System.Net.Http.Headers.HttpRe
 			var requestUri = "api/Tuple/Tuple2";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7875,7 +7875,7 @@ public System.Tuple<string, string, int> GetTuple3(Action<System.Net.Http.Header
 			var requestUri = "api/Tuple/Tuple3";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7923,7 +7923,7 @@ public System.Tuple<string, string, string, int> GetTuple4(Action<System.Net.Htt
 			var requestUri = "api/Tuple/Tuple4";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7971,7 +7971,7 @@ public System.Tuple<string, string, string, string, int> GetTuple5(Action<System
 			var requestUri = "api/Tuple/Tuple5";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8019,7 +8019,7 @@ public System.Tuple<string, string, string, string, string, int> GetTuple6(Actio
 			var requestUri = "api/Tuple/Tuple6";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8067,7 +8067,7 @@ public System.Tuple<string, string, string, string, string, long, int> GetTuple7
 			var requestUri = "api/Tuple/Tuple7";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8117,7 +8117,7 @@ public System.Tuple<string, string, string, string, string, long, int> GetTuple7
 			var requestUri = "api/Tuple/Tuple8";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8175,7 +8175,7 @@ public DemoWebApi.DemoData.Client.Person LinkPeopleCompany2(System.Tuple<DemoWeb
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8233,7 +8233,7 @@ public DemoWebApi.DemoData.Client.Person LinkPeopleCompany3(System.Tuple<DemoWeb
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8291,7 +8291,7 @@ public DemoWebApi.DemoData.Client.Person LinkPeopleCompany4(System.Tuple<DemoWeb
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8349,7 +8349,7 @@ public DemoWebApi.DemoData.Client.Person LinkPeopleCompany5(System.Tuple<DemoWeb
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8407,7 +8407,7 @@ public DemoWebApi.DemoData.Client.Person LinkPeopleCompany6(System.Tuple<DemoWeb
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8467,7 +8467,7 @@ public DemoWebApi.DemoData.Client.Person LinkPeopleCompany7(System.Tuple<DemoWeb
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8525,7 +8525,7 @@ public DemoWebApi.DemoData.Client.Person LinkPeopleCompany8(System.Tuple<DemoWeb
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8583,7 +8583,7 @@ public DemoWebApi.DemoData.Client.Person LinkPersonCompany1(System.Tuple<DemoWeb
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8639,7 +8639,7 @@ public int PostTuple1(System.Tuple<int> tuple, Action<System.Net.Http.Headers.Ht
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8696,7 +8696,7 @@ public string PostTuple2(System.Tuple<string, int> tuple, Action<System.Net.Http
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8752,7 +8752,7 @@ public string PostTuple3(System.Tuple<string, string, int> tuple, Action<System.
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8808,7 +8808,7 @@ public string PostTuple4(System.Tuple<string, string, string, int> tuple, Action
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8864,7 +8864,7 @@ public string PostTuple5(System.Tuple<string, string, string, string, int> tuple
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8920,7 +8920,7 @@ public string PostTuple6(System.Tuple<string, string, string, string, string, in
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8976,7 +8976,7 @@ public string PostTuple7(System.Tuple<string, string, string, string, string, lo
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -9032,7 +9032,7 @@ public string PostTuple8(System.Tuple<string, string, string, string, string, st
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -9094,7 +9094,7 @@ public void Delete(int id, Action<System.Net.Http.Headers.HttpRequestHeaders> ha
 			var requestUri = "api/Values/"+id;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Delete, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -9138,7 +9138,7 @@ public System.Collections.Generic.IEnumerable<string> Get(Action<System.Net.Http
 			var requestUri = "api/Values";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -9186,7 +9186,7 @@ public string Get(int id, string name, Action<System.Net.Http.Headers.HttpReques
 			var requestUri = "api/Values/Name/"+id+"?name="+(name == null ? "" : Uri.EscapeDataString(name));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -9234,7 +9234,7 @@ public string Get(string name, Action<System.Net.Http.Headers.HttpRequestHeaders
 			var requestUri = "api/Values?name="+(name == null ? "" : Uri.EscapeDataString(name));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -9282,7 +9282,7 @@ public string Get(int id, Action<System.Net.Http.Headers.HttpRequestHeaders> han
 			var requestUri = "api/Values/"+id;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -9330,7 +9330,7 @@ public System.Collections.Generic.IEnumerable<string> Get2(Action<System.Net.Htt
 			var requestUri = "api/Values/Get2";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -9386,7 +9386,7 @@ public string Post(string value, Action<System.Net.Http.Headers.HttpRequestHeade
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -9440,7 +9440,7 @@ public void Put(int id, string value, Action<System.Net.Http.Headers.HttpRequest
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -10175,7 +10175,7 @@ public Newtonsoft.Json.Linq.JObject GetAnonymousDynamic(Action<System.Net.Http.H
 			var requestUri = "api/SpecialTypes/AnonymousDynamic";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -10225,7 +10225,7 @@ public Newtonsoft.Json.Linq.JObject GetAnonymousDynamic2(Action<System.Net.Http.
 			var requestUri = "api/SpecialTypes/AnonymousDynamic2";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -10273,7 +10273,7 @@ public Newtonsoft.Json.Linq.JObject GetAnonymousObject(Action<System.Net.Http.He
 			var requestUri = "api/SpecialTypes/AnonymousObject";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -10323,7 +10323,7 @@ public Newtonsoft.Json.Linq.JObject GetAnonymousObject2(Action<System.Net.Http.H
 			var requestUri = "api/SpecialTypes/AnonymousObject2";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -10381,7 +10381,7 @@ public Newtonsoft.Json.Linq.JObject PostAnonymousObject(Newtonsoft.Json.Linq.JOb
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -10441,7 +10441,7 @@ public Newtonsoft.Json.Linq.JObject PostAnonymousObject2(Newtonsoft.Json.Linq.JO
 			var content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, "application/json");
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
diff --git a/DemoCoreWeb.ClientApiTextJson/WebApiClientTextJsonAuto.cs b/DemoCoreWeb.ClientApiTextJson/WebApiClientTextJsonAuto.cs
index 64f4868e..a007b7a1 100644
--- a/DemoCoreWeb.ClientApiTextJson/WebApiClientTextJsonAuto.cs
+++ b/DemoCoreWeb.ClientApiTextJson/WebApiClientTextJsonAuto.cs
@@ -142,7 +142,7 @@ public System.DateOnly GetDateOnlyMin(Action<System.Net.Http.Headers.HttpRequest
 			var requestUri = "api/DateTypes/GetDateOnlyMin";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -185,7 +185,7 @@ public System.DateOnly GetDateOnlyMin(Action<System.Net.Http.Headers.HttpRequest
 			var requestUri = "api/DateTypes/NullableDatetime/"+hasValue;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -228,7 +228,7 @@ public System.DateTimeOffset GetDateTimeOffset(Action<System.Net.Http.Headers.Ht
 			var requestUri = "api/DateTypes/ForDateTimeOffset";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -270,7 +270,7 @@ public System.DateTimeOffset GetNextHour(System.DateTimeOffset dt, Action<System
 			var requestUri = "api/DateTypes/NextHour/"+dt.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ");
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -312,7 +312,7 @@ public System.DateTimeOffset GetNextHourNullable(int n, System.Nullable<System.D
 			var requestUri = "api/DateTypes/NextHourNullable?n="+n+(dt.HasValue?"&dt="+dt.Value.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ"):String.Empty);
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -354,7 +354,7 @@ public System.DateTime GetNextYear(System.DateTime dt, Action<System.Net.Http.He
 			var requestUri = "api/DateTypes/NextYear/"+dt.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ");
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -396,7 +396,7 @@ public System.DateTime GetNextYearNullable(int n, System.Nullable<System.DateTim
 			var requestUri = "api/DateTypes/NextYearNullable?n="+n+(dt.HasValue?"&dt="+dt.Value.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ"):String.Empty);
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -443,7 +443,7 @@ public System.DateTime GetNextYearNullable(int n, System.Nullable<System.DateTim
 			var content = System.Net.Http.Json.JsonContent.Create(dt, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -491,7 +491,7 @@ public System.DateTime GetNextYearNullable(int n, System.Nullable<System.DateTim
 			var content = System.Net.Http.Json.JsonContent.Create(dt, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -538,7 +538,7 @@ public System.DateOnly PostDateOnly(System.DateOnly d, Action<System.Net.Http.He
 			var content = System.Net.Http.Json.JsonContent.Create(d, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -585,7 +585,7 @@ public System.DateOnly PostDateOnly(System.DateOnly d, Action<System.Net.Http.He
 			var content = System.Net.Http.Json.JsonContent.Create(d, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -632,7 +632,7 @@ public System.DateTime PostDateTime(System.DateTime d, Action<System.Net.Http.He
 			var content = System.Net.Http.Json.JsonContent.Create(d, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -679,7 +679,7 @@ public System.DateTime PostDateTime(System.DateTime d, Action<System.Net.Http.He
 			var content = System.Net.Http.Json.JsonContent.Create(d, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -726,7 +726,7 @@ public System.DateTimeOffset PostDateTimeOffset(System.DateTimeOffset d, Action<
 			var content = System.Net.Http.Json.JsonContent.Create(d, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -774,7 +774,7 @@ public string PostDateTimeOffsetForO(System.DateTimeOffset d, Action<System.Net.
 			var content = System.Net.Http.Json.JsonContent.Create(d, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -822,7 +822,7 @@ public System.TimeSpan PostDateTimeOffsetForOffset(System.DateTimeOffset d, Acti
 			var content = System.Net.Http.Json.JsonContent.Create(d, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -869,7 +869,7 @@ public System.TimeSpan PostDateTimeOffsetForOffset(System.DateTimeOffset d, Acti
 			var content = System.Net.Http.Json.JsonContent.Create(d, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -916,7 +916,7 @@ public System.TimeSpan PostDateTimeOffsetStringForOffset(string s, Action<System
 			var content = System.Net.Http.Json.JsonContent.Create(s, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -962,7 +962,7 @@ public System.DateTime PostNextYear(System.DateTime dt, Action<System.Net.Http.H
 			var content = System.Net.Http.Json.JsonContent.Create(dt, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1004,7 +1004,7 @@ public System.DateOnly QueryDateOnlyAsString(string d, Action<System.Net.Http.He
 			var requestUri = "api/DateTypes/DateOnlyStringQuery?d="+(d == null ? "" : Uri.EscapeDataString(d));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1046,7 +1046,7 @@ public System.DateTimeOffset RouteDateTimeOffset(System.DateTimeOffset d, Action
 			var requestUri = "api/DateTypes/RouteDateTimeOffset/"+d.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ");
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1089,7 +1089,7 @@ public System.DateTimeOffset RouteDateTimeOffset(System.DateTimeOffset d, Action
 			var requestUri = "api/DateTypes/SearchDateRange?"+(startDate.HasValue?"startDate="+startDate.Value.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ"):String.Empty)+(endDate.HasValue?"&endDate="+endDate.Value.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ"):String.Empty);
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1157,7 +1157,7 @@ public DemoWebApi.DemoData.Client.Company CreateCompany(DemoWebApi.DemoData.Clie
 			var content = System.Net.Http.Json.JsonContent.Create(p, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1204,7 +1204,7 @@ public long CreatePerson(DemoWebApi.DemoData.Client.Person p, Action<System.Net.
 			var content = System.Net.Http.Json.JsonContent.Create(p, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1251,7 +1251,7 @@ public DemoWebApi.DemoData.Client.Person CreatePerson2(DemoWebApi.DemoData.Clien
 			var content = System.Net.Http.Json.JsonContent.Create(p, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1299,7 +1299,7 @@ public DemoWebApi.DemoData.Client.Person CreatePerson3(DemoWebApi.DemoData.Clien
 			var content = System.Net.Http.Json.JsonContent.Create(p, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1349,7 +1349,7 @@ public DemoWebApi.DemoData.Client.Person CreatePersonByAdmin(DemoWebApi.DemoData
 			var content = System.Net.Http.Json.JsonContent.Create(p, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1399,7 +1399,7 @@ public DemoWebApi.DemoData.Client.Person CreatePersonWeak(DemoWebApi.DemoData.Cl
 			var content = System.Net.Http.Json.JsonContent.Create(p, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1449,7 +1449,7 @@ public DemoWebApi.DemoData.Client.Person CreatePersonWithNotFound(DemoWebApi.Dem
 			var content = System.Net.Http.Json.JsonContent.Create(p, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1499,7 +1499,7 @@ public DemoWebApi.DemoData.Client.Person CreatePersonWithStatuses(DemoWebApi.Dem
 			var content = System.Net.Http.Json.JsonContent.Create(p, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1540,7 +1540,7 @@ public void Delete(long id, Action<System.Net.Http.Headers.HttpRequestHeaders> h
 			var requestUri = "api/Entities/"+id;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Delete, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1581,7 +1581,7 @@ public DemoWebApi.DemoData.Client.Company GetCompany(long id, Action<System.Net.
 			var requestUri = "api/Entities/Company/"+id;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1629,7 +1629,7 @@ public DemoWebApi.DemoData.Client.MimsResult<string> GetMims(DemoWebApi.DemoData
 			var content = System.Net.Http.Json.JsonContent.Create(p, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1677,7 +1677,7 @@ public DemoWebApi.DemoData.Client.MyGeneric<string, decimal, double> GetMyGeneri
 			var content = System.Net.Http.Json.JsonContent.Create(s, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1725,7 +1725,7 @@ public DemoWebApi.DemoData.Client.MyGeneric<string, decimal, double> GetMyGeneri
 			var content = System.Net.Http.Json.JsonContent.Create(s, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1771,7 +1771,7 @@ public DemoWebApi.DemoData.Client.Company GetNullCompany(Action<System.Net.Http.
 			var requestUri = "api/Entities/NullCompany";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1815,7 +1815,7 @@ public DemoWebApi.DemoData.Client.Person GetPerson(long id, Action<System.Net.Ht
 			var requestUri = "api/Entities/getPerson/"+id;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1859,7 +1859,7 @@ public DemoWebApi.DemoData.Client.Person GetPerson2(long id, Action<System.Net.H
 			var requestUri = "api/Entities/getPerson2/"+id;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1906,7 +1906,7 @@ public bool LinkPerson(long id, string relationship, DemoWebApi.DemoData.Client.
 			var content = System.Net.Http.Json.JsonContent.Create(person, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -1954,7 +1954,7 @@ public string PatchPerson(DemoWebApi.DemoData.Client.Person person, Action<Syste
 			var content = System.Net.Http.Json.JsonContent.Create(person, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2003,7 +2003,7 @@ public DemoWebApi.DemoData.Client.IdMap PostIdMap(DemoWebApi.DemoData.Client.IdM
 			var content = System.Net.Http.Json.JsonContent.Create(idMap, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2052,7 +2052,7 @@ public string UpdatePerson(DemoWebApi.DemoData.Client.Person person, Action<Syst
 			var content = System.Net.Http.Json.JsonContent.Create(person, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2114,7 +2114,7 @@ public void Delete(long id, Action<System.Net.Http.Headers.HttpRequestHeaders> h
 			var requestUri = "api/Heroes/"+id;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Delete, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2154,7 +2154,7 @@ public DemoWebApi.Controllers.Client.Hero[] GetAsyncHeroes(Action<System.Net.Htt
 			var requestUri = "api/Heroes/asyncHeroes";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2199,7 +2199,7 @@ public DemoWebApi.Controllers.Client.Hero GetHero(long id, Action<System.Net.Htt
 			var requestUri = "api/Heroes/"+id;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2243,7 +2243,7 @@ public DemoWebApi.Controllers.Client.Hero[] GetHeroes(Action<System.Net.Http.Hea
 			var requestUri = "api/Heroes";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2289,7 +2289,7 @@ public DemoWebApi.Controllers.Client.SuperHero GetSuperHero(long id, Action<Syst
 			var requestUri = "api/Heroes/super?id="+id;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2337,7 +2337,7 @@ public DemoWebApi.Controllers.Client.Hero Post(string name, Action<System.Net.Ht
 			var content = System.Net.Http.Json.JsonContent.Create(name, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2379,7 +2379,7 @@ public DemoWebApi.Controllers.Client.Hero PostWithQuery(string name, Action<Syst
 		{
 			var requestUri = "api/Heroes/q?name="+(name == null ? "" : Uri.EscapeDataString(name));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2427,7 +2427,7 @@ public DemoWebApi.Controllers.Client.Hero Put(DemoWebApi.Controllers.Client.Hero
 			var content = System.Net.Http.Json.JsonContent.Create(hero, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2471,7 +2471,7 @@ public DemoWebApi.Controllers.Client.Hero[] Search(string name, Action<System.Ne
 			var requestUri = "api/Heroes/search/"+(name == null ? "" : Uri.EscapeDataString(name));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2534,7 +2534,7 @@ public byte GetByte(byte d, Action<System.Net.Http.Headers.HttpRequestHeaders> h
 			var requestUri = "api/Numbers/byte?d="+d;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2578,7 +2578,7 @@ public byte GetByteWithRange(byte d, Action<System.Net.Http.Headers.HttpRequestH
 			var requestUri = "api/Numbers/byteWithRange?d="+d;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2624,7 +2624,7 @@ public byte Post(byte d, Action<System.Net.Http.Headers.HttpRequestHeaders> hand
 			var content = System.Net.Http.Json.JsonContent.Create(d, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2670,7 +2670,7 @@ public sbyte Post(sbyte d, Action<System.Net.Http.Headers.HttpRequestHeaders> ha
 			var content = System.Net.Http.Json.JsonContent.Create(d, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2716,7 +2716,7 @@ public short Post(short d, Action<System.Net.Http.Headers.HttpRequestHeaders> ha
 			var content = System.Net.Http.Json.JsonContent.Create(d, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2762,7 +2762,7 @@ public ushort Post(ushort d, Action<System.Net.Http.Headers.HttpRequestHeaders>
 			var content = System.Net.Http.Json.JsonContent.Create(d, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2808,7 +2808,7 @@ public int Post(int d, Action<System.Net.Http.Headers.HttpRequestHeaders> handle
 			var content = System.Net.Http.Json.JsonContent.Create(d, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2854,7 +2854,7 @@ public long Post(long d, Action<System.Net.Http.Headers.HttpRequestHeaders> hand
 			var content = System.Net.Http.Json.JsonContent.Create(d, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2900,7 +2900,7 @@ public ulong Post(ulong d, Action<System.Net.Http.Headers.HttpRequestHeaders> ha
 			var content = System.Net.Http.Json.JsonContent.Create(d, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2946,7 +2946,7 @@ public System.Numerics.BigInteger PostBigInteger(System.Numerics.BigInteger bigI
 			var content = System.Net.Http.Json.JsonContent.Create(bigInteger, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -2994,7 +2994,7 @@ public string PostBigIntegralAsStringForJs(string bigIntegral, Action<System.Net
 			var content = System.Net.Http.Json.JsonContent.Create(bigIntegral, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3043,7 +3043,7 @@ public DemoWebApi.DemoData.Client.BigNumbers PostBigNumbers(DemoWebApi.DemoData.
 			var content = System.Net.Http.Json.JsonContent.Create(bigNumbers, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3090,7 +3090,7 @@ public System.Int128 PostInt128(System.Int128 int128, Action<System.Net.Http.Hea
 			var content = System.Net.Http.Json.JsonContent.Create(int128, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3136,7 +3136,7 @@ public long PostInt64(long int64, Action<System.Net.Http.Headers.HttpRequestHead
 			var content = System.Net.Http.Json.JsonContent.Create(int64, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3183,7 +3183,7 @@ public DemoWebApi.DemoData.Client.IntegralEntity PostIntegralEntity(DemoWebApi.D
 			var content = System.Net.Http.Json.JsonContent.Create(integralEntity, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3231,7 +3231,7 @@ public DemoWebApi.DemoData.Client.IntegralEntity PostIntegralEntityMustBeValid(D
 			var content = System.Net.Http.Json.JsonContent.Create(integralEntity, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3280,7 +3280,7 @@ public int PostIntWithRange(int d, Action<System.Net.Http.Headers.HttpRequestHea
 			var content = System.Net.Http.Json.JsonContent.Create(d, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3328,7 +3328,7 @@ public long PostLongWithRange(long d, Action<System.Net.Http.Headers.HttpRequest
 			var content = System.Net.Http.Json.JsonContent.Create(d, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3374,7 +3374,7 @@ public System.UInt128 PostUint128(System.UInt128 uint128, Action<System.Net.Http
 			var content = System.Net.Http.Json.JsonContent.Create(uint128, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3420,7 +3420,7 @@ public ulong PostUint64(ulong uint64, Action<System.Net.Http.Headers.HttpRequest
 			var content = System.Net.Http.Json.JsonContent.Create(uint64, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3484,7 +3484,7 @@ public string AthletheSearch(System.Nullable<int> take, int skip, string order,
 			var requestUri = "api/StringData/AthletheSearch?"+(take.HasValue?"take="+take.Value.ToString():String.Empty)+"&skip="+skip+"&order="+(order == null ? "" : Uri.EscapeDataString(order))+"&sort="+(sort == null ? "" : Uri.EscapeDataString(sort))+"&search="+(search == null ? "" : Uri.EscapeDataString(search));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3530,7 +3530,7 @@ public string GetABCDE(Action<System.Net.Http.Headers.HttpRequestHeaders> handle
 			var requestUri = "api/StringData/String";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3576,7 +3576,7 @@ public string GetEmptyString(Action<System.Net.Http.Headers.HttpRequestHeaders>
 			var requestUri = "api/StringData/EmptyString";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3624,7 +3624,7 @@ public string GetNullString(Action<System.Net.Http.Headers.HttpRequestHeaders> h
 			var requestUri = "api/StringData/NullString";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3680,7 +3680,7 @@ public System.Net.Http.HttpResponseMessage GetActionResult(Action<System.Net.Htt
 			var requestUri = "api/SuperDemo/ActionResult";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			responseMessage.EnsureSuccessStatusCodeEx();
 			return responseMessage;
 		}
@@ -3706,7 +3706,7 @@ public System.Net.Http.HttpResponseMessage GetActionResult2(Action<System.Net.Ht
 			var requestUri = "api/SuperDemo/ActionResult2";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			responseMessage.EnsureSuccessStatusCodeEx();
 			return responseMessage;
 		}
@@ -3744,7 +3744,7 @@ public string GetActionStringResult(Action<System.Net.Http.Headers.HttpRequestHe
 			var requestUri = "api/SuperDemo/ActionStringResult";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3780,7 +3780,7 @@ public System.Net.Http.HttpResponseMessage GetBadRequest(Action<System.Net.Http.
 			var requestUri = "api/SuperDemo/BadRequest";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			responseMessage.EnsureSuccessStatusCodeEx();
 			return responseMessage;
 		}
@@ -3806,7 +3806,7 @@ public System.Net.Http.HttpResponseMessage GetBadRequest2(Action<System.Net.Http
 			var requestUri = "api/SuperDemo/BadRequest2";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			responseMessage.EnsureSuccessStatusCodeEx();
 			return responseMessage;
 		}
@@ -3840,7 +3840,7 @@ public bool GetBool(Action<System.Net.Http.Headers.HttpRequestHeaders> handleHea
 			var requestUri = "api/SuperDemo/bool";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3882,7 +3882,7 @@ public byte Getbyte(Action<System.Net.Http.Headers.HttpRequestHeaders> handleHea
 			var requestUri = "api/SuperDemo/byte";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3925,7 +3925,7 @@ public byte[] GetByteArray(Action<System.Net.Http.Headers.HttpRequestHeaders> ha
 			var requestUri = "api/SuperDemo/ByteArray";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -3968,7 +3968,7 @@ public char GetChar(Action<System.Net.Http.Headers.HttpRequestHeaders> handleHea
 			var requestUri = "api/SuperDemo/char";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4011,7 +4011,7 @@ public char GetChar(Action<System.Net.Http.Headers.HttpRequestHeaders> handleHea
 			var requestUri = "api/SuperDemo/Collection";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4054,7 +4054,7 @@ public DemoWebApi.DemoData.Client.Days GetDay(DemoWebApi.DemoData.Client.Days d,
 			var requestUri = "api/SuperDemo/enumGet?d="+d;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4096,7 +4096,7 @@ public decimal GetDecimal(Action<System.Net.Http.Headers.HttpRequestHeaders> han
 			var requestUri = "api/SuperDemo/decimal";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4139,7 +4139,7 @@ public decimal[] GetDecimalArrayQ(decimal[] a, Action<System.Net.Http.Headers.Ht
 			var requestUri = "api/SuperDemo/decimalArrayQ?"+String.Join("&", a.Select(k => $"a={Uri.EscapeDataString(k.ToString())}"));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4182,7 +4182,7 @@ public decimal GetDecimalSquare(decimal d, Action<System.Net.Http.Headers.HttpRe
 			var requestUri = "api/SuperDemo/decimal/"+d;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4224,7 +4224,7 @@ public decimal GetDecimalZero(Action<System.Net.Http.Headers.HttpRequestHeaders>
 			var requestUri = "api/SuperDemo/DecimalZero";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4266,7 +4266,7 @@ public System.Collections.Generic.IDictionary<string, string> GetDictionary(Acti
 			var requestUri = "api/SuperDemo/StringStringDic";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4308,7 +4308,7 @@ public System.Collections.Generic.IDictionary<string, string> GetDictionary(Acti
 			var requestUri = "api/SuperDemo/StringPersonDic";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4351,7 +4351,7 @@ public System.Collections.Generic.IDictionary<string, string> GetDictionary(Acti
 			var requestUri = "api/SuperDemo/StringPersonDic2";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4394,7 +4394,7 @@ public double Getdouble(Action<System.Net.Http.Headers.HttpRequestHeaders> handl
 			var requestUri = "api/SuperDemo/doulbe";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4436,7 +4436,7 @@ public double GetDoubleZero(Action<System.Net.Http.Headers.HttpRequestHeaders> h
 			var requestUri = "api/SuperDemo/DoubleZero";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4479,7 +4479,7 @@ public DemoWebApi.DemoData.Client.Days[] GetEnumArrayDays(System.Collections.Gen
 			var requestUri = "api/SuperDemo/enumArrayDays?"+String.Join("&", a.Select(k => $"a={Uri.EscapeDataString(k.ToString())}"));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4523,7 +4523,7 @@ public System.DayOfWeek[] GetEnumArrayQ2(System.Collections.Generic.List<System.
 			var requestUri = "api/SuperDemo/enumArrayQ2?"+String.Join("&", a.Select(k => $"a={Uri.EscapeDataString(k.ToString())}"));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4566,7 +4566,7 @@ public float GetFloatZero(Action<System.Net.Http.Headers.HttpRequestHeaders> han
 			var requestUri = "api/SuperDemo/FloatZero";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4608,7 +4608,7 @@ public float GetFloatZero(Action<System.Net.Http.Headers.HttpRequestHeaders> han
 			var requestUri = "api/SuperDemo/ICollection";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4650,7 +4650,7 @@ public float GetFloatZero(Action<System.Net.Http.Headers.HttpRequestHeaders> han
 			var requestUri = "api/SuperDemo/IList";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4693,7 +4693,7 @@ public async Task<int[,]> GetInt2DAsync(Action<System.Net.Http.Headers.HttpReque
 			var requestUri = "api/SuperDemo/int2d";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4737,7 +4737,7 @@ public int[][] GetInt2DJagged(Action<System.Net.Http.Headers.HttpRequestHeaders>
 			var requestUri = "api/SuperDemo/int2dJagged";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4781,7 +4781,7 @@ public int[] GetIntArray(Action<System.Net.Http.Headers.HttpRequestHeaders> hand
 			var requestUri = "api/SuperDemo/intArray";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4825,7 +4825,7 @@ public int[] GetIntArrayQ(int[] a, Action<System.Net.Http.Headers.HttpRequestHea
 			var requestUri = "api/SuperDemo/intArrayQ?"+String.Join("&", a.Select(k => $"a={Uri.EscapeDataString(k.ToString())}"));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4869,7 +4869,7 @@ public long[] GetIntArrayQ2(System.Collections.Generic.IEnumerable<long> a, Acti
 			var requestUri = "api/SuperDemo/intArrayQ2?"+String.Join("&", a.Select(k => $"a={Uri.EscapeDataString(k.ToString())}"));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4912,7 +4912,7 @@ public int GetIntSquare(int d, Action<System.Net.Http.Headers.HttpRequestHeaders
 			var requestUri = "api/SuperDemo/int/"+d;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4954,7 +4954,7 @@ public int GetIntSquare(int d, Action<System.Net.Http.Headers.HttpRequestHeaders
 			var requestUri = "api/SuperDemo/IReadOnlyCollection";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -4996,7 +4996,7 @@ public int GetIntSquare(int d, Action<System.Net.Http.Headers.HttpRequestHeaders
 			var requestUri = "api/SuperDemo/IReadOnlyList";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5038,7 +5038,7 @@ public int GetIntSquare(int d, Action<System.Net.Http.Headers.HttpRequestHeaders
 			var requestUri = "api/SuperDemo/KeyValuePair";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5081,7 +5081,7 @@ public int GetIntSquare(int d, Action<System.Net.Http.Headers.HttpRequestHeaders
 			var requestUri = "api/SuperDemo/List";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5125,7 +5125,7 @@ public System.Nullable<decimal> GetNullableDecimal(bool hasValue, Action<System.
 			var requestUri = "api/SuperDemo/NullableDecimal/"+hasValue;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5171,7 +5171,7 @@ public DemoWebApi.DemoData.Client.Person GetNullPerson(Action<System.Net.Http.He
 			var requestUri = "api/SuperDemo/NullObject";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5215,7 +5215,7 @@ public DemoWebApi.DemoData.Client.Person GetNullPerson(Action<System.Net.Http.He
 			var requestUri = "api/SuperDemo/DoubleNullable?location="+(location == null ? "" : Uri.EscapeDataString(location))+(dd.HasValue?"&dd="+dd.Value.ToString():String.Empty)+(de.HasValue?"&de="+de.Value.ToString():String.Empty);
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5259,7 +5259,7 @@ public DemoWebApi.DemoData.Client.Person GetNullPerson(Action<System.Net.Http.He
 			var requestUri = "api/SuperDemo/DoubleNullable2?"+(dd.HasValue?"dd="+dd.Value.ToString():String.Empty)+(de.HasValue?"&de="+de.Value.ToString():String.Empty);
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5302,7 +5302,7 @@ public sbyte Getsbyte(Action<System.Net.Http.Headers.HttpRequestHeaders> handleH
 			var requestUri = "api/SuperDemo/sbyte";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5344,7 +5344,7 @@ public short GetShort(Action<System.Net.Http.Headers.HttpRequestHeaders> handleH
 			var requestUri = "api/SuperDemo/short";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5387,7 +5387,7 @@ public string[] GetStringArrayQ(string[] a, Action<System.Net.Http.Headers.HttpR
 			var requestUri = "api/SuperDemo/stringArrayQ?"+String.Join("&", a.Select(k => $"a={Uri.EscapeDataString(k.ToString())}"));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5431,7 +5431,7 @@ public string[] GetStringArrayQ2(System.Collections.Generic.List<string> a, Acti
 			var requestUri = "api/SuperDemo/stringArrayQ2?"+String.Join("&", a.Select(k => $"a={Uri.EscapeDataString(k.ToString())}"));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5466,7 +5466,7 @@ public System.Net.Http.HttpResponseMessage GetTextStream(Action<System.Net.Http.
 			var requestUri = "api/SuperDemo/TextStream";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			responseMessage.EnsureSuccessStatusCodeEx();
 			return responseMessage;
 		}
@@ -5500,7 +5500,7 @@ public uint GetUint(Action<System.Net.Http.Headers.HttpRequestHeaders> handleHea
 			var requestUri = "api/SuperDemo/uint";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5542,7 +5542,7 @@ public ulong Getulong(Action<System.Net.Http.Headers.HttpRequestHeaders> handleH
 			var requestUri = "api/SuperDemo/ulong";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5584,7 +5584,7 @@ public ushort GetUShort(Action<System.Net.Http.Headers.HttpRequestHeaders> handl
 			var requestUri = "api/SuperDemo/ushort";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5616,7 +5616,7 @@ public System.Net.Http.HttpResponseMessage PostActionResult(Action<System.Net.Ht
 		{
 			var requestUri = "api/SuperDemo/ActionResult";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			responseMessage.EnsureSuccessStatusCodeEx();
 			return responseMessage;
 		}
@@ -5646,7 +5646,7 @@ public System.Net.Http.HttpResponseMessage PostActionResult2(string s, Action<Sy
 			var content = System.Net.Http.Json.JsonContent.Create(s, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			responseMessage.EnsureSuccessStatusCodeEx();
 			return responseMessage;
 		}
@@ -5676,7 +5676,7 @@ public System.Net.Http.HttpResponseMessage PostActionResult3(DemoWebApi.DemoData
 			var content = System.Net.Http.Json.JsonContent.Create(person, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			responseMessage.EnsureSuccessStatusCodeEx();
 			return responseMessage;
 		}
@@ -5714,7 +5714,7 @@ public int PostCollection(System.Collections.ObjectModel.Collection<DemoWebApi.D
 			var content = System.Net.Http.Json.JsonContent.Create(list, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5761,7 +5761,7 @@ public DemoWebApi.DemoData.Client.Days[] PostDay(DemoWebApi.DemoData.Client.Days
 			var content = System.Net.Http.Json.JsonContent.Create(d2, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5808,7 +5808,7 @@ public int PostDictionary(System.Collections.Generic.IDictionary<string, DemoWeb
 			var content = System.Net.Http.Json.JsonContent.Create(dic, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5855,7 +5855,7 @@ public System.Guid[] PostGuids(System.Guid[] guids, Action<System.Net.Http.Heade
 			var content = System.Net.Http.Json.JsonContent.Create(guids, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5902,7 +5902,7 @@ public int PostICollection(System.Collections.Generic.ICollection<DemoWebApi.Dem
 			var content = System.Net.Http.Json.JsonContent.Create(list, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5948,7 +5948,7 @@ public int PostIList(System.Collections.Generic.IList<DemoWebApi.DemoData.Client
 			var content = System.Net.Http.Json.JsonContent.Create(list, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -5994,7 +5994,7 @@ public bool PostInt2D(int[,] a, Action<System.Net.Http.Headers.HttpRequestHeader
 			var content = System.Net.Http.Json.JsonContent.Create(a, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6040,7 +6040,7 @@ public bool PostInt2DJagged(int[][] a, Action<System.Net.Http.Headers.HttpReques
 			var content = System.Net.Http.Json.JsonContent.Create(a, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6092,7 +6092,7 @@ public bool PostIntArray(int[] a, Action<System.Net.Http.Headers.HttpRequestHead
 			var content = System.Net.Http.Json.JsonContent.Create(a, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6138,7 +6138,7 @@ public int PostIReadOnlyCollection(System.Collections.Generic.IReadOnlyCollectio
 			var content = System.Net.Http.Json.JsonContent.Create(list, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6184,7 +6184,7 @@ public int PostIReadOnlyList(System.Collections.Generic.IReadOnlyList<DemoWebApi
 			var content = System.Net.Http.Json.JsonContent.Create(list, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6230,7 +6230,7 @@ public int PostList(System.Collections.Generic.List<DemoWebApi.DemoData.Client.P
 			var content = System.Net.Http.Json.JsonContent.Create(list, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6277,7 +6277,7 @@ public System.Tuple<string, int> PostWithQueryButEmptyBody(string s, int i, Acti
 			var content = System.Net.Http.Json.JsonContent.Create(s, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6342,7 +6342,7 @@ public string AthletheSearch(System.Nullable<int> take, int skip, string order,
 			var requestUri = "api/TextData/AthletheSearch?"+(take.HasValue?"take="+take.Value.ToString():String.Empty)+"&skip="+skip+"&order="+(order == null ? "" : Uri.EscapeDataString(order))+"&sort="+(sort == null ? "" : Uri.EscapeDataString(sort))+"&search="+(search == null ? "" : Uri.EscapeDataString(search));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6388,7 +6388,7 @@ public string GetABCDE(Action<System.Net.Http.Headers.HttpRequestHeaders> handle
 			var requestUri = "api/TextData/String";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6434,7 +6434,7 @@ public string GetEmptyString(Action<System.Net.Http.Headers.HttpRequestHeaders>
 			var requestUri = "api/TextData/EmptyString";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6482,7 +6482,7 @@ public string GetNullableString(Action<System.Net.Http.Headers.HttpRequestHeader
 			var requestUri = "api/TextData/NullableString";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6530,7 +6530,7 @@ public string GetNullString(Action<System.Net.Http.Headers.HttpRequestHeaders> h
 			var requestUri = "api/TextData/NullString";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6596,7 +6596,7 @@ public void A1TupleArray(System.Tuple<System.Guid, int>[] idAndOrderArray, Actio
 			var content = System.Net.Http.Json.JsonContent.Create(idAndOrderArray, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6638,7 +6638,7 @@ public void A2TupleIEnumerable(System.Collections.Generic.IEnumerable<System.Tup
 			var content = System.Net.Http.Json.JsonContent.Create(idAndOrderArray, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6683,7 +6683,7 @@ public DemoWebApi.DemoData.Client.Person ChangeName(System.Tuple<string, DemoWeb
 			var content = System.Net.Http.Json.JsonContent.Create(d, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6729,7 +6729,7 @@ public DemoWebApi.DemoData.Client.Person ChangeName(System.Tuple<string, DemoWeb
 			var requestUri = "api/Tuple/PeopleCompany4";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6775,7 +6775,7 @@ public DemoWebApi.DemoData.Client.Person ChangeName(System.Tuple<string, DemoWeb
 			var requestUri = "api/Tuple/PeopleCompany5";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6819,7 +6819,7 @@ public System.Tuple<int> GetTuple1(Action<System.Net.Http.Headers.HttpRequestHea
 			var requestUri = "api/Tuple/Tuple1";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6863,7 +6863,7 @@ public System.Tuple<string, int> GetTuple2(Action<System.Net.Http.Headers.HttpRe
 			var requestUri = "api/Tuple/Tuple2";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6907,7 +6907,7 @@ public System.Tuple<string, string, int> GetTuple3(Action<System.Net.Http.Header
 			var requestUri = "api/Tuple/Tuple3";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6951,7 +6951,7 @@ public System.Tuple<string, string, string, int> GetTuple4(Action<System.Net.Htt
 			var requestUri = "api/Tuple/Tuple4";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -6995,7 +6995,7 @@ public System.Tuple<string, string, string, string, int> GetTuple5(Action<System
 			var requestUri = "api/Tuple/Tuple5";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7039,7 +7039,7 @@ public System.Tuple<string, string, string, string, string, int> GetTuple6(Actio
 			var requestUri = "api/Tuple/Tuple6";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7083,7 +7083,7 @@ public System.Tuple<string, string, string, string, string, long, int> GetTuple7
 			var requestUri = "api/Tuple/Tuple7";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7127,7 +7127,7 @@ public System.Tuple<string, string, string, string, string, long, int> GetTuple7
 			var requestUri = "api/Tuple/Tuple8";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7175,7 +7175,7 @@ public DemoWebApi.DemoData.Client.Person LinkPeopleCompany2(System.Tuple<DemoWeb
 			var content = System.Net.Http.Json.JsonContent.Create(peopleAndCompany, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7223,7 +7223,7 @@ public DemoWebApi.DemoData.Client.Person LinkPeopleCompany3(System.Tuple<DemoWeb
 			var content = System.Net.Http.Json.JsonContent.Create(peopleAndCompany, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7271,7 +7271,7 @@ public DemoWebApi.DemoData.Client.Person LinkPeopleCompany4(System.Tuple<DemoWeb
 			var content = System.Net.Http.Json.JsonContent.Create(peopleAndCompany, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7319,7 +7319,7 @@ public DemoWebApi.DemoData.Client.Person LinkPeopleCompany5(System.Tuple<DemoWeb
 			var content = System.Net.Http.Json.JsonContent.Create(peopleAndCompany, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7367,7 +7367,7 @@ public DemoWebApi.DemoData.Client.Person LinkPeopleCompany6(System.Tuple<DemoWeb
 			var content = System.Net.Http.Json.JsonContent.Create(peopleAndCompany, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7415,7 +7415,7 @@ public DemoWebApi.DemoData.Client.Person LinkPeopleCompany7(System.Tuple<DemoWeb
 			var content = System.Net.Http.Json.JsonContent.Create(peopleAndCompany, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7463,7 +7463,7 @@ public DemoWebApi.DemoData.Client.Person LinkPeopleCompany8(System.Tuple<DemoWeb
 			var content = System.Net.Http.Json.JsonContent.Create(peopleAndCompany, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7511,7 +7511,7 @@ public DemoWebApi.DemoData.Client.Person LinkPersonCompany1(System.Tuple<DemoWeb
 			var content = System.Net.Http.Json.JsonContent.Create(peopleAndCompany, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7558,7 +7558,7 @@ public int PostTuple1(System.Tuple<int> tuple, Action<System.Net.Http.Headers.Ht
 			var content = System.Net.Http.Json.JsonContent.Create(tuple, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7606,7 +7606,7 @@ public string PostTuple2(System.Tuple<string, int> tuple, Action<System.Net.Http
 			var content = System.Net.Http.Json.JsonContent.Create(tuple, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7656,7 +7656,7 @@ public string PostTuple3(System.Tuple<string, string, int> tuple, Action<System.
 			var content = System.Net.Http.Json.JsonContent.Create(tuple, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7706,7 +7706,7 @@ public string PostTuple4(System.Tuple<string, string, string, int> tuple, Action
 			var content = System.Net.Http.Json.JsonContent.Create(tuple, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7756,7 +7756,7 @@ public string PostTuple5(System.Tuple<string, string, string, string, int> tuple
 			var content = System.Net.Http.Json.JsonContent.Create(tuple, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7806,7 +7806,7 @@ public string PostTuple6(System.Tuple<string, string, string, string, string, in
 			var content = System.Net.Http.Json.JsonContent.Create(tuple, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7856,7 +7856,7 @@ public string PostTuple7(System.Tuple<string, string, string, string, string, lo
 			var content = System.Net.Http.Json.JsonContent.Create(tuple, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7906,7 +7906,7 @@ public string PostTuple8(System.Tuple<string, string, string, string, string, st
 			var content = System.Net.Http.Json.JsonContent.Create(tuple, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -7968,7 +7968,7 @@ public void Delete(int id, Action<System.Net.Http.Headers.HttpRequestHeaders> ha
 			var requestUri = "api/Values/"+id;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Delete, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8008,7 +8008,7 @@ public System.Collections.Generic.IEnumerable<string> Get(Action<System.Net.Http
 			var requestUri = "api/Values";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8052,7 +8052,7 @@ public string Get(int id, string name, Action<System.Net.Http.Headers.HttpReques
 			var requestUri = "api/Values/Name/"+id+"?name="+(name == null ? "" : Uri.EscapeDataString(name));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8098,7 +8098,7 @@ public string Get(string name, Action<System.Net.Http.Headers.HttpRequestHeaders
 			var requestUri = "api/Values?name="+(name == null ? "" : Uri.EscapeDataString(name));
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8144,7 +8144,7 @@ public string Get(int id, Action<System.Net.Http.Headers.HttpRequestHeaders> han
 			var requestUri = "api/Values/"+id;
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8188,7 +8188,7 @@ public System.Collections.Generic.IEnumerable<string> Get2(Action<System.Net.Htt
 			var requestUri = "api/Values/Get2";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8236,7 +8236,7 @@ public string Post(string value, Action<System.Net.Http.Headers.HttpRequestHeade
 			var content = System.Net.Http.Json.JsonContent.Create(value, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -8282,7 +8282,7 @@ public void Put(int id, string value, Action<System.Net.Http.Headers.HttpRequest
 			var content = System.Net.Http.Json.JsonContent.Create(value, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -9090,7 +9090,7 @@ public System.Text.Json.Nodes.JsonObject GetAnonymousDynamic(Action<System.Net.H
 			var requestUri = "api/SpecialTypes/AnonymousDynamic";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -9134,7 +9134,7 @@ public System.Text.Json.Nodes.JsonObject GetAnonymousDynamic2(Action<System.Net.
 			var requestUri = "api/SpecialTypes/AnonymousDynamic2";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -9178,7 +9178,7 @@ public System.Text.Json.Nodes.JsonObject GetAnonymousObject(Action<System.Net.Ht
 			var requestUri = "api/SpecialTypes/AnonymousObject";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -9222,7 +9222,7 @@ public System.Text.Json.Nodes.JsonObject GetAnonymousObject2(Action<System.Net.H
 			var requestUri = "api/SpecialTypes/AnonymousObject2";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -9270,7 +9270,7 @@ public System.Text.Json.Nodes.JsonObject PostAnonymousObject(System.Text.Json.No
 			var content = System.Net.Http.Json.JsonContent.Create(obj, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -9318,7 +9318,7 @@ public System.Text.Json.Nodes.JsonObject PostAnonymousObject2(System.Text.Json.N
 			var content = System.Net.Http.Json.JsonContent.Create(obj, mediaType: null, jsonSerializerSettings);
 			httpRequestMessage.Content = content;
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
@@ -9393,7 +9393,7 @@ public WeatherForecast(System.Net.Http.HttpClient client, JsonSerializerOptions
 			var requestUri = "WeatherForecast";
 			using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri);
 			handleHeaders?.Invoke(httpRequestMessage.Headers);
-			var responseMessage = client.Send(httpRequestMessage);
+			var responseMessage = client.SendAsync(httpRequestMessage).Result;
 			try
 			{
 				responseMessage.EnsureSuccessStatusCodeEx();
diff --git a/WebApiClientGenCore/ClientApiFunctionGen.cs b/WebApiClientGenCore/ClientApiFunctionGen.cs
index 172618af..cb726796 100644
--- a/WebApiClientGenCore/ClientApiFunctionGen.cs
+++ b/WebApiClientGenCore/ClientApiFunctionGen.cs
@@ -11,674 +11,674 @@
 
 namespace Fonlow.CodeDom.Web.Cs
 {
-    /// <summary>
-    /// Generate a client function upon ApiDescription for C#
-    /// </summary>
-    internal sealed class ClientApiFunctionGen
-    {
-        readonly WebApiDescription description;
-        readonly string methodName;
-        Type returnType;
-        readonly bool returnTypeIsStream;
-        readonly bool returnTypeIsDynamicObject;
-
-        /// <summary>
-        /// Decorated by NotNullAttribute
-        /// </summary>
-        readonly bool returnTypeDecoratedWithNotNullable;
-        readonly bool returnTypeDecoratedWithMaybeNullable;
-        CodeMemberMethod clientMethod;
-        readonly Poco2Client.Poco2CsGen poco2CsGen;
-        readonly bool forAsync;
-        readonly bool stringAsString;
-        readonly string statementOfEnsureSuccessStatusCode;
-        readonly CodeGenSettings codeGenSettings;
-        readonly CodeGenOutputs codeGenOutputsSettings;
-        readonly System.Reflection.ParameterInfo[] parameterInfoArray;
-        readonly IDictionary<Type, Func<object, string>> attribueCommentDic;
-
-        ClientApiFunctionGen(WebApiDescription webApiDescription, Poco2Client.Poco2CsGen poco2CsGen, CodeGenSettings codeGenSettings, bool forAsync)
-        {
-            this.description = webApiDescription;
-            this.poco2CsGen = poco2CsGen;
-            this.codeGenSettings = codeGenSettings;
-            this.codeGenOutputsSettings = codeGenSettings.ClientApiOutputs;
-            this.forAsync = forAsync;
-            this.stringAsString = codeGenOutputsSettings.StringAsString;
-            statementOfEnsureSuccessStatusCode = codeGenOutputsSettings.UseEnsureSuccessStatusCodeEx ? "EnsureSuccessStatusCodeEx" : "EnsureSuccessStatusCode";
-            methodName = webApiDescription.ActionDescriptor.ActionName;
-            if (methodName.EndsWith("Async", StringComparison.Ordinal))
-            {
-                methodName = methodName.Substring(0, methodName.Length - 5);
-            }
-
-            Type returnTypeOfProducesResponseType = GetTypeTextOfResponse2xx(description.ActionDescriptor.CustomAttributes);
-            returnType = returnTypeOfProducesResponseType ?? (webApiDescription.ResponseDescription?.ResponseType ?? webApiDescription.ActionDescriptor.ReturnType);
-
-            returnTypeIsStream = returnType != null && ((returnType.FullName == typeNameOfHttpResponseMessage)
-                || (returnType.FullName == typeOfIHttpActionResult)
-                || (returnType.FullName == typeOfIActionResult)
-                || (returnType.FullName == typeOfActionResult)
-                || (returnType.FullName.StartsWith("System.Threading.Tasks.Task`1[[Microsoft.AspNetCore.Mvc.IActionResult", StringComparison.Ordinal)) // .net core is not translating Task<IActionResult> properly.
-                || (returnType.FullName.StartsWith("System.Threading.Tasks.Task`1[[Microsoft.AspNetCore.Mvc.IHttpActionResult", StringComparison.Ordinal))
-                || (returnType.FullName.StartsWith("System.Threading.Tasks.Task`1[[Microsoft.AspNetCore.Mvc.ActionResult", StringComparison.Ordinal))
-                );
-
-            returnTypeIsDynamicObject = returnType != null && returnType.FullName != null && returnType.FullName.StartsWith("System.Threading.Tasks.Task`1[[System.Object", StringComparison.Ordinal);
-
-            MethodInfo methodInfo = webApiDescription.ActionDescriptor.ControllerDescriptor.ControllerType.GetMethod(webApiDescription.ActionDescriptor.MethodName, webApiDescription.ActionDescriptor.MethodParameterTypes);
-            if (methodInfo != null)
-            {
-                parameterInfoArray = methodInfo.GetParameters();
-                if (codeGenOutputsSettings.MaybeNullAttributeOnMethod)
-                {
-                    returnTypeDecoratedWithMaybeNullable = returnType != null && Attribute.IsDefined(methodInfo.ReturnParameter, typeof(System.Diagnostics.CodeAnalysis.MaybeNullAttribute));
-                }
-                else if (codeGenOutputsSettings.NotNullAttributeOnMethod)
-                {
-                    returnTypeDecoratedWithNotNullable = returnType != null && Attribute.IsDefined(methodInfo.ReturnParameter, typeof(System.Diagnostics.CodeAnalysis.NotNullAttribute));
-                }
-            }
-
-            AnnotationCommentGenerator annotationCommentGenerator = new AnnotationCommentGenerator();
-            attribueCommentDic = annotationCommentGenerator.Get();
-        }
-
-        const string typeOfIHttpActionResult = "System.Web.Http.IHttpActionResult";
-        const string typeOfIActionResult = "Microsoft.AspNetCore.Mvc.IActionResult"; //for .net core 2.1
-        const string typeOfActionResult = "Microsoft.AspNetCore.Mvc.ActionResult"; //for .net core 2.1
-
-        static readonly Type typeOfChar = typeof(char);
-
-        public static CodeMemberMethod Create(WebApiDescription webApiDescription, Poco2Client.Poco2CsGen poco2CsGen, CodeGenSettings codeGenOutputsSettings, bool forAsync)
-        {
-            ClientApiFunctionGen gen = new ClientApiFunctionGen(webApiDescription, poco2CsGen, codeGenOutputsSettings, forAsync);
-            return gen.CreateApiFunction();
-        }
-
-        /// <summary>
-        /// Candidate could be custom POCO, or custom POCO wrapped in IActionResult, ActionResult etc.
-        /// </summary>
-        /// <param name="candidateType"></param>
-        void AddCustomPocoTypeForCs(Type candidateType)
-        {
-            if (candidateType == null)
-            {
-                return;
-            }
-
-            var assemblyFilename = candidateType.Assembly.GetName().Name;
-            string controllerAssemblyName = description.ActionDescriptor.ControllerDescriptor.ControllerType.Assembly.GetName().Name;
-            poco2CsGen.CheckOrAdd(candidateType, controllerAssemblyName != assemblyFilename);
-        }
-
-        CodeMemberMethod CreateApiFunction()
-        {
-            AddCustomPocoTypeForCs(returnType);
-            //create method
-            clientMethod = forAsync ? CreateMethodBasicForAsync() : CreateMethodBasic();
+	/// <summary>
+	/// Generate a client function upon ApiDescription for C#
+	/// </summary>
+	internal sealed class ClientApiFunctionGen
+	{
+		readonly WebApiDescription description;
+		readonly string methodName;
+		Type returnType;
+		readonly bool returnTypeIsStream;
+		readonly bool returnTypeIsDynamicObject;
+
+		/// <summary>
+		/// Decorated by NotNullAttribute
+		/// </summary>
+		readonly bool returnTypeDecoratedWithNotNullable;
+		readonly bool returnTypeDecoratedWithMaybeNullable;
+		CodeMemberMethod clientMethod;
+		readonly Poco2Client.Poco2CsGen poco2CsGen;
+		readonly bool forAsync;
+		readonly bool stringAsString;
+		readonly string statementOfEnsureSuccessStatusCode;
+		readonly CodeGenSettings codeGenSettings;
+		readonly CodeGenOutputs codeGenOutputsSettings;
+		readonly System.Reflection.ParameterInfo[] parameterInfoArray;
+		readonly IDictionary<Type, Func<object, string>> attribueCommentDic;
+
+		ClientApiFunctionGen(WebApiDescription webApiDescription, Poco2Client.Poco2CsGen poco2CsGen, CodeGenSettings codeGenSettings, bool forAsync)
+		{
+			this.description = webApiDescription;
+			this.poco2CsGen = poco2CsGen;
+			this.codeGenSettings = codeGenSettings;
+			this.codeGenOutputsSettings = codeGenSettings.ClientApiOutputs;
+			this.forAsync = forAsync;
+			this.stringAsString = codeGenOutputsSettings.StringAsString;
+			statementOfEnsureSuccessStatusCode = codeGenOutputsSettings.UseEnsureSuccessStatusCodeEx ? "EnsureSuccessStatusCodeEx" : "EnsureSuccessStatusCode";
+			methodName = webApiDescription.ActionDescriptor.ActionName;
+			if (methodName.EndsWith("Async", StringComparison.Ordinal))
+			{
+				methodName = methodName.Substring(0, methodName.Length - 5);
+			}
+
+			Type returnTypeOfProducesResponseType = GetTypeTextOfResponse2xx(description.ActionDescriptor.CustomAttributes);
+			returnType = returnTypeOfProducesResponseType ?? (webApiDescription.ResponseDescription?.ResponseType ?? webApiDescription.ActionDescriptor.ReturnType);
+
+			returnTypeIsStream = returnType != null && ((returnType.FullName == typeNameOfHttpResponseMessage)
+				|| (returnType.FullName == typeOfIHttpActionResult)
+				|| (returnType.FullName == typeOfIActionResult)
+				|| (returnType.FullName == typeOfActionResult)
+				|| (returnType.FullName.StartsWith("System.Threading.Tasks.Task`1[[Microsoft.AspNetCore.Mvc.IActionResult", StringComparison.Ordinal)) // .net core is not translating Task<IActionResult> properly.
+				|| (returnType.FullName.StartsWith("System.Threading.Tasks.Task`1[[Microsoft.AspNetCore.Mvc.IHttpActionResult", StringComparison.Ordinal))
+				|| (returnType.FullName.StartsWith("System.Threading.Tasks.Task`1[[Microsoft.AspNetCore.Mvc.ActionResult", StringComparison.Ordinal))
+				);
+
+			returnTypeIsDynamicObject = returnType != null && returnType.FullName != null && returnType.FullName.StartsWith("System.Threading.Tasks.Task`1[[System.Object", StringComparison.Ordinal);
+
+			MethodInfo methodInfo = webApiDescription.ActionDescriptor.ControllerDescriptor.ControllerType.GetMethod(webApiDescription.ActionDescriptor.MethodName, webApiDescription.ActionDescriptor.MethodParameterTypes);
+			if (methodInfo != null)
+			{
+				parameterInfoArray = methodInfo.GetParameters();
+				if (codeGenOutputsSettings.MaybeNullAttributeOnMethod)
+				{
+					returnTypeDecoratedWithMaybeNullable = returnType != null && Attribute.IsDefined(methodInfo.ReturnParameter, typeof(System.Diagnostics.CodeAnalysis.MaybeNullAttribute));
+				}
+				else if (codeGenOutputsSettings.NotNullAttributeOnMethod)
+				{
+					returnTypeDecoratedWithNotNullable = returnType != null && Attribute.IsDefined(methodInfo.ReturnParameter, typeof(System.Diagnostics.CodeAnalysis.NotNullAttribute));
+				}
+			}
+
+			AnnotationCommentGenerator annotationCommentGenerator = new AnnotationCommentGenerator();
+			attribueCommentDic = annotationCommentGenerator.Get();
+		}
+
+		const string typeOfIHttpActionResult = "System.Web.Http.IHttpActionResult";
+		const string typeOfIActionResult = "Microsoft.AspNetCore.Mvc.IActionResult"; //for .net core 2.1
+		const string typeOfActionResult = "Microsoft.AspNetCore.Mvc.ActionResult"; //for .net core 2.1
+
+		static readonly Type typeOfChar = typeof(char);
+
+		public static CodeMemberMethod Create(WebApiDescription webApiDescription, Poco2Client.Poco2CsGen poco2CsGen, CodeGenSettings codeGenOutputsSettings, bool forAsync)
+		{
+			ClientApiFunctionGen gen = new ClientApiFunctionGen(webApiDescription, poco2CsGen, codeGenOutputsSettings, forAsync);
+			return gen.CreateApiFunction();
+		}
+
+		/// <summary>
+		/// Candidate could be custom POCO, or custom POCO wrapped in IActionResult, ActionResult etc.
+		/// </summary>
+		/// <param name="candidateType"></param>
+		void AddCustomPocoTypeForCs(Type candidateType)
+		{
+			if (candidateType == null)
+			{
+				return;
+			}
+
+			var assemblyFilename = candidateType.Assembly.GetName().Name;
+			string controllerAssemblyName = description.ActionDescriptor.ControllerDescriptor.ControllerType.Assembly.GetName().Name;
+			poco2CsGen.CheckOrAdd(candidateType, controllerAssemblyName != assemblyFilename);
+		}
+
+		CodeMemberMethod CreateApiFunction()
+		{
+			AddCustomPocoTypeForCs(returnType);
+			//create method
+			clientMethod = forAsync ? CreateMethodBasicForAsync() : CreateMethodBasic();
 #if DEBUG
-            if (methodName == "GetByteWithRange")
-            {
-                Console.WriteLine("GetByteWithRange");
-            }
+			if (methodName == "GetByteWithRange")
+			{
+				Console.WriteLine("GetByteWithRange");
+			}
 #endif
-            CreateDocComments();
-            if (codeGenOutputsSettings.MaybeNullAttributeOnMethod && returnTypeDecoratedWithMaybeNullable)
-            {
-                clientMethod.ReturnTypeCustomAttributes.Add(new CodeAttributeDeclaration("System.Diagnostics.CodeAnalysis.MaybeNullAttribute"));
-            }
-            else if (codeGenOutputsSettings.NotNullAttributeOnMethod && returnTypeDecoratedWithNotNullable)
-            {
-                clientMethod.ReturnTypeCustomAttributes.Add(new CodeAttributeDeclaration("System.Diagnostics.CodeAnalysis.NotNullAttribute"));
-            }
-
-            System.Globalization.TextInfo textInfo = new System.Globalization.CultureInfo("en-US", false).TextInfo;
-            switch (description.HttpMethod)
-            {
-                case "GET":
-                case "DELETE":
-                    RenderGetOrDeleteImplementation(textInfo.ToTitleCase(description.HttpMethod.ToLower(CultureInfo.CurrentCulture)));
-                    break;
-                case "POST":
-                case "PUT":
-                case "PATCH":
-                    RenderPostOrPutImplementation(textInfo.ToTitleCase(description.HttpMethod.ToLower(CultureInfo.CurrentCulture)));
-                    break;
-                default:
-                    Trace.TraceWarning("This HTTP method {0} is not yet supported", description.HttpMethod);
-                    break;
-            }
-
-            return clientMethod;
-        }
-
-        CodeMemberMethod CreateMethodBasic()
-        {
-            return new CodeMemberMethod()
-            {
-                Attributes = MemberAttributes.Public | MemberAttributes.Final,
-                Name = methodName,
-                ReturnType = poco2CsGen.TranslateToClientTypeReference(returnType),
-            };
-        }
-
-        CodeMemberMethod CreateMethodBasicForAsync()
-        {
-            return new CodeMemberMethod()
-            {
-                Attributes = MemberAttributes.Public | MemberAttributes.Final,
-                Name = methodName + "Async",
-                ReturnType = returnType == null ? new CodeTypeReference("async Task")
-                : new CodeTypeReference("async Task", poco2CsGen.TranslateToClientTypeReference(returnType)),
-            };
-        }
-
-        void CreateDocComments()
-        {
-            void CreateDocComment(string elementName, string doc)
-            {
-                if (string.IsNullOrWhiteSpace(doc))
-                    return;
-
-                clientMethod.Comments.Add(new CodeCommentStatement("<" + elementName + ">" + doc + "</" + elementName + ">", true));
-            }
-
-            void CreateParamDocComment(string paramName, string doc)
-            {
-                List<string> ss = new();
-                if (!String.IsNullOrWhiteSpace(doc))
-                {
-                    ss.Add(doc);
-                }
-
-                if (codeGenOutputsSettings.DataAnnotationsToComments)
-                {
-                    ParameterInfo parameterInfo = parameterInfoArray.SingleOrDefault(p => p?.Name == paramName);
-                    IEnumerable<Attribute> customAttributes = parameterInfo.GetCustomAttributes();
-                    foreach (Attribute a in customAttributes)
-                    {
-                        if (attribueCommentDic.TryGetValue(a.GetType(), out Func<object, string> textGenerator))
-                        {
-                            ss.Add(textGenerator(a));
-                        }
-                    }
-                }
-
-                if (ss.Count == 0)
-                {
-                    return;
-                }
-
-                if (ss.Count == 1)
-                {
-                    clientMethod.Comments.Add(new CodeCommentStatement("<param name=\"" + paramName + "\">" + ss[0] + "</param>", true));
-                }
-                else
-                {
-                    clientMethod.Comments.Add(new CodeCommentStatement("<param name=\"" + paramName + "\">" + ss[0], true));
-                    for (int i = 1; i < ss.Count; i++)
-                    {
-                        clientMethod.Comments.Add(new CodeCommentStatement(ss[i], true));
-                    }
-
-                    clientMethod.Comments.Add(new CodeCommentStatement("</param>", true));
-                }
-            }
-
-            clientMethod.Comments.Add(new CodeCommentStatement("<summary>", true));
-            string methodFullName = description.ActionDescriptor.MethodFullName;
-            if (description.ParameterDescriptions.Length > 0)
-            {
-                methodFullName += "(" + description.ParameterDescriptions.Select(d =>
-                {
-                    string typeText;
-                    if (TypeHelper.IsDotNetSimpleType(d.ParameterDescriptor.ParameterType))
-                    {
-                        typeText = d.ParameterDescriptor.ParameterType.FullName;
-                    }
-                    else if (d.ParameterDescriptor.ParameterType.IsGenericType)
-                    {
-                        typeText = poco2CsGen.TranslateToClientTypeReferenceTextForDocComment(d.ParameterDescriptor.ParameterType);
-                    }
-                    else if (d.ParameterDescriptor.ParameterType.IsArray)
-                    {
-                        typeText = poco2CsGen.TranslateToClientTypeReferenceTextForDocComment(d.ParameterDescriptor.ParameterType);
-                    }
-                    else
-                    {
-                        typeText = d.ParameterDescriptor.ParameterType.FullName;
-                    };
-
-                    return typeText;
-                }).Aggregate((c, n) => c + "," + n) + ")";
-
-                Console.WriteLine("FullName: " + methodFullName);
-            }
-
-            Fonlow.DocComment.docMember methodComments = null;
-            if (WebApiDocSingleton.Instance.Lookup != null)
-            {
-                methodComments = WebApiDocSingleton.Instance.Lookup.GetMember("M:" + methodFullName);
-                string[] noIndent = Fonlow.DocComment.StringFunctions.TrimIndentedMultiLineTextToArray(Fonlow.DocComment.DocCommentHelper.GetSummary(methodComments));
-                if (noIndent != null)
-                {
-                    foreach (string item in noIndent)
-                    {
-                        clientMethod.Comments.Add(new CodeCommentStatement(item, true));
-                    }
-                }
-            }
-
-            clientMethod.Comments.Add(new CodeCommentStatement(description.HttpMethod + " " + description.RelativePath, true));
-            string[] methodAttributesAsComments = WebApiClientGenCore.Abstract.AspNetAttributesHelper.CreateDocCommentBasedOnAttributes(description.ActionDescriptor.CustomAttributes);
-            if (methodAttributesAsComments.Length > 0)
-            {
-                foreach (string item in methodAttributesAsComments)
-                {
-                    clientMethod.Comments.Add(new CodeCommentStatement(item, true));
-                }
-            }
-
-            clientMethod.Comments.Add(new CodeCommentStatement("</summary>", true));
-            foreach (ParameterDescription pd in description.ParameterDescriptions)
-            {
-                string parameterComment = Fonlow.DocComment.DocCommentHelper.GetParameterComment(methodComments, pd.Name);
-                CreateParamDocComment(pd.Name, parameterComment);
-            }
-
-            string returnComment = Fonlow.DocComment.DocCommentHelper.GetReturnComment(methodComments);
-            if (returnComment != null)
-            {
-                CreateDocComment("returns", returnComment);
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="httpMethod">GET, DELETE, POST, PUT</param>
-        void RenderGetOrDeleteImplementation(string httpMethod)
-        {
-            CodeParameterDeclarationExpression[] parameters = description.ParameterDescriptions.Where(p => p.ParameterDescriptor.ParameterBinder == ParameterBinder.FromUri
-            || p.ParameterDescriptor.ParameterBinder == ParameterBinder.FromQuery || p.ParameterDescriptor.ParameterBinder == ParameterBinder.None)
-                .Select(d =>
-                {
-                    AddCustomPocoTypeForCs(d.ParameterDescriptor.ParameterType);
-                    CodeParameterDeclarationExpression exp = new CodeParameterDeclarationExpression(poco2CsGen.TranslateToClientTypeReference(d.ParameterDescriptor.ParameterType), d.Name);
-                    exp.UserData.Add(Fonlow.TypeScriptCodeDom.UserDataKeys.ParameterDescriptor, d.ParameterDescriptor);
-                    return exp;
-                }).ToArray();
-
-            clientMethod.Parameters.AddRange(parameters);
-
-            if (codeGenOutputsSettings.CancellationTokenEnabled)
-            {
-                clientMethod.Parameters.Add(new CodeParameterDeclarationExpression("System.Threading.CancellationToken", "cancellationToken"));
-            }
-
-            if (codeGenOutputsSettings.HandleHttpRequestHeaders)
-            {
-                clientMethod.Parameters.Add(new CodeParameterDeclarationExpression("Action<System.Net.Http.Headers.HttpRequestHeaders>", "handleHeaders = null"));
-            }
-
-            string jsUriQuery = UriQueryHelper.CreateUriQuery(description.RelativePath, description.ParameterDescriptions);
-            string uriText = string.IsNullOrWhiteSpace(jsUriQuery) ? $"\"{description.RelativePath}\"" : RemoveTrialEmptyString($"\"{jsUriQuery}\"");
-
-
-            clientMethod.Statements.Add(new CodeVariableDeclarationStatement(
-                new CodeTypeReference("var"), "requestUri",
-                new CodeSnippetExpression(uriText)));
-
-            clientMethod.Statements.Add(new CodeSnippetStatement(ThreeTabs + $"using var httpRequestMessage = new HttpRequestMessage(HttpMethod.{httpMethod}, requestUri);"));
-
-            if (codeGenOutputsSettings.HandleHttpRequestHeaders)
-            {
-                clientMethod.Statements.Add(new CodeSnippetStatement("\t\t\thandleHeaders?.Invoke(httpRequestMessage.Headers);"));
-            }
-
-            AddResponseMessageSendAsync(clientMethod);
-
-            CodeVariableReferenceExpression resultReference = new CodeVariableReferenceExpression("responseMessage");
-
-            //Statement: result.EnsureSuccessStatusCode();
-            if (returnTypeIsStream)
-            {
-                clientMethod.Statements.Add(new CodeMethodInvokeExpression(resultReference, statementOfEnsureSuccessStatusCode));
-
-                if (returnType != null)
-                {
-                    AddReturnStatement(clientMethod.Statements);
-                }
-            }
-            else
-            {
-                CodeTryCatchFinallyStatement try1 = new CodeTryCatchFinallyStatement();
-                try1.TryStatements.Add(new CodeMethodInvokeExpression(resultReference, statementOfEnsureSuccessStatusCode));
-                clientMethod.Statements.Add(try1);
-
-                //Statement: return something;
-                if (returnType != null)
-                {
-                    AddReturnStatement(try1.TryStatements);
-                }
-
-                try1.FinallyStatements.Add(new CodeMethodInvokeExpression(resultReference, "Dispose"));
-            }
-        }
-
-        void RenderPostOrPutImplementation(string httpMethod)
-        {
-            //Create function parameters in prototype
-            CodeParameterDeclarationExpression[] parameters = description.ParameterDescriptions.Where(p => p.ParameterDescriptor.ParameterBinder == ParameterBinder.FromUri
-            || p.ParameterDescriptor.ParameterBinder == ParameterBinder.FromQuery || p.ParameterDescriptor.ParameterBinder == ParameterBinder.FromBody
-            || p.ParameterDescriptor.ParameterBinder == ParameterBinder.None).Select(d =>
-            {
-                AddCustomPocoTypeForCs(d.ParameterDescriptor.ParameterType);
-                CodeParameterDeclarationExpression exp = new CodeParameterDeclarationExpression(poco2CsGen.TranslateToClientTypeReference(d.ParameterDescriptor.ParameterType), d.Name);
-                exp.UserData.Add(Fonlow.TypeScriptCodeDom.UserDataKeys.ParameterDescriptor, d.ParameterDescriptor);
-                return exp;
-            }
-            ).ToArray();
-            clientMethod.Parameters.AddRange(parameters);
-
-            if (codeGenOutputsSettings.CancellationTokenEnabled)
-            {
-                clientMethod.Parameters.Add(new CodeParameterDeclarationExpression("System.Threading.CancellationToken", "cancellationToken"));
-            }
-
-            if (codeGenOutputsSettings.HandleHttpRequestHeaders)
-            {
-                clientMethod.Parameters.Add(new CodeParameterDeclarationExpression("Action<System.Net.Http.Headers.HttpRequestHeaders>", "handleHeaders = null"));
-            }
-
-            ParameterDescription[] fromBodyParameterDescriptions = description.ParameterDescriptions.Where(d => d.ParameterDescriptor.ParameterBinder == ParameterBinder.FromBody
-                || (TypeHelper.IsComplexType(d.ParameterDescriptor.ParameterType) && (!(d.ParameterDescriptor.ParameterBinder == ParameterBinder.FromUri) || (d.ParameterDescriptor.ParameterBinder == ParameterBinder.None)))).ToArray();
-            if (fromBodyParameterDescriptions.Length > 1)
-            {
-                throw new CodeGenException("Bad Api Definition")
-                {
-                    Description = String.Format("This API function {0} has more than 1 FromBody bindings in parameters", description.ActionDescriptor.ActionName)
-                };
-            }
-
-            ParameterDescription singleFromBodyParameterDescription = fromBodyParameterDescriptions.FirstOrDefault();
-            bool hasBody = singleFromBodyParameterDescription != null;
-
-            void AddRequestUriWithQueryAssignmentStatement()
-            {
-
-                string jsUriQuery = UriQueryHelper.CreateUriQuery(description.RelativePath, description.ParameterDescriptions);
-                string uriText = jsUriQuery == null ? $"\"{description.RelativePath}\"" : RemoveTrialEmptyString($"\"{jsUriQuery}\"");
-
-                clientMethod.Statements.Add(new CodeVariableDeclarationStatement(
-                    new CodeTypeReference("var"), "requestUri",
-                    new CodeSnippetExpression(uriText)));
-            }
-
-            AddRequestUriWithQueryAssignmentStatement();
-
-            clientMethod.Statements.Add(new CodeSnippetStatement(
-                ThreeTabs + $"using var httpRequestMessage = new HttpRequestMessage(HttpMethod.{httpMethod}, requestUri);"));
-
-            if (hasBody)
-            {
-                if (codeGenOutputsSettings.UseSystemTextJson)
-                {
-                    clientMethod.Statements.Add(new CodeSnippetStatement(ThreeTabs + $"var content = System.Net.Http.Json.JsonContent.Create({singleFromBodyParameterDescription.ParameterDescriptor.ParameterName}, mediaType: null, jsonSerializerSettings);"));
-                }
-                else
-                {
-                    clientMethod.Statements.Add(new CodeSnippetStatement(
-                        $"\t\t\tusing var requestWriter = new System.IO.StringWriter();{Environment.NewLine}\t\t\tvar requestSerializer = JsonSerializer.Create(jsonSerializerSettings);"
-                        ));
-                    clientMethod.Statements.Add(new CodeMethodInvokeExpression(new CodeSnippetExpression("requestSerializer"), "Serialize",
-                        new CodeSnippetExpression("requestWriter"),
-                        new CodeSnippetExpression(singleFromBodyParameterDescription.ParameterDescriptor.ParameterName)));
-
-
-                    clientMethod.Statements.Add(new CodeSnippetStatement(
-                        "\t\t\tvar content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, \"application/json\");"
-                        ));
-                }
-
-                clientMethod.Statements.Add(new CodeSnippetStatement("\t\t\thttpRequestMessage.Content = content;"));
-                if (codeGenOutputsSettings.HandleHttpRequestHeaders)
-                {
-                    clientMethod.Statements.Add(new CodeSnippetStatement("\t\t\thandleHeaders?.Invoke(httpRequestMessage.Headers);"));
-                }
-            }
-
-            AddResponseMessageSendAsync(clientMethod);
-
-            CodeVariableReferenceExpression resultReference = new CodeVariableReferenceExpression("responseMessage");
-
-            if (returnTypeIsStream)
-            {
-                clientMethod.Statements.Add(new CodeMethodInvokeExpression(resultReference, statementOfEnsureSuccessStatusCode));
-
-                //Statement: return something;
-                if (returnType != null)
-                {
-                    AddReturnStatement(clientMethod.Statements);
-                }
-            }
-            else
-            {
-                CodeTryCatchFinallyStatement try1 = new CodeTryCatchFinallyStatement();
-                clientMethod.Statements.Add(try1);
-                try1.TryStatements.Add(new CodeMethodInvokeExpression(resultReference, statementOfEnsureSuccessStatusCode));
-
-                //Statement: return something;
-                if (returnType != null)
-                {
-                    AddReturnStatement(try1.TryStatements);
-                }
-
-                try1.FinallyStatements.Add(new CodeMethodInvokeExpression(resultReference, "Dispose"));
-            }
-
-            if (singleFromBodyParameterDescription != null && !codeGenOutputsSettings.UseSystemTextJson)
-            {
-                //Add3TEndBacket(clientMethod);
-            }
-
-        }
-
-        static string ThreeTabs => "\t\t\t";
-
-        void AddResponseMessageSendAsync(CodeMemberMethod method)
-        {
-            string cancellationToken = codeGenOutputsSettings.CancellationTokenEnabled ? ", cancellationToken" : String.Empty;
-            method.Statements.Add(new CodeVariableDeclarationStatement(
-                new CodeTypeReference("var"), "responseMessage", forAsync ? new CodeSnippetExpression($"await client.SendAsync(httpRequestMessage{cancellationToken})") : new CodeSnippetExpression($"client.Send(httpRequestMessage{cancellationToken})")));
-        }
-
-        static void AddNewtonSoftJsonTextReader(CodeStatementCollection statementCollection)
-        {
-            statementCollection.Add(new CodeSnippetStatement("\t\t\t\tusing JsonReader jsonReader = new JsonTextReader(new System.IO.StreamReader(stream));"));
-        }
-
-        void AddNewtonSoftJsonSerializerDeserialize(CodeStatementCollection statementCollection)
-        {
-            statementCollection.Add(new CodeSnippetStatement($"\t\t\t\treturn serializer.Deserialize<{poco2CsGen.TranslateTypeToCSharp(returnType)}>(jsonReader);"));
-        }
-
-        static void AddNewtonSoftJsonSerializer(CodeStatementCollection statementCollection)
-        {
-            statementCollection.Add(new CodeVariableDeclarationStatement(
-                new CodeTypeReference("var"), "serializer", new CodeSnippetExpression("JsonSerializer.Create(jsonSerializerSettings)")));
-        }
-
-        void DeserializeContentStream(CodeStatementCollection statementCollection)
-        {
-            statementCollection.Add(new CodeMethodReturnStatement(new CodeMethodInvokeExpression(
-                new CodeMethodReferenceExpression(
-                new CodeVariableReferenceExpression("JsonSerializer"), "Deserialize", poco2CsGen.TranslateToClientTypeReference(returnType)),
-                new CodeSnippetExpression("stream"), new CodeSnippetExpression("jsonSerializerSettings"))));
-        }
-
-        void AddResponseMessageRead(CodeStatementCollection statementCollection)
-        {
-            if (TypeHelper.IsStringType(returnType) || returnType.IsClass || TypeHelper.IsNullablePrimitive(returnType)) //ASP.NET Core return null as empty body with status code 204, whether to produce JSON or plain text.
-            {
-                statementCollection.Add(new CodeSnippetStatement("\t\t\t\tif (responseMessage.StatusCode == System.Net.HttpStatusCode.NoContent) { return null; }"));
-            }
-
-            statementCollection.Add(new CodeSnippetStatement(forAsync
-                 ? "\t\t\t\tvar stream = await responseMessage.Content.ReadAsStreamAsync();"
-                 : "\t\t\t\tvar stream = responseMessage.Content.ReadAsStream();"));
-        }
-
-        const string typeNameOfHttpResponseMessage = "System.Net.Http.HttpResponseMessage";
-
-        void AddReturnStatement(CodeStatementCollection statementCollection)
-        {
-            if (returnTypeIsStream)
-            {
-                statementCollection.Add(new CodeMethodReturnStatement(new CodeSnippetExpression("responseMessage")));
-                return;
-            }
-            else if (returnTypeIsDynamicObject) // .NET Core ApiExplorer could get return type out of Task<> in most cases, however, not for dynamic and anynomous, while .NET Framework ApiExplorer is fine.
-            {
-                AddResponseMessageRead(statementCollection);
-                if (codeGenOutputsSettings.UseSystemTextJson)
-                {
-                    DeserializeContentStream(statementCollection);
-                }
-                else
-                {
-                    AddNewtonSoftJsonTextReader(statementCollection);
-                    AddNewtonSoftJsonSerializer(statementCollection);
-                    statementCollection.Add(new CodeSnippetStatement($"\t\t\t\treturn serializer.Deserialize<{poco2CsGen.TranslateTypeToCSharp(returnType)}>(jsonReader);"));
-                }
-
-                return;
-            }
-            else if (returnType.IsGenericType)
-            {
-                Type genericTypeDefinition = returnType.GetGenericTypeDefinition();
-                if (genericTypeDefinition == typeof(System.Threading.Tasks.Task<>))
-                {
-                    statementCollection.Add(new CodeMethodReturnStatement(new CodeSnippetExpression("responseMessage")));
-                    Trace.TraceWarning("There could be something to improve: " + returnType.GenericTypeArguments[0].ToString());
-                    return;
-                }
-            }
-
-            AddResponseMessageRead(statementCollection);
-
-            if (returnType != null && TypeHelper.IsStringType(returnType))
-            {
-                if (this.stringAsString)
-                {
-                    statementCollection.Add(new CodeSnippetStatement("\t\t\t\tusing System.IO.StreamReader streamReader = new System.IO.StreamReader(stream);"));
-                    statementCollection.Add(new CodeMethodReturnStatement(new CodeSnippetExpression("streamReader.ReadToEnd();")));
-                }
-                else
-                {
-                    if (codeGenOutputsSettings.UseSystemTextJson)
-                    {
-                        statementCollection.Add(new CodeMethodReturnStatement(new CodeMethodInvokeExpression(
-                            new CodeMethodReferenceExpression(
-                                new CodeVariableReferenceExpression("JsonSerializer"), "Deserialize", new CodeTypeReference(typeof(System.String))),
-                            new CodeSnippetExpression("contentString"),
-                            new CodeSnippetExpression("jsonSerializerSettings"))));
-                    }
-                    else
-                    {
-                        AddNewtonSoftJsonTextReader(statementCollection);
-                        statementCollection.Add(new CodeMethodReturnStatement(new CodeSnippetExpression("jsonReader.ReadAsString()")));
-                    }
-                }
-            }
-            else if (returnType == typeOfChar)
-            {
-                if (codeGenOutputsSettings.UseSystemTextJson)
-                {
-                    DeserializeContentStream(statementCollection);
-                }
-                else
-                {
-                    AddNewtonSoftJsonTextReader(statementCollection);
-                    AddNewtonSoftJsonSerializer(statementCollection);
-                    statementCollection.Add(new CodeMethodReturnStatement(new CodeSnippetExpression("serializer.Deserialize<char>(jsonReader)")));
-                }
-            }
-            else if (returnType.IsPrimitive)
-            {
-                if (codeGenOutputsSettings.UseSystemTextJson)
-                {
-                    DeserializeContentStream(statementCollection);
-                }
-                else
-                {
-                    AddNewtonSoftJsonTextReader(statementCollection);
-                    statementCollection.Add(new CodeMethodReturnStatement(new CodeSnippetExpression(String.Format("{0}.Parse(jsonReader.ReadAsString())", returnType.FullName))));
-                }
-            }
-            else if (returnType.IsGenericType || TypeHelper.IsComplexType(returnType) || returnType.IsEnum)
-            {
-                if (codeGenOutputsSettings.UseSystemTextJson)
-                {
-                    DeserializeContentStream(statementCollection);
-                }
-                else
-                {
-                    AddNewtonSoftJsonTextReader(statementCollection);
-                    //Add4TStartBacket(statementCollection);
-                    AddNewtonSoftJsonSerializer(statementCollection);
-                    AddNewtonSoftJsonSerializerDeserialize(statementCollection);
-                    //Add4TEndBacket(statementCollection);
-                }
-            }
-            else
-            {
-                Trace.TraceWarning("This type is not yet supported: {0}", returnType.FullName);
-            }
-        }
-
-        private static string RemoveTrialEmptyString(string s)
-        {
-            int p = s.IndexOf("+\"\"", StringComparison.Ordinal);
-            if (p >= 0)
-            {
-                return s.Remove(p, 3);
-            }
-
-            int p2 = s.IndexOf("))\"", StringComparison.Ordinal);
-            if (p2 >= 0)
-            {
-                return s.Remove(p2 + 2, 1);
-            }
-
-            return s;
-        }
-
-        /// <summary>
-        /// If the API function use ProducesResponseTypeAttribute and 200-202 to define the return type, then get the return type as full type name,
-        /// Null if no such definition .
-        /// </summary>
-        /// <param name="customAttributes"></param>
-        /// <returns></returns>
-        static Type GetTypeTextOfResponse2xx(Attribute[] customAttributes)
-        {
-            foreach (Attribute c in customAttributes)
-            {
-                Microsoft.AspNetCore.Mvc.ProducesResponseTypeAttribute responseAttribute = c as Microsoft.AspNetCore.Mvc.ProducesResponseTypeAttribute;
-                if (responseAttribute != null)
-                {
-                    if (responseAttribute.StatusCode >= 200 && responseAttribute.StatusCode <= 202)
-                    {
-                        return responseAttribute.Type;
-                    }
-                }
-            }
-
-            return null;
-        }
-
-
-    }
+			CreateDocComments();
+			if (codeGenOutputsSettings.MaybeNullAttributeOnMethod && returnTypeDecoratedWithMaybeNullable)
+			{
+				clientMethod.ReturnTypeCustomAttributes.Add(new CodeAttributeDeclaration("System.Diagnostics.CodeAnalysis.MaybeNullAttribute"));
+			}
+			else if (codeGenOutputsSettings.NotNullAttributeOnMethod && returnTypeDecoratedWithNotNullable)
+			{
+				clientMethod.ReturnTypeCustomAttributes.Add(new CodeAttributeDeclaration("System.Diagnostics.CodeAnalysis.NotNullAttribute"));
+			}
+
+			System.Globalization.TextInfo textInfo = new System.Globalization.CultureInfo("en-US", false).TextInfo;
+			switch (description.HttpMethod)
+			{
+				case "GET":
+				case "DELETE":
+					RenderGetOrDeleteImplementation(textInfo.ToTitleCase(description.HttpMethod.ToLower(CultureInfo.CurrentCulture)));
+					break;
+				case "POST":
+				case "PUT":
+				case "PATCH":
+					RenderPostOrPutImplementation(textInfo.ToTitleCase(description.HttpMethod.ToLower(CultureInfo.CurrentCulture)));
+					break;
+				default:
+					Trace.TraceWarning("This HTTP method {0} is not yet supported", description.HttpMethod);
+					break;
+			}
+
+			return clientMethod;
+		}
+
+		CodeMemberMethod CreateMethodBasic()
+		{
+			return new CodeMemberMethod()
+			{
+				Attributes = MemberAttributes.Public | MemberAttributes.Final,
+				Name = methodName,
+				ReturnType = poco2CsGen.TranslateToClientTypeReference(returnType),
+			};
+		}
+
+		CodeMemberMethod CreateMethodBasicForAsync()
+		{
+			return new CodeMemberMethod()
+			{
+				Attributes = MemberAttributes.Public | MemberAttributes.Final,
+				Name = methodName + "Async",
+				ReturnType = returnType == null ? new CodeTypeReference("async Task")
+				: new CodeTypeReference("async Task", poco2CsGen.TranslateToClientTypeReference(returnType)),
+			};
+		}
+
+		void CreateDocComments()
+		{
+			void CreateDocComment(string elementName, string doc)
+			{
+				if (string.IsNullOrWhiteSpace(doc))
+					return;
+
+				clientMethod.Comments.Add(new CodeCommentStatement("<" + elementName + ">" + doc + "</" + elementName + ">", true));
+			}
+
+			void CreateParamDocComment(string paramName, string doc)
+			{
+				List<string> ss = new();
+				if (!String.IsNullOrWhiteSpace(doc))
+				{
+					ss.Add(doc);
+				}
+
+				if (codeGenOutputsSettings.DataAnnotationsToComments)
+				{
+					ParameterInfo parameterInfo = parameterInfoArray.SingleOrDefault(p => p?.Name == paramName);
+					IEnumerable<Attribute> customAttributes = parameterInfo.GetCustomAttributes();
+					foreach (Attribute a in customAttributes)
+					{
+						if (attribueCommentDic.TryGetValue(a.GetType(), out Func<object, string> textGenerator))
+						{
+							ss.Add(textGenerator(a));
+						}
+					}
+				}
+
+				if (ss.Count == 0)
+				{
+					return;
+				}
+
+				if (ss.Count == 1)
+				{
+					clientMethod.Comments.Add(new CodeCommentStatement("<param name=\"" + paramName + "\">" + ss[0] + "</param>", true));
+				}
+				else
+				{
+					clientMethod.Comments.Add(new CodeCommentStatement("<param name=\"" + paramName + "\">" + ss[0], true));
+					for (int i = 1; i < ss.Count; i++)
+					{
+						clientMethod.Comments.Add(new CodeCommentStatement(ss[i], true));
+					}
+
+					clientMethod.Comments.Add(new CodeCommentStatement("</param>", true));
+				}
+			}
+
+			clientMethod.Comments.Add(new CodeCommentStatement("<summary>", true));
+			string methodFullName = description.ActionDescriptor.MethodFullName;
+			if (description.ParameterDescriptions.Length > 0)
+			{
+				methodFullName += "(" + description.ParameterDescriptions.Select(d =>
+				{
+					string typeText;
+					if (TypeHelper.IsDotNetSimpleType(d.ParameterDescriptor.ParameterType))
+					{
+						typeText = d.ParameterDescriptor.ParameterType.FullName;
+					}
+					else if (d.ParameterDescriptor.ParameterType.IsGenericType)
+					{
+						typeText = poco2CsGen.TranslateToClientTypeReferenceTextForDocComment(d.ParameterDescriptor.ParameterType);
+					}
+					else if (d.ParameterDescriptor.ParameterType.IsArray)
+					{
+						typeText = poco2CsGen.TranslateToClientTypeReferenceTextForDocComment(d.ParameterDescriptor.ParameterType);
+					}
+					else
+					{
+						typeText = d.ParameterDescriptor.ParameterType.FullName;
+					};
+
+					return typeText;
+				}).Aggregate((c, n) => c + "," + n) + ")";
+
+				Console.WriteLine("FullName: " + methodFullName);
+			}
+
+			Fonlow.DocComment.docMember methodComments = null;
+			if (WebApiDocSingleton.Instance.Lookup != null)
+			{
+				methodComments = WebApiDocSingleton.Instance.Lookup.GetMember("M:" + methodFullName);
+				string[] noIndent = Fonlow.DocComment.StringFunctions.TrimIndentedMultiLineTextToArray(Fonlow.DocComment.DocCommentHelper.GetSummary(methodComments));
+				if (noIndent != null)
+				{
+					foreach (string item in noIndent)
+					{
+						clientMethod.Comments.Add(new CodeCommentStatement(item, true));
+					}
+				}
+			}
+
+			clientMethod.Comments.Add(new CodeCommentStatement(description.HttpMethod + " " + description.RelativePath, true));
+			string[] methodAttributesAsComments = WebApiClientGenCore.Abstract.AspNetAttributesHelper.CreateDocCommentBasedOnAttributes(description.ActionDescriptor.CustomAttributes);
+			if (methodAttributesAsComments.Length > 0)
+			{
+				foreach (string item in methodAttributesAsComments)
+				{
+					clientMethod.Comments.Add(new CodeCommentStatement(item, true));
+				}
+			}
+
+			clientMethod.Comments.Add(new CodeCommentStatement("</summary>", true));
+			foreach (ParameterDescription pd in description.ParameterDescriptions)
+			{
+				string parameterComment = Fonlow.DocComment.DocCommentHelper.GetParameterComment(methodComments, pd.Name);
+				CreateParamDocComment(pd.Name, parameterComment);
+			}
+
+			string returnComment = Fonlow.DocComment.DocCommentHelper.GetReturnComment(methodComments);
+			if (returnComment != null)
+			{
+				CreateDocComment("returns", returnComment);
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="httpMethod">GET, DELETE, POST, PUT</param>
+		void RenderGetOrDeleteImplementation(string httpMethod)
+		{
+			CodeParameterDeclarationExpression[] parameters = description.ParameterDescriptions.Where(p => p.ParameterDescriptor.ParameterBinder == ParameterBinder.FromUri
+			|| p.ParameterDescriptor.ParameterBinder == ParameterBinder.FromQuery || p.ParameterDescriptor.ParameterBinder == ParameterBinder.None)
+				.Select(d =>
+				{
+					AddCustomPocoTypeForCs(d.ParameterDescriptor.ParameterType);
+					CodeParameterDeclarationExpression exp = new CodeParameterDeclarationExpression(poco2CsGen.TranslateToClientTypeReference(d.ParameterDescriptor.ParameterType), d.Name);
+					exp.UserData.Add(Fonlow.TypeScriptCodeDom.UserDataKeys.ParameterDescriptor, d.ParameterDescriptor);
+					return exp;
+				}).ToArray();
+
+			clientMethod.Parameters.AddRange(parameters);
+
+			if (codeGenOutputsSettings.CancellationTokenEnabled)
+			{
+				clientMethod.Parameters.Add(new CodeParameterDeclarationExpression("System.Threading.CancellationToken", "cancellationToken"));
+			}
+
+			if (codeGenOutputsSettings.HandleHttpRequestHeaders)
+			{
+				clientMethod.Parameters.Add(new CodeParameterDeclarationExpression("Action<System.Net.Http.Headers.HttpRequestHeaders>", "handleHeaders = null"));
+			}
+
+			string jsUriQuery = UriQueryHelper.CreateUriQuery(description.RelativePath, description.ParameterDescriptions);
+			string uriText = string.IsNullOrWhiteSpace(jsUriQuery) ? $"\"{description.RelativePath}\"" : RemoveTrialEmptyString($"\"{jsUriQuery}\"");
+
+
+			clientMethod.Statements.Add(new CodeVariableDeclarationStatement(
+				new CodeTypeReference("var"), "requestUri",
+				new CodeSnippetExpression(uriText)));
+
+			clientMethod.Statements.Add(new CodeSnippetStatement(ThreeTabs + $"using var httpRequestMessage = new HttpRequestMessage(HttpMethod.{httpMethod}, requestUri);"));
+
+			if (codeGenOutputsSettings.HandleHttpRequestHeaders)
+			{
+				clientMethod.Statements.Add(new CodeSnippetStatement("\t\t\thandleHeaders?.Invoke(httpRequestMessage.Headers);"));
+			}
+
+			AddResponseMessageSendAsync(clientMethod);
+
+			CodeVariableReferenceExpression resultReference = new CodeVariableReferenceExpression("responseMessage");
+
+			//Statement: result.EnsureSuccessStatusCode();
+			if (returnTypeIsStream)
+			{
+				clientMethod.Statements.Add(new CodeMethodInvokeExpression(resultReference, statementOfEnsureSuccessStatusCode));
+
+				if (returnType != null)
+				{
+					AddReturnStatement(clientMethod.Statements);
+				}
+			}
+			else
+			{
+				CodeTryCatchFinallyStatement try1 = new CodeTryCatchFinallyStatement();
+				try1.TryStatements.Add(new CodeMethodInvokeExpression(resultReference, statementOfEnsureSuccessStatusCode));
+				clientMethod.Statements.Add(try1);
+
+				//Statement: return something;
+				if (returnType != null)
+				{
+					AddReturnStatement(try1.TryStatements);
+				}
+
+				try1.FinallyStatements.Add(new CodeMethodInvokeExpression(resultReference, "Dispose"));
+			}
+		}
+
+		void RenderPostOrPutImplementation(string httpMethod)
+		{
+			//Create function parameters in prototype
+			CodeParameterDeclarationExpression[] parameters = description.ParameterDescriptions.Where(p => p.ParameterDescriptor.ParameterBinder == ParameterBinder.FromUri
+			|| p.ParameterDescriptor.ParameterBinder == ParameterBinder.FromQuery || p.ParameterDescriptor.ParameterBinder == ParameterBinder.FromBody
+			|| p.ParameterDescriptor.ParameterBinder == ParameterBinder.None).Select(d =>
+			{
+				AddCustomPocoTypeForCs(d.ParameterDescriptor.ParameterType);
+				CodeParameterDeclarationExpression exp = new CodeParameterDeclarationExpression(poco2CsGen.TranslateToClientTypeReference(d.ParameterDescriptor.ParameterType), d.Name);
+				exp.UserData.Add(Fonlow.TypeScriptCodeDom.UserDataKeys.ParameterDescriptor, d.ParameterDescriptor);
+				return exp;
+			}
+			).ToArray();
+			clientMethod.Parameters.AddRange(parameters);
+
+			if (codeGenOutputsSettings.CancellationTokenEnabled)
+			{
+				clientMethod.Parameters.Add(new CodeParameterDeclarationExpression("System.Threading.CancellationToken", "cancellationToken"));
+			}
+
+			if (codeGenOutputsSettings.HandleHttpRequestHeaders)
+			{
+				clientMethod.Parameters.Add(new CodeParameterDeclarationExpression("Action<System.Net.Http.Headers.HttpRequestHeaders>", "handleHeaders = null"));
+			}
+
+			ParameterDescription[] fromBodyParameterDescriptions = description.ParameterDescriptions.Where(d => d.ParameterDescriptor.ParameterBinder == ParameterBinder.FromBody
+				|| (TypeHelper.IsComplexType(d.ParameterDescriptor.ParameterType) && (!(d.ParameterDescriptor.ParameterBinder == ParameterBinder.FromUri) || (d.ParameterDescriptor.ParameterBinder == ParameterBinder.None)))).ToArray();
+			if (fromBodyParameterDescriptions.Length > 1)
+			{
+				throw new CodeGenException("Bad Api Definition")
+				{
+					Description = String.Format("This API function {0} has more than 1 FromBody bindings in parameters", description.ActionDescriptor.ActionName)
+				};
+			}
+
+			ParameterDescription singleFromBodyParameterDescription = fromBodyParameterDescriptions.FirstOrDefault();
+			bool hasBody = singleFromBodyParameterDescription != null;
+
+			void AddRequestUriWithQueryAssignmentStatement()
+			{
+
+				string jsUriQuery = UriQueryHelper.CreateUriQuery(description.RelativePath, description.ParameterDescriptions);
+				string uriText = jsUriQuery == null ? $"\"{description.RelativePath}\"" : RemoveTrialEmptyString($"\"{jsUriQuery}\"");
+
+				clientMethod.Statements.Add(new CodeVariableDeclarationStatement(
+					new CodeTypeReference("var"), "requestUri",
+					new CodeSnippetExpression(uriText)));
+			}
+
+			AddRequestUriWithQueryAssignmentStatement();
+
+			clientMethod.Statements.Add(new CodeSnippetStatement(
+				ThreeTabs + $"using var httpRequestMessage = new HttpRequestMessage(HttpMethod.{httpMethod}, requestUri);"));
+
+			if (hasBody)
+			{
+				if (codeGenOutputsSettings.UseSystemTextJson)
+				{
+					clientMethod.Statements.Add(new CodeSnippetStatement(ThreeTabs + $"var content = System.Net.Http.Json.JsonContent.Create({singleFromBodyParameterDescription.ParameterDescriptor.ParameterName}, mediaType: null, jsonSerializerSettings);"));
+				}
+				else
+				{
+					clientMethod.Statements.Add(new CodeSnippetStatement(
+						$"\t\t\tusing var requestWriter = new System.IO.StringWriter();{Environment.NewLine}\t\t\tvar requestSerializer = JsonSerializer.Create(jsonSerializerSettings);"
+						));
+					clientMethod.Statements.Add(new CodeMethodInvokeExpression(new CodeSnippetExpression("requestSerializer"), "Serialize",
+						new CodeSnippetExpression("requestWriter"),
+						new CodeSnippetExpression(singleFromBodyParameterDescription.ParameterDescriptor.ParameterName)));
+
+
+					clientMethod.Statements.Add(new CodeSnippetStatement(
+						"\t\t\tvar content = new StringContent(requestWriter.ToString(), System.Text.Encoding.UTF8, \"application/json\");"
+						));
+				}
+
+				clientMethod.Statements.Add(new CodeSnippetStatement("\t\t\thttpRequestMessage.Content = content;"));
+				if (codeGenOutputsSettings.HandleHttpRequestHeaders)
+				{
+					clientMethod.Statements.Add(new CodeSnippetStatement("\t\t\thandleHeaders?.Invoke(httpRequestMessage.Headers);"));
+				}
+			}
+
+			AddResponseMessageSendAsync(clientMethod);
+
+			CodeVariableReferenceExpression resultReference = new CodeVariableReferenceExpression("responseMessage");
+
+			if (returnTypeIsStream)
+			{
+				clientMethod.Statements.Add(new CodeMethodInvokeExpression(resultReference, statementOfEnsureSuccessStatusCode));
+
+				//Statement: return something;
+				if (returnType != null)
+				{
+					AddReturnStatement(clientMethod.Statements);
+				}
+			}
+			else
+			{
+				CodeTryCatchFinallyStatement try1 = new CodeTryCatchFinallyStatement();
+				clientMethod.Statements.Add(try1);
+				try1.TryStatements.Add(new CodeMethodInvokeExpression(resultReference, statementOfEnsureSuccessStatusCode));
+
+				//Statement: return something;
+				if (returnType != null)
+				{
+					AddReturnStatement(try1.TryStatements);
+				}
+
+				try1.FinallyStatements.Add(new CodeMethodInvokeExpression(resultReference, "Dispose"));
+			}
+
+			if (singleFromBodyParameterDescription != null && !codeGenOutputsSettings.UseSystemTextJson)
+			{
+				//Add3TEndBacket(clientMethod);
+			}
+
+		}
+
+		static string ThreeTabs => "\t\t\t";
+
+		void AddResponseMessageSendAsync(CodeMemberMethod method)
+		{
+			string cancellationToken = codeGenOutputsSettings.CancellationTokenEnabled ? ", cancellationToken" : String.Empty;
+			method.Statements.Add(new CodeVariableDeclarationStatement(
+				new CodeTypeReference("var"), "responseMessage", forAsync ? new CodeSnippetExpression($"await client.SendAsync(httpRequestMessage{cancellationToken})") : new CodeSnippetExpression($"client.SendAsync(httpRequestMessage{cancellationToken}).Result"))); // reverse to the old way because of https://github.com/dotnet/runtime/issues/104716
+		}
+
+		static void AddNewtonSoftJsonTextReader(CodeStatementCollection statementCollection)
+		{
+			statementCollection.Add(new CodeSnippetStatement("\t\t\t\tusing JsonReader jsonReader = new JsonTextReader(new System.IO.StreamReader(stream));"));
+		}
+
+		void AddNewtonSoftJsonSerializerDeserialize(CodeStatementCollection statementCollection)
+		{
+			statementCollection.Add(new CodeSnippetStatement($"\t\t\t\treturn serializer.Deserialize<{poco2CsGen.TranslateTypeToCSharp(returnType)}>(jsonReader);"));
+		}
+
+		static void AddNewtonSoftJsonSerializer(CodeStatementCollection statementCollection)
+		{
+			statementCollection.Add(new CodeVariableDeclarationStatement(
+				new CodeTypeReference("var"), "serializer", new CodeSnippetExpression("JsonSerializer.Create(jsonSerializerSettings)")));
+		}
+
+		void DeserializeContentStream(CodeStatementCollection statementCollection)
+		{
+			statementCollection.Add(new CodeMethodReturnStatement(new CodeMethodInvokeExpression(
+				new CodeMethodReferenceExpression(
+				new CodeVariableReferenceExpression("JsonSerializer"), "Deserialize", poco2CsGen.TranslateToClientTypeReference(returnType)),
+				new CodeSnippetExpression("stream"), new CodeSnippetExpression("jsonSerializerSettings"))));
+		}
+
+		void AddResponseMessageRead(CodeStatementCollection statementCollection)
+		{
+			if (TypeHelper.IsStringType(returnType) || returnType.IsClass || TypeHelper.IsNullablePrimitive(returnType)) //ASP.NET Core return null as empty body with status code 204, whether to produce JSON or plain text.
+			{
+				statementCollection.Add(new CodeSnippetStatement("\t\t\t\tif (responseMessage.StatusCode == System.Net.HttpStatusCode.NoContent) { return null; }"));
+			}
+
+			statementCollection.Add(new CodeSnippetStatement(forAsync
+				 ? "\t\t\t\tvar stream = await responseMessage.Content.ReadAsStreamAsync();"
+				 : "\t\t\t\tvar stream = responseMessage.Content.ReadAsStream();"));
+		}
+
+		const string typeNameOfHttpResponseMessage = "System.Net.Http.HttpResponseMessage";
+
+		void AddReturnStatement(CodeStatementCollection statementCollection)
+		{
+			if (returnTypeIsStream)
+			{
+				statementCollection.Add(new CodeMethodReturnStatement(new CodeSnippetExpression("responseMessage")));
+				return;
+			}
+			else if (returnTypeIsDynamicObject) // .NET Core ApiExplorer could get return type out of Task<> in most cases, however, not for dynamic and anynomous, while .NET Framework ApiExplorer is fine.
+			{
+				AddResponseMessageRead(statementCollection);
+				if (codeGenOutputsSettings.UseSystemTextJson)
+				{
+					DeserializeContentStream(statementCollection);
+				}
+				else
+				{
+					AddNewtonSoftJsonTextReader(statementCollection);
+					AddNewtonSoftJsonSerializer(statementCollection);
+					statementCollection.Add(new CodeSnippetStatement($"\t\t\t\treturn serializer.Deserialize<{poco2CsGen.TranslateTypeToCSharp(returnType)}>(jsonReader);"));
+				}
+
+				return;
+			}
+			else if (returnType.IsGenericType)
+			{
+				Type genericTypeDefinition = returnType.GetGenericTypeDefinition();
+				if (genericTypeDefinition == typeof(System.Threading.Tasks.Task<>))
+				{
+					statementCollection.Add(new CodeMethodReturnStatement(new CodeSnippetExpression("responseMessage")));
+					Trace.TraceWarning("There could be something to improve: " + returnType.GenericTypeArguments[0].ToString());
+					return;
+				}
+			}
+
+			AddResponseMessageRead(statementCollection);
+
+			if (returnType != null && TypeHelper.IsStringType(returnType))
+			{
+				if (this.stringAsString)
+				{
+					statementCollection.Add(new CodeSnippetStatement("\t\t\t\tusing System.IO.StreamReader streamReader = new System.IO.StreamReader(stream);"));
+					statementCollection.Add(new CodeMethodReturnStatement(new CodeSnippetExpression("streamReader.ReadToEnd();")));
+				}
+				else
+				{
+					if (codeGenOutputsSettings.UseSystemTextJson)
+					{
+						statementCollection.Add(new CodeMethodReturnStatement(new CodeMethodInvokeExpression(
+							new CodeMethodReferenceExpression(
+								new CodeVariableReferenceExpression("JsonSerializer"), "Deserialize", new CodeTypeReference(typeof(System.String))),
+							new CodeSnippetExpression("contentString"),
+							new CodeSnippetExpression("jsonSerializerSettings"))));
+					}
+					else
+					{
+						AddNewtonSoftJsonTextReader(statementCollection);
+						statementCollection.Add(new CodeMethodReturnStatement(new CodeSnippetExpression("jsonReader.ReadAsString()")));
+					}
+				}
+			}
+			else if (returnType == typeOfChar)
+			{
+				if (codeGenOutputsSettings.UseSystemTextJson)
+				{
+					DeserializeContentStream(statementCollection);
+				}
+				else
+				{
+					AddNewtonSoftJsonTextReader(statementCollection);
+					AddNewtonSoftJsonSerializer(statementCollection);
+					statementCollection.Add(new CodeMethodReturnStatement(new CodeSnippetExpression("serializer.Deserialize<char>(jsonReader)")));
+				}
+			}
+			else if (returnType.IsPrimitive)
+			{
+				if (codeGenOutputsSettings.UseSystemTextJson)
+				{
+					DeserializeContentStream(statementCollection);
+				}
+				else
+				{
+					AddNewtonSoftJsonTextReader(statementCollection);
+					statementCollection.Add(new CodeMethodReturnStatement(new CodeSnippetExpression(String.Format("{0}.Parse(jsonReader.ReadAsString())", returnType.FullName))));
+				}
+			}
+			else if (returnType.IsGenericType || TypeHelper.IsComplexType(returnType) || returnType.IsEnum)
+			{
+				if (codeGenOutputsSettings.UseSystemTextJson)
+				{
+					DeserializeContentStream(statementCollection);
+				}
+				else
+				{
+					AddNewtonSoftJsonTextReader(statementCollection);
+					//Add4TStartBacket(statementCollection);
+					AddNewtonSoftJsonSerializer(statementCollection);
+					AddNewtonSoftJsonSerializerDeserialize(statementCollection);
+					//Add4TEndBacket(statementCollection);
+				}
+			}
+			else
+			{
+				Trace.TraceWarning("This type is not yet supported: {0}", returnType.FullName);
+			}
+		}
+
+		private static string RemoveTrialEmptyString(string s)
+		{
+			int p = s.IndexOf("+\"\"", StringComparison.Ordinal);
+			if (p >= 0)
+			{
+				return s.Remove(p, 3);
+			}
+
+			int p2 = s.IndexOf("))\"", StringComparison.Ordinal);
+			if (p2 >= 0)
+			{
+				return s.Remove(p2 + 2, 1);
+			}
+
+			return s;
+		}
+
+		/// <summary>
+		/// If the API function use ProducesResponseTypeAttribute and 200-202 to define the return type, then get the return type as full type name,
+		/// Null if no such definition .
+		/// </summary>
+		/// <param name="customAttributes"></param>
+		/// <returns></returns>
+		static Type GetTypeTextOfResponse2xx(Attribute[] customAttributes)
+		{
+			foreach (Attribute c in customAttributes)
+			{
+				Microsoft.AspNetCore.Mvc.ProducesResponseTypeAttribute responseAttribute = c as Microsoft.AspNetCore.Mvc.ProducesResponseTypeAttribute;
+				if (responseAttribute != null)
+				{
+					if (responseAttribute.StatusCode >= 200 && responseAttribute.StatusCode <= 202)
+					{
+						return responseAttribute.Type;
+					}
+				}
+			}
+
+			return null;
+		}
+
+
+	}
 
 }
diff --git a/WebApiClientGenCore/WebApiClientGenCore.csproj b/WebApiClientGenCore/WebApiClientGenCore.csproj
index 331f57e2..4aeee8a1 100644
--- a/WebApiClientGenCore/WebApiClientGenCore.csproj
+++ b/WebApiClientGenCore/WebApiClientGenCore.csproj
@@ -5,14 +5,14 @@
 		<RootNamespace>Fonlow.CodeDom.Web</RootNamespace>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<PackageId>Fonlow.WebApiClientGenCore</PackageId>
-		<Version>7.8.1</Version>
+		<Version>7.8.2</Version>
 		<Description>Generate strongly typed client API in C# or TypeScript for .NET Core Web API. Strongly Typed Client API Generator generates C# and TypeScript codes of strongly typed client API similar to what generated by SvcUtil.exe of WCF, provided you have access to the ASP.NET Web API source codes or assemblies. Then you may provide or publish either the source codes in C# and TypeScript or the compiled client API library to other developers who are developing client programs of your Web API. The TypeScript outputs support jQuery, Angular 2+, AXIOS and Aurelia.</Description>
 		<Copyright>Copyright © Zijian Huang 2015-$([System.DateTime]::Now.Year)</Copyright>
 		<PackageLicenseUrl></PackageLicenseUrl>
 		<PackageProjectUrl>https://github.com/zijianhuang/webapiclientgen</PackageProjectUrl>
 		<PackageTags>ASP API Web Client webapi rest restful aspnet aspnetwebapi httpclient .net core aspnetcore jquery angular</PackageTags>
 		<PackageReleaseNotes>
-			Simplified C# codes of client API utilizing new features after .NET 5 and .NET 8. Support LengthAttribute.
+			For https://github.com/dotnet/runtime/issues/104716, for synchronous HttpClient Send, uses HttpClient.SendAsync().Result.
 		</PackageReleaseNotes>
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 		<NeutralLanguage>en</NeutralLanguage>