Reapply "Simplify updating the primary workspace without passing in a…

… version" (#72723)

This reverts commit 01a6b9c.

src/EditorFeatures/Core/Remote/SolutionChecksumUpdater.cs

@@ -60,9 +60,6 @@ public SolutionChecksumUpdater(
  listener,
  shutdownToken);
 
- // Use an equality comparer here as we will commonly get lots of change notifications that will all be
- // associated with the same cancellation token controlling that batch of work. No need to enqueue the same
- // token a huge number of times when we only need the single value of it when doing the work.
  _synchronizeWorkspaceQueue = new AsyncBatchingWorkQueue(
  DelayTimeSpan.NearImmediate,
  SynchronizePrimaryWorkspaceAsync,
@@ -149,10 +146,9 @@ private async ValueTask SynchronizePrimaryWorkspaceAsync(CancellationToken cance
 
  using (Logger.LogBlock(FunctionId.SolutionChecksumUpdater_SynchronizePrimaryWorkspace, cancellationToken))
  {
- var workspaceVersion = solution.WorkspaceVersion;
  await client.TryInvokeAsync<IRemoteAssetSynchronizationService>(
  solution,
- (service, solution, cancellationToken) => service.SynchronizePrimaryWorkspaceAsync(solution, workspaceVersion, cancellationToken),
+ (service, solution, cancellationToken) => service.SynchronizePrimaryWorkspaceAsync(solution, cancellationToken),
  cancellationToken).ConfigureAwait(false);
  }
  }

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

@@ -137,7 +137,7 @@ public async Task TestDesignerAttributes()
  // Ensure remote workspace is in sync with normal workspace.
  var assetProvider = await GetAssetProviderAsync(workspace, remoteWorkspace, solution);
  var solutionChecksum = await solution.CompilationState.GetChecksumAsync(CancellationToken.None);
- await remoteWorkspace.UpdatePrimaryBranchSolutionAsync(assetProvider, solutionChecksum, solution.WorkspaceVersion, CancellationToken.None);
+ await remoteWorkspace.UpdatePrimaryBranchSolutionAsync(assetProvider, solutionChecksum, CancellationToken.None);
 
  var callback = new DesignerAttributeComputerCallback();
 
@@ -188,7 +188,7 @@ public async Task TestDesignerAttributesUnsupportedLanguage()
  // Ensure remote workspace is in sync with normal workspace.
  var assetProvider = await GetAssetProviderAsync(workspace, remoteWorkspace, solution);
  var solutionChecksum = await solution.CompilationState.GetChecksumAsync(CancellationToken.None);
- await remoteWorkspace.UpdatePrimaryBranchSolutionAsync(assetProvider, solutionChecksum, solution.WorkspaceVersion, CancellationToken.None);
+ await remoteWorkspace.UpdatePrimaryBranchSolutionAsync(assetProvider, solutionChecksum, CancellationToken.None);
 
  var callback = new DesignerAttributeComputerCallback();
 
@@ -359,9 +359,8 @@ public async Task TestRemoteWorkspaceCircularReferences()
  using var remoteWorkspace = new RemoteWorkspace(FeaturesTestCompositions.RemoteHost.GetHostServices());
 
  // this shouldn't throw exception
- var (solution, updated) = await remoteWorkspace.GetTestAccessor().TryUpdateWorkspaceCurrentSolutionAsync(
- remoteWorkspace.GetTestAccessor().CreateSolutionFromInfo(solutionInfo), workspaceVersion: 1);
- Assert.True(updated);
+ var solution = await remoteWorkspace.GetTestAccessor().UpdateWorkspaceCurrentSolutionAsync(
+ remoteWorkspace.GetTestAccessor().CreateSolutionFromInfo(solutionInfo));
  Assert.NotNull(solution);
  }
 
@@ -828,10 +827,9 @@ private static (Project project, ImmutableArray<Document> documents) GetProjectA
 
  private static async Task UpdatePrimaryWorkspace(RemoteHostClient client, Solution solution)
  {
- var workspaceVersion = solution.WorkspaceVersion;
  await client.TryInvokeAsync<IRemoteAssetSynchronizationService>(
  solution,
- async (service, solutionInfo, cancellationToken) => await service.SynchronizePrimaryWorkspaceAsync(solutionInfo, workspaceVersion, cancellationToken),
+ async (service, solutionInfo, cancellationToken) => await service.SynchronizePrimaryWorkspaceAsync(solutionInfo, cancellationToken),
  CancellationToken.None);
  }