-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Merge release/dev16.7 to release/dev16.7-vs-deps #45547
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
Merged
sharwell
merged 20 commits into
release/dev16.7-vs-deps
from
merges/release/dev16.7-to-release/dev16.7-vs-deps
Jul 1, 2020
Merged
Merge release/dev16.7 to release/dev16.7-vs-deps #45547
sharwell
merged 20 commits into
release/dev16.7-vs-deps
from
merges/release/dev16.7-to-release/dev16.7-vs-deps
Jul 1, 2020
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
…) in records with the latest design. (#45475) * Align addition of a synthesized override of object.Equals(object? obj) in records with the latest design. Related to #45296. From specification: The record type includes a synthesized override of object.Equals(object? obj). It is an error if the override is declared explicitly. The synthesized override returns Equals(other as R) where R is the record type.
…eferences If you have two projects that reference each other with metadata references, we should avoid converting both of them into project references as that causes a circularity in the Workspace layer. The workspace API correctly throws exceptions if you try to do this, but the Visual Studio project system layer wasn't checking, and so it'd call into the Workspace APIs and throw exceptions. Unfortunately this often resulted in us getting into corrupted states where the data structures got out of sync, which might later result in other exceptions too. This fix isn't entirely correct in that we're not going to re-convert the metadata reference to the project reference if something else breaks the circularity; that's better than crashing so this is an improvement either way. Fixes #39904 Fixes #43633
Co-authored-by: AlekseyTs <AlekseyTs@users.noreply.github.com>
Prevent trying to convert metadata references into circular project references
This reverts commit f755e8a. That change meant our EditorFeatures code was using DllImports in the cross-platform binary, and we weren't sure what that would do in VS for Mac if that code ran. It also brought a dependency on Microsoft.VisualStudio.RemoteControl, which also seems to depend on various Windows specific APIs. We'll finish up the decision of what to do in #45115
Inline rename highlight color in Dark Theme only has a contrast ratio of 1.238:1, and the target is 1.5:1 Original Color: #A6F1A6 New Color: #D3F8D3 Contrast ratio is 1.485:1 with new color Resolves: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1139737
…earch-to-editorfeatures Revert "Move SymbolSearch down to EditorFeatures (#45505)"
ghost
approved these changes
Jun 30, 2020
ghost
left a comment
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
…elease/dev16.7-to-release/dev16.7-vs-deps
Change Signature: Fix for NullReferenceException when trying to add parameter with type modifier
Allow independent methods to have the same parameter name
[LSP] Remove snippets from completion list until they are supported
…ease/dev16.7-to-release/dev16.7-vs-deps
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 into release/dev16.7-vs-deps.
git fetch --all git checkout merges/release/dev16.7-to-release/dev16.7-vs-deps git reset --hard upstream/release/dev16.7-vs-deps git merge upstream/release/dev16.7 # Fix merge conflicts git commit git push upstream merges/release/dev16.7-to-release/dev16.7-vs-deps --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.