Merge pull request #1350 from melnikvitaly/master

JakeGinnivan · web-flow · commit ede269632fdb · 2018-01-04T07:36:37.000+08:00
Fix issue with "tracks-release-branches" and custom release branch names
diff --git a/src/GitVersionCore/VersionCalculation/DevelopVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/DevelopVersionStrategy.cs
@@ -57,7 +57,7 @@ private IEnumerable<BaseVersion> ReleaseBranchBaseVersions(GitVersionContext con
             if (releaseBranchConfig.Any())
             {
                 var releaseBranches = context.Repository.Branches
-                    .Where(b => releaseBranchConfig.Any(c => Regex.IsMatch(b.FriendlyName, c.Key)));
+                    .Where(b => releaseBranchConfig.Any(c => Regex.IsMatch(b.FriendlyName, c.Value.Regex)));
 
                 return releaseBranches
                     .SelectMany(b => GetReleaseVersion(context, b))

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ private IEnumerable<BaseVersion> ReleaseBranchBaseVersions(GitVersionContext con`
`57`	`57`	`if (releaseBranchConfig.Any())`
`58`	`58`	`{`
`59`	`59`	`var releaseBranches = context.Repository.Branches`
`60`		`- .Where(b => releaseBranchConfig.Any(c => Regex.IsMatch(b.FriendlyName, c.Key)));`
	`60`	`+ .Where(b => releaseBranchConfig.Any(c => Regex.IsMatch(b.FriendlyName, c.Value.Regex)));`
`61`	`61`
`62`	`62`	`return releaseBranches`
`63`	`63`	`.SelectMany(b => GetReleaseVersion(context, b))`