Skip to content

Commit 46ae39f

Browse files
KiLLeRRaTarturcic
authored andcommitted
Added EscapedBranchName variable
1 parent 70e168d commit 46ae39f

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

src/GitVersionCore.Tests/Helpers/TestableVersionVariables.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ internal class TestableVersionVariables : VersionVariables
77
public TestableVersionVariables(
88
string major = "", string minor = "", string patch = "", string buildMetaData = "",
99
string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "",
10-
string sha = "", string shortSha = "", string majorMinorPatch = "", string semVer = "",
11-
string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "",
10+
string escapedBranchName = "", string sha = "", string shortSha = "", string majorMinorPatch = "",
11+
string semVer = "", string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "",
1212
string assemblySemVer = "", string assemblySemFileVer = "", string preReleaseTag = "",
1313
string preReleaseTagWithDash = "", string preReleaseLabel = "", string preReleaseNumber = "",
1414
string weightedPreReleaseNumber = "", string informationalVersion = "", string commitDate = "",
1515
string nugetVersion = "", string nugetVersionV2 = "", string nugetPreReleaseTag = "",
1616
string nugetPreReleaseTagV2 = "", string versionSourceSha = "", string commitsSinceVersionSource = "",
1717
string commitsSinceVersionSourcePadded = "") : base(
18-
major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName,
18+
major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, escapedBranchName,
1919
sha, shortSha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer,
2020
assemblySemVer, assemblySemFileVer, preReleaseTag, weightedPreReleaseNumber, preReleaseTagWithDash,
2121
preReleaseLabel, preReleaseNumber, informationalVersion, commitDate, nugetVersion, nugetVersionV2,

src/GitVersionCore/OutputVariables/VariableProvider.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public VersionVariables GetVariablesFor(SemanticVersion semanticVersion, Effecti
7676
semverFormatValues.BuildMetaDataPadded,
7777
semverFormatValues.FullBuildMetaData,
7878
semverFormatValues.BranchName,
79+
semverFormatValues.EscapedBranchName,
7980
semverFormatValues.Sha,
8081
semverFormatValues.ShortSha,
8182
semverFormatValues.MajorMinorPatch,

src/GitVersionCore/OutputVariables/VersionVariables.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ public VersionVariables(string major,
1818
string buildMetaDataPadded,
1919
string fullBuildMetaData,
2020
string branchName,
21+
string escapedBranchName,
2122
string sha,
2223
string shortSha,
2324
string majorMinorPatch,
@@ -49,6 +50,7 @@ public VersionVariables(string major,
4950
BuildMetaDataPadded = buildMetaDataPadded;
5051
FullBuildMetaData = fullBuildMetaData;
5152
BranchName = branchName;
53+
EscapedBranchName = escapedBranchName;
5254
Sha = sha;
5355
ShortSha = shortSha;
5456
MajorMinorPatch = majorMinorPatch;
@@ -94,6 +96,7 @@ public VersionVariables(string major,
9496
public string FullSemVer { get; private set; }
9597
public string InformationalVersion { get; private set; }
9698
public string BranchName { get; private set; }
99+
public string EscapedBranchName { get; private set; }
97100
public string Sha { get; private set; }
98101
public string ShortSha { get; private set; }
99102
public string NuGetVersionV2 { get; private set; }

src/GitVersionCore/SemanticVersioning/SemanticVersionFormatValues.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ public SemanticVersionFormatValues(SemanticVersion semver, EffectiveConfiguratio
5454

5555
public string BranchName => semver.BuildMetaData.Branch;
5656

57+
public string EscapedBranchName => semver.BuildMetaData.Branch.RegexReplace("[^a-zA-Z0-9-]", "-");
58+
5759
public string Sha => semver.BuildMetaData.Sha;
5860

5961
public string ShortSha => semver.BuildMetaData.ShortSha;

0 commit comments

Comments
 (0)