mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Ensure we reference WIX_NATIVE_MACHINE property

Browse source
This commit is contained in:
Eric StJohn 2021-10-06 07:06:48 -07:00
parent 95a8272668
commit 9230a610cc
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs
View file

@ -18,9 +18,10 @@
<?endif?> <?endif?>
<Fragment> <Fragment>
<!-- Identify when installing in emulation as when WIX_NATIVE_MACHINE does not match the installer <!-- Identify when installing in emulation as when WIX_NATIVE_MACHINE does not match the installer
native machine (where supported). Also detect running under WOW on x86 using VersionNT64, native machine (where supported). Also detect running under WOW on x86 using VersionNT64,
since WIX_NATIVE_MACHINE cannot be retrieved on older Windows builds. --> since WIX_NATIVE_MACHINE cannot be retrieved on older Windows builds. -->
<PropertyRef Id="WIX_NATIVE_MACHINE" />
<SetProperty Action="Set_NON_NATIVE_ARCHITECTURE" Id="NON_NATIVE_ARCHITECTURE" Value="true" Before="CostFinalize"> <SetProperty Action="Set_NON_NATIVE_ARCHITECTURE" Id="NON_NATIVE_ARCHITECTURE" Value="true" Before="CostFinalize">
<?if $(var.Platform)~=x86?> <?if $(var.Platform)~=x86?>
VersionNT64 OR VersionNT64 OR