Merge main into main-vs-deps

eng/Directory.Packages.props

@@ -67,9 +67,6 @@
     <PackageVersion Include="Microsoft.VSSDK.Debugger.VSDConfigTool" Version="17.13.1100801-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.Imaging" Version="18.0.1306-preview.1" />
     <PackageVersion Include="Microsoft.VisualStudio.ProjectSystem" Version="17.0.77-pre-g62a6cb5699" />
-    <PackageVersion Include="Microsoft.VisualStudio.Progression.CodeSchema" Version="15.8.27812-alpha" />
-    <PackageVersion Include="Microsoft.VisualStudio.Progression.Common" Version="15.8.27812-alpha" />
-    <PackageVersion Include="Microsoft.VisualStudio.Progression.Interfaces" Version="15.8.27812-alpha" />
     <PackageVersion Include="Microsoft.VisualStudio.CallHierarchy.Package.Definitions" Version="15.8.27812-alpha" />
     <PackageVersion Include="Microsoft.VisualStudio.CodeAnalysis.Sdk.UI" Version="15.8.27812-alpha" />
     <PackageVersion Include="Microsoft.VisualStudio.Language.CallHierarchy" Version="15.8.27812-alpha" />

eng/config/globalconfigs/Common.globalconfig

@@ -127,9 +127,6 @@ dotnet_diagnostic.VSTHRD010.severity = none
 # VSTHRD110: Observe result of async calls
 dotnet_diagnostic.VSTHRD110.severity = none
 
-# Workaround for old Microsoft.VisualStudio.Progression.* packages: https://github.com/dotnet/roslyn/issues/71404
-dotnet_diagnostic.VSIXCompatibility1001.severity = none
-
 dotnet_diagnostic.HAA0101.severity = none
 dotnet_diagnostic.HAA0102.severity = none
 dotnet_diagnostic.HAA0201.severity = none

eng/targets/Settings.props

@@ -11,9 +11,6 @@
 
     <VSSDKTargetPlatformRegRootSuffix>RoslynDev</VSSDKTargetPlatformRegRootSuffix>
 
-    <!-- Workaround for old Microsoft.VisualStudio.Progression.* packages -->
-    <NoWarn>$(NoWarn);VSIXCompatibility1001</NoWarn>
-
     <!-- TODO: https://github.com/dotnet/roslyn/issues/71667 -->
     <NoWarn>$(NoWarn);NU1507</NoWarn>
 

src/Compilers/Test/Core/Traits/Traits.cs

@@ -298,7 +298,6 @@ public static class Features
             public const string Packaging = nameof(Packaging);
             public const string PasteTracking = nameof(PasteTracking);
             public const string Peek = nameof(Peek);
-            public const string Progression = nameof(Progression);
             public const string ProjectSystemShims = nameof(ProjectSystemShims);
             public const string SarifErrorLogging = nameof(SarifErrorLogging);
             public const string QuickInfo = nameof(QuickInfo);

src/VisualStudio/CSharp/Impl/ProjectSystemShim/CSharpEntryPointFinder.cs

@@ -18,8 +18,7 @@ public static IEnumerable<INamedTypeSymbol> FindEntryPoints(Compilation compilat
     {
         // This differs from the VB implementation
         // (Microsoft.VisualStudio.LanguageServices.VisualBasic.ProjectSystemShim.EntryPointFinder) because we don't
-        // ever consider forms entry points. Technically, this is wrong but it just doesn't matter since the ref
-        // assemblies are unlikely to have a random Main() method that matches
+        // ever consider forms entry points.
         var visitor = new CSharpEntryPointFinder(compilation);
         visitor.Visit(compilation.SourceModule.GlobalNamespace);
         return visitor.EntryPoints;

src/VisualStudio/CSharp/Impl/ProjectSystemShim/CSharpEntryPointFinderService.cs

@@ -16,6 +16,6 @@ namespace Microsoft.VisualStudio.LanguageServices.CSharp.ProjectSystemShim;
 [method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
 internal sealed class CSharpEntryPointFinderService() : AbstractEntryPointFinderService
 {
-    protected override IEnumerable<INamedTypeSymbol> FindEntryPoints(Compilation compilation, bool findFormsOnly)
+    public override IEnumerable<INamedTypeSymbol> FindEntryPoints(Compilation compilation, bool findFormsOnly)
         => CSharpEntryPointFinder.FindEntryPoints(compilation);
 }

src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj

@@ -114,9 +114,6 @@
     <PackageReference Include="Microsoft.VisualStudio.Debugger.Engine-implementation" />
     <PackageReference Include="Microsoft.VisualStudio.Sdk" />
     <PackageReference Include="Microsoft.VisualStudio.Search" />
-    <PackageReference Include="Microsoft.VisualStudio.Progression.CodeSchema" />
-    <PackageReference Include="Microsoft.VisualStudio.Progression.Common" />
-    <PackageReference Include="Microsoft.VisualStudio.Progression.Interfaces" />
     <PackageReference Include="Microsoft.VisualStudio.CallHierarchy.Package.Definitions" />
     <PackageReference Include="Microsoft.VisualStudio.Language.CallHierarchy" />
     <PackageReference Include="Microsoft.VisualStudio.VsInteractiveWindow" />

src/VisualStudio/Core/Def/ProjectSystem/AbstractEntryPointFinderService.cs

@@ -9,10 +9,10 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem;
 
 internal abstract class AbstractEntryPointFinderService : IEntryPointFinderService
 {
-    protected abstract IEnumerable<INamedTypeSymbol> FindEntryPoints(Compilation compilation, bool findFormsOnly);
+    public abstract IEnumerable<INamedTypeSymbol> FindEntryPoints(Compilation compilation, bool findFormsOnly);
 
     public IEnumerable<INamedTypeSymbol> FindEntryPoints(INamespaceSymbol symbol, bool findFormsOnly)
-        => symbol is not { ContainingAssembly: ISourceAssemblySymbol sourceAssembly }
-            ? []
-            : FindEntryPoints(sourceAssembly.Compilation, findFormsOnly);
+        => symbol is { ContainingCompilation: Compilation compilation }
+            ? FindEntryPoints(compilation, findFormsOnly)
+            : [];
 }

src/VisualStudio/Core/Def/ProjectSystem/IEntryPointFinderService.cs

@@ -19,4 +19,11 @@ internal interface IEntryPointFinderService : ILanguageService
     /// <param name="symbol">The namespace to search.</param>
     /// <param name="findFormsOnly">Restrict the search to only Windows Forms classes. Note that this is only implemented for VisualBasic</param>
     IEnumerable<INamedTypeSymbol> FindEntryPoints(INamespaceSymbol symbol, bool findFormsOnly);
+
+    /// <summary>
+    /// Finds the types that contain entry points like the Main method in a given compilation.
+    /// </summary>
+    /// <param name="compilation">The compilation to search.</param>
+    /// <param name="findFormsOnly">Restrict the search to only Windows Forms classes. Note that this is only implemented for VisualBasic</param>
+    IEnumerable<INamedTypeSymbol> FindEntryPoints(Compilation compilation, bool findFormsOnly);
 }

src/VisualStudio/Core/Test/Microsoft.VisualStudio.LanguageServices.UnitTests.vbproj

@@ -45,13 +45,7 @@
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Elfie" />
-    <PackageReference Include="Microsoft.VisualStudio.InteractiveWindow" />
     <PackageReference Include="Xunit.Combinatorial" PrivateAssets="all" />
-
-    <!-- This is needed by the Progression and Graph Model APIs at runtime  -->
-    <PackageReference Include="Microsoft.VisualStudio.Diagnostics.Measurement" NoWarn="NU1605" IncludeAssets="runtime" />
-    <PackageReference Include="Microsoft.VisualStudio.Diagnostics.PerformanceProvider" IncludeAssets="runtime" />
   </ItemGroup>
   <ItemGroup>
     <Import Include="System.Threading.Tasks" />

src/VisualStudio/LiveShare/Impl/Microsoft.VisualStudio.LanguageServices.LiveShare.csproj

@@ -13,15 +13,11 @@
     <CreateVsixContainer>false</CreateVsixContainer>
   </PropertyGroup>
   <ItemGroup Label="Project References">
-    <ProjectReference Include="..\..\..\EditorFeatures\CSharp\Microsoft.CodeAnalysis.CSharp.EditorFeatures.csproj" />
-    <ProjectReference Include="..\..\..\EditorFeatures\VisualBasic\Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.vbproj" />
     <ProjectReference Include="..\..\..\LanguageServer\Protocol\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj" />
     <ProjectReference Include="..\..\Core\Def\Microsoft.VisualStudio.LanguageServices.csproj" />
   </ItemGroup>
   <ItemGroup>
     <!-- Override versions used by LiveShare packages. -->
-    <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" />
 
     <PackageReference Include="Microsoft.VisualStudio.LiveShare" />
     <PackageReference Include="Microsoft.VisualStudio.LiveShare.LanguageServices" />

src/VisualStudio/VisualBasic/Impl/ProjectSystemShim/VisualBasicEntryPointFinder.vb

@@ -28,12 +28,6 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.ProjectSystemShim
             Dim visitor = New VisualBasicEntryPointFinder(compilation, findFormsOnly)
             Dim symbol = compilation.SourceModule.GlobalNamespace
 
-            ' Attempt to only search source symbols
-            ' Some callers will give a symbol that is not part of a compilation
-            If symbol.ContainingCompilation IsNot Nothing Then
-                symbol = symbol.ContainingCompilation.SourceModule.GlobalNamespace
-            End If
-
             visitor.Visit(symbol)
             Return visitor.EntryPoints
         End Function

src/VisualStudio/VisualBasic/Impl/ProjectSystemShim/VisualBasicEntryPointFinderService.vb

@@ -17,7 +17,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.ProjectSystemShim
         Public Sub New()
         End Sub
 
-        Protected Overrides Function FindEntryPoints(compilation As Compilation, findFormsOnly As Boolean) As IEnumerable(Of INamedTypeSymbol)
+        Public Overrides Function FindEntryPoints(compilation As Compilation, findFormsOnly As Boolean) As IEnumerable(Of INamedTypeSymbol)
             Return VisualBasicEntryPointFinder.FindEntryPoints(compilation, findFormsOnly)
         End Function
     End Class