Merge remote-tracking branch 'upstream/master' into merges/master-to-master-vs-deps

# Conflicts:
#	src/EditorFeatures/TestUtilities2/Intellisense/TestState.vb

src/EditorFeatures/CSharpTest/EditAndContinue/EditSessionTests.cs

@@ -10,6 +10,7 @@
 using Microsoft.CodeAnalysis.EditAndContinue.UnitTests;
 using Microsoft.CodeAnalysis.Editor.UnitTests;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
+using Microsoft.CodeAnalysis.Test.Utilities;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Test.Utilities;
 using Roslyn.Utilities;
@@ -90,9 +91,12 @@ IEnumerable<ActiveStatementDebugInfo> Enumerate()
             ImmutableDictionary<ActiveMethodId, ImmutableArray<NonRemappableRegion>> nonRemappableRegions = null,
             Func<Solution, Solution> adjustSolution = null)
         {
-            var exportProvider = MinimalTestExportProvider.CreateExportProvider(
+            
+            var exportProviderFactory = ExportProviderCache.GetOrCreateExportProviderFactory(
                 TestExportProvider.MinimumCatalogWithCSharpAndVisualBasic.WithPart(typeof(CSharpEditAndContinueAnalyzer)).WithPart(typeof(DummyLanguageService)));
 
+            var exportProvider = exportProviderFactory.CreateExportProvider();
+
             using (var workspace = TestWorkspace.CreateCSharp(
                 ActiveStatementsDescription.ClearTags(markedSource),
                 exportProvider: exportProvider))