Rename namespaces.

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs

@@ -35,7 +35,7 @@ using Volo.Abp.Http;
 using Volo.Abp.DynamicProxy;
 using Volo.Abp.GlobalFeatures;
 using Volo.Abp.Http.Modeling;
-using Volo.Abp.Json.Microsoft;
+using Volo.Abp.Json;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI;

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Json/AbpJsonOptionsSetup.cs

@@ -2,8 +2,8 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using Volo.Abp.Json.Microsoft;
-using Volo.Abp.Json.Microsoft.JsonConverters;
+using Volo.Abp.Json.JsonConverters;
+using Volo.Abp.Json;
 
 namespace Volo.Abp.AspNetCore.Mvc.Json
 {

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpJsonValueConverter.cs

@@ -1,6 +1,6 @@
 using System.Text.Json;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Volo.Abp.Json.Microsoft.JsonConverters;
+using Volo.Abp.Json.JsonConverters;
 
 namespace Volo.Abp.EntityFrameworkCore.ValueConverters
 {

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/ExtraPropertiesValueConverter.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Volo.Abp.Json.Microsoft.JsonConverters;
+using Volo.Abp.Json.JsonConverters;
 using Volo.Abp.ObjectExtending;
 
 namespace Volo.Abp.EntityFrameworkCore.ValueConverters

framework/src/Volo.Abp.Json.Newtonsoft/Volo/Abp/Json/AbpJsonModule.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
-using Volo.Abp.Json.Microsoft;
+using Volo.Abp.Json;
 using Volo.Abp.Json.Newtonsoft;
 using Volo.Abp.Modularity;
 

framework/src/Volo.Abp.Json/Volo/Abp/Json/AbpJsonModule.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
-using Volo.Abp.Json.Microsoft;
 using Volo.Abp.Modularity;
 using Volo.Abp.Timing;
 

framework/src/Volo.Abp.Json/Volo/Abp/Json/Microsoft/AbpJsonSerializer.cs → framework/src/Volo.Abp.Json/Volo/Abp/Json/AbpJsonSerializer.cs

@@ -3,7 +3,7 @@ using System.Text.Json;
 using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
 
-namespace Volo.Abp.Json.Microsoft
+namespace Volo.Abp.Json
 {
     public class AbpJsonSerializer : IJsonSerializer, ITransientDependency
     {

framework/src/Volo.Abp.Json/Volo/Abp/Json/Microsoft/AbpJsonSerializerOptions.cs → framework/src/Volo.Abp.Json/Volo/Abp/Json/AbpJsonSerializerOptions.cs

@@ -1,6 +1,6 @@
 using System.Text.Json;
 
-namespace Volo.Abp.Json.Microsoft
+namespace Volo.Abp.Json
 {
     public class AbpJsonSerializerOptions
     {

framework/src/Volo.Abp.Json/Volo/Abp/Json/Microsoft/AbpJsonSerializerOptionsSetup.cs → framework/src/Volo.Abp.Json/Volo/Abp/Json/AbpJsonSerializerOptionsSetup.cs

@@ -1,9 +1,10 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using Volo.Abp.Json.Microsoft.JsonConverters;
+using Volo.Abp.Json.JsonConverters;
+using Volo.Abp.Json;
 
-namespace Volo.Abp.Json.Microsoft
+namespace Volo.Abp.Json
 {
     public class AbpJsonSerializerOptionsSetup : IConfigureOptions<AbpJsonSerializerOptions>
     {

framework/src/Volo.Abp.Json/Volo/Abp/Json/Microsoft/JsonConverters/AbpDateTimeConverter.cs → framework/src/Volo.Abp.Json/Volo/Abp/Json/JsonConverters/AbpDateTimeConverter.cs

@@ -5,7 +5,7 @@ using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Timing;
 
-namespace Volo.Abp.Json.Microsoft.JsonConverters
+namespace Volo.Abp.Json.JsonConverters
 {
     public class AbpDateTimeConverter : JsonConverter<DateTime>, ITransientDependency
     {

framework/src/Volo.Abp.Json/Volo/Abp/Json/Microsoft/JsonConverters/AbpNullableDateTimeConverter.cs → framework/src/Volo.Abp.Json/Volo/Abp/Json/JsonConverters/AbpNullableDateTimeConverter.cs

@@ -5,7 +5,7 @@ using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Timing;
 
-namespace Volo.Abp.Json.Microsoft.JsonConverters
+namespace Volo.Abp.Json.JsonConverters
 {
     public class AbpNullableDateTimeConverter : JsonConverter<DateTime?>, ITransientDependency
     {

framework/src/Volo.Abp.Json/Volo/Abp/Json/Microsoft/JsonConverters/ObjectToInferredTypesConverter.cs → framework/src/Volo.Abp.Json/Volo/Abp/Json/JsonConverters/ObjectToInferredTypesConverter.cs

@@ -2,7 +2,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Volo.Abp.Json.Microsoft.JsonConverters
+namespace Volo.Abp.Json.JsonConverters
 {
     public class ObjectToInferredTypesConverter : JsonConverter<object>
     {

framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/AbpMemoryDbTestModule.cs

@@ -6,6 +6,7 @@ using Volo.Abp.Data;
 using Volo.Abp.Autofac;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Repositories.MemoryDb;
+using Volo.Abp.MemoryDb.JsonConverters;
 using Volo.Abp.TestApp;
 using Volo.Abp.TestApp.Domain;
 

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/EntityJsonConverter.cs → framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/JsonConverters/EntityJsonConverter.cs

@@ -1,8 +1,9 @@
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Volo.Abp.Domain.Entities;
 
-namespace Volo.Abp.Domain.Entities
+namespace Volo.Abp.MemoryDb.JsonConverters
 {
     public class EntityJsonConverter<TEntity, TKey> : JsonConverter<TEntity>
     {

modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationContractsModule.cs

@@ -1,7 +1,7 @@
 using Volo.Abp.Application;
 using Volo.Abp.FeatureManagement.JsonConverters;
 using Volo.Abp.Json;
-using Volo.Abp.Json.Microsoft;
+using Volo.Abp.Json;
 using Volo.Abp.Modularity;
 using Volo.Abp.VirtualFileSystem;
 

modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/JsonConverters/ValueValidatorJsonConverter.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Volo.Abp.Json.Microsoft.JsonConverters;
+using Volo.Abp.Json.JsonConverters;
 using Volo.Abp.Validation.StringValues;
 
 namespace Volo.Abp.FeatureManagement.JsonConverters