Merge branch 'release/vs16.0-preview4'

dotnet · Feb 12, 2019 · f547905 · f547905
2 parents f58c436 + a73574a
commit f547905
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 23 deletions.
diff --git a/...src/Microsoft.VisualStudio.LiveShare.Razor/Guest/ProjectSnapshotSynchronizationService.cs b/...src/Microsoft.VisualStudio.LiveShare.Razor/Guest/ProjectSnapshotSynchronizationService.cs
@@ -14,13 +14,13 @@ namespace Microsoft.VisualStudio.LiveShare.Razor.Guest
     internal class ProjectSnapshotSynchronizationService : ICollaborationService, IAsyncDisposable
     {
         private readonly JoinableTaskFactory _joinableTaskFactory;
-        private readonly LiveShareSessionAccessor _liveShareSessionAccessor;
+        private readonly CollaborationSession _sessionContext;
         private readonly IProjectSnapshotManagerProxy _hostProjectManagerProxy;
         private readonly ProjectSnapshotManagerBase _projectSnapshotManager;
 
         public ProjectSnapshotSynchronizationService(
             JoinableTaskFactory joinableTaskFactory,
-            LiveShareSessionAccessor liveShareSessionAccessor,
+            CollaborationSession sessionContext,
             IProjectSnapshotManagerProxy hostProjectManagerProxy,
             ProjectSnapshotManagerBase projectSnapshotManager)
         {
@@ -29,9 +29,9 @@ public ProjectSnapshotSynchronizationService(
                 throw new ArgumentNullException(nameof(joinableTaskFactory));
             }
 
-            if (liveShareSessionAccessor == null)
+            if (sessionContext == null)
             {
-                throw new ArgumentNullException(nameof(liveShareSessionAccessor));
+                throw new ArgumentNullException(nameof(sessionContext));
             }
 
             if (hostProjectManagerProxy == null)
@@ -45,7 +45,7 @@ public ProjectSnapshotSynchronizationService(
             }
 
             _joinableTaskFactory = joinableTaskFactory;
-            _liveShareSessionAccessor = liveShareSessionAccessor;
+            _sessionContext = sessionContext;
             _hostProjectManagerProxy = hostProjectManagerProxy;
             _projectSnapshotManager = projectSnapshotManager;
         }
@@ -159,7 +159,7 @@ private async void HostProxyProjectManager_Changed(object sender, ProjectChangeE
 
         private string ResolveGuestPath(Uri filePath)
         {
-            return _liveShareSessionAccessor.Session?.ConvertSharedUriToLocalPath(filePath);
+            return _sessionContext.ConvertSharedUriToLocalPath(filePath);
         }
     }
 }
diff --git a/...rosoft.VisualStudio.LiveShare.Razor/Guest/ProjectSnapshotSynchronizationServiceFactory.cs b/...rosoft.VisualStudio.LiveShare.Razor/Guest/ProjectSnapshotSynchronizationServiceFactory.cs
@@ -20,14 +20,12 @@ internal class ProjectSnapshotSynchronizationServiceFactory : ICollaborationServ
     {
         private readonly ProxyAccessor _proxyAccessor;
         private readonly JoinableTaskContext _joinableTaskContext;
-        private readonly LiveShareSessionAccessor _liveShareSessionAccessor;
         private readonly Workspace _workspace;
 
         [ImportingConstructor]
         public ProjectSnapshotSynchronizationServiceFactory(
             ProxyAccessor proxyAccessor,
             JoinableTaskContext joinableTaskContext,
-            LiveShareSessionAccessor liveShareSessionAccessor,
             [Import(typeof(VisualStudioWorkspace))] Workspace workspace)
         {
             if (proxyAccessor == null)
@@ -40,19 +38,13 @@ public ProjectSnapshotSynchronizationServiceFactory(
                 throw new ArgumentNullException(nameof(joinableTaskContext));
             }
 
-            if (liveShareSessionAccessor == null)
-            {
-                throw new ArgumentNullException(nameof(liveShareSessionAccessor));
-            }
-
             if (workspace == null)
             {
                 throw new ArgumentNullException(nameof(workspace));
             }
 
             _proxyAccessor = proxyAccessor;
             _joinableTaskContext = joinableTaskContext;
-            _liveShareSessionAccessor = liveShareSessionAccessor;
             _workspace = workspace;
         }
 
@@ -69,7 +61,7 @@ public async Task<ICollaborationService> CreateServiceAsync(CollaborationSession
             var projectSnapshotManagerProxy = await sessionContext.GetRemoteServiceAsync<IProjectSnapshotManagerProxy>(typeof(IProjectSnapshotManagerProxy).Name, cancellationToken);
             var synchronizationService = new ProjectSnapshotSynchronizationService(
                 _joinableTaskContext.Factory,
-                _liveShareSessionAccessor,
+                sessionContext,
                 projectSnapshotManagerProxy,
                 projectManager);
 

diff --git a/...soft.VisualStudio.LiveShare.Razor.Test/Guest/ProjectSnapshotSynchronizationServiceTest.cs b/...soft.VisualStudio.LiveShare.Razor.Test/Guest/ProjectSnapshotSynchronizationServiceTest.cs
@@ -22,8 +22,7 @@ public ProjectSnapshotSynchronizationServiceTest()
             var joinableTaskContext = new JoinableTaskContextNode(new JoinableTaskContext());
             JoinableTaskFactory = new JoinableTaskFactory(joinableTaskContext.Context);
 
-            var collabSession = new TestCollaborationSession(isHost: false);
-            SessionAccessor = Mock.Of<LiveShareSessionAccessor>(accessor => accessor.IsGuestSessionActive == true && accessor.Session == collabSession);
+            SessionContext = new TestCollaborationSession(isHost: false);
 
             ProjectSnapshotManager = new TestProjectSnapshotManager(Workspace);
 
@@ -35,7 +34,7 @@ public ProjectSnapshotSynchronizationServiceTest()
 
         private JoinableTaskFactory JoinableTaskFactory { get; }
 
-        private LiveShareSessionAccessor SessionAccessor { get; }
+        private CollaborationSession SessionContext { get; }
 
         private TestProjectSnapshotManager ProjectSnapshotManager { get; }
 
@@ -54,7 +53,7 @@ public async Task InitializeAsync_RetrievesHostProjectManagerStateAndInitializes
                 proxy => proxy.GetProjectManagerStateAsync(It.IsAny<CancellationToken>()) == Task.FromResult(state));
             var synchronizationService = new ProjectSnapshotSynchronizationService(
                 JoinableTaskFactory,
-                SessionAccessor,
+                SessionContext,
                 hostProjectManagerProxy,
                 ProjectSnapshotManager);
 
@@ -78,7 +77,7 @@ public void UpdateGuestProjectManager_ProjectAdded()
                 ProjectWorkspaceStateWithTagHelpers);
             var synchronizationService = new ProjectSnapshotSynchronizationService(
                 JoinableTaskFactory,
-                SessionAccessor,
+                SessionContext,
                 Mock.Of<IProjectSnapshotManagerProxy>(),
                 ProjectSnapshotManager);
             var args = new ProjectChangeEventProxyArgs(older: null, newHandle, ProjectProxyChangeKind.ProjectAdded);
@@ -103,7 +102,7 @@ public void UpdateGuestProjectManager_ProjectRemoved()
                 projectWorkspaceState: null);
             var synchronizationService = new ProjectSnapshotSynchronizationService(
                 JoinableTaskFactory,
-                SessionAccessor,
+                SessionContext,
                 Mock.Of<IProjectSnapshotManagerProxy>(),
                 ProjectSnapshotManager);
             var hostProject = new HostProject("/guest/path/project.csproj", RazorConfiguration.Default);
@@ -132,7 +131,7 @@ public void UpdateGuestProjectManager_ProjectChanged_ConfigurationChange()
                 oldHandle.ProjectWorkspaceState);
             var synchronizationService = new ProjectSnapshotSynchronizationService(
                 JoinableTaskFactory,
-                SessionAccessor,
+                SessionContext,
                 Mock.Of<IProjectSnapshotManagerProxy>(),
                 ProjectSnapshotManager);
             var hostProject = new HostProject("/guest/path/project.csproj", RazorConfiguration.Default);
@@ -165,7 +164,7 @@ public void UpdateGuestProjectManager_ProjectChanged_ProjectWorkspaceStateChange
                 newProjectWorkspaceState);
             var synchronizationService = new ProjectSnapshotSynchronizationService(
                 JoinableTaskFactory,
-                SessionAccessor,
+                SessionContext,
                 Mock.Of<IProjectSnapshotManagerProxy>(),
                 ProjectSnapshotManager);
             var hostProject = new HostProject("/guest/path/project.csproj", RazorConfiguration.Default);