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.

Sign up for GitHub

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

Jump to bottom

Merge master into future #11161

Merged
merged 21 commits into from May 9, 2016
Merged

Merge master into future #11161

merged 21 commits into from May 9, 2016

Conversation

ghost
Copy link

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

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

tmat and others added 18 commits May 5, 2016 12:25
@tmat
Update nuget.exe to 3.5.0.1246
c543da7
@tmat
Remove reference to Workspaces.Desktop from portable sample projects
81e3e91
@tmat
Update CoreFX dependencies to rc3-24102-00
66c04c7
@tmat
Update references to System.Linq.Expressions
5e15358
@tmat
A few adjustments to match new API shape
c6bd8ec
@tmat
Fix up jsons of CompilerGeneratorTools
f6554c8
@tmat
Workaround for cross-gen bug https://github.com/dotnet/coreclr/issues…
5c5feb3 
…/4801
@basoundr
Call TestUtilities.InitUtilities appropriately
0dfe137 
Calling TestUtilities.InitUtilities from within the library, instead of a csx file, will result in the path of the file where the library was initially built to be passed to InitUtilities which is not the expected behavior. Fixing it in all occurence

Also removing some unnecessary and unused helpers
@jasonmalinowski
Remove BindingPath.pkgdef
01e63c7 
Since this file wasn't being included in the VSIX, it was having no
effect. We're better off using CodeBase attributes anyways which apply
earlier in the assembly resolution process.
@jasonmalinowski
Add an explicit CodeBase for Roslyn.Hosting.Diagnostics.dll
b929489
@jasonmalinowski
Don't bundle the Workspace project into the Test Setup VSIX
aab0704 
This is correctly bundled along with the language services VSIX, which
is the place it should ship with. We already take a VSIX dependency
upon that VSIX.
@jasonmalinowski
Don't reference the output assembly of VisualStudioSetup
b562b2e 
This is a DLL that doesn't ship and isn't used for anything other than
pkgdef generation.
@jasonmalinowski
Merge pull request #11037 from jasonmalinowski/change-contents-of-tes…
728d77e 
…tsetup

Change contents of the TestSetup project
@basoundr
uninstall previous vsixes
450a703 
While installing the VSIXes using the install_vsixes.csx, uninstall the previous VSIXes before installing the new ones.
@basoundr
Rename InitUtilities to InitUtilitiesFromCsx
6112701
@basoundr
Merge pull request #11148 from basoundr/fixInitUtilitiesPath
6057ae8 
Call TestUtilities.InitUtilities appropriately
@basoundr
Merge pull request #11153 from basoundr/uninstallVsixes
b7c267b 
uninstall previous vsixes
@basoundr
Check for Directory.Exists before deleting
cfed060
@ghost
Copy link
Author

ghost commented May 7, 2016

@dotnet-bot test vsi please

basoundr and others added 3 commits May 7, 2016 14:53
@basoundr
Merge pull request #11156 from basoundr/CheckDirExists
c90d3d5 
Check for Directory.Exists before deleting
@tmat
Merge pull request #11042 from tmat/SRM-24102
0cd9f41 
Update CoreFX dependencies to rc3-24102-00
@msJohnHamby
Merge remote-tracking branch 'upstream/master' into merge-master-into…
db1deaa 
…-future20160507-150018
@msJohnHamby
Copy link
Contributor

test vsi please

@msJohnHamby msJohnHamby merged commit e4f7a4a into dotnet:future May 9, 2016
@jasonmalinowski jasonmalinowski deleted the merge-master-into-future20160507-150018 branch June 28, 2016 21:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
cla-already-signed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@msJohnHamby @dnfclas @tmat @basoundr @jasonmalinowski