diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs index 946be023cc..3b4efd8bf1 100644 --- a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs +++ b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs @@ -81,7 +81,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions continue; } - if (!TypeHelper.IsPrimitiveExtendedIncludingNullable(prm.ParameterInfo.ParameterType)) + if (!TypeHelper.IsPrimitiveExtended(prm.ParameterInfo.ParameterType)) { if (CanUseFormBodyBinding(action, prm)) { diff --git a/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs b/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs index 21f36577d8..9d614687df 100644 --- a/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs +++ b/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs @@ -60,7 +60,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying var responseAsString = AsyncHelper.RunSync(() => MakeRequest(invocation)); //TODO: Think on that - if (TypeHelper.IsPrimitiveExtendedIncludingNullable(invocation.Method.ReturnType, true)) + if (TypeHelper.IsPrimitiveExtended(invocation.Method.ReturnType, true)) { invocation.ReturnValue = Convert.ChangeType(responseAsString, invocation.Method.ReturnType); } @@ -93,7 +93,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying var responseAsString = await MakeRequest(invocation); //TODO: Think on that - if (TypeHelper.IsPrimitiveExtendedIncludingNullable(typeof(T), true)) + if (TypeHelper.IsPrimitiveExtended(typeof(T), true)) { return (T)Convert.ChangeType(responseAsString, typeof(T)); } diff --git a/src/Volo.Abp.Validation/Volo/Abp/Validation/MethodInvocationValidator.cs b/src/Volo.Abp.Validation/Volo/Abp/Validation/MethodInvocationValidator.cs index bf266b3936..d99b3a0f51 100644 --- a/src/Volo.Abp.Validation/Volo/Abp/Validation/MethodInvocationValidator.cs +++ b/src/Volo.Abp.Validation/Volo/Abp/Validation/MethodInvocationValidator.cs @@ -89,7 +89,7 @@ namespace Volo.Abp.Validation { var allowNulls = parameterInfo.IsOptional || parameterInfo.IsOut || - TypeHelper.IsPrimitiveExtendedIncludingNullable(parameterInfo.ParameterType, includeEnums: true); + TypeHelper.IsPrimitiveExtended(parameterInfo.ParameterType, includeEnums: true); context.Errors.AddRange(_objectValidator.GetErrors(parameterValue, parameterInfo.Name, allowNulls)); } diff --git a/src/Volo.Abp.Validation/Volo/Abp/Validation/ObjectValidator.cs b/src/Volo.Abp.Validation/Volo/Abp/Validation/ObjectValidator.cs index 315652b78c..2d92af7221 100644 --- a/src/Volo.Abp.Validation/Volo/Abp/Validation/ObjectValidator.cs +++ b/src/Volo.Abp.Validation/Volo/Abp/Validation/ObjectValidator.cs @@ -86,7 +86,7 @@ namespace Volo.Abp.Validation var validatingObjectType = validatingObject.GetType(); //Do not recursively validate for primitive objects - if (TypeHelper.IsPrimitiveExtendedIncludingNullable(validatingObjectType)) + if (TypeHelper.IsPrimitiveExtended(validatingObjectType)) { return; }