Remove PackageSpec.Dependencies (#6830)

Author: nkolev92

src/NuGet.Core/NuGet.Build.Tasks.Pack/PackTaskLogic.cs

@@ -924,10 +924,7 @@ private void InitializePackageDependencies(
                     continue;
                 }
 
-                // First, add each of the generic package dependencies
-                AddDependencies(assetsFile.PackageSpec.Dependencies, dependenciesByFramework, framework, assetsFile, packageSpecificNoWarnProperties);
-
-                // Next, the framework-specific dependencies
+                // First, the framework-specific dependencies
                 var newFrameworkDependencies = AddDependencies(framework.Dependencies, dependenciesByFramework, framework, assetsFile, packageSpecificNoWarnProperties);
                 framework = new TargetFrameworkInformation(framework) { Dependencies = newFrameworkDependencies };
 

src/NuGet.Core/NuGet.Commands/RestoreCommand/Diagnostics/UnexpectedDependencyMessages.cs

@@ -315,18 +315,8 @@ private static bool IsNonFloatingPackageDependency(this LibraryDependency depend
         private static string[] GetDependencyTargetGraphs(PackageSpec spec, LibraryDependency dependency)
         {
             var infos = new List<TargetFrameworkInformation>();
-
-            if (spec.Dependencies.Contains(dependency))
-            {
-                // If the dependency is top level add it for all tfms
-                infos.AddRange(spec.TargetFrameworks);
-            }
-            else
-            {
-                // Add all tfms where the dependency is found
-                infos.AddRange(spec.TargetFrameworks.Where(e => e.Dependencies.Contains(dependency)));
-            }
-
+            // Add all tfms where the dependency is found
+            infos.AddRange(spec.TargetFrameworks.Where(e => e.Dependencies.Contains(dependency)));
             // Convert framework to target graph name.
             return infos.Select(e => e.FrameworkName.ToString()).ToArray();
         }

src/NuGet.Core/NuGet.Commands/RestoreCommand/LockFileBuilder.cs

@@ -393,13 +393,6 @@ private static string GetFallbackFrameworkString(NuGetFramework framework)
 
         private static void AddProjectFileDependenciesForSpec(PackageSpec project, LockFile lockFile)
         {
-            // Use empty string as the key of dependencies shared by all frameworks
-            lockFile.ProjectFileDependencyGroups.Add(new ProjectFileDependencyGroup(
-                string.Empty,
-                project.Dependencies
-                    .Select(group => group.LibraryRange.ToLockFileDependencyGroupString())
-                    .OrderBy(group => group, StringComparer.Ordinal)));
-
             foreach (var frameworkInfo in project.TargetFrameworks
                 .OrderBy(framework => framework.FrameworkName.ToString(),
                     StringComparer.Ordinal))
@@ -421,7 +414,6 @@ private static void AddProjectFileDependenciesForPackageReference(PackageSpec pr
                     StringComparer.Ordinal))
             {
                 var dependencies = new List<LibraryRange>();
-                dependencies.AddRange(project.Dependencies.Select(e => e.LibraryRange));
                 dependencies.AddRange(frameworkInfo.Dependencies.Select(e => e.LibraryRange));
 
                 var targetGraph = targetGraphs.SingleOrDefault(graph =>

src/NuGet.Core/NuGet.Commands/RestoreCommand/Logging/PackageSpecificWarningProperties.cs

@@ -33,14 +33,6 @@ public static PackageSpecificWarningProperties CreatePackageSpecificWarningPrope
             // NuGetLogCode -> LibraryId -> Set of Frameworks.
             var warningProperties = new PackageSpecificWarningProperties();
 
-            foreach (var dependency in packageSpec.Dependencies)
-            {
-                foreach (var framework in packageSpec.TargetFrameworks)
-                {
-                    warningProperties.AddRangeOfCodes(dependency.NoWarn, dependency.Name, framework.FrameworkName);
-                }
-            }
-
             foreach (var framework in packageSpec.TargetFrameworks)
             {
                 foreach (var dependency in framework.Dependencies)
@@ -64,11 +56,6 @@ public static PackageSpecificWarningProperties CreatePackageSpecificWarningPrope
             // NuGetLogCode -> LibraryId -> Set of Frameworks.
             var warningProperties = new PackageSpecificWarningProperties();
 
-            foreach (var dependency in packageSpec.Dependencies)
-            {
-                warningProperties.AddRangeOfCodes(dependency.NoWarn, dependency.Name, framework);
-            }
-
             var targetFrameworkInformation = packageSpec.GetTargetFramework(framework);
 
             foreach (var dependency in targetFrameworkInformation.Dependencies)

src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/IncludeFlagUtils.cs

@@ -38,18 +38,11 @@ internal static Dictionary<string, LibraryIncludeFlags> FlattenDependencyTypes(
             FlattenDependencyTypesUnified(targetGraph, result);
 
             // Override flags for direct dependencies
-            var directDependencies = spec.Dependencies.ToList();
-
-            // Add dependencies defined under the framework node
             var specFramework = spec.GetTargetFramework(targetGraph.Framework);
-            if (specFramework?.Dependencies != null)
-            {
-                directDependencies.AddRange(specFramework.Dependencies);
-            }
 
             // Override the flags for direct dependencies. This lets the
             // user take control when needed.
-            foreach (var dependency in directDependencies)
+            foreach (var dependency in specFramework?.Dependencies)
             {
                 LibraryIncludeFlags includeType = IsDependencyPruned(dependency, specFramework?.PackagesToPrune) ?
                     LibraryIncludeFlags.None :

src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/MSBuildRestoreUtility.cs

@@ -632,8 +632,7 @@ private static bool AddDependencyIfNotExist(PackageSpec spec, string targetAlias
             var frameworkInfo = spec.TargetFrameworks[index];
             var dependencies = frameworkInfo.Dependencies;
 
-            if (!spec.Dependencies
-                            .Concat(dependencies)
+            if (!dependencies
                             .Select(d => d.Name)
                             .Contains(dependency.Name, StringComparer.OrdinalIgnoreCase))
             {

src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/SpecValidationUtility.cs

@@ -315,7 +315,7 @@ private static void ValidateProjectSpecOther(PackageSpec spec, IEnumerable<strin
                 var message = string.Format(
                     CultureInfo.CurrentCulture,
                     Strings.PropertyNotAllowed,
-                    nameof(spec.Dependencies));
+                    "dependencies");
 
                 throw RestoreSpecException.Create(message, files);
             }
@@ -409,8 +409,7 @@ private static void ValidateProjectMSBuildMetadata(PackageSpec spec, IEnumerable
 
         private static IEnumerable<LibraryDependency> GetAllDependencies(PackageSpec spec)
         {
-            return spec.Dependencies
-                .Concat(spec.TargetFrameworks.SelectMany(f => f.Dependencies));
+            return spec.TargetFrameworks.SelectMany(f => f.Dependencies);
         }
     }
 }

src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/ToolRestoreUtility.cs

@@ -29,7 +29,6 @@ public static PackageSpec GetSpec(string projectFilePath, string id, VersionRang
             {
                 Name = name, // make sure this package never collides with a dependency
                 FilePath = projectFilePath,
-                Dependencies = new List<LibraryDependency>(),
                 TargetFrameworks =
                 {
                     new TargetFrameworkInformation
@@ -161,7 +160,7 @@ public static LibraryDependency GetToolDependencyOrNullFromSpec(PackageSpec spec
                 return null;
             }
 
-            return spec.Dependencies.Concat(spec.TargetFrameworks.SelectMany(e => e.Dependencies)).SingleOrDefault();
+            return spec.TargetFrameworks.SelectMany(e => e.Dependencies).SingleOrDefault();
         }
 
         public static LockFileTargetLibrary GetToolTargetLibrary(LockFile toolLockFile, string toolId)

src/NuGet.Core/NuGet.Commands/Utility/Extensions.cs

@@ -19,16 +19,14 @@ internal static class Extensions
         public static ISet<LibraryDependency> GetAllPackageDependencies(this PackageSpec project)
         {
             // Remove non-package dependencies such as framework assembly references.
-            return new HashSet<LibraryDependency>(
-                project.Dependencies.Concat(project.TargetFrameworks.SelectMany(e => e.Dependencies))
+            return new HashSet<LibraryDependency>(project.TargetFrameworks.SelectMany(e => e.Dependencies)
                                     .Where(e => e.LibraryRange.TypeConstraintAllows(LibraryDependencyTarget.Package)));
         }
 
         public static ISet<LibraryDependency> GetPackageDependenciesForFramework(this PackageSpec project, NuGetFramework framework)
         {
             // Remove non-package dependencies such as framework assembly references.
-            return new HashSet<LibraryDependency>(
-                project.Dependencies.Concat(project.GetTargetFramework(framework).Dependencies)
+            return new HashSet<LibraryDependency>(project.GetTargetFramework(framework).Dependencies
                                     .Where(e => e.LibraryRange.TypeConstraintAllows(LibraryDependencyTarget.Package)));
         }
 

src/NuGet.Core/NuGet.ProjectModel/GlobalSuppressions.cs

@@ -57,7 +57,6 @@
 [assembly: SuppressMessage("Build", "CA2227:Change 'ToolsAssemblies' to be read-only by removing the property setter.", Justification = "<Pending>", Scope = "member", Target = "~P:NuGet.ProjectModel.LockFileTargetLibrary.ToolsAssemblies")]
 [assembly: SuppressMessage("Build", "CA2227:Change 'Targets' to be read-only by removing the property setter.", Justification = "<Pending>", Scope = "member", Target = "~P:NuGet.ProjectModel.PackagesLockFile.Targets")]
 [assembly: SuppressMessage("Build", "CA2227:Change 'Dependencies' to be read-only by removing the property setter.", Justification = "<Pending>", Scope = "member", Target = "~P:NuGet.ProjectModel.PackagesLockFileTarget.Dependencies")]
-[assembly: SuppressMessage("Build", "CA2227:Change 'Dependencies' to be read-only by removing the property setter.", Justification = "<Pending>", Scope = "member", Target = "~P:NuGet.ProjectModel.PackageSpec.Dependencies")]
 [assembly: SuppressMessage("Build", "CA2227:Change 'ConfigFilePaths' to be read-only by removing the property setter.", Justification = "<Pending>", Scope = "member", Target = "~P:NuGet.ProjectModel.ProjectRestoreMetadata.ConfigFilePaths")]
 [assembly: SuppressMessage("Build", "CA2227:Change 'FallbackFolders' to be read-only by removing the property setter.", Justification = "<Pending>", Scope = "member", Target = "~P:NuGet.ProjectModel.ProjectRestoreMetadata.FallbackFolders")]
 [assembly: SuppressMessage("Build", "CA2227:Change 'Files' to be read-only by removing the property setter.", Justification = "<Pending>", Scope = "member", Target = "~P:NuGet.ProjectModel.ProjectRestoreMetadata.Files")]