Resolve merge conflicts.

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.csproj

@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftPackageVersion)" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Json\Volo.Abp.Json.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Json.SystemTextJson\Volo.Abp.Json.SystemTextJson.csproj" />
   </ItemGroup>
 
   <ItemGroup>

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs

@@ -1,10 +1,6 @@
-using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
-using System.Linq;
-using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.FeatureManagement.JsonConverters;
 using Volo.Abp.FeatureManagement.Localization;
-using Volo.Abp.Json;
-using Volo.Abp.Json.Newtonsoft;
 using Volo.Abp.Json.SystemTextJson;
 using Volo.Abp.Localization;
 using Volo.Abp.Localization.ExceptionHandling;
@@ -17,7 +13,7 @@ namespace Volo.Abp.FeatureManagement;
 
 [DependsOn(
     typeof(AbpValidationModule),
-    typeof(AbpJsonModule)
+    typeof(AbpJsonSystemTextJsonModule)
 )]
 public class AbpFeatureManagementDomainSharedModule : AbpModule
 {
@@ -42,11 +38,6 @@ public class AbpFeatureManagementDomainSharedModule : AbpModule
             options.MapCodeNamespace("Volo.Abp.FeatureManagement", typeof(AbpFeatureManagementResource));
         });
 
-        Configure<AbpNewtonsoftJsonSerializerOptions>(options =>
-        {
-            options.Converters.Add<NewtonsoftStringValueTypeJsonConverter>();
-        });
-
         var valueValidatorFactoryOptions = context.Services.GetPreConfigureActions<ValueValidatorFactoryOptions>();
         Configure<ValueValidatorFactoryOptions>(options =>
         {

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureGroupDefinitionRecord.cs

@@ -1,5 +1,5 @@
 using System;
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 using Volo.Abp.Data;
 using Volo.Abp.Domain.Entities;
 

modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo/Abp/FeatureManagement/SystemTextJsonStringValueJsonConverter_Tests.cs

@@ -20,7 +20,7 @@ public class SystemTextJsonStringValueJsonConverter_Tests : FeatureManagementApp
 
     protected override void BeforeAddApplication(IServiceCollection services)
     {
-        services.PreConfigure<AbpFeatureManagementApplicationContractsOptions>(options =>
+        services.PreConfigure<ValueValidatorFactoryOptions>(options =>
         {
             options.ValueValidatorFactory.Add(new ValueValidatorFactory<UrlValueValidator>("URL"));
         });