OSOE-795: Upgrade to latest OC preview to test System.Text.Json

Lombiq.ChartJs.Samples/Helpers/TransactionMigrationHelpers.cs

@@ -1,10 +1,14 @@
 using Lombiq.ChartJs.Samples.Constants;
 using Lombiq.ChartJs.Samples.Models;
+using OrchardCore.Alias.Models;
+using OrchardCore.Autoroute.Models;
 using OrchardCore.ContentFields.Settings;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata;
 using OrchardCore.ContentManagement.Metadata.Settings;
+using OrchardCore.Taxonomies.Models;
 using OrchardCore.Taxonomies.Settings;
+using OrchardCore.Title.Models;
 using System.Threading.Tasks;
 using YesSql.Sql;
 
@@ -19,17 +23,19 @@ public static async Task<int> CreateTransactionAsync<TPart>(
         string typeItemTaxonomyId)
         where TPart : TransactionPart
     {
+        // We need lower case version of content type name here
+#pragma warning disable CA1308 // Normalize strings to uppercase
+        var aliasName = contentTypeName.ToLowerInvariant() + "-tags";
+#pragma warning restore CA1308 // Normalize strings to uppercase
+
         var taxonomyTypeDefinition = await contentDefinitionManager.GetTypeDefinitionAsync(ContentTypes.Taxonomy);
         var taxonomyItem = await contentManager.NewAsync(taxonomyTypeDefinition.Name);
         taxonomyItem.DisplayText = contentTypeName + " tags";
         taxonomyItem.ContentItemId = typeItemTaxonomyId;
-        taxonomyItem.Content.TitlePart.Title = contentTypeName + " tags";
-        // We need lower case version of content type name here
-#pragma warning disable CA1308 // Normalize strings to uppercase
-        taxonomyItem.Content.AliasPart.Alias = contentTypeName.ToLowerInvariant() + "-tags";
-        taxonomyItem.Content.AutoroutePart.Path = contentTypeName.ToLowerInvariant() + "-tags";
-#pragma warning restore CA1308 // Normalize strings to uppercase
-        taxonomyItem.Content.TaxonomyPart.TermContentType = ContentTypes.Tag;
+        taxonomyItem.Alter<TitlePart>(part => part.Title = contentTypeName + " tags");
+        taxonomyItem.Alter<AliasPart>(part => part.Alias = aliasName);
+        taxonomyItem.Alter<AutoroutePart>(part => part.Path = aliasName);
+        taxonomyItem.Alter<TaxonomyPart>(part => part.TermContentType = ContentTypes.Tag);
         await contentManager.CreateAsync(taxonomyItem, VersionOptions.Published);
 
         await contentDefinitionManager.AlterPartDefinitionAsync<TPart>(part => part

Lombiq.ChartJs.Samples/Lombiq.ChartJs.Samples.csproj

@@ -30,8 +30,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.ContentFields" Version="1.8.2" />
-    <PackageReference Include="OrchardCore.Module.Targets" 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" />
   </ItemGroup>
 
   <ItemGroup>

Lombiq.ChartJs/Lombiq.ChartJs.csproj

@@ -33,7 +33,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">

Lombiq.ChartJs/Models/ChartJsDataSet.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace Lombiq.ChartJs.Models;
 
@@ -9,10 +9,10 @@ public class ChartJsDataSet
 
     public IEnumerable<double?> Data { get; set; }
 
-    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public IEnumerable<string> BackgroundColor { get; set; }
 
-    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public IEnumerable<string> BorderColor { get; set; }
 
     public double BorderWidth { get; set; } = 1;

Lombiq.ChartJs/Models/DataLabelAlignmentConfiguration.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System;
+using System.Text.Json.Serialization;
 
 namespace Lombiq.ChartJs.Models;
 
@@ -8,7 +8,8 @@ public class DataLabelAlignmentConfiguration
     [JsonIgnore]
     public DataLabelAlignment Align { get; set; }
 
-    [JsonProperty("align")]
+    [JsonInclude]
+    [JsonPropertyName("align")]
     internal string AlignText
     {
         get => GetAlignment(Align);
@@ -18,15 +19,18 @@ internal string AlignText
     [JsonIgnore]
     public DataLabelAlignment Anchor { get; set; }
 
-    [JsonProperty("anchor")]
+    [JsonInclude]
+    [JsonPropertyName("anchor")]
     internal string AnchorText
     {
         get => GetAlignment(Anchor);
         set => Anchor = SetAlignment(value);
     }
 
+    [JsonPropertyName("offset")]
     public double Offset { get; set; }
 
+    [JsonPropertyName("font")]
     public FontStyle Font { get; set; }
 
     private static string GetAlignment(DataLabelAlignment value) =>
@@ -49,13 +53,15 @@ private static DataLabelAlignment SetAlignment(string value) =>
 
     public class FontStyle
     {
+        [JsonPropertyName("size")]
         public double Size { get; set; }
 
         [JsonIgnore]
         public bool IsBold { get; set; }
 
-        [JsonProperty("weight")]
-        public string Weight
+        [JsonInclude]
+        [JsonPropertyName("weight")]
+        internal string Weight
         {
             get => IsBold ? "bold" : "normal";
             set => IsBold = value.EqualsOrdinalIgnoreCase("bold");

Lombiq.ChartJs/Models/LineAnnotation.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using OrchardCore.Modules;
+using System.Text.Json.Serialization;
 
 namespace Lombiq.ChartJs.Models;
 
@@ -16,7 +16,7 @@ public string Mode
         set => IsVertical = value.EqualsOrdinalIgnoreCase("vertical");
     }
 
-    [JsonProperty("scaleID")]
+    [JsonPropertyName("scaleID")]
     public string ScaleId => IsVertical ? "x-axis-0" : "y-axis-0";
 
     public double Value { get; set; }

Lombiq.ChartJs/Views/Chart.cshtml

@@ -12,12 +12,6 @@
     const string canvasName = blockName + "__canvas";
 
     var canvasId = $"{canvasName}_{Guid.NewGuid():N}";
-
-    var camelCase = new JsonSerializerSettings
-    {
-        ContractResolver = new DefaultContractResolver { NamingStrategy = new CamelCaseNamingStrategy() },
-        Formatting = Formatting.Indented,
-    };
 }
 <div class="@containerName">
     <canvas id="@canvasId" class="@canvasName"></canvas>
@@ -48,9 +42,9 @@
             type: @Json.Serialize(type),
             data: {
                 labels: @Json.Serialize(labels),
-                datasets: @Json.Serialize(datasets, camelCase),
+                datasets: @Json.Serialize(datasets),
             },
-            options: @Json.Serialize(options, camelCase),
+            options: @Json.Serialize(options),
             plugins: [{
                 beforeDraw: function(chartInstance) {
                     var canvasContext = chartInstance.chart.ctx;

Lombiq.ChartJs/Views/_ViewImports.cshtml

@@ -9,6 +9,6 @@
 @using Lombiq.ChartJs.Constants
 @using Lombiq.ChartJs.Models
 @using Microsoft.AspNetCore.Mvc.Localization
-@using Newtonsoft.Json
-@using Newtonsoft.Json.Serialization
+@using System.Text.Json
+@using System.Text.Json.Serialization
 @using OrchardCore.Mvc.Core.Utilities