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 into privateProtected branch #22071

Merged
merged 20 commits into from
Sep 12, 2017

Conversation

gafter
Copy link
Member

@gafter gafter commented Sep 12, 2017

No description provided.

Ravi Chande and others added 20 commits September 11, 2017 09:00
We were not generating a cached completion item rule for a non-preselected item in a tuple context that was also an alias context
Fixes dotnet#22002
Stop swallowing JTF exceptions
Fix completion crash in tuple in alias
Previously, we supported a light-up ability where we would use the
appropriate completion APIs for Dev14 or Dev15 depending upon which
version of Visual Studio we were targeting. We no longer support such
a configuration, so we can flatten all the code and indirection back
down.
Previously, we supported a light-up ability where we would use the
appropriate Navigate To APIs for Dev14 or Dev15 depending upon which
version of Visual Studio we were targeting. We no longer support such
a configuration, so we can flatten all the code and indirection back
down.
These helpers allowed us to do lightup between Dev14 and Dev15 for some
features. We no longer support Dev14, so that is unnecessary.
This lived in EditorFeatures.Next since it depended on Dev15 features,
but EditorFeatures is now Dev15 only so we can move this.
…udio

We don't need the split anymore now that we're only supporting Dev15.

Unfortunately this required the introduction of a NuGet package that
has a namespace "Workspace" to our VS project, which meant I had to
disambiguate Workspace wherever it's used in that layer. I considered
doing an extern alias instead to disambiguate, but applying that to a
ProjectReference isn't supported. That's tracked by NuGet/Home#4989.
…ioSetup

This transfers all the VSIX contents of VisualStudioSetup.Next
back to VisualStudioSetup, making VisualStudioSetup a Dev15 VSIX again.
Fix up .gitattributes to clone .sh files with LF
* Remove context (enclosing type name) from C# parser.
* Add a test demonstrating that unicode escapes are significant to determining if a method is a ctor.
This is a prerequisite to dotnet#367
@gafter gafter added this to the 15.5 milestone Sep 12, 2017
@gafter gafter self-assigned this Sep 12, 2017
@gafter gafter changed the base branch from master to features/privateProtected September 12, 2017 18:16
@gafter
Copy link
Member Author

gafter commented Sep 12, 2017

test ubuntu_14_debug_prtest please

@gafter
Copy link
Member Author

gafter commented Sep 12, 2017

test windows_release_unit64_prtest please

@gafter gafter merged commit 59d5885 into dotnet:features/privateProtected Sep 12, 2017
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.

5 participants