Include PrivateReleaseGitRef to output of GetBuildVersion

dotnet · Apr 28, 2020 · 60bf406 · 60bf406
1 parent 2819578
commit 60bf406
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/NerdBank.GitVersioning/VersionOracle.cs b/src/NerdBank.GitVersioning/VersionOracle.cs
@@ -272,7 +272,10 @@ public IEnumerable<string> BuildMetadataWithCommitId
         /// </summary>
         public int VersionHeightOffset { get; }
 
-        private string BuildingRef { get; }
+        /// <summary>
+        /// Gets the ref (branch or tag) being built.
+        /// </summary>
+        public string BuildingRef { get; }
 
         /// <summary>
         /// Gets the version for this project, with up to 4 components.

diff --git a/src/Nerdbank.GitVersioning.Tasks/GetBuildVersion.cs b/src/Nerdbank.GitVersioning.Tasks/GetBuildVersion.cs
@@ -78,6 +78,13 @@ public GetBuildVersion()
         [Output]
         public bool PublicRelease { get; private set; }
 
+        /// <summary>
+        /// Gets the ref (branch or tag) being built.
+        /// Only specified when this is not a public release.
+        /// </summary>
+        [Output]
+        public string PrivateReleaseGitRef { get; set; }
+
         /// <summary>
         /// Gets the version string to use in the compiled assemblies.
         /// </summary>
@@ -218,6 +225,7 @@ protected override bool ExecuteInner()
                 }
 
                 this.PublicRelease = oracle.PublicRelease;
+                this.PrivateReleaseGitRef = this.PublicRelease ? null : oracle.BuildingRef;
                 this.Version = oracle.Version.ToString();
                 this.AssemblyVersion = oracle.AssemblyVersion.ToString();
                 this.AssemblyFileVersion = oracle.AssemblyFileVersion.ToString();

diff --git a/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.targets b/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.targets
@@ -92,6 +92,7 @@
       <Output TaskParameter="BuildNumber" PropertyName="BuildNumber" />
       <Output TaskParameter="BuildNumber" PropertyName="BuildVersionNumberComponent" />
       <Output TaskParameter="PublicRelease" PropertyName="PublicRelease" />
+      <Output TaskParameter="PrivateReleaseGitRef" PropertyName="PrivateReleaseGitRef" />
       <Output TaskParameter="CloudBuildNumber" PropertyName="CloudBuildNumber" Condition=" '$(CloudBuildNumber)' == '' "/>
       <Output TaskParameter="BuildMetadataFragment" PropertyName="SemVerBuildSuffix" />
       <Output TaskParameter="NuGetPackageVersion" PropertyName="NuGetPackageVersion" />