diff --git a/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj b/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj index 7a1700a3711..959eb62bc74 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj +++ b/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj @@ -45,6 +45,7 @@ + diff --git a/vsintegration/tests/FSharp.Editor.Tests/Helpers/RoslynHelpers.fs b/vsintegration/tests/FSharp.Editor.Tests/Helpers/RoslynHelpers.fs index 9efa3ecc055..4927ccd1a7d 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/Helpers/RoslynHelpers.fs +++ b/vsintegration/tests/FSharp.Editor.Tests/Helpers/RoslynHelpers.fs @@ -28,6 +28,7 @@ module MefHelpers = [| "Microsoft.CodeAnalysis.Workspaces.dll" "Microsoft.VisualStudio.Shell.15.0.dll" + "Microsoft.VisualStudio.Platform.VSEditor.dll" "FSharp.Editor.dll" |] @@ -49,7 +50,7 @@ module MefHelpers = |> Seq.append MefHostServices.DefaultAssemblies |> Array.ofSeq - let createExportProvider () = + let exportProviderFactory = let resolver = Resolver.DefaultInstance let catalog = @@ -62,14 +63,15 @@ module MefHelpers = ) let parts = partDiscovery.CreatePartsAsync(asms).Result - let catalog = ComposableCatalog.Create(resolver) - catalog.AddParts(parts) + ComposableCatalog.Create(resolver).AddParts(parts).WithCompositionService() + + let configuration = CompositionConfiguration.Create(catalog) - let configuration = - CompositionConfiguration.Create(catalog.WithCompositionService()) + RuntimeComposition + .CreateRuntimeComposition(configuration) + .CreateExportProviderFactory() - let runtimeComposition = RuntimeComposition.CreateRuntimeComposition(configuration) - let exportProviderFactory = runtimeComposition.CreateExportProviderFactory() + let createExportProvider () = exportProviderFactory.CreateExportProvider() type TestWorkspaceServiceMetadata(serviceType: string, layer: string) =