@@ -28,6 +28,7 @@ module MefHelpers =
2828 [|
2929 " Microsoft.CodeAnalysis.Workspaces.dll"
3030 " Microsoft.VisualStudio.Shell.15.0.dll"
31+ " Microsoft.VisualStudio.Platform.VSEditor.dll"
3132 " FSharp.Editor.dll"
3233 |]
3334
@@ -49,7 +50,7 @@ module MefHelpers =
4950 |> Seq.append MefHostServices.DefaultAssemblies
5051 |> Array.ofSeq
5152
52- let createExportProvider () =
53+ let exportProviderFactory =
5354 let resolver = Resolver.DefaultInstance
5455
5556 let catalog =
@@ -62,14 +63,15 @@ module MefHelpers =
6263 )
6364
6465 let parts = partDiscovery.CreatePartsAsync( asms) .Result
65- let catalog = ComposableCatalog.Create( resolver)
66- catalog.AddParts( parts)
66+ ComposableCatalog.Create( resolver) .AddParts( parts) .WithCompositionService()
67+
68+ let configuration = CompositionConfiguration.Create( catalog)
6769
68- let configuration =
69- CompositionConfiguration.Create( catalog.WithCompositionService())
70+ RuntimeComposition
71+ .CreateRuntimeComposition( configuration)
72+ .CreateExportProviderFactory()
7073
71- let runtimeComposition = RuntimeComposition.CreateRuntimeComposition( configuration)
72- let exportProviderFactory = runtimeComposition.CreateExportProviderFactory()
74+ let createExportProvider () =
7375 exportProviderFactory.CreateExportProvider()
7476
7577type TestWorkspaceServiceMetadata ( serviceType : string , layer : string ) =
0 commit comments