Upgrade dependencies (#603)

rose-a · web-flow · commit fbf37dfff283 · 2023-11-23T10:14:46.000+01:00
* upgrade dependencies

* fix code warnings
diff --git a/src/GraphQL.Client.LocalExecution/GraphQL.Client.LocalExecution.csproj b/src/GraphQL.Client.LocalExecution/GraphQL.Client.LocalExecution.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL.MicrosoftDI" Version="7.4.1" />
-    <PackageReference Include="System.Reactive" Version="5.0.0" />
+    <PackageReference Include="GraphQL.MicrosoftDI" Version="7.6.1" />
+    <PackageReference Include="System.Reactive" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/GraphQL.Client.Serializer.SystemTextJson/GraphQL.Client.Serializer.SystemTextJson.csproj b/src/GraphQL.Client.Serializer.SystemTextJson/GraphQL.Client.Serializer.SystemTextJson.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="System.Text.Json" Version="4.7.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/GraphQL.Client.Serializer.SystemTextJson/ImmutableConverter.cs b/src/GraphQL.Client.Serializer.SystemTextJson/ImmutableConverter.cs
@@ -95,7 +95,10 @@ public override void Write(Utf8JsonWriter writer, object value, JsonSerializerOp
             DefaultBufferSize = options.DefaultBufferSize,
             DictionaryKeyPolicy = options.DictionaryKeyPolicy,
             Encoder = options.Encoder,
+#pragma warning disable SYSLIB0020
+            // obsolete warning disabled to keep compatibility until deprecated field is removed
             IgnoreNullValues = options.IgnoreNullValues,
+#pragma warning restore SYSLIB0020
             IgnoreReadOnlyProperties = options.IgnoreReadOnlyProperties,
             MaxDepth = options.MaxDepth,
             PropertyNameCaseInsensitive = options.PropertyNameCaseInsensitive,
diff --git a/src/GraphQL.Client/GraphQL.Client.csproj b/src/GraphQL.Client/GraphQL.Client.csproj
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
-    <PackageReference Include="System.Reactive" Version="5.0.0" />
+    <PackageReference Include="System.Reactive" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461'">
diff --git a/tests/GraphQL.Client.Serializer.Tests/BaseSerializerTest.cs b/tests/GraphQL.Client.Serializer.Tests/BaseSerializerTest.cs
@@ -199,7 +199,8 @@ public async Task CanDeserializeObjectWithBothConstructorAndProperties()
         var contentStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(jsonString));
 
         // Act
-        var result = await ClientSerializer.DeserializeFromUtf8StreamAsync<WithConstructorAndProperties>(contentStream, default).ConfigureAwait(false);
+        var result = await ClientSerializer
+            .DeserializeFromUtf8StreamAsync<WithConstructorAndProperties>(contentStream, default);
 
         // Assert
         result.Data.Property1.Should().Be("value1");
diff --git a/tests/GraphQL.Client.Serializer.Tests/GraphQL.Client.Serializer.Tests.csproj b/tests/GraphQL.Client.Serializer.Tests/GraphQL.Client.Serializer.Tests.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL.NewtonsoftJson" Version="7.4.1" />
-    <PackageReference Include="GraphQL.SystemTextJson" Version="7.4.1" />
+    <PackageReference Include="GraphQL.NewtonsoftJson" Version="7.6.1" />
+    <PackageReference Include="GraphQL.SystemTextJson" Version="7.6.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -19,4 +19,13 @@
     <ProjectReference Include="..\GraphQL.Client.Tests.Common\GraphQL.Client.Tests.Common.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Update="xunit" Version="2.6.2" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.5.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/tests/GraphQL.Client.Tests.Common/GraphQL.Client.Tests.Common.csproj b/tests/GraphQL.Client.Tests.Common/GraphQL.Client.Tests.Common.csproj
@@ -7,8 +7,8 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions.Reactive" Version="0.2.0" />
-    <PackageReference Include="GraphQL" Version="7.4.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="GraphQL" Version="7.6.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/GraphQL.Integration.Tests/GraphQL.Integration.Tests.csproj b/tests/GraphQL.Integration.Tests/GraphQL.Integration.Tests.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Reactive.Testing" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -18,4 +18,13 @@
     <ProjectReference Include="..\IntegrationTestServer\IntegrationTestServer.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Update="xunit" Version="2.6.2" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.5.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/tests/GraphQL.Integration.Tests/QueryAndMutationTests/Base.cs b/tests/GraphQL.Integration.Tests/QueryAndMutationTests/Base.cs
@@ -1,5 +1,4 @@
 using System.Net;
-using System.Net.Http.Headers;
 using FluentAssertions;
 using GraphQL.Client.Abstractions;
 using GraphQL.Client.Http;
@@ -185,7 +184,7 @@ query Long {
         // unblock the query
         chatQuery.LongRunningQueryBlocker.Set();
         // check execution time
-        request.Invoke().Result.Data.longRunning.Should().Be("finally returned");
+        (await request.Invoke()).Data.longRunning.Should().Be("finally returned");
 
         // reset stuff
         chatQuery.LongRunningQueryBlocker.Reset();
diff --git a/tests/GraphQL.Integration.Tests/UriExtensionTests.cs b/tests/GraphQL.Integration.Tests/UriExtensionTests.cs
@@ -30,12 +30,12 @@ public void HasWebSocketSchemaTest(string url, bool result)
     [InlineData("ftp://this-url-cannot-be-converted.net", false, null)]
     // AppSync example
     [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=")]
-    public void GetWebSocketUriTest(string input, bool canConvert, string result)
+    public void GetWebSocketUriTest(string input, bool canConvert, string? result)
     {
         var inputUri = new Uri(input);
         if (canConvert)
         {
-            inputUri.GetWebSocketUri().Should().BeEquivalentTo(new Uri(result));
+            inputUri.GetWebSocketUri().Should().BeEquivalentTo(new Uri(result!));
         }
         else
         {
diff --git a/tests/GraphQL.Integration.Tests/UserAgentHeaderTests.cs b/tests/GraphQL.Integration.Tests/UserAgentHeaderTests.cs
@@ -17,7 +17,7 @@ public UserAgentHeaderTests(SystemTextJsonAutoNegotiateServerTestFixture fixture
         Fixture = fixture;
     }
 
-    public async Task InitializeAsync() => await Fixture.CreateServer().ConfigureAwait(false);
+    public async Task InitializeAsync() => await Fixture.CreateServer();
 
     public Task DisposeAsync()
     {
@@ -32,7 +32,7 @@ public async void Can_set_custom_user_agent()
         ChatClient = Fixture.GetChatClient(options => options.DefaultUserAgentRequestHeader = ProductInfoHeaderValue.Parse(userAgent));
 
         var graphQLRequest = new GraphQLRequest("query clientUserAgent { clientUserAgent }");
-        var response = await ChatClient.SendQueryAsync(graphQLRequest, () => new { clientUserAgent = string.Empty }).ConfigureAwait(false);
+        var response = await ChatClient.SendQueryAsync(graphQLRequest, () => new { clientUserAgent = string.Empty });
 
         response.Errors.Should().BeNull();
         response.Data.clientUserAgent.Should().Be(userAgent);
@@ -48,7 +48,7 @@ public async void Default_user_agent_is_set_as_expected()
         ChatClient = Fixture.GetChatClient();
 
         var graphQLRequest = new GraphQLRequest("query clientUserAgent { clientUserAgent }");
-        var response = await ChatClient.SendQueryAsync(graphQLRequest, () => new { clientUserAgent = string.Empty }).ConfigureAwait(false);
+        var response = await ChatClient.SendQueryAsync(graphQLRequest, () => new { clientUserAgent = string.Empty });
 
         response.Errors.Should().BeNull();
         response.Data.clientUserAgent.Should().Be(expectedUserAgent);
@@ -60,7 +60,7 @@ public async void No_Default_user_agent_if_set_to_null()
         ChatClient = Fixture.GetChatClient(options => options.DefaultUserAgentRequestHeader = null);
 
         var graphQLRequest = new GraphQLRequest("query clientUserAgent { clientUserAgent }");
-        var response = await ChatClient.SendQueryAsync(graphQLRequest, () => new { clientUserAgent = string.Empty }).ConfigureAwait(false);
+        var response = await ChatClient.SendQueryAsync(graphQLRequest, () => new { clientUserAgent = string.Empty });
 
         response.Errors.Should().HaveCount(1);
         response.Errors[0].Message.Should().Be("user agent header not set");
diff --git a/tests/GraphQL.Integration.Tests/WebsocketTests/Base.cs b/tests/GraphQL.Integration.Tests/WebsocketTests/Base.cs
@@ -121,7 +121,7 @@ query Long {
         // unblock the query
         chatQuery.LongRunningQueryBlocker.Set();
         // check execution time
-        request.Invoke().Result.Data.longRunning.Should().Be("finally returned");
+        (await request.Invoke()).Data.longRunning.Should().Be("finally returned");
 
         // reset stuff
         chatQuery.LongRunningQueryBlocker.Reset();
diff --git a/tests/GraphQL.Integration.Tests/WebsocketTests/SystemTextJsonAutoNegotiate.cs b/tests/GraphQL.Integration.Tests/WebsocketTests/SystemTextJsonAutoNegotiate.cs
@@ -15,7 +15,7 @@ public SystemTextJsonAutoNegotiate(ITestOutputHelper output, SystemTextJsonAutoN
     [Fact]
     public async Task WebSocketProtocolIsAutoNegotiated()
     {
-        await ChatClient.InitializeWebsocketConnection().ConfigureAwait(false);
+        await ChatClient.InitializeWebsocketConnection();
         ChatClient.WebSocketSubProtocol.Should().Be(WebSocketProtocols.GRAPHQL_TRANSPORT_WS);
     }
 }
diff --git a/tests/GraphQL.Integration.Tests/WebsocketTests/SystemTextJsonGraphQLTransportWs.cs b/tests/GraphQL.Integration.Tests/WebsocketTests/SystemTextJsonGraphQLTransportWs.cs
@@ -15,21 +15,21 @@ public SystemTextJsonGraphQLTransportWs(ITestOutputHelper output, SystemTextJson
     [Fact]
     public async void Sending_a_pong_message_should_not_throw()
     {
-        await ChatClient.InitializeWebsocketConnection().ConfigureAwait(false);
+        await ChatClient.InitializeWebsocketConnection();
 
-        await ChatClient.Awaiting(client => client.SendPongAsync(null)).Should().NotThrowAsync().ConfigureAwait(false);
-        await ChatClient.Awaiting(client => client.SendPongAsync("some payload")).Should().NotThrowAsync().ConfigureAwait(false);
+        await ChatClient.Awaiting(client => client.SendPongAsync(null)).Should().NotThrowAsync();
+        await ChatClient.Awaiting(client => client.SendPongAsync("some payload")).Should().NotThrowAsync();
     }
 
     [Fact]
     public async void Sending_a_ping_message_should_result_in_a_pong_message_from_the_server()
     {
-        await ChatClient.InitializeWebsocketConnection().ConfigureAwait(false);
+        await ChatClient.InitializeWebsocketConnection();
 
         using var pongObserver = ChatClient.PongStream.Observe();
 
-        await ChatClient.Awaiting(client => client.SendPingAsync(null)).Should().NotThrowAsync().ConfigureAwait(false);
+        await ChatClient.Awaiting(client => client.SendPingAsync(null)).Should().NotThrowAsync();
 
-        await pongObserver.Should().PushAsync(1, TimeSpan.FromSeconds(1), "because the server was pinged by the client").ConfigureAwait(false);
+        await pongObserver.Should().PushAsync(1, TimeSpan.FromSeconds(1), "because the server was pinged by the client");
     }
 }
diff --git a/tests/GraphQL.Integration.Tests/WebsocketTests/SystemTextJsonGraphQLWs.cs b/tests/GraphQL.Integration.Tests/WebsocketTests/SystemTextJsonGraphQLWs.cs
@@ -14,25 +14,25 @@ public SystemTextJsonGraphQLWs(ITestOutputHelper output, SystemTextJsonGraphQLWs
     [Fact]
     public async void Sending_a_ping_message_should_throw_not_supported_exception()
     {
-        await ChatClient.InitializeWebsocketConnection().ConfigureAwait(false);
+        await ChatClient.InitializeWebsocketConnection();
 
         await ChatClient.Awaiting(client => client.SendPingAsync(null))
-            .Should().ThrowAsync<NotSupportedException>().ConfigureAwait(false);
+            .Should().ThrowAsync<NotSupportedException>();
     }
 
     [Fact]
     public async void Sending_a_pong_message_should_throw_not_supported_exception()
     {
-        await ChatClient.InitializeWebsocketConnection().ConfigureAwait(false);
+        await ChatClient.InitializeWebsocketConnection();
 
         await ChatClient.Awaiting(client => client.SendPongAsync(null))
-            .Should().ThrowAsync<NotSupportedException>().ConfigureAwait(false);
+            .Should().ThrowAsync<NotSupportedException>();
     }
 
     [Fact]
     public async void Subscribing_to_the_pong_stream_should_throw_not_supported_exception()
     {
-        await ChatClient.InitializeWebsocketConnection().ConfigureAwait(false);
+        await ChatClient.InitializeWebsocketConnection();
 
         ChatClient.Invoking(client => client.PongStream.Subscribe())
             .Should().Throw<NotSupportedException>();
diff --git a/tests/GraphQL.Primitives.Tests/GraphQL.Primitives.Tests.csproj b/tests/GraphQL.Primitives.Tests/GraphQL.Primitives.Tests.csproj
@@ -10,4 +10,13 @@
     <ProjectReference Include="..\..\src\GraphQL.Primitives\GraphQL.Primitives.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Update="xunit" Version="2.6.2" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.5.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/tests/GraphQL.Primitives.Tests/GraphQLRequestTest.cs b/tests/GraphQL.Primitives.Tests/GraphQLRequestTest.cs
@@ -1,3 +1,4 @@
+using FluentAssertions;
 using Xunit;
 
 namespace GraphQL.Primitives.Tests;
@@ -26,23 +27,23 @@ public void ConstructorExtendedFact()
     public void Equality1Fact()
     {
         var graphQLRequest = new GraphQLRequest("{hero{name}}");
-        Assert.Equal(graphQLRequest, graphQLRequest);
+        graphQLRequest.Equals(graphQLRequest).Should().BeTrue();
     }
 
     [Fact]
     public void Equality2Fact()
     {
         var graphQLRequest1 = new GraphQLRequest("{hero{name}}");
         var graphQLRequest2 = new GraphQLRequest("{hero{name}}");
-        Assert.Equal(graphQLRequest1, graphQLRequest2);
+        graphQLRequest1.Equals(graphQLRequest2).Should().BeTrue();
     }
 
     [Fact]
     public void Equality3Fact()
     {
         var graphQLRequest1 = new GraphQLRequest("{hero{name}}", new { varName = "varValue" }, "operationName");
         var graphQLRequest2 = new GraphQLRequest("{hero{name}}", new { varName = "varValue" }, "operationName");
-        Assert.Equal(graphQLRequest1, graphQLRequest2);
+        graphQLRequest1.Equals(graphQLRequest2).Should().BeTrue();
     }
 
     [Fact]
@@ -66,15 +67,15 @@ public void InEquality1Fact()
     {
         var graphQLRequest1 = new GraphQLRequest("{hero{name1}}");
         var graphQLRequest2 = new GraphQLRequest("{hero{name2}}");
-        Assert.NotEqual(graphQLRequest1, graphQLRequest2);
+        graphQLRequest1.Equals(graphQLRequest2).Should().BeFalse();
     }
 
     [Fact]
     public void InEquality2Fact()
     {
         var graphQLRequest1 = new GraphQLRequest("{hero{name}}", new { varName = "varValue1" }, "operationName");
         var graphQLRequest2 = new GraphQLRequest("{hero{name}}", new { varName = "varValue2" }, "operationName");
-        Assert.NotEqual(graphQLRequest1, graphQLRequest2);
+        graphQLRequest1.Equals(graphQLRequest2).Should().BeFalse();
     }
 
     [Fact]
diff --git a/tests/GraphQL.Server.Test/GraphQL.Server.Test.csproj b/tests/GraphQL.Server.Test/GraphQL.Server.Test.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL.MicrosoftDI" Version="7.4.1" />
-    <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="7.4.0" />
-    <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="7.4.0" />
+    <PackageReference Include="GraphQL.MicrosoftDI" Version="7.6.1" />
+    <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="7.6.0" />
+    <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="7.6.0" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/IntegrationTestServer/IntegrationTestServer.csproj b/tests/IntegrationTestServer/IntegrationTestServer.csproj
@@ -11,9 +11,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL.Server.All" Version="7.4.0" />
-    <PackageReference Include="System.Reactive" Version="5.0.0" />
-    <PackageReference Include="System.Reactive.Compatibility" Version="5.0.0" />
+    <PackageReference Include="GraphQL.Server.All" Version="7.6.0" />
+    <PackageReference Include="System.Reactive" Version="6.0.0" />
+    <PackageReference Include="System.Reactive.Compatibility" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -30,12 +30,12 @@ public void HasWebSocketSchemaTest(string url, bool result)`
`30`	`30`	`[InlineData("ftp://this-url-cannot-be-converted.net", false, null)]`
`31`	`31`	`// AppSync example`
`32`	`32`	`[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)`
`34`	`34`	`{`
`35`	`35`	`var inputUri = new Uri(input);`
`36`	`36`	`if (canConvert)`
`37`	`37`	`{`
`38`		`- inputUri.GetWebSocketUri().Should().BeEquivalentTo(new Uri(result));`
	`38`	`+ inputUri.GetWebSocketUri().Should().BeEquivalentTo(new Uri(result!));`
`39`	`39`	`}`
`40`	`40`	`else`
`41`	`41`	`{`