Merge pull request #12644 from CyrusNajmabadi/asyncFindRefs2

Add support for the new async find refs.

src/Compilers/Core/Portable/InternalUtilities/MultiDictionary.cs

@@ -232,4 +232,4 @@ internal void Clear()
             _dictionary.Clear();
         }
     }
-}
+}
\ No newline at end of file

src/Dependencies/VisualStudio/project.json

@@ -2,15 +2,11 @@
   "supports": { },
   "dependencies": {
     "Microsoft.VisualStudio.Designer.Interfaces": "1.1.4322",
-    "Microsoft.VisualStudio.Editor": "14.3.25407",
     "Microsoft.VisualStudio.ImageCatalog": "14.3.25407",
     "Microsoft.VisualStudio.OLE.Interop": "7.10.6070",
-    "Microsoft.VisualStudio.Shell.Design": "14.3.25407",
-    "Microsoft.VisualStudio.Shell.14.0": "14.3.25407",
     "Microsoft.VisualStudio.Shell.Interop.10.0": "10.0.30319",
     "Microsoft.VisualStudio.Shell.Interop.11.0": "11.0.61030",
     "Microsoft.VisualStudio.Shell.Interop.12.1.DesignTime": "12.1.30328",
-    "Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407",
     "Microsoft.VisualStudio.TextManager.Interop.10.0": "10.0.30319",
     "Microsoft.VisualStudio.TextManager.Interop.12.0": "12.0.30110",
     "Microsoft.VisualStudio.TextManager.Interop.12.1.DesignTime": "12.1.30328",
@@ -19,8 +15,6 @@
     "Microsoft.VisualStudio.WCFReference.Interop": "9.0.30729",
     "Microsoft.VisualStudio.Data.Core": "9.0.21022",
     "Microsoft.VisualStudio.Data.Services": "9.0.21022",
-    "RoslynDependencies.Microsoft.VisualStudio.ComponentModelHost": "14.3.25407",
-    "RoslynDependencies.Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "14.3.25420",
     "Roslyn.Microsoft.VisualStudio.ExtensionManager": "0.0.4"
   },
   "frameworks": {

src/Dependencies/VisualStudioEditor/project.json

@@ -3,7 +3,6 @@
   "dependencies": {
     "Microsoft.VisualStudio.Imaging": "14.3.25407",
     "Microsoft.VisualStudio.ImageCatalog": "14.3.25407",
-    "Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
     "Microsoft.VisualStudio.Language.StandardClassification": "14.3.25407",
     "Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime": "14.3.25407"
   },

src/EditorFeatures/CSharp/FindReferences/CSharpFindReferencesService.cs

@@ -20,4 +20,17 @@ internal class CSharpFindReferencesService : AbstractFindReferencesService
         {
         }
     }
-}
+
+    [ExportLanguageService(typeof(IStreamingFindReferencesService), LanguageNames.CSharp), Shared]
+    internal class CSharpStreamingFindReferencesService : AbstractFindReferencesService
+    {
+        [ImportingConstructor]
+        public CSharpStreamingFindReferencesService(
+            [ImportMany] IEnumerable<IDefinitionsAndReferencesPresenter> referencedSymbolsPresenters,
+            [ImportMany] IEnumerable<INavigableItemsPresenter> navigableItemsPresenters,
+            [ImportMany] IEnumerable<IFindReferencesResultProvider> externalReferencesProviders)
+            : base(referencedSymbolsPresenters, navigableItemsPresenters, externalReferencesProviders)
+        {
+        }
+    }
+}
\ No newline at end of file

src/EditorFeatures/CSharp/project.json

 {
-  "dependencies": { },
+  "dependencies": { 
+      "Microsoft.VisualStudio.Language.Intellisense": {
+        "version": "14.3.25407",
+        "suppressParent": "all"
+    },
+  },
   "frameworks": {
     "net46": { }
   }

src/EditorFeatures/CSharpTest/project.json

 {
-  "dependencies": { },
+  "dependencies": { 
+    "Microsoft.VisualStudio.Language.Intellisense": {
+        "version": "14.3.25407",
+        "suppressParent": "all"
+    },
+  },
   "frameworks": {
     "net46": {}
   },

src/EditorFeatures/Core/EditorFeatures.csproj

@@ -75,6 +75,7 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.EditorFeatures" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.EditorFeatures" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices" />
+    <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Next" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.CSharp" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Implementation" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.SolutionExplorer" />
@@ -251,6 +252,7 @@
     <Compile Include="Extensibility\SignatureHelp\PredefinedSignatureHelpPresenterNames.cs" />
     <Compile Include="Extensibility\SignatureHelp\SignatureHelpItemEventArgs.cs" />
     <Compile Include="Extensibility\VersionSelector.cs" />
+    <Compile Include="Host\IStreamingFindReferencesPresenter.cs" />
     <Compile Include="Implementation\Adornments\AbstractAdornmentManagerProvider.cs" />
     <Compile Include="Implementation\Classification\SemanticClassificationBufferTaggerProvider.cs" />
     <Compile Include="Implementation\Classification\SemanticClassificationBufferTaggerProvider.Tagger.cs" />
@@ -262,6 +264,8 @@
     <Compile Include="Implementation\Diagnostics\DiagnosticsSuggestionTaggerProvider.cs" />
     <Compile Include="Implementation\Diagnostics\SuggestionAdornmentManagerProvider.cs" />
     <Compile Include="Implementation\Diagnostics\SuggestionTag.cs" />
+    <Compile Include="Implementation\FindReferences\AbstractFindReferencesService.ProgressAdapter.cs" />
+    <Compile Include="Implementation\FindReferences\FindReferencesContext.cs" />
     <Compile Include="Implementation\FindReferences\IFindReferencesNavigableItemResultProvider.cs" />
     <Compile Include="Implementation\GoToDefinition\INavigableDefinitionProvider.cs" />
     <Compile Include="Implementation\GoToImplementation\AbstractGoToImplementationService.cs" />
@@ -284,6 +288,7 @@
     <Compile Include="Implementation\Outlining\AbstractSyntaxOutliner.cs" />
     <Compile Include="Implementation\Outlining\InvalidOutliningRegionException.cs" />
     <Compile Include="Implementation\Preview\DifferenceViewerPreview.cs" />
+    <Compile Include="Implementation\Preview\PreviewReferenceHighlightingTaggerProvider.cs" />
     <Compile Include="Implementation\Suggestions\FixMultipleOccurrencesService.cs" />
     <Compile Include="Implementation\Suggestions\FixMultipleSuggestedAction.cs" />
     <Compile Include="Implementation\GoToImplementation\GoToImplementationCommandHandler.cs" />

src/EditorFeatures/Core/Host/IStreamingFindReferencesPresenter.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.
+
+namespace Microsoft.CodeAnalysis.Editor.Host
+{
+    /// <summary>
+    /// API for hosts to provide if they can present FindReferences results in a streaming manner.
+    /// i.e. if they support showing results as they are found instead of after all of the results
+    /// are found.
+    /// </summary>
+    internal interface IStreamingFindReferencesPresenter
+    {
+        /// <summary>
+        /// Tells the presenter that a search is starting.  The returned <see cref="FindReferencesContext"/>
+        /// is used to push information about the search into.  i.e. when a reference is found
+        /// <see cref="FindReferencesContext.OnReferenceFound"/> should be called.  When the
+        /// search completes <see cref="FindReferencesContext.OnCompleted"/> should be called. 
+        /// etc. etc.
+        /// </summary>
+        FindReferencesContext StartSearch();
+    }
+}
\ No newline at end of file

src/EditorFeatures/Core/Implementation/FindReferences/AbstractFindReferencesService.ProgressAdapter.cs

+using System;
+using System.Collections.Concurrent;
+using Microsoft.CodeAnalysis.Editor.Navigation;
+using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
+using Microsoft.CodeAnalysis.FindReferences;
+using Microsoft.CodeAnalysis.FindSymbols;
+
+namespace Microsoft.CodeAnalysis.Editor.Implementation.FindReferences
+{
+    internal abstract partial class AbstractFindReferencesService
+    {
+        /// <summary>
+        /// Forwards IFindReferencesProgress calls to a FindRefrencesContext instance.
+        /// </summary>
+        private class ProgressAdapter : ForegroundThreadAffinitizedObject, IFindReferencesProgress
+        {
+            private readonly Solution _solution;
+            private readonly FindReferencesContext _context;
+
+            /// <summary>
+            /// We will hear about definition symbols many times while performing FAR.  We'll
+            /// here about it first when the FAR engine discovers the symbol, and then for every
+            /// reference it finds to the symbol.  However, we only want to create and pass along
+            /// a single instance of <see cref="INavigableItem" /> for that definition no matter
+            /// how many times we see it.
+            /// 
+            /// This dictionary allows us to make that mapping once and then keep it around for
+            /// all future callbacks.
+            /// </summary>
+            private readonly ConcurrentDictionary<ISymbol, DefinitionItem> _definitionToItem =
+                new ConcurrentDictionary<ISymbol, DefinitionItem>(MetadataUnifyingEquivalenceComparer.Instance);
+
+            private readonly Func<ISymbol, DefinitionItem> _definitionFactory;
+
+            public ProgressAdapter(Solution solution, FindReferencesContext context)
+            {
+                _solution = solution;
+                _context = context;
+                _definitionFactory = s => s.ToDefinitionItem(solution);
+            }
+
+            // Do nothing functions.  The streaming far service doesn't care about
+            // any of these.
+            public void OnStarted() { }
+            public void OnCompleted() { }
+            public void OnFindInDocumentStarted(Document document) { }
+            public void OnFindInDocumentCompleted(Document document) { }
+
+            // Simple context forwarding functions.
+            public void ReportProgress(int current, int maximum) => _context.ReportProgress(current, maximum);
+
+            // More complicated forwarding functions.  These need to map from the symbols
+            // used by the FAR engine to the INavigableItems used by the streaming FAR 
+            // feature.
+
+            private DefinitionItem GetDefinitionItem(ISymbol definition)
+            {
+                return _definitionToItem.GetOrAdd(definition, _definitionFactory);
+            }
+
+            public void OnDefinitionFound(ISymbol definition)
+            {
+                _context.OnDefinitionFound(GetDefinitionItem(definition));
+            }
+
+            public void OnReferenceFound(ISymbol definition, ReferenceLocation location)
+            {
+                var referenceItem = location.TryCreateSourceReferenceItem(
+                    GetDefinitionItem(definition));
+
+                if (referenceItem != null)
+                {
+                    _context.OnReferenceFound(referenceItem);
+                }
+            }
+
+            public void CallThirdPartyExtensions()
+            {
+                var factory = _solution.Workspace.Services.GetService<IDefinitionsAndReferencesFactory>();
+                foreach (var definition in _definitionToItem.Keys)
+                {
+                    var item = factory.GetThirdPartyDefinitionItem(_solution, definition);
+                    if (item != null)
+                    {
+                        _context.OnDefinitionFound(item);
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

src/EditorFeatures/Core/Implementation/FindReferences/AbstractFindReferencesService.cs

@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Editor.Navigation;
+using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Editor.SymbolMapping;
 using Microsoft.CodeAnalysis.FindReferences;
 using Microsoft.CodeAnalysis.FindSymbols;
@@ -15,7 +16,8 @@
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.FindReferences
 {
-    internal abstract partial class AbstractFindReferencesService : IFindReferencesService
+    internal abstract partial class AbstractFindReferencesService :
+        ForegroundThreadAffinitizedObject, IFindReferencesService, IStreamingFindReferencesService
     {
         private readonly IEnumerable<IDefinitionsAndReferencesPresenter> _referenceSymbolPresenters;
         private readonly IEnumerable<INavigableItemsPresenter> _navigableItemPresenters;
@@ -31,6 +33,16 @@ internal abstract partial class AbstractFindReferencesService : IFindReferencesS
             _externalReferencesProviders = externalReferencesProviders;
         }
 
+        /// <summary>
+        /// Common helper for both the synchronous and streaming versions of FAR. 
+        /// It returns the symbol we want to search for and the solution we should
+        /// be searching.
+        /// 
+        /// Note that the <see cref="Solution"/> returned may absolutely *not* be
+        /// the same as <code>document.Project.Solution</code>.  This is because 
+        /// there may be symbol mapping involved (for example in Metadata-As-Source
+        /// scenarios).
+        /// </summary>
         private async Task<Tuple<ISymbol, Solution>> GetRelevantSymbolAndSolutionAtPositionAsync(
             Document document, int position, CancellationToken cancellationToken)
         {
@@ -84,7 +96,7 @@ private async Task AddExternalReferencesAsync(Document document, int position, A
             var symbol = symbolAndSolution.Item1;
             var solution = symbolAndSolution.Item2;
 
-            var displayName = symbol.IsConstructor() ? symbol.ContainingType.Name : symbol.Name;
+            var displayName = GetDisplayName(symbol);
 
             waitContext.Message = string.Format(
                 EditorFeaturesResources.Finding_references_of_0, displayName);
@@ -94,6 +106,11 @@ private async Task AddExternalReferencesAsync(Document document, int position, A
             return Tuple.Create(result, solution);
         }
 
+        private static string GetDisplayName(ISymbol symbol)
+        {
+            return symbol.IsConstructor() ? symbol.ContainingType.Name : symbol.Name;
+        }
+
         public bool TryFindReferences(Document document, int position, IWaitContext waitContext)
         {
             var cancellationToken = waitContext.CancellationToken;
@@ -171,5 +188,47 @@ private bool TryDisplayReferences(Tuple<IEnumerable<ReferencedSymbol>, Solution>
 
             return false;
         }
+
+        public async Task FindReferencesAsync(
+            Document document, int position, FindReferencesContext context)
+        {
+            var cancellationToken = context.CancellationToken;
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // Find the symbol we want to search and the solution we want to search in.
+            var symbolAndSolution = await GetRelevantSymbolAndSolutionAtPositionAsync(
+                document, position, cancellationToken).ConfigureAwait(false);
+            if (symbolAndSolution == null)
+            {
+                return;
+            }
+
+            var symbol = symbolAndSolution.Item1;
+            var solution = symbolAndSolution.Item2;
+
+            var displayName = GetDisplayName(symbol);
+            context.SetSearchLabel(displayName);
+
+            var progressAdapter = new ProgressAdapter(solution, context);
+
+            // Now call into the underlying FAR engine to find reference.  The FAR
+            // engine will push results into the 'progress' instance passed into it.
+            // We'll take those results, massage them, and forward them along to the 
+            // FindReferencesContext instance we were given.
+            //
+            // Note: we pass along ConfigureAwait(true) because we need to come back
+            // to the UI thread.  There's more work we need to do once the FAR engine
+            // is done.
+            await SymbolFinder.FindReferencesAsync(
+                symbol,
+                solution,
+                progressAdapter,
+                documents: null,
+                cancellationToken: cancellationToken).ConfigureAwait(true);
+
+            // After the FAR engine is done call into any third party extensions to see
+            // if they want to add results.
+            progressAdapter.CallThirdPartyExtensions();
+        }
     }
 }
\ No newline at end of file

src/EditorFeatures/Core/Implementation/FindReferences/FindReferencesCommandHandler.cs

@@ -3,84 +3,162 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
+using System.Linq;
 using Microsoft.CodeAnalysis.Editor.Commands;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
+using Microsoft.CodeAnalysis.Editor.Shared.Options;
+using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.FindReferences;
 using Microsoft.CodeAnalysis.Internal.Log;
+using Microsoft.CodeAnalysis.Shared.TestHooks;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Text;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.FindReferences
 {
-    [ExportCommandHandler(PredefinedCommandHandlerNames.FindReferences,
-       ContentTypeNames.RoslynContentType)]
-    internal class FindReferencesCommandHandler :
-        ICommandHandler<FindReferencesCommandArgs>
+    [ExportCommandHandler(PredefinedCommandHandlerNames.FindReferences, ContentTypeNames.RoslynContentType)]
+    internal class FindReferencesCommandHandler : ICommandHandler<FindReferencesCommandArgs>
     {
-        private readonly IEnumerable<IDefinitionsAndReferencesPresenter> _presenters;
+        private readonly IEnumerable<IDefinitionsAndReferencesPresenter> _synchronousPresenters;
+        private readonly IEnumerable<Lazy<IStreamingFindReferencesPresenter>> _streamingPresenters;
+
         private readonly IWaitIndicator _waitIndicator;
+        private readonly IAsynchronousOperationListener _asyncListener;
 
         [ImportingConstructor]
         internal FindReferencesCommandHandler(
             IWaitIndicator waitIndicator,
-            [ImportMany] IEnumerable<IDefinitionsAndReferencesPresenter> presenters)
+            [ImportMany] IEnumerable<IDefinitionsAndReferencesPresenter> synchronousPresenters,
+            [ImportMany] IEnumerable<Lazy<IStreamingFindReferencesPresenter>> streamingPresenters,
+            [ImportMany] IEnumerable<Lazy<IAsynchronousOperationListener, FeatureMetadata>> asyncListeners)
         {
-            Contract.ThrowIfNull(waitIndicator);
-            Contract.ThrowIfNull(presenters);
+            Contract.ThrowIfNull(synchronousPresenters);
+            Contract.ThrowIfNull(streamingPresenters);
+            Contract.ThrowIfNull(asyncListeners);
 
             _waitIndicator = waitIndicator;
-            _presenters = presenters;
+            _synchronousPresenters = synchronousPresenters;
+            _streamingPresenters = streamingPresenters;
+            _asyncListener = new AggregateAsynchronousOperationListener(
+                asyncListeners, FeatureAttribute.FindReferences);
         }
 
-        internal void FindReferences(ITextSnapshot snapshot, int caretPosition)
+        public CommandState GetCommandState(FindReferencesCommandArgs args, Func<CommandState> nextHandler)
         {
-            _waitIndicator.Wait(
-                title: EditorFeaturesResources.Find_References,
-                message: EditorFeaturesResources.Finding_references,
-                action: context =>
+            return nextHandler();
+        }
+
+        public void ExecuteCommand(FindReferencesCommandArgs args, Action nextHandler)
+        {
+            var caretPosition = args.TextView.GetCaretPoint(args.SubjectBuffer) ?? -1;
+
+            if (caretPosition >= 0)
             {
-                Document document = snapshot.GetOpenDocumentInCurrentContextWithChanges();
+                var snapshot = args.SubjectBuffer.CurrentSnapshot;
+                var document = snapshot.GetOpenDocumentInCurrentContextWithChanges();
                 if (document != null)
                 {
-                    var service = document.Project.LanguageServices.GetService<IFindReferencesService>();
-                    if (service != null)
+                    if (TryExecuteCommand(caretPosition, document))
                     {
-                        using (Logger.LogBlock(FunctionId.CommandHandler_FindAllReference, context.CancellationToken))
-                        {
-                            if (!service.TryFindReferences(document, caretPosition, context))
-                            {
-                                foreach (var presenter in _presenters)
-                                {
-                                    presenter.DisplayResult(DefinitionsAndReferences.Empty);
-                                    return;
-                                }
-                            }
-                        }
+                        return;
                     }
                 }
-            }, allowCancel: true);
+            }
+
+            nextHandler();
         }
 
-        public CommandState GetCommandState(FindReferencesCommandArgs args, Func<CommandState> nextHandler)
+        private bool TryExecuteCommand(int caretPosition, Document document)
         {
-            return nextHandler();
+            var streamingService = document.Project.LanguageServices.GetService<IStreamingFindReferencesService>();
+            var synchronousService = document.Project.LanguageServices.GetService<IFindReferencesService>();
+
+            var streamingPresenter = GetStreamingPresenter();
+
+            // See if we're running on a host that can provide streaming results.
+            // We'll both need a FAR service that can stream results to us, and 
+            // a presenter that can accept streamed results.
+            var streamingEnabled = document.Options.GetOption(FeatureOnOffOptions.StreamingFindReferences);
+            if (streamingEnabled && streamingService != null && streamingPresenter != null)
+            {
+                StreamingFindReferences(document, streamingService, streamingPresenter, caretPosition);
+                return true;
+            }
+
+            // Otherwise, either the language doesn't support streaming results,
+            // or the host has no way to present results in a sreaming manner.
+            // Fall back to the old non-streaming approach to finding and presenting 
+            // results.
+            if (synchronousService != null)
+            {
+                FindReferences(document, synchronousService, caretPosition);
+                return true;
+            }
+
+            return false;
         }
 
-        public void ExecuteCommand(FindReferencesCommandArgs args, Action nextHandler)
+        private IStreamingFindReferencesPresenter GetStreamingPresenter()
         {
-            var caretPosition = args.TextView.GetCaretPoint(args.SubjectBuffer) ?? -1;
-
-            if (caretPosition < 0)
+            try
             {
-                nextHandler();
-                return;
+                return _streamingPresenters.FirstOrDefault()?.Value;
             }
+            catch
+            {
+                return null;
+            }
+        }
 
-            var snapshot = args.SubjectBuffer.CurrentSnapshot;
+        private async void StreamingFindReferences(
+            Document document, IStreamingFindReferencesService service,
+            IStreamingFindReferencesPresenter presenter, int caretPosition)
+        {
+            try
+            {
+                using (var token = _asyncListener.BeginAsyncOperation(nameof(StreamingFindReferences)))
+                {
+                    // Let the presented know we're starging a search.  It will give us back
+                    // the context object that the FAR service will push results into.
+                    var context = presenter.StartSearch();
+                    await service.FindReferencesAsync(document, caretPosition, context).ConfigureAwait(false);
+
+                    // Note: we don't need to put this in a finally.  The only time we might not hit
+                    // this is if cancellation or another error gets thrown.  In the former case,
+                    // that means that a new search has started.  We don't care about telling the
+                    // context it has completed.  In the latter case somethign wrong has happened
+                    // and we don't want to run any more code code in this particular context.
+                    context.OnCompleted();
+                }
+            }
+            catch (Exception e) when (FatalError.ReportUnlessCanceled(e))
+            {
+            }
+        }
 
-            FindReferences(snapshot, caretPosition);
+        internal void FindReferences(
+            Document document, IFindReferencesService service, int caretPosition)
+        {
+            _waitIndicator.Wait(
+                title: EditorFeaturesResources.Find_References,
+                message: EditorFeaturesResources.Finding_references,
+                action: context =>
+                {
+                    using (Logger.LogBlock(FunctionId.CommandHandler_FindAllReference, context.CancellationToken))
+                    {
+                        if (!service.TryFindReferences(document, caretPosition, context))
+                        {
+                            // The service failed, so just present an empty list of references
+                            foreach (var presenter in _synchronousPresenters)
+                            {
+                                presenter.DisplayResult(DefinitionsAndReferences.Empty);
+                                return;
+                            }
+                        }
+                    }
+                }, allowCancel: true);
         }
     }
-}
+}
\ No newline at end of file

src/EditorFeatures/Core/Implementation/FindReferences/FindReferencesContext.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;
+using System.Threading;
+using Microsoft.CodeAnalysis.FindReferences;
+
+namespace Microsoft.CodeAnalysis.Editor
+{
+    internal abstract class FindReferencesContext
+    {
+        public virtual CancellationToken CancellationToken { get; }
+
+        protected FindReferencesContext()
+        {
+        }
+
+        public virtual void SetSearchLabel(string displayName)
+        {
+        }
+
+        public virtual void OnCompleted()
+        {
+        }
+
+        public virtual void OnDefinitionFound(DefinitionItem definition)
+        {
+        }
+
+        public virtual void OnReferenceFound(SourceReferenceItem reference)
+        {
+        }
+
+        public virtual void ReportProgress(int current, int maximum)
+        {
+        }
+    }
+}
\ No newline at end of file

src/EditorFeatures/Core/Implementation/FindReferences/IFindReferencesService.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.Threading.Tasks;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Host;
 
@@ -14,4 +15,13 @@ internal interface IFindReferencesService : ILanguageService
         /// <returns>True if finding references of the symbol at the provided position succeeds.  False, otherwise.</returns>
         bool TryFindReferences(Document document, int position, IWaitContext waitContext);
     }
+
+    internal interface IStreamingFindReferencesService : ILanguageService
+    {
+        /// <summary>
+        /// Finds the references for the symbol at the specific position in the document,
+        /// pushing the results into the context instance.
+        /// </summary>
+        Task FindReferencesAsync(Document document, int position, FindReferencesContext context);
+    }
 }
\ No newline at end of file

src/EditorFeatures/Core/Implementation/IntelliSense/QuickInfo/DeferredContent/ElisionBufferDeferredContent.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.Windows;
+using System.Windows.Controls;
 using System.Windows.Media;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Projection;
+using Microsoft.VisualStudio.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.QuickInfo
 {
@@ -21,28 +23,36 @@ internal class ElisionBufferDeferredContent : IDeferredQuickInfoContent
         private readonly IProjectionBufferFactoryService _projectionBufferFactoryService;
         private readonly IEditorOptionsFactoryService _editorOptionsFactoryService;
         private readonly ITextEditorFactoryService _textEditorFactoryService;
+        private readonly IContentType _contentType;
+        private readonly ITextViewRoleSet _roleSet;
 
         public ElisionBufferDeferredContent(
             SnapshotSpan span,
             IProjectionBufferFactoryService projectionBufferFactoryService,
             IEditorOptionsFactoryService editorOptionsFactoryService,
-            ITextEditorFactoryService textEditorFactoryService)
+            ITextEditorFactoryService textEditorFactoryService,
+            IContentType contentType = null,
+            ITextViewRoleSet roleSet = null)
         {
             _span = span;
             _projectionBufferFactoryService = projectionBufferFactoryService;
             _editorOptionsFactoryService = editorOptionsFactoryService;
             _textEditorFactoryService = textEditorFactoryService;
+            _contentType = contentType;
+            _roleSet = roleSet ?? _textEditorFactoryService.NoRoles;
         }
 
-        public FrameworkElement Create()
+        public ContentControl Create()
         {
             return new ViewHostingControl(CreateView, CreateBuffer);
         }
 
+        FrameworkElement IDeferredQuickInfoContent.Create() => Create();
+
         private IWpfTextView CreateView(ITextBuffer buffer)
         {
             var view = _textEditorFactoryService.CreateTextView(
-                buffer, _textEditorFactoryService.NoRoles);
+                buffer, _roleSet);
 
             view.SizeToFit();
             view.Background = Brushes.Transparent;
@@ -56,7 +66,7 @@ private IWpfTextView CreateView(ITextBuffer buffer)
         private IElisionBuffer CreateBuffer()
         {
             return _projectionBufferFactoryService.CreateElisionBufferWithoutIndentation(
-                            _editorOptionsFactoryService.GlobalOptions, _span);
+                _editorOptionsFactoryService.GlobalOptions, _contentType, _span);
         }
     }
-}
+}
\ No newline at end of file

src/EditorFeatures/Core/Implementation/Outlining/OutliningTaggerProvider.Tag.cs

@@ -9,6 +9,7 @@
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Projection;
 using Microsoft.VisualStudio.Text.Tagging;
+using Microsoft.VisualStudio.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.Outlining
 {
@@ -138,11 +139,13 @@ private Span TrimStartingNewlines(Span span)
                 return span;
             }
 
-            private ITextBuffer CreateElisionBufferWithoutIndentation(ITextBuffer dataBuffer, Span shortHintSpan)
+            private ITextBuffer CreateElisionBufferWithoutIndentation(
+                ITextBuffer dataBuffer, Span shortHintSpan)
             {
                 return _projectionBufferFactoryService.CreateElisionBufferWithoutIndentation(
                     _editorOptionsFactoryService.GlobalOptions,
-                    new SnapshotSpan(dataBuffer.CurrentSnapshot, shortHintSpan));
+                    contentType: null,
+                    exposedSpans: new SnapshotSpan(dataBuffer.CurrentSnapshot, shortHintSpan));
             }
         }
     }

src/EditorFeatures/Core/Implementation/Preview/AbstractPreviewTaggerProvider.cs

@@ -42,7 +42,7 @@ public Tagger(ITextBuffer buffer, object key, TTag tagInstance)
             public IEnumerable<ITagSpan<TTag>> GetTags(NormalizedSnapshotSpanCollection spans)
             {
                 NormalizedSnapshotSpanCollection matchingSpans;
-                if (_buffer.Properties.TryGetProperty<NormalizedSnapshotSpanCollection>(_key, out matchingSpans))
+                if (_buffer.Properties.TryGetProperty(_key, out matchingSpans))
                 {
                     var intersection = NormalizedSnapshotSpanCollection.Intersection(matchingSpans, spans);
 

src/EditorFeatures/Core/Implementation/Preview/PreviewFactoryService.cs

@@ -737,4 +737,4 @@ private NormalizedSpanCollection GetChangedSpans(IHierarchicalDifferenceCollecti
             return new NormalizedSpanCollection(lineSpans);
         }
     }
-}
+}
\ No newline at end of file

src/EditorFeatures/Core/Implementation/Preview/PreviewReferenceHighlightingTaggerProvider.cs

+using System.ComponentModel.Composition;
+using Microsoft.CodeAnalysis.Editor.Shared.Preview;
+using Microsoft.CodeAnalysis.Editor.Shared.Tagging;
+using Microsoft.VisualStudio.Text.Editor;
+using Microsoft.VisualStudio.Text.Tagging;
+using Microsoft.VisualStudio.Utilities;
+using Microsoft.CodeAnalysis.Editor.Implementation.ReferenceHighlighting;
+
+namespace Microsoft.CodeAnalysis.Editor.Implementation.Preview
+{
+    /// <summary>
+    /// Special tagger we use for previews that is told precisely which spans to
+    /// reference highlight.
+    /// </summary>
+    [Export(typeof(ITaggerProvider))]
+    [TagType(typeof(NavigableHighlightTag))]
+    [ContentType(ContentTypeNames.RoslynContentType)]
+    [TextViewRole(TextViewRoles.PreviewRole)]
+    internal class PreviewReferenceHighlightingTaggerProvider
+        : AbstractPreviewTaggerProvider<NavigableHighlightTag>
+    {
+        [ImportingConstructor]
+        public PreviewReferenceHighlightingTaggerProvider() :
+            base(PredefinedPreviewTaggerKeys.ReferenceHighlightingSpansKey, ReferenceHighlightTag.Instance)
+        {
+        }
+    }
+
+    [Export(typeof(ITaggerProvider))]
+    [TagType(typeof(NavigableHighlightTag))]
+    [ContentType(ContentTypeNames.RoslynContentType)]
+    [TextViewRole(TextViewRoles.PreviewRole)]
+    internal class PreviewDefinitionHighlightingTaggerProvider
+        : AbstractPreviewTaggerProvider<NavigableHighlightTag>
+    {
+        [ImportingConstructor]
+        public PreviewDefinitionHighlightingTaggerProvider() :
+            base(PredefinedPreviewTaggerKeys.DefinitionHighlightingSpansKey, DefinitionHighlightTag.Instance)
+        {
+        }
+    }
+}
\ No newline at end of file

src/EditorFeatures/Core/Implementation/Preview/PreviewWarningViewTaggerProvider.cs

@@ -6,6 +6,7 @@
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Tagging;
 using Microsoft.VisualStudio.Utilities;
+using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting;
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.Preview
 {
@@ -22,4 +23,4 @@ internal class PreviewWarningTaggerProvider
         {
         }
     }
-}
+}
\ No newline at end of file

src/EditorFeatures/Core/Implementation/ReferenceHighlighting/DefinitionHighlightTag.cs

@@ -6,7 +6,7 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.ReferenceHighlighting
 {
     internal class DefinitionHighlightTag : NavigableHighlightTag
     {
-        internal const string TagId = "MarkerFormatDefinition/HighlightedDefinition";
+        public const string TagId = "MarkerFormatDefinition/HighlightedDefinition";
 
         public static readonly DefinitionHighlightTag Instance = new DefinitionHighlightTag();
 

src/EditorFeatures/Core/Shared/Extensions/GlyphExtensions.cs

@@ -383,6 +383,9 @@ public static ImageMoniker GetImageMoniker(this Glyph glyph)
                 case Glyph.CompletionWarning:
                     return KnownMonikers.IntellisenseWarning;
 
+                case Glyph.StatusInformation:
+                    return KnownMonikers.StatusInformation;
+
                 case Glyph.NuGet:
                     return KnownMonikers.NuGet;
 
@@ -629,6 +632,9 @@ public static Glyph GetGlyph(this ImmutableArray<string> tags)
 
                     case CompletionTags.Warning:
                         return Glyph.CompletionWarning;
+
+                case CompletionTags.StatusInformation:
+                    return Glyph.StatusInformation;
                 }
             }
 

src/EditorFeatures/Core/Shared/Extensions/IProjectionBufferFactoryServiceExtensions.cs

@@ -17,7 +17,7 @@ namespace Microsoft.CodeAnalysis.Editor.Shared.Extensions
 {
     internal static class IProjectionBufferFactoryServiceExtensions
     {
-        private const string RoslynPreviewContentType = nameof(RoslynPreviewContentType);
+        public const string RoslynPreviewContentType = nameof(RoslynPreviewContentType);
 
         /// <summary>
         /// Hack to get view taggers working on our preview surfaces.  We need to define
@@ -33,16 +33,19 @@ internal static class IProjectionBufferFactoryServiceExtensions
         public static IElisionBuffer CreateElisionBufferWithoutIndentation(
             this IProjectionBufferFactoryService factoryService,
             IEditorOptions editorOptions,
+            IContentType contentType = null,
             params SnapshotSpan[] exposedSpans)
         {
             return factoryService.CreateElisionBufferWithoutIndentation(
                 editorOptions,
+                contentType,
                 (IEnumerable<SnapshotSpan>)exposedSpans);
         }
 
         public static IElisionBuffer CreateElisionBufferWithoutIndentation(
             this IProjectionBufferFactoryService factoryService,
             IEditorOptions editorOptions,
+            IContentType contentType,
             IEnumerable<SnapshotSpan> exposedSpans)
         {
             var spans = new NormalizedSnapshotSpanCollection(exposedSpans);
@@ -57,7 +60,9 @@ internal static class IProjectionBufferFactoryServiceExtensions
                     spans.Select(s => s.TranslateTo(currentSnapshot, SpanTrackingMode.EdgeExclusive)));
             }
 
-            var elisionBuffer = factoryService.CreateElisionBuffer(null, spans, ElisionBufferOptions.None);
+            contentType = contentType ?? factoryService.ProjectionContentType;
+            var elisionBuffer = factoryService.CreateElisionBuffer(
+                null, spans, ElisionBufferOptions.None, contentType);
 
             if (spans.Count > 0)
             {

src/EditorFeatures/Core/Shared/Extensions/TaggedTextExtensions.cs

@@ -8,6 +8,7 @@
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Classification;
 using Roslyn.Utilities;
+using System;
 
 namespace Microsoft.CodeAnalysis.Editor.Shared.Extensions
 {
@@ -31,19 +32,55 @@ public static TextBlock ToTextBlock(this TaggedText part, ClassificationTypeMap
             return SpecializedCollections.SingletonEnumerable(part).ToTextBlock(typeMap);
         }
 
-        public static TextBlock ToTextBlock(this IEnumerable<TaggedText> parts, ClassificationTypeMap typeMap)
+        public static IList<Inline> ToInlines(
+            this IEnumerable<TaggedText> parts, 
+            ClassificationTypeMap typeMap,
+            string classificationFormatMap = null,
+            Action<Run, TaggedText, int> runCallback = null)
         {
-            var result = new TextBlock() { TextWrapping = TextWrapping.Wrap };
+            classificationFormatMap = classificationFormatMap ?? "tooltip";
 
-            var formatMap = typeMap.ClassificationFormatMapService.GetClassificationFormatMap("tooltip");
-            result.SetDefaultTextProperties(formatMap);
+            var formatMap = typeMap.ClassificationFormatMapService.GetClassificationFormatMap(classificationFormatMap);
+            var inlines = new List<Inline>();
 
+            var position = 0;
             foreach (var part in parts)
             {
-                result.Inlines.Add(part.ToRun(formatMap, typeMap));
+                var run = part.ToRun(formatMap, typeMap);
+                runCallback?.Invoke(run, part, position);
+                inlines.Add(run);
+
+                position += part.Text.Length;
             }
 
-            return result;
+            return inlines;
+        }
+
+        public static TextBlock ToTextBlock(
+            this IEnumerable<TaggedText> parts,
+            ClassificationTypeMap typeMap,
+            string classificationFormatMap = null,
+            Action<Run, TaggedText, int> runCallback = null)
+        {
+            classificationFormatMap = classificationFormatMap ?? "tooltip";
+
+            var inlines = parts.ToInlines(typeMap, classificationFormatMap, runCallback);
+            return inlines.ToTextBlock(typeMap, classificationFormatMap);
+        }
+
+        public static TextBlock ToTextBlock(
+            this IEnumerable<Inline> inlines,
+            ClassificationTypeMap typeMap,
+            string classificationFormatMap = null)
+        {
+            classificationFormatMap = classificationFormatMap ?? "tooltip";
+            var formatMap = typeMap.ClassificationFormatMapService.GetClassificationFormatMap(classificationFormatMap);
+
+            var textBlock = new TextBlock { TextWrapping = TextWrapping.Wrap };
+            textBlock.SetDefaultTextProperties(formatMap);
+            textBlock.Inlines.AddRange(inlines);
+
+            return textBlock;
         }
 
         public static IList<ClassificationSpan> ToClassificationSpans(

src/EditorFeatures/Core/Shared/Options/FeatureOnOffOptions.cs

@@ -64,5 +64,8 @@ internal static class FeatureOnOffOptions
         /// </summary>
         [ExportOption]
         public static readonly PerLanguageOption<bool> RefactoringVerification = new PerLanguageOption<bool>(OptionName, "Refactoring Verification", defaultValue: false);
+
+        [ExportOption]
+        public static readonly PerLanguageOption<bool> StreamingFindReferences = new PerLanguageOption<bool>(OptionName, nameof(StreamingFindReferences), defaultValue: true);
     }
 }

src/EditorFeatures/Core/Shared/Preview/PredefinedPreviewTaggerKeys.cs

@@ -4,6 +4,8 @@ namespace Microsoft.CodeAnalysis.Editor.Shared.Preview
 {
     internal static class PredefinedPreviewTaggerKeys
     {
+        public static readonly object DefinitionHighlightingSpansKey = new object();
+        public static readonly object ReferenceHighlightingSpansKey = new object();
         public static readonly object ConflictSpansKey = new object();
         public static readonly object WarningSpansKey = new object();
         public static readonly object SuppressDiagnosticsSpansKey = new object();

src/EditorFeatures/Core/Shared/Utilities/ViewHostingControl.cs

@@ -14,7 +14,9 @@ internal class ViewHostingControl : ContentControl
         private readonly Func<ITextBuffer, IWpfTextView> _createView;
         private readonly Func<ITextBuffer> _createBuffer;
 
-        public ViewHostingControl(Func<ITextBuffer, IWpfTextView> createView, Func<ITextBuffer> createBuffer)
+        public ViewHostingControl(
+            Func<ITextBuffer, IWpfTextView> createView, 
+            Func<ITextBuffer> createBuffer)
         {
             _createView = createView;
             _createBuffer = createBuffer;

src/EditorFeatures/Core/project.json

@@ -2,7 +2,11 @@
   "dependencies": {
     "System.Collections.Immutable": "1.2.0",
     "RoslynDependencies.Microsoft.VisualStudio.Language.CallHierarchy": "14.3.25407",
-    "RoslynDependencies.Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "14.3.25407"
+    "RoslynDependencies.Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "14.3.25407",
+	"Microsoft.VisualStudio.Language.Intellisense": {
+        "version": "14.3.25407",
+        "suppressParent": "all"
+    }
   },
   "frameworks": {
     "net46": {}

src/EditorFeatures/Test/Extensions/IProjectionBufferFactoryServiceExtensionsTests.cs

@@ -30,7 +30,8 @@ line 2
             var elisionBuffer = IProjectionBufferFactoryServiceExtensions.CreateElisionBufferWithoutIndentation(
                 exportProvider.GetExportedValue<IProjectionBufferFactoryService>(),
                 exportProvider.GetExportedValue<IEditorOptionsFactoryService>().GlobalOptions,
-                textBuffer.CurrentSnapshot.GetFullSpan());
+                contentType: null,
+                exposedSpans: textBuffer.CurrentSnapshot.GetFullSpan());
 
             var elisionSnapshot = elisionBuffer.CurrentSnapshot;
             Assert.Equal(elisionSnapshot.LineCount, 3);

src/EditorFeatures/Test/FindReferences/FindReferencesCommandHandlerTests.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;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Editor.Commands;
+using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Editor.Implementation.FindReferences;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Utilities;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
 using Microsoft.CodeAnalysis.FindReferences;
+using Microsoft.CodeAnalysis.Shared.TestHooks;
 using Microsoft.VisualStudio.Text;
 using Roslyn.Test.Utilities;
 using Roslyn.Utilities;
@@ -25,7 +28,9 @@ public async Task TestFindReferencesSynchronousCall()
 
                 var handler = new FindReferencesCommandHandler(
                     TestWaitIndicator.Default,
-                    SpecializedCollections.SingletonEnumerable(findReferencesPresenter));
+                    SpecializedCollections.SingletonEnumerable(findReferencesPresenter),
+                    SpecializedCollections.EmptyEnumerable<Lazy<IStreamingFindReferencesPresenter>>(),
+                    workspace.ExportProvider.GetExports<IAsynchronousOperationListener, FeatureMetadata>());
 
                 var textView = workspace.Documents[0].GetTextView();
                 textView.Caret.MoveTo(new SnapshotPoint(textView.TextSnapshot, 7));

src/EditorFeatures/Test/project.json

@@ -2,7 +2,11 @@
   "dependencies": {
     "BasicUndo": "0.9.3",
     "Microsoft.VisualStudio.Composition": "14.2.19-pre",
-    "RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407"
+    "RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
+	"Microsoft.VisualStudio.Language.Intellisense": {
+        "version": "14.3.25407",
+        "suppressParent": "all"
+    },
   },
   "frameworks": {
     "net46": {}

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.AliasSymbols.vb

@@ -4,7 +4,7 @@ Imports System.Threading.Tasks
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAlias1() As Task
             Dim input =
 <Workspace>
@@ -32,7 +32,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAlias2() As Task
             Dim input =
 <Workspace>
@@ -53,7 +53,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAlias3() As Task
             Dim input =
 <Workspace>
@@ -74,10 +74,10 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
         </Document>
     </Project>
 </Workspace>
-            Await TestAsync(input)
+            Await TestFullAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestNamedType_CSharpAttributeEndingWithAttributeThroughAlias() As Task
             Dim input =
 <Workspace>
@@ -107,7 +107,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         <WorkItem(667962, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/667962")>
         Public Async Function TestMultipleAliasSymbols() As Task
             Dim input =
@@ -139,7 +139,7 @@ namespace NS
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         <WorkItem(667962, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/667962")>
         Public Async Function TestMultipleAliasSymbols2() As Task
             Dim input =
@@ -170,7 +170,7 @@ namespace NS
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestNamedType_VBAttributeEndingWithAttributeThroughAlias() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.AnonymousTypeSymbols.vb

@@ -5,7 +5,7 @@ Imports System.Threading.Tasks
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
         <WorkItem(542553, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542553")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAnonymousType1() As Task
             Dim input =
 <Workspace>
@@ -27,7 +27,7 @@ End Module
         End Function
 
         <WorkItem(542553, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542553")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAnonymousType2() As Task
             Dim input =
 <Workspace>
@@ -49,7 +49,7 @@ End Module
         End Function
 
         <WorkItem(542553, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542553")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAnonymousType3() As Task
             Dim input =
 <Workspace>
@@ -73,7 +73,7 @@ End Module
         End Function
 
         <WorkItem(542553, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542553")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAnonymousType4() As Task
             Dim input =
 <Workspace>
@@ -97,7 +97,7 @@ End Module
         End Function
 
         <WorkItem(542705, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542705")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAnonymousType5() As Task
             Dim input =
 <Workspace>
@@ -123,7 +123,7 @@ End Class
         End Function
 
         <WorkItem(3284, "https://github.com/dotnet/roslyn/issues/3284")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCaseInsensitiveAnonymousType1() As Task
             Dim input =
 <Workspace>
@@ -143,7 +143,7 @@ End Class
         End Function
 
         <WorkItem(3284, "https://github.com/dotnet/roslyn/issues/3284")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCaseInsensitiveAnonymousType2() As System.Threading.Tasks.Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.AsyncSymbols.vb

@@ -4,7 +4,7 @@ Imports System.Threading.Tasks
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSAsyncMethodsName1() As Task
             Dim input =
 <Workspace>
@@ -31,7 +31,7 @@ class Test
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVBAsyncMethodsName1() As Task
             Dim input =
 <Workspace>
@@ -54,7 +54,7 @@ End Class
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSAsyncMethodsName2() As Task
             Dim input =
 <Workspace>
@@ -83,7 +83,7 @@ class Test
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVBAsyncMethodsName2() As Task
             Dim input =
 <Workspace>
@@ -106,7 +106,7 @@ End Class
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSAsyncMethodsName3() As Task
             Dim input =
 <Workspace>
@@ -132,7 +132,7 @@ class Test
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVBAsyncMethodsName3() As Task
             Dim input =
 <Workspace>
@@ -155,7 +155,7 @@ End Class
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSAsyncDelegatesName1() As Task
             Dim input =
 <Workspace>
@@ -180,7 +180,7 @@ class Test
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVBAsyncDelegatesName1() As Task
             Dim input =
 <Workspace>
@@ -203,7 +203,7 @@ End Class
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSAsyncDelegatesName2() As Task
             Dim input =
 <Workspace>
@@ -231,7 +231,7 @@ class Test
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVBAsyncDelegatesName2() As Task
             Dim input =
 <Workspace>
@@ -256,7 +256,7 @@ End Class
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSAsyncLambdaName1() As Task
             Dim input =
 <Workspace>
@@ -283,7 +283,7 @@ class Test
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVBAsyncLambdaName1() As Task
             Dim input =
 <Workspace>
@@ -308,7 +308,7 @@ End Class
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAsyncWithinDelegate() As Task
             Dim input =
 <Workspace>
@@ -334,7 +334,7 @@ class Program
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAsyncVBWithinAnonFunctions() As Task
             Dim input =
 <Workspace>
@@ -358,7 +358,7 @@ End Class
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAsyncWithinLambda() As Task
             Dim input =
 <Workspace>
@@ -384,7 +384,7 @@ class Program
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAsyncFunctionWithAsyncParameters1() As Task
             Dim input =
 <Workspace>
@@ -413,7 +413,7 @@ class Test
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAsyncVBFunctionWithAsyncParameters1() As Task
             Dim input =
 <Workspace>
@@ -436,7 +436,7 @@ End Class
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAsyncVBFunctionWithAsyncParameters2() As Task
             Dim input =
 <Workspace>
@@ -459,7 +459,7 @@ End Class
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAsyncFunctionWithAsyncParameters2() As Task
             Dim input =
 <Workspace>
@@ -488,7 +488,7 @@ class Test
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAsyncFunctionWithAsyncParameters3() As Task
             Dim input =
 <Workspace>
@@ -514,7 +514,7 @@ class Test
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAsyncFunctionWithAsyncParameters4() As Task
             Dim input =
 <Workspace>
@@ -540,7 +540,7 @@ class Test
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAsyncCSFunctionWithRecursion() As Task
             Dim input =
 <Workspace>
@@ -566,7 +566,7 @@ class Test
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAsyncCSFunctionWithOverloading1() As Task
             Dim input =
 <Workspace>
@@ -599,7 +599,7 @@ class Test
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAsyncVBFunctionWithOverloading1() As Task
             Dim input =
 <Workspace>
@@ -627,7 +627,7 @@ End Class
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAsyncVBFunctionWithOverloading2() As Task
             Dim input =
 <Workspace>
@@ -655,7 +655,7 @@ End Class
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAsyncCSFunctionWithOverloading2() As Task
             Dim input =
 <Workspace>
@@ -689,7 +689,7 @@ class Test
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAsyncCSAsIdentifier() As Task
             Dim input =
 <Workspace>
@@ -706,7 +706,7 @@ class Test
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAsyncVBAsIdentifier() As Task
             Dim input =
 <Workspace>
@@ -726,7 +726,7 @@ End Class
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAwaitCSAsIdentifier() As Task
             Dim input =
 <Workspace>
@@ -743,7 +743,7 @@ class Test
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAwaitVBAsIdentifier() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.ConstructorSymbols.vb

@@ -4,7 +4,7 @@ Imports System.Threading.Tasks
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestThisConstructorInitializerSameFile1() As Task
             Dim input =
 <Workspace>
@@ -28,7 +28,7 @@ class Program
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestThisConstructorInitializerSameFile2() As Task
             Dim input =
 <Workspace>
@@ -52,7 +52,7 @@ class Program
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestThisConstructorInitializerDifferentFile1() As Task
             Dim input =
 <Workspace>
@@ -80,7 +80,7 @@ partial class Program
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestThisConstructorInitializerDifferentFile2() As Task
             Dim input =
 <Workspace>
@@ -108,7 +108,7 @@ partial class Program
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBaseConstructorInitializerSameFile1() As Task
             Dim input =
 <Workspace>
@@ -135,7 +135,7 @@ class BaseType
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBaseConstructorInitializerSameFile2() As Task
             Dim input =
 <Workspace>
@@ -162,7 +162,7 @@ class BaseType
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBaseConstructorInitializerDifferentFile1() As Task
             Dim input =
 <Workspace>
@@ -190,7 +190,7 @@ class BaseType
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBaseConstructorInitializerDifferentFile2() As Task
             Dim input =
 <Workspace>
@@ -218,7 +218,7 @@ class BaseType
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBaseConstructorInitializerDifferentFile3() As Task
             Dim input =
 <Workspace>
@@ -252,7 +252,7 @@ class BaseType
         End Function
 
         <WorkItem(541658, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/541658")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAttribute1() As Task
             Dim input =
 <Workspace>
@@ -275,7 +275,7 @@ internal class {|Definition:$$AttClassAttribute|} : Attribute
         End Function
 
         <WorkItem(541658, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/541658")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAttribute2() As Task
             Dim input =
 <Workspace>
@@ -298,7 +298,7 @@ internal class {|Definition:$$AttClassAttribute|} : Attribute
         End Function
 
         <WorkItem(541658, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/541658")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAttribute3() As Task
             Dim input =
 <Workspace>
@@ -319,7 +319,7 @@ internal class {|Definition:$$AttClassAttribute|} : Attribute
         End Function
 
         <WorkItem(541658, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/541658")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAttribute4() As Task
             Dim input =
 <Workspace>
@@ -339,7 +339,7 @@ internal class {|Definition:$$AttClassAttribute|} : Attribute
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestThisAtEndOfFile() As Task
             Dim input =
 <Workspace>
@@ -360,7 +360,7 @@ class Program
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestConstructor_ThroughAlias1() As Task
             Dim input =
 <Workspace>
@@ -386,7 +386,7 @@ class Program
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAttributeConstructor_ThroughAlias1() As Task
             Dim input =
 <Workspace>
@@ -414,7 +414,7 @@ class Program
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAttributeConstructor_ThroughAlias2() As Task
             Dim input =
 <Workspace>
@@ -445,7 +445,7 @@ class Program
         End Function
 
         <WorkItem(542218, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542218")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAttributeConstructor_ThroughAlias3() As Task
             Dim input =
 <Workspace>
@@ -473,7 +473,7 @@ class Program
         End Function
 
         <WorkItem(542218, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542218")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAttributeConstructor_ThroughAlias4() As Task
             Dim input =
 <Workspace>
@@ -501,7 +501,7 @@ class Program
         End Function
 
         <WorkItem(542218, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542218")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAttributeConstructor_ThroughAlias5() As Task
             Dim input =
 <Workspace>
@@ -529,7 +529,7 @@ class Program
         End Function
 
         <WorkItem(542218, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542218")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAttributeConstructor_ThroughAlias6() As Task
             Dim input =
 <Workspace>
@@ -557,7 +557,7 @@ class Program
         End Function
 
         <WorkItem(542218, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542218")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAttributeConstructor_ThroughAlias7() As Task
             Dim input =
 <Workspace>
@@ -585,7 +585,7 @@ class Program
         End Function
 
         <WorkItem(542218, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542218")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAttributeConstructor_ThroughAlias8() As Task
             Dim input =
 <Workspace>
@@ -613,7 +613,7 @@ class Program
         End Function
 
         <WorkItem(542218, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542218")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAttributeConstructor_ThroughAlias9() As Task
             Dim input =
 <Workspace>
@@ -641,7 +641,7 @@ class Program
         End Function
 
         <WorkItem(542979, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542979")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAttributeConstructor_ThroughAlias10() As Task
             Dim input =
 <Workspace>
@@ -683,7 +683,7 @@ class C { }
 #End If
 
         <WorkItem(542386, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542386")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestClassCalledNew1() As Task
             Dim input =
 <Workspace>
@@ -709,7 +709,7 @@ End Class
         End Function
 
         <WorkItem(531200, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/531200")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharpCascadeFromTypeToConstructorsAndDestructors() As Task
             Dim input =
 <Workspace>
@@ -739,7 +739,7 @@ namespace Tester
         End Function
 
         <WorkItem(531200, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/531200")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVBCascadeFromTypeToConstructorsAndDestructors() As Task
             Dim input =
 <Workspace>
@@ -767,7 +767,7 @@ End Namespace
         End Function
 
         <WorkItem(652809, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/652809")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharpStaticCtorVsInstanceCtorReferences() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.DelegateInvokeMethodSymbols.vb

@@ -5,7 +5,7 @@ Imports System.Threading.Tasks
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
         <WorkItem(11003, "DevDiv_Projects/Roslyn")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAnonymousDelegateInvoke1() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.DynamicAssemblies.vb

@@ -4,7 +4,7 @@ Imports System.Threading.Tasks
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
-        <Fact(), Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact(), Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLocalVariableOnDeclaration() As Task
             Dim input =
 <Workspace>
@@ -42,7 +42,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestDynamicFunctionOnDefinition() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.DynamicBinding.vb

@@ -4,7 +4,7 @@ Imports System.Threading.Tasks
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestFunctionBindOnDefinition() As Task
             Dim input =
 <Workspace>
@@ -28,7 +28,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestFunctionBindOnUse() As Task
             Dim input =
 <Workspace>
@@ -52,7 +52,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestPropertyBindOnUse() As Task
             Dim input =
 <Workspace>
@@ -81,7 +81,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestPropertyBindOnDefinition() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.DynamicConstructors.vb

@@ -4,7 +4,7 @@ Imports System.Threading.Tasks
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestConstructorOnDynamicCall() As Task
             Dim input =
 <Workspace>
@@ -30,7 +30,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestConstructorOnOverloadedDynamicDefinition() As Task
             Dim input =
 <Workspace>
@@ -56,7 +56,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestConstructorOnTypeName() As Task
             Dim input =
 <Workspace>
@@ -82,7 +82,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestConstructorOnNonDynamicCall() As Task
             Dim input =
 <Workspace>
@@ -108,7 +108,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestConstructorOverloadedOnNonDynamicDefinition() As Task
             Dim input =
 <Workspace>
@@ -134,7 +134,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestConstructorOverloadedOnDynamicTypeDeclaration() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.DynamicDelegatesAndIndexers.vb

@@ -4,7 +4,7 @@ Imports System.Threading.Tasks
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestDelegateWithDynamicArgument() As Task
             Dim input =
 <Workspace>
@@ -26,7 +26,7 @@ class A
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestIndexerWithStaticParameter() As Task
             Dim input =
 <Workspace>
@@ -54,7 +54,7 @@ class B
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestIndexerWithDynamicParameter() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.DynamicFunctions.vb

@@ -4,7 +4,7 @@ Imports System.Threading.Tasks
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestFunctionDynamicParameterCall() As Task
             Dim input =
 <Workspace>
@@ -28,7 +28,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestFunctionDynamicArgumentCall() As Task
             Dim input =
 <Workspace>
@@ -53,7 +53,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestDoubleFunctionCallWithKnownTypeReturn() As Task
             Dim input =
 <Workspace>
@@ -78,7 +78,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestDoubleFunctionCallWithDynamicTypeReturn() As Task
             Dim input =
 <Workspace>
@@ -103,7 +103,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestFunctionDynamicParameterOnDefinition() As Task
             Dim input =
 <Workspace>
@@ -127,7 +127,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestFunctionDynamicArgumentOnDefinition() As Task
             Dim input =
 <Workspace>
@@ -152,7 +152,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestDoubleFunctionDynamicOnDefinition() As Task
             Dim input =
 <Workspace>
@@ -177,7 +177,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestFunctionOverloadOnKnownTypeDefinition() As Task
             Dim input =
 <Workspace>
@@ -206,7 +206,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestFunctionOverloadOnDynamicTypeDefinition() As Task
             Dim input =
 <Workspace>
@@ -234,7 +234,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestFunctionOverloadOnDynamicTypeCall() As Task
             Dim input =
 <Workspace>
@@ -263,7 +263,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestFunctionOverloadOnStaticTypeCall() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.DynamicIdentifiers.vb

@@ -4,7 +4,7 @@ Imports System.Threading.Tasks
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLocalVariable() As Task
             Dim input =
 <Workspace>
@@ -26,7 +26,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLocalObject() As Task
             Dim input =
 <Workspace>
@@ -50,7 +50,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLocalLambda() As Task
             Dim input =
 <Workspace>
@@ -72,7 +72,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLocalArray() As Task
             Dim input =
 <Workspace>
@@ -93,7 +93,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLocalCast() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.DynamicPartialClass.vb

@@ -4,7 +4,7 @@ Imports System.Threading.Tasks
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestDynamicLocalVariableOnDeclaration() As Task
             Dim input =
 <Workspace>
@@ -31,7 +31,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestDynamicLocalVariableOnUse() As Task
             Dim input =
 <Workspace>
@@ -58,7 +58,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestDynamicFunction() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.EventSymbols.vb

@@ -5,7 +5,7 @@ Imports System.Threading.Tasks
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
         <WorkItem(542443, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542443")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestEvent1() As Task
             Dim input =
 <Workspace>
@@ -40,7 +40,7 @@ public class MainClass
         End Function
 
         <WorkItem(542443, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542443")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestEvent2() As Task
             Dim input =
 <Workspace>
@@ -75,7 +75,7 @@ public class MainClass
         End Function
 
         <WorkItem(542443, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542443")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestEvent3() As Task
             Dim input =
 <Workspace>
@@ -110,7 +110,7 @@ public class MainClass
         End Function
 
         <WorkItem(542443, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542443")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestEvent4() As Task
             Dim input =
 <Workspace>
@@ -145,7 +145,7 @@ public class MainClass
         End Function
 
         <WorkItem(529819, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529819")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestEventCascading1() As Task
             Dim input =
 <Workspace>
@@ -164,7 +164,7 @@ End Class
         End Function
 
         <WorkItem(529819, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529819")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestEventCascading2() As Task
             Dim input =
 <Workspace>
@@ -183,7 +183,7 @@ End Class
         End Function
 
         <WorkItem(553324, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/553324")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestEventParameterCascading() As Task
             Dim input =
 <Workspace>
@@ -204,7 +204,7 @@ End Module
         End Function
 
         <WorkItem(529804, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529804")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCrossAssemblyEventImplementation1() As Task
             Dim input =
 <Workspace>
@@ -237,7 +237,7 @@ class C : I
         End Function
 
         <WorkItem(529804, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529804")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCrossAssemblyEventImplementation2() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.ExplicitInterfaceMethodSymbols.vb

@@ -6,7 +6,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
 
         <WorkItem(538972, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538972")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestExplicitMethod1() As Task
             Dim input =
 <Workspace>
@@ -28,7 +28,7 @@ class C : I
         End Function
 
         <WorkItem(538972, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538972")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestExplicitMethod2() As Task
             Dim input =
 <Workspace>
@@ -49,7 +49,7 @@ class C : I
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestExplicitMethodAndInheritance() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.ExtensionMethodSymbols.vb

@@ -5,7 +5,7 @@ Imports System.Threading.Tasks
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
         <WorkItem(541167, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/541167")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestExtensionMethodToDelegateConversion() As Task
             Dim input =
 <Workspace>
@@ -28,7 +28,7 @@ class Program
         End Function
 
         <WorkItem(541697, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/541697")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestReducedExtensionMethod1() As Task
             Dim input =
 <Workspace>
@@ -60,7 +60,7 @@ public static class MyExtension
         End Function
 
         <WorkItem(541697, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/541697")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestReducedExtensionMethod2() As Task
             Dim input =
 <Workspace>
@@ -93,7 +93,7 @@ public static class MyExtension
 
 #Region "Normal Visual Basic Tests"
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVisualBasicFindReferencesOnExtensionMethod() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.FieldSymbols.vb

@@ -4,7 +4,7 @@ Imports System.Threading.Tasks
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestField_Private_SameType() As Task
             Dim input =
 <Workspace>
@@ -26,7 +26,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestField_Private_WrappedInProperty() As Task
             Dim input =
 <Workspace>
@@ -47,7 +47,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestField_MultipleVariableDeclarators() As Task
             Dim input =
 <Workspace>
@@ -70,7 +70,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestField_Public_OtherType() As Task
             Dim input =
 <Workspace>
@@ -95,7 +95,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestField_Inaccessible() As Task
             Dim input =
 <Workspace>
@@ -120,7 +120,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestField_InDependentProject1() As Task
             Dim input =
 <Workspace>
@@ -157,7 +157,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestField_CSharpInaccessibleStaticField() As Task
             Dim input =
 <Workspace>
@@ -181,7 +181,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestField_VBInaccessibleStaticField() As Task
             Dim input =
 <Workspace>
@@ -202,7 +202,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestField_CSharpInaccessibleStaticProtectedField() As Task
             Dim input =
 <Workspace>
@@ -226,7 +226,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestField_VBInaccessibleStaticProtectedField() As Task
             Dim input =
 <Workspace>
@@ -247,7 +247,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestField_CSharpInaccessibleInstanceProtectedField() As Task
             Dim input =
 <Workspace>
@@ -271,7 +271,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestField_VBInaccessibleInstanceProtectedField() As Task
             Dim input =
 <Workspace>
@@ -293,7 +293,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
         End Function
 
         <WorkItem(539598, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539598")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestField_EnumMember1() As Task
             Dim input =
 <Workspace>
@@ -316,7 +316,7 @@ class Program
         End Function
 
         <WorkItem(539598, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539598")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestField_EnumMember2() As Task
             Dim input =
 <Workspace>
@@ -339,7 +339,7 @@ class Program
         End Function
 
         <WorkItem(540515, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/540515")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestField_AcrossSubmission() As Task
             Dim input =
 <Workspace>
@@ -354,7 +354,7 @@ class Program
         End Function
 
         <WorkItem(4952, "https://github.com/dotnet/roslyn/pull/4952")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestField_AcrossSubmission_Command() As Task
             Dim input =
 <Workspace>
@@ -371,7 +371,7 @@ class Program
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCrefField() As Task
             Dim input =
 <Workspace>
@@ -392,7 +392,7 @@ class Definition:Program
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCrefField2() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.IndexerSymbols.vb

@@ -5,7 +5,7 @@ Imports System.Threading.Tasks
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
         <WorkItem(529629, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529629")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_Indexer1() As Task
             Dim input =
 <Workspace>
@@ -31,7 +31,7 @@ class D
         End Function
 
         <WorkItem(529629, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529629")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBasic_Indexer1() As Task
             Dim input =
 <Workspace>
@@ -58,7 +58,7 @@ end class
         End Function
 
         <WorkItem(545577, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545577")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBasic_Indexer2() As Task
             Dim input =
 <Workspace>
@@ -81,7 +81,7 @@ End Class
         End Function
 
         <WorkItem(650779, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/650779")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBasic_Indexer3() As Task
             Dim input =
 <Workspace>
@@ -111,7 +111,7 @@ End Class
         End Function
 
         <WorkItem(661362, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/661362")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBasic_Indexer4() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.LabelSymbols.vb

@@ -4,7 +4,7 @@ Imports System.Threading.Tasks
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLabel1() As Task
             Dim input =
 <Workspace>
@@ -25,7 +25,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLabel2() As Task
             Dim input =
 <Workspace>
@@ -47,7 +47,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
         End Function
 
         <WorkItem(529060, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529060")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestNumericLabel1() As Task
             Dim input =
 <Workspace>
@@ -66,7 +66,7 @@ End Module
         End Function
 
         <WorkItem(529060, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529060")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestNumericLabel2() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.LambdaSymbols.vb

@@ -4,7 +4,7 @@ Imports System.Threading.Tasks
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLambdaParameterDefinition() As Task
             Dim input =
 <Workspace>
@@ -26,7 +26,7 @@ class Program
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLambdaParameterReferencesInDifferentLambdas1() As Task
             Dim input =
 <Workspace>
@@ -55,7 +55,7 @@ class Program
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLambdaParameterReferencesInDifferentLambdas2() As Task
             Dim input =
 <Workspace>
@@ -84,7 +84,7 @@ class Program
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLambdaParameterReferencesInDifferentLambdas3() As Task
             Dim input =
 <Workspace>
@@ -113,7 +113,7 @@ class Program
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLambdaParameterReferencesInDifferentLambdas4() As Task
             Dim input =
 <Workspace>
@@ -142,7 +142,7 @@ class Program
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLambdaParameterReferencesInDifferentLambdas5() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.LinkedFiles.vb

@@ -6,7 +6,7 @@ Imports Microsoft.CodeAnalysis.FindSymbols
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLinkedFiles_Methods() As Task
             Dim definition =
 <Workspace>
@@ -41,7 +41,7 @@ class C
             End Using
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLinkedFiles_ClassWithSameSpanAsCompilationUnit() As Task
             Dim definition =
 <Workspace>
@@ -75,7 +75,7 @@ End Class
             End Using
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLinkedFiles_ReferencesBeforeAndAfterRemovingLinkedDocument() As Task
             Dim definition =
 <Workspace>
@@ -130,7 +130,7 @@ End Class
             End Using
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Function TestLinkedFiles_LinkedFilesWithSameAssemblyNameNoReferences() As Task
             Dim definition =
 <Workspace>
@@ -150,7 +150,7 @@ class {|Definition:$$C|}
             Return TestAsync(definition)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Function TestLinkedFiles_LinkedFilesWithSameAssemblyNameWithReferences() As Task
             Dim definition =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.LocalSymbols.vb

@@ -4,7 +4,7 @@ Imports System.Threading.Tasks
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLocal() As Task
             Dim input =
 <Workspace>
@@ -24,7 +24,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLocalInFieldInitializerLambda1() As Task
             Dim input =
 <Workspace>
@@ -45,7 +45,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLocalInFieldInitializerLambda2() As Task
             Dim input =
 <Workspace>
@@ -66,7 +66,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLocalCaseSensitivity() As Task
             Dim input =
 <Workspace>
@@ -86,7 +86,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLocalCaseInsensitivity() As Task
             Dim input =
 <Workspace>
@@ -107,7 +107,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
         End Function
 
         <WorkItem(530636, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530636")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLocalInLambdaInField1() As Task
             Dim input =
 <Workspace>
@@ -123,7 +123,7 @@ End Module
         End Function
 
         <WorkItem(530636, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530636")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLocalInLambdaInField2() As Task
             Dim input =
 <Workspace>
@@ -138,7 +138,7 @@ End Module
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         <WorkItem(608210, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/608210")>
         Public Async Function TestLocalInPropertyInitializer() As Task
             Dim input =
@@ -158,7 +158,7 @@ End Module
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         <WorkItem(2667, "https://github.com/dotnet/roslyn/issues/2667")>
         Public Async Function TestLocalWithWithStatement() As Task
             Dim input =
@@ -187,7 +187,7 @@ End Module
 
 
 #Region "FAR on collection initializers"
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLocal_CSharpNamedIdentifiersUsedInNestedColInit() As Task
             Dim input =
 <Workspace>
@@ -209,7 +209,7 @@ End Module
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLocal_VBNamedIdentifiersUsedInNestedColInit() As Task
             Dim input =
 <Workspace>
@@ -229,7 +229,7 @@ End Module
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLocal_CSharpNamedIdentifiersUsedInAVeryLongColInitExp() As Task
             Dim input =
 <Workspace>
@@ -249,7 +249,7 @@ End Module
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestLocal_VBNamedIdentifiersUsedInAVeryLongColInitEx() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.MethodTypeParameterTypeSymbol.vb

@@ -5,7 +5,7 @@ Imports System.Threading.Tasks
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
 #Region "FAR on generic methods"
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestMethodType_Parameter1() As Task
             Dim input =
 <Workspace>
@@ -22,7 +22,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestMethodType_Parameter3() As Task
             Dim input =
 <Workspace>
@@ -43,7 +43,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestMethodType_ParameterCaseSensitivity() As Task
             Dim input =
 <Workspace>
@@ -59,7 +59,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestMethodType_MethodCall() As Task
             Dim input =
 <Workspace>
@@ -92,7 +92,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
 #Region "FAR on generic partial methods"
 
         <WorkItem(544436, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544436")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestMethodType_GenericPartialParameter_CSharp1() As Task
             Dim input =
 <Workspace>
@@ -115,7 +115,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
         End Function
 
         <WorkItem(544436, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544436"), WorkItem(544475, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544475")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestMethodType_GenericPartialParameter_CSharp2() As Task
             Dim input =
 <Workspace>
@@ -138,7 +138,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
         End Function
 
         <WorkItem(544435, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544435")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestMethodType_GenericPartialParameter_VB1() As Task
             Dim input =
 <Workspace>
@@ -161,7 +161,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
         End Function
 
         <WorkItem(544435, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544435")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestMethodType_GenericPartialParameter_VB2() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.NamespaceSymbols.vb

@@ -4,7 +4,7 @@ Imports System.Threading.Tasks
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestNamespace1() As Task
             Dim input =
 <Workspace>
@@ -23,10 +23,10 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
         </Document>
     </Project>
 </Workspace>
-            Await TestAsync(input)
+            Await TestFullAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestNamespace2() As Task
             Dim input =
 <Workspace>
@@ -57,10 +57,10 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
         </Document>
     </Project>
 </Workspace>
-            Await TestAsync(input)
+            Await TestFullAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestNamespace3() As Task
             Dim input =
 <Workspace>
@@ -91,9 +91,10 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
         </Document>
     </Project>
 </Workspace>
-            Await TestAsync(input)
+            Await TestFullAsync(input)
         End Function
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestNamespace5() As Task
             Dim input =
 <Workspace>
@@ -105,16 +106,16 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             {
             }
         }
-        namespace {|Definition:[|N|]|}.Inner
+        namespace [|N|].Inner
         {
         }
         </Document>
     </Project>
 </Workspace>
-            Await TestAsync(input)
+            Await TestFullAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestNamespaceCaseSensitivity1() As Task
             Dim input =
 <Workspace>
@@ -135,10 +136,10 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     </Project>
 </Workspace>
 
-            Await TestAsync(input)
+            Await TestFullAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestNamespaceCaseSensitivity2() As Task
             Dim input =
 <Workspace>
@@ -163,10 +164,10 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
         </Document>
     </Project>
 </Workspace>
-            Await TestAsync(input)
+            Await TestFullAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestNamespaceThroughAlias1() As Task
             Dim input =
 <Workspace>
@@ -188,10 +189,10 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
         </Document>
     </Project>
 </Workspace>
-            Await TestAsync(input)
+            Await TestFullAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestNamespaceThroughAlias2() As Task
             Dim input =
 <Workspace>
@@ -213,10 +214,10 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
         </Document>
     </Project>
 </Workspace>
-            Await TestAsync(input)
+            Await TestFullAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestNamespaceThroughAlias3() As Task
             Dim input =
 <Workspace>
@@ -242,11 +243,11 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
         </Document>
     </Project>
 </Workspace>
-            Await TestAsync(input)
+            Await TestFullAsync(input)
         End Function
 
         <WorkItem(541162, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/541162")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestNamespaceCalledVar1() As Task
             Dim input =
 <Workspace>
@@ -266,11 +267,11 @@ namespace {|Definition:$$[|var|]|} { }
         </Document>
     </Project>
 </Workspace>
-            Await TestAsync(input)
+            Await TestFullAsync(input)
         End Function
 
         <WorkItem(541162, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/541162")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestNamespaceCalledVar2() As Task
             Dim input =
 <Workspace>
@@ -293,7 +294,7 @@ namespace var { }
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestNamespaceWithUnicodeCharacter() As Task
             Dim input =
 <Workspace>
@@ -311,10 +312,10 @@ namespace var { }
         </Document>
     </Project>
 </Workspace>
-            Await TestAsync(input)
+            Await TestFullAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestNamespaceWithComment() As Task
             Dim input =
 <Workspace>
@@ -330,10 +331,10 @@ namespace var { }
         </Document>
     </Project>
 </Workspace>
-            Await TestAsync(input)
+            Await TestFullAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestNamespaceWithVerbatimIdentifier() As Task
             Dim input =
 <Workspace>
@@ -349,10 +350,10 @@ namespace var { }
         </Document>
     </Project>
 </Workspace>
-            Await TestAsync(input)
+            Await TestFullAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestGlobalNamespace() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.OperatorSymbols.vb

@@ -5,7 +5,7 @@ Imports System.Threading.Tasks
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
         <WorkItem(539174, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539174")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVisualBasic_OperatorError1() As Task
             Dim input =
 <Workspace>
@@ -22,7 +22,7 @@ End Module
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharpFindReferencesOnUnaryOperatorOverload() As Task
             Dim input =
 <Workspace>
@@ -43,7 +43,7 @@ class A
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharpFindReferencesOnUnaryOperatorOverloadFromDefinition() As Task
             Dim input =
 <Workspace>
@@ -64,7 +64,7 @@ class A
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharpFindReferencesOnBinaryOperatorOverload() As Task
             Dim input =
 <Workspace>
@@ -84,7 +84,7 @@ class A
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharpFindReferencesOnBinaryOperatorOverloadFromDefinition() As Task
             Dim input =
 <Workspace>
@@ -104,7 +104,7 @@ class A
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVisualBasicFindReferencesOnUnaryOperatorOverload() As Task
             Dim input =
 <Workspace>
@@ -126,7 +126,7 @@ End Class
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVisualBasicFindReferencesOnUnaryOperatorOverloadFromDefinition() As Task
             Dim input =
 <Workspace>
@@ -148,7 +148,7 @@ End Class
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVisualBasicFindReferencesOnBinaryOperatorOverload() As Task
             Dim input =
 <Workspace>
@@ -169,7 +169,7 @@ End Class
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVisualBasicFindReferencesOnBinaryOperatorOverloadFromDefinition() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.ParameterSymbol.vb

@@ -4,7 +4,7 @@ Imports System.Threading.Tasks
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestParameterInMethod1() As Task
             Dim input =
 <Workspace>
@@ -23,7 +23,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestParameterInMethod2() As Task
             Dim input =
 <Workspace>
@@ -47,7 +47,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestParameterInMethod3() As Task
             Dim input =
 <Workspace>
@@ -71,7 +71,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestParameterCaseSensitivity1() As Task
             Dim input =
 <Workspace>
@@ -91,7 +91,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestParameterCaseSensitivity2() As Task
             Dim input =
 <Workspace>
@@ -110,7 +110,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
         End Function
 
         <WorkItem(542475, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542475")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestPartialParameter1() As Task
             Dim input =
 <Workspace>
@@ -131,7 +131,7 @@ partial class program
         End Function
 
         <WorkItem(542475, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542475")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestPartialParameter2() As Task
             Dim input =
 <Workspace>
@@ -153,7 +153,7 @@ partial class program
 
 #Region "FAR on partial methods"
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestParameter_CSharpWithSignaturesMatchFARParameterOnDefDecl() As Task
             Dim input =
 <Workspace>
@@ -173,7 +173,7 @@ partial class program
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestParameter_VBWithSignaturesMatchFARParameterOnDefDecl() As Task
             Dim input =
 <Workspace>
@@ -196,7 +196,7 @@ partial class program
 #End Region
 
         <WorkItem(543276, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543276")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAnonymousFunctionParameter1() As Task
             Dim input =
 <Workspace>
@@ -219,7 +219,7 @@ End Module
         End Function
 
         <WorkItem(624310, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/624310")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAnonymousFunctionParameter3() As Task
             Dim input =
 <Workspace>
@@ -239,7 +239,7 @@ End Module
         End Function
 
         <WorkItem(624310, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/624310")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAnonymousFunctionParameter4() As Task
             Dim input =
 <Workspace>
@@ -258,7 +258,7 @@ class Program
         End Function
 
         <WorkItem(543276, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543276")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAnonymousFunctionParameter2() As Task
             Dim input =
 <Workspace>
@@ -281,7 +281,7 @@ End Module
         End Function
 
         <WorkItem(529688, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529688")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestAnonymousFunctionParameter5() As Task
             Dim input =
 <Workspace>
@@ -301,7 +301,7 @@ End Module
         End Function
 
         <WorkItem(545654, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545654")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestReducedExtensionNamedParameter1() As Task
             Dim input =
 <Workspace>
@@ -330,7 +330,7 @@ End Module
         End Function
 
         <WorkItem(545654, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545654")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestReducedExtensionNamedParameter2() As Task
             Dim input =
 <Workspace>
@@ -359,7 +359,7 @@ End Module
         End Function
 
         <WorkItem(545618, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545618")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_TestAnonymousMethodParameter1() As Task
             Dim input =
 <Workspace>
@@ -382,7 +382,7 @@ class X
         End Function
 
         <WorkItem(545618, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545618")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_TestAnonymousMethodParameter2() As Task
             Dim input =
 <Workspace>
@@ -405,7 +405,7 @@ class X
         End Function
 
         <WorkItem(545618, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545618")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_TestAnonymousMethodParameter3() As Task
             Dim input =
 <Workspace>
@@ -428,7 +428,7 @@ class X
         End Function
 
         <WorkItem(545618, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545618")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_TestAnonymousMethodParameter4() As Task
             Dim input =
 <Workspace>
@@ -451,7 +451,7 @@ class X
         End Function
 
         <WorkItem(545618, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545618")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVB_TestAnonymousMethodParameter1() As Task
             Dim input =
 <Workspace>
@@ -472,7 +472,7 @@ end class
         End Function
 
         <WorkItem(545618, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545618")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVB_TestAnonymousMethodParameter2() As Task
             Dim input =
 <Workspace>
@@ -493,7 +493,7 @@ end class
         End Function
 
         <WorkItem(545618, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545618")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVB_TestAnonymousMethodParameter3() As Task
             Dim input =
 <Workspace>
@@ -514,7 +514,7 @@ end class
         End Function
 
         <WorkItem(545618, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545618")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVB_TestAnonymousMethodParameter4() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.PropertySymbols.vb

@@ -5,7 +5,7 @@ Imports System.Threading.Tasks
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
         <WorkItem(538886, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538886")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_Property1() As Task
             Dim input =
 <Workspace>
@@ -36,7 +36,7 @@ namespace ConsoleApplication22
         End Function
 
         <WorkItem(538886, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538886")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_Property2() As Task
             Dim input =
 <Workspace>
@@ -67,7 +67,7 @@ namespace ConsoleApplication22
         End Function
 
         <WorkItem(539022, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539022")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_PropertyCascadeThroughInterface1() As Task
             Dim input =
 <Workspace>
@@ -89,7 +89,7 @@ namespace ConsoleApplication22
         End Function
 
         <WorkItem(539022, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539022")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_PropertyCascadeThroughInterface2() As Task
             Dim input =
 <Workspace>
@@ -111,7 +111,7 @@ namespace ConsoleApplication22
         End Function
 
         <WorkItem(539047, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539047")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_PropertyThroughBase1() As Task
             Dim input =
 <Workspace>
@@ -144,7 +144,7 @@ class C2 : C1
         End Function
 
         <WorkItem(539047, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539047")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_PropertyThroughBase2() As Task
             Dim input =
 <Workspace>
@@ -177,7 +177,7 @@ class C2 : C1
         End Function
 
         <WorkItem(539047, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539047")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_PropertyThroughBase3() As Task
             Dim input =
 <Workspace>
@@ -210,7 +210,7 @@ class C2 : C1
         End Function
 
         <WorkItem(539047, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539047")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_PropertyThroughBase4() As Task
             Dim input =
 <Workspace>
@@ -243,7 +243,7 @@ class C2 : C1
         End Function
 
         <WorkItem(539523, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539523")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_ExplicitProperty1() As Task
             Dim input =
 <Workspace>
@@ -268,7 +268,7 @@ public class A : DD
         End Function
 
         <WorkItem(539523, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539523")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_ExplicitProperty2() As Task
             Dim input =
 <Workspace>
@@ -293,7 +293,7 @@ public class A : DD
         End Function
 
         <WorkItem(539885, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539885")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_PropertyFromGenericInterface1() As Task
             Dim input =
 <Workspace>
@@ -330,7 +330,7 @@ public class M<T> : I1<T>, I3<T>
         End Function
 
         <WorkItem(539885, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539885")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_PropertyFromGenericInterface2() As Task
             Dim input =
 <Workspace>
@@ -367,7 +367,7 @@ public class M<T> : I1<T>, I3<T>
         End Function
 
         <WorkItem(539885, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539885")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_PropertyFromGenericInterface3() As Task
             Dim input =
 <Workspace>
@@ -404,7 +404,7 @@ public class M<T> : I1<T>, I3<T>
         End Function
 
         <WorkItem(539885, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539885")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_PropertyFromGenericInterface4() As Task
             Dim input =
 <Workspace>
@@ -441,7 +441,7 @@ public class M<T> : I1<T>, I3<T>
         End Function
 
         <WorkItem(539885, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539885")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_PropertyFromGenericInterface5() As Task
             Dim input =
 <Workspace>
@@ -478,7 +478,7 @@ public class M<T> : I1<T>, I3<T>
         End Function
 
         <WorkItem(540440, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/540440")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBasic_PropertyFunctionValue1() As Task
             Dim input =
 <Workspace>
@@ -499,7 +499,7 @@ End Module]]>
         End Function
 
         <WorkItem(540440, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/540440")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBasic_PropertyFunctionValue2() As Task
             Dim input =
 <Workspace>
@@ -520,7 +520,7 @@ End Module]]>
         End Function
 
         <WorkItem(543125, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543125")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_AnonymousTypeProperties1() As Task
             Dim input =
 <Workspace>
@@ -543,7 +543,7 @@ class C
         End Function
 
         <WorkItem(543125, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543125")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_AnonymousTypeProperties2() As Task
             Dim input =
 <Workspace>
@@ -566,7 +566,7 @@ class C
         End Function
 
         <WorkItem(543125, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543125")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_AnonymousTypeProperties3() As Task
             Dim input =
 <Workspace>
@@ -589,7 +589,7 @@ class C
         End Function
 
         <WorkItem(543125, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543125")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharp_AnonymousTypeProperties4() As Task
             Dim input =
 <Workspace>
@@ -612,7 +612,7 @@ class C
         End Function
 
         <WorkItem(542881, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542881")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBasic_AnonymousTypeProperties1() As Task
             Dim input =
 <Workspace>
@@ -636,7 +636,7 @@ End Module
         End Function
 
         <WorkItem(542881, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542881")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBasic_AnonymousTypeProperties2() As Task
             Dim input =
 <Workspace>
@@ -660,7 +660,7 @@ End Module
         End Function
 
         <WorkItem(542881, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542881")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBasic_AnonymousTypeProperties3() As Task
             Dim input =
 <Workspace>
@@ -684,7 +684,7 @@ End Module
         End Function
 
         <WorkItem(545576, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545576")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBasic_CascadeBetweenPropertyAndField1() As Task
             Dim input =
 <Workspace>
@@ -704,7 +704,7 @@ End Class
         End Function
 
         <WorkItem(545576, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545576")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBasic_CascadeBetweenPropertyAndField2() As Task
             Dim input =
 <Workspace>
@@ -724,7 +724,7 @@ End Class
         End Function
 
         <WorkItem(529765, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529765")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBasic_CascadeBetweenParameterizedVBPropertyAndCSharpMethod1() As Task
             Dim input =
 <Workspace>
@@ -757,7 +757,7 @@ class B : A
         End Function
 
         <WorkItem(529765, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529765")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBasic_CascadeBetweenParameterizedVBPropertyAndCSharpMethod2() As Task
             Dim input =
 <Workspace>
@@ -790,7 +790,7 @@ class B : A
         End Function
 
         <WorkItem(529765, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529765")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBasic_CascadeBetweenParameterizedVBPropertyAndCSharpMethod3() As Task
             Dim input =
 <Workspace>
@@ -823,7 +823,7 @@ class B : A
         End Function
 
         <WorkItem(665876, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/665876")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBasic_DefaultProperties() As Task
             Dim input =
 <Workspace>
@@ -859,7 +859,7 @@ End Class
         End Function
 
         <WorkItem(665876, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/665876")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestBasic_DefaultProperties2() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.RangeVariableSymbol.vb

@@ -6,7 +6,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
 
         <WorkItem(541928, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/541928")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharpRangeVariableInInto1() As Task
             Dim input =
 <Workspace>
@@ -30,7 +30,7 @@ class C
         End Function
 
         <WorkItem(541928, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/541928")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharpRangeVariableInInto2() As Task
             Dim input =
 <Workspace>
@@ -54,7 +54,7 @@ class C
         End Function
 
         <WorkItem(542161, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542161")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharpRangeVariableInSubmission1() As Task
             Dim input =
 <Workspace>
@@ -68,7 +68,7 @@ var q = from $${|Definition:x|} in new int[] { 1, 2, 3, 4 } select [|x|];
         End Function
 
         <WorkItem(542161, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542161")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharpRangeVariableInSubmission2() As Task
             Dim input =
 <Workspace>
@@ -82,7 +82,7 @@ var q = from {|Definition:x|} in new int[] { 1, 2, 3, 4 } select [|$$x|];
         End Function
 
         <WorkItem(542161, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542161")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharpRangeVariableInFieldInitializer1() As Task
             Dim input =
 <Workspace>
@@ -100,7 +100,7 @@ class C
         End Function
 
         <WorkItem(542161, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542161")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestCSharpRangeVariableInFieldInitializer2() As Task
             Dim input =
 <Workspace>
@@ -118,7 +118,7 @@ class C
         End Function
 
         <WorkItem(542509, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542509")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVisualBasicTrivialSelect1() As Task
             Dim input =
 <Workspace>
@@ -140,7 +140,7 @@ End Module
         End Function
 
         <WorkItem(542509, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542509")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVisualBasicTrivialSelect2() As Task
             Dim input =
 <Workspace>
@@ -162,7 +162,7 @@ End Module
         End Function
 
         <WorkItem(545163, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545163")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVisualBasicLetClause1() As Task
             Dim input =
 <Workspace>
@@ -181,7 +181,7 @@ End Module
         End Function
 
         <WorkItem(545163, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545163")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVisualBasicLetClause2() As Task
             Dim input =
 <Workspace>
@@ -200,7 +200,7 @@ End Module
         End Function
 
         <WorkItem(628189, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/628189")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestVisualBasicMultipleAggregateFunctions() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.TypeParameterTypeSymbol.vb

@@ -4,7 +4,7 @@ Imports System.Threading.Tasks
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestTypeParameter1() As Task
             Dim input =
 <Workspace>
@@ -25,7 +25,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestTypeParameter2() As Task
             Dim input =
 <Workspace>
@@ -53,7 +53,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestTypeParameter3() As Task
             Dim input =
 <Workspace>
@@ -75,7 +75,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestGenericTypeArgsWithStaticCalls() As Task
             Dim input =
 <Workspace>
@@ -89,7 +89,7 @@ class Bar<T> { public static void StaticDoSomething() { } }]]></Document>
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestTypeParameterCaseSensitivity() As Task
             Dim input =
 <Workspace>
@@ -108,7 +108,7 @@ class Bar<T> { public static void StaticDoSomething() { } }]]></Document>
         End Function
 
         <WorkItem(542598, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542598")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestMethodTypeParameterExplicitImplementation1() As Task
             Dim input =
 <Workspace>
@@ -130,7 +130,7 @@ class A : I
         End Function
 
         <WorkItem(542598, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542598")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestMethodTypeParameterExplicitImplementation2() As Task
             Dim input =
 <Workspace>
@@ -152,7 +152,7 @@ class A : I
         End Function
 
         <WorkItem(542598, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542598")>
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestMethodTypeParameterExplicitImplementation3() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.WinmdSymbols.vb

@@ -4,7 +4,7 @@ Imports System.Threading.Tasks
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
     Partial Public Class FindReferencesTests
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestWinmdCSInterfaceProjection() As Task
             Dim input =
 <Workspace>
@@ -41,7 +41,7 @@ namespace SampleComponent
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestWinmdVBInterfaceProjection() As Task
             Dim input =
 <Workspace>
@@ -81,7 +81,7 @@ End Class
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestWinmdCSCollectionProjection() As Task
             Dim input =
 <Workspace>
@@ -123,7 +123,7 @@ namespace SampleComponent
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestWinmdVBCollectionProjection() As Task
             Dim input =
 <Workspace>
@@ -153,7 +153,7 @@ End Class
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestWinmdCSEventProjection() As Task
             Dim input =
 <Workspace>
@@ -213,7 +213,7 @@ namespace SampleComponent
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestWinmdVBEventProjection() As Task
             Dim input =
 <Workspace>
@@ -266,7 +266,7 @@ End Module
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestWinmdCSAllIsWellTest() As Task
             Dim input =
 <Workspace>
@@ -470,7 +470,7 @@ namespace SampleComponent
             Await TestAsync(input)
         End Function
 
-        <Fact, Trait(Traits.Feature, Traits.Features.FindReferences)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
         Public Async Function TestWinmdVBAllIsWellTest() As Task
             Dim input =
 <Workspace>

src/EditorFeatures/Test2/FindReferences/FindReferencesTests.vb

@@ -4,8 +4,11 @@ Imports System.Collections.Immutable
 Imports System.Threading
 Imports System.Threading.Tasks
 Imports Microsoft.CodeAnalysis
+Imports Microsoft.CodeAnalysis.Editor.Navigation
 Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
+Imports Microsoft.CodeAnalysis.FindReferences
 Imports Microsoft.CodeAnalysis.FindSymbols
+Imports Microsoft.CodeAnalysis.Text
 Imports Roslyn.Utilities
 Imports Xunit.Abstractions
 
@@ -20,7 +23,123 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
         End Sub
 
         Private Async Function TestAsync(definition As XElement, Optional searchSingleFileOnly As Boolean = False, Optional uiVisibleOnly As Boolean = False) As Task
+            Await TestFullAsync(definition, searchSingleFileOnly, uiVisibleOnly)
+            Await TestStreamingAsync(definition, searchSingleFileOnly, uiVisibleOnly)
+        End Function
+
+        Private Async Function TestStreamingAsync(element As XElement, searchSingleFileOnly As Boolean, uiVisibleOnly As Boolean) As Task
+            ' We don't support testing features htat only expect partial results.
+            If searchSingleFileOnly OrElse uiVisibleOnly Then
+                Return
+            End If
+
+            Using workspace = Await TestWorkspace.CreateAsync(element)
+                For Each cursorDocument In workspace.Documents.Where(Function(d) d.CursorPosition.HasValue)
+                    Dim cursorPosition = cursorDocument.CursorPosition.Value
+
+                    Dim startDocument = workspace.CurrentSolution.GetDocument(cursorDocument.Id)
+                    Assert.NotNull(startDocument)
+
+                    Dim findRefsService = startDocument.GetLanguageService(Of IStreamingFindReferencesService)
+                    Dim context = New TestContext()
+                    Await findRefsService.FindReferencesAsync(startDocument, cursorPosition, context)
+
+                    Dim expectedDefinitions =
+                        workspace.Documents.Where(Function(d) d.AnnotatedSpans.ContainsKey(DefinitionKey) AndAlso d.AnnotatedSpans(DefinitionKey).Any()).
+                                            OrderBy(Function(d) d.Name).
+                                            Select(Function(d) New FileNameAndSpans(
+                                                   d.Name, d.AnnotatedSpans(DefinitionKey).ToList())).ToList()
+
+                    Dim actualDefinitions = GetFileNamesAndSpans(
+                        context.Definitions.Where(AddressOf context.ShouldShow).
+                                            SelectMany(Function(d) d.SourceLocations))
+
+                    Assert.Equal(expectedDefinitions, actualDefinitions)
+
+                    Dim expectedReferences =
+                        workspace.Documents.Where(Function(d) d.SelectedSpans.Any()).
+                                            OrderBy(Function(d) d.Name).
+                                            Select(Function(d) New FileNameAndSpans(
+                                                   d.Name, d.SelectedSpans.ToList())).ToList()
+
+                    Dim actualReferences = GetFileNamesAndSpans(
+                        context.References.Select(Function(r) r.Location))
+
+                    Assert.Equal(expectedReferences, actualReferences)
+                Next
+            End Using
+        End Function
+
+        Private Function GetFileNamesAndSpans(items As IEnumerable(Of DocumentLocation)) As List(Of FileNameAndSpans)
+            Return items.Where(Function(i) i.Document IsNot Nothing).
+                         GroupBy(Function(i) i.Document).
+                         OrderBy(Function(g) g.Key.Name).
+                         Select(Function(g) GetFileNameAndSpans(g)).ToList()
+        End Function
+
+        Private Function GetFileNameAndSpans(g As IGrouping(Of Document, DocumentLocation)) As FileNameAndSpans
+            Return New FileNameAndSpans(
+                g.Key.Name,
+                g.Select(Function(i) i.SourceSpan).OrderBy(Function(s) s.Start).
+                                                   Distinct().ToList())
+        End Function
+
+        Private Structure FileNameAndSpans
+            Public ReadOnly FileName As String
+            Public ReadOnly Spans As List(Of TextSpan)
+
+            Public Sub New(fileName As String, spans As List(Of TextSpan))
+                Me.FileName = fileName
+                Me.Spans = spans
+            End Sub
+
+            Public Overrides Function Equals(obj As Object) As Boolean
+                Return Equals(DirectCast(obj, FileNameAndSpans))
+            End Function
+
+            Public Overloads Function Equals(f As FileNameAndSpans) As Boolean
+                Assert.Equal(Me.FileName, f.FileName)
+                Assert.Equal(Me.Spans.Count, f.Spans.Count)
+
+                For i = 0 To Me.Spans.Count - 1
+                    Assert.Equal(Me.Spans(i), f.Spans(i))
+                Next
+
+                Return True
+            End Function
+
+        End Structure
+
+        Private Class TestContext
+            Inherits FindReferencesContext
+
+            Private ReadOnly gate As Object = New Object()
+
+            Public ReadOnly Definitions As List(Of DefinitionItem) = New List(Of DefinitionItem)()
+            Public ReadOnly References As List(Of SourceReferenceItem) = New List(Of SourceReferenceItem)()
+
+            Public Function ShouldShow(definition As DefinitionItem) As Boolean
+                If References.Any(Function(r) r.Definition Is definition) Then
+                    Return True
+                End If
+
+                Return definition.DisplayIfNoReferences
+            End Function
+
+            Public Overrides Sub OnDefinitionFound(definition As DefinitionItem)
+                SyncLock gate
+                    Me.Definitions.Add(definition)
+                End SyncLock
+            End Sub
+
+            Public Overrides Sub OnReferenceFound(reference As SourceReferenceItem)
+                SyncLock gate
+                    References.Add(reference)
+                End SyncLock
+            End Sub
+        End Class
 
+        Private Async Function TestFullAsync(definition As XElement, Optional searchSingleFileOnly As Boolean = False, Optional uiVisibleOnly As Boolean = False) As Task
             Using workspace = Await TestWorkspace.CreateAsync(definition)
                 workspace.SetTestLogger(AddressOf _outputHelper.WriteLine)
 
@@ -42,7 +161,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
                     Dim actualDefinitions =
                         result.FilterToItemsToShow().
                                Where(Function(s) Not IsImplicitNamespace(s)).
-                               SelectMany(Function(r) r.Definition.Locations).
+                               SelectMany(Function(r) r.Definition.GetDefinitionLocationsToShow()).
                                Where(Function(loc) IsInSource(workspace, loc, uiVisibleOnly)).
                                GroupBy(Function(loc) loc.SourceTree).
                                ToDictionary(

src/EditorFeatures/Test2/project.json

 {
-  "dependencies": {    
+  "dependencies": {
+    "Microsoft.VisualStudio.Language.Intellisense": {
+        "version": "14.3.25407",
+        "suppressParent": "all"
+    },    
   },
   "frameworks": {
     "net46": { }

src/EditorFeatures/Text/TextEditorFeatures.csproj

@@ -18,10 +18,6 @@
       <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
       <Name>CodeAnalysis</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Dependencies\VisualStudioText\VisualStudioText.csproj">
-      <Project>{c25768b3-2fe1-4d6d-8c17-a6acd56f8389}</Project>
-      <Name>VisualStudioText</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Workspaces\Core\Portable\Workspaces.csproj">
       <Project>{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}</Project>
       <Name>Workspaces</Name>
@@ -43,6 +39,7 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.EditorFeatures.Next" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.EditorFeatures" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices" />
+    <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Next" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.CSharp" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.VisualBasic" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.ExternalDependencyServices" />
@@ -92,4 +89,4 @@
   <ImportGroup Label="Targets">
     <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/EditorFeatures/VisualBasic/project.json

 {
-  "dependencies": { },
+  "dependencies": { 
+    "Microsoft.VisualStudio.Language.Intellisense": {
+        "version": "14.3.25407",
+        "suppressParent": "all"
+    },
+  },
   "frameworks": {
     "net46": { }
   }