Implement code review feedback

1. Simplify the new unit test a little bit.
2. Include all items in the located projectFileDependencyGroup whether or not they have a version number. It's not entirely clear why we were dropping items without a version number; the most likely explanation is that we expected all valid items to have a version number and wanted to exclude the "invalid" ones. Whatever the reason, we should include all of them.

2 files changed, 7 insertions, 8 deletions

diff --git a/src/Microsoft.NuGet.Build.Tasks.Tests/ReferenceResolutionTests.cs b/src/Microsoft.NuGet.Build.Tasks.Tests/ReferenceResolutionTests.cs
index c227d89..828a72b 100644
--- a/src/Microsoft.NuGet.Build.Tasks.Tests/ReferenceResolutionTests.cs
+++ b/src/Microsoft.NuGet.Build.Tasks.Tests/ReferenceResolutionTests.cs
@@ -397,17 +397,15 @@ namespace Microsoft.NuGet.Build.Tasks.Tests
                 runtimeIdentifier: "win",
                 allowFallbackOnTargetSelection: true);
 
-            AssertHelpers.AssertCountOf(1, resultFor45.ReferencedPackages);
-
             var packageNames = resultFor45.ReferencedPackages.Select(t => t.ItemSpec);
 
-            Assert.Contains("Newtonsoft.Json", packageNames);
+            Assert.Equal("Newtonsoft.Json", packageNames.Single());
 
             var resultFor46 = NuGetTestHelpers.ResolvePackagesWithJsonFileContents(
                 Json.Json.MultipleProjectFileDependencyGroups,
                 targetMoniker: ".NETFramework,Version=v4.6",
                 runtimeIdentifier: "win",
-                allowFallbackOnTargetSelection:true);
+                allowFallbackOnTargetSelection: true);
 
             AssertHelpers.AssertCountOf(1, resultFor46.ReferencedPackages);
 
diff --git a/src/Microsoft.NuGet.Build.Tasks/ResolveNuGetPackageAssets.cs b/src/Microsoft.NuGet.Build.Tasks/ResolveNuGetPackageAssets.cs
index 38ea6fa..de16d88 100644
--- a/src/Microsoft.NuGet.Build.Tasks/ResolveNuGetPackageAssets.cs
+++ b/src/Microsoft.NuGet.Build.Tasks/ResolveNuGetPackageAssets.cs
@@ -905,12 +905,13 @@ namespace Microsoft.NuGet.Build.Tasks
         {
             foreach (var packageDependency in packageDependencies.Select(v => (string)v))
             {
+                // Strip the version, if any, from the dependency.
                 int firstSpace = packageDependency.IndexOf(' ');
+                string packageName = firstSpace > -1
+                    ? packageDependency.Substring(0, firstSpace)
+                    : packageDependency;
 
-                if (firstSpace > -1)
-                {
-                    _referencedPackages.Add(new TaskItem(packageDependency.Substring(0, firstSpace)));
-                }
+                _referencedPackages.Add(new TaskItem(packageName));
             }
         }