diff options
Diffstat (limited to 'src/wixlib/DependencyExtension_Platform.wxi')
| -rw-r--r-- | src/wixlib/DependencyExtension_Platform.wxi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wixlib/DependencyExtension_Platform.wxi b/src/wixlib/DependencyExtension_Platform.wxi index d06b0055..7cd7ad96 100644 --- a/src/wixlib/DependencyExtension_Platform.wxi +++ b/src/wixlib/DependencyExtension_Platform.wxi | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 5 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 6 | <?include caSuffix.wxi ?> | 6 | <?include caSuffix.wxi ?> |
| 7 | <Fragment> | 7 | <Fragment> |
| 8 | <CustomAction Id="WixDependencyRequire$(var.Suffix)" BinaryKey="WixDepCA$(var.Suffix)" DllEntry="WixDependencyRequire" Execute="immediate" Return="check" SuppressModularization="yes"/> | 8 | <CustomAction Id="WixDependencyRequire$(var.Suffix)" BinaryKey="DependencyCA$(var.Suffix)" DllEntry="WixDependencyRequire" Execute="immediate" Return="check" SuppressModularization="yes"/> |
| 9 | <InstallExecuteSequence> | 9 | <InstallExecuteSequence> |
| 10 | <Custom Action="WixDependencyRequire$(var.Suffix)" Before="WixDependencyCheck$(var.Suffix)" Overridable="yes"><![CDATA[NOT DISABLEDEPENDENCYCHECK]]></Custom> | 10 | <Custom Action="WixDependencyRequire$(var.Suffix)" Before="WixDependencyCheck$(var.Suffix)" Overridable="yes"><![CDATA[NOT DISABLEDEPENDENCYCHECK]]></Custom> |
| 11 | </InstallExecuteSequence> | 11 | </InstallExecuteSequence> |
| @@ -13,7 +13,7 @@ | |||
| 13 | <PropertyRef Id="DISABLEDEPENDENCYCHECK"/> | 13 | <PropertyRef Id="DISABLEDEPENDENCYCHECK"/> |
| 14 | </Fragment> | 14 | </Fragment> |
| 15 | <Fragment> | 15 | <Fragment> |
| 16 | <CustomAction Id="WixDependencyCheck$(var.Suffix)" BinaryKey="WixDepCA$(var.Suffix)" DllEntry="WixDependencyCheck" Execute="immediate" Return="check" SuppressModularization="yes"/> | 16 | <CustomAction Id="WixDependencyCheck$(var.Suffix)" BinaryKey="DependencyCA$(var.Suffix)" DllEntry="WixDependencyCheck" Execute="immediate" Return="check" SuppressModularization="yes"/> |
| 17 | <InstallExecuteSequence> | 17 | <InstallExecuteSequence> |
| 18 | <Custom Action="WixDependencyCheck$(var.Suffix)" Before="InstallInitialize" Overridable="yes"><![CDATA[(REMOVE OR MsiPatchRemovalList) AND NOT (UPGRADINGPRODUCTCODE OR IGNOREDEPENDENCIES="ALL")]]></Custom> | 18 | <Custom Action="WixDependencyCheck$(var.Suffix)" Before="InstallInitialize" Overridable="yes"><![CDATA[(REMOVE OR MsiPatchRemovalList) AND NOT (UPGRADINGPRODUCTCODE OR IGNOREDEPENDENCIES="ALL")]]></Custom> |
| 19 | </InstallExecuteSequence> | 19 | </InstallExecuteSequence> |
| @@ -21,6 +21,6 @@ | |||
| 21 | <PropertyRef Id="IGNOREDEPENDENCIES"/> | 21 | <PropertyRef Id="IGNOREDEPENDENCIES"/> |
| 22 | </Fragment> | 22 | </Fragment> |
| 23 | <Fragment> | 23 | <Fragment> |
| 24 | <Binary Id="WixDepCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))wixdepca.dll"/> | 24 | <Binary Id="DependencyCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))dependencyca.dll"/> |
| 25 | </Fragment> | 25 | </Fragment> |
| 26 | </Include> | 26 | </Include> |