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

Merged
merged 25 commits into from Jan 9, 2016
Merged

Merge master into future #7853

merged 25 commits into from Jan 9, 2016

Conversation

ghost
Copy link

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

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

agocke and others added 23 commits December 30, 2015 17:28
Also adds tests for this case. Right now /delaysign silently wins.

Fixes bug #7734.
Make /delaysign and /publicsign used together an error
If non-roslyn runs enable node reuse and leave instances floating around,
roslyn will reuse them (even with node reuse disabled) and have problems
(e.g. because the build task is not the expected version).
Kill msbuild before each CI run
Because #7812 is not yet fixed, the IDE doesn't know if we set the
PublicSign flag. As a result, all design-time builds will thing we're
real-signing, which causes semantics to get all screwed up. The
workaround for now is, for design-time builds only, to pass the
DelaySign flag since that's "good enough".

Fixes GitHub issue #7790.
…n-attribute

Fix design time builds in the Roslyn solution for PublicSign projects
Verify improved errors for name lookup
The previous NuGet package got upgraded, but the ref was not
Bump the compiler MSBuild task version on every build
Updating samples to use xunit
Fixes #6843
Fixes #6422
Fixes #5918
@amcasey
Copy link
Member

amcasey commented Jan 8, 2016

@agocke Any idea why this failed? It appears to include both of your build task fixes.

@amcasey
Copy link
Member

amcasey commented Jan 8, 2016

@agocke - I understand future doesn't have the toolset compiler that includes your fix.

@brettfo
Copy link
Member

brettfo commented Jan 8, 2016

xunit error in 64 bit tests here, will investigate

test prtest/win/dbg/unit64 please

@amcasey
Copy link
Member

amcasey commented Jan 8, 2016

test vsi please

@amcasey
Copy link
Member

amcasey commented Jan 8, 2016

👍, pending tests

@brettfo
Copy link
Member

brettfo commented Jan 9, 2016

Mac build won't start, merging to get other builds green.

brettfo added a commit that referenced this pull request Jan 9, 2016
@brettfo brettfo merged commit 9436e33 into dotnet:future Jan 9, 2016
@brettfo brettfo deleted the merge-master-into-future20160108-160001 branch January 9, 2016 03:33
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