Merge develop into main

HttpClient.Caching.sln

@@ -15,6 +15,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitignore = .gitignore
 		azure-pipelines.yml = azure-pipelines.yml
 		README.md = README.md
+		global.json = global.json
+		ReleaseNotes.txt = ReleaseNotes.txt
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleAppSample", "Samples\ConsoleAppSample\ConsoleAppSample.csproj", "{592B2324-79AA-4973-8CE5-F65BD503641F}"

HttpClient.Caching/Abstractions/CacheData.cs

@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Net.Http;
 
 namespace Microsoft.Extensions.Caching.Abstractions

HttpClient.Caching/Abstractions/CacheDataExtensions.cs

@@ -1,32 +1,34 @@
-using System;
-using Newtonsoft.Json;
+using System.Net;
+using System.Net.Http;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.Extensions.Caching.Internals;
 
 namespace Microsoft.Extensions.Caching.Abstractions
 {
     public static class CacheDataExtensions
     {
+        private static readonly JsonSerializerOptions SerializerOptions = new JsonSerializerOptions
+        {
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+            Converters = { new CacheDataJsonConverter() }
+        };
+
         public static byte[] Serialize(this CacheData cacheData)
         {
-            var json = JsonConvert.SerializeObject(cacheData);
-            var bytes = new byte[json.Length * sizeof(char)];
-            Buffer.BlockCopy(json.ToCharArray(), 0, bytes, 0, bytes.Length);
-            return bytes;
+            return JsonSerializer.SerializeToUtf8Bytes(cacheData, SerializerOptions);
         }
 
         public static CacheData Deserialize(this byte[] cacheData)
         {
             try
             {
-                var chars = new char[cacheData.Length / sizeof(char)];
-                Buffer.BlockCopy(cacheData, 0, chars, 0, cacheData.Length);
-                var json = new string(chars);
-                var data = JsonConvert.DeserializeObject<CacheData>(json);
-                return data;
+                return JsonSerializer.Deserialize<CacheData>(cacheData, SerializerOptions)!;
             }
             catch
             {
-                return null;
+                return null!;
             }
         }
     }
-}
+}

HttpClient.Caching/Abstractions/HttpResponseMessageExtensions.cs

@@ -16,7 +16,7 @@ public static async Task<CacheData> ToCacheEntryAsync(this HttpResponseMessage h
             return httpResponseMessage.ToCacheEntry(contentBytes);
         }
 
-#if NET5_0_OR_GREATER
+#if NET8_0_OR_GREATER
         public static CacheData ToCacheEntry(this HttpResponseMessage httpResponseMessage)
         {
             using var contentStream = httpResponseMessage.Content.ReadAsStream();

HttpClient.Caching/Abstractions/ICacheKeysProvider.cs

@@ -10,8 +10,8 @@ public interface ICacheKeysProvider
         /// <summary>
         ///     Return the key for the request message <paramref name="request"/>
         /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
+        /// <param name="request">The http request message.</param>
+        /// <returns>The cache key.</returns>
         string GetKey(HttpRequestMessage request);
     }
 }

HttpClient.Caching/Abstractions/StatusCodeExtensions.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Net;
 
 namespace Microsoft.Extensions.Caching.Abstractions