diff options
| author | Bob Arnson <bob@firegiant.com> | 2019-05-14 14:19:34 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2019-05-14 16:07:39 -0400 |
| commit | 44fb31d655bc5860d45e3acd4cd0cbfaaf5f12eb (patch) | |
| tree | c522b10288ceacf89ae3febc692ba92f27a6b2d7 /src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs | |
| parent | 83b04241472fdc93b0a3a7511479a1182ad5f4c0 (diff) | |
| download | wix-44fb31d655bc5860d45e3acd4cd0cbfaaf5f12eb.tar.gz wix-44fb31d655bc5860d45e3acd4cd0cbfaaf5f12eb.tar.bz2 wix-44fb31d655bc5860d45e3acd4cd0cbfaaf5f12eb.zip | |
Add Component/@Shared and fix UninstallWhenSuperseded
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs index 4b02b3aa..6f33080d 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs | |||
| @@ -232,9 +232,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 232 | attributes |= tuple.NeverOverwrite ? WindowsInstallerConstants.MsidbComponentAttributesNeverOverwrite : 0; | 232 | attributes |= tuple.NeverOverwrite ? WindowsInstallerConstants.MsidbComponentAttributesNeverOverwrite : 0; |
| 233 | attributes |= tuple.Permanent ? WindowsInstallerConstants.MsidbComponentAttributesPermanent : 0; | 233 | attributes |= tuple.Permanent ? WindowsInstallerConstants.MsidbComponentAttributesPermanent : 0; |
| 234 | attributes |= tuple.SharedDllRefCount ? WindowsInstallerConstants.MsidbComponentAttributesSharedDllRefCount : 0; | 234 | attributes |= tuple.SharedDllRefCount ? WindowsInstallerConstants.MsidbComponentAttributesSharedDllRefCount : 0; |
| 235 | attributes |= tuple.Shared ? WindowsInstallerConstants.MsidbComponentAttributesShared : 0; | ||
| 235 | attributes |= tuple.Transitive ? WindowsInstallerConstants.MsidbComponentAttributesTransitive : 0; | 236 | attributes |= tuple.Transitive ? WindowsInstallerConstants.MsidbComponentAttributesTransitive : 0; |
| 236 | attributes |= tuple.UninstallWhenSuperseded ? WindowsInstallerConstants.MsidbComponentAttributes64bit : 0; | 237 | attributes |= tuple.UninstallWhenSuperseded ? WindowsInstallerConstants.MsidbComponentAttributesUninstallOnSupersedence : 0; |
| 237 | |||
| 238 | attributes |= tuple.Win64 ? WindowsInstallerConstants.MsidbComponentAttributes64bit : 0; | 238 | attributes |= tuple.Win64 ? WindowsInstallerConstants.MsidbComponentAttributes64bit : 0; |
| 239 | 239 | ||
| 240 | var table = output.EnsureTable(this.TableDefinitions["Component"]); | 240 | var table = output.EnsureTable(this.TableDefinitions["Component"]); |
