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.

tmat and others added 2 commits May 23, 2020 20:22
* RemoveHostClientProvider

* Dispose cancellation source

* Do not start ServiceHub in command line mode

* Unused usings

* Fix

* Do not remote operations on non-VS Workspace

* Better tests
@dotnet-bot dotnet-bot requested review from a team as code owners May 24, 2020 06:06
@dotnet-bot dotnet-bot added Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch. labels May 24, 2020
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

@JoeRobich JoeRobich merged commit 4c6e1a9 into master-vs-deps May 24, 2020
@ghost ghost added this to the Next milestone May 24, 2020
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch May 24, 2020 18:02
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch May 24, 2020 21:02
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch May 24, 2020 21:02
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch May 25, 2020 00:02
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch May 25, 2020 00:02
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch May 25, 2020 03:02
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch May 25, 2020 06:02
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch May 25, 2020 09:02
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch May 25, 2020 09:02
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch May 25, 2020 12:03
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch May 25, 2020 12:03
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch May 25, 2020 15:02
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch May 25, 2020 15:02
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch May 25, 2020 18:02
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch May 25, 2020 18:02
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch May 25, 2020 21:02
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch May 25, 2020 21: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

Labels

Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants