Merge branch 'release/1.4.1'

Author: GregaMohorko

LICENSE.md

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2020 Gregor Mohorko
+   Copyright 2023 Gregor Mohorko
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -45,6 +45,6 @@ YourClass response = request.Call("TestAction");
 
 Gregor Mohorko ([www.mohorko.info](https://www.mohorko.info))
 
-Copyright (c) 2020 Gregor Mohorko
+Copyright (c) 2023 Gregor Mohorko
 
 [Apache License 2.0](./LICENSE.md)

src/BlueWSClient.NET/BlueWSClient.NET.Test/BlueWSClient.NET.Test.csproj

@@ -37,8 +37,8 @@
     <Reference Include="GM.Utility, Version=1.4.2.0, Culture=neutral, PublicKeyToken=a1ae152199607549, processorArchitecture=MSIL">
       <HintPath>..\packages\GM.Utility.1.4.2\lib\netstandard2.0\GM.Utility.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

src/BlueWSClient.NET/BlueWSClient.NET.Test/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="GM.Utility" version="1.4.2" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
 </packages>

src/BlueWSClient.NET/BlueWSClient.NET/BlueWSClient.NET.csproj

@@ -7,20 +7,19 @@
 	<SignAssembly>true</SignAssembly>
 	<DelaySign>false</DelaySign>
 	<AssemblyOriginatorKeyFile>GM.StrongNameKey.snk</AssemblyOriginatorKeyFile>
-	<Version>1.4.0.0</Version>
-	<AssemblyVersion>1.4.0.0</AssemblyVersion>
-	<FileVersion>1.4.0.0</FileVersion>
+	<Version>1.4.1.0</Version>
+	<AssemblyVersion>1.4.1.0</AssemblyVersion>
+	<FileVersion>1.4.1.0</FileVersion>
 	<Title>BlueWS</Title>
 	<Authors>Gregor Mohorko</Authors>
 	<Company>Gregor Mohorko</Company>
 	<PackageProjectUrl>https://github.com/GregaMohorko/BlueWSClient.NET</PackageProjectUrl>
 	<PackageIcon>BlueWS Icon.png</PackageIcon>
 	<PackageTags>EntityFramework Entity Database JSON Criteria Expression TableInheritance ManyToOne OneToMany ManyToMany MySQL</PackageTags>
 	<Description>A client library for BlueWS library. Includes logic and utility for calling BlueWS web service actions.</Description>
-	<Copyright>Copyright © Grega Mohorko 2022</Copyright>
+	<Copyright>Copyright © Grega Mohorko 2023</Copyright>
 	<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-	<PackageReleaseNotes>Remove obsolete things.
-Add ability to specify custom http client.</PackageReleaseNotes>
+	<PackageReleaseNotes>Fix usage with latest GM.Utility package.</PackageReleaseNotes>
 	<RepositoryUrl>https://github.com/GregaMohorko/BlueWSClient.NET</RepositoryUrl>
 	<RepositoryType>Git</RepositoryType>
 	<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
@@ -30,7 +29,7 @@ Add ability to specify custom http client.</PackageReleaseNotes>
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
 	</ItemGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -45,8 +44,8 @@ Add ability to specify custom http client.</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GM.Utility" Version="1.4.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="GM.Utility" Version="1.5.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

src/BlueWSClient.NET/BlueWSClient.NET/Request.cs

@@ -26,6 +26,9 @@ limitations under the License.
 using GM.Utility.Net;
 using HttpMethod = System.Net.Http.HttpMethod;
 using System.Threading;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Net;
 
 namespace BlueWS
 {
@@ -110,7 +113,15 @@ public async Task<T> CallAsync(string action, CancellationToken cancellationToke
 				string address = WebService.ServerAddress;
 				HttpMethod httpMethod = WebService.HttpMethod;
 				using(var webClient = new GMHttpClient(httpClient, disposeHttpClient: httpClient == null)) {
-					RawResponse = await webClient.UploadValuesAsync(address, data, httpMethod, cancellationToken);
+					if(httpMethod == HttpMethod.Get) {
+						RawResponse = await webClient.SendGet(address, data, cancellationToken).ConfigureAwait(false);
+					} else if(httpMethod == HttpMethod.Post) {
+						var encodedItems = data.Select(x => $"{WebUtility.UrlEncode(x.Key)}={WebUtility.UrlEncode(x.Value)}");
+						var httpContent = new StringContent(string.Join("&", encodedItems), null, "application/x-www-form-urlencoded");
+						RawResponse = await webClient.Send(address, HttpMethod.Post, httpContent, cancellationToken).ConfigureAwait(false);
+					} else {
+						throw new Exception($"HttpMethod {httpMethod} is not allowed.");
+					}
 				}
 				AfterCalling();
 			} catch(HttpRequestException) {