Merge master to master-vs-deps #24746
Closed
Conversation
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
This is necessary to install pre-release .debs of the Mono runtime.
…0180208-080014 Merge dev15.6.x to dev15.7.x
Produce an error when a bridge method must be variadic
* fixed a bug on solution crawler progress report. found case where retry can mess up Start/Stop call. instead trying being smart to reduce Start/Stop call, made it simpler and rely on ref counting on reporter. and the fact that all enqeued work must run at some point. * updated comment * renamed and added comments
…0209-080018 Merge dev15.7.x to master
* connected diagnostic service to task status center * PR feedback updated some variable name and string * fixed test break. task status center and service provider doesn't exist in unit test * made GetProject and GetDocument to have same behavior on given ProjectId/DocumentId * addressed PR feedback * forgot to remove optional * moved diagnostic progress reporter out of error list and made its own thing * removed unnecessary service provider * removed ?. and adjust ordering * removed comment * removed debug only info * address PR feedbacks * update on VoidResult * removed blank line * more feedbacks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is an automatically generated pull request from master into master-vs-deps.
git fetch --all git checkout merges/master-to-master-vs-deps git reset --hard upstream/master-vs-deps git merge upstream/master # Fix merge conflicts git commit git push merges/master-to-master-vs-deps --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.