Skip to content

Commit fbf37df

Browse files
rose-arose-a
authored
Upgrade dependencies (#603)
* upgrade dependencies * fix code warnings
1 parent cfac737 commit fbf37df

19 files changed

+74
-43
lines changed

‎src/GraphQL.Client.LocalExecution/GraphQL.Client.LocalExecution.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="GraphQL.MicrosoftDI" Version="7.4.1" />
10-
<PackageReference Include="System.Reactive" Version="5.0.0" />
9+
<PackageReference Include="GraphQL.MicrosoftDI" Version="7.6.1" />
10+
<PackageReference Include="System.Reactive" Version="6.0.0" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
9-
<PackageReference Include="System.Text.Json" Version="4.7.0" />
9+
<PackageReference Include="System.Text.Json" Version="8.0.0" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎src/GraphQL.Client.Serializer.SystemTextJson/ImmutableConverter.cs

+3
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,10 @@ public override void Write(Utf8JsonWriter writer, object value, JsonSerializerOp
9595
DefaultBufferSize = options.DefaultBufferSize,
9696
DictionaryKeyPolicy = options.DictionaryKeyPolicy,
9797
Encoder = options.Encoder,
98+
#pragma warning disable SYSLIB0020
99+
// obsolete warning disabled to keep compatibility until deprecated field is removed
98100
IgnoreNullValues = options.IgnoreNullValues,
101+
#pragma warning restore SYSLIB0020
99102
IgnoreReadOnlyProperties = options.IgnoreReadOnlyProperties,
100103
MaxDepth = options.MaxDepth,
101104
PropertyNameCaseInsensitive = options.PropertyNameCaseInsensitive,

‎src/GraphQL.Client/GraphQL.Client.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<ItemGroup>
1717
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
18-
<PackageReference Include="System.Reactive" Version="5.0.0" />
18+
<PackageReference Include="System.Reactive" Version="6.0.0" />
1919
</ItemGroup>
2020

2121
<ItemGroup Condition=" '$(TargetFramework)' == 'net461'">

‎tests/GraphQL.Client.Serializer.Tests/BaseSerializerTest.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@ public async Task CanDeserializeObjectWithBothConstructorAndProperties()
199199
var contentStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(jsonString));
200200

201201
// Act
202-
var result = await ClientSerializer.DeserializeFromUtf8StreamAsync<WithConstructorAndProperties>(contentStream, default).ConfigureAwait(false);
202+
var result = await ClientSerializer
203+
.DeserializeFromUtf8StreamAsync<WithConstructorAndProperties>(contentStream, default);
203204

204205
// Assert
205206
result.Data.Property1.Should().Be("value1");

‎tests/GraphQL.Client.Serializer.Tests/GraphQL.Client.Serializer.Tests.csproj

+11-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="GraphQL.NewtonsoftJson" Version="7.4.1" />
11-
<PackageReference Include="GraphQL.SystemTextJson" Version="7.4.1" />
10+
<PackageReference Include="GraphQL.NewtonsoftJson" Version="7.6.1" />
11+
<PackageReference Include="GraphQL.SystemTextJson" Version="7.6.1" />
1212
</ItemGroup>
1313

1414
<ItemGroup>
@@ -19,4 +19,13 @@
1919
<ProjectReference Include="..\GraphQL.Client.Tests.Common\GraphQL.Client.Tests.Common.csproj" />
2020
</ItemGroup>
2121

22+
<ItemGroup>
23+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" />
24+
<PackageReference Update="xunit" Version="2.6.2" />
25+
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.4">
26+
<PrivateAssets>all</PrivateAssets>
27+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
28+
</PackageReference>
29+
</ItemGroup>
30+
2231
</Project>

‎tests/GraphQL.Client.Tests.Common/GraphQL.Client.Tests.Common.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
<ItemGroup>
99
<PackageReference Include="FluentAssertions.Reactive" Version="0.2.0" />
10-
<PackageReference Include="GraphQL" Version="7.4.1" />
11-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
10+
<PackageReference Include="GraphQL" Version="7.6.1" />
11+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎tests/GraphQL.Integration.Tests/GraphQL.Integration.Tests.csproj

+11-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.5" />
11-
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
10+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
11+
<PackageReference Include="Microsoft.Reactive.Testing" Version="6.0.0" />
1212
</ItemGroup>
1313

1414
<ItemGroup>
@@ -18,4 +18,13 @@
1818
<ProjectReference Include="..\IntegrationTestServer\IntegrationTestServer.csproj" />
1919
</ItemGroup>
2020

21+
<ItemGroup>
22+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" />
23+
<PackageReference Update="xunit" Version="2.6.2" />
24+
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.4">
25+
<PrivateAssets>all</PrivateAssets>
26+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27+
</PackageReference>
28+
</ItemGroup>
29+
2130
</Project>

‎tests/GraphQL.Integration.Tests/QueryAndMutationTests/Base.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Net;
2-
using System.Net.Http.Headers;
32
using FluentAssertions;
43
using GraphQL.Client.Abstractions;
54
using GraphQL.Client.Http;
@@ -185,7 +184,7 @@ query Long {
185184
// unblock the query
186185
chatQuery.LongRunningQueryBlocker.Set();
187186
// check execution time
188-
request.Invoke().Result.Data.longRunning.Should().Be("finally returned");
187+
(await request.Invoke()).Data.longRunning.Should().Be("finally returned");
189188

190189
// reset stuff
191190
chatQuery.LongRunningQueryBlocker.Reset();

‎tests/GraphQL.Integration.Tests/UriExtensionTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ public void HasWebSocketSchemaTest(string url, bool result)
3030
[InlineData("ftp://this-url-cannot-be-converted.net", false, null)]
3131
// AppSync example
3232
[InlineData("wss://example1234567890000.appsync-realtime-api.us-west-2.amazonaws.com/graphql?header=123456789ABCDEF&payload=e30=", true, "wss://example1234567890000.appsync-realtime-api.us-west-2.amazonaws.com/graphql?header=123456789ABCDEF&payload=e30=")]
33-
public void GetWebSocketUriTest(string input, bool canConvert, string result)
33+
public void GetWebSocketUriTest(string input, bool canConvert, string? result)
3434
{
3535
var inputUri = new Uri(input);
3636
if (canConvert)
3737
{
38-
inputUri.GetWebSocketUri().Should().BeEquivalentTo(new Uri(result));
38+
inputUri.GetWebSocketUri().Should().BeEquivalentTo(new Uri(result!));
3939
}
4040
else
4141
{

‎tests/GraphQL.Integration.Tests/UserAgentHeaderTests.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public UserAgentHeaderTests(SystemTextJsonAutoNegotiateServerTestFixture fixture
1717
Fixture = fixture;
1818
}
1919

20-
public async Task InitializeAsync() => await Fixture.CreateServer().ConfigureAwait(false);
20+
public async Task InitializeAsync() => await Fixture.CreateServer();
2121

2222
public Task DisposeAsync()
2323
{
@@ -32,7 +32,7 @@ public async void Can_set_custom_user_agent()
3232
ChatClient = Fixture.GetChatClient(options => options.DefaultUserAgentRequestHeader = ProductInfoHeaderValue.Parse(userAgent));
3333

3434
var graphQLRequest = new GraphQLRequest("query clientUserAgent { clientUserAgent }");
35-
var response = await ChatClient.SendQueryAsync(graphQLRequest, () => new { clientUserAgent = string.Empty }).ConfigureAwait(false);
35+
var response = await ChatClient.SendQueryAsync(graphQLRequest, () => new { clientUserAgent = string.Empty });
3636

3737
response.Errors.Should().BeNull();
3838
response.Data.clientUserAgent.Should().Be(userAgent);
@@ -48,7 +48,7 @@ public async void Default_user_agent_is_set_as_expected()
4848
ChatClient = Fixture.GetChatClient();
4949

5050
var graphQLRequest = new GraphQLRequest("query clientUserAgent { clientUserAgent }");
51-
var response = await ChatClient.SendQueryAsync(graphQLRequest, () => new { clientUserAgent = string.Empty }).ConfigureAwait(false);
51+
var response = await ChatClient.SendQueryAsync(graphQLRequest, () => new { clientUserAgent = string.Empty });
5252

5353
response.Errors.Should().BeNull();
5454
response.Data.clientUserAgent.Should().Be(expectedUserAgent);
@@ -60,7 +60,7 @@ public async void No_Default_user_agent_if_set_to_null()
6060
ChatClient = Fixture.GetChatClient(options => options.DefaultUserAgentRequestHeader = null);
6161

6262
var graphQLRequest = new GraphQLRequest("query clientUserAgent { clientUserAgent }");
63-
var response = await ChatClient.SendQueryAsync(graphQLRequest, () => new { clientUserAgent = string.Empty }).ConfigureAwait(false);
63+
var response = await ChatClient.SendQueryAsync(graphQLRequest, () => new { clientUserAgent = string.Empty });
6464

6565
response.Errors.Should().HaveCount(1);
6666
response.Errors[0].Message.Should().Be("user agent header not set");

‎tests/GraphQL.Integration.Tests/WebsocketTests/Base.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ query Long {
121121
// unblock the query
122122
chatQuery.LongRunningQueryBlocker.Set();
123123
// check execution time
124-
request.Invoke().Result.Data.longRunning.Should().Be("finally returned");
124+
(await request.Invoke()).Data.longRunning.Should().Be("finally returned");
125125

126126
// reset stuff
127127
chatQuery.LongRunningQueryBlocker.Reset();

‎tests/GraphQL.Integration.Tests/WebsocketTests/SystemTextJsonAutoNegotiate.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public SystemTextJsonAutoNegotiate(ITestOutputHelper output, SystemTextJsonAutoN
1515
[Fact]
1616
public async Task WebSocketProtocolIsAutoNegotiated()
1717
{
18-
await ChatClient.InitializeWebsocketConnection().ConfigureAwait(false);
18+
await ChatClient.InitializeWebsocketConnection();
1919
ChatClient.WebSocketSubProtocol.Should().Be(WebSocketProtocols.GRAPHQL_TRANSPORT_WS);
2020
}
2121
}

‎tests/GraphQL.Integration.Tests/WebsocketTests/SystemTextJsonGraphQLTransportWs.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ public SystemTextJsonGraphQLTransportWs(ITestOutputHelper output, SystemTextJson
1515
[Fact]
1616
public async void Sending_a_pong_message_should_not_throw()
1717
{
18-
await ChatClient.InitializeWebsocketConnection().ConfigureAwait(false);
18+
await ChatClient.InitializeWebsocketConnection();
1919

20-
await ChatClient.Awaiting(client => client.SendPongAsync(null)).Should().NotThrowAsync().ConfigureAwait(false);
21-
await ChatClient.Awaiting(client => client.SendPongAsync("some payload")).Should().NotThrowAsync().ConfigureAwait(false);
20+
await ChatClient.Awaiting(client => client.SendPongAsync(null)).Should().NotThrowAsync();
21+
await ChatClient.Awaiting(client => client.SendPongAsync("some payload")).Should().NotThrowAsync();
2222
}
2323

2424
[Fact]
2525
public async void Sending_a_ping_message_should_result_in_a_pong_message_from_the_server()
2626
{
27-
await ChatClient.InitializeWebsocketConnection().ConfigureAwait(false);
27+
await ChatClient.InitializeWebsocketConnection();
2828

2929
using var pongObserver = ChatClient.PongStream.Observe();
3030

31-
await ChatClient.Awaiting(client => client.SendPingAsync(null)).Should().NotThrowAsync().ConfigureAwait(false);
31+
await ChatClient.Awaiting(client => client.SendPingAsync(null)).Should().NotThrowAsync();
3232

33-
await pongObserver.Should().PushAsync(1, TimeSpan.FromSeconds(1), "because the server was pinged by the client").ConfigureAwait(false);
33+
await pongObserver.Should().PushAsync(1, TimeSpan.FromSeconds(1), "because the server was pinged by the client");
3434
}
3535
}

‎tests/GraphQL.Integration.Tests/WebsocketTests/SystemTextJsonGraphQLWs.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,25 @@ public SystemTextJsonGraphQLWs(ITestOutputHelper output, SystemTextJsonGraphQLWs
1414
[Fact]
1515
public async void Sending_a_ping_message_should_throw_not_supported_exception()
1616
{
17-
await ChatClient.InitializeWebsocketConnection().ConfigureAwait(false);
17+
await ChatClient.InitializeWebsocketConnection();
1818

1919
await ChatClient.Awaiting(client => client.SendPingAsync(null))
20-
.Should().ThrowAsync<NotSupportedException>().ConfigureAwait(false);
20+
.Should().ThrowAsync<NotSupportedException>();
2121
}
2222

2323
[Fact]
2424
public async void Sending_a_pong_message_should_throw_not_supported_exception()
2525
{
26-
await ChatClient.InitializeWebsocketConnection().ConfigureAwait(false);
26+
await ChatClient.InitializeWebsocketConnection();
2727

2828
await ChatClient.Awaiting(client => client.SendPongAsync(null))
29-
.Should().ThrowAsync<NotSupportedException>().ConfigureAwait(false);
29+
.Should().ThrowAsync<NotSupportedException>();
3030
}
3131

3232
[Fact]
3333
public async void Subscribing_to_the_pong_stream_should_throw_not_supported_exception()
3434
{
35-
await ChatClient.InitializeWebsocketConnection().ConfigureAwait(false);
35+
await ChatClient.InitializeWebsocketConnection();
3636

3737
ChatClient.Invoking(client => client.PongStream.Subscribe())
3838
.Should().Throw<NotSupportedException>();

‎tests/GraphQL.Primitives.Tests/GraphQL.Primitives.Tests.csproj

+9
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,13 @@
1010
<ProjectReference Include="..\..\src\GraphQL.Primitives\GraphQL.Primitives.csproj" />
1111
</ItemGroup>
1212

13+
<ItemGroup>
14+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" />
15+
<PackageReference Update="xunit" Version="2.6.2" />
16+
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.4">
17+
<PrivateAssets>all</PrivateAssets>
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19+
</PackageReference>
20+
</ItemGroup>
21+
1322
</Project>

‎tests/GraphQL.Primitives.Tests/GraphQLRequestTest.cs

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using FluentAssertions;
12
using Xunit;
23

34
namespace GraphQL.Primitives.Tests;
@@ -26,23 +27,23 @@ public void ConstructorExtendedFact()
2627
public void Equality1Fact()
2728
{
2829
var graphQLRequest = new GraphQLRequest("{hero{name}}");
29-
Assert.Equal(graphQLRequest, graphQLRequest);
30+
graphQLRequest.Equals(graphQLRequest).Should().BeTrue();
3031
}
3132

3233
[Fact]
3334
public void Equality2Fact()
3435
{
3536
var graphQLRequest1 = new GraphQLRequest("{hero{name}}");
3637
var graphQLRequest2 = new GraphQLRequest("{hero{name}}");
37-
Assert.Equal(graphQLRequest1, graphQLRequest2);
38+
graphQLRequest1.Equals(graphQLRequest2).Should().BeTrue();
3839
}
3940

4041
[Fact]
4142
public void Equality3Fact()
4243
{
4344
var graphQLRequest1 = new GraphQLRequest("{hero{name}}", new { varName = "varValue" }, "operationName");
4445
var graphQLRequest2 = new GraphQLRequest("{hero{name}}", new { varName = "varValue" }, "operationName");
45-
Assert.Equal(graphQLRequest1, graphQLRequest2);
46+
graphQLRequest1.Equals(graphQLRequest2).Should().BeTrue();
4647
}
4748

4849
[Fact]
@@ -66,15 +67,15 @@ public void InEquality1Fact()
6667
{
6768
var graphQLRequest1 = new GraphQLRequest("{hero{name1}}");
6869
var graphQLRequest2 = new GraphQLRequest("{hero{name2}}");
69-
Assert.NotEqual(graphQLRequest1, graphQLRequest2);
70+
graphQLRequest1.Equals(graphQLRequest2).Should().BeFalse();
7071
}
7172

7273
[Fact]
7374
public void InEquality2Fact()
7475
{
7576
var graphQLRequest1 = new GraphQLRequest("{hero{name}}", new { varName = "varValue1" }, "operationName");
7677
var graphQLRequest2 = new GraphQLRequest("{hero{name}}", new { varName = "varValue2" }, "operationName");
77-
Assert.NotEqual(graphQLRequest1, graphQLRequest2);
78+
graphQLRequest1.Equals(graphQLRequest2).Should().BeFalse();
7879
}
7980

8081
[Fact]

‎tests/GraphQL.Server.Test/GraphQL.Server.Test.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="GraphQL.MicrosoftDI" Version="7.4.1" />
10-
<PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="7.4.0" />
11-
<PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="7.4.0" />
9+
<PackageReference Include="GraphQL.MicrosoftDI" Version="7.6.1" />
10+
<PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="7.6.0" />
11+
<PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="7.6.0" />
1212
</ItemGroup>
1313

1414
</Project>

‎tests/IntegrationTestServer/IntegrationTestServer.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="GraphQL.Server.All" Version="7.4.0" />
15-
<PackageReference Include="System.Reactive" Version="5.0.0" />
16-
<PackageReference Include="System.Reactive.Compatibility" Version="5.0.0" />
14+
<PackageReference Include="GraphQL.Server.All" Version="7.6.0" />
15+
<PackageReference Include="System.Reactive" Version="6.0.0" />
16+
<PackageReference Include="System.Reactive.Compatibility" Version="6.0.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

0 commit comments

Comments
 (0)