Include only PackageReferences included at runtime

Author: Forgind

src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs

@@ -64,7 +64,7 @@ public class GenerateDepsFile : TaskBase
 
         public ITaskItem CompilerOptions { get; set; }
 
-        public ITaskItem[] ExcludeFromPublishPackageReferences { get; set; } = Array.Empty<ITaskItem>();
+        public ITaskItem[] AllPackageReferences { get; set; } = Array.Empty<ITaskItem>();
 
         public ITaskItem[] RuntimeStorePackages { get; set; }
 
@@ -228,13 +228,21 @@ bool ShouldIncludeRuntimeAsset(ITaskItem item)
                     targetFramework: TargetFramework);
             }
 
+            Func<ITaskItem, bool> ShouldNotBeInDepsFile = taskItem =>
+            {
+                var excludedAssets = taskItem.GetMetadata("ExcludeAssets");
+                var includedAssets = taskItem.GetMetadata("IncludeAssets");
+                return excludedAssets?.Contains("runtime") == true || excludedAssets?.Contains("all") == true ||
+                    (!string.IsNullOrEmpty(includedAssets) && !includedAssets.Contains("runtime") && !includedAssets.Contains("all"));
+            };
+
             builder = builder
                 .WithMainProjectInDepsFile(IncludeMainProject)
                 .WithReferenceAssemblies(referenceAssemblyInfos)
                 .WithDirectReferences(directReferences)
                 .WithDependencyReferences(dependencyReferences)
                 .WithReferenceProjectInfos(referenceProjects)
-                .WithExcludeFromPublishAssets(PackageReferenceConverter.GetPackageIds(ExcludeFromPublishPackageReferences))
+                .WithExcludeFromPublishAssets(PackageReferenceConverter.GetPackageIds(AllPackageReferences?.Where(ShouldNotBeInDepsFile)))
                 .WithRuntimePackAssets(runtimePackAssets)
                 .WithCompilationOptions(compilationOptions)
                 .WithReferenceAssembliesPath(FrameworkReferenceResolver.GetDefaultReferenceAssembliesPath())

src/Tasks/Microsoft.NET.Build.Tasks/PackageReferenceConverter.cs

@@ -7,7 +7,7 @@ namespace Microsoft.NET.Build.Tasks
 {
     internal static class PackageReferenceConverter
     {
-        public static IEnumerable<string> GetPackageIds(ITaskItem[] packageReferences)
+        public static IEnumerable<string> GetPackageIds(IEnumerable<ITaskItem> packageReferences)
         {
             if (packageReferences == null)
             {

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets

@@ -1236,7 +1236,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                       PlatformLibraryName="$(MicrosoftNETPlatformLibrary)"
                       RuntimeFrameworks="@(RuntimeFramework)"
                       CompilerOptions="@(DependencyFileCompilerOptions)"
-                      ExcludeFromPublishPackageReferences="@(_ExcludeFromPublishPackageReference)"
+                      AllPackageReferences="@(PackageReference)"
                       RuntimeStorePackages="@(RuntimeStorePackages)"
                       CompileReferences="@(ResolvedCompileFileDefinitions)"
                       ResolvedNuGetFiles="@(_ResolvedNuGetFilesForPublish)"

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets

@@ -338,7 +338,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                       PlatformLibraryName="$(MicrosoftNETPlatformLibrary)"
                       RuntimeFrameworks="@(RuntimeFramework)"
                       CompilerOptions="@(DependencyFileCompilerOptions)"
-                      ExcludeFromPublishPackageReferences="@(_ExcludeFromPublishPackageReference)"
+                      AllPackageReferences="@(PackageReference)"
                       CompileReferences="@(ResolvedCompileFileDefinitions)"
                       ResolvedNuGetFiles="@(NativeCopyLocalItems);@(ResourceCopyLocalItems);@(RuntimeCopyLocalItems)"
                       UserRuntimeAssemblies="@(UserRuntimeAssembly)"