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

Resolves #187 #196

Merged
merged 1 commit into from
Mar 8, 2020
Merged

Resolves #187 #196

merged 1 commit into from
Mar 8, 2020

Conversation

ominestre
Copy link
Collaborator

Git stage all can accidentally include unintended changes into a release commit. This change explicitly instructs Git to only stage the CHANGELOG and the AssemblyInfo.

Resolves #187

Proposed Changes

In the build scripts Git stage all can accidentally include unintended changes into a release commit. This change explicitly instructs Git to only stage the CHANGELOG and the AssemblyInfo.

Types of changes

What types of changes does your code introduce to MiniScaffold?
Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

  • Build and tests pass locally
  • I have added tests that prove my fix is effective or that my feature works (if appropriate)
  • I have added necessary documentation (if appropriate)

Git stage all can accidentally include unintended changes into a release commit. This change explicitly instructs Git to only stage the CHANGELOG and the AssemblyInfo.

Resolves #187
@ominestre ominestre added the bug label Mar 7, 2020
@ominestre ominestre requested a review from TheAngryByrd March 7, 2020 15:52
@ominestre ominestre self-assigned this Mar 7, 2020
@ominestre
Copy link
Collaborator Author

@TheAngryByrd I didn't get to run a good test on this because of the Nuget publish step. If you have an idea of how to side-step that I can test this out or you're welcome to take a shot.

@TheAngryByrd
Copy link
Owner

Thanks a ton! I'll take a look at adding a test. Might not be worth it given integration points.

Copy link
Owner

@TheAngryByrd TheAngryByrd left a comment

Choose a reason for hiding this comment

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

LGTM

@TheAngryByrd TheAngryByrd merged commit d5b0ee2 into master Mar 8, 2020
@TheAngryByrd TheAngryByrd deleted the limit-release-file-staging branch March 8, 2020 15:26
TheAngryByrd pushed a commit that referenced this pull request Mar 8, 2020
## [0.23.4] - 2020-03-08

### Fixed
- Fixed issues of opening the browser with the docs generation tool from [@TheAngryByrd](https://github.com/TheAngryByrd) - (#195)
- Fixed staging too many files during Release mode from [@ominestre](https://github.com/ominestre) - (#196)
- Fixed an issue with extension recommendations. Microsoft changed their CSharp tooling identifier from [@TheAngryByrd](https://github.com/TheAngryByrd) - (#198)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Limit files staged by Git during a release
2 participants