Skip to content

Commit

Permalink
Merge pull request #720 from codemonkey256/develop
Browse files Browse the repository at this point in the history
(GH-719) Tagged commits on Hotfix branch do not use the correct seman…
  • Loading branch information
AdmiringWorm authored Oct 28, 2020
2 parents 8608f40 + 4580654 commit dd26510
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Cake.Recipe/Content/gitversion.cake
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public class BuildVersion
return new BuildVersion
{
Version = version,
SemVersion = (BuildParameters.BranchType == BranchType.HotFix || BuildParameters.BranchType == BranchType.Release && !BuildParameters.IsTagged) ? uniqueSemVersion?.ToLowerInvariant() : semVersion?.ToLowerInvariant(),
SemVersion = ((BuildParameters.BranchType == BranchType.HotFix || BuildParameters.BranchType == BranchType.Release) && !BuildParameters.IsTagged) ? uniqueSemVersion?.ToLowerInvariant() : semVersion?.ToLowerInvariant(),
Milestone = BuildParameters.IsTagged || context.HasArgument("create-pre-release") ? milestone : version,
CakeVersion = cakeVersion,
InformationalVersion = informationalVersion?.ToLowerInvariant(),
Expand Down

0 comments on commit dd26510

Please sign in to comment.