Replace Newtonsoft.Json with the new .Net JsonSerializer.

Author: azchohfi

Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj

@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="System.Text.Json" Version="4.7.2" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
 

Microsoft.Toolkit.Services/Properties/Microsoft.Toolkit.Services.rd.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
+  <Library Name="Microsoft.Toolkit.Services">
+    <Namespace Name="System.Text.Json.Serialization.Converters" Dynamic="Required All"/>
+  </Library>
+</Directives>

Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs

@@ -7,9 +7,9 @@
 using System.Diagnostics;
 using System.Net.Http;
 using System.Text;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Services.Core;
-using Newtonsoft.Json.Linq;
 
 #if WINRT
 using Microsoft.Toolkit.Services.PlatformSpecific.Uwp;
@@ -81,7 +81,8 @@ public LinkedInDataProvider(LinkedInOAuthTokens tokens, LinkedInPermissions requ
                 throw new ArgumentException("Missing callback uri");
             }
 
-            if (!Enum.IsDefined(typeof(LinkedInPermissions), requiredPermissions))
+            // Check if outside the bounds of the LinkedInPermissions Enum
+            if (requiredPermissions < 0 || requiredPermissions > (LinkedInPermissions)15)
             {
                 throw new ArgumentException("Error retrieving required permissions");
             }
@@ -278,9 +279,14 @@ private async Task<string> GetAccessTokenAsync(LinkedInOAuthTokens tokens, strin
             {
                 using (var response = await client.SendAsync(request).ConfigureAwait(false))
                 {
-                    var jsonString = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    var json = JObject.Parse(jsonString);
-                    return json.GetValue("access_token").Value<string>();
+                    using (var jsonStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
+                    {
+                        using (var jsonDoc = await JsonDocument.ParseAsync(jsonStream).ConfigureAwait(false))
+                        {
+                            var value = jsonDoc.RootElement.GetProperty("access_token");
+                            return value.GetString();
+                        }
+                    }
                 }
             }
         }

Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInParser.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-using Newtonsoft.Json;
+using System.Text.Json;
 
 namespace Microsoft.Toolkit.Services.LinkedIn
 {
@@ -24,11 +24,11 @@ public IEnumerable<T> Parse(string data)
 
             try
             {
-                results = JsonConvert.DeserializeObject<List<T>>(data);
+                results = JsonSerializer.Deserialize<List<T>>(data);
             }
-            catch (JsonSerializationException)
+            catch (JsonException)
             {
-                T linkedInResult = JsonConvert.DeserializeObject<T>(data);
+                T linkedInResult = JsonSerializer.Deserialize<T>(data);
                 results = new List<T> { linkedInResult };
             }
 
@@ -42,7 +42,7 @@ public IEnumerable<T> Parse(string data)
         /// <returns>Returns string data.</returns>
         public string Parse(T dataToShare)
         {
-            return JsonConvert.SerializeObject(dataToShare, Formatting.None, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
+            return JsonSerializer.Serialize(dataToShare, typeof(T), new JsonSerializerOptions { IgnoreNullValues = true });
         }
     }
 }

Microsoft.Toolkit.Services/Services/MicrosoftTranslator/AzureAuthToken.cs

@@ -4,8 +4,8 @@
 
 using System;
 using System.Net.Http;
+using System.Text.Json;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 
 namespace Microsoft.Toolkit.Services.MicrosoftTranslator
 {
@@ -24,6 +24,9 @@ internal class AzureAuthToken
         /// </summary>
         private static readonly Uri ServiceUrl = new Uri("https://api.cognitive.microsoft.com/sts/v1.0/issueToken");
 
+        // TODO
+        // private static readonly Uri ServiceUrl = new Uri(THIS SHOULD BE A PARAMETER NOW);
+
         /// <summary>
         /// After obtaining a valid token, this class will cache it for this duration.
         /// Use a duration of 8 minutes, which is less than the actual token lifetime of 10 minutes.
@@ -99,8 +102,8 @@ public async Task<string> GetAccessTokenAsync()
 
                 if (!response.IsSuccessStatusCode)
                 {
-                    var error = JsonConvert.DeserializeObject<ErrorResponse>(content);
-                    throw new TranslatorServiceException(error.Message);
+                    var error = JsonSerializer.Deserialize<ErrorResponse>(content);
+                    throw new TranslatorServiceException(error?.Error?.Message);
                 }
 
                 _storedTokenTime = DateTime.Now;

Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ErrorResponse.cs

@@ -2,21 +2,27 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Text.Json.Serialization;
+
 namespace Microsoft.Toolkit.Services.MicrosoftTranslator
 {
+#pragma warning disable SA1402 // File may only contain a single type
     /// <summary>
     /// Holds information about an error occurred while accessing Microsoft Translator Service.
     /// </summary>
     internal class ErrorResponse
+    {
+        [JsonPropertyName("error")]
+        public Error Error { get; set; }
+    }
+
+    internal class Error
     {
         /// <summary>
         /// Gets or sets the error message.
         /// </summary>
+        [JsonPropertyName("message")]
         public string Message { get; set; }
-
-        /// <summary>
-        /// Gets or sets the HTTP status code.
-        /// </summary>
-        public int StatusCode { get; set; }
     }
+#pragma warning restore SA1402 // File may only contain a single type
 }

Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ServiceLanguage.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.Toolkit.Services.MicrosoftTranslator
 {
@@ -30,7 +30,7 @@ public class ServiceLanguage
         /// <summary>
         /// Gets the directionality, which is rtl for right-to-left languages or ltr for left-to-right languages.
         /// </summary>
-        [JsonProperty("dir")]
+        [JsonPropertyName("dir")]
         public string Directionality { get; }
 
         /// <summary>

Microsoft.Toolkit.Services/Services/MicrosoftTranslator/TranslatorService.cs

@@ -8,9 +8,8 @@
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Text.Json;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace Microsoft.Toolkit.Services.MicrosoftTranslator
 {
@@ -113,7 +112,7 @@ public async Task<IEnumerable<DetectedLanguageResponse>> DetectLanguagesWithResp
                 var response = await client.SendAsync(request).ConfigureAwait(false);
                 var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
-                var responseContent = JsonConvert.DeserializeObject<IEnumerable<DetectedLanguageResponse>>(content);
+                var responseContent = JsonSerializer.Deserialize<IEnumerable<DetectedLanguageResponse>>(content);
                 return responseContent;
             }
         }
@@ -144,8 +143,8 @@ public async Task<IEnumerable<ServiceLanguage>> GetLanguageNamesAsync(string lan
                 var response = await client.SendAsync(request).ConfigureAwait(false);
                 var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
-                var jsonContent = JToken.Parse(content)["translation"];
-                var responseContent = JsonConvert.DeserializeObject<Dictionary<string, ServiceLanguage>>(jsonContent.ToString()).ToList();
+                var jsonContent = JsonDocument.Parse(content).RootElement.GetProperty("translation");
+                var responseContent = JsonSerializer.Deserialize<Dictionary<string, ServiceLanguage>>(jsonContent.ToString()).ToList();
                 responseContent.ForEach(r => r.Value.Code = r.Key);
 
                 return responseContent.Select(r => r.Value).OrderBy(r => r.Name).ToList();
@@ -221,7 +220,7 @@ public async Task<IEnumerable<TranslationResponse>> TranslateWithResponseAsync(I
                 var response = await client.SendAsync(request).ConfigureAwait(false);
                 var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
-                var responseContent = JsonConvert.DeserializeObject<IEnumerable<TranslationResponse>>(content);
+                var responseContent = JsonSerializer.Deserialize<IEnumerable<TranslationResponse>>(content);
                 return responseContent;
             }
         }
@@ -254,7 +253,7 @@ private HttpRequestMessage CreateHttpRequest(string uriString, HttpMethod method
 
             if (content != null)
             {
-                var jsonRequest = JsonConvert.SerializeObject(content);
+                var jsonRequest = JsonSerializer.Serialize(content);
                 var requestContent = new StringContent(jsonRequest, System.Text.Encoding.UTF8, JsonMediaType);
                 request.Content = requestContent;
             }