Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 11, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/NerdBank.GitVersioning/ReleaseManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand All @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/nbgv/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading