Merge master to features/embeddedRegex#27531
Merged
5 commits merged intofeatures/embeddedRegexfrom Jun 6, 2018
Merged
Conversation
This synchronization context is used by MD's test suite - it is based on the idea that the IDE is not yet initialized so headless tests can run, so it just routes the main synchronization context calls into the native OS' main thread implementation
This commit gets rid of having to manually track all the possible `T`s for `CodeStyleOption<T>`, by instantiating the type via activator. Sadly, it uses reflection, but there is no way to make the code function in a generic way that does not pollute the API.
Expand persister deserialization to also take into account string and accessibility modifiers
Add support for VSMac unit test synchronization context
This pull request was closed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automatically generated pull request from master into features/embeddedRegex.
git fetch --all git checkout merges/master-to-features/embeddedRegex git reset --hard upstream/features/embeddedRegex git merge upstream/master # Fix merge conflicts git commit git push merges/master-to-features/embeddedRegex --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.