Convert Razor tools from NewtonSoft.Json to System.Text.Json

src/RazorSdk/Tool/DiscoverCommand.cs

@@ -9,7 +9,7 @@
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.NET.Sdk.Razor.Tool.CommandLineUtils;
 using Microsoft.NET.Sdk.Razor.Tool.Json;
-using Newtonsoft.Json;
+using System.Text.Json;
 
 namespace Microsoft.NET.Sdk.Razor.Tool
 {
@@ -244,13 +244,7 @@ private bool HashesEqual(byte[] x, byte[] y)
 
         private static void Serialize(Stream stream, IReadOnlyList<TagHelperDescriptor> tagHelpers)
         {
-            using (var writer = new StreamWriter(stream, Encoding.UTF8, bufferSize: 4096, leaveOpen: true))
-            {
-                var serializer = new JsonSerializer();
-                serializer.Converters.Add(TagHelperDescriptorJsonConverter.Instance);
-
-                serializer.Serialize(writer, tagHelpers);
-            }
+            JsonSerializer.Serialize(stream, tagHelpers, TagHelperDescriptorJsonConverter.SerializerOptions);
         }
     }
 }

src/RazorSdk/Tool/GenerateCommand.cs

@@ -9,7 +9,7 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.NET.Sdk.Razor.Tool.CommandLineUtils;
 using Microsoft.NET.Sdk.Razor.Tool.Json;
-using Newtonsoft.Json;
+using System.Text.Json;
 
 namespace Microsoft.NET.Sdk.Razor.Tool
 {
@@ -306,12 +306,7 @@ private static TagHelperCollection GetTagHelpers(string tagHelperManifest)
 
             using (var stream = File.OpenRead(tagHelperManifest))
             {
-                var reader = new JsonTextReader(new StreamReader(stream));
-
-                var serializer = new JsonSerializer();
-                serializer.Converters.Add(TagHelperDescriptorJsonConverter.Instance);
-
-                var tagHelpers = serializer.Deserialize<IReadOnlyList<TagHelperDescriptor>>(reader);
+                var tagHelpers = JsonSerializer.Deserialize<IReadOnlyList<TagHelperDescriptor>>(stream, TagHelperDescriptorJsonConverter.SerializerOptions);
 
                 return TagHelperCollection.Create(tagHelpers);
             }