Merge branch 'master' of https://github.com/graphql-dotnet/graphql-client into code-cleanup

# Conflicts:
#	src/GraphQL.Client.Abstractions.Websocket/GraphQL.Client.Abstractions.Websocket.csproj
#	src/GraphQL.Client.Serializer.SystemTextJson/GraphQL.Client.Serializer.SystemTextJson.csproj
#	src/GraphQL.Client/GraphQL.Client.csproj
#	src/GraphQL.Client/GraphQLHttpException.cs
#	src/GraphQL.Primitives/GraphQL.Primitives.csproj
#	src/src.props
#	tests/GraphQL.Client.Serializer.Tests/GraphQL.Client.Serializer.Tests.csproj
#	tests/GraphQL.Client.Tests.Common/Helpers/ObservableTester.cs
#	tests/GraphQL.Integration.Tests/GraphQL.Integration.Tests.csproj
#	tests/GraphQL.Integration.Tests/WebsocketTests/Base.cs
#	tests/GraphQL.Primitives.Tests/GraphQL.Primitives.Tests.csproj

Author: sungam3r

.github/workflows/branches-windows.yml

@@ -1,12 +1,14 @@
-name: Branch workflow (Ubuntu)
+name: Branch workflow
 on: 
   push:
     branches-ignore:
-      - develop
+      - master
       - 'release/**'
       - 'releases/**'
+  pull_request:
 env:
-  DOTNET_CLI_TELEMETRY_OPTOUT: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: true  
+  MSBUILDSINGLELOADCONTEXT: 1
 jobs:
   generateVersionInfo:  
     name: GenerateVersionInfo
@@ -18,10 +20,10 @@ jobs:
         fetch-depth: 0
     - name: Restore dotnet tools
       run: dotnet tool restore
-    - name: Fetch complete repository 
-      run: git fetch
+    - name: Fetch complete repository including tags
+      run: git fetch --tags --force --prune && git describe
     - name: Generate version info from git history
-      run: dotnet gitversion /output json > gitversion.json
+      run: dotnet gitversion /output json > gitversion.json && cat gitversion.json
     - name: Upload version info file
       uses: actions/upload-artifact@v1
       with:

.github/workflows/branches-ubuntu.yml renamed to .github/workflows/branches.yml

@@ -1,15 +1,17 @@
-name: Main workflow (Ubuntu)
+name: Master workflow
 on: 
   push:
     branches:
-      - develop
+      - master
       - 'release/**'
       - 'releases/**'
     tags:        
       - v*
       - V*
 env:
   DOTNET_CLI_TELEMETRY_OPTOUT: true
+  MSBUILDSINGLELOADCONTEXT: 1
+
 jobs:
   generateVersionInfo:  
     name: GenerateVersionInfo
@@ -21,10 +23,10 @@ jobs:
         fetch-depth: 0
     - name: Restore dotnet tools
       run: dotnet tool restore
-    - name: Fetch complete repository 
-      run: git fetch
+    - name: Fetch complete repository including tags
+      run: git fetch --tags --force --prune && git describe
     - name: Generate version info from git history
-      run: dotnet gitversion /output json > gitversion.json
+      run: dotnet gitversion /output json > gitversion.json && cat gitversion.json
     - name: Upload version info file
       uses: actions/upload-artifact@v1
       with:

.github/workflows/main-windows.yml

@@ -1 +1,4 @@
 mode: ContinuousDeployment
+branches:
+  master:
+    tag: alpha

.github/workflows/main-ubuntu.yml renamed to .github/workflows/master.yml

@@ -8,7 +8,7 @@
       ]
     },
     "gitversion.tool": {
-      "version": "5.1.3",
+      "version": "5.2.4",
       "commands": [
         "dotnet-gitversion"
       ]

GitVersion.yml

@@ -48,9 +48,9 @@ private Dictionary<string, object> ReadDictionary(JToken element, Dictionary<str
             return to;
         }
 
-        private IEnumerable<object> ReadArray(JToken element)
+        private IEnumerable<object> ReadArray(JArray element)
         {
-            foreach (var item in element.Values())
+            foreach (var item in element)
             {
                 if (IsUnsupportedJTokenType(item.Type))
                     continue;

dotnet-tools.json

@@ -15,18 +15,6 @@
     <DefineConstants>NETFRAMEWORK</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="GraphQLSerializationExtensions.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="GraphQLSerializationExtensions.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461'">
     <PackageReference Include="System.Net.WebSockets.Client.Managed" Version="1.0.22" />
   </ItemGroup>

src/GraphQL.Client.Http/Websocket/IGraphQLWebSocketJsonSerializer.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Concurrent;
 using System.Diagnostics;
+using System.IO;
 using System.Net.Http;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using GraphQL.Client.Abstractions;
@@ -70,7 +70,7 @@ public async Task<GraphQLResponse<TResponse>> SendQueryAsync<TResponse>(GraphQLR
             if (Options.UseWebSocketForQueriesAndMutations)
                 return await _graphQlHttpWebSocket.SendRequest<TResponse>(request, cancellationToken);
 
-            return await SendHttpPostRequestAsync<TResponse>(request, cancellationToken);
+            return await SendHttpRequestAsync<TResponse>(request, cancellationToken);
         }
 
         /// <inheritdoc />
@@ -121,37 +121,33 @@ public IObservable<GraphQLResponse<TResponse>> CreateSubscriptionStream<TRespons
 
         #region Private Methods
 
-        private async Task<GraphQLHttpResponse<TResponse>> SendHttpPostRequestAsync<TResponse>(GraphQLRequest request, CancellationToken cancellationToken = default)
+        private async Task<GraphQLHttpResponse<TResponse>> SendHttpRequestAsync<TResponse>(GraphQLRequest request, CancellationToken cancellationToken = default)
         {
             var preprocessedRequest = await Options.PreprocessRequest(request, this);
-            using var httpRequestMessage = GenerateHttpRequestMessage(preprocessedRequest);
-            using var httpResponseMessage = await HttpClient.SendAsync(httpRequestMessage, cancellationToken);
-            if (!httpResponseMessage.IsSuccessStatusCode)
-            {
-                throw new GraphQLHttpException(httpResponseMessage);
-            }
+            
+            using var httpRequestMessage = preprocessedRequest.ToHttpRequestMessage(Options, JsonSerializer);
+            using var httpResponseMessage = await HttpClient.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
 
-            var bodyStream = await httpResponseMessage.Content.ReadAsStreamAsync();
-            var response = await JsonSerializer.DeserializeFromUtf8StreamAsync<TResponse>(bodyStream, cancellationToken);
-            return response.ToGraphQLHttpResponse(httpResponseMessage.Headers, httpResponseMessage.StatusCode);
-        }
+            var contentStream = await httpResponseMessage.Content.ReadAsStreamAsync();
 
-        private HttpRequestMessage GenerateHttpRequestMessage(GraphQLRequest request)
-        {
-            var message = new HttpRequestMessage(HttpMethod.Post, Options.EndPoint)
+            if (httpResponseMessage.IsSuccessStatusCode)
             {
-                Content = new StringContent(JsonSerializer.SerializeToString(request), Encoding.UTF8, Options.MediaType)
-            };
+                var graphQLResponse = await JsonSerializer.DeserializeFromUtf8StreamAsync<TResponse>(contentStream, cancellationToken);
+                return graphQLResponse.ToGraphQLHttpResponse(httpResponseMessage.Headers, httpResponseMessage.StatusCode);
+            }
 
-            if (request is GraphQLHttpRequest httpRequest)
-                httpRequest.PreprocessHttpRequestMessage(message);
+            // error handling
+            string content = null;
+            if (contentStream != null)
+                using (var sr = new StreamReader(contentStream))
+                    content = await sr.ReadToEndAsync();
 
-            return message;
+            throw new GraphQLHttpRequestException(httpResponseMessage.StatusCode, httpResponseMessage.Headers, content);
         }
 
         private Uri GetWebSocketUri()
         {
-            var webSocketSchema = Options.EndPoint.Scheme == "https" ? "wss" : "ws";
+            string webSocketSchema = Options.EndPoint.Scheme == "https" ? "wss" : "ws";
             return new Uri($"{webSocketSchema}://{Options.EndPoint.Host}:{Options.EndPoint.Port}{Options.EndPoint.AbsolutePath}");
         }