Skip to content

Comply with the SemVer2.0 format in Metadata #1704

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
asbjornu merged 4 commits into from
Jun 27, 2019
Merged

Comply with the SemVer2.0 format in Metadata #1704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e41c358
Comply with the SemVer2.0 for metadata
Jun 7, 2019
a74a4cc
Merge branch 'master' into feature/issue-1520
Skoucail Jun 19, 2019
a23dfde
Merge branch 'master' into feature/issue-1520
Skoucail Jun 26, 2019
b2dbc96
Merge branch 'master' into feature/issue-1520
arturcic Jun 27, 2019
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
2 changes: 2 additions & 0 deletions src/GitVersionCore.Tests/InformationalVersionBuilderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ public class InformationalVersionBuilderTests : TestBase
[TestCase("myPullRequest", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "unstable3", null, null, "1.2.3-unstable.3+Branch.myPullRequest.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
[TestCase("release-1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "beta2", null, null, "1.2.0-beta.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
[TestCase("release-1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "alpha2", null, null, "1.2.0-alpha.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
[TestCase("release/1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "beta2", null, null, "1.2.0-beta.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
[TestCase("release/1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "alpha2", null, null, "1.2.0-alpha.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
public void ValidateInformationalVersionBuilder(string branchName, string sha, string shortSha, int major, int minor, int patch,
string tag, string versionSourceSha, int? commitsSinceTag, string versionString)
{
Expand Down
11 changes: 9 additions & 2 deletions src/GitVersionCore/SemanticVersionBuildMetaData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ public string ToString(string format, IFormatProvider formatProvider = null)
return string.Format(
"{0}{1}{2}{3}",
CommitsSinceTag,
string.IsNullOrEmpty(Branch) ? null : ".Branch." + Branch,
string.IsNullOrEmpty(Branch) ? null : ".Branch." + FormatMetaDataPart(Branch),
string.IsNullOrEmpty(Sha) ? null : ".Sha." + Sha,
string.IsNullOrEmpty(OtherMetaData) ? null : "." + OtherMetaData)
string.IsNullOrEmpty(OtherMetaData) ? null : "." + FormatMetaDataPart(OtherMetaData))
.TrimStart('.');
default:
throw new ArgumentException("Unrecognised format", "format");
Expand Down Expand Up @@ -171,5 +171,12 @@ public static SemanticVersionBuildMetaData Parse(string buildMetaData)

return semanticVersionBuildMetaData;
}

private string FormatMetaDataPart(string value)
{
if(!string.IsNullOrEmpty(value))
value = Regex.Replace(value, "[^0-9A-Za-z-.]", "-");
return value;
}
}
}