Provided default values for the pre-release-weight, add a testcase to check for default value on the release branch, updated the approved file

Author: Ruh Ullah Shah

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

@@ -37,7 +37,7 @@ branches:
     tracks-release-branches: false
     is-release-branch: false
     is-mainline: true
-    pre-release-weight: 0
+    pre-release-weight: 60000
   release:
     mode: ContinuousDelivery
     tag: beta
@@ -53,7 +53,7 @@ branches:
     tracks-release-branches: false
     is-release-branch: true
     is-mainline: false
-    pre-release-weight: 0
+    pre-release-weight: 30000
   feature:
     mode: ContinuousDelivery
     tag: useBranchName
@@ -71,7 +71,7 @@ branches:
     tracks-release-branches: false
     is-release-branch: false
     is-mainline: false
-    pre-release-weight: 0
+    pre-release-weight: 30000
   pull-request:
     mode: ContinuousDelivery
     tag: PullRequest
@@ -90,7 +90,7 @@ branches:
     tracks-release-branches: false
     is-release-branch: false
     is-mainline: false
-    pre-release-weight: 0
+    pre-release-weight: 30000
   hotfix:
     mode: ContinuousDelivery
     tag: beta
@@ -105,7 +105,7 @@ branches:
     tracks-release-branches: false
     is-release-branch: false
     is-mainline: false
-    pre-release-weight: 0
+    pre-release-weight: 30000
   support:
     mode: ContinuousDelivery
     tag: ''
@@ -118,7 +118,7 @@ branches:
     tracks-release-branches: false
     is-release-branch: false
     is-mainline: true
-    pre-release-weight: 0
+    pre-release-weight: 60000
 ignore:
   sha: []
 commit-date-format: yyyy-MM-dd

src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs

@@ -1,4 +1,4 @@
-using GitTools.Testing;
+using GitTools.Testing;
 using GitVersion;
 using GitVersionCore.Tests;
 using LibGit2Sharp;
@@ -551,6 +551,54 @@ public void FeatureFromReleaseBranch_ShouldNotResetCount()
         }
     }
 
+<<<<<<< HEAD
+=======
+    [Test]
+    public void AssemblySemFileVerShouldBeWeightedByPreReleaseWeight()
+    {
+        var config = new Config
+        {
+            AssemblyFileVersioningFormat = "{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumber}",
+            Branches =
+            {
+                { "release", new BranchConfig
+                    {
+                        PreReleaseWeight = 1000
+                    }
+                }
+            }
+        };
+        using (var fixture = new EmptyRepositoryFixture())
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.3");
+            fixture.Repository.MakeCommits(5);
+            fixture.Repository.CreateBranch("release-2.0.0");
+            fixture.Checkout("release-2.0.0");
+            ConfigurationProvider.ApplyDefaultsTo(config);
+            var variables = fixture.GetVersion(config);
+            Assert.AreEqual(variables.AssemblySemFileVer, "2.0.0.1001");
+        }
+    }
+
+    [Test]
+    public void AssemblySemFileVerShouldBeWeightedByDefaultPreReleaseWeight()
+    {
+        var config = new Config
+        {
+            AssemblyFileVersioningFormat = "{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumber}",
+        };
+        using (var fixture = new EmptyRepositoryFixture())
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.3");
+            fixture.Repository.MakeCommits(5);
+            fixture.Repository.CreateBranch("release-2.0.0");
+            fixture.Checkout("release-2.0.0");
+            ConfigurationProvider.ApplyDefaultsTo(config);
+            var variables = fixture.GetVersion(config);
+            Assert.AreEqual(variables.AssemblySemFileVer, "2.0.0.30001");
+        }
+    }
+
     /// <summary>
     /// Create a feature branch from a release branch, and merge back, then delete it
     /// </summary>
@@ -650,4 +698,4 @@ public void AssemblySemFileVerShouldBeWeightedByPreReleaseWeight()
             Assert.AreEqual(variables.AssemblySemFileVer, "2.0.0.1001");
         }
     }
-}
+}

src/GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -28,6 +28,17 @@ public class ConfigurationProvider
         public const string HotfixBranchKey = "hotfix";
         public const string SupportBranchKey = "support";
         public const string DevelopBranchKey = "develop";
+        public static Dictionary<string, int> DefaultPreReleaseWeight =
+            new Dictionary<string, int>
+            {
+                { DevelopBranchRegex, 0 },
+                { HotfixBranchRegex, 30000 },
+                { ReleaseBranchRegex, 30000 },
+                { FeatureBranchRegex, 30000 },
+                { PullRequestRegex, 30000 },
+                { SupportBranchRegex, 60000 },
+                { MasterBranchRegex, 60000 }
+            };
 
         private const IncrementStrategy DefaultIncrementStrategy = IncrementStrategy.Inherit;
 
@@ -231,7 +242,9 @@ public static void ApplyBranchDefaults(Config config,
             branchConfig.TracksReleaseBranches = branchConfig.TracksReleaseBranches ?? tracksReleaseBranches;
             branchConfig.IsReleaseBranch = branchConfig.IsReleaseBranch ?? isReleaseBranch;
             branchConfig.IsMainline = branchConfig.IsMainline ?? isMainline;
-            branchConfig.PreReleaseWeight = branchConfig.PreReleaseWeight ?? 0;
+            int defaultPreReleaseNumber = 0;
+            DefaultPreReleaseWeight.TryGetValue(branchRegex, out defaultPreReleaseNumber);
+            branchConfig.PreReleaseWeight = branchConfig.PreReleaseWeight ?? defaultPreReleaseNumber;
         }
 
         static Config ReadConfig(string workingDirectory, IFileSystem fileSystem)