From 692c7fb4bc6b2c29d3c9c32df5c1a0eeca1bd900 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Wed, 17 Jan 2018 11:31:50 -0800 Subject: [PATCH] Fix merge conflict --- src/EditorFeatures/TestUtilities/MinimalTestExportProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/EditorFeatures/TestUtilities/MinimalTestExportProvider.cs b/src/EditorFeatures/TestUtilities/MinimalTestExportProvider.cs index 963265290a0..9dbc80f8bb1 100644 --- a/src/EditorFeatures/TestUtilities/MinimalTestExportProvider.cs +++ b/src/EditorFeatures/TestUtilities/MinimalTestExportProvider.cs @@ -129,7 +129,7 @@ public static ExportProvider CreateExportProvider(ComposableCatalog catalog) // make sure we enable this for all unit tests AsynchronousOperationListenerProvider.Enable(true); - var configuration = CompositionConfiguration.Create(catalog.WithDesktopSupport().WithCompositionService()); + var configuration = CompositionConfiguration.Create(catalog.WithCompositionService()); var runtimeComposition = RuntimeComposition.CreateRuntimeComposition(configuration); return runtimeComposition.CreateExportProviderFactory().CreateExportProvider(); } -- GitLab