diff options
| author | Bob Arnson <bob@firegiant.com> | 2021-09-18 19:18:17 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2021-09-18 19:18:17 -0400 |
| commit | befda7bad8a90f43d7f9ca419e91f79613e0effb (patch) | |
| tree | 17e36af44fb4bd0e58c8f39359b99650758030d6 /src/ext/Util/wixlib/UtilExtension_Platform.wxi | |
| parent | a4dc574fa13d828614058906c4e99fcb45965fe5 (diff) | |
| parent | f958aeb8eea975ef76b72e73c0e40303b3a6b0d0 (diff) | |
| download | wix-befda7bad8a90f43d7f9ca419e91f79613e0effb.tar.gz wix-befda7bad8a90f43d7f9ca419e91f79613e0effb.tar.bz2 wix-befda7bad8a90f43d7f9ca419e91f79613e0effb.zip | |
Merge branch 'ericstj-addNativeMachine' into develop
Diffstat (limited to 'src/ext/Util/wixlib/UtilExtension_Platform.wxi')
| -rw-r--r-- | src/ext/Util/wixlib/UtilExtension_Platform.wxi | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/ext/Util/wixlib/UtilExtension_Platform.wxi b/src/ext/Util/wixlib/UtilExtension_Platform.wxi index 913c01b9..ab436adc 100644 --- a/src/ext/Util/wixlib/UtilExtension_Platform.wxi +++ b/src/ext/Util/wixlib/UtilExtension_Platform.wxi | |||
| @@ -353,6 +353,18 @@ | |||
| 353 | <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" /> | 353 | <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" /> |
| 354 | </InstallUISequence> | 354 | </InstallUISequence> |
| 355 | </Fragment> | 355 | </Fragment> |
| 356 | |||
| 357 | <Fragment> | ||
| 358 | <CustomAction Id="$(var.Prefix)QueryNativeMachine$(var.Suffix)" DllEntry="WixQueryNativeMachine" Execute="firstSequence" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" /> | ||
| 359 | |||
| 360 | <InstallExecuteSequence> | ||
| 361 | <Custom Action="$(var.Prefix)QueryNativeMachine$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" /> | ||
| 362 | </InstallExecuteSequence> | ||
| 363 | |||
| 364 | <InstallUISequence> | ||
| 365 | <Custom Action="$(var.Prefix)QueryNativeMachine$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" /> | ||
| 366 | </InstallUISequence> | ||
| 367 | </Fragment> | ||
| 356 | 368 | ||
| 357 | <Fragment> | 369 | <Fragment> |
| 358 | <Binary Id="$(var.Prefix)UtilCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))utilca.dll" /> | 370 | <Binary Id="$(var.Prefix)UtilCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))utilca.dll" /> |