Merge pull request #612 from Philo/feature/dynamic-repo-branch-teamcity

re #611 - Ensures branch with dynamic repositories and buildserver

Author: JakeGinnivan

src/GitVersionCore.Tests/BuildServers/BuildServerBaseTests.cs

@@ -44,10 +44,5 @@ public override string[] GenerateSetParameterMessage(string name, string value)
         {
             return new string[0];
         }
-
-        public override string GetCurrentBranch()
-        {
-            throw new NotImplementedException();
-        }
     }
 }

src/GitVersionCore/BuildServers/AppVeyor.cs

@@ -59,10 +59,5 @@ public override string[] GenerateSetParameterMessage(string name, string value)
                 string.Format("Adding Environment Variable. name='GitVersion_{0}' value='{1}']", name, value)
             };
         }
-
-        public override string GetCurrentBranch()
-        {
-            return null;
-        }
     }
 }

src/GitVersionCore/BuildServers/BuildServerBase.cs

@@ -7,7 +7,11 @@ public abstract class BuildServerBase : IBuildServer
         public abstract bool CanApplyToCurrentContext();
         public abstract string GenerateSetVersionMessage(string versionToUseForBuildNumber);
         public abstract string[] GenerateSetParameterMessage(string name, string value);
-        public abstract string GetCurrentBranch();
+
+        public virtual string GetCurrentBranch()
+        {
+            return null;
+        }
 
         public virtual void WriteIntegration(Action<string> writer, VersionVariables variables)
         {

src/GitVersionCore/BuildServers/ContinuaCi.cs

@@ -29,8 +29,6 @@ public override string[] GenerateSetParameterMessage(string name, string value)
             };
         }
 
-        public override string GetCurrentBranch() { return string.Empty; }
-
         public override string GenerateSetVersionMessage(string versionToUseForBuildNumber)
         {
             return string.Format("@@continua[setBuildVersion value='{0}']", versionToUseForBuildNumber);

src/GitVersionCore/BuildServers/Jenkins.cs

@@ -26,8 +26,6 @@ public override string GenerateSetVersionMessage(string versionToUseForBuildNumb
             return versionToUseForBuildNumber;
         }
 
-        public override string GetCurrentBranch() { return string.Empty; }
-
         public override string[] GenerateSetParameterMessage(string name, string value)
         {
             return new[]

src/GitVersionCore/BuildServers/MyGet.cs

@@ -13,8 +13,6 @@ public override bool CanApplyToCurrentContext()
                 && buildRunner.Equals("MyGet", StringComparison.InvariantCultureIgnoreCase);
         }
 
-        public override string GetCurrentBranch() { return string.Empty; }
-
         public override string[] GenerateSetParameterMessage(string name, string value)
         {
             var messages = new List<string>

src/GitVersionCore/BuildServers/TeamCity.cs

@@ -9,8 +9,6 @@ public override bool CanApplyToCurrentContext()
             return !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TEAMCITY_VERSION"));
         }
 
-        public override string GetCurrentBranch() { return string.Empty; }
-
         public override string[] GenerateSetParameterMessage(string name, string value)
         {
             return new[]

src/GitVersionCore/ExecuteCore.cs

@@ -12,12 +12,9 @@ public static VersionVariables ExecuteGitVersion(IFileSystem fileSystem, string
             var gitPreparer = new GitPreparer(targetUrl, dynamicRepositoryLocation, authentication, noFetch, workingDirectory);
             var applicableBuildServers = BuildServerList.GetApplicableBuildServers();
             var buildServer = applicableBuildServers.FirstOrDefault();
-            var currentBranch = buildServer == null ? null : buildServer.GetCurrentBranch();
-            if (!string.IsNullOrEmpty(currentBranch))
-            {
-                Logger.WriteInfo("Branch from build environment: " + currentBranch);
-            }
-            gitPreparer.Initialise(buildServer != null, currentBranch ?? targetBranch);
+
+            gitPreparer.Initialise(buildServer != null, ResolveCurrentBranch(buildServer, targetBranch));
+
             var dotGitDirectory = gitPreparer.GetDotGitDirectory();
             var projectRoot = gitPreparer.GetProjectRootDirectory();
             Logger.WriteInfo(string.Format("Project root is: " + projectRoot));
@@ -40,5 +37,15 @@ public static VersionVariables ExecuteGitVersion(IFileSystem fileSystem, string
 
             return variables;
         }
+
+        private static string ResolveCurrentBranch(IBuildServer buildServer, string targetBranch)
+        {
+            if (buildServer == null) return targetBranch;
+
+            var currentBranch = buildServer.GetCurrentBranch() ?? targetBranch;
+            Logger.WriteInfo("Branch from build environment: " + currentBranch);
+
+            return currentBranch;
+        }
     }
 }