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

Closed
wants to merge 18 commits into from
Closed

Merge master into future #7785

wants to merge 18 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Jan 5, 2016

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

@dotnet/roslyn-infrastructure:

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

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

thefaxman and others added 17 commits December 19, 2015 12:58
…f we get an invalid generic type like Action<0> we end up generic 6-7 errors as the parser attempts to recover. We now handle the case where the invalid type is followed by a comma or greater than and identify that we can continue parsing the expression to produce a much cleaner error state.
The compiler now supports publicsign so FakeSign isn't necessary.
However, since we're not using the toolset compiler on *nix we can't
using the PublicSign property. In the meantime we can pass publicsign in
a response file.
Brings in a new toolset compiler that supports publicsign in VB and
updates the ci bootstrap to use the bootstrap build task, which
provides bootstrap support for the <PublicSign> property.
Use /publicsign instead of FakeSign
Implements support for GAC on Mono
This is quick fix to prevent throwing asserts if CPS has changed the
foreground SynchronizationContext.
Improve error message for invalid generic type arguments.
Remove source for FakeSign and reference from Roslyn.sln
…text-as-foreground-thread

Recognize JoinableTaskSynchronizationContext as a foreground kind
@jmarolf
Copy link
Contributor

jmarolf commented Jan 5, 2016

test vsi please

@jmarolf
Copy link
Contributor

jmarolf commented Jan 5, 2016

@dotnet-bot retest prtest/lin/dbg/unit32 please
@dotnet-bot retest prtest/mac/dbg/unit32 please
@dotnet-bot retest prtest/win/dbg/unit32 please
@dotnet-bot retest prtest/win/dbg/unit64 please
@dotnet-bot retest prtest/win/vsi/p0 please
@dotnet-bot retest prtest/win/vsi/p1 please
@dotnet-bot retest prtest/win/vsi/p2 please
@dotnet-bot retest prtest/win/vsi/p3 please

// Retest reason: Jenkins upgrade caused jobs to be cancelled

@davkean
Copy link
Member

davkean commented Jan 5, 2016

retest vsi please
looks like we didn't pick up @agocke's signing changes.

@brettfo
Copy link
Member

brettfo commented Jan 6, 2016

closing in favor of #7800

@brettfo brettfo closed this Jan 6, 2016
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.

9 participants