Fix for: NuGet/Home#2354

NuGet · Apr 21, 2016 · 51e2f5d · 51e2f5d
1 parent 2e9de8e
commit 51e2f5d
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 1 deletion.
diff --git a/src/NuGet.Core/NuGet.Packaging/PackageFolderReader.cs b/src/NuGet.Core/NuGet.Packaging/PackageFolderReader.cs
@@ -104,12 +104,22 @@ public override IEnumerable<string> GetFiles()
         {
             var searchFolder = new DirectoryInfo(_root.FullName);
 
-            foreach (var file in searchFolder.GetFiles("*", SearchOption.AllDirectories).
+            // Enumerate root folder filtering out nupkg files
+            foreach (var file in searchFolder.GetFiles("*", SearchOption.TopDirectoryOnly).
                 Where(p => !p.FullName.EndsWith(PackagingCoreConstants.NupkgExtension, StringComparison.OrdinalIgnoreCase)))
             {
                 yield return GetRelativePath(_root, file);
             }
 
+            // Enumerate all sub folders without filtering
+            foreach (var directory in searchFolder.GetDirectories("*", SearchOption.TopDirectoryOnly))
+            {
+                foreach (var file in directory.GetFiles("*", SearchOption.AllDirectories))
+                {
+                    yield return GetRelativePath(_root, file);
+                }
+            }
+
             yield break;
         }
 

diff --git a/test/NuGet.Core.Tests/NuGet.Packaging.Test/PackageExtractorTests.cs b/test/NuGet.Core.Tests/NuGet.Packaging.Test/PackageExtractorTests.cs
@@ -66,6 +66,39 @@ public void PackageExtractor_DuplicateNupkg()
             }
         }
 
+        [Fact]
+        public async Task PackageExtractor_NupkgContent()
+        {
+            // Arrange
+            using (var root = TestFileSystemUtility.CreateRandomTestFolder())
+            {
+                var packageFileInfo = await TestPackages.GeneratePackageAsync(
+                   root,
+                   "A",
+                   "2.0.4",
+                   DateTimeOffset.UtcNow.LocalDateTime,
+                   "content/A.nupkg");
+
+                using (var packageStream = File.OpenRead(packageFileInfo.FullName))
+                {
+                    var packageExtractionContext = new PackageExtractionContext
+                    {
+                        XmlDocFileSaveMode = XmlDocFileSaveMode.None
+                    };
+
+                    // Act
+                    var packageFiles = PackageExtractor.ExtractPackage(
+                        packageStream,
+                        new PackagePathResolver(root),
+                        packageExtractionContext,
+                        CancellationToken.None);
+
+                    // Assert
+                    Assert.True(File.Exists(Path.Combine(root, "A.2.0.4", "content", "A.nupkg")));
+                }
+            }
+        }
+
         [Fact]
         public void PackageExtractor_PackageSaveModeNupkg_FolderReader()
         {