ResolvePackageDependencies only when EmitLegacyAssetsFileItem is true

Removing all the conditions that depend on EmitLegacyAssetsFileItems
since there is case when this variable is false.

Author: ocalles

src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageDependenciesTask.cs

@@ -21,9 +21,9 @@ public class GivenAResolvePackageDependenciesTask
 
         [Theory]
         [MemberData(nameof(ItemCounts))]
-        public void ItRaisesLockFileToMSBuildItems(string projectName, int[] counts, bool emitLegacyAssetsFileItems)
+        public void ItRaisesLockFileToMSBuildItems(string projectName, int[] counts)
         {
-            var task = GetExecutedTaskFromPrefix(projectName, out _, emitLegacyAssetsFileItems);
+            var task = GetExecutedTaskFromPrefix(projectName, out _);
 
             task.PackageDefinitions .Count().Should().Be(counts[0]);
             task.FileDefinitions    .Count().Should().Be(counts[1]);
@@ -40,36 +40,16 @@ public static IEnumerable<object[]> ItemCounts
                 {
                     new object[] {
                         "dotnet.new",
-                        new int[] { 110, 2536, 1, 846, 73 },
-                        true
-                    },
-                    new object[] {
-                        "dotnet.new",
-                        new int[] { 110, 0, 0, 846, 0 },
-                        false
-                    },
-                    new object[] {
-                        "simple.dependencies",
-                        new int[] { 113, 2613, 1, 878, 94 },
-                        true
+                        new int[] { 110, 2536, 1, 845, 75 },
                     },
                     new object[] {
                         "simple.dependencies",
-                        new int[] { 113, 0, 0, 878, 0 },
-                        false
+                        new int[] { 113, 2613, 1, 877, 96 },
                     },
                 };
             }
         }
 
-        [Fact]
-        public void ItOmitsLegacyItemsByDefault()
-        {
-            var task = new ResolvePackageDependencies();
-
-            task.EmitLegacyAssetsFileItems.Should().Be(false);
-        }
-
         [Theory]
         [InlineData("dotnet.new")]
         [InlineData("simple.dependencies")]
@@ -584,8 +564,7 @@ public void ItAddsAnalyzerMetadataAndFileDependencies()
             {
                 ProjectAssetsFile = lockFile.Path,
                 ProjectPath = null,
-                ProjectLanguage = projectLanguage, // set language
-                EmitLegacyAssetsFileItems = true
+                ProjectLanguage = projectLanguage // set language
             };
             task.Execute().Should().BeTrue();
 
@@ -669,8 +648,7 @@ public void ItFiltersAnalyzersByProjectLanguage()
             {
                 ProjectAssetsFile = lockFile.Path,
                 ProjectPath = null,
-                ProjectLanguage = projectLanguage, // set language
-                EmitLegacyAssetsFileItems = true
+                ProjectLanguage = projectLanguage // set language
             };
             task.Execute().Should().BeTrue();
 
@@ -839,19 +817,19 @@ public void ItDoesNotThrowOnCrossTargetingWithTargetPlatforms()
             GetExecutedTaskFromContents(lockFileContent, out _); // Task should not fail on matching framework names
         }
 
-        private static ResolvePackageDependencies GetExecutedTaskFromPrefix(string lockFilePrefix, out LockFile lockFile, bool emitLegacyAssetsFileItems = true, string target = null)
+        private static ResolvePackageDependencies GetExecutedTaskFromPrefix(string lockFilePrefix, out LockFile lockFile, string target = null)
         {
             lockFile = TestLockFiles.GetLockFile(lockFilePrefix);
-            return GetExecutedTask(lockFile, emitLegacyAssetsFileItems, target);
+            return GetExecutedTask(lockFile, target);
         }
 
-        private static ResolvePackageDependencies GetExecutedTaskFromContents(string lockFileContents, out LockFile lockFile, bool emitLegacyAssetsFileItems = true, string target = null)
+        private static ResolvePackageDependencies GetExecutedTaskFromContents(string lockFileContents, out LockFile lockFile, string target = null)
         {
             lockFile = TestLockFiles.CreateLockFile(lockFileContents);
-            return GetExecutedTask(lockFile, emitLegacyAssetsFileItems, target);
+            return GetExecutedTask(lockFile, target);
         }
 
-        private static ResolvePackageDependencies GetExecutedTask(LockFile lockFile, bool emitLegacyAssetsFileItems, string target)
+        private static ResolvePackageDependencies GetExecutedTask(LockFile lockFile, string target)
         {
             var resolver = new MockPackageResolver(_packageRoot);
 
@@ -860,7 +838,6 @@ private static ResolvePackageDependencies GetExecutedTask(LockFile lockFile, boo
                 ProjectAssetsFile = lockFile.Path,
                 ProjectPath = _projectPath,
                 ProjectLanguage = null,
-                EmitLegacyAssetsFileItems = emitLegacyAssetsFileItems,
                 TargetFramework = target
             };
 

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

@@ -18,9 +18,6 @@ namespace Microsoft.NET.Build.Tasks
     /// </summary>
     public sealed class ResolvePackageDependencies : TaskBase
     {
-        /// <summary>
-        /// Only used if <see cref="EmitLegacyAssetsFileItems"/> is <see langword="true"/>.
-        /// </summary>
         private readonly Dictionary<string, string> _fileTypes = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
         private HashSet<string> _projectFileDependencies;
@@ -37,7 +34,6 @@ public sealed class ResolvePackageDependencies : TaskBase
 
         /// <summary>
         /// All the targets in the lock file.
-        /// Only populated if <see cref="EmitLegacyAssetsFileItems"/> is <see langword="true"/>.
         /// </summary>
         [Output]
         public ITaskItem[] TargetDefinitions
@@ -56,7 +52,6 @@ public ITaskItem[] PackageDefinitions
 
         /// <summary>
         /// All the files in the lock file.
-        /// Only populated if <see cref="EmitLegacyAssetsFileItems"/> is <see langword="true"/>.
         /// </summary>
         [Output]
         public ITaskItem[] FileDefinitions
@@ -77,7 +72,6 @@ public ITaskItem[] PackageDependencies
         /// <summary>
         /// All the dependencies between files and packages, labeled by the group containing
         /// the file (e.g. CompileTimeAssembly, RuntimeAssembly, etc.).
-        /// Only populated if <see cref="EmitLegacyAssetsFileItems"/> is <see langword="true"/>.
         /// </summary>
         [Output]
         public ITaskItem[] FileDependencies
@@ -114,12 +108,6 @@ public string ProjectLanguage
             get; set;
         }
 
-        /// <summary>
-        /// Setting this property restores pre-16.7 behaviour of populating <see cref="TargetDefinitions"/>,
-        /// <see cref="FileDefinitions"/> and <see cref="FileDependencies"/> outputs.
-        /// </summary>
-        public bool EmitLegacyAssetsFileItems { get; set; } = false;
-
         public string TargetFramework { get; set; }
 
         #endregion
@@ -195,11 +183,6 @@ private void GetPackageAndFileDefinitions()
 
                 _packageDefinitions.Add(item);
 
-                if (!EmitLegacyAssetsFileItems)
-                {
-                    continue;
-                }
-
                 foreach (var file in package.Files)
                 {
                     if (NuGetUtils.IsPlaceholderFile(file))
@@ -276,18 +259,15 @@ private void RaiseLockFileTargets()
         {
             foreach (var target in LockFile.Targets)
             {
-                if (EmitLegacyAssetsFileItems)
-                {
-                    TaskItem item = new TaskItem(target.Name);
-                    item.SetMetadata(MetadataKeys.RuntimeIdentifier, target.RuntimeIdentifier ?? string.Empty);
-                    item.SetMetadata(MetadataKeys.TargetFramework, TargetFramework);
-                    item.SetMetadata(MetadataKeys.TargetFrameworkMoniker, target.TargetFramework.DotNetFrameworkName);
-                    item.SetMetadata(MetadataKeys.FrameworkName, target.TargetFramework.Framework);
-                    item.SetMetadata(MetadataKeys.FrameworkVersion, target.TargetFramework.Version.ToString());
-                    item.SetMetadata(MetadataKeys.Type, "target");
-
-                    _targetDefinitions.Add(item);
-                }
+                TaskItem item = new TaskItem(target.Name);
+                item.SetMetadata(MetadataKeys.RuntimeIdentifier, target.RuntimeIdentifier ?? string.Empty);
+                item.SetMetadata(MetadataKeys.TargetFramework, TargetFramework);
+                item.SetMetadata(MetadataKeys.TargetFrameworkMoniker, target.TargetFramework.DotNetFrameworkName);
+                item.SetMetadata(MetadataKeys.FrameworkName, target.TargetFramework.Framework);
+                item.SetMetadata(MetadataKeys.FrameworkVersion, target.TargetFramework.Version.ToString());
+                item.SetMetadata(MetadataKeys.Type, "target");
+
+                _targetDefinitions.Add(item);
 
                 // raise each library in the target
                 GetPackageAndFileDependencies(target);
@@ -323,11 +303,8 @@ private void GetPackageAndFileDependencies(LockFileTarget target)
                 // get sub package dependencies
                 GetPackageDependencies(package, target.Name, resolvedPackageVersions, transitiveProjectRefs);
 
-                if (EmitLegacyAssetsFileItems)
-                {
-                    // get file dependencies on this package
-                    GetFileDependencies(package, target.Name);
-                }
+                // get file dependencies on this package
+                GetFileDependencies(package, target.Name);
             }
         }
 
@@ -375,7 +352,7 @@ private void GetFileDependencies(LockFileTargetLibrary package, string targetNam
                     string filePath = entry.Item1;
                     IDictionary<string, string> properties = entry.Item2;
 
-                    if (NuGetUtils.IsPlaceholderFile(filePath) || !EmitLegacyAssetsFileItems)
+                    if (NuGetUtils.IsPlaceholderFile(filePath))
                     {
                         continue;
                     }

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

@@ -196,14 +196,12 @@ Copyright (c) .NET Foundation. All rights reserved.
       ProjectPath="$(MSBuildProjectFullPath)"
       ProjectAssetsFile="$(ProjectAssetsFile)"
       ProjectLanguage="$(Language)"
-      EmitLegacyAssetsFileItems="$(EmitLegacyAssetsFileItems)"
       TargetFramework="$(TargetFramework)"
-      ContinueOnError="ErrorAndContinue">
+      ContinueOnError="ErrorAndContinue"
+      Condition="'$(EmitLegacyAssetsFileItems)' == 'true'">
 
       <Output TaskParameter="PackageDefinitions" ItemName="PackageDefinitions" />
       <Output TaskParameter="PackageDependencies" ItemName="PackageDependencies" />
-
-      <!-- These outputs only produced when EmitLegacyAssetsFileItems is true -->
       <Output TaskParameter="TargetDefinitions" ItemName="TargetDefinitions" />
       <Output TaskParameter="FileDefinitions" ItemName="FileDefinitions" />
       <Output TaskParameter="FileDependencies" ItemName="FileDependencies" />