Skip to content

Commit

Permalink
Fix casing
Browse files Browse the repository at this point in the history
  • Loading branch information
forki committed Sep 20, 2014
1 parent ed81c70 commit fd2c58c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
9 changes: 6 additions & 3 deletions src/Paket/InstallProcess.fs
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ let Install(regenerate, force, hard, dependenciesFilename) =
let directPackages = extractReferencesFromListFile proj.FullName
let project = ProjectFile.Load proj.FullName

if directPackages |> Array.isEmpty |> not then verbosefn " - direct packages: %A" directPackages
let usedPackages = new HashSet<_>()
let usedSourceFiles = new HashSet<_>()

Expand All @@ -110,12 +111,12 @@ let Install(regenerate, force, hard, dependenciesFilename) =
|> Map.ofArray

let rec addPackage (name:string) =
if name.ToLower().StartsWith "file:" then
let identity = name.ToLower()
if identity.StartsWith "file:" then
let sourceFile = name.Split(':').[1]
usedSourceFiles.Add sourceFile |> ignore
else
let name = name.ToLower()
match allPackages |> Map.tryFind name with
match allPackages |> Map.tryFind identity with
| Some package ->
if usedPackages.Add name then
if not lockFile.Strict then
Expand All @@ -126,6 +127,8 @@ let Install(regenerate, force, hard, dependenciesFilename) =
directPackages
|> Array.iter addPackage

if usedPackages.Count > 0 then verbosefn " - all packages: %A" (usedPackages |> Seq.toArray)

project.UpdateReferences(extractedPackages,usedPackages,hard)

lockFile.SourceFiles
Expand Down
2 changes: 1 addition & 1 deletion src/Paket/Paket.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<StartProgram>paket.exe</StartProgram>
<StartWorkingDirectory>
</StartWorkingDirectory>
<StartWorkingDirectory>D:\code\Paket</StartWorkingDirectory>
<StartWorkingDirectory>D:\code\paket</StartWorkingDirectory>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand Down
2 changes: 1 addition & 1 deletion src/Paket/ProjectFile.fs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type private InstallInfo = {
module private InstallRules =
let groupDLLs (usedPackages : HashSet<string>) extracted projectPath =
[ for (package:ResolvedPackage), libraries in extracted do
if usedPackages.Contains(package.Name.ToLower()) then
if usedPackages.Contains(package.Name) then
let libraries = libraries |> Seq.toArray
for (lib : FileInfo) in libraries do
match FrameworkIdentifier.DetectFromPath lib.FullName with
Expand Down

0 comments on commit fd2c58c

Please sign in to comment.