Merge master to features/param-nullchecking#36479
Merged
22 commits merged intofeatures/param-nullcheckingfrom Jun 15, 2019
Merged
Merge master to features/param-nullchecking#3647922 commits merged intofeatures/param-nullcheckingfrom
22 commits merged intofeatures/param-nullcheckingfrom
Conversation
Address formatting style suggestion. Co-Authored-By: Gen Lu <genlu@users.noreply.github.com>
Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/824308/ In Naming Styles, we previously hadn't been localizing the "Symbol Kinds" list, along with the other two lists there (Accessibilities and Modifiers). We've decided to loc just the "Symbol Kinds" list because the other two lists are exclusively language keywords.
Reduce dependencies
…-to-release/dev16.2-preview3 Merge release/dev16.2-preview2 to release/dev16.2-preview3
Fix #33560 Handle equal tokens where Text is not available.
…-to-master Merge release/dev16.2-preview3 to master
The resource in question has an ID that is 414 characters long. This is apparently too long for some of the tools used by the loc team, blocking parts of their processes. The exact failure mechanism is not well understood but in order to avoid problems with the final loc pass for 16.2 I'm just going to go ahead and shorten it. Unfortunately no one knows how long resource IDs can be before they cause problems. At the suggestion of the loc team I'm shortening this one by 50 characters which lines up nicely with a natural break in the ID.
Loc the Naming Specification Symbol Kinds
Add EditorFeatures.WPF dependency to F# ExternalAccess
Shorten a resource ID
…tracker Revert "Extract the RDT implementation for Misc files and VS open file tracker"
This pull request was closed.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
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 master into features/param-nullchecking.
(created from a manual run of the PR generation tool)
git fetch --all git checkout merges/master-to-features/param-nullchecking git reset --hard upstream/features/param-nullchecking git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-features/param-nullchecking --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.