Skip to content

Merge master to features/module-initializers#45333

Merged
8 commits merged intofeatures/module-initializersfrom
merges/master-to-features/module-initializers
Jun 20, 2020
Merged

Merge master to features/module-initializers#45333
8 commits merged intofeatures/module-initializersfrom
merges/master-to-features/module-initializers

Conversation

@dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from master into features/module-initializers.

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

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

333fred and others added 8 commits June 13, 2020 12:35
Instead of reporting that a constraint must come first, if there are multiple constraints that must come first, we now report that these constraints cannot be combined. We also suppress these errors if a previous error about inherited constraints was reported. Fixes #45141.
Call GetSyntaxRootAsync once outside loop
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 6127260 into features/module-initializers Jun 20, 2020
@ghost ghost deleted the merges/master-to-features/module-initializers branch June 20, 2020 01:32
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.

5 participants