Merge branch 'master' into bugfix/1257

Author: asbjornu

docs/who.md

@@ -4,6 +4,7 @@ Various people are actively using GitVersion, and taking advantage of the automa
  * [Catel](https://github.com/catel/catel)
  * [ChocolateyGUI](https://github.com/chocolatey/ChocolateyGUI)
  * [GitLink](https://github.com/GitTools/GitLink)
+ * [OctopusDeploy](https://github.com/OctopusDeploy)
  * [Orc.* packages](https://github.com/wildgums?query=orc)
  * [Orchestra](https://github.com/wildgums/orchestra)
  * [Pomona](http://pomona.io/)

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

@@ -29,7 +29,7 @@ branches:
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
-    regex: master
+    regex: master$
     source-branches:
     - develop
     - release

src/GitVersionCore.Tests/IntegrationTests/OtherScenarios.cs

@@ -46,6 +46,20 @@ public void AllowNotHavingMaster()
             }
         }
 
+        [Test]
+        public void AllowHavingVariantsStartingWithMaster()
+        {
+            using (var fixture = new EmptyRepositoryFixture())
+            {
+                fixture.Repository.MakeACommit();
+                fixture.Repository.MakeATaggedCommit("1.0.0");
+                fixture.Repository.MakeACommit();
+                Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("masterfix"));
+
+                fixture.AssertFullSemver("1.0.1-masterfix.1+1");
+            }
+        }
+
         [Test]
         public void AllowHavingMainInsteadOfMaster()
         {

src/GitVersionCore/BuildServers/ContinuaCi.cs

@@ -1,24 +1,16 @@
 namespace GitVersion
 {
-    using Microsoft.Win32;
+    using System;
 
     public class ContinuaCi : BuildServerBase
     {
-        public override bool CanApplyToCurrentContext()
-        {
-            const string KeyName = @"Software\VSoft Technologies\Continua CI Agent";
 
-            if (RegistryKeyExists(KeyName, RegistryView.Registry32))
-            {
-                return true;
-            }
+        public const string EnvironmentVariableName = "ContinuaCI.Version";
 
-            if (RegistryKeyExists(KeyName, RegistryView.Registry64))
-            {
-                return true;
-            }
+        public override bool CanApplyToCurrentContext()
+        {
+            return !string.IsNullOrEmpty(Environment.GetEnvironmentVariable(EnvironmentVariableName));
 
-            return false;
         }
 
         public override string[] GenerateSetParameterMessage(string name, string value)
@@ -32,14 +24,6 @@ public override string[] GenerateSetParameterMessage(string name, string value)
         public override string GenerateSetVersionMessage(VersionVariables variables)
         {
             return string.Format("@@continua[setBuildVersion value='{0}']", variables.FullSemVer);
-        }
-
-        static bool RegistryKeyExists(string keyName, RegistryView registryView)
-        {
-            var localKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, registryView);
-            localKey = localKey.OpenSubKey(keyName);
-
-            return localKey != null;
-        }
+        }    
     }
 }

src/GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -21,7 +21,7 @@ public class ConfigurationProvider
         public const string HotfixBranchRegex = "hotfix(es)?[/-]";
         public const string SupportBranchRegex = "support[/-]";
         public const string DevelopBranchRegex = "dev(elop)?(ment)?$";
-        public const string MasterBranchRegex = "master";
+        public const string MasterBranchRegex = "master$";
         public const string MasterBranchKey = "master";
         public const string ReleaseBranchKey = "release";
         public const string FeatureBranchKey = "feature";