.NET 8 support

Closes #241

Author: dnperfors

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-sonarscanner": {
-      "version": "5.13.1",
+      "version": "5.14.0",
       "commands": [
         "dotnet-sonarscanner"
       ]

.github/workflows/ci.yml

@@ -27,7 +27,9 @@ jobs:
       with:
         dotnet-version: |
           6.0.x
-          7.0.103
+          7.0.x
+          8.0.x
+        include-prerelease: true
     - name: Dump .NET info
       run: dotnet --info
     - name: Restore dotnet tools
@@ -77,7 +79,9 @@ jobs:
       with:
         dotnet-version: |
           6.0.x
-          7.0.306
+          7.0.x
+          8.0.x
+        include-prerelease: true
     - name: Dump .NET info
       run: dotnet --info
     - name: Restore dependencies
@@ -98,7 +102,8 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: |
-          7.0.x
+          8.0.x
+        include-prerelease: true
     - uses: actions/download-artifact@v2
       with:
         name: artifacts

.github/workflows/codeql.yml

@@ -28,6 +28,8 @@ jobs:
         dotnet-version: |
           6.0.x
           7.0.x
+          8.0.x
+        include-prerelease: true
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:

CHANGELOG.md

@@ -9,8 +9,13 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - `ShouldHaveMadeRequestsTo(this TestableHttpMessageHandler, string, bool)` and `ShouldHaveMadeRequestsTo(this TestableHttpMessageHandler, string, bool, int)` have been removed. CaseInsensitivity is controlled by the `UriPatternMatchingOptions` that can be set on the `TestableHttpMessageHandler`.
 - `WithRequestUri(this IHttpRequestMessagesCheck, string, bool)` and `WithRequestUri(this IHttpRequestMessagesCheck, string, bool, int)` have been removed. CaseInsensitivity is controlled by the `UriPatternMatchingOptions` that can be set on the `TestableHttpMessageHandler`.
 - `WithQueryString` has been removed, since `ShouldHaveMadeRequestTo` and `WithRequestUri` now properly support querystrings.
+
+### Changed
 - Replaced Moq with NSubstitute in test project because of the SponsorLink dependencies.
 
+### Added
+- Support for .NET 8
+
 ## [0.10] - 2022-12-03
 ### Deprecated
 - `ShouldHaveMadeRequestsTo(this TestableHttpMessageHandler, string, bool)` and `ShouldHaveMadeRequestsTo(this TestableHttpMessageHandler, string, bool, int)` have been deprecated. CaseInsensitivity is controlled by the `UriPatternMatchingOptions` that can be set on the `TestableHttpMessageHandler`.

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>

README.md

@@ -84,6 +84,7 @@ The following versions are being actively tested and thus supported:
 - .NET Framework 4.6, 4.7 and 4.8
 - .NET 6.0
 - .NET 7.0
+- .NET 8.0
 
 These versions are supported as long as Microsoft supports them, we do our best to test and support newer versions as soon as possible.
 

global.json

@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "7.0.100",
-    "allowPrerelease": false,
+    "version": "8.0.100-rc.1",
+    "allowPrerelease": true,
     "rollForward": "latestMajor"
   }
 }

src/TestableHttpClient/HttpRequestMessageAsserter.cs

@@ -47,7 +47,7 @@ private void Assert(int? expectedCount = null)
     /// 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 conditon, used in the exception message.</param>
+    /// <param name="condition">The name of the condition, used in the exception message.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
     [AssertionMethod]
     public IHttpRequestMessagesCheck WithFilter(Func<HttpRequestMessage, bool> requestFilter, string condition) => WithFilter(requestFilter, null, condition);
@@ -56,7 +56,7 @@ private void Assert(int? expectedCount = null)
     /// 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 conditon, used in the exception message.</param>
+    /// <param name="condition">The name of the condition, used in the exception message.</param>
     /// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
     [AssertionMethod]
     public IHttpRequestMessagesCheck WithFilter(Func<HttpRequestMessage, bool> requestFilter, int expectedNumberOfRequests, string condition) => WithFilter(requestFilter, (int?)expectedNumberOfRequests, condition);

src/TestableHttpClient/HttpRequestMessageExtensions.cs

@@ -13,15 +13,8 @@ internal static class HttpRequestMessageExtensions
     /// <returns>true when the HttpVersion matches; otherwise, false.</returns>
     internal static bool HasHttpVersion(this HttpRequestMessage httpRequestMessage, Version httpVersion)
     {
-        if (httpRequestMessage == null)
-        {
-            throw new ArgumentNullException(nameof(httpRequestMessage));
-        }
-
-        if (httpVersion == null)
-        {
-            throw new ArgumentNullException(nameof(httpVersion));
-        }
+        Guard.ThrowIfNull(httpRequestMessage);
+        Guard.ThrowIfNull(httpVersion);
 
         return httpRequestMessage.Version == httpVersion;
     }
@@ -34,15 +27,8 @@ internal static bool HasHttpVersion(this HttpRequestMessage httpRequestMessage,
     /// <returns>true when the HttpVersion matches; otherwise, false.</returns>
     internal static bool HasHttpVersion(this HttpRequestMessage httpRequestMessage, string httpVersion)
     {
-        if (httpRequestMessage == null)
-        {
-            throw new ArgumentNullException(nameof(httpRequestMessage));
-        }
-
-        if (string.IsNullOrEmpty(httpVersion))
-        {
-            throw new ArgumentNullException(nameof(httpVersion));
-        }
+        Guard.ThrowIfNull(httpRequestMessage);
+        Guard.ThrowIfNullOrEmpty(httpVersion);
 
         return httpRequestMessage.HasHttpVersion(new Version(httpVersion));
     }
@@ -55,15 +41,8 @@ internal static bool HasHttpVersion(this HttpRequestMessage httpRequestMessage,
     /// <returns>true when the HttpMethod matches; otherwise, false.</returns>
     internal static bool HasHttpMethod(this HttpRequestMessage httpRequestMessage, HttpMethod httpMethod)
     {
-        if (httpRequestMessage == null)
-        {
-            throw new ArgumentNullException(nameof(httpRequestMessage));
-        }
-
-        if (httpMethod == null)
-        {
-            throw new ArgumentNullException(nameof(httpMethod));
-        }
+        Guard.ThrowIfNull(httpRequestMessage);
+        Guard.ThrowIfNull(httpMethod);
 
         return httpRequestMessage.Method == httpMethod;
     }
@@ -76,15 +55,8 @@ internal static bool HasHttpMethod(this HttpRequestMessage httpRequestMessage, H
     /// <returns>true when the HttpMethod matches; otherwise, false.</returns>
     internal static bool HasHttpMethod(this HttpRequestMessage httpRequestMessage, string httpMethod)
     {
-        if (httpRequestMessage == null)
-        {
-            throw new ArgumentNullException(nameof(httpRequestMessage));
-        }
-
-        if (string.IsNullOrEmpty(httpMethod))
-        {
-            throw new ArgumentNullException(nameof(httpMethod));
-        }
+        Guard.ThrowIfNull(httpRequestMessage);
+        Guard.ThrowIfNullOrEmpty(httpMethod);
 
         return httpRequestMessage.HasHttpMethod(new HttpMethod(httpMethod));
     }
@@ -98,15 +70,8 @@ internal static bool HasHttpMethod(this HttpRequestMessage httpRequestMessage, s
     /// <returns>true when the request contains a header with the specified name; otherwise, false.</returns>
     internal static bool HasRequestHeader(this HttpRequestMessage httpRequestMessage, string headerName)
     {
-        if (httpRequestMessage == null)
-        {
-            throw new ArgumentNullException(nameof(httpRequestMessage));
-        }
-
-        if (string.IsNullOrEmpty(headerName))
-        {
-            throw new ArgumentNullException(nameof(headerName));
-        }
+        Guard.ThrowIfNull(httpRequestMessage);
+        Guard.ThrowIfNullOrEmpty(headerName);
 
         return httpRequestMessage.Headers.HasHeader(headerName);
     }
@@ -121,20 +86,9 @@ internal static bool HasRequestHeader(this HttpRequestMessage httpRequestMessage
     /// <returns>true when the request contains a header with the specified name and value; otherwise, false.</returns>
     internal static bool HasRequestHeader(this HttpRequestMessage httpRequestMessage, string headerName, string headerValue)
     {
-        if (httpRequestMessage == null)
-        {
-            throw new ArgumentNullException(nameof(httpRequestMessage));
-        }
-
-        if (string.IsNullOrEmpty(headerName))
-        {
-            throw new ArgumentNullException(nameof(headerName));
-        }
-
-        if (string.IsNullOrEmpty(headerValue))
-        {
-            throw new ArgumentNullException(nameof(headerValue));
-        }
+        Guard.ThrowIfNull(httpRequestMessage);
+        Guard.ThrowIfNullOrEmpty(headerName);
+        Guard.ThrowIfNullOrEmpty(headerValue);
 
         return httpRequestMessage.Headers.HasHeader(headerName, headerValue);
     }
@@ -148,15 +102,8 @@ internal static bool HasRequestHeader(this HttpRequestMessage httpRequestMessage
     /// <returns>true when the request contains a header with the specified name; otherwise, false.</returns>
     internal static bool HasContentHeader(this HttpRequestMessage httpRequestMessage, string headerName)
     {
-        if (httpRequestMessage == null)
-        {
-            throw new ArgumentNullException(nameof(httpRequestMessage));
-        }
-
-        if (string.IsNullOrEmpty(headerName))
-        {
-            throw new ArgumentNullException(nameof(headerName));
-        }
+        Guard.ThrowIfNull(httpRequestMessage);
+        Guard.ThrowIfNullOrEmpty(headerName);
 
         if (httpRequestMessage.Content == null)
         {
@@ -176,20 +123,9 @@ internal static bool HasContentHeader(this HttpRequestMessage httpRequestMessage
     /// <returns>true when the request contains a header with the specified name and value; otherwise, false.</returns>
     internal static bool HasContentHeader(this HttpRequestMessage httpRequestMessage, string headerName, string headerValue)
     {
-        if (httpRequestMessage == null)
-        {
-            throw new ArgumentNullException(nameof(httpRequestMessage));
-        }
-
-        if (string.IsNullOrEmpty(headerName))
-        {
-            throw new ArgumentNullException(nameof(headerName));
-        }
-
-        if (string.IsNullOrEmpty(headerValue))
-        {
-            throw new ArgumentNullException(nameof(headerValue));
-        }
+        Guard.ThrowIfNull(httpRequestMessage);
+        Guard.ThrowIfNullOrEmpty(headerName);
+        Guard.ThrowIfNullOrEmpty(headerValue);
 
         if (httpRequestMessage.Content == null)
         {
@@ -206,10 +142,7 @@ internal static bool HasContentHeader(this HttpRequestMessage httpRequestMessage
     /// <returns>true when the request has content; otherwise, false.</returns>
     internal static bool HasContent(this HttpRequestMessage httpRequestMessage)
     {
-        if (httpRequestMessage == null)
-        {
-            throw new ArgumentNullException(nameof(httpRequestMessage));
-        }
+        Guard.ThrowIfNull(httpRequestMessage);
 
         return httpRequestMessage.Content != null;
     }
@@ -222,15 +155,8 @@ internal static bool HasContent(this HttpRequestMessage httpRequestMessage)
     /// <returns>true when the request content matches the pattern; otherwise, false.</returns>
     internal static bool HasContent(this HttpRequestMessage httpRequestMessage, string pattern)
     {
-        if (httpRequestMessage == null)
-        {
-            throw new ArgumentNullException(nameof(httpRequestMessage));
-        }
-
-        if (pattern == null)
-        {
-            throw new ArgumentNullException(nameof(pattern));
-        }
+        Guard.ThrowIfNull(httpRequestMessage);
+        Guard.ThrowIfNull(pattern);
 
         if (httpRequestMessage.Content == null)
         {