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 stabilization into master #11696

Merged
merged 37 commits into from Jun 3, 2016
Merged

Merge stabilization into master #11696

merged 37 commits into from Jun 3, 2016

Conversation

ghost
Copy link

@ghost ghost commented Jun 1, 2016

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

@dotnet/roslyn-infrastructure:

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

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

jaredpar and others added 28 commits May 19, 2016 15:36
…-stabilization

Merge master back to stabilization
…st to drop the return value.

Expression trees can naturally ignore return value when necessary and old compiler was skipping relaxation in this case.

Fixes: #8804
This restores the ability to utter the following test phrases:

- test mac please
- test linux please
Add mac / linux trigger phrases
Port two Update3 changes to stabilization.
Don't classify the entire document when we're accurate tagging.
Add ChecksumAlgorithm to csc/vbc build task

Fixes #10451
Updates CoreFX dependencies to rc3-24126-00
stabilization is now for Visual Studio 2015 Update 3, master is
targeting Visual Studio "15".
@ghost
Copy link
Author

ghost commented Jun 1, 2016

@dotnet-bot test vsi please

AlekseyTs and others added 7 commits June 1, 2016 15:32
Disallow invocation of extension methods off of types as query operators.
Suppress dynamic access to instance indexers off of types.
Update the branches and build badges to current targets
* Tests: fix minasync Task<T> to derive from Task

* Tests: provide MinAsyncCorlibRef

This combines the async features of minasync with mincorlib to produce
a minimum unversioned corlib with async stubs.

* Compilation: use System.Object from target corlib

When creating a script compilation without an explicit return type,
System.Object was being resolved via reflection from the host.

This resulted in an implicit dependency of a script compilation on the
host corlib, even if a different corlib was specified as a reference
for the compilation (e.g. Xamarin.iOS).

Fix this by using System.Object as defined in the corlib resovled
for the compilation.
Order GlobalNamespace declarations to match Compilation.SyntaxTrees
Merging to unblock folks who are blocked on the build issue asap.
@panopticoncentral
Copy link
Contributor

@dotnet-bot retest windows_debug_unit32_prtest please
// Previous failure: http://dotnet-ci.cloudapp.net/job/dotnet_roslyn/job/master/job/windows_debug_unit32_prtest/207/
// Retest reason:

@panopticoncentral
Copy link
Contributor

@dotnet-bot retest windows_debug_unit64_prtest please

@panopticoncentral
Copy link
Contributor

@dotnet-bot retest windows_debug_unit64_prtest please

1 similar comment
@panopticoncentral
Copy link
Contributor

@dotnet-bot retest windows_debug_unit64_prtest please

@panopticoncentral panopticoncentral merged commit 55e9268 into dotnet:master Jun 3, 2016
@panopticoncentral panopticoncentral deleted the merge-stabilization-into-master20160601-201349 branch June 3, 2016 22:01
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.