Merge pull request #9561 from harleend/dev/hadhaliw/ExportInitialRule…

…sSubscriptions

Export initial rules subscriptions

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Frameworks/SupportedTargetFrameworkAliasEnumProvider.cs

@@ -14,6 +14,7 @@ namespace Microsoft.VisualStudio.ProjectSystem.VS.Frameworks
     /// </summary>
     [ExportDynamicEnumValuesProvider("SupportedTargetFrameworkAliasEnumProvider")]
     [AppliesTo(ProjectCapability.DotNet)]
+    [ExportInitialBuildRulesSubscriptions(SupportedTargetFrameworkAlias.SchemaName)]
     internal class SupportedTargetFrameworkAliasEnumProvider : ChainedProjectValueDataSourceBase<EnumCollection>, IDynamicEnumValuesProvider, IDynamicEnumValuesGenerator
     {
         private readonly IProjectSubscriptionService _subscriptionService;

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/LanguageServices/LanguageServiceHost.cs

@@ -32,6 +32,7 @@ namespace Microsoft.VisualStudio.ProjectSystem.LanguageServices;
 /// </remarks>
 [Export(typeof(IWorkspaceWriter))]
 [Export(ExportContractNames.Scopes.UnconfiguredProject, typeof(IProjectDynamicLoadComponent))]
+[ExportInitialBuildRulesSubscriptions(CompilerCommandLineArgs.SchemaName)]
 [AppliesTo(ProjectCapability.DotNetLanguageService)]
 internal sealed class LanguageServiceHost : OnceInitializedOnceDisposedAsync, IProjectDynamicLoadComponent, IWorkspaceWriter
 {

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/LanguageServices/Workspace.cs

@@ -26,8 +26,6 @@ internal enum WorkspaceState
         Disposed
     }
 
-    private const string ProjectBuildRuleName = CompilerCommandLineArgs.SchemaName;
-
     private readonly DisposableBag _disposableBag;
 
     private readonly ProjectConfigurationSlice _slice;
@@ -418,7 +416,7 @@ private async Task OnBuildUpdateAsync(IProjectVersionedValue<BuildUpdate> update
         await OnProjectChangedAsync(
             _buildProgressRegistration,
             update,
-            hasChange: e => e.Value.BuildRuleUpdate.ProjectChanges[ProjectBuildRuleName].Difference.AnyChanges,
+            hasChange: e => e.Value.BuildRuleUpdate.ProjectChanges[CompilerCommandLineArgs.SchemaName].Difference.AnyChanges,
             applyFunc: ApplyProjectBuild,
             _unloadCancellationToken);
 
@@ -429,7 +427,7 @@ void ApplyProjectBuild(
             ContextState state,
             CancellationToken cancellationToken)
         {
-            IProjectChangeDescription projectChange = update.Value.BuildRuleUpdate.ProjectChanges[ProjectBuildRuleName];
+            IProjectChangeDescription projectChange = update.Value.BuildRuleUpdate.ProjectChanges[CompilerCommandLineArgs.SchemaName];
 
             ProcessCommandLine();
 

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/LanguageServices/WorkspaceFactory.cs

@@ -15,8 +15,6 @@ namespace Microsoft.VisualStudio.ProjectSystem.LanguageServices;
 [Export(typeof(IWorkspaceFactory))]
 internal class WorkspaceFactory : IWorkspaceFactory
 {
-    private const string ProjectBuildRuleName = CompilerCommandLineArgs.SchemaName;
-
     private readonly UnconfiguredProject _unconfiguredProject;
     private readonly IProjectService _projectService;
     private readonly IProjectThreadingService _threadingService;
@@ -142,7 +140,7 @@ var buildTransformBlock
         {
             ProjectDataSources.SyncLinkTo(
                 source.ActiveConfiguredProjectSource.SourceBlock.SyncLinkOptions(),
-                source.ProjectBuildRuleSource.SourceBlock.SyncLinkOptions(DataflowOption.WithRuleNames(ProjectBuildRuleName)),
+                source.ProjectBuildRuleSource.SourceBlock.SyncLinkOptions(DataflowOption.WithRuleNames(CompilerCommandLineArgs.SchemaName)),
                 target: buildTransformBlock,
                 linkOptions: DataflowOption.PropagateCompletion,
                 cancellationToken: cancellationToken),

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Setup/SetupComponentProvider.cs

@@ -20,6 +20,7 @@ namespace Microsoft.VisualStudio.ProjectSystem.VS.Setup;
 /// </remarks>
 [Export(ExportContractNames.Scopes.UnconfiguredProject, typeof(IProjectDynamicLoadComponent))]
 [AppliesTo(ProjectCapability.DotNet)]
+[ExportInitialBuildRulesSubscriptions(SuggestedWorkload.SchemaName)]
 internal sealed class SetupComponentProvider : OnceInitializedOnceDisposedAsync, IProjectDynamicLoadComponent
 {
     private readonly UnconfiguredProject _unconfiguredProject;

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Tree/Dependencies/DependenciesTreeBuildRuleRequirements.cs

@@ -0,0 +1,48 @@
+// Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using Microsoft.VisualStudio.ProjectSystem.Tree.Dependencies.Subscriptions.MSBuildDependencies;
+
+namespace Microsoft.VisualStudio.ProjectSystem.VS.Tree.Dependencies;
+
+/// <summary>
+/// Exports the set of rules required for the dependencies tree in Visual Studio.
+/// </summary>
+/// <remarks>
+/// The dependencies tree handles this metadata a little differently to other components in the project system that export it.
+/// The dependencies tree works a little differently between VS and VS Code.
+/// <list type="bullet">
+/// <item>In VS (which loads this assembly) the dependencies tree is loaded eagerly. We want the targets referenced by these rules to be included in the first design-time build.</item>
+/// <item>In VS Code (which uses the shared layer) the tree is loaded lazily, and we don't want these targets included in the first design-time build.</item>
+/// </list>
+/// For this reason, we export the rules here in the VS-only layer, rather than in the shared layer (like other components).
+/// </remarks>
+internal static class DependenciesTreeBuildRuleRequirements
+{
+    [AppliesTo(AnalyzerDependencyFactory.AppliesTo)]
+    [ExportInitialBuildRulesSubscriptions(ResolvedAnalyzerReference.SchemaName)]
+    public static int AnalyzerReference;
+
+    [AppliesTo(AssemblyDependencyFactory.AppliesTo)]
+    [ExportInitialBuildRulesSubscriptions(ResolvedAssemblyReference.SchemaName)]
+    public static int AssemblyReference;
+
+    [AppliesTo(ComDependencyFactory.AppliesTo)]
+    [ExportInitialBuildRulesSubscriptions(ResolvedCOMReference.SchemaName)]
+    public static int ComReference;
+
+    [AppliesTo(FrameworkDependencyFactory.AppliesTo)]
+    [ExportInitialBuildRulesSubscriptions(ResolvedFrameworkReference.SchemaName)]
+    public static int FrameworkReference;
+
+    [AppliesTo(PackageDependencyFactory.AppliesTo)]
+    [ExportInitialBuildRulesSubscriptions(ResolvedPackageReference.SchemaName)]
+    public static int PackageReference;
+
+    [AppliesTo(ProjectDependencyFactory.AppliesTo)]
+    [ExportInitialBuildRulesSubscriptions(ResolvedProjectReference.SchemaName)]
+    public static int ProjectReference;
+
+    [AppliesTo(SdkDependencyFactory.AppliesTo)]
+    [ExportInitialBuildRulesSubscriptions(ResolvedSdkReference.SchemaName)]
+    public static int SdkReference;
+}

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/UpToDate/UpToDateCheckImplicitConfiguredInputDataSource.cs

@@ -16,6 +16,15 @@ namespace Microsoft.VisualStudio.ProjectSystem.VS.UpToDate
     /// <inheritdoc cref="IUpToDateCheckImplicitConfiguredInputDataSource" />
     [Export(typeof(IUpToDateCheckImplicitConfiguredInputDataSource))]
     [AppliesTo(BuildUpToDateCheck.AppliesToExpression)]
+    [ExportInitialBuildRulesSubscriptions([
+        ResolvedAnalyzerReference.SchemaName,
+        ResolvedCompilationReference.SchemaName,
+        ResolvedProjectReference.SchemaName,
+        UpToDateCheckInput.SchemaName,
+        UpToDateCheckOutput.SchemaName,
+        UpToDateCheckBuilt.SchemaName,
+        CopyToOutputDirectoryItem.SchemaName,
+        BuildAccelerationIncompatiblePackage.SchemaName])]
     internal sealed class UpToDateCheckImplicitConfiguredInputDataSource : ChainedProjectValueDataSourceBase<UpToDateCheckImplicitConfiguredInput>, IUpToDateCheckImplicitConfiguredInputDataSource
     {
         private readonly ConfiguredProject _configuredProject;

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/PackageRestore/PackageRestoreConfiguredInputDataSource.cs

@@ -12,6 +12,12 @@ namespace Microsoft.VisualStudio.ProjectSystem.PackageRestore
     /// </summary>
     [Export(typeof(IPackageRestoreConfiguredInputDataSource))]
     [AppliesTo(ProjectCapability.PackageReferences)]
+    [ExportInitialBuildRulesSubscriptions([
+        CollectedFrameworkReference.SchemaName,
+        CollectedPackageDownload.SchemaName,
+        CollectedPackageVersion.SchemaName,
+        CollectedNuGetAuditSuppressions.SchemaName,
+        CollectedPackageReference.SchemaName])]
     internal class PackageRestoreConfiguredInputDataSource : ChainedProjectValueDataSourceBase<PackageRestoreConfiguredInput>, IPackageRestoreConfiguredInputDataSource
     {
         private static readonly ImmutableHashSet<string> s_rules = Empty.OrdinalIgnoreCaseStringSet

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Tree/Dependencies/Subscriptions/MSBuildDependencies/AnalyzerDependencyFactory.cs

@@ -3,10 +3,12 @@
 namespace Microsoft.VisualStudio.ProjectSystem.Tree.Dependencies.Subscriptions.MSBuildDependencies;
 
 [Export(typeof(IMSBuildDependencyFactory))]
-// There's no "AnalyzerReferences" capability, and F# doesn't have analyzers
-[AppliesTo(ProjectCapability.DependenciesTree + " & (" + ProjectCapability.CSharp + " | " + ProjectCapability.VisualBasic + ")")]
+[AppliesTo(AppliesTo)]
 internal sealed class AnalyzerDependencyFactory : MSBuildDependencyFactoryBase
 {
+    // There's no "AnalyzerReferences" capability, and F# doesn't have analyzers
+    public const string AppliesTo = ProjectCapability.DependenciesTree + " & (" + ProjectCapability.CSharp + " | " + ProjectCapability.VisualBasic + ")";
+
     // NOTE we include ProjectTreeFlags.FileSystemEntity here so that Roslyn can correctly identify the
     // analyzer's path in order to attach child nodes to these dependency items in Solution Explorer.
     // Without this flag, CPS will remove whatever file path we pass during tree construction (for

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Tree/Dependencies/Subscriptions/MSBuildDependencies/AssemblyDependencyFactory.cs

@@ -6,9 +6,11 @@
 namespace Microsoft.VisualStudio.ProjectSystem.Tree.Dependencies.Subscriptions.MSBuildDependencies;
 
 [Export(typeof(IMSBuildDependencyFactory))]
-[AppliesTo(ProjectCapability.DependenciesTree + " & (" + ProjectCapabilities.AssemblyReferences + " | " + ProjectCapabilities.WinRTReferences + ")")]
+[AppliesTo(AppliesTo)]
 internal sealed class AssemblyDependencyFactory : MSBuildDependencyFactoryBase
 {
+    public const string AppliesTo = ProjectCapability.DependenciesTree + " & (" + ProjectCapabilities.AssemblyReferences + " | " + ProjectCapabilities.WinRTReferences + ")";
+
     private static readonly DependencyFlagCache s_flagCache = new(
         resolved: DependencyTreeFlags.AssemblyDependency + DependencyTreeFlags.SupportsBrowse,
         unresolved: DependencyTreeFlags.AssemblyDependency);

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Tree/Dependencies/Subscriptions/MSBuildDependencies/ComDependencyFactory.cs

@@ -3,9 +3,11 @@
 namespace Microsoft.VisualStudio.ProjectSystem.Tree.Dependencies.Subscriptions.MSBuildDependencies;
 
 [Export(typeof(IMSBuildDependencyFactory))]
-[AppliesTo(ProjectCapability.DependenciesTree + " & " + ProjectCapabilities.ComReferences)]
+[AppliesTo(AppliesTo)]
 internal sealed class ComDependencyFactory : MSBuildDependencyFactoryBase
 {
+    public const string AppliesTo = ProjectCapability.DependenciesTree + " & " + ProjectCapabilities.ComReferences;
+
     private static readonly DependencyFlagCache s_flagCache = new(
         resolved: DependencyTreeFlags.ComDependency + DependencyTreeFlags.SupportsBrowse,
         unresolved: DependencyTreeFlags.ComDependency);

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Tree/Dependencies/Subscriptions/MSBuildDependencies/FrameworkDependencyFactory.cs

@@ -3,9 +3,12 @@
 namespace Microsoft.VisualStudio.ProjectSystem.Tree.Dependencies.Subscriptions.MSBuildDependencies;
 
 [Export(typeof(IMSBuildDependencyFactory))]
-[AppliesTo(ProjectCapability.DependenciesTree + " & " + ProjectCapability.DotNet)] // There's no "FrameworkReferences" capability
+[AppliesTo(AppliesTo)]
 internal sealed class FrameworkDependencyFactory : MSBuildDependencyFactoryBase
 {
+    // There's no "FrameworkReferences" capability
+    public const string AppliesTo = ProjectCapability.DependenciesTree + " & " + ProjectCapability.DotNet;
+
     // Framework references were introduced in .NET Core 2.0
 
     private static readonly DependencyFlagCache s_flagCache = new(

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Tree/Dependencies/Subscriptions/MSBuildDependencies/PackageDependencyFactory.cs

@@ -5,9 +5,11 @@
 namespace Microsoft.VisualStudio.ProjectSystem.Tree.Dependencies.Subscriptions.MSBuildDependencies
 {
     [Export(typeof(IMSBuildDependencyFactory))]
-    [AppliesTo(ProjectCapability.DependenciesTree + " & " + ProjectCapabilities.PackageReferences)]
+    [AppliesTo(AppliesTo)]
     internal sealed class PackageDependencyFactory : MSBuildDependencyFactoryBase
     {
+        public const string AppliesTo = ProjectCapability.DependenciesTree + " & " + ProjectCapabilities.PackageReferences;
+
         private static readonly DependencyFlagCache s_flagCache = new(
             resolved: DependencyTreeFlags.PackageDependency + DependencyTreeFlags.SupportsFolderBrowse,
             unresolved: DependencyTreeFlags.PackageDependency);

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Tree/Dependencies/Subscriptions/MSBuildDependencies/ProjectDependencyFactory.cs

@@ -2,12 +2,12 @@
 
 namespace Microsoft.VisualStudio.ProjectSystem.Tree.Dependencies.Subscriptions.MSBuildDependencies;
 
-// TODO also filter AppliesTo to ProjectCapabilities.ProjectReferences? same for other dependency types
-
 [Export(typeof(IMSBuildDependencyFactory))]
-[AppliesTo(ProjectCapability.DependenciesTree + " & " + ProjectCapabilities.ProjectReferences)]
+[AppliesTo(AppliesTo)]
 internal sealed class ProjectDependencyFactory : MSBuildDependencyFactoryBase
 {
+    public const string AppliesTo = ProjectCapability.DependenciesTree + " & " + ProjectCapabilities.ProjectReferences;
+
     private static readonly DependencyFlagCache s_flagCache = new(
         resolved: DependencyTreeFlags.ProjectDependency + DependencyTreeFlags.SupportsBrowse,
         unresolved: DependencyTreeFlags.ProjectDependency + DependencyTreeFlags.SupportsBrowse);

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Tree/Dependencies/Subscriptions/MSBuildDependencies/SdkDependencyFactory.cs

@@ -6,9 +6,11 @@
 namespace Microsoft.VisualStudio.ProjectSystem.Tree.Dependencies.Subscriptions.MSBuildDependencies;
 
 [Export(typeof(IMSBuildDependencyFactory))]
-[AppliesTo(ProjectCapability.DependenciesTree + " & " + ProjectCapabilities.SdkReferences)]
+[AppliesTo(AppliesTo)]
 internal class SdkDependencyFactory : MSBuildDependencyFactoryBase
 {
+    public const string AppliesTo = ProjectCapability.DependenciesTree + " & " + ProjectCapabilities.SdkReferences;
+
     private static readonly DependencyFlagCache s_flagCache = new(
         resolved: DependencyTreeFlags.SdkDependency + DependencyTreeFlags.SupportsFolderBrowse,
         unresolved: DependencyTreeFlags.SdkDependency);