Skip to content

Commit 396fee0

Browse files
committed
Add missing hyphen before commit ID in semver 1 property
Fixes #273
1 parent cf2126c commit 396fee0

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

src/NerdBank.GitVersioning.Tests/VersionOracleTests.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.IO;
33
using System.Linq;
4+
using System.Text.RegularExpressions;
45
using LibGit2Sharp;
56
using Nerdbank.GitVersioning;
67
using Nerdbank.GitVersioning.Tests;
@@ -162,6 +163,22 @@ public void SemVer1PrereleaseConversionPadding()
162163
Assert.Equal("7.8.9-foo-025", oracle.SemVer1);
163164
}
164165

166+
[Fact]
167+
public void SemVerStableNonPublicVersion()
168+
{
169+
var workingCopyVersion = new VersionOptions
170+
{
171+
Version = SemanticVersion.Parse("2.3"),
172+
};
173+
this.WriteVersionFile(workingCopyVersion);
174+
this.InitializeSourceControl();
175+
var oracle = VersionOracle.Create(this.RepoPath);
176+
oracle.PublicRelease = false;
177+
Assert.True(Regex.IsMatch(oracle.SemVer1, @"^2.3.1-[^g]{10}$"));
178+
Assert.True(Regex.IsMatch(oracle.SemVer2, @"^2.3.1-[^g]{10}$"));
179+
Assert.True(Regex.IsMatch(oracle.NuGetPackageVersion, @"^2.3.1-g[a-f0-9]{10}$"));
180+
}
181+
165182
[Fact]
166183
public void DefaultNuGetPackageVersionIsSemVer1PublicRelease()
167184
{

src/NerdBank.GitVersioning/VersionOracle.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ public IDictionary<string, string> CloudBuildVersionVars
377377
/// Gets the build metadata, compliant to SemVer 1.0.
378378
/// </summary>
379379
private string SemVer1BuildMetadata =>
380-
this.PublicRelease ? string.Empty : this.GitCommitIdShort;
380+
this.PublicRelease ? string.Empty : $"-{this.GitCommitIdShort}";
381381

382382
/// <summary>
383383
/// Gets a SemVer 1.0 compliant string that represents this version, including the -gCOMMITID suffix

0 commit comments

Comments
 (0)