Skip to content

Commit 44ab723

Browse files
committed
Merge pull request GitTools#3315 from arturcic/feature/1054
1 parent b4d828c commit 44ab723

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

GitVersion.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
assembly-versioning-scheme: MajorMinorPatch
2+
branches:
3+
main:
4+
tag: beta
5+
support:
6+
tag: beta

build/common/Utilities/ContextExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public static void ValidateOutput(this ICakeContext context, string cmd, string?
7575
var outputStr = string.Concat(output);
7676
context.Information(outputStr);
7777

78-
Assert.Equal(expected, expected);
78+
Assert.Equal(expected, outputStr);
7979
}
8080

8181
public static bool IsEnabled(this ICakeContext context, string envVar, bool nullOrEmptyAsEnabled = true)

src/GitVersion.Core/Configuration/BranchConfiguration.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,15 @@ public BranchConfiguration(BranchConfiguration branchConfiguration)
4040
[YamlMember(Alias = "label")]
4141
public string? Label { get; set; }
4242

43+
44+
// TODO: Remove in 6.0
45+
[YamlMember(Alias = "tag")]
46+
public string? Tag
47+
{
48+
get => Label;
49+
set => Label = value;
50+
}
51+
4352
[YamlMember(Alias = "increment")]
4453
public IncrementStrategy? Increment { get; set; }
4554

0 commit comments

Comments
 (0)