Update from Core 2.0 to 2.1

Unsettling · May 26, 2021 · 48f311b · 48f311b
1 parent 7dcc693
commit 48f311b
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 26 deletions.
diff --git a/examples/FeatureFlagger.Example.Console/App.config b/examples/FeatureFlagger.Example.Console/App.config
@@ -6,6  6,10 @@
   <startup> 
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
   </startup>
   <appSettings>
     <add key="FeatureFlagger.Reader" value="CONFIG"/>
     <add key="FeatureFlagger.Writer" value="CONFIG"/>
   </appSettings>
   <features>
     <feature name="example" enabled="true">
       <from date="2015-03-20" />

diff --git a/examples/FeatureFlagger.Example.Console/ExampleFeatureFlag.cs b/examples/FeatureFlagger.Example.Console/ExampleFeatureFlag.cs
@@ -1,7  1,7 @@
-using FeatureFlagger.Core;
-
-namespace FeatureFlagger.Example.Console
 namespace FeatureFlagger.Example.Console
 {
     using FeatureFlagger.Core;
 
     public class ExampleFeatureFlag : IFeatureFlagger
     {
     }

diff --git a/examples/FeatureFlagger.Example.Console/FeatureFlagger.Examples.Console.csproj b/examples/FeatureFlagger.Example.Console/FeatureFlagger.Examples.Console.csproj
@@ -2,7  2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
     <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\FeatureFlagger\FeatureFlagger.Core.csproj" />

diff --git a/src/FeatureFlagger.Authorisation/FeatureFlagger.Authorisation.csproj b/src/FeatureFlagger.Authorisation/FeatureFlagger.Authorisation.csproj
@@ -5,7  5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.7" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.7">
      <NoWarn>NU1701</NoWarn>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/FeatureFlagger.ConfigurationReaders/ConfigReader.cs b/src/FeatureFlagger.ConfigurationReaders/ConfigReader.cs
@@ -24,9  24,15 @@ public Feature Read(string featureName, IEnumerable<Feature> features)
 
         public IEnumerable<Feature> ReadAll()
         {
-            var features = (List<Feature>)ConfigurationManager.GetSection("features");
             Configuration config =
                 ConfigurationManager.OpenExeConfiguration(
                     ConfigurationUserLevel.None);
 
-            return features;
             var sectionName = "features";
 
             FeaturesSection section = config.GetSection(sectionName) as FeaturesSection;
 
             return null;
         }
     }
 }
diff --git a/src/FeatureFlagger.ConfigurationReaders/FeaturesSection.cs b/src/FeatureFlagger.ConfigurationReaders/FeaturesSection.cs
@@ -9,7  9,7 @@
 
     using FeatureFlagger.Domain;
 
-    public class FeaturesSection : ConfigurationSection
     public sealed class FeaturesSection : ConfigurationSection
     {
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1059:MembersShouldNotExposeCertainConcreteTypes", MessageId = "System.Xml.XmlNode", Justification = "Standard method")]
         public object Create(

diff --git a/src/FeatureFlagger.ConfigurationReaders/TestReader.cs b/src/FeatureFlagger.ConfigurationReaders/TestReader.cs
@@ -0,0  1,38 @@
 namespace FeatureFlagger.ConfigurationReaders
 {
     using System;
     using System.Collections.Generic;
     using System.Composition;
     using System.Linq;
     using FeatureFlagger.Domain;
 
     [Export(typeof(IConfigurationReader))]
     [ExportMetadata("Reader", "TEST")]
     public class TestReader : IConfigurationReader
     {
         public Feature Read(string featureName, IEnumerable<Feature> features)
         {
             return
                 features.ToList()
                     .Find(
                         f =>
                         f.Name.Equals(
                             featureName,
                             StringComparison.OrdinalIgnoreCase));
         }
 
         public IEnumerable<Feature> ReadAll()
         {
             List<Feature> features = new List<Feature>();
 
             var properties =
                 new Dictionary<string, string> { { "enabled", "true" } };
             var flag = new Flag("Enabled", properties);
             var feature = new Feature("example", new List<Flag> { flag });
 
             features.Add(feature);
 
             return features;
         }
     }
 }
diff --git a/src/FeatureFlagger/FeatureFlagger.cs b/src/FeatureFlagger/FeatureFlagger.cs
@@ -46,7  46,7 @@ private static IConfigurationReader SetReader()
         {
             // set the configuration reader based on an AppSetting.
             var source =
-                ConfigurationManager.AppSettings["FeatureFlaggerSource"]
                 ConfigurationManager.AppSettings["FeatureFlagger.Reader"]
                 ?? Constants.Config;
 
             var reader =
@@ -66,7  66,7 @@ private static IConfigurationWriter SetWriter()
         {
             // set the configuration writer based on an AppSetting.
             var source =
-                ConfigurationManager.AppSettings["FeatureFlaggerSource"];
                 ConfigurationManager.AppSettings["FeatureFlagger.Writer"];
 
             // if a writer isn't required then don't proceed.
             if (string.IsNullOrEmpty(source))

diff --git a/tests/FeatureFlagger.Tests/App.config b/tests/FeatureFlagger.Tests/App.config
@@ -1,18  1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <configSections>
-    <section name="features" type="FeatureFlagger.ConfigurationReaders.FeaturesSection, FeatureFlagger.ConfigurationReaders" />
-  </configSections>
-  <features>
-    <feature name="example" enabled="true"></feature>
-    <feature name="disabled" enabled="false"></feature>
-    <feature name="from" enabled="true">
-      <from date="2015-03-20" />
-    </feature>
-    <feature name="test" enabled="true">
-      <from date="2015-03-20" />
-      <rollout percentage="25" basis="user" name="barndoor" />
-      <fullmoon />
-    </feature>
-  </features>
   <appSettings>
     <add key="FeatureFlagger.Reader" value="TEST"/>
   </appSettings>
 </configuration>
diff --git a/tests/FeatureFlagger.Tests/FeatureFlagger.Tests.csproj b/tests/FeatureFlagger.Tests/FeatureFlagger.Tests.csproj
@@ -1,7  1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <ApplicationIcon />
     <Win32Resource />
   </PropertyGroup>