Register JsonSerializerOptions in the IoC Container

src/OrchardCore.Modules/OrchardCore.AdminMenu/Deployment/AdminMenuDeploymentSource.cs

@@ -1,11 +1,9 @@
 using System.Text.Json;
 using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Options;
 using OrchardCore.AdminMenu.Services;
 using OrchardCore.Deployment;
-using OrchardCore.Json;
 
 namespace OrchardCore.AdminMenu.Deployment
 {
@@ -14,15 +12,10 @@ public class AdminMenuDeploymentSource : IDeploymentSource
         private readonly IAdminMenuService _adminMenuService;
         private readonly JsonSerializerOptions _serializationOptions;
 
-        public AdminMenuDeploymentSource(IAdminMenuService adminMenuService, IOptions<JsonDerivedTypesOptions> derivedTypesOptions)
+        public AdminMenuDeploymentSource(IAdminMenuService adminMenuService, IOptions<JsonSerializerOptions> serializationOptions)
         {
             _adminMenuService = adminMenuService;
-
-            // The recipe step contains polymorphic types which need to be resolved
-            _serializationOptions = new()
-            {
-                TypeInfoResolver = new PolymorphicJsonTypeInfoResolver(derivedTypesOptions.Value)
-            };
+            _serializationOptions = serializationOptions.Value;
         }
 
         public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)

src/OrchardCore.Modules/OrchardCore.AdminMenu/Recipes/AdminMenuStep.cs

@@ -2,11 +2,9 @@
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Options;
 using OrchardCore.AdminMenu.Services;
-using OrchardCore.Json;
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
@@ -20,15 +18,12 @@ public class AdminMenuStep : IRecipeStepHandler
         private readonly IAdminMenuService _adminMenuService;
         private readonly JsonSerializerOptions _serializationOptions;
 
-        public AdminMenuStep(IAdminMenuService adminMenuService, IOptions<JsonDerivedTypesOptions> derivedTypesOptions)
+        public AdminMenuStep(IAdminMenuService adminMenuService, IOptions<JsonSerializerOptions> serializationOptions)
         {
             _adminMenuService = adminMenuService;
 
             // The recipe step contains polymorphic types (menu items) which need to be resolved
-            _serializationOptions = new()
-            {
-                TypeInfoResolver = new PolymorphicJsonTypeInfoResolver(derivedTypesOptions.Value)
-            };
+            _serializationOptions = serializationOptions.Value;
         }
 
         public async Task ExecuteAsync(RecipeExecutionContext context)

src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ContentDefinitionDeploymentSource.cs

@@ -1,6 +1,8 @@
 using System.Linq;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Options;
 using OrchardCore.ContentManagement;
 using OrchardCore.Deployment;
 
@@ -9,10 +11,14 @@ namespace OrchardCore.ContentTypes.Deployment
     public class ContentDefinitionDeploymentSource : IDeploymentSource
     {
         private readonly IContentDefinitionStore _contentDefinitionStore;
+        private readonly JsonSerializerOptions _jsonSerializerOptions;
 
-        public ContentDefinitionDeploymentSource(IContentDefinitionStore contentDefinitionStore)
+        public ContentDefinitionDeploymentSource(
+            IContentDefinitionStore contentDefinitionStore,
+            IOptions<JsonSerializerOptions> jsonSerializerOptions)
         {
             _contentDefinitionStore = contentDefinitionStore;
+            _jsonSerializerOptions = jsonSerializerOptions.Value;
         }
 
         public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
@@ -37,8 +43,8 @@ public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlan
             result.Steps.Add(new JsonObject
             {
                 ["name"] = "ContentDefinition",
-                ["ContentTypes"] = JArray.FromObject(contentTypes),
-                ["ContentParts"] = JArray.FromObject(contentParts),
+                ["ContentTypes"] = JArray.FromObject(contentTypes, _jsonSerializerOptions),
+                ["ContentParts"] = JArray.FromObject(contentParts, _jsonSerializerOptions),
             });
         }
     }

src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ReplaceContentDefinitionDeploymentSource.cs

@@ -1,6 +1,8 @@
 using System.Linq;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Options;
 using OrchardCore.ContentManagement;
 using OrchardCore.Deployment;
 
@@ -9,10 +11,14 @@ namespace OrchardCore.ContentTypes.Deployment
     public class ReplaceContentDefinitionDeploymentSource : IDeploymentSource
     {
         private readonly IContentDefinitionStore _contentDefinitionStore;
+        private readonly JsonSerializerOptions _jsonSerializerOptions;
 
-        public ReplaceContentDefinitionDeploymentSource(IContentDefinitionStore contentDefinitionStore)
+        public ReplaceContentDefinitionDeploymentSource(
+            IContentDefinitionStore contentDefinitionStore,
+            IOptions<JsonSerializerOptions> jsonSerializerOptions)
         {
             _contentDefinitionStore = contentDefinitionStore;
+            _jsonSerializerOptions = jsonSerializerOptions.Value;
         }
 
         public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
@@ -37,8 +43,8 @@ public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlan
             result.Steps.Add(new JsonObject
             {
                 ["name"] = "ReplaceContentDefinition",
-                ["ContentTypes"] = JArray.FromObject(contentTypes),
-                ["ContentParts"] = JArray.FromObject(contentParts),
+                ["ContentTypes"] = JArray.FromObject(contentTypes, _jsonSerializerOptions),
+                ["ContentParts"] = JArray.FromObject(contentParts, _jsonSerializerOptions),
             });
         }
     }

src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/ContentItemDeploymentSource.cs

@@ -1,6 +1,8 @@
 using System.Linq;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Options;
 using OrchardCore.ContentManagement;
 using OrchardCore.Deployment;
 
@@ -9,10 +11,14 @@ namespace OrchardCore.Contents.Deployment.AddToDeploymentPlan
     public class ContentItemDeploymentSource : IDeploymentSource
     {
         private readonly IContentManager _contentManager;
+        private readonly JsonSerializerOptions _jsonSerializerOptions;
 
-        public ContentItemDeploymentSource(IContentManager contentManager)
+        public ContentItemDeploymentSource(
+            IContentManager contentManager,
+            IOptions<JsonSerializerOptions> jsonSerializerOptions)
         {
             _contentManager = contentManager;
+            _jsonSerializerOptions = jsonSerializerOptions.Value;
         }
 
         public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
@@ -31,7 +37,7 @@ public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlan
                 return;
             }
 
-            var jContentItem = JObject.FromObject(contentItem);
+            var jContentItem = JObject.FromObject(contentItem, _jsonSerializerOptions);
             jContentItem.Remove(nameof(ContentItem.Id));
 
             var contentStep = result.Steps.FirstOrDefault(s => s["name"]?.ToString() == "Content");

src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AllContentDeploymentSource.cs

@@ -1,5 +1,7 @@
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Options;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Records;
 using OrchardCore.Deployment;
@@ -10,10 +12,14 @@ namespace OrchardCore.Contents.Deployment
     public class AllContentDeploymentSource : IDeploymentSource
     {
         private readonly ISession _session;
+        private readonly JsonSerializerOptions _jsonSerializerOptions;
 
-        public AllContentDeploymentSource(ISession session)
+        public AllContentDeploymentSource(
+            ISession session,
+            IOptions<JsonSerializerOptions> jsonSerializerOptions)
         {
             _session = session;
+            _jsonSerializerOptions = jsonSerializerOptions.Value;
         }
 
         public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
@@ -34,7 +40,7 @@ public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlan
 
             foreach (var contentItem in await _session.Query<ContentItem, ContentItemIndex>(x => x.Published).ListAsync())
             {
-                var objectData = JObject.FromObject(contentItem);
+                var objectData = JObject.FromObject(contentItem, _jsonSerializerOptions);
 
                 // Don't serialize the Id as it could be interpreted as an updated object when added back to YesSql
                 objectData.Remove(nameof(ContentItem.Id));

src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ContentDeploymentSource.cs

@@ -1,5 +1,7 @@
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Options;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Records;
 using OrchardCore.Deployment;
@@ -11,10 +13,14 @@ namespace OrchardCore.Contents.Deployment
     public class ContentDeploymentSource : IDeploymentSource
     {
         private readonly ISession _session;
+        private readonly JsonSerializerOptions _jsonSerializerOptions;
 
-        public ContentDeploymentSource(ISession session)
+        public ContentDeploymentSource(
+            ISession session,
+            IOptions<JsonSerializerOptions> jsonSerializerOptions)
         {
             _session = session;
+            _jsonSerializerOptions = jsonSerializerOptions.Value;
         }
 
         public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
@@ -32,7 +38,7 @@ public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlan
 
             foreach (var contentItem in await _session.Query<ContentItem, ContentItemIndex>(x => x.Published && x.ContentType.IsIn(contentStep.ContentTypes)).ListAsync())
             {
-                var objectData = JObject.FromObject(contentItem);
+                var objectData = JObject.FromObject(contentItem, _jsonSerializerOptions);
 
                 // Don't serialize the Id as it could be interpreted as an updated object when added back to YesSql.
                 objectData.Remove(nameof(ContentItem.Id));

src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetDeploymentSource.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Options;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Records;
 using OrchardCore.Deployment;
@@ -17,15 +19,18 @@ public class ExportContentToDeploymentTargetDeploymentSource : IDeploymentSource
         private readonly IContentManager _contentManager;
         private readonly ISession _session;
         private readonly IUpdateModelAccessor _updateModelAccessor;
+        private readonly JsonSerializerOptions _jsonSerializerOptions;
 
         public ExportContentToDeploymentTargetDeploymentSource(
             IContentManager contentManager,
             ISession session,
-            IUpdateModelAccessor updateModelAccessor)
+            IUpdateModelAccessor updateModelAccessor,
+            IOptions<JsonSerializerOptions> jsonSerializerOptions)
         {
             _contentManager = contentManager;
             _session = session;
             _updateModelAccessor = updateModelAccessor;
+            _jsonSerializerOptions = jsonSerializerOptions.Value;
         }
 
         public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
@@ -52,7 +57,7 @@ public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlan
                 var contentItem = await _contentManager.GetAsync(model.ContentItemId, model.Latest ? VersionOptions.Latest : VersionOptions.Published);
                 if (contentItem != null)
                 {
-                    var objectData = JObject.FromObject(contentItem);
+                    var objectData = JObject.FromObject(contentItem, _jsonSerializerOptions);
                     objectData.Remove(nameof(ContentItem.Id));
                     data.Add(objectData);
                 }
@@ -64,7 +69,7 @@ public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlan
 
                 foreach (var contentItem in checkedContentItems)
                 {
-                    var objectData = JObject.FromObject(contentItem);
+                    var objectData = JObject.FromObject(contentItem, _jsonSerializerOptions);
                     objectData.Remove(nameof(ContentItem.Id));
                     data.Add(objectData);
                 }

src/OrchardCore.Modules/OrchardCore.CustomSettings/Deployment/CustomSettingsDeploymentSource.cs

@@ -1,7 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Options;
 using OrchardCore.CustomSettings.Services;
 using OrchardCore.Deployment;
 
@@ -10,10 +12,14 @@ namespace OrchardCore.CustomSettings.Deployment
     public class CustomSettingsDeploymentSource : IDeploymentSource
     {
         private readonly CustomSettingsService _customSettingsService;
+        private readonly JsonSerializerOptions _jsonSerializerOptions;
 
-        public CustomSettingsDeploymentSource(CustomSettingsService customSettingsService)
+        public CustomSettingsDeploymentSource(
+            CustomSettingsService customSettingsService,
+            IOptions<JsonSerializerOptions> jsonSerializerOptions)
         {
             _customSettingsService = customSettingsService;
+            _jsonSerializerOptions = jsonSerializerOptions.Value;
         }
 
         public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
@@ -44,7 +50,7 @@ public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlan
             foreach (var settingsType in settingsTypes)
             {
                 var settings = await _customSettingsService.GetSettingsAsync(settingsType);
-                settingsList.Add(new(settings.ContentType, JObject.FromObject(settings)));
+                settingsList.Add(new(settings.ContentType, JObject.FromObject(settings, _jsonSerializerOptions)));
             }
 
             // Adding custom settings

src/OrchardCore.Modules/OrchardCore.Deployment/Deployment/DeploymentPlanDeploymentSource.cs

@@ -1,21 +1,26 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Options;
 
 namespace OrchardCore.Deployment.Deployment
 {
     public class DeploymentPlanDeploymentSource : IDeploymentSource
     {
         private readonly IDeploymentPlanService _deploymentPlanService;
         private readonly IEnumerable<IDeploymentStepFactory> _deploymentStepFactories;
+        private readonly JsonSerializerOptions _jsonSerializerOptions;
 
         public DeploymentPlanDeploymentSource(
             IDeploymentPlanService deploymentPlanService,
-            IEnumerable<IDeploymentStepFactory> deploymentStepFactories)
+            IEnumerable<IDeploymentStepFactory> deploymentStepFactories,
+            IOptions<JsonSerializerOptions> jsonSerializerOptions)
         {
             _deploymentPlanService = deploymentPlanService;
             _deploymentStepFactories = deploymentStepFactories;
+            _jsonSerializerOptions = jsonSerializerOptions.Value;
         }
 
         public async Task ProcessDeploymentStepAsync(DeploymentStep deploymentStep, DeploymentPlanResult result)
@@ -52,7 +57,7 @@ public async Task ProcessDeploymentStepAsync(DeploymentStep deploymentStep, Depl
             result.Steps.Add(new JsonObject
             {
                 ["name"] = "deployment",
-                ["Plans"] = JArray.FromObject(plans),
+                ["Plans"] = JArray.FromObject(plans, _jsonSerializerOptions),
             });
         }
 

src/OrchardCore.Modules/OrchardCore.Deployment/Steps/CustomFileDeploymentSource.cs

@@ -7,9 +7,7 @@ public class CustomFileDeploymentSource : IDeploymentSource
     {
         public Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
         {
-            var customFile = step as CustomFileDeploymentStep;
-
-            if (customFile == null)
+            if (step is not CustomFileDeploymentStep customFile)
             {
                 return Task.CompletedTask;
             }