Follow up with feedback and avoid extra work when there is only one t…

…arget
dotnet · Apr 26, 2017 · 6ca35d0 · 6ca35d0
1 parent 5d38fa9
commit 6ca35d0
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs
@@ -236,7 +236,7 @@ private void AddDependenciesToTheWorld(Dictionary<string, ItemMetadata> items,
 
                 var currentPackageUniqueId = $"{parentTargetId}/{currentItemId}";
                 // add current package to dependencies world
-                var currentItem = items[currentItemId].Clone();
+                var currentItem = GetItem(items, currentItemId);
                 DependenciesWorld[currentPackageUniqueId] = currentItem;
 
                 // update parent
@@ -255,11 +255,11 @@ private void AddDependenciesToTheWorld(Dictionary<string, ItemMetadata> items,
                     // Update parent's Dependencies count and make sure parent is in the dependencies world
                     if (!string.IsNullOrEmpty(parentPackageId))
                     {
-                        parentDependency = Packages[parentPackageId].Clone();
+                        parentDependency = GetItem(Packages, parentPackageId);
                     }
                     else
                     {
-                        parentDependency = Targets[parentTargetId].Clone();
+                        parentDependency = GetItem(Targets, parentTargetId);
                         currentItem.IsTopLevelDependency = true;
                     }
 
@@ -269,6 +269,11 @@ private void AddDependenciesToTheWorld(Dictionary<string, ItemMetadata> items,
             }
         }
 
+        private ItemMetadata GetItem(Dictionary<string, ItemMetadata> items, string id)
+        {
+            return Targets.Count > 1 ? items[id].Clone() : items[id];
+        }
+
         private abstract class ItemMetadata
         {
             public ItemMetadata(DependencyType type, IList<string> dependencies = null, bool isTopLevelDependency = false)