Support for features to be treated the same way as feature

Author: Oren Novotny

src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt

@@ -19,7 +19,7 @@ branches:
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
-  feature[/-]:
+  features?[/-]:
     mode: ContinuousDelivery
     tag: useBranchName
     increment: Inherit

src/GitVersionCore.Tests/GitVersionContextTests.cs

@@ -69,7 +69,7 @@ public void CanFindParentBranchForInheritingIncrementStrategy()
                 Branches =
                 {
                     { "dev(elop)?(ment)?$", new BranchConfig { Increment = IncrementStrategy.Major} },
-                    { "feature[/-]", new BranchConfig { Increment = IncrementStrategy.Inherit} }
+                    { "features?[/-]", new BranchConfig { Increment = IncrementStrategy.Inherit} }
                 }
             };
 

src/GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs

@@ -111,6 +111,20 @@ public void TestFeatureBranch()
         }
     }
 
+    [Test]
+    public void TestFeaturesBranch()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.0");
+            fixture.Repository.CreateBranch("features/test");
+            fixture.Repository.Checkout("features/test");
+            fixture.Repository.MakeCommits(5);
+
+            fixture.AssertFullSemver("1.0.1-test.1+5");
+        }
+    }
+
     [Test]
     public void WhenTwoFeatureBranchPointToTheSameCommit()
     {

src/GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -32,7 +32,7 @@ public static void ApplyDefaultsTo(Config config)
 
             ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "master"), defaultTag: string.Empty, defaultPreventIncrement: true);
             ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "release[/-]"), defaultTag: "beta", defaultPreventIncrement: true);
-            ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "feature[/-]"), defaultIncrementStrategy: IncrementStrategy.Inherit);
+            ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "features?[/-]"), defaultIncrementStrategy: IncrementStrategy.Inherit);
             ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, @"(pull|pull\-requests|pr)[/-]"),
                 defaultTag: "PullRequest",
                 defaultTagNumberPattern: @"[/-](?<number>\d+)[-/]",