Switch to explicit jtf run

Author: CyrusNajmabadi

src/VisualStudio/CSharp/Impl/ProjectSystemShim/CSharpProjectShim.ICSharpProjectSite.cs

@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.VisualStudio.LanguageServices.CSharp.ProjectSystemShim.Interop;
@@ -120,48 +121,50 @@ public void OnModuleRemoved(string filename)
 
         public int GetValidStartupClasses(IntPtr[] classNames, ref int count)
         {
-            var project = Workspace.CurrentSolution.GetRequiredProject(ProjectSystemProject.Id);
-            var compilation = project.GetRequiredCompilationAsync(CancellationToken.None).WaitAndGetResult(CancellationToken.None);
-            var entryPoints = CSharpEntryPointFinder.FindEntryPoints(compilation);
+            var (result, newCount) = this.ThreadingContext.JoinableTaskFactory.Run(GetValidStartupClassesAsync);
+            if (newCount.HasValue)
+                count = newCount.Value;
 
-            // If classNames is NULL, then we need to populate the number of valid startup
-            // classes only
-            if (classNames == null)
-            {
-                count = entryPoints.Count();
-                return VSConstants.S_OK;
-            }
-            else
+            return result;
+
+            async Task<(int result, int? newCount)> GetValidStartupClassesAsync()
             {
-                // We return S_FALSE if we have more entrypoints than places in the array.
-                var entryPointNames = entryPoints.Select(e => e.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat.WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted))).ToArray();
+                var project = Workspace.CurrentSolution.GetRequiredProject(ProjectSystemProject.Id);
+                var compilation = await project.GetRequiredCompilationAsync(CancellationToken.None).ConfigureAwait(true);
+                var entryPoints = CSharpEntryPointFinder.FindEntryPoints(compilation);
 
-                if (entryPointNames.Length > classNames.Length)
+                // If classNames is NULL, then we need to populate the number of valid startup
+                // classes only
+                if (classNames == null)
                 {
-                    return VSConstants.S_FALSE;
+                    return (VSConstants.S_OK, entryPoints.Count());
                 }
-
-                // The old language service stored startup class names in its string table,
-                // so the property page never freed them. To avoid leaking memory, we're 
-                // going to allocate our strings on the native heap and keep the pointers to them.
-                // Subsequent calls to this function will free the old strings and allocate the 
-                // new ones. The last set of marshalled strings is freed in the destructor.
-                if (_startupClasses != null)
+                else
                 {
-                    foreach (var @class in _startupClasses)
+                    // We return S_FALSE if we have more entrypoints than places in the array.
+                    var entryPointNames = entryPoints.Select(e => e.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat.WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted))).ToArray();
+
+                    if (entryPointNames.Length > classNames.Length)
+                        return (VSConstants.S_FALSE, null);
+
+                    // The old language service stored startup class names in its string table,
+                    // so the property page never freed them. To avoid leaking memory, we're 
+                    // going to allocate our strings on the native heap and keep the pointers to them.
+                    // Subsequent calls to this function will free the old strings and allocate the 
+                    // new ones. The last set of marshalled strings is freed in the destructor.
+                    if (_startupClasses != null)
                     {
-                        Marshal.FreeHGlobal(@class);
+                        foreach (var @class in _startupClasses)
+                            Marshal.FreeHGlobal(@class);
                     }
-                }
 
-                _startupClasses = entryPointNames.Select(Marshal.StringToHGlobalUni).ToArray();
-                Array.Copy(_startupClasses, classNames, _startupClasses.Length);
+                    _startupClasses = entryPointNames.Select(Marshal.StringToHGlobalUni).ToArray();
+                    Array.Copy(_startupClasses, classNames, _startupClasses.Length);
 
-                count = entryPointNames.Length;
-                return VSConstants.S_OK;
+                    return (VSConstants.S_OK, entryPointNames.Length);
+                }
             }
         }
-
         public void OnAliasesChanged(string file, string project, int previousAliasesCount, string[] previousAliases, int currentAliasesCount, string[] currentAliases)
         {
             using (ProjectSystemProject.CreateBatchScope())

src/VisualStudio/Core/Def/ProjectSystem/Legacy/AbstractLegacyProject.cs

@@ -67,8 +67,8 @@ public AbstractLegacyProject(
         IThreadingContext threadingContext,
         string externalErrorReportingPrefix)
     {
-        _threadingContext = threadingContext;
-        _threadingContext.ThrowIfNotOnUIThread();
+        ThreadingContext = threadingContext;
+        ThreadingContext.ThrowIfNotOnUIThread();
         Contract.ThrowIfNull(hierarchy);
 
         var componentModel = (IComponentModel)serviceProvider.GetService(typeof(SComponentModel));
@@ -177,7 +177,7 @@ protected void AddFile(
         string filename,
         SourceCodeKind sourceCodeKind)
     {
-        _threadingContext.ThrowIfNotOnUIThread();
+        ThreadingContext.ThrowIfNotOnUIThread();
 
         // We have tests that assert that XOML files should not get added; this was similar
         // behavior to how ASP.NET projects would add .aspx files even though we ultimately ignored
@@ -306,7 +306,7 @@ private static Guid GetProjectIDGuid(IVsHierarchy hierarchy)
     /// <remarks>Using item IDs as a key like this in a long-lived way is considered unsupported by CPS and other
     /// IVsHierarchy providers, but this code (which is fairly old) still makes the assumptions anyways.</remarks>
     private readonly Dictionary<uint, ImmutableArray<string>> _folderNameMap = [];
-    private readonly IThreadingContext _threadingContext;
+    protected readonly IThreadingContext ThreadingContext;
 
     private ImmutableArray<string> GetFolderNamesForDocument(string filename)
     {
@@ -321,7 +321,7 @@ private ImmutableArray<string> GetFolderNamesForDocument(string filename)
 
     private ImmutableArray<string> GetFolderNamesForDocument(uint documentItemID)
     {
-        _threadingContext.ThrowIfNotOnUIThread();
+        ThreadingContext.ThrowIfNotOnUIThread();
 
         if (documentItemID != (uint)VSConstants.VSITEMID.Nil && Hierarchy.GetProperty(documentItemID, (int)VsHierarchyPropID.Parent, out var parentObj) == VSConstants.S_OK)
         {
@@ -337,7 +337,7 @@ private ImmutableArray<string> GetFolderNamesForDocument(uint documentItemID)
 
     private ImmutableArray<string> GetFolderNamesForFolder(uint folderItemID)
     {
-        _threadingContext.ThrowIfNotOnUIThread();
+        ThreadingContext.ThrowIfNotOnUIThread();
 
         using var pooledObject = SharedPools.Default<List<string>>().GetPooledObject();
 

src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicPackage.IVbEntryPointProvider.vb

@@ -12,10 +12,11 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic
     Partial Friend Class VisualBasicPackage
         Implements IVBEntryPointProvider
 
-        Public Function GetFormEntryPointsList(<[In]> pHierarchy As Object,
-                                               cItems As Integer,
-                                               <Out> bstrList() As String,
-                                               <Out> ByVal pcActualItems As IntPtr) As Integer Implements IVBEntryPointProvider.GetFormEntryPointsList
+        Public Function GetFormEntryPointsList(
+                pHierarchy As Object,
+                cItems As Integer,
+                <Out> bstrList() As String,
+                <Out> pcActualItems As IntPtr) As Integer Implements IVBEntryPointProvider.GetFormEntryPointsList
 
             Dim workspace = ComponentModel.GetService(Of VisualStudioWorkspace)()
             Dim hierarchy = CType(pHierarchy, IVsHierarchy)