Skip to content

Merge dev15.6.x to dev15.7.x#24367

Merged
agocke merged 14 commits intodev15.7.xfrom
merges/dev15.6.x-to-dev15.7.x-20180122-080019
Jan 22, 2018
Merged

Merge dev15.6.x to dev15.7.x#24367
agocke merged 14 commits intodev15.7.xfrom
merges/dev15.6.x-to-dev15.7.x-20180122-080019

Conversation

@dotnet-bot
Copy link
Copy Markdown
Collaborator

This is an automatically generated pull request from dev15.6.x into dev15.7.x.

git fetch --all
git checkout merges/dev15.6.x-to-dev15.7.x-20180122-080019
git reset --hard upstream/dev15.7.x
git merge upstream/dev15.6.x
# Fix merge conflicts
git commit
git push merges/dev15.6.x-to-dev15.7.x-20180122-080019 --force

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

VSadov and others added 14 commits January 16, 2018 16:22
The last await-containing expression in an argument triggers spilling of all argument before it.
The value of the expression itself, however, should not be spilled. (there are no awaits after it)

Agreesive spilling may result in substandard codegenration and/or unexpected errors.
VB does not have this particular bug and corresponding scenario works correctly.
There are however other bugs beyond the scope of what is fixed in this PR.
…g-text

* dotnet/dev15.6.x:
  Fix symbol completion after 'in' (#24335)
  use PascalCase for const name
  Limit compiler server pipe name length (#24265)
  Test ConvertedType on LHS of deconstruction-assignment (#24158)
  remove unused usings
  use .editorconfig files
  address more comments
  address code review comments
  move newly added text into resource file
  add text and hyperlink to C# code style page
Fix a case where the stack spiller spills more than needed. (possibly resulting in false errors)
#24332)

* make sure OOP inherit same culture as VS otherwise culture sensitive resource such as xml doc comment will not work properly

* don't crash on expected issue
Update string text for keybindings reset.
@dotnet-bot dotnet-bot requested review from a team as code owners January 22, 2018 08:00
@agocke agocke merged commit 3a3ba13 into dev15.7.x Jan 22, 2018
@agocke agocke deleted the merges/dev15.6.x-to-dev15.7.x-20180122-080019 branch January 22, 2018 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants