Merge master into future #11058

ghost · 2016-05-04T15:00:16Z

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-future20160504-150015
git reset --hard upstream/future
git merge upstream/master
# Fix merge conflicts
git commit
git push vslsnap-roslyn merge-master-into-future20160504-150015 --force

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

…work.

clicking automation elements.

projects.

contents.

Fixes #9826

This simplies some of the lifetime handling inside the type.

This brings along our standard trace listener that converts assert failures over to exceptions, so we don't need IntegrationTraceListener anymore.

If the VS STA thread is busy, it can reject any calls we make. This retries them explicitly. I don't like this change, but I don't have a better option that I know of.

This just hides bugs. If there's a specific point of cleanup that is flaky, we should target that specific area.

This moves the cleanup process of a test during that test, so that way any screwups are blamed on the right test.

Otherwise it reuses the default which can conflict if we start another instance.

New Visual Studio integration test framework improvements

… within a logical not expression

Integration Test Framework

Few other fixes

… transitive dependency due to perf concern.

Move Perf helpers into binary

Remove Redundant Cast should not incorrectly suggest to remove a cast within a logical not expression

change default to only re-analyze direct dependencies rather than all…

csi.exe should emit exception to stderr, not stdout

…ange Temporarily disable test CurrentWorkingDirectory_Change

This code has been moved to http://dotnet/roslyn-project-system

There are 2 changes here 1. Move some of the helpers from test_util to tools_util since the helpers are not depended on the helper binary and can work without any dependencies 2. Introduce TriggerAutomation.bat, which triggers the automation process. The reason we need a bat file to trigger this and not a csx or a new csx is because running the csx requires the helper binary. Hence we need to run the csx files from the binaries folder but we cannot have binaries in place if we dont fetch them in the first place. This is a cyclic problem that has to be broken with the help of one initial Trigger Batch file

ghost · 2016-05-04T15:00:47Z

@dotnet-bot test vsi please

…hange Reenable CurrentWorkingDirectory_Change

Remove ProjectSystem code

Fix automation to fetch

Make completion service public

…-future20160504-150015 Conflicts: src/Compilers/Core/Portable/PublicAPI.Unshipped.txt src/Dependencies/VisualStudio/project.json src/Features/CSharp/Portable/CSharpFeatures.csproj src/Features/Core/Portable/Features.csproj src/Workspaces/Core/Portable/PublicAPI.Unshipped.txt

msJohnHamby · 2016-05-04T20:14:34Z

test vsi please

mattwar · 2016-05-04T20:25:57Z

@dotnet-bot retest prtest/lin/dbg/unit32 please
// Previous failure: http://dotnet-ci.cloudapp.net/job/roslyn_prtest_lin_dbg_unit32/6816/
// Retest reason:

atifaziz and others added 30 commits March 16, 2016 09:48

csi should emit exception to stderr, not stdout

3ee3725

Adding the base projects for the Visual Studio Integration Test Frame…

a971d8e

…work.

Adding integration support for testing the Interactive Window.

25c8caa

Adding C# Interactive Demo integration test and adding support for

f794d2f

clicking automation elements.

Adding basic integration support for interacting with solutions and

b3f94cd

projects.

Adding basic integration support for getting/setting the editor window

af966b0

contents.

Adding the start of the CSharp and VisualBasic Build integration tests.

fdef0a7

Responding to PR feedback.

f0c48a5

Adding some base level documentation.

79dbda5

Fix CommandLineRunner to emit errors et al. to stderr, not stdout

92999b7

Fixes #9826

CsiTests.ReferenceSearchPaths_LIB regression fix

6958c01

Merge remote-tracking branch 'dotnet/master' into integration

8002cda

Remove unnecessary ConfigureAwaits()

0a843cf

Simplify the directory deletion code when cleaning up

84016ce

Split out the creation of IntegrationHost into a separate factory

357b5f2

This simplies some of the lifetime handling inside the type.

Rename IntegrationHost -> VisualStudioInstance

41b6d15

Switch the integration tests over to our standard app.config for xunit

5bd9ec5

This brings along our standard trace listener that converts assert failures over to exceptions, so we don't need IntegrationTraceListener anymore.

Fix waiting for DTE to appear before we start doing stuff

8230409

Fix EditorWindow.Text marshalling to the other process

21db99c

Correctly ensure we close the existing open solution before reusing

35f839b

Explicitly add a retry around all DTE operations

929ff2d

If the VS STA thread is busy, it can reject any calls we make. This retries them explicitly. I don't like this change, but I don't have a better option that I know of.

Don't eat exceptions when cleaning up previous instances

7db3998

This just hides bugs. If there's a specific point of cleanup that is flaky, we should target that specific area.

Add a VisualStudioInstanceContext that is used to clean up an instance

2740856

This moves the cleanup process of a test during that test, so that way any screwups are blamed on the right test.

Let's use Lazys to clean up the code.

5fd08ec

Use a unique name for IpcClientChannel

1f61520

Otherwise it reuses the default which can conflict if we start another instance.

Merge pull request #3 from jasonmalinowski/integration-improvements

84c858e

New Visual Studio integration test framework improvements

Remove Redundant Cast should not incorrectly suggest to remove a cast…

639ee93

… within a logical not expression

Merge remote-tracking branch 'dotnet/master' into integration

7dc23b8

New public completion API

4445deb

Merge remote-tracking branch 'dotnet/master' into integration

bc99ca3

tannergooding and others added 18 commits May 2, 2016 13:52

Updating the project references and lock json files.

94f5638

Merge pull request #9803 from tannergooding/integration

6560b5e

Integration Test Framework

Fix the binary path

db6db1a

Few other fixes

change default to only re-analyze directly dependency rather than all…

a44b881

… transitive dependency due to perf concern.

update test for default change

ef7e97b

Merge pull request #11020 from basoundr/perfTypesFinal1

4a835e1

Move Perf helpers into binary

only mail to infraswat (#10999)

4a17757

Merge pull request #10698 from DustinCampbell/issue-10311

20e63dc

Remove Redundant Cast should not incorrectly suggest to remove a cast within a logical not expression

Merge pull request #11025 from heejaechang/directdependency

794f8c7

change default to only re-analyze direct dependencies rather than all…

Fix test completion item description

3de62a0

Merge pull request #9791 from atifaziz/csi-stderr

31cba13

csi.exe should emit exception to stderr, not stdout

Temporarily disable test CurrentWorkingDirectory_Change

a07e4af

Fixing the casing of a VSIX GUID.

9cc29f6

Merge pull request #11040 from tmat/DisableCurrentWorkingDirectory_Ch…

fbaaf3a

…ange Temporarily disable test CurrentWorkingDirectory_Change

Reenable CurrentWorkingDirectory_Change

f480322

Remove ProjectSystem code

49b843c

This code has been moved to http://dotnet/roslyn-project-system

Add a helper

f3d6f2e

dnfclas added the cla-already-signed label May 4, 2016

tmat and others added 6 commits May 4, 2016 08:39

Merge pull request #11045 from tmat/ReenableCurrentWorkingDirectory_C…

7341c70

…hange Reenable CurrentWorkingDirectory_Change

Fix path and make TraceManager verbose

1faaa0c

Merge pull request #11046 from davkean/DeleteProjectSystem

ef35faf

Remove ProjectSystem code

Merge pull request #11052 from basoundr/FixAutomationToFetch

1fbca1c

Fix automation to fetch

Merge pull request #8170 from mattwar/FeatureAPIs

1a3b616

Make completion service public

msJohnHamby merged commit 9fd861e into dotnet:future May 4, 2016

jasonmalinowski deleted the merge-master-into-future20160504-150015 branch June 28, 2016 21:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge master into future #11058

Merge master into future #11058

ghost commented May 4, 2016

ghost commented May 4, 2016

msJohnHamby commented May 4, 2016

mattwar commented May 4, 2016

Merge master into future #11058

Merge master into future #11058

Conversation

ghost commented May 4, 2016

ghost commented May 4, 2016

msJohnHamby commented May 4, 2016

mattwar commented May 4, 2016