enumerate all package dirs

Fody · Apr 8, 2018 · d66d5ee · d66d5ee
1 parent a610dc2
commit d66d5ee
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 19 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>3.0.2</Version>
+    <Version>3.0.3</Version>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <LangVersion>latest</LangVersion>
     <NoWarn>CS1591</NoWarn>

diff --git a/Fody/AddinFinder/AddinSearchDirectories.cs b/Fody/AddinFinder/AddinSearchDirectories.cs
@@ -179,14 +179,12 @@ public void AddNugetDirectoryFromNugetConfig()
 
     public void AddNugetDirectoryFromConvention()
     {
-        var solutionPackages = Path.Combine(solutionDirectory, DirectoryEx.DirectoryActualCase(solutionDirectory, "Packages"));
-        if (!Directory.Exists(solutionPackages))
+        foreach (var solutionPackages in DirectoryEx.EnumerateDirectoriesEndsWith(solutionDirectory, "Packages"))
         {
-            log($"  Skipped SolutionDir/Packages convention '{solutionPackages}' since it doesn't exist.");
-            return;
+
+            log($"  Scanning SolutionDir/Packages convention: {solutionPackages}'.");
+            AddFiles(ScanDirectoryForPackages(solutionPackages));
         }
-        log($"  Scanning SolutionDir/Packages convention: {solutionPackages}'.");
-        AddFiles(ScanDirectoryForPackages(solutionPackages));
     }
 
     void AddFiles(IEnumerable<string> files)

diff --git a/Fody/AddinFinder/DirectoryEx.cs b/Fody/AddinFinder/DirectoryEx.cs
@@ -11,24 +11,12 @@ public static IEnumerable<string> EnumerateFilesEndsWith(string directory, strin
             .Where(_ => _.EndsWith(end, StringComparison.OrdinalIgnoreCase));
     }
 
-    public static IEnumerable<string> EnumerateFilesEndsWith(string directory, string end)
-    {
-        return Directory.EnumerateFiles(directory, "*")
-            .Where(_ => _.EndsWith(end, StringComparison.OrdinalIgnoreCase));
-    }
     public static IEnumerable<string> EnumerateDirectoriesEndsWith(string directory, string end)
     {
         return Directory.EnumerateDirectories(directory, "*")
             .Where(_ => _.EndsWith(end, StringComparison.OrdinalIgnoreCase));
     }
 
-    public static string DirectoryActualCase(string directory, string name) 
-    {
-        return Directory.EnumerateDirectories(directory, "*", SearchOption.TopDirectoryOnly)
-            .Where(_ => _.EndsWith(name, StringComparison.OrdinalIgnoreCase))
-            .FirstOrDefault();
-    }
-
     public static IEnumerable<string> EnumerateDirectoriesContains(string directory, string contains)
     {
         return Directory.EnumerateDirectories(directory)