Merge pull request dotnet#64799 from Cosifne/dev/shech/FixMEFErrorInI…

…ntegrationTest Export correct type for VisualStudioWorkpacePartialSolutionsTestHook.cs
CyrusNajmabadi · Oct 19, 2022 · 795612c · 795612c
2 parents 10cfffd + 9c0f460
commit 795612c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 43 deletions.
diff --git a/src/EditorFeatures/TestUtilities/Workspaces/TestWorkspace.cs b/src/EditorFeatures/TestUtilities/Workspaces/TestWorkspace.cs
@@ -67,11 +67,14 @@ internal TestWorkspace(
             bool disablePartialSolutions = true,
             bool ignoreUnchangeableDocumentsWhenApplyingChanges = true,
             WorkspaceConfigurationOptions? configurationOptions = null)
-            : base(GetHostServices(ref composition, configurationOptions != null, disablePartialSolutions), workspaceKind ?? WorkspaceKind.Host)
+            : base(GetHostServices(ref composition, configurationOptions != null), workspaceKind ?? WorkspaceKind.Host)
         {
             this.Composition = composition;
             this.ExportProvider = composition.ExportProviderFactory.CreateExportProvider();
 
+            var partialSolutionsTestHook = Services.GetRequiredService<IWorkpacePartialSolutionsTestHook>();
+            partialSolutionsTestHook.IsPartialSolutionDisabled = disablePartialSolutions;
+
             // configure workspace before creating any solutions:
             if (configurationOptions != null)
             {
@@ -119,7 +122,7 @@ internal TestWorkspace(
             _metadataAsSourceFileService = ExportProvider.GetExportedValues<IMetadataAsSourceFileService>().FirstOrDefault();
         }
 
-        private static HostServices GetHostServices([NotNull] ref TestComposition? composition, bool hasWorkspaceConfigurationOptions, bool disablePartialSolutions)
+        private static HostServices GetHostServices([NotNull] ref TestComposition? composition, bool hasWorkspaceConfigurationOptions)
         {
             composition ??= EditorTestCompositions.EditorFeatures;
 
@@ -128,11 +131,6 @@ private static HostServices GetHostServices([NotNull] ref TestComposition? compo
                 composition = composition.AddParts(typeof(TestWorkspaceConfigurationService));
             }
 
-            if (disablePartialSolutions)
-            {
-                composition = composition.AddParts(typeof(WorkpacePartialSolutionsTestHook));
-            }
-
             return composition.GetHostServices();
         }
 

diff --git a/src/VisualStudio/Core/Def/Utilities/VisualStudioWorkpacePartialSolutionsTestHook.cs b/src/VisualStudio/Core/Def/Utilities/VisualStudioWorkpacePartialSolutionsTestHook.cs
diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/InProcess/VisualStudioWorkspace_InProc.cs b/src/VisualStudio/IntegrationTest/TestUtilities/InProcess/VisualStudioWorkspace_InProc.cs
@@ -117,7 +117,7 @@ public void CleanUpWorkspace()
             {
                 LoadRoslynPackage();
 
-                var hook = (VisualStudioWorkpacePartialSolutionsTestHook)_visualStudioWorkspace.Services.GetRequiredService<IWorkpacePartialSolutionsTestHook>();
+                var hook = _visualStudioWorkspace.Services.GetRequiredService<IWorkpacePartialSolutionsTestHook>();
                 hook.IsPartialSolutionDisabled = true;
             });
 

diff --git a/src/Workspaces/Core/Portable/Workspace/Host/IWorkpacePartialSolutionsTestHook.cs b/src/Workspaces/Core/Portable/Workspace/Host/IWorkpacePartialSolutionsTestHook.cs
@@ -6,5 +6,5 @@ namespace Microsoft.CodeAnalysis.Host;
 
 internal interface IWorkpacePartialSolutionsTestHook : IWorkspaceService
 {
-    bool IsPartialSolutionDisabled { get; }
+    bool IsPartialSolutionDisabled { get; set; }
 }
diff --git a/...ities/WorkpacePartialSolutionsTestHook.cs → .../Host/WorkpacePartialSolutionsTestHook.cs b/...ities/WorkpacePartialSolutionsTestHook.cs → .../Host/WorkpacePartialSolutionsTestHook.cs
@@ -6,15 +6,13 @@
 using System.Composition;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
-using Xunit.Abstractions;
-using Xunit;
 
 namespace Microsoft.CodeAnalysis.UnitTests;
 
-[ExportWorkspaceService(typeof(IWorkpacePartialSolutionsTestHook), ServiceLayer.Host), Shared, PartNotDiscoverable]
+[ExportWorkspaceService(typeof(IWorkpacePartialSolutionsTestHook), ServiceLayer.Host), Shared]
 internal class WorkpacePartialSolutionsTestHook : IWorkpacePartialSolutionsTestHook
 {
-    public bool IsPartialSolutionDisabled { get; set; } = true;
+    public bool IsPartialSolutionDisabled { get; set; }
 
     [ImportingConstructor]
     [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]