Merge pull request #31411 from jasonmalinowski/remove-asyncservicepro…

…vider-todo Properly import the IAsyncServiceProvider
dotnet · Dec 5, 2018 · 5e0c1c5 · 5e0c1c5
2 parents 65cdbba + c89535f
commit 5e0c1c5
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/VisualStudio/Core/Impl/RoslynVisualStudioWorkspace.cs b/src/VisualStudio/Core/Impl/RoslynVisualStudioWorkspace.cs
@@ -36,8 +36,9 @@ internal class RoslynVisualStudioWorkspace : VisualStudioWorkspaceImpl
             ExportProvider exportProvider,
             [ImportMany] IEnumerable<Lazy<IStreamingFindUsagesPresenter>> streamingPresenters,
             [ImportMany] IEnumerable<IDocumentOptionsProviderFactory> documentOptionsProviderFactories,
-            Lazy<ProjectCodeModelFactory> projectCodeModelFactory)
-            : base(exportProvider, AsyncServiceProvider.GlobalProvider) // TODO: switch to the cleaner MEF import
+            Lazy<ProjectCodeModelFactory> projectCodeModelFactory,
+            [Import(typeof(SVsServiceProvider))] IAsyncServiceProvider asyncServiceProvider)
+            : base(exportProvider, asyncServiceProvider)
         {
             _streamingPresenters = streamingPresenters;
             _projectCodeModelFactory = projectCodeModelFactory;