From cf24ef3b56a899c8c450f324be4bf4d77bc65f4d Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@gmail.com>
Date: Fri, 19 Oct 2018 16:36:30 -0700
Subject: [PATCH] Add a few properties for easier processing at the command
 line

Closes #233
---
 src/NerdBank.GitVersioning/VersionOracle.cs | 28 ++++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/NerdBank.GitVersioning/VersionOracle.cs b/src/NerdBank.GitVersioning/VersionOracle.cs
index f4f73f27..6fd30b24 100644
--- a/src/NerdBank.GitVersioning/VersionOracle.cs
+++ b/src/NerdBank.GitVersioning/VersionOracle.cs
@@ -98,7 +98,7 @@ public VersionOracle(string projectDirectory, LibGit2Sharp.Repository repo, LibG
 
             this.VersionHeightOffset = this.VersionOptions?.BuildNumberOffsetOrDefault ?? 0;
 
-            this.PrereleaseVersion = ReplaceMacros(this.VersionOptions?.Version.Prerelease ?? string.Empty);
+            this.PrereleaseVersion = this.ReplaceMacros(this.VersionOptions?.Version.Prerelease ?? string.Empty);
 
             this.CloudBuildNumberOptions = this.VersionOptions?.CloudBuild?.BuildNumberOrDefault ?? VersionOptions.CloudBuildNumberOptions.DefaultInstance;
 
@@ -186,10 +186,15 @@ public IEnumerable<string> BuildMetadataWithCommitId
         public bool PublicRelease { get; set; }
 
         /// <summary>
-        /// Gets the prerelease version information.
+        /// Gets the prerelease version information, including a leading hyphen.
         /// </summary>
         public string PrereleaseVersion { get; }
 
+        /// <summary>
+        /// Gets the prerelease version information, omitting the leading hyphen, if any.
+        /// </summary>
+        public string PrereleaseVersionNoLeadingHyphen => this.PrereleaseVersion?.TrimStart('-');
+
         /// <summary>
         /// Gets the version information without a Revision component.
         /// </summary>
@@ -203,13 +208,28 @@ public IEnumerable<string> BuildMetadataWithCommitId
         public int BuildNumber => Math.Max(0, this.Version.Build);
 
         /// <summary>
-        /// Gets or sets the major.minor version string.
+        /// Gets the <see cref="Version.Revision"/> component of the <see cref="Version"/>.
+        /// </summary>
+        public int VersionRevision => this.Version.Revision;
+
+        /// <summary>
+        /// Gets the major.minor version string.
         /// </summary>
         /// <value>
         /// The x.y string (no build number or revision number).
         /// </value>
         public Version MajorMinorVersion => new Version(this.Version.Major, this.Version.Minor);
 
+        /// <summary>
+        /// Gets the <see cref="Version.Major"/> component of the <see cref="Version"/>.
+        /// </summary>
+        public int VersionMajor => this.Version.Major;
+
+        /// <summary>
+        /// Gets the <see cref="Version.Minor"/> component of the <see cref="Version"/>.
+        /// </summary>
+        public int VersionMinor => this.Version.Minor;
+
         /// <summary>
         /// Gets the Git revision control commit id for HEAD (the current source code version).
         /// </summary>
@@ -355,7 +375,7 @@ public IEnumerable<string> BuildMetadataWithCommitId
         private string SemVer2BuildMetadata =>
             (this.PublicRelease ? string.Empty : this.GitCommitIdShortForNonPublicPrereleaseTag) + FormatBuildMetadata(this.BuildMetadata);
 
-        private string PrereleaseVersionSemVer1 => MakePrereleaseSemVer1Compliant(this.PrereleaseVersion, SemVer1NumericIdentifierPadding);
+        private string PrereleaseVersionSemVer1 => MakePrereleaseSemVer1Compliant(this.PrereleaseVersion, this.SemVer1NumericIdentifierPadding);
 
         private string GitCommitIdShortForNonPublicPrereleaseTag => (string.IsNullOrEmpty(this.PrereleaseVersion) ? "-" : ".") + $"g{this.GitCommitIdShort}";