Update integration test waiters to MEF v2

src/Test/Diagnostics/Diagnostics.csproj

@@ -15,6 +15,33 @@
     <RestorePackages>true</RestorePackages>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
   </PropertyGroup>
+  <ItemGroup Label="File References">
+    <Reference Include="System.Collections.Immutable">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Composition.AttributedModel">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\packages\Microsoft.Composition.$(MicrosoftCompositionVersion)\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.Convention">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\packages\Microsoft.Composition.$(MicrosoftCompositionVersion)\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.Hosting">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\packages\Microsoft.Composition.$(MicrosoftCompositionVersion)\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.Runtime">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\packages\Microsoft.Composition.$(MicrosoftCompositionVersion)\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.TypedParts">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\packages\Microsoft.Composition.$(MicrosoftCompositionVersion)\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
       <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
@@ -60,11 +87,6 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
-    <Reference Include="System.Collections.Immutable">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />

src/Test/Diagnostics/TestingOnly_WaitingService.cs

@@ -2,21 +2,24 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.Composition;
+using System.Composition;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 using Roslyn.Test.Utilities;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
-    [Export]
+    [Export, Shared]
     public class TestingOnly_WaitingService
     {
-        [ImportMany]
-        private IEnumerable<Lazy<IAsynchronousOperationWaiter, FeatureMetadata>> _waiters = null;
+        private readonly IEnumerable<Lazy<IAsynchronousOperationWaiter, FeatureMetadata>> _waiters;
+
+        [ImportingConstructor]
+        private TestingOnly_WaitingService([ImportMany] IEnumerable<Lazy<IAsynchronousOperationWaiter, FeatureMetadata>> waiters)
+        {
+            this._waiters = waiters;
+        }
 
         private void WaitForAsyncOperations(
             Func<FeatureMetadata, bool> predicate,
@@ -105,8 +108,7 @@ public IEnumerable<string> GetTotalFeatures()
 
         public IEnumerable<string> GetActiveFeatures()
         {
-            var activeFeatures = from w in _waiters where w.Value.HasPendingWork select w.Metadata.FeatureName;
-            return activeFeatures;
+            return from w in _waiters where w.Value.HasPendingWork select w.Metadata.FeatureName;
         }
 
         public void EnableActiveTokenTracking(bool enable)

src/Test/Diagnostics/Waiters/AutomaticCompletionWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.AutomaticPairCompletion)]

src/Test/Diagnostics/Waiters/AutomaticEndConstructCorrectionWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.AutomaticEndConstructCorrection)]

src/Test/Diagnostics/Waiters/BraceHighlightingWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.BraceHighlighting)]

src/Test/Diagnostics/Waiters/ClassificationWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.Classification)]

src/Test/Diagnostics/Waiters/CompletionSetWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.CompletionSet)]

src/Test/Diagnostics/Waiters/DesignerAttributeWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.DesignerAttribute)]

src/Test/Diagnostics/Waiters/DiagnosticServiceWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.DiagnosticService)]

src/Test/Diagnostics/Waiters/ErrorListWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.ErrorList)]

src/Test/Diagnostics/Waiters/ErrorSquiggleWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.ErrorSquiggles)]

src/Test/Diagnostics/Waiters/EventHookupWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.EventHookup)]

src/Test/Diagnostics/Waiters/GlobalOperationWatier.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.GlobalOperation)]

src/Test/Diagnostics/Waiters/GraphProviderWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.GraphProvider)]

src/Test/Diagnostics/Waiters/KeywordHighlightingWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.KeywordHighlighting)]

src/Test/Diagnostics/Waiters/LightBulbWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.LightBulb)]

src/Test/Diagnostics/Waiters/LineSeparatorWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
     // This doesn't need to be an EditorAdornmentWaiter, since we control our own 
     // adornment layer
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.LineSeparators)]

src/Test/Diagnostics/Waiters/NavigateToWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.NavigateTo)]

src/Test/Diagnostics/Waiters/NavigationBarWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.NavigationBar)]

src/Test/Diagnostics/Waiters/OutliningWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.Outlining)]

src/Test/Diagnostics/Waiters/QuickInfoWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.QuickInfo)]

src/Test/Diagnostics/Waiters/ReferenceHighlightingWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.ReferenceHighlighting)]

src/Test/Diagnostics/Waiters/RenameWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.Rename)]

src/Test/Diagnostics/Waiters/SignatureHelpWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.SignatureHelp)]

src/Test/Diagnostics/Waiters/SolutionCrawlerWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.SolutionCrawler)]

src/Test/Diagnostics/Waiters/TodoCommentListWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.TodoCommentList)]

src/Test/Diagnostics/Waiters/WorkspaceWaiter.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Roslyn.Hosting.Diagnostics.Waiters
 {
+    [Shared]
     [Export(typeof(IAsynchronousOperationListener))]
     [Export(typeof(IAsynchronousOperationWaiter))]
     [Feature(FeatureAttribute.Workspace)]