Merge branch 'allow-major-precision'

Author: AArnott

src/NerdBank.GitVersioning.Tests/BuildIntegrationTests.cs

@@ -311,6 +311,7 @@ public async Task GetBuildVersion_CustomAssemblyVersion()
     }
 
     [Theory]
+    [InlineData(VersionOptions.VersionPrecision.Major)]
     [InlineData(VersionOptions.VersionPrecision.Build)]
     [InlineData(VersionOptions.VersionPrecision.Revision)]
     public async Task GetBuildVersion_CustomAssemblyVersionWithPrecision(VersionOptions.VersionPrecision precision)
@@ -331,6 +332,7 @@ public async Task GetBuildVersion_CustomAssemblyVersionWithPrecision(VersionOpti
     }
 
     [Theory]
+    [InlineData(VersionOptions.VersionPrecision.Major)]
     [InlineData(VersionOptions.VersionPrecision.Build)]
     [InlineData(VersionOptions.VersionPrecision.Revision)]
     public async Task GetBuildVersion_CustomAssemblyVersionPrecision(VersionOptions.VersionPrecision precision)
@@ -750,11 +752,15 @@ public async Task AssemblyInfo_SuppressedImplicitlyByTargetExt()
 
     private static Version GetExpectedAssemblyVersion(VersionOptions versionOptions, Version version)
     {
-        var assemblyVersionPrecision = versionOptions.AssemblyVersion?.Precision ?? VersionOptions.VersionPrecision.Minor;
-        int assemblyVersionBuild = assemblyVersionPrecision >= VersionOptions.VersionPrecision.Build ? version.Build : 0;
-        int assemblyVersionRevision = assemblyVersionPrecision >= VersionOptions.VersionPrecision.Revision ? version.Revision : 0;
-        Version assemblyVersion = (versionOptions.AssemblyVersion?.Version ?? versionOptions.Version.Version).EnsureNonNegativeComponents();
-        assemblyVersion = new Version(assemblyVersion.Major, assemblyVersion.Minor, assemblyVersionBuild, assemblyVersionRevision);
+        // Function should be very similar to VersionOracle.GetAssemblyVersion()
+        var assemblyVersion = (versionOptions?.AssemblyVersion?.Version ?? versionOptions.Version.Version).EnsureNonNegativeComponents();
+        var precision = versionOptions?.AssemblyVersion?.Precision ?? VersionOptions.DefaultVersionPrecision;
+
+        assemblyVersion = new System.Version(
+            assemblyVersion.Major,
+            precision >= VersionOptions.VersionPrecision.Minor ? assemblyVersion.Minor : 0,
+            precision >= VersionOptions.VersionPrecision.Build ? version.Build : 0,
+            precision >= VersionOptions.VersionPrecision.Revision ? version.Revision : 0);
         return assemblyVersion;
     }
 

src/NerdBank.GitVersioning/AssemblyVersionOptionsConverter.cs

@@ -45,7 +45,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
             var data = value as VersionOptions.AssemblyVersionOptions;
             if (data != null)
             {
-                if (data.Precision == default(VersionOptions.VersionPrecision))
+                if (data.Precision == VersionOptions.DefaultVersionPrecision)
                 {
                     serializer.Serialize(writer, data.Version);
                     return;

src/NerdBank.GitVersioning/VersionOptions.cs

@@ -2,6 +2,7 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.ComponentModel;
     using System.Diagnostics;
     using System.Reflection;
     using Newtonsoft.Json;
@@ -13,6 +14,11 @@
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public class VersionOptions : IEquatable<VersionOptions>
     {
+        /// <summary>
+        /// Default value for <see cref="VersionPrecision"/>.
+        /// </summary>
+        public const VersionPrecision DefaultVersionPrecision = VersionPrecision.Minor;
+
         /// <summary>
         /// The JSON serializer settings to use.
         /// </summary>
@@ -162,7 +168,7 @@ public AssemblyVersionOptions()
             /// </summary>
             /// <param name="version">The assembly version (with major.minor components).</param>
             /// <param name="precision">The additional version precision to add toward matching the AssemblyFileVersion.</param>
-            public AssemblyVersionOptions(Version version, VersionPrecision precision = default(VersionPrecision))
+            public AssemblyVersionOptions(Version version, VersionPrecision precision = DefaultVersionPrecision)
             {
                 this.Version = version;
                 this.Precision = precision;
@@ -178,7 +184,8 @@ public AssemblyVersionOptions()
             /// Gets or sets the additional version precision to add toward matching the AssemblyFileVersion.
             /// </summary>
             [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-            public VersionPrecision Precision { get; set; }
+            [DefaultValue(DefaultVersionPrecision)]
+            public VersionPrecision Precision { get; set; } = DefaultVersionPrecision;
 
             /// <inheritdoc />
             public override bool Equals(object obj) => this.Equals(obj as AssemblyVersionOptions);
@@ -368,6 +375,11 @@ public override int GetHashCode()
         /// </summary>
         public enum VersionPrecision
         {
+            /// <summary>
+            /// The first integer is the last number set. The rest will be zeros.
+            /// </summary>
+            Major,
+
             /// <summary>
             /// The second integer is the last number set. The rest will be zeros.
             /// </summary>

src/NerdBank.GitVersioning/VersionOracle.cs

@@ -282,11 +282,13 @@ private static Version GetAssemblyVersion(Version version, VersionOptions versio
             version = version.EnsureNonNegativeComponents();
 
             var assemblyVersion = versionOptions?.AssemblyVersion?.Version ?? new System.Version(version.Major, version.Minor);
+            var precision = versionOptions?.AssemblyVersion?.Precision ?? VersionOptions.DefaultVersionPrecision;
+
             assemblyVersion = new System.Version(
                 assemblyVersion.Major,
-                assemblyVersion.Minor,
-                versionOptions?.AssemblyVersion?.Precision >= VersionOptions.VersionPrecision.Build ? version.Build : 0,
-                versionOptions?.AssemblyVersion?.Precision >= VersionOptions.VersionPrecision.Revision ? version.Revision : 0);
+                precision >= VersionOptions.VersionPrecision.Minor ? assemblyVersion.Minor : 0,
+                precision >= VersionOptions.VersionPrecision.Build ? version.Build : 0,
+                precision >= VersionOptions.VersionPrecision.Revision ? version.Revision : 0);
             return assemblyVersion.EnsureNonNegativeComponents(4);
         }
     }

src/NerdBank.GitVersioning/version.schema.json

@@ -20,7 +20,7 @@
             "precision": {
               "type": "string",
               "description": "Identifies the last component to be explicitly set in the version.",
-              "enum": [ "minor", "build", "revision" ],
+              "enum": [ "major", "minor", "build", "revision" ],
               "default": "minor"
             }
           }