Skip to content

New Variable: EscapedBranchName #2157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arturcic merged 2 commits into from
Mar 5, 2020
Merged

New Variable: EscapedBranchName #2157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ca0f56
Added EscapedBranchName variable
KiLLeRRaT Mar 5, 2020
eca4a2f
Added new EscapedBranchName variable
KiLLeRRaT Mar 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Added EscapedBranchName variable
  • Loading branch information
@KiLLeRRaT
KiLLeRRaT committed Mar 5, 2020
commit 8ca0f562a2fff52b7268c18d0b5ac150ffb417ea
6 changes: 3 additions & 3 deletions src/GitVersionCore.Tests/Helpers/TestableVersionVariables.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ internal class TestableVersionVariables : VersionVariables
public TestableVersionVariables(
string major = "", string minor = "", string patch = "", string buildMetaData = "",
string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "",
string sha = "", string shortSha = "", string majorMinorPatch = "", string semVer = "",
string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "",
string escapedBranchName = "", string sha = "", string shortSha = "", string majorMinorPatch = "",
string semVer = "", string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "",
string assemblySemVer = "", string assemblySemFileVer = "", string preReleaseTag = "",
string preReleaseTagWithDash = "", string preReleaseLabel = "", string preReleaseNumber = "",
string weightedPreReleaseNumber = "", string informationalVersion = "", string commitDate = "",
string nugetVersion = "", string nugetVersionV2 = "", string nugetPreReleaseTag = "",
string nugetPreReleaseTagV2 = "", string versionSourceSha = "", string commitsSinceVersionSource = "",
string commitsSinceVersionSourcePadded = "") : base(
major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName,
major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, escapedBranchName,
sha, shortSha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer,
assemblySemVer, assemblySemFileVer, preReleaseTag, weightedPreReleaseNumber, preReleaseTagWithDash,
preReleaseLabel, preReleaseNumber, informationalVersion, commitDate, nugetVersion, nugetVersionV2,
Expand Down
1 change: 1 addition & 0 deletions src/GitVersionCore/OutputVariables/VariableProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public VersionVariables GetVariablesFor(SemanticVersion semanticVersion, Effecti
semverFormatValues.BuildMetaDataPadded,
semverFormatValues.FullBuildMetaData,
semverFormatValues.BranchName,
semverFormatValues.EscapedBranchName,
semverFormatValues.Sha,
semverFormatValues.ShortSha,
semverFormatValues.MajorMinorPatch,
Expand Down
3 changes: 3 additions & 0 deletions src/GitVersionCore/OutputVariables/VersionVariables.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public VersionVariables(string major,
string buildMetaDataPadded,
string fullBuildMetaData,
string branchName,
string escapedBranchName,
string sha,
string shortSha,
string majorMinorPatch,
Expand Down Expand Up @@ -49,6 +50,7 @@ public VersionVariables(string major,
BuildMetaDataPadded = buildMetaDataPadded;
FullBuildMetaData = fullBuildMetaData;
BranchName = branchName;
EscapedBranchName = escapedBranchName;
Sha = sha;
ShortSha = shortSha;
MajorMinorPatch = majorMinorPatch;
Expand Down Expand Up @@ -94,6 +96,7 @@ public VersionVariables(string major,
public string FullSemVer { get; private set; }
public string InformationalVersion { get; private set; }
public string BranchName { get; private set; }
public string EscapedBranchName { get; private set; }
public string Sha { get; private set; }
public string ShortSha { get; private set; }
public string NuGetVersionV2 { get; private set; }
Expand Down
2 changes: 2 additions & 0 deletions src/GitVersionCore/SemanticVersioning/SemanticVersionFormatValues.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ public SemanticVersionFormatValues(SemanticVersion semver, EffectiveConfiguratio

public string BranchName => semver.BuildMetaData.Branch;

public string EscapedBranchName => semver.BuildMetaData.Branch.RegexReplace("[^a-zA-Z0-9-]", "-");

public string Sha => semver.BuildMetaData.Sha;

public string ShortSha => semver.BuildMetaData.ShortSha;
Expand Down