Use directory separator char to find shared files

#1410
aspnet · Mar 17, 2015 · 30ad729 · 30ad729
1 parent 2860f7c
commit 30ad729
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/Microsoft.Framework.Runtime/DependencyManagement/NuGetDependencyResolver.cs b/src/Microsoft.Framework.Runtime/DependencyManagement/NuGetDependencyResolver.cs
@@ -56,20 +56,20 @@ public LibraryDescription GetDescription(LibraryRange libraryRange, FrameworkNam
             {
                 return null;
             }
-            
+
             var package = FindCandidate(libraryRange.Name, libraryRange.VersionRange);
-            
+
             if (package != null)
             {
                 LockFileFrameworkGroup group = null;
                 IEnumerable<LibraryDependency> dependencies;
                 bool resolved = true;
-                if(package.LockFileLibrary != null)
+                if (package.LockFileLibrary != null)
                 {
                     // If we have a lock file, it MUST have an exact match for this target
                     // framework
                     group = package.LockFileLibrary.FrameworkGroups.FirstOrDefault(f => f.TargetFramework == targetFramework);
-                    if(group == null)
+                    if (group == null)
                     {
                         resolved = false;
                         dependencies = Enumerable.Empty<LibraryDependency>();
@@ -94,7 +94,7 @@ public LibraryDescription GetDescription(LibraryRange libraryRange, FrameworkNam
                     },
                     Type = "Package",
                     Dependencies = dependencies,
-                    Resolved = resolved 
+                    Resolved = resolved
                 };
             }
 
@@ -231,7 +231,7 @@ public void Initialize(IEnumerable<LibraryDescription> packages, FrameworkName t
                 }
 
                 var group = packageInfo.LockFileLibrary.FrameworkGroups.FirstOrDefault(g => g.TargetFramework == targetFramework);
-                if(group == null)
+                if (group == null)
                 {
                     continue;
                 }
@@ -318,7 +318,7 @@ public ILibraryExport GetLibraryExport(ILibraryKey target)
 
             var references = new Dictionary<string, IMetadataReference>(StringComparer.OrdinalIgnoreCase);
 
-            if(!TryPopulateMetadataReferences(description, target.TargetFramework, references))
+            if (!TryPopulateMetadataReferences(description, target.TargetFramework, references))
             {
                 return null;
             }
@@ -337,7 +337,7 @@ public ILibraryExport GetLibraryExport(ILibraryKey target)
         private bool TryPopulateMetadataReferences(PackageDescription description, FrameworkName targetFramework, IDictionary<string, IMetadataReference> paths)
         {
             var group = description.Package.LockFileLibrary.FrameworkGroups.FirstOrDefault(f => f.TargetFramework == targetFramework);
-            if(group == null)
+            if (group == null)
             {
                 return false;
             }
@@ -356,7 +356,7 @@ private IEnumerable<string> GetSharedSources(PackageDescription description, Fra
         {
             var directory = Path.Combine(description.Library.Path, "shared");
 
-            return description.Package.LockFileLibrary.Files.Where(path => path.StartsWith("shared\\"))
+            return description.Package.LockFileLibrary.Files.Where(path => path.StartsWith("shared" + Path.DirectorySeparatorChar))
                                                             .Select(path => Path.Combine(description.Library.Path, path));
         }