Skip to content

Merge master to master-vs-deps#45909

Merged
JoeRobich merged 33 commits intomaster-vs-depsfrom
merges/master-to-master-vs-deps
Jul 13, 2020
Merged

Merge master to master-vs-deps#45909
JoeRobich merged 33 commits intomaster-vs-depsfrom
merges/master-to-master-vs-deps

Conversation

@dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from master into master-vs-deps.

git fetch --all
git checkout merges/master-to-master-vs-deps
git reset --hard upstream/master-vs-deps
git merge upstream/master
# Fix merge conflicts
git commit
git push upstream merges/master-to-master-vs-deps --force

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

Markus Hartmair and others added 28 commits July 2, 2020 18:50
Add test infrastructure for case correction and a failing test case for #45508
Do not auto-case named tuple name identifiers, fixes #45508
Forward integration from dotnet/roslyn
Forward integration from dotnet/roslyn
Forward integration from dotnet/roslyn
Builds on top of prior PRs that aim at dogfooding code style enforcement in IDE layers.
[Dogfooding] Extend existing IDE code style enforcement rules to EditorFeatures layer
@dotnet-bot dotnet-bot requested a review from a team as a code owner July 11, 2020 03:02
@dotnet-bot dotnet-bot requested a review from a team July 11, 2020 03:02
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

Fix VB case correction for named tuple identifiers
@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/master-to-master-vs-deps to 21803cb4840ff5d79fa3034a11948b0aefef24b9

tmat and others added 2 commits July 11, 2020 15:24
* Use TestHost consistently

* Comments

* Fix

* RenameTestHost

* Renaming
@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/master-to-master-vs-deps to fc2f4b5763c06a4fb5ede7ace6d4ca18d4236548

@dotnet-bot dotnet-bot requested review from a team as code owners July 12, 2020 00:02
@dotnet-bot dotnet-bot added the Merge Conflicts There are merge conflicts with the base branch. label Jul 12, 2020
@JoeRobich JoeRobich merged commit 60894ba into master-vs-deps Jul 13, 2020
@ghost ghost added this to the Next milestone Jul 13, 2020
@JoeRobich JoeRobich modified the milestones: Next, 16.8.P1 Jul 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants