Merge pull request #12784 from vslsnap/merge-microupdate-into-dev15-preview-420160727-150134

Merge microupdate into dev15-preview-4

src/VisualStudio/CSharp/Test/ProjectSystemShim/AnalyzersTests.cs

@@ -34,7 +34,7 @@ public string Path
             }
         }
 
-        [Fact]
+        [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
         public void RuleSet_GeneralOption()
         {
@@ -64,7 +64,7 @@ public void RuleSet_GeneralOption()
             }
         }
 
-        [Fact]
+        [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
         public void RuleSet_ProjectSettingOverridesGeneralOption()
         {
@@ -97,7 +97,7 @@ public void RuleSet_ProjectSettingOverridesGeneralOption()
             }
         }
 
-        [Fact]
+        [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
         public void RuleSet_SpecificOptions()
         {
@@ -127,7 +127,7 @@ public void RuleSet_SpecificOptions()
             }
         }
 
-        [Fact]
+        [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
         public void RuleSet_ProjectSettingsOverrideSpecificOptions()
         {
@@ -158,7 +158,7 @@ public void RuleSet_ProjectSettingsOverrideSpecificOptions()
             }
         }
 
-        [Fact, WorkItem(1087250, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1087250")]
+        [WpfFact, WorkItem(1087250, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1087250")]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
         public void SetRuleSetFile_RemoveExtraBackslashes()
         {
@@ -176,7 +176,7 @@ public void SetRuleSetFile_RemoveExtraBackslashes()
             }
         }
 
-        [Fact]
+        [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
         [WorkItem(1092636, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1092636")]
         [WorkItem(1040247, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1040247")]
@@ -220,7 +220,7 @@ public void RuleSet_ProjectSettingsOverrideSpecificOptionsAndRestore()
             }
         }
 
-        [Fact]
+        [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
         [WorkItem(468, "https://github.com/dotnet/roslyn/issues/468")]
         public void RuleSet_ProjectNoWarnOverridesOtherSettings()

src/VisualStudio/CSharp/Test/ProjectSystemShim/CSharpCompilerOptionsTests.cs

@@ -18,7 +18,7 @@ namespace Roslyn.VisualStudio.CSharp.UnitTests.ProjectSystemShim
 {
     public class CSharpCompilerOptionsTests
     {
-        [Fact]
+        [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
         [WorkItem(530980, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530980")]
         public void DocumentationModeSetToDiagnoseIfProducingDocFile()
@@ -36,7 +36,7 @@ public void DocumentationModeSetToDiagnoseIfProducingDocFile()
             }
         }
 
-        [Fact]
+        [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
         [WorkItem(530980, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530980")]
         public void DocumentationModeSetToParseIfNotProducingDocFile()
@@ -54,7 +54,7 @@ public void DocumentationModeSetToParseIfNotProducingDocFile()
             }
         }
 
-        [Fact]
+        [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
         public void UseOPTID_COMPATIBILITY()
         {
@@ -88,7 +88,7 @@ public void UseOPTID_COMPATIBILITY()
         ////    }
         ////}
 
-        [Fact]
+        [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
         [WorkItem(1092636, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1092636")]
         [WorkItem(1040247, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1040247")]

src/VisualStudio/CSharp/Test/ProjectSystemShim/CSharpReferencesTests.cs

@@ -20,7 +20,7 @@ namespace Roslyn.VisualStudio.CSharp.UnitTests.ProjectSystemShim
 
     public class CSharpReferenceTests
     {
-        [Fact]
+        [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
         public void AddingReferenceToProjectMetadataPromotesToProjectReference()
         {
@@ -42,7 +42,7 @@ public void AddingReferenceToProjectMetadataPromotesToProjectReference()
             }
         }
 
-        [Fact]
+        [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
         public void AddCyclicProjectMetadataReferences()
         {
@@ -67,7 +67,7 @@ public void AddCyclicProjectMetadataReferences()
             }
         }
 
-        [Fact]
+        [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
         public void AddCyclicProjectReferences()
         {
@@ -87,7 +87,7 @@ public void AddCyclicProjectReferences()
             }
         }
 
-        [Fact]
+        [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
         public void AddCyclicProjectReferencesDeep()
         {

src/VisualStudio/CSharp/Test/ProjectSystemShim/SourceFileHandlingTests.cs

@@ -9,7 +9,7 @@ namespace Roslyn.VisualStudio.CSharp.UnitTests.ProjectSystemShim
 {
     public class SourceFileHandlingTests
     {
-        [Fact]
+        [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
         [WorkItem(1100114, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1100114")]
         public void IgnoreAdditionsOfXomlFiles()

src/VisualStudio/Core/Def/Implementation/ProjectSystem/AbstractProject.cs

@@ -6,16 +6,18 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Windows.Threading;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Editor.Shared.Options;
+using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Notification;
 using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.LanguageServices.Implementation.TaskList;
-using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.TextManager.Interop;
@@ -23,9 +25,11 @@
 using Roslyn.Utilities;
 using VSLangProj;
 
+using VsHierarchyPropID = Microsoft.VisualStudio.Shell.VsHierarchyPropID;
+
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem
 {
-    internal abstract partial class AbstractProject : IVisualStudioHostProject
+    internal abstract partial class AbstractProject : ForegroundThreadAffinitizedObject, IVisualStudioHostProject
     {
         internal static object RuleSetErrorId = new object();
 
@@ -108,6 +112,18 @@ internal abstract partial class AbstractProject : IVisualStudioHostProject
             defaultSeverity: DiagnosticSeverity.Error,
             isEnabledByDefault: true);
 
+        /// <summary>
+        /// When a reference changes on disk we start a delayed task to update the <see cref="Workspace"/>.
+        /// It is delayed for two reasons: first, there are often a bunch of change notifications in quick succession
+        /// as the file is written.  Second, we often get the first notification while something is still writing the
+        /// file, so we're unable to actually load it.  To avoid both of these issues, we wait five seconds before
+        /// reloading the metadata.  This <see cref="Dictionary{TKey, TValue}"/> holds on to
+        /// <see cref="CancellationTokenSource"/>s that allow us to cancel the existing reload task if another file
+        /// change comes in before we process it.
+        /// </summary>
+        private readonly Dictionary<VisualStudioMetadataReference, CancellationTokenSource> _changedReferencesPendingUpdate
+            = new Dictionary<VisualStudioMetadataReference, CancellationTokenSource>();
+
         public AbstractProject(
             VisualStudioProjectTracker projectTracker,
             Func<ProjectId, IVsReportExternalErrors> reportExternalErrorCreatorOpt,
@@ -589,8 +605,34 @@ private void RemoveMetadataReferenceCore(VisualStudioMetadataReference reference
         /// </summary>
         private void OnImportChanged(object sender, EventArgs e)
         {
+            AssertIsForeground();
+
             VisualStudioMetadataReference reference = (VisualStudioMetadataReference)sender;
 
+            CancellationTokenSource delayTaskCancellationTokenSource;
+            if (_changedReferencesPendingUpdate.TryGetValue(reference, out delayTaskCancellationTokenSource))
+            {
+                delayTaskCancellationTokenSource.Cancel();
+            }
+
+            delayTaskCancellationTokenSource = new CancellationTokenSource();
+            _changedReferencesPendingUpdate[reference] = delayTaskCancellationTokenSource;
+
+            var task = Task.Delay(TimeSpan.FromSeconds(5), delayTaskCancellationTokenSource.Token)
+                .ContinueWith(
+                    OnImportChangedAfterDelay,
+                    reference,
+                    delayTaskCancellationTokenSource.Token,
+                    TaskContinuationOptions.None,
+                    TaskScheduler.FromCurrentSynchronizationContext());
+        }
+
+        private void OnImportChangedAfterDelay(Task previous, object state)
+        {
+            AssertIsForeground();
+
+            var reference = (VisualStudioMetadataReference)state;
+            _changedReferencesPendingUpdate.Remove(reference);
             // Ensure that we are still referencing this binary
             if (_metadataReferences.Contains(reference))
             {
@@ -954,8 +996,18 @@ private void RemoveGeneratedDocument(IVisualStudioHostDocument document)
 
         public virtual void Disconnect()
         {
+            AssertIsForeground();
+
             using (_visualStudioWorkspaceOpt?.Services.GetService<IGlobalOperationNotificationService>()?.Start("Disconnect Project"))
             {
+                // No sense in reloading any metadata references anymore.
+                foreach (var cancellationTokenSource in _changedReferencesPendingUpdate.Values)
+                {
+                    cancellationTokenSource.Cancel();
+                }
+
+                _changedReferencesPendingUpdate.Clear();
+
                 // Unsubscribe IVsHierarchyEvents
                 DisconnectHierarchyEvents();
 

src/VisualStudio/Core/Test/ProjectSystemShim/ConvertedVisualBasicProjectOptionsTests.vb

@@ -18,7 +18,7 @@ Imports Roslyn.Utilities
 Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
 
     Public Class ConvertedVisualBasicProjectOptionsTests
-        <Fact, WorkItem(468, "https://github.com/dotnet/roslyn/issues/468")>
+        <WpfFact, WorkItem(468, "https://github.com/dotnet/roslyn/issues/468")>
         Public Sub RuleSet_GeneralCommandLineOptionOverridesGeneralRuleSetOption()
             Dim convertedOptions = GetConvertedOptions(ruleSetGeneralOption:=ReportDiagnostic.Warn, commandLineGeneralOption:=WarningLevel.WARN_AsError)
 
@@ -26,7 +26,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             Assert.Equal(expected:=0, actual:=convertedOptions.CompilationOptions.SpecificDiagnosticOptions.Count)
         End Sub
 
-        <Fact, WorkItem(468, "https://github.com/dotnet/roslyn/issues/468")>
+        <WpfFact, WorkItem(468, "https://github.com/dotnet/roslyn/issues/468")>
         Public Sub RuleSet_GeneralWarnAsErrorPromotesWarningFromRuleSet()
             Dim ruleSetSpecificOptions = New Dictionary(Of String, ReportDiagnostic) From
                 {
@@ -40,7 +40,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             Assert.Equal(expected:=ReportDiagnostic.Error, actual:=convertedOptions.CompilationOptions.SpecificDiagnosticOptions("Test001"))
         End Sub
 
-        <Fact, WorkItem(468, "https://github.com/dotnet/roslyn/issues/468")>
+        <WpfFact, WorkItem(468, "https://github.com/dotnet/roslyn/issues/468")>
         Public Sub RuleSet_GeneralWarnAsErrorDoesNotPromoteInfoFromRuleSet()
             Dim ruleSetSpecificOptions = New Dictionary(Of String, ReportDiagnostic) From
                 {
@@ -54,7 +54,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             Assert.Equal(expected:=ReportDiagnostic.Info, actual:=convertedOptions.CompilationOptions.SpecificDiagnosticOptions("Test001"))
         End Sub
 
-        <Fact, WorkItem(468, "https://github.com/dotnet/roslyn/issues/468")>
+        <WpfFact, WorkItem(468, "https://github.com/dotnet/roslyn/issues/468")>
         Public Sub RuleSet_SpecificWarnAsErrorPromotesInfoFromRuleSet()
             Dim ruleSetSpecificOptions = New Dictionary(Of String, ReportDiagnostic) From
                 {
@@ -71,7 +71,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             Assert.Equal(expected:=ReportDiagnostic.Error, actual:=convertedOptions.CompilationOptions.SpecificDiagnosticOptions("Test001"))
         End Sub
 
-        <Fact, WorkItem(468, "https://github.com/dotnet/roslyn/issues/468")>
+        <WpfFact, WorkItem(468, "https://github.com/dotnet/roslyn/issues/468")>
         Public Sub RuleSet_SpecificWarnAsErrorMinusResetsRules()
             Dim ruleSetSpecificOptions = New Dictionary(Of String, ReportDiagnostic) From
                 {
@@ -88,7 +88,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             Assert.Equal(expected:=ReportDiagnostic.Warn, actual:=convertedOptions.CompilationOptions.SpecificDiagnosticOptions("Test001"))
         End Sub
 
-        <Fact, WorkItem(468, "https://github.com/dotnet/roslyn/issues/468")>
+        <WpfFact, WorkItem(468, "https://github.com/dotnet/roslyn/issues/468")>
         Public Sub RuleSet_SpecificWarnAsErrorMinusDefaultsRuleNotInRuleSet()
             Dim ruleSetSpecificOptions = New Dictionary(Of String, ReportDiagnostic) From
                 {
@@ -106,7 +106,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             Assert.Equal(expected:=ReportDiagnostic.Default, actual:=convertedOptions.CompilationOptions.SpecificDiagnosticOptions("Test002"))
         End Sub
 
-        <Fact, WorkItem(468, "https://github.com/dotnet/roslyn/issues/468")>
+        <WpfFact, WorkItem(468, "https://github.com/dotnet/roslyn/issues/468")>
         Public Sub RuleSet_GeneralNoWarnTurnsOffAllButErrors()
             Dim ruleSetSpecificOptions = New Dictionary(Of String, ReportDiagnostic) From
                {
@@ -126,7 +126,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             Assert.Equal(expected:=ReportDiagnostic.Suppress, actual:=convertedOptions.CompilationOptions.SpecificDiagnosticOptions("Test003"))
         End Sub
 
-        <Fact, WorkItem(468, "https://github.com/dotnet/roslyn/issues/468")>
+        <WpfFact, WorkItem(468, "https://github.com/dotnet/roslyn/issues/468")>
         Public Sub RuleSet_SpecificNoWarnAlwaysWins()
             Dim ruleSetSpecificOptions = New Dictionary(Of String, ReportDiagnostic) From
                 {

src/VisualStudio/Core/Test/ProjectSystemShim/DeferredProjectLoadingTests.vb

@@ -12,7 +12,7 @@ Imports Roslyn.Test.Utilities
 
 Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
     Public Class DeferredProjectLoadingTests
-        <Fact>
+        <WpfFact>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         Public Sub SimpleDeferredLoading()
             Using testEnvironment = New TestEnvironment(solutionIsFullyLoaded:=False)
@@ -27,7 +27,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             End Using
         End Sub
 
-        <Fact, WorkItem(1094112, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1094112")>
+        <WpfFact, WorkItem(1094112, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1094112")>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         Public Sub DoNotDeferLoadIfInNonBackgroundBatch()
             Using testEnvironment = New TestEnvironment(solutionIsFullyLoaded:=False)
@@ -45,7 +45,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             End Using
         End Sub
 
-        <Fact, WorkItem(1094112, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1094112")>
+        <WpfFact, WorkItem(1094112, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1094112")>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         Public Sub AddingProjectInBatchDoesntAddAllProjects()
             Using testEnvironment = New TestEnvironment(solutionIsFullyLoaded:=False)
@@ -65,7 +65,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             End Using
         End Sub
 
-        <Fact, WorkItem(1094112, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1094112")>
+        <WpfFact, WorkItem(1094112, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1094112")>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         Public Sub AddingProjectReferenceInBatchMayPushOtherProjects()
             Using testEnvironment = New TestEnvironment(solutionIsFullyLoaded:=False)
@@ -82,7 +82,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             End Using
         End Sub
 
-        <Fact, WorkItem(1094112, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1094112")>
+        <WpfFact, WorkItem(1094112, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1094112")>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         Public Sub AddingProjectReferenceAfterBatchMayPushOtherProjects()
             Using testEnvironment = New TestEnvironment(solutionIsFullyLoaded:=False)

src/VisualStudio/Core/Test/ProjectSystemShim/VisualBasicCompilerOptionsTests.vb

@@ -8,7 +8,7 @@ Imports Microsoft.CodeAnalysis
 
 Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
     Public Class VisualBasicCompilerOptions
-        <Fact()>
+        <WpfFact()>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         <WorkItem(867840, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/867840")>
         Public Sub ConditionalCompilationOptionsIncludesTargetAndVersion()
@@ -27,7 +27,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             End Using
         End Sub
 
-        <Fact()>
+        <WpfFact()>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         <WorkItem(530980, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530980")>
         Public Sub DocumentationModeSetToDiagnoseIfProducingDocFile()
@@ -47,7 +47,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             End Using
         End Sub
 
-        <Fact()>
+        <WpfFact()>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         <WorkItem(530980, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530980")>
         Public Sub DocumentationModeSetToParseIfNotProducingDocFile()
@@ -67,7 +67,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             End Using
         End Sub
 
-        <Fact()>
+        <WpfFact()>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         <WorkItem(1092636, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1092636")>
         <WorkItem(1040247, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1040247")>

src/VisualStudio/Core/Test/ProjectSystemShim/VisualBasicProjectTests.vb

@@ -8,7 +8,7 @@ Imports Microsoft.CodeAnalysis
 
 Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
     Public Class VisualBasicProjectTests
-        <Fact()>
+        <WpfFact()>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         Public Sub RenameProjectUpdatesWorkspace()
             Using environment = New TestEnvironment()

src/VisualStudio/Core/Test/ProjectSystemShim/VisualBasicSpecialReferencesTests.vb

@@ -7,7 +7,7 @@ Imports Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim.Visu
 
 Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
     Public Class VisualBasicSpecialReferencesTests
-        <Fact()>
+        <WpfFact()>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         Public Sub ProjectIncludesReferencesToMscorlibSystemAndMicrosoftVisualBasic()
             Using environment = New TestEnvironment()
@@ -25,7 +25,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             End Using
         End Sub
 
-        <Fact()>
+        <WpfFact()>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         Public Sub ProjectWithoutStandardLibsDoesNotReferenceSystem()
             Using environment = New TestEnvironment()
@@ -45,7 +45,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             End Using
         End Sub
 
-        <Fact()>
+        <WpfFact()>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         Public Sub ProjectWithoutVisualBasicRuntimeDoesNotReferenceMicrosoftVisualBasic()
             Using environment = New TestEnvironment()
@@ -65,7 +65,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             End Using
         End Sub
 
-        <Fact()>
+        <WpfFact()>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         <WorkItem(860964, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/860964")>
         Public Sub AddingReferenceToMicrosoftVisualBasicBeforeSettingOptionsShouldNotCrash()
@@ -96,7 +96,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             End Using
         End Sub
 
-        <Fact()>
+        <WpfFact()>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         <WorkItem(3477, "https://github.com/dotnet/roslyn/issues/3477")>
         Public Sub ProjectWithEmptySdkPathHasNoReferences()
@@ -113,7 +113,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             End Using
         End Sub
 
-        <Fact()>
+        <WpfFact()>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         <WorkItem(860964, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/860964")>
         Public Sub AddingReferenceToMicrosoftVisualBasicAfterSettingOptionsShouldNotCrash()
@@ -142,7 +142,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             End Using
         End Sub
 
-        <Fact()>
+        <WpfFact()>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         Public Sub AddingReferenceToProjectMetadataPromotesToProjectReference()
             Using environment = New TestEnvironment()
@@ -163,7 +163,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             End Using
         End Sub
 
-        <Fact()>
+        <WpfFact()>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         Public Sub AddCyclicProjectMetadataReferences()
             Using environment = New TestEnvironment()
@@ -187,7 +187,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             End Using
         End Sub
 
-        <Fact()>
+        <WpfFact()>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         Public Sub AddCyclicProjectReferences()
             Using environment = New TestEnvironment()
@@ -206,7 +206,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             End Using
         End Sub
 
-        <Fact()>
+        <WpfFact()>
         <Trait(Traits.Feature, Traits.Features.ProjectSystemShims)>
         Public Sub AddCyclicProjectReferencesDeep()
             Using environment = New TestEnvironment()

src/VisualStudio/Core/Test/ProjectSystemShim/VisualStudioAnalyzerTests.vb

@@ -12,7 +12,7 @@ Imports Roslyn.Test.Utilities
 
 Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
     Public Class VisualStudioAnalyzerTests
-        <Fact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
         Public Sub GetReferenceCalledMultipleTimes()
             Using analyzer = New VisualStudioAnalyzer("C:\Foo\Bar.dll", New MockVsFileChangeEx(), Nothing, Nothing, Nothing, Nothing, Nothing)
                 Dim reference1 = analyzer.GetReference()
@@ -22,7 +22,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             End Using
         End Sub
 
-        <Fact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
         Public Sub AnalyzerErrorsAreUpdated()
             Dim hostDiagnosticUpdateSource = New HostDiagnosticUpdateSource(Nothing, New MockDiagnosticUpdateSourceRegistrationService())
 

src/VisualStudio/Core/Test/ProjectSystemShim/VisualStudioRuleSetTests.vb

@@ -13,7 +13,7 @@ Imports Roslyn.Utilities
 Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
     Public Class VisualStudioRuleSetTests
 
-        <Fact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
         Public Sub SingleFile()
             Dim ruleSetSource = "<?xml version=""1.0"" encoding=""utf-8""?>
 <RuleSet Name=""New Rule Set3"" Description=""Test"" ToolsVersion=""12.0"">
@@ -48,7 +48,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             Directory.Delete(tempPath, recursive:=True)
         End Sub
 
-        <Fact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
         Public Sub TwoFiles()
             Dim ruleSetSource = "<?xml version=""1.0"" encoding=""utf-8""?>
 <RuleSet Name=""New Rule Set1"" Description=""Test"" ToolsVersion=""12.0"">
@@ -95,7 +95,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             Directory.Delete(tempPath, recursive:=True)
         End Sub
 
-        <Fact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
         Public Sub IncludeUpdated()
             Dim ruleSetSource = "<?xml version=""1.0"" encoding=""utf-8""?>
 <RuleSet Name=""New Rule Set1"" Description=""Test"" ToolsVersion=""12.0"">
@@ -147,7 +147,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             Directory.Delete(tempPath, recursive:=True)
         End Sub
 
-        <Fact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
         Public Sub SameFileRequestedAfterChange()
             Dim ruleSetSource = "<?xml version=""1.0"" encoding=""utf-8""?>
 <RuleSet Name=""New Rule Set3"" Description=""Test"" ToolsVersion=""12.0"">
@@ -190,7 +190,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             Directory.Delete(tempPath, recursive:=True)
         End Sub
 
-        <Fact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
         Public Sub SameFileRequestedMultipleTimes()
             Dim ruleSetSource = "<?xml version=""1.0"" encoding=""utf-8""?>
 <RuleSet Name=""New Rule Set3"" Description=""Test"" ToolsVersion=""12.0"">
@@ -227,7 +227,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim
             Directory.Delete(tempPath, recursive:=True)
         End Sub
 
-        <Fact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
         Public Sub FileWithError()
             Dim ruleSetSource = "<?xml version=""1.0"" encoding=""utf-8""?>
 <RuleSet Name=""New Rule Set3"" Description=""Test"" ToolsVersion=""12.0"">

src/VisualStudio/Core/Test/SolutionExplorer/AnalyzersFolderProviderTests.vb

@@ -39,7 +39,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.SolutionExplorer
             End Using
         End Sub
 
-        <Fact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
+        <WpfFact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
         Public Sub CreateCollectionSource()
             Using environment = New TestEnvironment()
                 Dim project = CreateVisualBasicProject(environment, "Foo")