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

Merged
merged 51 commits into from Jan 6, 2016
Merged

Merge master into future #7800

merged 51 commits into from Jan 6, 2016

Conversation

ghost
Copy link

@ghost ghost commented Jan 6, 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-future20160106-160001
git reset --hard upstream/future
git merge upstream/master
# Fix merge conflicts
git commit
git push roslyn-bot merge-master-into-future20160106-160001 --force

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

CyrusNajmabadi and others added 30 commits December 18, 2015 01:38
…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
The scheduler returned by TaskScheduler.FromCurrentSynchronizationContext
does not allow concurrency (meaning all Tasks within a submission were being
inlined).  This would nearly always result in a deadlock if you kicked off a
child Task and attempted to continue within the same submission.

We can instead use the Winforms Dispatcher, which will invoke the parent
Task on the "UI" thread but allow child Tasks to use the ThreadPool.
We currently attempt to 're-sign' after merging IBC data, but
since we don't re-sign delay-signed bits and IBC merge happened
before we ran FakeSign, this line should have been a no-op.
Corrects a couple of items noted in #7677
…text-as-foreground-thread

Recognize JoinableTaskSynchronizationContext as a foreground kind
tmat and others added 18 commits January 5, 2016 10:44
…te CoreFX versions to the same as csc/vbc core
…ability when binding arguments for error recovery in presence of single instance method candidate.

Fixes #5128.
Avoid async deadlock in InteractiveHost...
Moves random source generation into helper library
Add an ICompilationUnitSyntax interface to allow for a common way to operate on VB and C# root nodes.
the race itself already existed but this PR made the race to surface.
Add System.Runtime.Numerics to CsiCore and VbiCore dependencies
Throttle async event queues
davkean and others added 2 commits January 6, 2016 09:47
Fix link to point to correct FixAllProvider
Account for presence of inapplicable extension methods of the same viability when binding arguments for error recovery in presence of single instance method candidate.
@brettfo brettfo mentioned this pull request Jan 6, 2016
@brettfo
Copy link
Member

brettfo commented Jan 6, 2016

Linux failure is expected. Looking for issue now.

@tannergooding
Copy link
Member

Merging as the signed build needs to get kicked off for our VS insertion.. I validated this locally and saw no issues (Jenkins Issues are preventing the validation builds from completing properly).

tannergooding added a commit that referenced this pull request Jan 6, 2016
@tannergooding tannergooding merged commit 509ba90 into dotnet:future 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.