Merge pull request #6054 from abpframework/maliming/Enhancement-5952

Enhance the function of PR 5952.

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

@@ -23,7 +23,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Json
                 return new SystemTextJsonInputFormatter(jsonOptions.Value, logger);
             });
 
-            builder.Services.AddTransient<DefaultObjectPoolProvider>();
+            builder.Services.TryAddTransient<DefaultObjectPoolProvider>();
             //NewtonsoftJsonInputFormatter
             builder.Services.AddTransient(provider =>
             {

framework/src/Volo.Abp.Auditing/Volo.Abp.Auditing.csproj

@@ -23,8 +23,4 @@
     <ProjectReference Include="..\Volo.Abp.Timing\Volo.Abp.Timing.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-  </ItemGroup>
-
 </Project>

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/EntityHelper.cs

@@ -246,36 +246,5 @@ namespace Volo.Abp.Domain.Entities
                     ? new Type[] { typeof(DisableIdGenerationAttribute) }
                     : new Type[] { });
         }
-
-        public static void TrySetId<TKey>(
-            object entity,
-            TKey id,
-            bool checkForDisableIdGenerationAttribute = false)
-        {
-            var property = CachedIdProperties.GetOrAdd(
-                $"{entity.GetType().FullName}-{checkForDisableIdGenerationAttribute}", () =>
-                {
-                    var idProperty = entity
-                        .GetType()
-                        .GetProperties()
-                        .FirstOrDefault(x => x.Name == nameof(IEntity<object>.Id) &&
-                                             x.GetSetMethod(true) != null);
-
-                    if (idProperty == null)
-                    {
-                        return null;
-                    }
-
-                    if (checkForDisableIdGenerationAttribute &&
-                        idProperty.IsDefined(typeof(DisableIdGenerationAttribute), true))
-                    {
-                        return null;
-                    }
-
-                    return idProperty;
-                });
-
-            property?.SetValue(entity, id);
-        }
     }
 }

framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/JsonConverters/EntityJsonConverter.cs

@@ -6,6 +6,7 @@ using Volo.Abp.Domain.Entities;
 namespace Volo.Abp.MemoryDb.JsonConverters
 {
     public class EntityJsonConverter<TEntity, TKey> : JsonConverter<TEntity>
+        where TEntity : IEntity<TKey>
     {
         public override TEntity Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
@@ -16,7 +17,7 @@ namespace Volo.Abp.MemoryDb.JsonConverters
             var id = JsonSerializer.Deserialize<TKey>(idJsonElement.GetRawText());
             if (id != null)
             {
-                EntityHelper.TrySetId(entity, id);
+                EntityHelper.TrySetId(entity, () => id);
             }
 
             return entity;

modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.csproj

@@ -13,9 +13,5 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-  </ItemGroup>
 
 </Project>