Skip to content

Commit f6fdca7

Browse files
authored
Merge pull request #213 from graphql-dotnet/refactor-observable-tester
Refactor observable tester
2 parents f501e5d + d1950f8 commit f6fdca7

File tree

22 files changed

+760
-309
lines changed

22 files changed

+760
-309
lines changed

.github/workflows/branches-ubuntu.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ on:
66
- 'release/**'
77
- 'releases/**'
88
env:
9-
DOTNET_CLI_TELEMETRY_OPTOUT: true
9+
DOTNET_CLI_TELEMETRY_OPTOUT: true
10+
MSBUILDSINGLELOADCONTEXT: 1
1011
jobs:
1112
generateVersionInfo:
1213
name: GenerateVersionInfo

.github/workflows/main-ubuntu.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ on:
1010
- V*
1111
env:
1212
DOTNET_CLI_TELEMETRY_OPTOUT: true
13+
MSBUILDSINGLELOADCONTEXT: 1
14+
1315
jobs:
1416
generateVersionInfo:
1517
name: GenerateVersionInfo

dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
]
99
},
1010
"gitversion.tool": {
11-
"version": "5.1.3",
11+
"version": "5.2.4",
1212
"commands": [
1313
"dotnet-gitversion"
1414
]

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<PropertyGroup>
55
<Description>Abstractions for the Websocket transport used in GraphQL.Client</Description>
66
<TargetFramework>netstandard2.0</TargetFramework>
7-
<LangVersion>8.0</LangVersion>
87
</PropertyGroup>
98

109
<ItemGroup>

src/GraphQL.Client.Serializer.Newtonsoft/GraphQL.Client.Serializer.Newtonsoft.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<PropertyGroup>
55
<Description>A serializer implementation for GraphQL.Client using Newtonsoft.Json as underlying JSON library</Description>
66
<TargetFrameworks>netstandard2.0</TargetFrameworks>
7-
<LangVersion>8.0</LangVersion>
87
</PropertyGroup>
98

109
<ItemGroup>

src/GraphQL.Client.Serializer.SystemTextJson/GraphQL.Client.Serializer.SystemTextJson.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="../src.props" />
2+
3+
<Import Project="../src.props" />
34

45
<PropertyGroup>
56
<Description>A serializer implementation for GraphQL.Client using System.Text.Json as underlying JSON library</Description>
67
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
7-
<LangVersion>8.0</LangVersion>
88
</PropertyGroup>
99

1010
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">

src/GraphQL.Client/GraphQL.Client.csproj

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,7 @@
1515
<DefineConstants>NETFRAMEWORK</DefineConstants>
1616
</PropertyGroup>
1717

18-
<ItemGroup>
19-
<Compile Remove="GraphQLSerializationExtensions.cs" />
20-
</ItemGroup>
21-
22-
<ItemGroup>
23-
<None Include="GraphQLSerializationExtensions.cs" />
24-
</ItemGroup>
25-
26-
27-
<ItemGroup>
18+
<ItemGroup>
2819
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
2920
</ItemGroup>
3021

@@ -37,7 +28,4 @@
3728
<ProjectReference Include="..\GraphQL.Client.Abstractions\GraphQL.Client.Abstractions.csproj" />
3829
</ItemGroup>
3930

40-
41-
42-
4331
</Project>

src/GraphQL.Client/GraphQLHttpClient.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,9 @@ private async Task<GraphQLHttpResponse<TResponse>> SendHttpPostRequestAsync<TRes
129129
var preprocessedRequest = await Options.PreprocessRequest(request, this);
130130
using var httpRequestMessage = GenerateHttpRequestMessage(preprocessedRequest);
131131
using var httpResponseMessage = await HttpClient.SendAsync(httpRequestMessage, cancellationToken);
132-
if (!httpResponseMessage.IsSuccessStatusCode)
133-
{
134-
throw new GraphQLHttpException(httpResponseMessage);
135-
}
136132

133+
httpResponseMessage.EnsureSuccessStatusCode();
134+
137135
var bodyStream = await httpResponseMessage.Content.ReadAsStreamAsync();
138136
var response = await JsonSerializer.DeserializeFromUtf8StreamAsync<TResponse>(bodyStream, cancellationToken);
139137
return response.ToGraphQLHttpResponse(httpResponseMessage.Headers, httpResponseMessage.StatusCode);

src/GraphQL.Client/GraphQLSerializationExtensions.cs

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/GraphQL.Primitives/GraphQL.Primitives.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77
<RootNamespace>GraphQL</RootNamespace>
88
<TargetFrameworks>netstandard2.0</TargetFrameworks>
99
</PropertyGroup>
10+
1011
</Project>

0 commit comments

Comments
 (0)