Use System.Text.Json for serialization

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Serialization/CompletionListSerializationBenchmark.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System.IO;
-using System.Text;
+using System.Text.Json;
 using BenchmarkDotNet.Attributes;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.LanguageServer;
@@ -11,15 +11,13 @@
 using Microsoft.CodeAnalysis.Razor.Completion;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Newtonsoft.Json;
 
 namespace Microsoft.AspNetCore.Razor.Microbenchmarks.Serialization;
 
 public class CompletionListSerializationBenchmark
 {
     private readonly byte[] _completionListBuffer;
 
-    private readonly JsonSerializer _serializer;
     private readonly CompletionList _completionList;
 
     public CompletionListSerializationBenchmark()
@@ -29,8 +27,6 @@ public CompletionListSerializationBenchmark()
         var optionsMonitor = new RazorLSPOptionsMonitor(configurationService, RazorLSPOptions.Default);
         var tagHelperCompletionProvider = new TagHelperCompletionProvider(completionService, optionsMonitor);
 
-        _serializer = JsonSerializer.Create();
-
         var documentContent = "<";
         var queryIndex = 1;
         _completionList = GenerateCompletionList(documentContent, queryIndex, tagHelperCompletionProvider);
@@ -43,36 +39,32 @@ public void ComponentElement_CompletionList_Serialization_RoundTrip()
         // Serialize back to json.
         MemoryStream originalStream;
         using (originalStream = new MemoryStream())
-        using (var writer = new StreamWriter(originalStream, Encoding.UTF8, bufferSize: 4096))
         {
-            _serializer.Serialize(writer, _completionList);
+            JsonSerializer.Serialize(originalStream, _completionList);
         }
 
         CompletionList deserializedCompletions;
         var stream = new MemoryStream(originalStream.GetBuffer());
         using (stream)
-        using (var reader = new JsonTextReader(new StreamReader(stream)))
         {
-            deserializedCompletions = _serializer.Deserialize<CompletionList>(reader).AssumeNotNull();
+            deserializedCompletions = JsonSerializer.Deserialize<CompletionList>(stream).AssumeNotNull();
         }
     }
 
     [Benchmark(Description = "Component Completion List Serialization")]
     public void ComponentElement_CompletionList_Serialization()
     {
         using var stream = new MemoryStream();
-        using var writer = new StreamWriter(stream, Encoding.UTF8, bufferSize: 4096);
-        _serializer.Serialize(writer, _completionList);
+        JsonSerializer.Serialize(stream, _completionList);
     }
 
     [Benchmark(Description = "Component Completion List Deserialization")]
     public void ComponentElement_CompletionList_Deserialization()
     {
         // Deserialize from json file.
         using var stream = new MemoryStream(_completionListBuffer);
-        using var reader = new JsonTextReader(new StreamReader(stream));
         CompletionList deserializedCompletions;
-        deserializedCompletions = _serializer.Deserialize<CompletionList>(reader).AssumeNotNull();
+        deserializedCompletions = JsonSerializer.Deserialize<CompletionList>(stream).AssumeNotNull();
     }
 
     private CompletionList GenerateCompletionList(string documentContent, int queryIndex, TagHelperCompletionProvider componentCompletionProvider)
@@ -111,8 +103,7 @@ private CompletionList GenerateCompletionList(string documentContent, int queryI
     private byte[] GenerateBuffer(CompletionList completionList)
     {
         using var stream = new MemoryStream();
-        using var writer = new StreamWriter(stream, Encoding.UTF8, bufferSize: 4096);
-        _serializer.Serialize(writer, completionList);
+        JsonSerializer.Serialize(stream, completionList);
         var buffer = stream.GetBuffer();
 
         return buffer;

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/BaseDelegatedCodeActionResolver.cs

@@ -2,13 +2,15 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.LanguageServer.CodeActions.Models;
 using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Razor.Protocol.CodeActions;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
+using Newtonsoft.Json.Linq;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.CodeActions;
 

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/CSharp/DefaultCSharpCodeActionProvider.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
@@ -12,7 +13,6 @@
 using Microsoft.AspNetCore.Razor.Threading;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
-using Newtonsoft.Json.Linq;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.CodeActions;
 
@@ -101,7 +101,7 @@ public DefaultCSharpCodeActionProvider(LanguageServerFeatureOptions languageServ
                 // flag is on, any perf hit here isn't going to affect real users.
                 try
                 {
-                    if (((JToken)codeAction.Data).ToObject<RazorCodeActionResolutionParams>() is not null)
+                    if (((JsonElement)codeAction.Data).Deserialize<RazorCodeActionResolutionParams>() is not null)
                     {
                         // This code action has already been wrapped by something else, so skip it here, or it could
                         // be marked as experimental when its not, and more importantly would be duplicated in the list.

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/CodeActionEndpoint.cs

@@ -6,6 +6,7 @@
 using System.Collections.Immutable;
 using System.Linq;
 using System.Reflection;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
@@ -22,7 +23,6 @@
 using Microsoft.CodeAnalysis.Razor.Protocol.CodeActions;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Newtonsoft.Json.Linq;
 using StreamJsonRpc;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.CodeActions;
@@ -215,9 +215,9 @@ private RazorVSInternalCodeAction[] ExtractCSharpCodeActionNamesFromData(RazorVS
 
         foreach (var codeAction in codeActions)
         {
-            // Note: we may see a perf benefit from using a JsonConverter
-            var tags = ((JToken?)codeAction.Data)?["CustomTags"]?.ToObject<string[]>();
-            if (tags is null || tags.Length == 0)
+            if (codeAction.Data is not JsonElement jsonData ||
+                !jsonData.TryGetProperty("CustomTags", out var value) ||
+                value.Deserialize<string[]>() is not [..] tags)
             {
                 continue;
             }

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/CodeActionResolveEndpoint.cs

@@ -5,14 +5,14 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.LanguageServer.CodeActions.Models;
 using Microsoft.AspNetCore.Razor.LanguageServer.EndpointContracts;
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Newtonsoft.Json.Linq;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.CodeActions;
 
@@ -66,13 +66,13 @@ public async Task<CodeAction> HandleRequestAsync(CodeAction request, RazorReques
             throw new ArgumentNullException(nameof(request));
         }
 
-        if (request.Data is not JObject paramsObj)
+        if (request.Data is not JsonElement paramsObj)
         {
             _logger.LogError($"Invalid CodeAction Received '{request.Title}'.");
             return request;
         }
 
-        var resolutionParams = paramsObj.ToObject<RazorCodeActionResolutionParams>();
+        var resolutionParams = paramsObj.Deserialize<RazorCodeActionResolutionParams>();
 
         if (resolutionParams is null)
         {
@@ -87,7 +87,7 @@ public async Task<CodeAction> HandleRequestAsync(CodeAction request, RazorReques
         // as it does not support Command.Edit based code actions anymore.
         if (resolutionParams.Action == LanguageServerConstants.CodeActions.EditBasedCodeActionCommand)
         {
-            request.Edit = (resolutionParams.Data as JObject)?.ToObject<WorkspaceEdit>();
+            request.Edit = (resolutionParams.Data as JsonElement?)?.Deserialize<WorkspaceEdit>();
             return request;
         }
 
@@ -128,7 +128,7 @@ internal async Task<CodeAction> ResolveRazorCodeActionAsync(
             return codeAction;
         }
 
-        if (resolutionParams.Data is not JObject data)
+        if (resolutionParams.Data is not JsonElement data)
         {
             return codeAction;
         }
@@ -148,20 +148,20 @@ internal Task<CodeAction> ResolveHtmlCodeActionAsync(CodeAction codeAction, Razo
 
     private async Task<CodeAction> ResolveDelegatedCodeActionAsync(ImmutableDictionary<string, BaseDelegatedCodeActionResolver> resolvers, CodeAction codeAction, RazorCodeActionResolutionParams resolutionParams, CancellationToken cancellationToken)
     {
-        if (resolutionParams.Data is not JObject csharpParamsObj)
+        if (resolutionParams.Data is not JsonElement csharpParamsObj)
         {
             _logger.LogError($"Invalid CodeAction Received.");
             Debug.Fail($"Invalid CSharp CodeAction Received.");
             return codeAction;
         }
 
-        var csharpParams = csharpParamsObj.ToObject<CodeActionResolveParams>();
+        var csharpParams = csharpParamsObj.Deserialize<CodeActionResolveParams>();
         if (csharpParams is null)
         {
             throw new ArgumentOutOfRangeException($"Data was not convertible to {nameof(CodeActionResolveParams)}");
         }
 
-        codeAction.Data = csharpParams.Data as JToken;
+        codeAction.Data = csharpParams.Data;
 
         if (!resolvers.TryGetValue(resolutionParams.Action, out var resolver))
         {

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Models/AddUsingsCodeActionParams.cs

@@ -2,13 +2,17 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System;
+using System.Text.Json.Serialization;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.CodeActions.Models;
 
 internal sealed class AddUsingsCodeActionParams
 {
+    [JsonPropertyName("uri")]
     public required Uri Uri { get; set; }
+    [JsonPropertyName("namespace")]
     public required string Namespace { get; set; }
+    [JsonPropertyName("additionalEdit")]
     public TextDocumentEdit? AdditionalEdit { get; set; }
 }

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Models/CodeActionExtensions.cs

@@ -3,8 +3,9 @@
 
 using System;
 using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Nodes;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Newtonsoft.Json.Linq;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.CodeActions.Models;
 
@@ -26,19 +27,19 @@ public static SumType<Command, CodeAction> AsVSCodeCommandOrCodeAction(this VSIn
             razorCodeAction = new VSInternalCodeAction()
             {
                 Title = razorCodeAction.Title,
-                Data = JToken.FromObject(resolutionParams),
+                Data = JsonSerializer.SerializeToElement(resolutionParams),
                 TelemetryId = razorCodeAction.TelemetryId,
             };
         }
 
-        var serializedParams = JToken.FromObject(razorCodeAction.Data);
-        var arguments = new JArray(serializedParams);
+        var serializedParams = JsonSerializer.SerializeToNode(razorCodeAction.Data).AssumeNotNull();
+        var arguments = new JsonArray(serializedParams);
 
         return new Command
         {
             Title = razorCodeAction.Title ?? string.Empty,
             CommandIdentifier = LanguageServerConstants.RazorCodeActionRunnerCommand,
-            Arguments = arguments.ToArray(),
+            Arguments = arguments.ToArray()!
         };
     }
 
@@ -71,7 +72,7 @@ public static RazorVSInternalCodeAction WrapResolvableCodeAction(
             Language = language,
             Data = resolveParams
         };
-        razorCodeAction.Data = JToken.FromObject(resolutionParams);
+        razorCodeAction.Data = JsonSerializer.SerializeToElement(resolutionParams);
 
         if (!isOnAllowList)
         {
@@ -108,7 +109,7 @@ private static VSInternalCodeAction WrapResolvableCodeAction(
             Language = language,
             Data = resolveParams
         };
-        razorCodeAction.Data = JToken.FromObject(resolutionParams);
+        razorCodeAction.Data = JsonSerializer.SerializeToElement(resolutionParams);
 
         if (!isOnAllowList)
         {

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Models/CodeActionResolveParams.cs

@@ -1,14 +1,17 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
+using System.Text.Json.Serialization;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.CodeActions.Models;
 
 internal sealed class CodeActionResolveParams
 {
+    [JsonPropertyName("data")]
     public object? Data { get; set; }
 
     // Need to use the VS type so that project context info, if present, is maintained
+    [JsonPropertyName("razorFileIdentifier")]
     public required VSTextDocumentIdentifier RazorFileIdentifier { get; set; }
 }

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Models/CreateComponentCodeActionParams.cs

@@ -2,11 +2,14 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.CodeActions.Models;
 
 internal sealed class CreateComponentCodeActionParams
 {
+    [JsonPropertyName("uri")]
     public required Uri Uri { get; set; }
+    [JsonPropertyName("path")]
     public required string Path { get; set; }
 }

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Models/ExtractToCodeBehindCodeActionParams.cs

@@ -2,15 +2,27 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.CodeActions.Models;
 
 internal sealed class ExtractToCodeBehindCodeActionParams
 {
+    [JsonPropertyName("uri")]
     public required Uri Uri { get; set; }
+
+    [JsonPropertyName("extractStart")]
     public int ExtractStart { get; set; }
+
+    [JsonPropertyName("extractEnd")]
     public int ExtractEnd { get; set; }
+
+    [JsonPropertyName("removeStart")]
     public int RemoveStart { get; set; }
+
+    [JsonPropertyName("removeEnd")]
     public int RemoveEnd { get; set; }
+
+    [JsonPropertyName("namespace")]
     public required string Namespace { get; set; }
 }

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Models/GenerateMethodCodeActionParams.cs

@@ -2,13 +2,21 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.CodeActions.Models;
 
 internal class GenerateMethodCodeActionParams
 {
+    [JsonPropertyName("uri")]
     public required Uri Uri { get; set; }
+
+    [JsonPropertyName("methodName")]
     public required string MethodName { get; set; }
+
+    [JsonPropertyName("eventName")]
     public required string EventName { get; set; }
+
+    [JsonPropertyName("isAsync")]
     public required bool IsAsync { get; set; }
 }