Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master to features/editorconfig-in-compiler #32140

Conversation

dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from master into features/editorconfig-in-compiler.

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

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

gafter and others added 30 commits April 11, 2018 18:55
as the default language version
Related to #26115 which we use to mark the skipped tests.
recursive-patterns(20) Add language version 8.0 for recursive pattern-matching.
Extract common code into a helper method.
Move some bound node definitions leaving the statements more contiguous.
Fix parser regression in pattern switch parsing
Permit an array of tuple type in an is-type expression or in a pattern.
Add tests to demonstrate that a bug is fixed
Now that we have only one kind of switch statement, rename bound nodes to recognize that fact.
Merge master into features/recursive-patterns
@JoeRobich JoeRobich force-pushed the merges/master-to-features/editorconfig-in-compiler branch from 1e924ee to e2c82ae Compare January 4, 2019 05:09
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

@ghost ghost merged commit 58748b9 into features/editorconfig-in-compiler Jan 4, 2019
@ghost ghost deleted the merges/master-to-features/editorconfig-in-compiler branch January 4, 2019 07: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.