Fix

src/VisualStudio/Core/Test.Next/Mocks/InProcRemoteHostClientFactory.cs

@@ -20,7 +20,7 @@ public InProcRemoteHostClientFactory()
 
         public Task<RemoteHostClient> CreateAsync(Workspace workspace, CancellationToken cancellationToken)
         {
-            return InProcRemoteHostClient.CreateAsync(workspace, runCacheCleanup: false, cancellationToken: cancellationToken);
+            return InProcRemoteHostClient.CreateAsync(workspace, runCacheCleanup: false);
         }
     }
 }

src/VisualStudio/Core/Test.Next/Services/ServiceHubServicesTests.cs

@@ -64,7 +64,7 @@ public async Task TestRemoteHostSynchronize()
 
             using (var workspace = TestWorkspace.CreateCSharp(code))
             {
-                var client = (InProcRemoteHostClient)(await InProcRemoteHostClient.CreateAsync(workspace, runCacheCleanup: false, cancellationToken: CancellationToken.None));
+                var client = (InProcRemoteHostClient)(await InProcRemoteHostClient.CreateAsync(workspace, runCacheCleanup: false));
 
                 var solution = workspace.CurrentSolution;
 
@@ -84,7 +84,7 @@ public async Task TestRemoteHostTextSynchronize()
 
             using (var workspace = TestWorkspace.CreateCSharp(code))
             {
-                var client = (InProcRemoteHostClient)(await InProcRemoteHostClient.CreateAsync(workspace, runCacheCleanup: false, cancellationToken: CancellationToken.None));
+                var client = (InProcRemoteHostClient)(await InProcRemoteHostClient.CreateAsync(workspace, runCacheCleanup: false));
 
                 var solution = workspace.CurrentSolution;
 
@@ -121,7 +121,7 @@ public async Task TestTodoComments()
 
             using (var workspace = TestWorkspace.CreateCSharp(code))
             {
-                var client = (InProcRemoteHostClient)(await InProcRemoteHostClient.CreateAsync(workspace, runCacheCleanup: false, cancellationToken: CancellationToken.None));
+                var client = (InProcRemoteHostClient)(await InProcRemoteHostClient.CreateAsync(workspace, runCacheCleanup: false));
 
                 var solution = workspace.CurrentSolution;
 
@@ -143,7 +143,7 @@ class Test { }";
 
             using (var workspace = TestWorkspace.CreateCSharp(code))
             {
-                var client = (InProcRemoteHostClient)(await InProcRemoteHostClient.CreateAsync(workspace, runCacheCleanup: false, cancellationToken: CancellationToken.None));
+                var client = (InProcRemoteHostClient)(await InProcRemoteHostClient.CreateAsync(workspace, runCacheCleanup: false));
 
                 var solution = workspace.CurrentSolution;
 
@@ -164,7 +164,7 @@ public async Task TestRemoteHostSynchronizeGlobalAssets()
 
             using (var workspace = TestWorkspace.CreateCSharp(code))
             {
-                var client = (InProcRemoteHostClient)(await InProcRemoteHostClient.CreateAsync(workspace, runCacheCleanup: false, cancellationToken: CancellationToken.None));
+                var client = (InProcRemoteHostClient)(await InProcRemoteHostClient.CreateAsync(workspace, runCacheCleanup: false));
 
                 await client.TryRunRemoteAsync(
                     WellKnownRemoteHostServices.RemoteHostService,
@@ -183,7 +183,7 @@ public async Task TestUnknownProject()
             var workspace = new AdhocWorkspace(TestHostServices.CreateHostServices());
             var solution = workspace.CurrentSolution.AddProject("unknown", "unknown", NoCompilationConstants.LanguageName).Solution;
 
-            var client = (InProcRemoteHostClient)(await InProcRemoteHostClient.CreateAsync(workspace, runCacheCleanup: false, cancellationToken: CancellationToken.None));
+            var client = (InProcRemoteHostClient)(await InProcRemoteHostClient.CreateAsync(workspace, runCacheCleanup: false));
 
             await UpdatePrimaryWorkspace(client, solution);
             await VerifyAssetStorageAsync(client, solution);
@@ -198,7 +198,7 @@ public async Task TestRemoteHostSynchronizeIncrementalUpdate()
         {
             using (var workspace = TestWorkspace.CreateCSharp(Array.Empty<string>(), metadataReferences: null))
             {
-                var client = (InProcRemoteHostClient)(await InProcRemoteHostClient.CreateAsync(workspace, runCacheCleanup: false, cancellationToken: CancellationToken.None));
+                var client = (InProcRemoteHostClient)(await InProcRemoteHostClient.CreateAsync(workspace, runCacheCleanup: false));
 
                 var solution = Populate(workspace.CurrentSolution.RemoveProject(workspace.CurrentSolution.ProjectIds.First()));
 

src/VisualStudio/RemoteHostClientMock/Remote/RemoteHostClientFactory.cs

@@ -24,7 +24,7 @@ public Task<RemoteHostClient> CreateAsync(Workspace workspace, CancellationToken
             // this is the point where we can create different kind of remote host client in future (cloud or etc)
             if (workspace.Options.GetOption(RemoteHostClientFactoryOptions.RemoteHost_InProc))
             {
-                return InProcRemoteHostClient.CreateAsync(workspace, runCacheCleanup: true, cancellationToken: cancellationToken);
+                return InProcRemoteHostClient.CreateAsync(workspace, runCacheCleanup: true);
             }
 
             return ServiceHubRemoteHostClient.CreateAsync(workspace, cancellationToken);