From 040a1e7f92afced5454553411e379241875be010 Mon Sep 17 00:00:00 2001 From: maliming Date: Thu, 9 Apr 2026 14:30:45 +0800 Subject: [PATCH] Extract DisablePropertyInjection check to avoid duplication --- .../Builder/AbpRegistrationBuilderExtensions.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/framework/src/Volo.Abp.Autofac/Autofac/Builder/AbpRegistrationBuilderExtensions.cs b/framework/src/Volo.Abp.Autofac/Autofac/Builder/AbpRegistrationBuilderExtensions.cs index 2bf2d30605..d587d556d8 100644 --- a/framework/src/Volo.Abp.Autofac/Autofac/Builder/AbpRegistrationBuilderExtensions.cs +++ b/framework/src/Volo.Abp.Autofac/Autofac/Builder/AbpRegistrationBuilderExtensions.cs @@ -105,14 +105,16 @@ public static class AbpRegistrationBuilderExtensions where TActivatorData : ReflectionActivatorData { // Enable Property Injection only for types in an assembly containing an AbpModule and without a DisablePropertyInjection attribute on class or properties. + if (!implementationType.GetCustomAttributes(typeof(DisablePropertyInjectionAttribute), true).IsNullOrEmpty()) + { + return registrationBuilder; + } + if (moduleContainer.Modules.Any(m => m.AllAssemblies.Contains(implementationType.Assembly))) { - if (implementationType.GetCustomAttributes(typeof(DisablePropertyInjectionAttribute), true).IsNullOrEmpty()) - { - registrationBuilder = registrationBuilder.PropertiesAutowired(new AbpPropertySelector(false)); - } + registrationBuilder = registrationBuilder.PropertiesAutowired(new AbpPropertySelector(false)); } - else if (implementationType.GetCustomAttributes(typeof(DisablePropertyInjectionAttribute), true).IsNullOrEmpty()) + else { nonModuleAssemblies?.Add(implementationType.Assembly); }