Skip to content

Commit

Permalink
fixes #1321
Browse files Browse the repository at this point in the history
  • Loading branch information
eiriktsarpalis committed Dec 21, 2015
1 parent 79255aa commit b07ec1a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/Paket.Core/PackageProcess.fs
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ open System.Collections.Generic
open Paket.PackageMetaData
open Chessie.ErrorHandling

let private merge buildConfig buildPlatform versionFromAssembly projectFile templateFile =
let private merge buildConfig buildPlatform versionFromAssembly specificVersions projectFile templateFile =
let withVersion =
match versionFromAssembly with
| None -> templateFile
| Some v -> templateFile |> TemplateFile.setVersion (Some v) Map.empty
| Some v -> templateFile |> TemplateFile.setVersion (Some v) specificVersions

match withVersion with
| { Contents = ProjectInfo(md, opt) } ->
Expand Down Expand Up @@ -123,7 +123,7 @@ let Pack(workingDir,dependencies : DependenciesFile, packageOutputPath, buildCon
|> Array.map (fun (projectFile,templateFile) ->
allTemplateFiles.Remove(templateFile.FileName) |> ignore

let merged = merge buildConfig buildPlatform version projectFile templateFile
let merged = merge buildConfig buildPlatform version specificVersions projectFile templateFile
Path.GetFullPath projectFile.FileName |> normalizePath,(merged,projectFile))
|> Map.ofArray

Expand All @@ -141,7 +141,7 @@ let Pack(workingDir,dependencies : DependenciesFile, packageOutputPath, buildCon

match allProjectFiles with
| [ projectFile ] ->
merge buildConfig buildPlatform version projectFile templateFile
merge buildConfig buildPlatform version specificVersions projectFile templateFile
|> optWithSymbols projectFile
| [] -> failwithf "There was no project file found for template file %s" fileName
| _ -> failwithf "There was more than one project file found for template file %s" fileName
Expand Down

0 comments on commit b07ec1a

Please sign in to comment.