Merge pull request #468 from microsoft/main

Merge main into release v3

Author: zhiyuanliang-ms

README.md

@@ -4,7 +4,6 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

examples/ConsoleApp/ConsoleApp.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

examples/FeatureFlagDemo/FeatureFlagDemo.csproj

@@ -8,7 +8,7 @@ namespace FeatureFlagDemo.Pages.Shared
     [IgnoreAntiforgeryToken]
     public class ErrorModel : PageModel
     {
-        public string? RequestId { get; set; }
+        public string RequestId { get; set; }
 
         public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
 

examples/FeatureFlagDemo/Views/Shared/Error.cshtml.cs

@@ -4,7 +4,6 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

examples/TargetingConsoleApp/TargetingConsoleApp.csproj

@@ -4,8 +4,8 @@
   <!-- Official Version -->
   <PropertyGroup>
     <MajorVersion>3</MajorVersion>
-    <MinorVersion>3</MinorVersion>
-    <PatchVersion>1</PatchVersion>
+    <MinorVersion>4</MinorVersion>
+    <PatchVersion>0</PatchVersion>
   </PropertyGroup>
 
   <Import Project="..\..\build\Versioning.props" />

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

@@ -58,12 +58,12 @@ public ConfigurationFeatureDefinitionProvider(IConfiguration configuration)
         /// <summary>
         /// The option that controls the behavior when "FeatureManagement" section in the configuration is missing.
         /// </summary>
-        public bool RootConfigurationFallbackEnabled { get; init; }
+        public bool RootConfigurationFallbackEnabled { get; set; }
 
         /// <summary>
         /// The logger for the configuration feature definition provider.
         /// </summary>
-        public ILogger Logger { get; init; }
+        public ILogger Logger { get; set; }
 
         /// <summary>
         /// Disposes the change subscription of the configuration.

src/Microsoft.FeatureManagement/ConfigurationFeatureDefinitionProvider.cs

@@ -358,25 +358,20 @@ private static bool IsDurationCompliantWithDaysOfWeek(TimeSpan duration, int int
 
             foreach (DayOfWeek dayOfWeek in sortedDaysOfWeek)
             {
-                if (prev == DateTime.MinValue)
-                {
-                    prev = firstDayOfThisWeek.AddDays(
-                        CalculateWeeklyDayOffset(dayOfWeek, firstDayOfWeek));
-                }
-                else
-                {
-                    DateTime date = firstDayOfThisWeek.AddDays(
+                DateTime date = firstDayOfThisWeek.AddDays(
                         CalculateWeeklyDayOffset(dayOfWeek, firstDayOfWeek));
 
+                if (prev != DateTime.MinValue)
+                {
                     TimeSpan gap = date - prev;
 
                     if (gap < minGap)
                     {
                         minGap = gap;
                     }
-
-                    prev = date;
                 }
+
+                prev = date;
             }
 
             //

src/Microsoft.FeatureManagement/FeatureFilters/Recurrence/RecurrenceValidator.cs

@@ -34,12 +34,12 @@ public TimeWindowFilter(ILoggerFactory loggerFactory = null)
         /// <summary>
         /// The application memory cache to store the start time of the closest active time window. By caching this time, the time window can minimize redundant computations when evaluating recurrence.
         /// </summary>
-        public IMemoryCache Cache { get; init; }
+        public IMemoryCache Cache { get; set; }
 
         /// <summary>
         /// This property allows the time window filter in our test suite to use simulated time.
         /// </summary>
-        internal ISystemClock SystemClock { get; init; }
+        internal ISystemClock SystemClock { get; set; }
 
         /// <summary>
         /// Binds configuration representing filter parameters to <see cref="TimeWindowFilterSettings"/>.

src/Microsoft.FeatureManagement/FeatureFilters/TimeWindowFilter.cs

@@ -21,11 +21,11 @@ public sealed class FeatureManager : IFeatureManager
         private readonly TimeSpan ParametersCacheAbsoluteExpirationRelativeToNow = TimeSpan.FromDays(1);
 
         private readonly IFeatureDefinitionProvider _featureDefinitionProvider;
-        private readonly IEnumerable<IFeatureFilterMetadata> _featureFilters;
-        private readonly IEnumerable<ISessionManager> _sessionManagers;
         private readonly ConcurrentDictionary<string, IFeatureFilterMetadata> _filterMetadataCache;
         private readonly ConcurrentDictionary<string, ContextualFeatureFilterEvaluator> _contextualFeatureFilterCache;
         private readonly FeatureManagementOptions _options;
+        private IEnumerable<IFeatureFilterMetadata> _featureFilters;
+        private IEnumerable<ISessionManager> _sessionManagers;
 
         private class ConfigurationCacheItem
         {
@@ -60,7 +60,7 @@ public IEnumerable<IFeatureFilterMetadata> FeatureFilters
         {
             get => _featureFilters;
 
-            init
+            set
             {
                 _featureFilters = value ?? throw new ArgumentNullException(nameof(value));
             }
@@ -74,7 +74,7 @@ public IEnumerable<ISessionManager> SessionManagers
         {
             get => _sessionManagers;
 
-            init
+            set
             {
                 _sessionManagers = value ?? throw new ArgumentNullException(nameof(value));
             }
@@ -83,12 +83,12 @@ public IEnumerable<ISessionManager> SessionManagers
         /// <summary>
         /// The application memory cache to store feature filter settings.
         /// </summary>
-        public IMemoryCache Cache { get; init; }
+        public IMemoryCache Cache { get; set; }
 
         /// <summary>
         /// The logger for the feature manager.
         /// </summary>
-        public ILogger Logger { get; init; }
+        public ILogger Logger { get; set; }
 
         /// <summary>
         /// Checks whether a given feature is enabled.

src/Microsoft.FeatureManagement/FeatureManager.cs

@@ -4,8 +4,8 @@
   <!-- Official Version -->
   <PropertyGroup>
     <MajorVersion>3</MajorVersion>
-    <MinorVersion>3</MinorVersion>
-    <PatchVersion>1</PatchVersion>
+    <MinorVersion>4</MinorVersion>
+    <PatchVersion>0</PatchVersion>
   </PropertyGroup>
 
   <Import Project="..\..\build\Versioning.props" />
@@ -15,7 +15,9 @@
     <SignAssembly>true</SignAssembly>
     <DelaySign>false</DelaySign>
     <AssemblyOriginatorKeyFile>..\..\build\Microsoft.FeatureManagement.snk</AssemblyOriginatorKeyFile>
-    <LangVersion>9.0</LangVersion>
+    <!-- Microsoft.FeatureManagement uses the feature of async streams which is not supported in versions of C# earlier than 8.0. 
+        The library targets on netstandard 2.0. To ensure compatibility, the minimum language version requirement should be maintained. -->
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup>

src/Microsoft.FeatureManagement/IsExternalInit.cs

@@ -752,11 +752,11 @@ public async Task ThreadsafeSnapshot()
 
             await Task.WhenAll(tasks);
 
-            bool result = tasks.First().Result;
+            bool result = await tasks.First();
 
             foreach (Task<bool> t in tasks)
             {
-                Assert.Equal(result, t.Result);
+                Assert.Equal(result, await t);
             }
         }