Merge release/dev16.11-vs-deps to main-vs-deps

eng/Versions.props

@@ -31,11 +31,11 @@
  <MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-preview1.21054.10</MicrosoftCodeAnalysisNetAnalyzersVersion>
  <MicrosoftCodeAnalysisTestingVersion>1.0.1-beta1.20623.3</MicrosoftCodeAnalysisTestingVersion>
  <CodeStyleAnalyzerVersion>3.9.0</CodeStyleAnalyzerVersion>
- <VisualStudioEditorPackagesVersion>16.10.44</VisualStudioEditorPackagesVersion>
+ <VisualStudioEditorPackagesVersion>16.10.230</VisualStudioEditorPackagesVersion>
  <ILAsmPackageVersion>5.0.0-alpha1.19409.1</ILAsmPackageVersion>
  <ILDAsmPackageVersion>5.0.0-preview.1.20112.8</ILDAsmPackageVersion>
  <MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>16.10.161</MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>
- <MicrosoftVisualStudioShellPackagesVersion>16.10.0-preview-2-31112-292</MicrosoftVisualStudioShellPackagesVersion>
+ <MicrosoftVisualStudioShellPackagesVersion>16.10.31320.204</MicrosoftVisualStudioShellPackagesVersion>
  <MicrosoftBuildPackagesVersion>16.5.0</MicrosoftBuildPackagesVersion>
  <!-- The version of Roslyn we build Source Generators against that are built in this
  repository. This must be lower than MicrosoftNetCompilersToolsetVersion,
@@ -62,8 +62,7 @@
  <MicrosoftBuildRuntimeVersion>$(MicrosoftBuildPackagesVersion)</MicrosoftBuildRuntimeVersion>
  <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildPackagesVersion)</MicrosoftBuildTasksCoreVersion>
  <NuGetVisualStudioContractsVersion>5.7.0</NuGetVisualStudioContractsVersion>
- <!-- This is working around Microsoft.VisualStudio.Shell.15.0 having an unstated conflicting reference on this with NuGet.VisualStudio.Contracts -->
- <MicrosoftVisualStudioRpcContractsVersion>16.10.14-alpha</MicrosoftVisualStudioRpcContractsVersion>
+ <MicrosoftVisualStudioRpcContractsVersion>16.10.23</MicrosoftVisualStudioRpcContractsVersion>
  <!--
  Since the Microsoft.CodeAnalysis.Analyzers package is a public dependency of our NuGet
  packages we will keep it untied to the RoslynDiagnosticsNugetPackageVersion we use for
@@ -114,20 +113,20 @@
  <MicrosoftNetSdkVersion>2.0.0-alpha-20170405-2</MicrosoftNetSdkVersion>
  <MicrosoftNuGetBuildTasksVersion>0.1.0</MicrosoftNuGetBuildTasksVersion>
  <MicrosoftPortableTargetsVersion>0.1.2-dev</MicrosoftPortableTargetsVersion>
- <MicrosoftServiceHubClientVersion>2.7.454</MicrosoftServiceHubClientVersion>
- <MicrosoftServiceHubFrameworkVersion>2.7.454</MicrosoftServiceHubFrameworkVersion>
+ <MicrosoftServiceHubClientVersion>2.8.10</MicrosoftServiceHubClientVersion>
+ <MicrosoftServiceHubFrameworkVersion>2.8.10</MicrosoftServiceHubFrameworkVersion>
  <MicrosoftVisualBasicVersion>10.1.0</MicrosoftVisualBasicVersion>
  <MicrosoftVisualStudioCacheVersion>16.10.40-alpha</MicrosoftVisualStudioCacheVersion>
  <MicrosoftVisualStudioCallHierarchyPackageDefinitionsVersion>15.8.27812-alpha</MicrosoftVisualStudioCallHierarchyPackageDefinitionsVersion>
  <MicrosoftVisualStudioCodeAnalysisSdkUIVersion>15.8.27812-alpha</MicrosoftVisualStudioCodeAnalysisSdkUIVersion>
- <MicrosoftVisualStudioComponentModelHostVersion>16.10.44</MicrosoftVisualStudioComponentModelHostVersion>
- <MicrosoftVisualStudioCompositionVersion>16.5.13</MicrosoftVisualStudioCompositionVersion>
+ <MicrosoftVisualStudioComponentModelHostVersion>16.10.230</MicrosoftVisualStudioComponentModelHostVersion>
+ <MicrosoftVisualStudioCompositionVersion>16.9.20</MicrosoftVisualStudioCompositionVersion>
  <MicrosoftVisualStudioCoreUtilityVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioCoreUtilityVersion>
  <MicrosoftVisualStudioDebuggerUIInterfacesVersion>16.10.0-beta.21214.1</MicrosoftVisualStudioDebuggerUIInterfacesVersion>
  <MicrosoftVisualStudioDebuggerContractsVersion>16.10.0-beta.21214.1</MicrosoftVisualStudioDebuggerContractsVersion>
  <MicrosoftVisualStudioDebuggerEngineimplementationVersion>16.5.1122001-preview</MicrosoftVisualStudioDebuggerEngineimplementationVersion>
  <MicrosoftVisualStudioDebuggerMetadataimplementationVersion>16.5.1122001-preview</MicrosoftVisualStudioDebuggerMetadataimplementationVersion>
- <MicrosoftVisualStudioDesignerInterfacesVersion>16.10.0-preview-2-31112-292</MicrosoftVisualStudioDesignerInterfacesVersion>
+ <MicrosoftVisualStudioDesignerInterfacesVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioDesignerInterfacesVersion>
  <MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion>16.0.28226-alpha</MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion>
  <MicrosoftVisualStudioSDKEmbedInteropTypesVersion>15.0.36</MicrosoftVisualStudioSDKEmbedInteropTypesVersion>
  <MicrosoftVisualStudioEditorVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioEditorVersion>
@@ -154,7 +153,7 @@
  <MicrosoftVisualStudioProjectSystemVersion>16.2.133-pre</MicrosoftVisualStudioProjectSystemVersion>
  <MicrosoftVisualStudioProjectSystemManagedVersion>2.3.6152103</MicrosoftVisualStudioProjectSystemManagedVersion>
  <MicrosoftVisualStudioRemoteControlVersion>16.3.32</MicrosoftVisualStudioRemoteControlVersion>
- <MicrosoftVisualStudioSDKAnalyzersVersion>16.9.2-alpha</MicrosoftVisualStudioSDKAnalyzersVersion>
+ <MicrosoftVisualStudioSDKAnalyzersVersion>16.10.1</MicrosoftVisualStudioSDKAnalyzersVersion>
  <MicrosoftVisualStudioSetupConfigurationInteropVersion>1.16.30</MicrosoftVisualStudioSetupConfigurationInteropVersion>
  <MicrosoftVisualStudioShell150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShell150Version>
  <MicrosoftVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellFrameworkVersion>
@@ -169,7 +168,7 @@
  <MicrosoftVisualStudioShellInterop169DesignTimeVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellInterop169DesignTimeVersion>
  <MicrosoftVisualStudioShellInterop80Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellInterop80Version>
  <MicrosoftVisualStudioShellInterop90Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellInterop90Version>
- <MicrosoftVisualStudioTelemetryVersion>16.3.109</MicrosoftVisualStudioTelemetryVersion>
+ <MicrosoftVisualStudioTelemetryVersion>16.3.176</MicrosoftVisualStudioTelemetryVersion>
  <MicrosoftVisualStudioTemplateWizardInterfaceVersion>8.0.0.0-alpha</MicrosoftVisualStudioTemplateWizardInterfaceVersion>
  <MicrosoftVisualStudioTextDataVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextDataVersion>
  <MicrosoftVisualStudioTextInternalVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextInternalVersion>
@@ -182,10 +181,10 @@
  <MicrosoftVisualStudioTextManagerInterop120Version>12.0.30110</MicrosoftVisualStudioTextManagerInterop120Version>
  <MicrosoftVisualStudioTextManagerInterop121DesignTimeVersion>12.1.30328</MicrosoftVisualStudioTextManagerInterop121DesignTimeVersion>
  <MicrosoftVisualStudioTextManagerInterop160DesignTimeVersion>16.0.0</MicrosoftVisualStudioTextManagerInterop160DesignTimeVersion>
- <MicrosoftVisualStudioThreadingAnalyzersVersion>16.10.41-alpha</MicrosoftVisualStudioThreadingAnalyzersVersion>
- <MicrosoftVisualStudioThreadingVersion>16.10.41-alpha</MicrosoftVisualStudioThreadingVersion>
+ <MicrosoftVisualStudioThreadingAnalyzersVersion>16.10.56</MicrosoftVisualStudioThreadingAnalyzersVersion>
+ <MicrosoftVisualStudioThreadingVersion>16.10.56</MicrosoftVisualStudioThreadingVersion>
  <MicrosoftVisualStudioUtilitiesVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioUtilitiesVersion>
- <MicrosoftVisualStudioValidationVersion>16.9.30</MicrosoftVisualStudioValidationVersion>
+ <MicrosoftVisualStudioValidationVersion>16.10.26</MicrosoftVisualStudioValidationVersion>
  <MicrosoftVisualStudioVsInteractiveWindowVersion>2.8.0</MicrosoftVisualStudioVsInteractiveWindowVersion>
  <MicrosoftVisualStudioWorkspaceVSIntegrationVersion>16.3.43</MicrosoftVisualStudioWorkspaceVSIntegrationVersion>
  <MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
@@ -194,7 +193,7 @@
  <MDbgVersion>0.1.0</MDbgVersion>
  <MonoOptionsVersion>6.6.0.161</MonoOptionsVersion>
  <MoqVersion>4.10.1</MoqVersion>
- <NerdbankStreamsVersion>2.6.81</NerdbankStreamsVersion>
+ <NerdbankStreamsVersion>2.7.74</NerdbankStreamsVersion>
  <NuGetVisualStudioVersion>4.0.0-rc-2048</NuGetVisualStudioVersion>
  <NuGetSolutionRestoreManagerInteropVersion>4.8.0</NuGetSolutionRestoreManagerInteropVersion>
  <MicrosoftDiaSymReaderPdb2PdbVersion>1.1.0-beta1-62506-02</MicrosoftDiaSymReaderPdb2PdbVersion>

src/EditorFeatures/CSharp/NavigationBar/CSharpEditorNavigationBarItemService.cs

@@ -44,7 +44,10 @@ public CSharpEditorNavigationBarItemService(IThreadingContext threadingContext)
  return new VirtualTreePoint(tree, tree.GetText(cancellationToken), location.SourceSpan.Start);
  }
 
- protected override Task NavigateToItemAsync(Document document, WrappedNavigationBarItem item, ITextView textView, CancellationToken cancellationToken)
- => NavigateToSymbolItemAsync(document, (RoslynNavigationBarItem.SymbolItem)item.UnderlyingItem, cancellationToken);
+ protected override async Task<bool> TryNavigateToItemAsync(Document document, WrappedNavigationBarItem item, ITextView textView, CancellationToken cancellationToken)
+ {
+ await NavigateToSymbolItemAsync(document, (RoslynNavigationBarItem.SymbolItem)item.UnderlyingItem, cancellationToken).ConfigureAwait(false);
+ return true;
+ }
  }
 }

src/EditorFeatures/Core/Extensibility/NavigationBar/AbstractEditorNavigationBarItemService.cs

@@ -24,11 +24,11 @@ protected AbstractEditorNavigationBarItemService(IThreadingContext threadingCont
  }
 
  protected abstract Task<VirtualTreePoint?> GetSymbolNavigationPointAsync(Document document, ISymbol symbol, CancellationToken cancellationToken);
- protected abstract Task NavigateToItemAsync(Document document, WrappedNavigationBarItem item, ITextView textView, CancellationToken cancellationToken);
+ protected abstract Task<bool> TryNavigateToItemAsync(Document document, WrappedNavigationBarItem item, ITextView textView, CancellationToken cancellationToken);
 
  [Obsolete("Caller should call NavigateToItemAsync instead", error: true)]
  public void NavigateToItem(Document document, NavigationBarItem item, ITextView view, CancellationToken cancellationToken)
- => throw new NotSupportedException($"Caller should call {nameof(NavigateToItemAsync)} instead");
+ => throw new NotSupportedException($"Caller should call {nameof(TryNavigateToItemAsync)} instead");
 
  public async Task<IList<NavigationBarItem>?> GetItemsAsync(Document document, CancellationToken cancellationToken)
  {
@@ -38,8 +38,8 @@ public void NavigateToItem(Document document, NavigationBarItem item, ITextView
  return items.SelectAsArray(v => (NavigationBarItem)new WrappedNavigationBarItem(v));
  }
 
- public Task NavigateToItemAsync(Document document, NavigationBarItem item, ITextView textView, CancellationToken cancellationToken)
- => NavigateToItemAsync(document, (WrappedNavigationBarItem)item, textView, cancellationToken);
+ public Task<bool> TryNavigateToItemAsync(Document document, NavigationBarItem item, ITextView textView, CancellationToken cancellationToken)
+ => TryNavigateToItemAsync(document, (WrappedNavigationBarItem)item, textView, cancellationToken);
 
  protected async Task NavigateToSymbolItemAsync(
  Document document, RoslynNavigationBarItem.SymbolItem item, CancellationToken cancellationToken)

src/EditorFeatures/Core/Extensibility/NavigationBar/INavigationBarItemService.cs

@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.VisualStudio.Text.Editor;
+using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor
 {
@@ -23,7 +24,10 @@ internal interface INavigationBarItemServiceRenameOnceTypeScriptMovesToExternalA
  {
  Task<IList<NavigationBarItem>?> GetItemsAsync(Document document, CancellationToken cancellationToken);
  bool ShowItemGrayedIfNear(NavigationBarItem item);
- Task NavigateToItemAsync(Document document, NavigationBarItem item, ITextView view, CancellationToken cancellationToken);
+ /// <summary>
+ /// Returns <see langword="true"/> if navigation (or generation) happened. <see langword="false"/> otherwise.
+ /// </summary>
+ Task<bool> TryNavigateToItemAsync(Document document, NavigationBarItem item, ITextView view, CancellationToken cancellationToken);
  }
 
  internal class NavigationBarItemServiceWrapper : INavigationBarItemServiceRenameOnceTypeScriptMovesToExternalAccess
@@ -41,10 +45,10 @@ public NavigationBarItemServiceWrapper(INavigationBarItemService service)
  public bool ShowItemGrayedIfNear(NavigationBarItem item)
  => _service.ShowItemGrayedIfNear(item);
 
- public Task NavigateToItemAsync(Document document, NavigationBarItem item, ITextView view, CancellationToken cancellationToken)
+ public Task<bool> TryNavigateToItemAsync(Document document, NavigationBarItem item, ITextView view, CancellationToken cancellationToken)
  {
  _service.NavigateToItem(document, item, view, cancellationToken);
- return Task.CompletedTask;
+ return SpecializedTasks.True;
  }
  }
 }

src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptNavigationBarItemService.cs

@@ -40,16 +40,18 @@ public VSTypeScriptNavigationBarItemService(
  return items.Select(x => ConvertToNavigationBarItem(x)).ToList();
  }
 
- public async Task NavigateToItemAsync(Document document, NavigationBarItem item, ITextView view, CancellationToken cancellationToken)
+ public async Task<bool> TryNavigateToItemAsync(Document document, NavigationBarItem item, ITextView view, CancellationToken cancellationToken)
  {
- if (item.Spans.Length <= 0)
- return;
+ if (item.Spans.Length > 0)
+ {
+ await _threadingContext.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
 
- await _threadingContext.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
+ var workspace = document.Project.Solution.Workspace;
+ var navigationService = VSTypeScriptDocumentNavigationServiceWrapper.Create(workspace);
+ navigationService.TryNavigateToPosition(workspace, document.Id, item.Spans[0].Start, virtualSpace: 0, options: null, cancellationToken: cancellationToken);
+ }
 
- var workspace = document.Project.Solution.Workspace;
- var navigationService = VSTypeScriptDocumentNavigationServiceWrapper.Create(workspace);
- navigationService.TryNavigateToPosition(workspace, document.Id, item.Spans[0].Start, virtualSpace: 0, options: null, cancellationToken: cancellationToken);
+ return true;
  }
 
  public bool ShowItemGrayedIfNear(NavigationBarItem item)

src/EditorFeatures/Core/Implementation/Classification/CompilationAvailableTaggerEventSource.cs

@@ -32,7 +32,7 @@ internal class CompilationAvailableTaggerEventSource : ITaggerEventSource
  /// <summary>
  /// Cancellation tokens controlling background computation of the compilation.
  /// </summary>
- private readonly CancellationSeries _cancellationSeries = new();
+ private readonly ReferenceCountedDisposable<CancellationSeries> _cancellationSeries = new(new CancellationSeries());
 
  public CompilationAvailableTaggerEventSource(
  ITextBuffer subjectBuffer,
@@ -72,9 +72,16 @@ private void OnEventSourceChanged(object? sender, TaggerEventArgs args)
  if (!document.SupportsSemanticModel)
  return;
 
+ using var cancellationSeries = _cancellationSeries.TryAddReference();
+ if (cancellationSeries is null)
+ {
+ // Already in the process of disposing this instance
+ return;
+ }
+
  // Cancel any existing tasks that are computing the compilation and spawn a new one to compute
  // it and notify any listening clients.
- var cancellationToken = _cancellationSeries.CreateNext();
+ var cancellationToken = cancellationSeries.Target.CreateNext();
 
  var token = _asyncListener.BeginAsyncOperation(nameof(OnEventSourceChanged));
  var task = Task.Run(async () =>

src/EditorFeatures/Core/Implementation/NavigationBar/NavigationBarController.cs

@@ -388,8 +388,14 @@ private async Task ProcessItemSelectionAsync(NavigationBarItem item, Cancellatio
  item.Spans = item.TrackingSpans.SelectAsArray(ts => ts.GetSpan(snapshot).Span.ToTextSpan());
  var view = _presenter.TryGetCurrentView();
 
- // ConfigureAwait(true) as we have to come back to UI thread in order to kick of the refresh task below.
- await navBarService.NavigateToItemAsync(document, item, view, cancellationToken).ConfigureAwait(true);
+ // ConfigureAwait(true) as we have to come back to UI thread in order to kick of the refresh task
+ // below. Note that we only want to refresh if selecting the item had an effect (either navigating
+ // or generating). If nothing happened to don't want to refresh. This is important as some items
+ // exist in the type list that are only there to show a set a particular set of items in the member
+ // list. So selecting such an item should only update the member list, and we do not want a refresh
+ // to wipe that out.
+ if (!await navBarService.TryNavigateToItemAsync(document, item, view, cancellationToken).ConfigureAwait(true))
+ return;
  }
  }