Skip to content

Merge master to features/embeddedRegex#27586

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

Merge master to features/embeddedRegex#27586
23 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.

zaytsev-victor and others added 23 commits November 27, 2017 19:29
…vider.cs

The new name matches the contained type name.
# Conflicts:
#	src/Features/Core/Portable/UseObjectInitializer/ObjectCreationExpressionAnalyzer.cs
Updated dev15.8-preview3-vs-deps channel
Exclude nested captures from quick-info
Fixed incorrect suggestion for object initialization simplification
 Strip common prefixes before applying naming suggestions
…args (#27279)

* Validate full path of file instead of file name in parsing /resource args

* PR Comments

* Fix build break
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 50c3b56 into features/embeddedRegex Jun 7, 2018
@ghost ghost deleted the merges/master-to-features/embeddedRegex branch June 7, 2018 21:30
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