Merge pull request #21 from brminnick/Replace-Newtonsoft.JSON-with-System.Text.JSON

Replace Newtonsoft.JSON with System.Text.JSON

Author: TheCodeTraveler

Src/GitHubApiStatus.Extensions/GitHubApiStatus.Extensions.csproj

@@ -31,7 +31,7 @@ New In This Release:
 - Add Support for Microsoft.Extensions.DependencyInjection
 - Implements Microsoft.Extensions.Http
         </PackageReleaseNotes>
-        <Version>2.0.0</Version>
+        <Version>2.0.1</Version>
         <RepositoryUrl>https://github.com/brminnick/GitHubApiStatus</RepositoryUrl>
         <Product>$(AssemblyName) ($(TargetFramework))</Product>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>

Src/GitHubApiStatus/GitHubApiStatus.csproj

@@ -40,17 +40,9 @@ Calculate the GitHub API Rate Limits for the following GitHub APIs
         </Description>
         <PackageReleaseNotes>
 New In This Release:
-- Added Interfaces: IGitHubApiStatusService, IGitHubApiRateLimitResponse, IGitHubApiRateLimits and IRateLimitStatus
-- Added GitHubApiClient
-- Added GitHubApiStatusService.AddProductHeaderValue()
-- Added GitHubApiStatusService.SetAuthenticationHeaderValue()
-- Added GitHubApiStatusService.IsProductHeaderValueValid
-- Added GitHubApiStatusService.IsAuthenticationHeaderValueSet
-- Added HttpResponseHeaders Extensions
-- Breaking Change: Removed GitHubApiStatusService.Instance
-- Breaking Change: Changed GitHubApiStatusService.IsAuthenticated to GitHubApiStatusService.IsResponseFromAuthenticatedRequest
+- Use System.Text.Json for .NET Standard 2.0 
         </PackageReleaseNotes>
-        <Version>2.0.0</Version>
+        <Version>2.0.1</Version>
         <RepositoryUrl>https://github.com/brminnick/GitHubApiStatus</RepositoryUrl>
         <Product>$(AssemblyName) ($(TargetFramework))</Product>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -99,9 +91,9 @@ New In This Release:
     <ItemGroup Condition=" '$(Configuration)'=='Release' ">
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     </ItemGroup>
-    <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
-        <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard1.3')) ">
         <PackageReference Update="NETStandard.Library" PrivateAssets="all" />
+        <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     </ItemGroup>
     <ItemGroup Condition=" $(TargetFramework.StartsWith('net5')) ">
     </ItemGroup>
@@ -111,4 +103,7 @@ New In This Release:
         <Folder Include="Services\" />
         <Folder Include="Interfaces\" />
     </ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+      <PackageReference Include="System.Text.Json" Version="4.6.0" />
+    </ItemGroup>
 </Project>

Src/GitHubApiStatus/Models/GitHubApiRateLimitsMutable.cs

@@ -1,4 +1,4 @@
-#if !NETSTANDARD
+#if !NETSTANDARD1_3
 using System;
 using System.Text.Json.Serialization;
 

Src/GitHubApiStatus/Services/GitHubApiStatusService.cs

@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using System.Net.Http;
 
-#if NETSTANDARD
+#if NETSTANDARD1_3
 using System.IO;
 using Newtonsoft.Json;
 #else
@@ -36,7 +36,7 @@ public class GitHubApiStatusService : IGitHubApiStatusService
         /// </summary>
         public const string RateLimitRemainingHeader = "X-RateLimit-Remaining";
 
-#if NETSTANDARD
+#if NETSTANDARD1_3
         readonly static Lazy<JsonSerializer> _serializerHolder = new(() => new JsonSerializer());
 #endif
 
@@ -118,7 +118,7 @@ public bool IsAuthenticationHeaderValueSet
             }
         }
 
-#if NETSTANDARD
+#if NETSTANDARD1_3
         static JsonSerializer Serializer => _serializerHolder.Value;
 #endif
 
@@ -326,14 +326,14 @@ static async Task<GitHubApiRateLimitResponse> GetGitHubApiRateLimitResponse(Http
             using var response = await client.GetAsync("https://api.github.com/rate_limit", cancellationToken).ConfigureAwait(false);
             response.EnsureSuccessStatusCode();
 
-#if NET5_0
+#if NET
             using var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
 #else
             using var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
 #endif
 
 
-#if NETSTANDARD
+#if NETSTANDARD1_3
             using var streamReader = new StreamReader(stream);
             using var jsonTextReader = new JsonTextReader(streamReader);