Release 2.1

.github/workflows/branches-ubuntu.yml

@@ -0,0 +1,70 @@
+name: Branch workflow (Ubuntu)
+on: 
+  push:
+    branches-ignore:
+      - develop
+      - 'release/**'
+      - 'releases/**'
+env:
+  DOTNET_CLI_TELEMETRY_OPTOUT: true
+jobs:
+  generateVersionInfo:  
+    name: GenerateVersionInfo
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Restore dotnet tools
+      run: dotnet tool restore
+    - name: Fetch complete repository 
+      run: git fetch
+    - name: Generate version info from git history
+      run: dotnet gitversion /output json > gitversion.json
+    - name: Upload version info file
+      uses: actions/upload-artifact@v1
+      with:
+        name: gitversion
+        path: gitversion.json
+
+  build:
+    name: Build
+    needs: generateVersionInfo
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Download version info file
+      uses: actions/download-artifact@v1
+      with:
+        name: gitversion
+        path: ./
+    - name: Inject version info into environment
+      run: jq -r 'to_entries|map("::set-env name=GitVersion_\(.key)::\(.value|tostring)")|.[]' gitversion.json
+    - name: Build solution
+      run: echo "Current version is \"$GitVersion_SemVer\"" && dotnet build -c Release
+    - name: Create NuGet packages
+      run: dotnet pack -c Release --no-build -o nupkg 
+    - name: Upload nuget packages
+      uses: actions/upload-artifact@v1
+      with:
+        name: nupkg
+        path: nupkg
+
+  test:
+    name: Test
+    needs: [build, generateVersionInfo]
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Download version info file
+      uses: actions/download-artifact@v1
+      with:
+        name: gitversion
+        path: ./
+    - name: Inject version info into environment
+      run: jq -r 'to_entries|map("::set-env name=GitVersion_\(.key)::\(.value|tostring)")|.[]' gitversion.json
+    - name: Run tests
+      run: echo "Current version is \"$GitVersion_SemVer\"" && dotnet test -c Release

.github/workflows/branches.yml → .github/workflows/branches-windows.yml

@@ -1,10 +1,8 @@
 name: Branch workflow
-on: 
+on:
   push:
     branches-ignore:
-      - develop
-      - 'release/**'
-      - 'releases/**'
+      - '**'
 jobs:
   generateVersionInfo:  
     name: GenerateVersionInfo

.github/workflows/main-ubuntu.yml

@@ -0,0 +1,92 @@
+name: Main workflow (Ubuntu)
+on: 
+  push:
+    branches:
+      - develop
+      - 'release/**'
+      - 'releases/**'
+    tags:        
+      - v*
+      - V*
+env:
+  DOTNET_CLI_TELEMETRY_OPTOUT: true
+jobs:
+  generateVersionInfo:  
+    name: GenerateVersionInfo
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Restore dotnet tools
+      run: dotnet tool restore
+    - name: Fetch complete repository 
+      run: git fetch
+    - name: Generate version info from git history
+      run: dotnet gitversion /output json > gitversion.json
+    - name: Upload version info file
+      uses: actions/upload-artifact@v1
+      with:
+        name: gitversion
+        path: gitversion.json
+
+  build:
+    name: Build
+    needs: generateVersionInfo
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Download version info file
+      uses: actions/download-artifact@v1
+      with:
+        name: gitversion
+        path: ./
+    - name: Inject version info into environment
+      run: jq -r 'to_entries|map("::set-env name=GitVersion_\(.key)::\(.value|tostring)")|.[]' gitversion.json
+    - name: Build solution
+      run: echo "Current version is \"$GitVersion_SemVer\"" && dotnet build -c Release
+    - name: Create NuGet packages
+      run: dotnet pack -c Release --no-build -o nupkg 
+    - name: Upload nuget packages
+      uses: actions/upload-artifact@v1
+      with:
+        name: nupkg
+        path: nupkg
+
+  test:
+    name: Test
+    needs: [build, generateVersionInfo]
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Download version info file
+      uses: actions/download-artifact@v1
+      with:
+        name: gitversion
+        path: ./
+    - name: Inject version info into environment
+      run: jq -r 'to_entries|map("::set-env name=GitVersion_\(.key)::\(.value|tostring)")|.[]' gitversion.json
+    - name: Run tests
+      run: echo "Current version is \"$GitVersion_SemVer\"" && dotnet test -c Release
+
+  publish:
+    name: Publish
+    needs: [test]
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Download nuget packages
+      uses: actions/download-artifact@v1
+      with:
+        name: nupkg
+    - name: Publish the package to GPR    
+    # using workaround with CURL because of non-functioning upload via dotnet nuget (https://stackoverflow.com/a/58943251)
+      run: |
+           for f in ./nupkg/*.nupkg
+           do
+             curl -vX PUT -u "graphql-dotnet:${{secrets.GITHUB_TOKEN}}" -F package=@$f https://nuget.pkg.github.com/graphql-dotnet/
+           done

.github/workflows/main.yml → .github/workflows/main-windows.yml

@@ -1,13 +1,8 @@
 name: Main workflow
-on: 
+on:
   push:
-    branches:
-      - develop
-      - 'release/**'
-      - 'releases/**'
-    tags:        
-      - v*
-      - V*
+    branches-ignore:
+      - '**'
 jobs:
   generateVersionInfo:  
     name: GenerateVersionInfo

GitVersion.yml

@@ -1,3 +1 @@
-branches:   
-  release:
-    mode: ContinuousDeployment
+mode: ContinuousDeployment

GraphQL.Client.sln

@@ -32,12 +32,10 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Server.Test", "tests\GraphQL.Server.Test\GraphQL.Server.Test.csproj", "{E95A1258-F666-4D4E-9101-E0C46F6A3CB3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{C42106CF-F685-4F29-BC18-A70616BD68A0}"
-	ProjectSection(SolutionItems) = preProject
-		.github\FUNDING.yml = .github\FUNDING.yml
-	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{05CAF9B2-981E-40C0-AE31-5FA56E351F12}"
 	ProjectSection(SolutionItems) = preProject
+		.github\workflows\branches-ubuntu.yml = .github\workflows\branches-ubuntu.yml
 		.github\workflows\branches.yml = .github\workflows\branches.yml
 		.github\workflows\main.yml = .github\workflows\main.yml
 	EndProjectSection
@@ -58,6 +56,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Client.Abstractions
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Client", "src\GraphQL.Client\GraphQL.Client.csproj", "{ED3541C9-D2B2-4D06-A464-38E404A3919A}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Client.Abstractions.Websocket", "src\GraphQL.Client.Abstractions.Websocket\GraphQL.Client.Abstractions.Websocket.csproj", "{4D581CE1-523D-46BF-BAA5-F7D79A1B7654}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Client.Serializer.Newtonsoft", "src\GraphQL.Client.Serializer.Newtonsoft\GraphQL.Client.Serializer.Newtonsoft.csproj", "{11F28E78-ADE4-4153-B97C-56136EB7BD5B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Client.LocalExecution", "src\GraphQL.Client.LocalExecution\GraphQL.Client.LocalExecution.csproj", "{2BEC821C-E405-43CB-9BC9-A6BB0322F6C2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Client.Serializer.Tests", "tests\GraphQL.Client.Serializer.Tests\GraphQL.Client.Serializer.Tests.csproj", "{CA842D18-FC4A-4281-B1FF-080FA91887B8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Client.Tests.Common", "tests\GraphQL.Client.Tests.Common\GraphQL.Client.Tests.Common.csproj", "{0D307BAD-27AE-4A5D-8764-4AA2620B01E9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Client.Serializer.SystemTextJson", "src\GraphQL.Client.Serializer.SystemTextJson\GraphQL.Client.Serializer.SystemTextJson.csproj", "{7FFFEC00-D751-4FFC-9FD4-E91858F9A1C5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -96,19 +106,50 @@ Global
 		{ED3541C9-D2B2-4D06-A464-38E404A3919A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ED3541C9-D2B2-4D06-A464-38E404A3919A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ED3541C9-D2B2-4D06-A464-38E404A3919A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4D581CE1-523D-46BF-BAA5-F7D79A1B7654}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D581CE1-523D-46BF-BAA5-F7D79A1B7654}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D581CE1-523D-46BF-BAA5-F7D79A1B7654}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4D581CE1-523D-46BF-BAA5-F7D79A1B7654}.Release|Any CPU.Build.0 = Release|Any CPU
+		{11F28E78-ADE4-4153-B97C-56136EB7BD5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11F28E78-ADE4-4153-B97C-56136EB7BD5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11F28E78-ADE4-4153-B97C-56136EB7BD5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{11F28E78-ADE4-4153-B97C-56136EB7BD5B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2BEC821C-E405-43CB-9BC9-A6BB0322F6C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BEC821C-E405-43CB-9BC9-A6BB0322F6C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2BEC821C-E405-43CB-9BC9-A6BB0322F6C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2BEC821C-E405-43CB-9BC9-A6BB0322F6C2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA842D18-FC4A-4281-B1FF-080FA91887B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA842D18-FC4A-4281-B1FF-080FA91887B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA842D18-FC4A-4281-B1FF-080FA91887B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA842D18-FC4A-4281-B1FF-080FA91887B8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0D307BAD-27AE-4A5D-8764-4AA2620B01E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D307BAD-27AE-4A5D-8764-4AA2620B01E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D307BAD-27AE-4A5D-8764-4AA2620B01E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0D307BAD-27AE-4A5D-8764-4AA2620B01E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7FFFEC00-D751-4FFC-9FD4-E91858F9A1C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7FFFEC00-D751-4FFC-9FD4-E91858F9A1C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7FFFEC00-D751-4FFC-9FD4-E91858F9A1C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7FFFEC00-D751-4FFC-9FD4-E91858F9A1C5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{E95A1258-F666-4D4E-9101-E0C46F6A3CB3} = {0B0EDB0F-FF67-4B78-A8DB-B5C23E1FEE8C}
+		{05CAF9B2-981E-40C0-AE31-5FA56E351F12} = {C42106CF-F685-4F29-BC18-A70616BD68A0}
 		{95D78D57-3232-491D-BAD6-F373D76EA34D} = {D61415CA-D822-43DD-9AE7-993B8B60E855}
 		{87FC440E-6A4D-47D8-9EB2-416FC31CC4A6} = {47C98B55-08F1-4428-863E-2C5C876DEEFE}
 		{C212983F-67DB-44EB-BFB0-5DA75A86DF55} = {0B0EDB0F-FF67-4B78-A8DB-B5C23E1FEE8C}
 		{92107DF5-73DF-4371-8EB1-6734FED704AD} = {0B0EDB0F-FF67-4B78-A8DB-B5C23E1FEE8C}
 		{C68C26EB-7659-402A-93D1-E6E248DA5427} = {0B0EDB0F-FF67-4B78-A8DB-B5C23E1FEE8C}
 		{76E622F6-7CDD-4B1F-AD06-FFABF37C55E5} = {47C98B55-08F1-4428-863E-2C5C876DEEFE}
 		{ED3541C9-D2B2-4D06-A464-38E404A3919A} = {47C98B55-08F1-4428-863E-2C5C876DEEFE}
+		{4D581CE1-523D-46BF-BAA5-F7D79A1B7654} = {47C98B55-08F1-4428-863E-2C5C876DEEFE}
+		{11F28E78-ADE4-4153-B97C-56136EB7BD5B} = {47C98B55-08F1-4428-863E-2C5C876DEEFE}
+		{2BEC821C-E405-43CB-9BC9-A6BB0322F6C2} = {47C98B55-08F1-4428-863E-2C5C876DEEFE}
+		{CA842D18-FC4A-4281-B1FF-080FA91887B8} = {0B0EDB0F-FF67-4B78-A8DB-B5C23E1FEE8C}
+		{0D307BAD-27AE-4A5D-8764-4AA2620B01E9} = {0B0EDB0F-FF67-4B78-A8DB-B5C23E1FEE8C}
+		{7FFFEC00-D751-4FFC-9FD4-E91858F9A1C5} = {47C98B55-08F1-4428-863E-2C5C876DEEFE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {387AC1AC-F90C-4EF8-955A-04D495C75AF4}

README.md

@@ -43,9 +43,11 @@ var heroAndFriendsRequest = new GraphQLRequest {
 };
 ```
 
+Be careful when using `byte[]` in your variables object, as most JSON serializers will treat that as binary data! If you really need to send a *list of bytes* with a `byte[]` as a source, then convert it to a `List<byte>` first, which will tell the serializer to output a list of numbers instead of a base64-encoded string.
+
 ### Execute Query/Mutation:
 ```csharp
-var graphQLClient = new GraphQLClient("https://swapi.apis.guru/");
+var graphQLClient = new GraphQLHttpClient("https://swapi.apis.guru/");
 
 public class HeroAndFriendsResponse {
     public Hero Hero {get; set;}
@@ -62,6 +64,8 @@ var graphQLResponse = await graphQLClient.SendQueryAsync<HeroAndFriendsResponse>
 var heroName = graphQLResponse.Data.Hero.Name;
 ```
 
+
+
 ### Use Subscriptions
 
 ```csharp

src/GraphQL.Client.Abstractions.Websocket/GraphQL.Client.Abstractions.Websocket.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<Import Project="../src.props" />
+
+	<PropertyGroup>
+	<TargetFramework>netstandard2.0</TargetFramework>
+	  <LangVersion>8.0</LangVersion>
+	</PropertyGroup>
+
+	<ItemGroup>
+	<ProjectReference Include="..\GraphQL.Client.Abstractions\GraphQL.Client.Abstractions.csproj" />
+	</ItemGroup>
+
+</Project>

src/GraphQL.Client/Websocket/GraphQLWebSocketMessageType.cs → src/GraphQL.Client.Abstractions.Websocket/GraphQLWebSocketMessageType.cs

@@ -1,4 +1,4 @@
-namespace GraphQL.Client.Http.Websocket {
+namespace GraphQL.Client.Abstractions.Websocket {
 	public static class GraphQLWebSocketMessageType {
 
 		/// <summary>

src/GraphQL.Client/Websocket/GraphQLWebSocketRequest.cs → src/GraphQL.Client.Abstractions.Websocket/GraphQLWebSocketRequest.cs

@@ -1,28 +1,35 @@
 using System;
 using System.Collections.Generic;
+using System.Runtime.Serialization;
 using System.Threading.Tasks;
 
-namespace GraphQL.Client.Http.Websocket {
+namespace GraphQL.Client.Abstractions.Websocket {
 
 	/// <summary>
 	/// A Subscription Request
 	/// </summary>
 	public class GraphQLWebSocketRequest : IEquatable<GraphQLWebSocketRequest> {
+		public const string IdKey = "id";
+		public const string TypeKey = "type";
+		public const string PayloadKey = "payload";
 
 		/// <summary>
 		/// The Identifier of the Response
 		/// </summary>
-		public string Id { get; set; }
+		[DataMember(Name = IdKey)]
+		public virtual string Id { get; set; }
 
 		/// <summary>
 		/// The Type of the Request
 		/// </summary>
-		public string Type { get; set; }
+		[DataMember(Name = TypeKey)]
+		public virtual string Type { get; set; }
 
 		/// <summary>
 		/// The payload of the websocket request
 		/// </summary>
-		public GraphQLRequest Payload { get; set; }
+		[DataMember(Name = PayloadKey)]
+		public virtual GraphQLRequest Payload { get; set; }
 
 		private TaskCompletionSource<bool> _tcs = new TaskCompletionSource<bool>();
 

src/GraphQL.Client/Websocket/GraphQLWebSocketResponse.cs → src/GraphQL.Client.Abstractions.Websocket/GraphQLWebSocketResponse.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace GraphQL.Client.Http.Websocket {
+namespace GraphQL.Client.Abstractions.Websocket {
 
 	/// <summary>
 	/// A Subscription Response
@@ -60,10 +60,10 @@ public override int GetHashCode() {
 
 	}
 
-	public class GraphQLWebSocketResponse<TResponse> : GraphQLWebSocketResponse, IEquatable<GraphQLWebSocketResponse<TResponse>> {
-		public GraphQLHttpResponse<TResponse> Payload { get; set; }
+	public class GraphQLWebSocketResponse<TPayload> : GraphQLWebSocketResponse, IEquatable<GraphQLWebSocketResponse<TPayload>> {
+		public TPayload Payload { get; set; }
 
-		public bool Equals(GraphQLWebSocketResponse<TResponse>? other) {
+		public bool Equals(GraphQLWebSocketResponse<TPayload>? other) {
 			if (ReferenceEquals(null, other)) return false;
 			if (ReferenceEquals(this, other)) return true;
 			return base.Equals(other) && Payload.Equals(other.Payload);
@@ -73,7 +73,7 @@ public override bool Equals(object? obj) {
 			if (ReferenceEquals(null, obj)) return false;
 			if (ReferenceEquals(this, obj)) return true;
 			if (obj.GetType() != this.GetType()) return false;
-			return Equals((GraphQLWebSocketResponse<TResponse>)obj);
+			return Equals((GraphQLWebSocketResponse<TPayload>)obj);
 		}
 
 		public override int GetHashCode() {