-
Notifications
You must be signed in to change notification settings - Fork 4k
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
Conversation
This file contains 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
Unlike Equals(object), which discussion seems to prefer generating broken code, generating IEquatable is always invalid This PR makes it so IEquatable can not be generated as a fix for ref structs
ghost
approved these changes
May 3, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Auto-approval
Disallow generating IEquatable for Ref Struct
* Remove direct usage of Connection * Refactor connection pooling * SolutionChecksumUpdater * GlobalNotificationRemoteDeliveryService
dotnet-bot
added
the
Merge Conflicts
There are merge conflicts with the base branch.
label
May 3, 2020
…erges/release/dev16.7-preview1-to-master
sharwell
removed
Merge Conflicts
There are merge conflicts with the base branch.
auto-merge
labels
May 4, 2020
tmat
approved these changes
May 4, 2020
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 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.