GitVersion now writes results to console when a compatible build server is found so the build server can also pick up the version without using it as msbuild task

Author: GeertvanHorrik

GitVersion/BuildServers/BuildServerBase.cs

@@ -0,0 +1,33 @@
+namespace GitVersion
+{
+    using System;
+
+    public abstract class BuildServerBase : IBuildServer
+    {
+        public abstract bool CanApplyToCurrentContext();
+        public abstract void PerformPreProcessingSteps(string gitDirectory);
+        public abstract string GenerateSetVersionMessage(string versionToUseForBuildNumber);
+        public abstract string[] GenerateSetParameterMessage(string name, string value);
+
+        public virtual void WriteIntegration(VersionAndBranch versionAndBranch, Action<string> writer)
+        {
+            if (versionAndBranch == null)
+            {
+                return;
+            }
+
+            if (writer == null)
+            {
+                return;
+            }
+
+            writer(string.Format("Executing GenerateSetVersionMessage for '{0}'.", GetType().Name));
+            writer(GenerateSetVersionMessage(versionAndBranch.GenerateSemVer()));
+            writer(string.Format("Executing GenerateBuildLogOutput for '{0}'.", GetType().Name));
+            foreach (var buildParameter in BuildOutputFormatter.GenerateBuildLogOutput(versionAndBranch, this))
+            {
+                writer(buildParameter);
+            }
+        }
+    }
+}

GitVersion/BuildServers/BuildServerList.cs

@@ -30,14 +30,25 @@ static IEnumerable<IBuildServer> DefaultSelector(Arguments arguments)
                 };
             }
 
+            var buildServices = new List<IBuildServer>();
+
             foreach (var buildServer in BuildServers)
             {
-                if (buildServer.CanApplyToCurrentContext())
+                try
+                {
+                    if (buildServer.CanApplyToCurrentContext())
+                    {
+                        Logger.WriteInfo(string.Format("Applicable build agent found: '{0}'.", buildServer.GetType().Name));
+                        buildServices.Add(buildServer);
+                    }
+                }
+                catch (Exception ex)
                 {
-                    Logger.WriteInfo(string.Format("Applicable build agent found: '{0}'.", buildServer.GetType().Name));
-                    yield return buildServer;
+                    Logger.WriteWarning(string.Format("Failed to check build server '{0}': {1}", buildServer.GetType().Name, ex.Message));
                 }
             }
+
+            return buildServices;
         }
     }
 }

GitVersion/BuildServers/ContinuaCi.cs

@@ -2,7 +2,7 @@
 {
     using Microsoft.Win32;
 
-    public class ContinuaCi : IBuildServer
+    public class ContinuaCi : BuildServerBase
     {
         readonly Arguments _arguments;
 
@@ -11,15 +11,24 @@ public ContinuaCi(Arguments arguments)
             _arguments = arguments;
         }
 
-        public bool CanApplyToCurrentContext()
+        public override bool CanApplyToCurrentContext()
         {
-            using (var registryKey = Registry.LocalMachine.OpenSubKey("SOFTWARE\\VSoft Technologies\\Continua CI Agent"))
+            const string KeyName = @"Software\VSoft Technologies\Continua CI Agent";
+
+            if (RegistryKeyExists(KeyName, RegistryView.Registry32))
             {
-                return registryKey != null;
+                return true;
             }
+
+            if (RegistryKeyExists(KeyName, RegistryView.Registry64))
+            {
+                return true;
+            }
+
+            return false;
         }
 
-        public void PerformPreProcessingSteps(string gitDirectory)
+        public override void PerformPreProcessingSteps(string gitDirectory)
         {
             if (string.IsNullOrEmpty(gitDirectory))
             {
@@ -29,18 +38,25 @@ public void PerformPreProcessingSteps(string gitDirectory)
             GitHelper.NormalizeGitDirectory(gitDirectory, _arguments);
         }
 
-        public string[] GenerateSetParameterMessage(string name, string value)
+        public override string[] GenerateSetParameterMessage(string name, string value)
         {
-            return new []
+            return new[]
             {
                 string.Format("@@continua[setVariable name='GitVersion.{0}' value='{1}']", name, value)
             };
         }
 
-        public string GenerateSetVersionMessage(string versionToUseForBuildNumber)
+        public override string GenerateSetVersionMessage(string versionToUseForBuildNumber)
         {
             return string.Format("@@continua[setBuildVersion value='{0}']", versionToUseForBuildNumber);
         }
-    }
 
+        private static bool RegistryKeyExists(string keyName, RegistryView registryView)
+        {
+            var localKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, registryView);
+            localKey = localKey.OpenSubKey(keyName);
+
+            return localKey != null;
+        }
+    }
 }

GitVersion/BuildServers/IBuildServer.cs

@@ -1,10 +1,15 @@
 namespace GitVersion
 {
+    using System;
+
     public interface IBuildServer
     {
         bool CanApplyToCurrentContext();
         void PerformPreProcessingSteps(string gitDirectory);
         string GenerateSetVersionMessage(string versionToUseForBuildNumber);
         string[] GenerateSetParameterMessage(string name, string value);
+
+        void WriteIntegration(VersionAndBranch versionAndBranch, Action<string> writer);
     }
+
 }

GitVersion/BuildServers/TeamCity.cs

@@ -2,7 +2,7 @@
 {
     using System;
 
-    public class TeamCity : IBuildServer
+    public class TeamCity : BuildServerBase
     {
         readonly Arguments _arguments;
 
@@ -12,12 +12,12 @@ public TeamCity(Arguments arguments)
         }
 
 
-        public bool CanApplyToCurrentContext()
+        public override bool CanApplyToCurrentContext()
         {
             return !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TEAMCITY_VERSION"));
         }
 
-        public void PerformPreProcessingSteps(string gitDirectory)
+        public override void PerformPreProcessingSteps(string gitDirectory)
         {
             if (string.IsNullOrEmpty(gitDirectory))
             {
@@ -27,7 +27,7 @@ public void PerformPreProcessingSteps(string gitDirectory)
             GitHelper.NormalizeGitDirectory(gitDirectory, _arguments);
         }
 
-        public string[] GenerateSetParameterMessage(string name, string value)
+        public override string[] GenerateSetParameterMessage(string name, string value)
         {
             return new[]
             {
@@ -37,7 +37,7 @@ public string[] GenerateSetParameterMessage(string name, string value)
             };
         }
 
-        public string GenerateSetVersionMessage(string versionToUseForBuildNumber)
+        public override string GenerateSetVersionMessage(string versionToUseForBuildNumber)
         {
             return string.Format("##teamcity[buildNumber '{0}']", EscapeValue(versionToUseForBuildNumber));
         }

GitVersion/GitVersion.csproj

@@ -54,6 +54,7 @@
   <ItemGroup>
     <Compile Include="ArgumentParser.cs" />
     <Compile Include="Arguments.cs" />
+    <Compile Include="BuildServers\BuildServerBase.cs" />
     <Compile Include="GitFlow\GitFlowVersionFinder.cs" />
     <Compile Include="GitFlow\BranchClassifier.cs" />
     <Compile Include="GitFlow\BranchFinders\DevelopBasedVersionFinderBase.cs" />

GitVersion/Program.cs

@@ -40,6 +40,11 @@ static void Main()
 
                 var versionAndBranch = VersionCache.GetVersion(gitDirectory);
 
+                foreach (var buildServer in applicableBuildServers)
+                {
+                    buildServer.WriteIntegration(versionAndBranch, Logger.WriteInfo);
+                }
+
                 var versionAsKeyValue = versionAndBranch.ToKeyValue();
                 switch (arguments.VersionPart)
                 {

GitVersion/VersionCache.cs

@@ -16,6 +16,7 @@ public static VersionAndBranchAndDate GetVersion(string gitDirectory)
                 {
                     throw new ErrorException("No Tip found. Has repo been initialize?");
                 }
+
                 var ticks = DirectoryDateFinder.GetLastDirectoryWrite(gitDirectory);
                 var key = string.Format("{0}:{1}:{2}", repo.Head.CanonicalName, repo.Head.Tip.Sha, ticks);
                 CachedVersion cachedVersion;

GitVersionTask/WriteVersionInfoToBuildLog.cs

@@ -70,6 +70,5 @@ public void WriteIntegrationParameters(VersionAndBranch versionAndBranch, IEnume
                 }
             }
         }
-  
     }
 }