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.

Sign up for GitHub

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

Jump to bottom

Merge release/dev16.5 to release/dev16.5-vs-deps #41921

Merged
12 commits merged into from
Feb 25, 2020
Merged

Merge release/dev16.5 to release/dev16.5-vs-deps #41921

12 commits merged into from
Feb 25, 2020

Conversation

dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from release/dev16.5 into release/dev16.5-vs-deps.

git fetch --all
git checkout merges/release/dev16.5-to-release/dev16.5-vs-deps
git reset --hard upstream/release/dev16.5-vs-deps
git merge upstream/release/dev16.5
# Fix merge conflicts
git commit
git push upstream merges/release/dev16.5-to-release/dev16.5-vs-deps --force

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.

genlu and others added 12 commits February 24, 2020 16:56
@genlu
Fix item sorting
adf7848
@genlu
Add tests
0a23fba
@genlu
Upgrade VS editor packages to 16.5.173-g9c5f5bc040
4a2d146 
This is the version used in VS 16.5 preview 2 (d16.5 16.5.29721.120)
@genlu
Mark unimported attribute item as "expanded" when in attribute context
39f9cdb
@genlu
Fix sorting
17e52cc
@genlu
Fix inconsistent sorting
b588dde
@genlu
Fix nuget version conflict warnings
0a76667
@genlu
Revert "Fix nuget version conflict warnings"
43eeb59 
This reverts commit 9ef11ce3bcd1ddd60391060962158c2f79215170.
@genlu
Revert "Upgrade VS editor packages to 16.5.173-g9c5f5bc040"
078ed21 
This reverts commit f19214b69c2fbc6aa8431e3aceeb8d805bb99c6f.
@genlu
Add tests
2bed76f
@cston
Return null rather than this from INamedTypeSymbol.TupleUnderlyin…
25c439c 
…gType (#41828)

Fixes #41702
@JoeRobich
Merge pull request #41712 from genlu/fixCompletion
f265123 
Fix sorting for import completion
@dotnet-bot dotnet-bot requested review from a team as code owners February 25, 2020 02:22
ghost
ghost approved these changes Feb 25, 2020
View reviewed changes
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

@ghost ghost merged commit 1baa0b3 into release/dev16.5-vs-deps Feb 25, 2020
@ghost ghost deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 25, 2020 04:11
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 25, 2020 06:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 25, 2020 06:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 25, 2020 09:01
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 25, 2020 09:01
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 25, 2020 12:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 25, 2020 12:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 25, 2020 15:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 25, 2020 15:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 25, 2020 18:01
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 25, 2020 18:01
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 25, 2020 21:01
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 26, 2020 06:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 26, 2020 06:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 26, 2020 09:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 26, 2020 09:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 26, 2020 12:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 26, 2020 12:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 26, 2020 15:01
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 26, 2020 15:01
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 26, 2020 18:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 26, 2020 18:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 26, 2020 21:01
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 26, 2020 21:01
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 27, 2020 00:04
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 27, 2020 00:04
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 27, 2020 03:01
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 27, 2020 03:01
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 27, 2020 04:47
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 27, 2020 04:47
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 27, 2020 06:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 27, 2020 06:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 27, 2020 09:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 27, 2020 09:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 27, 2020 12:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 27, 2020 12:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 27, 2020 15:07
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 27, 2020 15:07
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 27, 2020 18:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 27, 2020 18:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 27, 2020 21:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.5-to-release/dev16.5-vs-deps branch February 27, 2020 21:02
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
Assignees
No one assigned
Labels
Area-Infrastructure auto-merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dotnet-bot @genlu @cston @JoeRobich