Skip to content

Merge master to features/embeddedJson#27265

Merged
309 commits merged intofeatures/embeddedJsonfrom
merges/master-to-features/embeddedJson
May 31, 2018
Merged

Merge master to features/embeddedJson#27265
309 commits merged intofeatures/embeddedJsonfrom
merges/master-to-features/embeddedJson

Conversation

@dotnet-bot
Copy link
Copy Markdown
Collaborator

This is an automatically generated pull request from master into features/embeddedJson.

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

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

etbyrd and others added 20 commits May 24, 2018 13:12
Fix initialization in CSharpReplIntellisense
…constructors-count

Minor update for 'Generate delegate constructor' refactoring
…der_TupleSupport

Tuple support for DeclarationNameCompletionProvider (name suggestion)
Also add
- CommonConversion.IsImplicit
- Compilation.HasImplicitConversion
Fixes #9461
MonoDevelop(VSfM) recently switched from using `Microsoft.CodeAnalysis.Classification.Classifier` to using `IAccurateClassifier` from VS API.
But with this switch some classifications that were added in #24931 stopped working. Reason for this is that in that commit new classifications were filtered out by converting back to classification that was used before `ClassificationTypeNames.Identifier` so VS Windows would continue working fine. But later in #25723 this ClassificationTypes were added so I assume with removing this filtering VS Windows will work just fine since ClassificationTypes that were added #25723 have BaseType `ClassificationTypeNames.Identifier`.
[SQLite] Bump and use byte[] variants added to blob_open for performance
Copy link
Copy Markdown

@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 08f73c1 into features/embeddedJson May 31, 2018
@ghost ghost deleted the merges/master-to-features/embeddedJson branch May 31, 2018 00:00
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.