Refactor access to remote workspace (#46542)

dotnet · Aug 18, 2020 · 05b8f2d · 05b8f2d
1 parent d8e46bb
commit 05b8f2d
Show file tree

Hide file tree

Showing 30 changed files with 628 additions and 807 deletions.
diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs
@@ -127,7 +127,6 @@ public VisualStudioWorkspaceImpl(ExportProvider exportProvider, IAsyncServicePro
 
             _textBufferFactoryService.TextBufferCreated += AddTextBufferCloneServiceToBuffer;
             _projectionBufferFactoryService.ProjectionBufferCreated += AddTextBufferCloneServiceToBuffer;
-            exportProvider.GetExportedValue<PrimaryWorkspace>().Register(this);
 
             _ = Task.Run(() => InitializeUIAffinitizedServicesAsync(asyncServiceProvider));
 

diff --git a/src/VisualStudio/Core/Test.Next/Remote/RemoteHostClientServiceFactoryTests.cs b/src/VisualStudio/Core/Test.Next/Remote/RemoteHostClientServiceFactoryTests.cs
@@ -89,7 +89,8 @@ public async Task TestSessionClosed()
         {
             using var workspace = CreateWorkspace();
 
-            var client = (InProcRemoteHostClient)await InProcRemoteHostClient.CreateAsync(workspace.Services, runCacheCleanup: false).ConfigureAwait(false);
+            using var client = await InProcRemoteHostClient.GetTestClientAsync(workspace).ConfigureAwait(false);
+
             var serviceName = new RemoteServiceName("Test");
 
             // register local service

diff --git a/src/VisualStudio/Core/Test.Next/Services/AssetProviderTests.cs b/src/VisualStudio/Core/Test.Next/Services/AssetProviderTests.cs
@@ -22,17 +22,22 @@ namespace Roslyn.VisualStudio.Next.UnitTests.Remote
     [UseExportProvider]
     public class AssetProviderTests
     {
+        private static Workspace CreateRemoteWorkspace()
+            => new RemoteWorkspace(FeaturesTestCompositions.RemoteHost.GetHostServices(), WorkspaceKind.RemoteWorkspace);
+
         [Fact, Trait(Traits.Feature, Traits.Features.RemoteHost)]
         public async Task TestAssets()
         {
             var sessionId = 0;
             var checksum = Checksum.Create(WellKnownSynchronizationKind.Null, ImmutableArray.CreateRange(Guid.NewGuid().ToByteArray()));
             var data = new object();
 
+            using var remoteWorkspace = CreateRemoteWorkspace();
+
             var storage = new AssetStorage();
             storage.Initialize(new SimpleAssetSource(new Dictionary<Checksum, object>() { { checksum, data } }));
 
-            var provider = new AssetProvider(sessionId, storage, new RemoteWorkspace().Services.GetService<ISerializerService>());
+            var provider = new AssetProvider(sessionId, storage, remoteWorkspace.Services.GetService<ISerializerService>());
             var stored = await provider.GetAssetAsync<object>(checksum, CancellationToken.None);
             Assert.Equal(data, stored);
 
@@ -56,11 +61,13 @@ public async Task TestAssetSynchronization()
 
             var map = await solution.GetAssetMapAsync(CancellationToken.None);
 
+            using var remoteWorkspace = CreateRemoteWorkspace();
+
             var sessionId = 0;
             var storage = new AssetStorage();
             storage.Initialize(new SimpleAssetSource(map));
 
-            var service = new AssetProvider(sessionId, storage, new RemoteWorkspace().Services.GetService<ISerializerService>());
+            var service = new AssetProvider(sessionId, storage, remoteWorkspace.Services.GetService<ISerializerService>());
             await service.SynchronizeAssetsAsync(new HashSet<Checksum>(map.Keys), CancellationToken.None);
 
             foreach (var kv in map)
@@ -82,11 +89,13 @@ public async Task TestSolutionSynchronization()
 
             var map = await solution.GetAssetMapAsync(CancellationToken.None);
 
+            using var remoteWorkspace = CreateRemoteWorkspace();
+
             var sessionId = 0;
             var storage = new AssetStorage();
             storage.Initialize(new SimpleAssetSource(map));
 
-            var service = new AssetProvider(sessionId, storage, new RemoteWorkspace().Services.GetService<ISerializerService>());
+            var service = new AssetProvider(sessionId, storage, remoteWorkspace.Services.GetService<ISerializerService>());
             await service.SynchronizeSolutionAssetsAsync(await solution.State.GetChecksumAsync(CancellationToken.None), CancellationToken.None);
 
             TestUtils.VerifyAssetStorage(map, storage);
@@ -105,11 +114,13 @@ public async Task TestProjectSynchronization()
 
             var map = await project.GetAssetMapAsync(CancellationToken.None);
 
+            using var remoteWorkspace = CreateRemoteWorkspace();
+
             var sessionId = 0;
             var storage = new AssetStorage();
             storage.Initialize(new SimpleAssetSource(map));
 
-            var service = new AssetProvider(sessionId, storage, new RemoteWorkspace().Services.GetService<ISerializerService>());
+            var service = new AssetProvider(sessionId, storage, remoteWorkspace.Services.GetService<ISerializerService>());
             await service.SynchronizeProjectAssetsAsync(SpecializedCollections.SingletonEnumerable(await project.State.GetChecksumAsync(CancellationToken.None)), CancellationToken.None);
 
             TestUtils.VerifyAssetStorage(map, storage);