Fix warnings and upgrade dotnet-tools

Author: dnperfors

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "nbgv": {
-      "version": "3.7.115",
+      "version": "3.9.50",
       "commands": [
         "nbgv"
       ],

.editorconfig

@@ -94,3 +94,6 @@ dotnet_style_namespace_match_folder = true
 
 # CA1303: Do not pass literals as localized parameters
 dotnet_diagnostic.CA1303.severity = silent
+
+# IDE0060: Remove unused parameter
+dotnet_diagnostic.IDE0060.severity = silent

src/TestableHttpClient/IHttpRequestMessagesCheck.cs

@@ -8,15 +8,15 @@ public interface IHttpRequestMessagesCheck
     /// <summary>
     /// Options that could be used by several asserters.
     /// </summary>
-    TestableHttpMessageHandlerOptions Options { get; }
+    public TestableHttpMessageHandlerOptions Options { get; }
 
     /// <summary>
     /// Asserts whether requests comply with a specific filter.
     /// </summary>
     /// <param name="requestFilter">The filter to filter requests with before asserting.</param>
     /// <param name="condition">The name of the condition, used in the exception message.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    IHttpRequestMessagesCheck WithFilter(Func<HttpRequestMessage, bool> requestFilter, string condition);
+    public IHttpRequestMessagesCheck WithFilter(Func<HttpRequestMessage, bool> requestFilter, string condition);
 
     /// <summary>
     /// Asserts whether requests comply with a specific filter.
@@ -25,7 +25,7 @@ public interface IHttpRequestMessagesCheck
     /// <param name="expectedNumberOfRequests">The expected number of requests.</param>
     /// <param name="condition">The name of the condition, used in the exception message.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    IHttpRequestMessagesCheck WithFilter(Func<HttpRequestMessage, bool> requestFilter, int expectedNumberOfRequests, string condition);
+    public IHttpRequestMessagesCheck WithFilter(Func<HttpRequestMessage, bool> requestFilter, int expectedNumberOfRequests, string condition);
 
     /// <summary>
     /// Asserts whether requests comply with a specific filter.
@@ -34,5 +34,5 @@ public interface IHttpRequestMessagesCheck
     /// <param name="expectedNumberOfRequests">The expected number of requests, when null is passed "at least one" is presumed.</param>
     /// <param name="condition">The name of the condition, used in the exception message.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
-    IHttpRequestMessagesCheck WithFilter(Func<HttpRequestMessage, bool> requestFilter, int? expectedNumberOfRequests, string condition);
+    public IHttpRequestMessagesCheck WithFilter(Func<HttpRequestMessage, bool> requestFilter, int? expectedNumberOfRequests, string condition);
 }

src/TestableHttpClient/IResponse.cs

@@ -11,5 +11,5 @@ public interface IResponse
     /// <param name="context">The context for this request.</param>
     /// <param name="cancellationToken">The cancellationToken.</param>
     /// <returns></returns>
-    Task ExecuteAsync(HttpResponseContext context, CancellationToken cancellationToken);
+    public Task ExecuteAsync(HttpResponseContext context, CancellationToken cancellationToken);
 }

src/TestableHttpClient/IRoutingResponseBuilder.cs

@@ -11,10 +11,10 @@ public interface IRoutingResponseBuilder
     /// <param name="route">The route pattern.</param>
     /// <param name="response">The response the route should return.</param>
     /// <example>x.Map("*", Responses.StatusCode(HttpStatusCode.OK))</example>
-    void Map(string route, IResponse response);
+    public void Map(string route, IResponse response);
     /// <summary>
     /// Maps a custom response for when a request didn't match any route. Defaults to Responses.StatusCode(HttpStatusCode.NotFound).
     /// </summary>
     /// <param name="fallBackResponse">The response that should be returned when no route matches.</param>
-    void MapFallBackResponse(IResponse fallBackResponse);
+    public void MapFallBackResponse(IResponse fallBackResponse);
 }

src/TestableHttpClient/Response/RoutingResponse.cs

@@ -2,6 +2,7 @@
 using static TestableHttpClient.Responses;
 
 namespace TestableHttpClient.Response;
+
 internal sealed class RoutingResponse : IResponse
 {
     public Task ExecuteAsync(HttpResponseContext context, CancellationToken cancellationToken)

src/TestableHttpClient/TestableHttpClient.csproj

@@ -32,7 +32,6 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Text.Json" Version="4.7.2" />
     <PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
     <PackageReference Include="Perfors.UnreachableException" Version="1.0.0" />

test/TestableHttpClient.IntegrationTests/CustomizeJsonSerialization.cs

@@ -14,7 +14,11 @@ public async Task ByDefault_CamelCasing_is_used_for_json_serialization()
         sut.RespondWith(Json(new { Name = "Charlie" }));
         using HttpClient client = sut.CreateClient();
 
+#if NETFRAMEWORK
         string json = await client.GetStringAsync("http://localhost/myjson");
+#else
+        string json = await client.GetStringAsync("http://localhost/myjson", TestContext.Current.CancellationToken);
+#endif
 
         Assert.Equal("{\"name\":\"Charlie\"}", json);
     }
@@ -27,7 +31,11 @@ public async Task But_this_can_be_changed()
         sut.RespondWith(Json(new { Name = "Charlie" }));
         using HttpClient client = sut.CreateClient();
 
+#if NETFRAMEWORK
         string json = await client.GetStringAsync("http://localhost/myjson");
+#else
+        string json = await client.GetStringAsync("http://localhost/myjson", TestContext.Current.CancellationToken);
+#endif
 
         Assert.Equal("{\"Name\":\"Charlie\"}", json);
     }
@@ -39,7 +47,11 @@ public async Task But_Also_directly_on_the_response()
         sut.RespondWith(Json(new { Name = "Charlie" }, jsonSerializerOptions: new JsonSerializerOptions()));
         using HttpClient client = sut.CreateClient();
 
+#if NETFRAMEWORK
         string json = await client.GetStringAsync("http://localhost/myjson");
+#else
+        string json = await client.GetStringAsync("http://localhost/myjson", TestContext.Current.CancellationToken);
+#endif
 
         Assert.Equal("{\"Name\":\"Charlie\"}", json);
     }

test/TestableHttpClient.Tests/Response/ResponseTestHelpers.cs

@@ -3,17 +3,17 @@
 internal static class ResponseTestHelpers
 {
     public static Task<HttpResponseMessage> TestAsync(this IResponse response) => TestAsync(response, "http://httpbin.org");
-    public static Task<HttpResponseMessage> TestAsync(this IResponse response, string url)
+    public static async Task<HttpResponseMessage> TestAsync(this IResponse response, string url)
     {
         using TestableHttpMessageHandler handler = new();
         handler.RespondWith(response);
-        return handler.TestAsync(url);
+        return await handler.TestAsync(url);
     }
 
     public static Task<HttpResponseMessage> TestAsync(this TestableHttpMessageHandler handler) => TestAsync(handler, "http://httpbin.org");
-    public static Task<HttpResponseMessage> TestAsync(this TestableHttpMessageHandler handler, string url)
+    public static async Task<HttpResponseMessage> TestAsync(this TestableHttpMessageHandler handler, string url)
     {
         using HttpClient client = new(handler);
-        return client.GetAsync(url);
+        return await client.GetAsync(url);
     }
 }

test/TestableHttpClient.Tests/Utils/UriPatternParserTests.cs

@@ -1,6 +1,7 @@
 using TestableHttpClient.Utils;
 
 namespace TestableHttpClient.Tests.Utils;
+
 public class UriPatternParserTests
 {
     [Theory]