Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed issue in bulk component creation functions where IDs where invalid #1264

Merged
merged 1 commit into from
Jun 15, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/app/FakeLib/WiXHelper.fs
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ let bulkComponentCreation fileFilter directoryInfo architecture =
|> Seq.filter fileFilter
|> Seq.map (fun file ->
{
Id = "f" + file.Name.GetHashCode().ToString().Replace("-", "")
Id = getFileId(file.FullName)
Name = file.Name
Source = file.FullName
ProcessorArchitecture = architecture
Expand All @@ -544,7 +544,7 @@ let bulkComponentCreation fileFilter directoryInfo architecture =
/// The components are embedded into the passed in root directory.
let bulkComponentCreationAsSubDir fileFilter (directoryInfo : DirectoryInfo) architecture =
{
Id = (directoryInfo.FullName.GetHashCode().ToString())
Id = getDirectoryId(directoryInfo.FullName)
Name = directoryInfo.Name
Files = []
Components = bulkComponentCreation fileFilter directoryInfo architecture
Expand Down