Skip to content

Merge master to master-vs-deps#46199

Merged
22 commits merged intomaster-vs-depsfrom
merges/master-to-master-vs-deps
Jul 22, 2020
Merged

Merge master to master-vs-deps#46199
22 commits merged intomaster-vs-depsfrom
merges/master-to-master-vs-deps

Conversation

@dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from master into master-vs-deps.

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

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

Youssef1313 and others added 19 commits June 3, 2020 22:22
This supports go to def / impl / far from a c# file to a razor file.
Co-authored-by: CyrusNajmabadi <cyrus.najmabadi@gmail.com>
Add support for navigation to mapped file paths.
Rename ComilerTraitDiscoverer.cs to CompilerTraitDiscoverer.cs
Enable CompletionUsesTrackingPointsInTheFaceOfAutomaticBraceCompletion
…-to-master

Merge release/dev16.8-preview1 to master
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

@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/master-to-master-vs-deps to 6af3aa7c483967c40935959ab7a789c130b19342

@ghost ghost merged commit d9b6c0e into master-vs-deps Jul 22, 2020
@ghost ghost deleted the merges/master-to-master-vs-deps branch July 22, 2020 04:32
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch July 22, 2020 06:02
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch July 22, 2020 06:02
This pull request was closed.
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.

7 participants