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

Merged
merged 39 commits into from May 5, 2016
Merged

Merge master into future #11089

merged 39 commits into from May 5, 2016

Conversation

ghost
Copy link

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

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

@CyrusNajmabadi
Use threadlocal storage for pooling our matrices.
2b91f74
@CyrusNajmabadi
Use constant
d694d80
@CyrusNajmabadi
Use another threadlocal for storing our dictionary.
01ec771
@CyrusNajmabadi
Remove unused class.
5dfa339
@CyrusNajmabadi
Remove option we aren't using.
8d5c08d
@CyrusNajmabadi
Add UI options for configuring 'add using'
a7a631f
@CyrusNajmabadi
Update strings.
f39fd52
@CyrusNajmabadi
The option is not per language.
fd19f45
@CyrusNajmabadi
Merge the two symbol search APIs into one.
5de5408
@CyrusNajmabadi
Option serialization work.
968a975
@CyrusNajmabadi
Properly persist options.
f14aa61
@CyrusNajmabadi
Rename group.
6f66b48
@CyrusNajmabadi
Expose optoins for VS as well.
9993a3d
@CyrusNajmabadi
Sort usings.
1d5e74d
@CyrusNajmabadi
Make the nuget options into per-language options.
87d43bd
@CyrusNajmabadi
Update tests.
1132292
@CyrusNajmabadi
Rename type.
41a326f
@CyrusNajmabadi
Rename files.
70429d6
@CyrusNajmabadi
Move files to new folder.
f58bc96
@CyrusNajmabadi
Move file.
2d4291f
@CyrusNajmabadi
Move SymbolSearch into its own namespace.
c10a2d7
@CyrusNajmabadi
Move files.
0ce9b17
@CyrusNajmabadi
Rename types.
19e6663
@CyrusNajmabadi
Move types to SymbolSearch.
3607ad9
@CyrusNajmabadi
Move test code.
b8c6ae3
@CyrusNajmabadi
Update type name.
d03df21
@CyrusNajmabadi
Update option name.
f99d4e3
@CyrusNajmabadi
Fix accelerators.
0b8fe75
@CyrusNajmabadi
Update accelerators.
110bc76
@CyrusNajmabadi
Sort usings.
2f00943
CyrusNajmabadi and others added 6 commits May 4, 2016 11:31
@CyrusNajmabadi
Merge branch 'master' into usingOptions
c5de602
@CyrusNajmabadi
Merge pull request #11023 from CyrusNajmabadi/usingOptions
3379fcb 
Add options to enable/disable nuget search.
@agocke
Remove vestigial vars from Makefile (#11066)
7bef5a9
@mavasani
Update the diagnostics rolling perf tests
cffb29f 
1. Split out the tests into ones with built-in IDE analyzers and ones with only third party analyzers
2. Tests depends on closed side changes (add/update VS tao actions)
@CyrusNajmabadi
Merge pull request #11014 from CyrusNajmabadi/useThreadLocal
58230a0 
Use threadlocal storage for pooling our matrices.
@basoundr
Fix NRE and provide better verbosity
05d5122
@ghost
Copy link
Author

ghost commented May 5, 2016

@dotnet-bot test vsi please

mavasani and others added 3 commits May 5, 2016 09:14
@mavasani
Merge pull request #11077 from mavasani/PerfTests
9b5d7ac 
Update the diagnostics rolling perf tests
@basoundr
Merge pull request #11086 from basoundr/FixNRE
006b915 
Fix NRE and provide better verbosity
@msJohnHamby
Merge remote-tracking branch 'upstream/master' into merge-master-into…
8497f9f 
…-future20160505-150019

Conflicts:
	Makefile
	src/VisualStudio/CSharp/Impl/CSharpVSResources.resx
	src/VisualStudio/CSharp/Impl/Options/AutomationObject.cs
	src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj
	src/VisualStudio/VisualBasic/Impl/BasicVSResources.resx
	src/Workspaces/Core/Portable/Workspaces.csproj
@msJohnHamby
Copy link
Contributor

test vsi please

1 similar comment
@msJohnHamby
Copy link
Contributor

test vsi please

@msJohnHamby msJohnHamby merged commit e9304b3 into dotnet:future May 5, 2016
@jasonmalinowski jasonmalinowski deleted the merge-master-into-future20160505-150019 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.

None yet
6 participants
@msJohnHamby @dnfclas @CyrusNajmabadi @agocke @mavasani @basoundr