Skip to content

Merge master to features/embeddedRegex#27570

Merged
5 commits merged intofeatures/embeddedRegexfrom
merges/master-to-features/embeddedRegex
Jun 7, 2018
Merged

Merge master to features/embeddedRegex#27570
5 commits merged intofeatures/embeddedRegexfrom
merges/master-to-features/embeddedRegex

Conversation

@dotnet-bot
Copy link
Copy Markdown
Collaborator

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 --force

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

tmeschter and others added 5 commits June 5, 2018 10:30
Update XliffTasks to the latest version. Notably, this version produces
better MSBuild error messages when a .xlf file can't be loaded as XML.
…tern

This change exposes two SymbolFinder APIs to locate source declarations using the Roslyn
pattern-matcher logic.
…-pattern-api

Expose SymbolFinder APIs that find source declarations based on a pattern
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 cf55fde into features/embeddedRegex Jun 7, 2018
@ghost ghost deleted the merges/master-to-features/embeddedRegex branch June 7, 2018 18:30
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 7, 2018 19:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 7, 2018 19: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.

3 participants