Merged
Conversation
# Conflicts: # tools/appveyor.psm1 # tools/travis.ps1
Add --quiet to git checkout which should resolve error message displayed in AppVeyor
daxian-dbw
approved these changes
Dec 6, 2017
SteveL-MSFT
requested changes
Dec 6, 2017
|
|
||
| - Update the contribution guideline to note that updating the changelog is required. (#5586) | ||
| - Remove Pester as a module include with the PowerShell Packages. | ||
| In the future, you should be able to add it by running `Install-Module Pester`. (#5623, #5631) |
Member
There was a problem hiding this comment.
Should we have this as a sub bullet point to make it clear it's part of the previous sentence. I think typically we've had changes on a single line, but would not want long lines either.
Collaborator
There was a problem hiding this comment.
Shouldn't Start-PSBootstrap check for Pester and just install it (CurrentUser scope) if it isn't on the user's system?
Member
Author
There was a problem hiding this comment.
Why is not a single bullet point adequate?
Member
Author
There was a problem hiding this comment.
Shouldn't
Start-PSBootstrapcheck for Pester and just install it (CurrentUser scope) if it isn't on the user's system?
start-psbootstrap is for the development environment, this is referring to the product.
SteveL-MSFT
approved these changes
Dec 7, 2017
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR Summary
Merge the following PRs to 6.0.0-rc.2:
#5623 Note: merge conflicts had to be resolved because we are specifying release tag in most
start-psbuildstatements in master:#5631