Merge pull request #3348 from dsplaisted/build-publish-tweaks

Unify more build and publish logic

Author: dsplaisted

src/Tasks/Common/MetadataKeys.cs

@@ -65,6 +65,7 @@ internal static class MetadataKeys
         public const string NuGetSourceType = "NuGetSourceType";
         public const string PathInPackage = "PathInPackage";
         public const string PackageDirectory = "PackageDirectory";
+        public const string Publish = "Publish";
 
         // References
         public const string ExternallyResolved = "ExternallyResolved";

src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Mocks/MockTaskItem.cs

@@ -58,10 +58,10 @@ public string GetMetadata(string metadataName)
             string metadataValue = null;
             if (_metadata.TryGetValue(metadataName, out metadataValue))
             {
-                return metadataValue;
+                return metadataValue ?? string.Empty;
             }
 
-            return null;
+            return string.Empty;
         }
 
         public void RemoveMetadata(string metadataName)

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

@@ -21,7 +21,6 @@ internal class DependencyContextBuilder
         private Dictionary<string, List<ReferenceInfo>> _compileReferences;
         private Dictionary<string, List<ResolvedFile>> _resolvedNuGetFiles;
         private Dictionary<string, SingleProjectInfo> _referenceProjectInfos;
-        private IEnumerable<string> _excludeFromPublishPackageIds;
         private Dictionary<string, List<RuntimePackAssetInfo>> _runtimePackAssets;
         private CompilationOptions _compilationOptions;
         private string _referenceAssembliesPath;
@@ -160,12 +159,6 @@ public DependencyContextBuilder WithMainProjectInDepsFile(bool includeMainProjec
             return this;
         }
 
-        public DependencyContextBuilder WithExcludeFromPublishAssets(IEnumerable<string> excludeFromPublishPackageIds)
-        {
-            _excludeFromPublishPackageIds = excludeFromPublishPackageIds;
-            return this;
-        }
-
         public DependencyContextBuilder WithRuntimePackAssets(IEnumerable<RuntimePackAssetInfo> runtimePackAssets)
         {
             _runtimePackAssets = new Dictionary<string, List<RuntimePackAssetInfo>>();
@@ -748,50 +741,6 @@ private void CalculateExcludedLibraries()
             {
                 _dependencyLibraries[packageToExcludeFromRuntime].ExcludeFromRuntime = true;
             }
-
-            if (_excludeFromPublishPackageIds != null && _excludeFromPublishPackageIds.Any())
-            {
-                //  Include transitive dependencies of all top-level dependencies which are not
-                //  excluded from publish
-
-                Dictionary<string, DependencyLibrary> includedDependencies = new Dictionary<string, DependencyLibrary>(StringComparer.OrdinalIgnoreCase);
-
-                HashSet<string> excludeFromPublishPackageIds = new HashSet<string>(_excludeFromPublishPackageIds);
-
-                Stack<string> dependenciesToWalk = new Stack<string>(
-                    _mainProjectDependencies.Except(_excludeFromPublishPackageIds, StringComparer.OrdinalIgnoreCase));
-
-                while (dependenciesToWalk.Any())
-                {
-                    var dependencyName = dependenciesToWalk.Pop();
-                    if (!includedDependencies.ContainsKey(dependencyName))
-                    {
-                        //  There may not be a library in the assets file if a referenced project has
-                        //  PrivateAssets="all" for a package reference, and there is a package in the graph
-                        //  that depends on the same packge.
-                        if (_dependencyLibraries.TryGetValue(dependencyName, out var dependencyLibrary))
-                        {
-                            includedDependencies.Add(dependencyName, dependencyLibrary);
-                            foreach (var newDependency in _libraryDependencies[dependencyName])
-                            {
-                                dependenciesToWalk.Push(newDependency.Name);
-                            }
-                        }
-                    }
-                }
-
-                foreach (var dependencyLibrary in _dependencyLibraries.Values)
-                {
-                    //  Libraries explicitly marked as exclude from publish should be excluded from
-                    //  publish even if there are other transitive dependencies to them
-                    if (!includedDependencies.ContainsKey(dependencyLibrary.Name) ||
-                        excludeFromPublishPackageIds.Contains(dependencyLibrary.Name))
-                    {
-                        dependencyLibrary.ExcludeFromCompilation = true;
-                        dependencyLibrary.ExcludeFromRuntime = true;
-                    }
-                }
-            }
         }
 
         private string GetReferenceLibraryName(ReferenceInfo reference)

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

@@ -52,7 +52,6 @@ public class GenerateDepsFile : TaskBase
         [Required]
         public bool IncludeMainProject { get; set; }
 
-
         public ITaskItem[] ReferencePaths { get; set; } = Array.Empty<ITaskItem>();
 
         public ITaskItem[] ReferenceDependencyPaths { get; set; } = Array.Empty<ITaskItem>();
@@ -61,15 +60,10 @@ public class GenerateDepsFile : TaskBase
 
         public ITaskItem[] ReferenceAssemblies { get; set; } = Array.Empty<ITaskItem>();
 
-        [Required]
-        public ITaskItem[] FilesToSkip { get; set; }
-
         public ITaskItem[] RuntimePackAssets { get; set; } = Array.Empty<ITaskItem>();
 
         public ITaskItem CompilerOptions { get; set; }
 
-        public ITaskItem[] ExcludeFromPublishPackageReferences { get; set; }
-
         public ITaskItem[] RuntimeStorePackages { get; set; }
 
         [Required]
@@ -138,8 +132,6 @@ private void WriteDepsFile(string depsFilePath)
                 ReferenceDependencyPaths,
                 ReferenceSatellitePaths);
 
-            IEnumerable<string> excludeFromPublishAssets = PackageReferenceConverter.GetPackageIds(ExcludeFromPublishPackageReferences);
-
             IEnumerable<RuntimePackAssetInfo> runtimePackAssets =
                 IsSelfContained ? RuntimePackAssets.Select(item => RuntimePackAssetInfo.FromItem(item)) : Enumerable.Empty<RuntimePackAssetInfo>();
 
@@ -159,7 +151,6 @@ private void WriteDepsFile(string depsFilePath)
                 .WithDirectReferences(directReferences)
                 .WithDependencyReferences(dependencyReferences)
                 .WithReferenceProjectInfos(referenceProjects)
-                .WithExcludeFromPublishAssets(excludeFromPublishAssets)
                 .WithRuntimePackAssets(runtimePackAssets)
                 .WithCompilationOptions(compilationOptions)
                 .WithReferenceAssembliesPath(FrameworkReferenceResolver.GetDefaultReferenceAssembliesPath())

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

@@ -176,14 +176,19 @@ public IEnumerable<LockFileTargetLibrary> GetCompileLibraries(IEnumerable<string
         }
 
         public IEnumerable<string> GetTopLevelDependencies()
+        {
+            return GetTopLevelDependencies(LockFile, LockFileTarget);
+        }
+
+        static public IEnumerable<string> GetTopLevelDependencies(LockFile lockFile, LockFileTarget lockFileTarget)
         {
             Dictionary<string, LockFileTargetLibrary> libraryLookup =
-                LockFileTarget.Libraries.ToDictionary(l => l.Name, StringComparer.OrdinalIgnoreCase);
+                lockFileTarget.Libraries.ToDictionary(l => l.Name, StringComparer.OrdinalIgnoreCase);
 
-            return LockFile
+            return lockFile
                 .ProjectFileDependencyGroups
                 .Where(dg => dg.FrameworkName == string.Empty ||
-                             dg.FrameworkName == LockFileTarget.TargetFramework.DotNetFrameworkName)
+                             dg.FrameworkName == lockFileTarget.TargetFramework.DotNetFrameworkName)
                 .SelectMany(g => g.Dependencies)
                 .Select(projectFileDependency =>
                 {