Merge pull request #123 from Lombiq/issue/OSOE-795

OSOE-795: Upgrade to latest OC preview to test System.Text.Json
Lombiq · May 15, 2024 · a5a6b04 · a5a6b04
2 parents bb8f5f0 + 5c2c52f
commit a5a6b04
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 22 deletions.
diff --git a/Lombiq.VueJs.Samples/Lombiq.VueJs.Samples.csproj b/Lombiq.VueJs.Samples/Lombiq.VueJs.Samples.csproj
@@ -34,10 +34,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.ContentFields" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18200" />
     <PackageReference Include="ZXing.Net.Bindings.ImageSharp.V2" Version="0.16.15" />
   </ItemGroup>
 

diff --git a/Lombiq.VueJs/Lombiq.VueJs.csproj b/Lombiq.VueJs/Lombiq.VueJs.csproj
@@ -13,7 +13,7 @@
     <SourceGeneratorLocation Condition=" '$(Configuration)' != 'Debug' ">
       $(SolutionDir)src\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.SourceGenerators\bin\Release\netstandard2.0\Lombiq.HelpfulLibraries.SourceGenerators.dll
     </SourceGeneratorLocation>
-  </PropertyGroup> 
+  </PropertyGroup>
 
   <Target Name="CustomBeforeCompile" BeforeTargets="Compile">
     <MSBuild Condition="!Exists('$(SourceGeneratorLocation)')" Projects="..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.SourceGenerators\Lombiq.HelpfulLibraries.SourceGenerators.csproj" />
@@ -57,9 +57,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18200" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">

diff --git a/Lombiq.VueJs/Models/GetPageFromQueryResult.cs b/Lombiq.VueJs/Models/GetPageFromQueryResult.cs
@@ -1,13 +1,16 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace Lombiq.VueJs.Models;
 
-[JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))]
 public class GetPageFromQueryResult
 {
+    [JsonPropertyName("items")]
     public IEnumerable<object> Items { get; set; }
+
+    [JsonPropertyName("pageSize")]
     public int PageSize { get; set; }
+
+    [JsonPropertyName("pageCount")]
     public int PageCount { get; set; }
 }
diff --git a/Lombiq.VueJs/Models/UrlAndText.cs b/Lombiq.VueJs/Models/UrlAndText.cs
@@ -1,11 +1,12 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Lombiq.VueJs.Models;
 
-[JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))]
 public class UrlAndText
 {
+    [JsonPropertyName("url")]
     public string Url { get; set; }
+
+    [JsonPropertyName("text")]
     public string Text { get; set; }
 }
diff --git a/Lombiq.VueJs/Services/ServerSideValuesVueSingleFileComponentShapeAmenderBase.cs b/Lombiq.VueJs/Services/ServerSideValuesVueSingleFileComponentShapeAmenderBase.cs
@@ -1,8 +1,7 @@
 using Microsoft.AspNetCore.Html;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
 
 namespace Lombiq.VueJs.Services;
@@ -20,6 +19,12 @@ namespace Lombiq.VueJs.Services;
 /// </remarks>
 public abstract class ServerSideValuesVueSingleFileComponentShapeAmenderBase : IVueSingleFileComponentShapeAmender
 {
+    private static readonly JsonSerializerOptions _camelCaseJsonSerializerOptions = new()
+    {
+        WriteIndented = false,
+        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+    };
+
     /// <summary>
     /// Gets the value used to compare in <see cref="PrependAsync"/>. If this value is <see langword="null"/> then <see
     /// cref="PrependAsync"/> will be called on every Vue.js shape, otherwise only if its name is the value of <see
@@ -40,18 +45,15 @@ public async ValueTask<IEnumerable<IHtmlContent>> PrependAsync(string shapeName)
     {
         if (ShapeName != null && ShapeName != shapeName) return Enumerable.Empty<IHtmlContent>();
 
-        var values = await GetPropertyValueAsync(shapeName);
-        var json = JsonConvert.SerializeObject(
-            values,
-            Formatting.None,
-            new JsonSerializerSettings { ContractResolver = new CamelCasePropertyNamesContractResolver() });
+        var propertyName = JsonSerializer.Serialize(PropertyName);
+        var json = JsonSerializer.SerializeToNode(await GetPropertyValueAsync(shapeName), _camelCaseJsonSerializerOptions);
 
         return new[]
         {
             new HtmlString(
                 "<script>" +
                 "if (!window.Vue.$orchardCore) window.Vue.$orchardCore = {};" +
-                $"window.Vue.$orchardCore[{JsonConvert.SerializeObject(PropertyName)}] = {json};" +
+                $"window.Vue.$orchardCore[{propertyName}] = {json};" +
                 "</script>"),
         };
     }