Merge pull request #268 from AArnott/revert-264-fix260

Revert "Remove `g` prefix in commit IDs"

Author: AArnott

src/NerdBank.GitVersioning.Tests/BuildIntegrationTests.cs

@@ -176,7 +176,7 @@ public async Task GetBuildVersion_In_Git_But_Head_Lacks_VersionFile()
         Assumes.True(repo.Index[VersionFile.JsonFileName] == null);
         var buildResult = await this.BuildAsync();
         Assert.Equal("3.4.0." + repo.Head.Commits.First().GetIdAsVersion().Revision, buildResult.BuildVersion);
-        Assert.Equal("3.4.0+" + repo.Head.Commits.First().Id.Sha.Substring(0, 10), buildResult.AssemblyInformationalVersion);
+        Assert.Equal("3.4.0+g" + repo.Head.Commits.First().Id.Sha.Substring(0, 10), buildResult.AssemblyInformationalVersion);
     }
 
     [Fact]
@@ -201,7 +201,7 @@ public async Task GetBuildVersion_In_Git_No_VersionFile_At_All()
         repo.Commit("empty", this.Signer, this.Signer, new CommitOptions { AllowEmptyCommit = true });
         var buildResult = await this.BuildAsync();
         Assert.Equal("0.0.1." + repo.Head.Commits.First().GetIdAsVersion().Revision, buildResult.BuildVersion);
-        Assert.Equal("0.0.1+" + repo.Head.Commits.First().Id.Sha.Substring(0, 10), buildResult.AssemblyInformationalVersion);
+        Assert.Equal("0.0.1+g" + repo.Head.Commits.First().Id.Sha.Substring(0, 10), buildResult.AssemblyInformationalVersion);
     }
 
     [Fact]
@@ -915,7 +915,7 @@ private void AssertStandardProperties(VersionOptions versionOptions, BuildResult
         Version assemblyVersion = GetExpectedAssemblyVersion(versionOptions, version);
         var additionalBuildMetadata = from item in buildResult.BuildResult.ProjectStateAfterBuild.GetItems("BuildMetadata")
                                       select item.EvaluatedInclude;
-        var expectedBuildMetadata = $"+{commitIdShort}";
+        var expectedBuildMetadata = $"+g{commitIdShort}";
         if (additionalBuildMetadata.Any())
         {
             expectedBuildMetadata += "." + string.Join(".", additionalBuildMetadata);
@@ -944,7 +944,7 @@ private void AssertStandardProperties(VersionOptions versionOptions, BuildResult
 
         // NuGet is now SemVer 2.0 and will pass additional build metadata if provided
         bool semVer2 = versionOptions?.NuGetPackageVersionOrDefault.SemVer == 2;
-        string pkgVersionSuffix = buildResult.PublicRelease ? string.Empty : $"-{commitIdShort}";
+        string pkgVersionSuffix = buildResult.PublicRelease ? string.Empty : $"-g{commitIdShort}";
         if (semVer2)
         {
             pkgVersionSuffix += expectedBuildMetadataWithoutCommitId;
@@ -965,7 +965,7 @@ private void AssertStandardProperties(VersionOptions versionOptions, BuildResult
             Assert.Equal(expectedVersion, buildNumberSemVer.Version);
             Assert.Equal(buildResult.PrereleaseVersion, buildNumberSemVer.Prerelease);
             string expectedBuildNumberMetadata = hasCommitData && commitIdOptions.WhereOrDefault == VersionOptions.CloudBuildNumberCommitWhere.BuildMetadata
-                ? $"+{commitIdShort}"
+                ? $"+g{commitIdShort}"
                 : string.Empty;
             if (additionalBuildMetadata.Any())
             {

src/NerdBank.GitVersioning.Tests/VersionOracleTests.cs

@@ -189,7 +189,7 @@ public void DefaultNuGetPackageVersionIsSemVer1NonPublicRelease()
         this.InitializeSourceControl();
         var oracle = VersionOracle.Create(this.RepoPath);
         oracle.PublicRelease = false;
-        Assert.Equal($"7.8.9-foo-25-{this.CommitIdShort}", oracle.NuGetPackageVersion);
+        Assert.Equal($"7.8.9-foo-25-g{this.CommitIdShort}", oracle.NuGetPackageVersion);
     }
 
     [Fact]
@@ -240,7 +240,7 @@ public void CanSetSemVer2ForNuGetPackageVersionNonPublicRelease()
         this.InitializeSourceControl();
         var oracle = VersionOracle.Create(this.RepoPath);
         oracle.PublicRelease = false;
-        Assert.Equal($"7.8.9-foo.25.{this.CommitIdShort}", oracle.NuGetPackageVersion);
+        Assert.Equal($"7.8.9-foo.25.g{this.CommitIdShort}", oracle.NuGetPackageVersion);
     }
 
     [Fact]

src/NerdBank.GitVersioning/VersionOracle.cs

@@ -143,7 +143,7 @@ public IEnumerable<string> BuildMetadataWithCommitId
             {
                 if (!string.IsNullOrEmpty(this.GitCommitId))
                 {
-                    yield return this.GitCommitId.Substring(0, 10);
+                    yield return $"g{this.GitCommitId.Substring(0, 10)}";
                 }
 
                 foreach (string identifier in this.BuildMetadata)
@@ -362,7 +362,7 @@ public IDictionary<string, string> CloudBuildVersionVars
         public int SemVer1NumericIdentifierPadding => this.VersionOptions?.SemVer1NumericIdentifierPaddingOrDefault ?? 4;
 
         private string SemVer1BuildMetadata =>
-            this.PublicRelease ? string.Empty : $"-{this.GitCommitIdShort}";
+            this.PublicRelease ? string.Empty : $"-g{this.GitCommitIdShort}";
 
         /// <summary>
         /// Gets the build metadata that is appropriate for SemVer2 use.
@@ -377,7 +377,7 @@ public IDictionary<string, string> CloudBuildVersionVars
 
         private string PrereleaseVersionSemVer1 => MakePrereleaseSemVer1Compliant(this.PrereleaseVersion, this.SemVer1NumericIdentifierPadding);
 
-        private string GitCommitIdShortForNonPublicPrereleaseTag => (string.IsNullOrEmpty(this.PrereleaseVersion) ? "-" : ".") + this.GitCommitIdShort;
+        private string GitCommitIdShortForNonPublicPrereleaseTag => (string.IsNullOrEmpty(this.PrereleaseVersion) ? "-" : ".") + $"g{this.GitCommitIdShort}";
 
         private VersionOptions.CloudBuildNumberOptions CloudBuildNumberOptions { get; }