Merge pull request #1281 from dotnet/1280-inherited-versionjson-changed-unexpectedly-by-nbgv-prepare-release

Fix `nbgv prepare-release` command to honor inheriting version.json files

Author: AArnott

src/NerdBank.GitVersioning/ReleaseManager.cs

@@ -270,7 +270,9 @@ private void UpdateVersion(LibGit2Context context, SemanticVersion oldVersion, S
         Requires.NotNull(context, nameof(context));
 
         Signature signature = this.GetSignature(context.Repository);
-        VersionOptions versionOptions = context.VersionFile.GetVersion();
+
+        // Retrieve the version options carefully to avoid 'flattening' an inheriting version.json file.
+        VersionOptions versionOptions = context.VersionFile.GetVersion(VersionFileRequirements.NonMergedResult | VersionFileRequirements.VersionSpecified | VersionFileRequirements.AcceptInheritingFile, out VersionFileLocations locations);
 
         if (IsVersionDecrement(oldVersion, newVersion))
         {
@@ -288,7 +290,7 @@ private void UpdateVersion(LibGit2Context context, SemanticVersion oldVersion, S
             }
 
             versionOptions.Version = newVersion;
-            string filePath = context.VersionFile.SetVersion(context.AbsoluteProjectDirectory, versionOptions, includeSchemaProperty: true);
+            string filePath = context.VersionFile.SetVersion(locations.VersionSpecifyingVersionDirectory, versionOptions, includeSchemaProperty: true);
 
             global::LibGit2Sharp.Commands.Stage(context.Repository, filePath);
 

src/nbgv/Program.cs

@@ -912,7 +912,7 @@ private static Task<int> OnPrepareReleaseCommand(string project, string nextVers
             VersionOptions.ReleaseVersionIncrement? versionIncrementParsed = default;
             if (!string.IsNullOrEmpty(versionIncrement))
             {
-                if (!Enum.TryParse<VersionOptions.ReleaseVersionIncrement>(versionIncrement, true, out VersionOptions.ReleaseVersionIncrement parsed))
+                if (!Enum.TryParse(versionIncrement, true, out VersionOptions.ReleaseVersionIncrement parsed))
                 {
                     Console.Error.WriteLine($"\"{versionIncrement}\" is not a valid version increment");
                     return Task.FromResult((int)ExitCodes.InvalidVersionIncrement);