Switch more over to System.Text.Json

build-tools/installers/create-installers.targets

@@ -116,7 +116,6 @@
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Mono.Options.dll" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Mono.Options.pdb" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)MULTIDEX_JAR_LICENSE" />
-    <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Newtonsoft.Json.dll" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)NuGet.Common.dll" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)NuGet.Configuration.dll" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)NuGet.DependencyResolver.Core.dll" />

src/Xamarin.Android.Build.Tasks/Tasks/BuildAppBundle.cs

@@ -1,7 +1,7 @@
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using System.Text.Json;
+using System.Text.Json.Nodes;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -88,26 +88,25 @@ public override bool RunTask ()
 					}
 				}
 
-				var json = JObject.FromObject (new { });
+				JsonNode json = JsonNode.Parse ("{}")!;
 				if (!string.IsNullOrEmpty (CustomBuildConfigFile) && File.Exists (CustomBuildConfigFile)) {
-					using (StreamReader file = File.OpenText (CustomBuildConfigFile))
-					using (JsonTextReader reader = new JsonTextReader (file)) {
-						json = (JObject)JToken.ReadFrom(reader);
-					}
+					using Stream fs = File.OpenRead (CustomBuildConfigFile);
+					using JsonDocument doc = JsonDocument.Parse (fs, new JsonDocumentOptions { AllowTrailingCommas = true });
+					json = doc.RootElement.ToNode ();
 				}
-				var jsonAddition = JObject.FromObject (new {
+				var jsonAddition = new {
 					compression = new {
 						uncompressedGlob = uncompressed,
 					}
-				});
-
-				var mergeSettings = new JsonMergeSettings () {
-					MergeArrayHandling = MergeArrayHandling.Union,
-					MergeNullValueHandling = MergeNullValueHandling.Ignore
 				};
-				json.Merge (jsonAddition, mergeSettings);
-				Log.LogDebugMessage ("BundleConfig.json: {0}", json);
-				File.WriteAllText (temp, json.ToString ());
+
+				var jsonAdditionDoc = JsonSerializer.SerializeToNode (jsonAddition);
+
+				var mergedJson = json.Merge (jsonAdditionDoc);
+				var output = mergedJson.ToJsonString (new JsonSerializerOptions { WriteIndented = true });
+
+				Log.LogDebugMessage ("BundleConfig.json: {0}", output);
+				File.WriteAllText (temp, output);
 
 				//NOTE: bundletool will not overwrite
 				if (File.Exists (Output))

src/Xamarin.Android.Build.Tasks/Tasks/JavaDependencyVerification.cs

@@ -11,7 +11,8 @@
 using Microsoft.Android.Build.Tasks;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
-using Newtonsoft.Json;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 using NuGet.ProjectModel;
 
 namespace Xamarin.Android.Tasks;
@@ -305,7 +306,7 @@ public Project Resolve (Artifact artifact)
 	}
 }
 
-class MicrosoftNuGetPackageFinder
+partial class MicrosoftNuGetPackageFinder
 {
 	readonly PackageListFile? package_list;
 
@@ -318,7 +319,7 @@ public MicrosoftNuGetPackageFinder (string? file, TaskLoggingHelper log)
 
 		try {
 			var json = File.ReadAllText (file);
-			package_list = JsonConvert.DeserializeObject<PackageListFile> (json);
+			package_list = JsonSerializer.Deserialize<PackageListFile> (json, PackageListFileContext.Default.PackageListFile);
 		} catch (Exception ex) {
 			log.LogMessage ("There was an error reading 'microsoft-packages.json', Android NuGet suggestions will not be provided: {0}", ex);
 		}
@@ -331,18 +332,26 @@ public MicrosoftNuGetPackageFinder (string? file, TaskLoggingHelper log)
 
 	public class PackageListFile
 	{
-		[JsonProperty ("packages")]
 		public List<Package>? Packages { get; set; }
 	}
 
 	public class Package
 	{
-		[JsonProperty ("javaId")]
 		public string? JavaId { get; set; }
-
-		[JsonProperty ("nugetId")]
 		public string? NuGetId { get; set; }
 	}
+
+	[JsonSourceGenerationOptions(
+		AllowTrailingCommas = true,
+		WriteIndented = true,
+		PropertyNameCaseInsensitive = true
+	)]
+	[JsonSerializable(typeof(PackageListFile))]
+	[JsonSerializable(typeof(List<Package>))]
+	[JsonSerializable(typeof(string))]
+	internal partial class PackageListFileContext : JsonSerializerContext
+	{
+	}
 }
 
 public class NuGetPackageVersionFinder

src/Xamarin.Android.Build.Tasks/Utilities/JsonExtensions.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+
+public static class JsonExtensions
+{
+    public static JsonNode Merge (this JsonNode jsonBase, JsonNode jsonMerge)
+    {
+        if (jsonBase == null || jsonMerge == null)
+            return jsonBase;
+
+        switch (jsonBase)
+        {
+            case JsonObject jsonBaseObj when jsonMerge is JsonObject jsonMergeObj: {
+                var mergeNodesArray = new KeyValuePair<string, JsonNode?> [jsonMergeObj.Count];
+                int index = 0;
+                foreach (var prop in jsonMergeObj) {
+                    mergeNodesArray [index++] = prop;
+                }
+                jsonMergeObj.Clear ();
+
+                foreach (var prop in mergeNodesArray) {
+                    jsonBaseObj [prop.Key] = jsonBaseObj [prop.Key] switch {
+                        JsonObject jsonBaseChildObj when prop.Value is JsonObject jsonMergeChildObj => jsonBaseChildObj.Merge (jsonMergeChildObj),
+                        JsonArray jsonBaseChildArray when prop.Value is JsonArray jsonMergeChildArray => jsonBaseChildArray.Merge (jsonMergeChildArray),
+                        _ => prop.Value
+                    };
+                }
+                break;
+            }
+            case JsonArray jsonBaseArray when jsonMerge is JsonArray jsonMergeArray: {
+                var mergeNodesArray = new JsonNode? [jsonMergeArray.Count];
+                int index = 0;
+                foreach (var mergeNode in jsonMergeArray) {
+                    mergeNodesArray [index++] = mergeNode;
+                }
+                jsonMergeArray.Clear ();
+                foreach (var mergeNode in mergeNodesArray) {
+                    jsonBaseArray.Add (mergeNode);
+                }
+                break;
+            }
+            default:
+                throw new ArgumentException ($"The JsonNode type [{jsonBase.GetType ().Name}] is incompatible for merging with the target/base " +
+                    $"type [{jsonMerge.GetType ().Name}]; merge requires the types to be the same.");
+        }
+        return jsonBase;
+    }
+
+    public static JsonNode? ToNode (this JsonElement element)
+    {
+        switch (element.ValueKind) {
+            case JsonValueKind.Object:
+                var obj = new JsonObject ();
+                foreach (JsonProperty prop in element.EnumerateObject()) {
+                    obj [prop.Name] = prop.Value.ToNode ();
+                }
+                return obj;
+
+            case JsonValueKind.Array:
+                var arr = new JsonArray();
+                foreach (JsonElement item in element.EnumerateArray ()) {
+                    arr.Add (item.ToNode ());
+                }
+                return arr;
+
+            case JsonValueKind.String:
+                return element.GetString ();
+
+            case JsonValueKind.Number:
+                return element.TryGetInt32 (out int intValue) ? intValue : element.GetDouble ();
+
+            case JsonValueKind.True:
+                return true;
+
+            case JsonValueKind.False:
+                return false;
+
+            case JsonValueKind.Null:
+                return null;
+
+            default:
+                throw new NotSupportedException ($"Unsupported JSON value kind: {element.ValueKind}");
+        }
+    }
+}

src/Xamarin.Android.Build.Tasks/Utilities/MamJsonParser.cs

@@ -57,10 +57,11 @@ public XElement ToXml ()
 				GetReplacementMethods ());
 		}
 
-		static JsonObject ReadJson (string path)
+		static JsonNode ReadJson (string path)
 		{
-			using (var f = File.OpenRead (path)) {
-				return JsonNode.Parse (f)!.AsObject ();
+			using (var fs = File.OpenRead (path)) {
+				using JsonDocument doc = JsonDocument.Parse (fs, new JsonDocumentOptions { AllowTrailingCommas = true });
+				return doc.RootElement.ToNode () ?? JsonNode.Parse ("{}")!;
 			}
 		}
 

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj

@@ -29,7 +29,6 @@
     <PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" GeneratePathProperty="true" />
     <PackageReference Include="Irony" />
     <PackageReference Include="NuGet.ProjectModel" Version="6.13.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
     <PackageReference Include="System.CodeDom" />
     <PackageReference Include="System.IO.Hashing" Version="$(SystemIOHashingPackageVersion)" />
     <PackageReference Include="System.Reflection.Metadata" Version="8.0.0" />