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 #11145

Merged
merged 17 commits into from May 6, 2016
Merged

Merge master into future #11145

merged 17 commits into from May 6, 2016

Conversation

ghost
Copy link

@ghost ghost commented May 6, 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-future20160506-150017
git reset --hard upstream/future
git merge upstream/master
# Fix merge conflicts
git commit
git push vslsnap-roslyn merge-master-into-future20160506-150017 --force

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

AlekseyTs and others added 14 commits April 30, 2016 23:51
- Include memebers of underlying type into a set of members returned by
tuple type symbol. Properties and events are not supported at the moment.
- Track declaration locations for tuple related symbols.
- Ensure Rest extensions are tuples.
- Substitute underlying type with corresponding tuple type at the point of type reference.
- Adjusted implementation of symbol display to account for presence of names in the extension tuples.
- Implemented proper retargeting for tuple types (multi-targeting support).
Use nameof() instead of string literals in ArgumentExceptions
- Added support for properties and events in tuple type symbol.
- Made additional adjustments to implementation of tuple symbol display around presence of element names.
)

Most of this PR is invisible.

What I did was pull down the current toolset packages from azure and replaced the files in the dotnet-cli folder with new ones downloaded from https://github.com/dotnet/cli
@ghost
Copy link
Author

ghost commented May 6, 2016

@dotnet-bot test vsi please

DustinCampbell and others added 3 commits May 6, 2016 09:47
…-future20160506-150017

Conflicts:
	src/Debugging/Roslyn.Reflection.Metadata.Decoding/SignatureDecoder.cs
	src/Features/CSharp/Portable/CSharpFeaturesResources.resx
@msJohnHamby
Copy link
Contributor

test vsi please

@msJohnHamby msJohnHamby merged commit e453c91 into dotnet:future May 6, 2016
@jasonmalinowski jasonmalinowski deleted the merge-master-into-future20160506-150017 branch June 28, 2016 21:52
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.

None yet

6 participants