Skip to content
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.

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

Add "prepare-release" command #291

Merged
merged 47 commits into from
Feb 2, 2019
Merged

Add "prepare-release" command #291

merged 47 commits into from
Feb 2, 2019

Conversation

ap0llo
Copy link
Contributor

@ap0llo ap0llo commented Jan 27, 2019

This PR adds the prepare-release command as discussed in #287

I made a minor modification to the feature compared to what was discussed in the issue. The setting to control the name of release branches does not use {0} as a placeholder for the version but {version}. I think this makes it more consistent with the version setting which uses {height}

Closes #287

Before this change, although the version file was committed, git thought the file was both added to the index and deleted locally. By useing Stage, the working directory is in a clean state after CommitVersionFile()
When incrementing major or minor version, set following version components to 0
Copy link
Collaborator

@AArnott AArnott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks so much. You're clearly meticulous with error and edge cases. Awesome!

I'm preparing a few changes locally that I'll push to your branch. But I do have one question for you.

src/NerdBank.GitVersioning/GitExtensions.cs Show resolved Hide resolved
@AArnott
Copy link
Collaborator

AArnott commented Feb 2, 2019

I just tried this command out in one of my repos. There were two issues:

  1. The // comments were stripped. I can probably live with that.
  2. The $schema field was dropped.

We must fix the $schema field dropping issue, since that's how many folks get intellisense for the file.

@AArnott
Copy link
Collaborator

AArnott commented Feb 2, 2019

I've fixed the $schema issue.

This stops us from commiting a change that just changes trivia in the file.
Also decreased message verbosity to STDOUT
@AArnott AArnott merged commit 2b81b0b into dotnet:master Feb 2, 2019
AArnott pushed a commit that referenced this pull request Oct 9, 2024
Bumps [xunit](https://github.com/xunit/xunit) from 2.9.1 to 2.9.2.
- [Commits](xunit/xunit@v2-2.9.1...v2-2.9.2)

---
updated-dependencies:
- dependency-name: xunit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants