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

Merge release/dev16.7-preview1 to master #43922

Merged
merged 17 commits into from
May 5, 2020

Conversation

dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from release/dev16.7-preview1 into master.

git fetch --all
git checkout merges/release/dev16.7-preview1-to-master
git reset --hard upstream/master
git merge upstream/release/dev16.7-preview1
# Fix merge conflicts
git commit
git push upstream merges/release/dev16.7-preview1-to-master --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

CyrusNajmabadi and others added 2 commits May 2, 2020 18:25
Disallow generating IEquatable for Ref Struct
* Remove direct usage of Connection

* Refactor connection pooling

* SolutionChecksumUpdater

* GlobalNotificationRemoteDeliveryService
@dotnet-bot dotnet-bot added the Merge Conflicts There are merge conflicts with the base branch. label May 3, 2020
@sharwell
Copy link
Member

sharwell commented May 4, 2020

I believe the wait removed in #43752 was already removed from master in #43928, and have resolved the merge conflicts with that approach. I'm removing the auto-merge label so @tmat can confirm that I have correctly resolved this.

@sharwell sharwell removed Merge Conflicts There are merge conflicts with the base branch. auto-merge labels May 4, 2020
@sharwell sharwell requested a review from tmat May 4, 2020 00:13
@sharwell sharwell merged commit 634ab3e into master May 5, 2020
@ghost ghost added this to the Next milestone May 5, 2020
@sharwell sharwell deleted the merges/release/dev16.7-preview1-to-master branch May 5, 2020 18:47
@JoeRobich JoeRobich modified the milestones: Next, 16.7.P2 May 18, 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.

6 participants