Added tests for overriding develop tag via config and updated msbuild Tasks

Author: JakeGinnivan

GitVersionCore.Tests/GitFlow/DevelopScenarios.cs

@@ -15,6 +15,34 @@ public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
             fixture.AssertFullSemver("1.1.0-unstable.0+0");
         }
     }
+    
+    [Test]
+    public void CanChangeDevelopTagViaConfig()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config
+        {
+            DevelopBranchTag = "alpha"
+        }))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.0");
+            fixture.Repository.CreateBranch("develop").Checkout();
+            fixture.AssertFullSemver("1.1.0-alpha.0+0");
+        }
+    }
+    
+    [Test]
+    public void CanClearDevelopTagViaConfig()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config
+        {
+            DevelopBranchTag = ""
+        }))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.0");
+            fixture.Repository.CreateBranch("develop").Checkout();
+            fixture.AssertFullSemver("1.1.0+0");
+        }
+    }
 
     [Test]
     public void WhenDevelopBranchedFromMasterDetachedHead_MinorIsIncreased()

GitVersionTask/AssemblyInfoBuilder/UpdateAssemblyInfo.cs

@@ -12,6 +12,10 @@ public class UpdateAssemblyInfo : Task
     {
         public string AssemblyVersioningScheme { get; set; }
 
+        public string DevelopBranchTag { get; set; }
+
+        public string ReleaseBranchTag { get; set; }
+
         [Required]
         public string SolutionDirectory { get; set; }
 
@@ -68,6 +72,30 @@ public void InnerExecute()
                 return;
 
             var config = ConfigurationProvider.Provide(gitDirectory);
+            if (!string.IsNullOrEmpty(AssemblyVersioningScheme))
+            {
+                AssemblyVersioningScheme versioningScheme;
+                if (Enum.TryParse(AssemblyVersioningScheme, true, out versioningScheme))
+                {
+                    config.AssemblyVersioningScheme = versioningScheme;
+                }
+                else
+                {
+                    throw new WarningException(string.Format("Unexpected assembly versioning scheme '{0}'.", AssemblyVersioningScheme));
+                }
+            }
+
+            // TODO This should be covered by tests
+            // Null is intentional. Empty string means the user has set the value to an empty string and wants to clear the tag
+            if (DevelopBranchTag != null)
+            {
+                config.DevelopBranchTag = DevelopBranchTag;
+            }
+
+            if (ReleaseBranchTag != null)
+            {
+                config.ReleaseBranchTag = ReleaseBranchTag;
+            }
 
             CachedVersion semanticVersion;
             if (!VersionAndBranchFinder.TryGetVersion(SolutionDirectory, out semanticVersion, config))
@@ -96,11 +124,10 @@ AssemblyVersioningScheme GetAssemblyVersioningScheme(Config config)
 
         void CreateTempAssemblyInfo(CachedVersion semanticVersion, Config config)
         {
-            var versioningScheme = GetAssemblyVersioningScheme(config);
             var assemblyInfoBuilder = new AssemblyInfoBuilder
                                       {
                                           CachedVersion = semanticVersion,
-                                          AssemblyVersioningScheme = versioningScheme,
+                                          AssemblyVersioningScheme = config.AssemblyVersioningScheme,
                                       };
             var assemblyInfo = assemblyInfoBuilder.GetAssemblyInfoText();
 

GitVersionTask/GetVersion.cs

@@ -72,6 +72,10 @@ public class GetVersion : Task
         [Output]
         public string NuGetVersion { get; set; }
 
+        public string DevelopBranchTag { get; set; }
+
+        public string ReleaseBranchTag { get; set; }
+
         TaskLogger logger;
 
         public GetVersion()
@@ -88,6 +92,19 @@ public override bool Execute()
                 CachedVersion versionAndBranch;
                 var gitDirectory = GitDirFinder.TreeWalkForGitDir(SolutionDirectory);
                 var config = ConfigurationProvider.Provide(gitDirectory);
+
+                // TODO This should be covered by tests
+                // Null is intentional. Empty string means the user has set the value to an empty string and wants to clear the tag
+                if (DevelopBranchTag != null)
+                {
+                    config.DevelopBranchTag = DevelopBranchTag;
+                }
+
+                if (ReleaseBranchTag != null)
+                {
+                    config.ReleaseBranchTag = ReleaseBranchTag;
+                }
+
                 if (VersionAndBranchFinder.TryGetVersion(SolutionDirectory, out versionAndBranch, config))
                 {
                     var thisType = typeof(GetVersion);