Merge main to release/v4 (#549)

* Bug fix - Respect root configuration fallback (#547)

* use Lazy<T> to ensure lazy initialization

* use ensureinit pattern without lock

* version bump 4.2.1 (#548)

Author: zhiyuanliang-ms

src/Microsoft.FeatureManagement.AspNetCore/Microsoft.FeatureManagement.AspNetCore.csproj

@@ -6,7 +6,7 @@
   <PropertyGroup>
     <MajorVersion>4</MajorVersion>
     <MinorVersion>2</MinorVersion>
-    <PatchVersion>0</PatchVersion>
+    <PatchVersion>1</PatchVersion>
   </PropertyGroup>
 
   <Import Project="..\..\build\Versioning.props" />

src/Microsoft.FeatureManagement.Telemetry.ApplicationInsights/Microsoft.FeatureManagement.Telemetry.ApplicationInsights.csproj

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <MajorVersion>4</MajorVersion>
     <MinorVersion>2</MinorVersion>
-    <PatchVersion>0</PatchVersion>
+    <PatchVersion>1</PatchVersion>
   </PropertyGroup>
 
   <Import Project="..\..\build\Versioning.props" />

src/Microsoft.FeatureManagement/ConfigurationFeatureDefinitionProvider.cs

@@ -28,6 +28,7 @@ public sealed class ConfigurationFeatureDefinitionProvider : IFeatureDefinitionP
         private readonly ConcurrentDictionary<string, Task<FeatureDefinition>> _definitions;
         private IDisposable _changeSubscription;
         private int _stale = 0;
+        private int _initialized = 0;
         private readonly Func<string, Task<FeatureDefinition>> _getFeatureDefinitionFunc;
 
         const string ParseValueErrorString = "Invalid setting '{0}' with value '{1}' for feature '{2}'.";
@@ -49,10 +50,6 @@ public ConfigurationFeatureDefinitionProvider(IConfiguration configuration)
             {
                 return Task.FromResult(GetMicrosoftSchemaFeatureDefinition(featureName) ?? GetDotnetSchemaFeatureDefinition(featureName));
             };
-
-            _dotnetFeatureDefinitionSections = GetDotnetFeatureDefinitionSections();
-
-            _microsoftFeatureDefinitionSections = GetMicrosoftFeatureDefinitionSections();
         }
 
         /// <summary>
@@ -92,13 +89,15 @@ public Task<FeatureDefinition> GetFeatureDefinitionAsync(string featureName)
                 throw new ArgumentException($"The value '{ConfigurationPath.KeyDelimiter}' is not allowed in the feature name.", nameof(featureName));
             }
 
+            EnsureInit();
+
             if (Interlocked.Exchange(ref _stale, 0) != 0)
             {
-                _definitions.Clear();
-
                 _dotnetFeatureDefinitionSections = GetDotnetFeatureDefinitionSections();
 
                 _microsoftFeatureDefinitionSections = GetMicrosoftFeatureDefinitionSections();
+
+                _definitions.Clear();
             }
 
             return _definitions.GetOrAdd(featureName, _getFeatureDefinitionFunc);
@@ -115,13 +114,15 @@ public Task<FeatureDefinition> GetFeatureDefinitionAsync(string featureName)
         public async IAsyncEnumerable<FeatureDefinition> GetAllFeatureDefinitionsAsync()
 #pragma warning restore CS1998
         {
+            EnsureInit();
+
             if (Interlocked.Exchange(ref _stale, 0) != 0)
             {
-                _definitions.Clear();
-
                 _dotnetFeatureDefinitionSections = GetDotnetFeatureDefinitionSections();
 
                 _microsoftFeatureDefinitionSections = GetMicrosoftFeatureDefinitionSections();
+
+                _definitions.Clear();
             }
 
             foreach (IConfigurationSection featureSection in _microsoftFeatureDefinitionSections)
@@ -163,6 +164,18 @@ public async IAsyncEnumerable<FeatureDefinition> GetAllFeatureDefinitionsAsync()
             }
         }
 
+        private void EnsureInit()
+        {
+            if (_initialized == 0)
+            {
+                _dotnetFeatureDefinitionSections = GetDotnetFeatureDefinitionSections();
+
+                _microsoftFeatureDefinitionSections = GetMicrosoftFeatureDefinitionSections();
+
+                _initialized = 1;
+            }
+        }
+
         private FeatureDefinition GetDotnetSchemaFeatureDefinition(string featureName)
         {
             IConfigurationSection dotnetFeatureDefinitionConfiguration = _dotnetFeatureDefinitionSections

src/Microsoft.FeatureManagement/Microsoft.FeatureManagement.csproj

@@ -6,7 +6,7 @@
   <PropertyGroup>
     <MajorVersion>4</MajorVersion>
     <MinorVersion>2</MinorVersion>
-    <PatchVersion>0</PatchVersion>
+    <PatchVersion>1</PatchVersion>
   </PropertyGroup>
 
   <Import Project="..\..\build\Versioning.props" />

tests/Tests.FeatureManagement/FeatureManagementTest.cs

@@ -90,7 +90,7 @@ public async Task ReadsTopLevelConfiguration()
 
             IFeatureManager featureManager = serviceProvider.GetRequiredService<IFeatureManager>();
 
-            //Assert.True(await featureManager.IsEnabledAsync("FeatureX"));
+            Assert.True(await featureManager.IsEnabledAsync("FeatureX"));
 
             string json = @"
             {