Skip to content

Conversation

@dotnet-bot
Copy link
Collaborator

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 upstream merges/master-to-master-vs-deps --force

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Auto-approval

Julien Couvreur and others added 4 commits May 29, 2020 17:07
@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/master-to-master-vs-deps to beef218d459cc21ec0cec884a4919e81ce9cbe8c

Wait for callbacks to complete before returning
@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/master-to-master-vs-deps to 3c1c0fcb4dcb296758254fef0751111633af22a0

Youssef1313 and others added 5 commits May 30, 2020 08:16
* RemoveHostClientProvider

* Do not start ServiceHub in command line mode

* Unused usings

* CreateConnection can no longer return null

* Connection refactoring

* Feedback

* Feedback

* Workaround for CodeLens issue

* Address NuGet PackageInstall failure

* Remove NuGet workaroud fixed in 15.9

* Fix potential hang
Fix wrong reporting for removing parenthesis for stackalloc
@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/master-to-master-vs-deps to f74d449c25ee577c6d6d9bc304e30955fe654ef8

@dotnet-bot dotnet-bot requested a review from a team as a code owner May 31, 2020 00:03
@dotnet-bot dotnet-bot requested a review from a team May 31, 2020 00:03
Improve performance of SyntaxTreeIndex checksum computation.
@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/master-to-master-vs-deps to 3fc72c9db23c3bb9c7f0f98c2a6dc6e45dae1711

@RikkiGibson RikkiGibson merged commit 8131c58 into master-vs-deps May 31, 2020
@ghost ghost added this to the Next milestone May 31, 2020
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch May 31, 2020 21:02
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch June 1, 2020 00:02
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch June 1, 2020 00:02
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch June 1, 2020 03:02
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch June 1, 2020 03:02
@RikkiGibson RikkiGibson modified the milestones: Next, 16.7.P3 Jun 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants