15th release (#13)

* Upgrade .NET version of test projects to 8.0 * Upgrade to newer version of System.Text.Json package * Fix some typos in the documentation --------- Co-authored-by: Kambiz Khojasteh <kambiz.khojasteh@gmail.com>
kampute · Jul 27, 2024 · 796081a · 796081a
1 parent 6f01e83
commit 796081a
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 42 deletions.
diff --git a/src/Kampute.HttpClient.DataContract/Kampute.HttpClient.DataContract.csproj b/src/Kampute.HttpClient.DataContract/Kampute.HttpClient.DataContract.csproj
@@ -5,7 +5,7 @@
     <Title>Kampute.HttpClient.DataContract</Title>
     <Description>This package is an extension package for Kampute.HttpClient, enhancing it to manage application/xml content types, using DataContractSerializer for serialization and deserialization of XML responses and payloads.</Description>
     <Authors>Kambiz Khojasteh</Authors>
-    <Version>2.3.0</Version>
+    <Version>2.3.1</Version>
     <Company>Kampute</Company>
     <Copyright>Copyright (c) 2024 Kampute</Copyright>
     <LangVersion>latest</LangVersion>
@@ -27,7 +27,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="Exists('../../SigningKey.snk')">
-    <SignAssembly >true</SignAssembly>
+    <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../../SigningKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 

diff --git a/src/Kampute.HttpClient.Json/Kampute.HttpClient.Json.csproj b/src/Kampute.HttpClient.Json/Kampute.HttpClient.Json.csproj
@@ -5,7 +5,7 @@
     <Title>Kampute.HttpClient.Json</Title>
     <Description>This package is an extension package for Kampute.HttpClient, enhancing it to manage application/json content types, using System.Text.Json library for serialization and deserialization of JSON responses and payloads.</Description>
     <Authors>Kambiz Khojasteh</Authors>
-    <Version>2.3.0</Version>
+    <Version>2.3.1</Version>
     <Company>Kampute</Company>
     <Copyright>Copyright (c) 2024 Kampute</Copyright>
     <LangVersion>latest</LangVersion>
@@ -27,7 +27,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="Exists('../../SigningKey.snk')">
-    <SignAssembly >true</SignAssembly>
+    <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../../SigningKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
@@ -36,7 +36,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="8.0.3" />
+    <PackageReference Include="System.Text.Json" Version="8.0.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Kampute.HttpClient.NewtonsoftJson/Kampute.HttpClient.NewtonsoftJson.csproj b/src/Kampute.HttpClient.NewtonsoftJson/Kampute.HttpClient.NewtonsoftJson.csproj
@@ -5,7 +5,7 @@
     <Title>Kampute.HttpClient.NewtonsoftJson</Title>
     <Description>This package is an extension package for Kampute.HttpClient, enhancing it to manage application/json content types, using Newtonsoft.Json library for serialization and deserialization of JSON responses and payloads.</Description>
     <Authors>Kambiz Khojasteh</Authors>
-    <Version>2.3.0</Version>
+    <Version>2.3.1</Version>
     <Company>Kampute</Company>
     <Copyright>Copyright (c) 2024 Kampute</Copyright>
     <LangVersion>latest</LangVersion>
@@ -27,7 +27,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="Exists('../../SigningKey.snk')">
-    <SignAssembly >true</SignAssembly>
+    <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../../SigningKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 

diff --git a/src/Kampute.HttpClient.Xml/Kampute.HttpClient.Xml.csproj b/src/Kampute.HttpClient.Xml/Kampute.HttpClient.Xml.csproj
@@ -5,7 +5,7 @@
     <Title>Kampute.HttpClient.Xml</Title>
     <Description>This package is an extension package for Kampute.HttpClient, enhancing it to manage application/xml content types, using XmlSerializer for serialization and deserialization of XML responses and payloads.</Description>
     <Authors>Kambiz Khojasteh</Authors>
-    <Version>2.3.0</Version>
+    <Version>2.3.1</Version>
     <Company>Kampute</Company>
     <Copyright>Copyright (c) 2024 Kampute</Copyright>
     <LangVersion>latest</LangVersion>
@@ -27,7 +27,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="Exists('../../SigningKey.snk')">
-    <SignAssembly >true</SignAssembly>
+    <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../../SigningKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 

diff --git a/src/Kampute.HttpClient/ErrorHandlers/HttpError503Handler.cs b/src/Kampute.HttpClient/ErrorHandlers/HttpError503Handler.cs
@@ -41,7 +41,7 @@ public class HttpError503Handler : IHttpErrorHandler
         ///   <item>
         ///     <term>context</term>
         ///     <description>
-        ///     Provides context about the HTTP responce indicating a '503 Service Unavailable' error. It is encapsulated within
+        ///     Provides context about the HTTP response indicating a '503 Service Unavailable' error. It is encapsulated within
         ///     an <see cref="HttpResponseErrorContext"/> instance, allowing for an informed decision on the retry strategy.
         ///     </description>
         ///   </item>

diff --git a/src/Kampute.HttpClient/HttpContentDeserializerCollection.cs b/src/Kampute.HttpClient/HttpContentDeserializerCollection.cs
@@ -288,7 +288,7 @@ public IReadOnlyCollection<string> GetSupportedMediaTypes(Type modelType, Type e
             }
 
             /// <summary>
-            /// Clears the chace.
+            /// Clears the cache.
             /// </summary>
             public void Clear()
             {

diff --git a/src/Kampute.HttpClient/HttpErrorHandlerCollection.cs b/src/Kampute.HttpClient/HttpErrorHandlerCollection.cs
@@ -43,7 +43,7 @@ public sealed class HttpErrorHandlerCollection : ICollection<IHttpErrorHandler>
         /// Retrieves all <see cref="IHttpErrorHandler"/> instances in the collection that support handling a specific HTTP status code.
         /// </summary>
         /// <param name="statusCode">The HTTP status code to query.</param>
-        /// <returns>An enumrable of <see cref="IHttpErrorHandler"/> that can handle the specified status code.</returns>
+        /// <returns>An enumerable of <see cref="IHttpErrorHandler"/> that can handle the specified status code.</returns>
         public IEnumerable<IHttpErrorHandler> GetHandlersFor(HttpStatusCode statusCode)
         {
             return _collection.Where(errorHandler => errorHandler.CanHandle(statusCode));

diff --git a/src/Kampute.HttpClient/Kampute.HttpClient.csproj b/src/Kampute.HttpClient/Kampute.HttpClient.csproj
@@ -5,7 +5,7 @@
     <Title>Kampute.HttpClient</Title>
     <Description>Kampute.HttpClient is a versatile and lightweight .NET library that simplifies RESTful API communication. Its core HttpRestClient class provides a streamlined approach to HTTP interactions, offering advanced features such as flexible serialization/deserialization, robust error handling, configurable backoff strategies, and detailed request-response processing. Striking a balance between simplicity and extensibility, Kampute.HttpClient empowers developers with a powerful yet easy-to-use client for seamless API integration across a wide range of .NET applications.</Description>
     <Authors>Kambiz Khojasteh</Authors>
-    <Version>2.3.0</Version>
+    <Version>2.3.1</Version>
     <Company>Kampute</Company>
     <Copyright>Copyright (c) 2024 Kampute</Copyright>
     <LangVersion>latest</LangVersion>

diff --git a/tests/Kampute.HttpClient.DataContract.Test/Kampute.HttpClient.DataContract.Test.csproj b/tests/Kampute.HttpClient.DataContract.Test/Kampute.HttpClient.DataContract.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
 	<LangVersion>latest</LangVersion>
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="NUnit" Version="4.1.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/tests/Kampute.HttpClient.Json.Test/Kampute.HttpClient.Json.Test.csproj b/tests/Kampute.HttpClient.Json.Test/Kampute.HttpClient.Json.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
 	<LangVersion>latest</LangVersion>
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="NUnit" Version="4.1.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/tests/Kampute.HttpClient.Json.Test/TestModel.cs b/tests/Kampute.HttpClient.Json.Test/TestModel.cs
@@ -5,7 +5,7 @@
     using System.Text.Json.Serialization;
     using System.Text.RegularExpressions;
 
-    public class TestModel
+    public partial class TestModel
     {
         public string? Name { get; set; }
 
@@ -28,7 +28,7 @@ static string ToJson(string? value)
                 if (value is null)
                     return "null";
 
-                var escaped = Regex.Replace(value, @"[\u0000-\u001F\\""]", match =>
+                var escaped = SpecialCharacters().Replace(value, match =>
                 {
                     var c = match.Value[0];
                     return c switch
@@ -52,5 +52,8 @@ static string ToJson(string? value)
         {
             UnmappedMemberHandling = JsonUnmappedMemberHandling.Disallow
         };
+
+        [GeneratedRegex(@"[\u0000-\u001F\\""]")]
+        private static partial Regex SpecialCharacters();
     }
 }
diff --git a/tests/Kampute.HttpClient.NewtonsoftJson.Test/Kampute.HttpClient.NewtonsoftJson.Test.csproj b/tests/Kampute.HttpClient.NewtonsoftJson.Test/Kampute.HttpClient.NewtonsoftJson.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
 	<LangVersion>latest</LangVersion>
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="NUnit" Version="4.1.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/tests/Kampute.HttpClient.NewtonsoftJson.Test/TestModel.cs b/tests/Kampute.HttpClient.NewtonsoftJson.Test/TestModel.cs
@@ -4,7 +4,7 @@
     using System;
     using System.Text.RegularExpressions;
 
-    public class TestModel
+    public partial class TestModel
     {
         public string? Name { get; set; }
 
@@ -27,7 +27,7 @@ static string ToJson(string? value)
                 if (value is null)
                     return "null";
 
-                var escaped = Regex.Replace(value, @"[\u0000-\u001F\\""]", match =>
+                var escaped = SpecialCharacters().Replace(value, match =>
                 {
                     var c = match.Value[0];
                     return c switch
@@ -52,5 +52,8 @@ static string ToJson(string? value)
             NullValueHandling = NullValueHandling.Include,
             MissingMemberHandling = MissingMemberHandling.Error,
         };
+
+        [GeneratedRegex(@"[\u0000-\u001F\\""]")]
+        private static partial Regex SpecialCharacters();
     }
 }
diff --git a/tests/Kampute.HttpClient.Test/Kampute.HttpClient.Test.csproj b/tests/Kampute.HttpClient.Test/Kampute.HttpClient.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
 	<LangVersion>latest</LangVersion>
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="NUnit" Version="4.1.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/tests/Kampute.HttpClient.Test/TestHelpers/MockExtensions.cs b/tests/Kampute.HttpClient.Test/TestHelpers/MockExtensions.cs
@@ -12,10 +12,8 @@ internal static class MockExtensions
     {
         public static void MockHttpResponse(this Mock<HttpMessageHandler> mockMessageHandler, Func<HttpRequestMessage, HttpResponseMessage> responseFactory)
         {
-            if (mockMessageHandler is null)
-                throw new ArgumentNullException(nameof(mockMessageHandler));
-            if (responseFactory is null)
-                throw new ArgumentNullException(nameof(responseFactory));
+            ArgumentNullException.ThrowIfNull(mockMessageHandler);
+            ArgumentNullException.ThrowIfNull(responseFactory);
 
             mockMessageHandler.Protected()
                 .Setup<Task<HttpResponseMessage>>
@@ -34,8 +32,7 @@ public static void MockHttpResponse(this Mock<HttpMessageHandler> mockMessageHan
 
         public static void MockHttpResponse(this Mock<HttpMessageHandler> mockMessageHandler, HttpStatusCode statusCode, HttpContent? content = null)
         {
-            if (mockMessageHandler is null)
-                throw new ArgumentNullException(nameof(mockMessageHandler));
+            ArgumentNullException.ThrowIfNull(mockMessageHandler);
 
             mockMessageHandler.MockHttpResponse(_ => new HttpResponseMessage(statusCode) { Content = content });
         }

diff --git a/tests/Kampute.HttpClient.Test/TestHelpers/TestContentDeserializer.cs b/tests/Kampute.HttpClient.Test/TestHelpers/TestContentDeserializer.cs
@@ -24,10 +24,8 @@ public bool CanDeserialize(string mediaType, Type? modelType)
 
         public async Task<object?> DeserializeAsync(HttpContent content, Type modelType, CancellationToken cancellationToken = default)
         {
-            if (content is null)
-                throw new ArgumentNullException(nameof(content));
-            if (modelType is null)
-                throw new ArgumentNullException(nameof(modelType));
+            ArgumentNullException.ThrowIfNull(content);
+            ArgumentNullException.ThrowIfNull(modelType);
 
             var str = await content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
             return (typeof(TestErrorResponse) == modelType) ? new TestErrorResponse(str) : Convert.ChangeType(str, modelType);

diff --git a/tests/Kampute.HttpClient.Xml.Test/Kampute.HttpClient.Xml.Test.csproj b/tests/Kampute.HttpClient.Xml.Test/Kampute.HttpClient.Xml.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
 	<LangVersion>latest</LangVersion>
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="NUnit" Version="4.1.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>