From 42f1d0d1e449f5d3a015d8287e42f7d4652ef3e3 Mon Sep 17 00:00:00 2001
From: Drew Noakes <git@drewnoakes.com>
Date: Tue, 18 Oct 2022 11:49:48 +1100
Subject: [PATCH] Join upstream data sources in LanguageServiceHost

To avoid hangs, we must ensure that the LanguageServiceHost's upstream data sources are joined.
---
 .../ProjectSystem/LanguageServices/LanguageServiceHost.cs       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/LanguageServices/LanguageServiceHost.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/LanguageServices/LanguageServiceHost.cs
index 2968f2a91af..903cba19638 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/LanguageServices/LanguageServiceHost.cs
+++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/LanguageServices/LanguageServiceHost.cs
@@ -136,6 +136,8 @@ protected override async Task InitializeCoreAsync(CancellationToken cancellation
                 linkOptions: DataflowOption.PropagateCompletion,
                 cancellationToken: cancellationToken),
 
+            ProjectDataSources.JoinUpstreamDataSources(_joinableTaskFactory, _projectFaultHandler, _activeConfiguredProjectProvider, _activeConfigurationGroupSubscriptionService),
+
             new DisposableDelegate(() =>
             {
                 // Dispose all workspaces. Note that this happens within a lock, so we will not race with project updates.