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 master to master vs deps #32162

Merged

Conversation

jmarolf
Copy link
Contributor

@jmarolf jmarolf commented Jan 4, 2019

emergency merge from master to master-vs-deps

davkean and others added 4 commits January 4, 2019 17:04
CPS-based projects have moved from a "fake" IVsHierarchy being passed to the Roslyn to returning the "real" hiearchy representing the project. This results in GetItemContext actually returning a real implementation of "IWebApplicationCtxSvc" instead of previously failing.

This implementation returns S_OK and an "empty" project name - to indicate that it doesn't actually handle the call (with a giant TODO). Handle that situation and treated it as failed, so that we proceed onto IVsContainedLanguageProjectNameProvider which provides the real underlying value.

This is blocking dotnet/project-system#4419.
Handle GetIntellisenseProjectName returning empty
@jmarolf jmarolf requested a review from a team as a code owner January 4, 2019 19:00
@jmarolf jmarolf merged commit 75e3797 into dotnet:master-vs-deps Jan 4, 2019
xoofx pushed a commit to stark-lang/stark-roslyn that referenced this pull request Apr 16, 2019
@jmarolf jmarolf deleted the merge-master-to-master-vs-deps branch January 27, 2020 17:02
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