diff options
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs index 8c11555e..b90aecd1 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs | |||
| @@ -277,7 +277,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 277 | 277 | ||
| 278 | using (Record record = new Record(1)) | 278 | using (Record record = new Record(1)) |
| 279 | { | 279 | { |
| 280 | record.SetString(1, file.File.Id.Id); | 280 | record.SetString(1, file.Id); |
| 281 | view.Execute(record); | 281 | view.Execute(record); |
| 282 | } | 282 | } |
| 283 | 283 | ||
| @@ -288,7 +288,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 288 | throw new InvalidOperationException("Failed to fetch a File row from the database that was merged in from a module."); | 288 | throw new InvalidOperationException("Failed to fetch a File row from the database that was merged in from a module."); |
| 289 | } | 289 | } |
| 290 | 290 | ||
| 291 | recordUpdate.SetInteger(1, file.File.Sequence); | 291 | recordUpdate.SetInteger(1, file.Sequence); |
| 292 | 292 | ||
| 293 | // Update the file attributes to match the compression specified | 293 | // Update the file attributes to match the compression specified |
| 294 | // on the Merge element or on the Package element. | 294 | // on the Merge element or on the Package element. |
| @@ -300,12 +300,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 300 | attributes = recordUpdate.GetInteger(2); | 300 | attributes = recordUpdate.GetInteger(2); |
| 301 | } | 301 | } |
| 302 | 302 | ||
| 303 | if ((file.File.Attributes & FileTupleAttributes.Compressed) == FileTupleAttributes.Compressed) | 303 | if (file.Compressed) |
| 304 | { | 304 | { |
| 305 | attributes |= WindowsInstallerConstants.MsidbFileAttributesCompressed; | 305 | attributes |= WindowsInstallerConstants.MsidbFileAttributesCompressed; |
| 306 | attributes &= ~WindowsInstallerConstants.MsidbFileAttributesNoncompressed; | 306 | attributes &= ~WindowsInstallerConstants.MsidbFileAttributesNoncompressed; |
| 307 | } | 307 | } |
| 308 | else if ((file.File.Attributes & FileTupleAttributes.Uncompressed) == FileTupleAttributes.Uncompressed) | 308 | else if (file.Uncompressed) |
| 309 | { | 309 | { |
| 310 | attributes |= WindowsInstallerConstants.MsidbFileAttributesNoncompressed; | 310 | attributes |= WindowsInstallerConstants.MsidbFileAttributesNoncompressed; |
| 311 | attributes &= ~WindowsInstallerConstants.MsidbFileAttributesCompressed; | 311 | attributes &= ~WindowsInstallerConstants.MsidbFileAttributesCompressed; |
