Merge pull request #24517 from abpframework/auto-merge/rel-10-0/4230

Merge branch rel-10.1 with rel-10.0

Author: maliming

framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureChecker.cs

@@ -28,7 +28,12 @@ public FeatureChecker(
 
     public override async Task<string?> GetOrNullAsync(string name)
     {
-        var featureDefinition = await FeatureDefinitionManager.GetAsync(name);
+        var featureDefinition = await FeatureDefinitionManager.GetOrNullAsync(name);
+        if (featureDefinition == null)
+        {
+            return null;
+        }
+        
         var providers = FeatureValueProviderManager.ValueProviders
             .Reverse();
 

framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingProvider.cs

@@ -23,7 +23,12 @@ public SettingProvider(
 
     public virtual async Task<string?> GetOrNullAsync(string name)
     {
-        var setting = await SettingDefinitionManager.GetAsync(name);
+        var setting = await SettingDefinitionManager.GetOrNullAsync(name);
+        if (setting == null)
+        {
+            return null;
+        }
+
         var providers = Enumerable
             .Reverse(SettingValueProviderManager.Providers);
 

modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingManager_Basic_Tests.cs

@@ -18,11 +18,10 @@ public SettingManager_Basic_Tests()
     }
 
     [Fact]
-    public async Task Should_Throw_Exception_When_Try_To_Get_An_Undefined_Setting()
+    public async Task Should_Return_Null_When_Try_To_Get_An_Undefined_Setting()
     {
-        await Assert.ThrowsAsync<AbpException>(
-            async () => await _settingProvider.GetOrNullAsync("UndefinedSetting")
-        );
+        var value = await _settingProvider.GetOrNullAsync("UndefinedSetting");
+        value.ShouldBeNull();
     }
 
     [Fact]
@@ -64,15 +63,15 @@ public async Task Should_Set_Global_Value()
         (await _settingManager.GetOrNullGlobalAsync("MySetting1")).ShouldBe("43");
         (await _settingProvider.GetOrNullAsync("MySetting1")).ShouldBe("43");
     }
-    
+
     [Fact]
     public async Task Set_Should_Throw_Exception_If_Provider_Not_Found()
     {
         var exception = await Assert.ThrowsAsync<AbpException>(async () =>
         {
             await _settingManager.SetAsync("MySetting1", "43", "UndefinedProvider", "Test");
         });
-        
+
         exception.Message.ShouldBe("Unknown setting value provider: UndefinedProvider");
     }
-}
+}