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 into future #11331

Merged
merged 17 commits into from May 16, 2016
Merged

Merge master into future #11331

merged 17 commits into from May 16, 2016

Conversation

ghost
Copy link

@ghost ghost commented May 16, 2016

This is an automatically generated pull request from master into future.

@dotnet/roslyn-infrastructure:

git remote add vslsnap-roslyn "https://github.com/vslsnap/roslyn.git"
git fetch vslsnap-roslyn
git fetch upstream
git checkout merge-master-into-future20160516-150017
git reset --hard upstream/future
git merge upstream/master
# Fix merge conflicts
git commit
git push vslsnap-roslyn merge-master-into-future20160516-150017 --force

Once the merge can be made and all the tests pass, you are free to merge the pull request.

@ghost
Copy link
Author

ghost commented May 16, 2016

@dotnet-bot test vsi please

svick and others added 4 commits May 16, 2016 09:10
* Fix formatting of ref/out parameters in Scripting

This is used when displaying exceptions in csi.

Previously, ref/out parameters in stacktraces were shown incorrectly,
and even threw NRE when the type of the ref/out parameter was a type parameter.

Fixes the fixable part of #11284
Also mentioned converting to string using ToString
Fixes unintended move of banner text, as reported in issue #8797.
@panopticoncentral panopticoncentral merged commit 234e66a into dotnet:future May 16, 2016
@panopticoncentral panopticoncentral deleted the merge-master-into-future20160516-150017 branch May 23, 2016 17:31
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