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

x64 installer now creates registry keys in both x64 and Wow32 hives.

Browse source 
This is required to enable 32-bit MSIs (like VS) that need to access the
registry key on a 64-bit OS. Refer #250
This commit is contained in:
Sridhar Periyasamy 2015-11-20 18:32:58 -08:00
parent 040e7f5d84
commit 3f00cfbeb9
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
packaging/windows/registrykeys.wxs
View file

@ -3,7 +3,9 @@
<?include "Variables.wxi" ?> <?include "Variables.wxi" ?>
<Fragment> <Fragment>
<ComponentGroup Id="AuthoredRegistryKeys"> <ComponentGroup Id="AuthoredRegistryKeys">
<Component Directory="TARGETDIR" Guid="*" Win64="$(var.Win64AttributeValue)"> <!--Need this to set the reg keys for both x64 and x86 from the x64 installer-->
<?if $(var.Platform) = x64?>
<Component Id="SetupRegistry_x64" Directory="TARGETDIR" Guid="*" Win64="yes">
<RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup"> <RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup">
<RegistryValue Action="write" Name="Install" Type="integer" Value="1" KeyPath="yes"/> <RegistryValue Action="write" Name="Install" Type="integer" Value="1" KeyPath="yes"/>
<RegistryValue Action="write" Name="InstallDir" Type="string" Value="[DOTNETHOME]" /> <RegistryValue Action="write" Name="InstallDir" Type="string" Value="[DOTNETHOME]" />
@ -11,6 +13,19 @@
</RegistryKey> </RegistryKey>
<Environment Id="E_PATH" Name="PATH" Value="[DOTNETHOME]bin" Permanent="no" Part="last" Action="set" System="yes" /> <Environment Id="E_PATH" Name="PATH" Value="[DOTNETHOME]bin" Permanent="no" Part="last" Action="set" System="yes" />
<Environment Id="E_DOTNET_HOME" Name="DOTNET_HOME" Value="[DOTNETHOME]" Permanent="no" Part="all" Action="set" System="yes" /> <Environment Id="E_DOTNET_HOME" Name="DOTNET_HOME" Value="[DOTNETHOME]" Permanent="no" Part="all" Action="set" System="yes" />
</Component>
<?endif?>
<Component Id="SetupRegistry_x86" Directory="TARGETDIR" Guid="*" Win64="no">
<RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup">
<RegistryValue Action="write" Name="Install" Type="integer" Value="1" KeyPath="yes"/>
<RegistryValue Action="write" Name="InstallDir" Type="string" Value="[DOTNETHOME]" />
<RegistryValue Action="write" Name="Version" Type="string" Value="$(var.Dotnet_ProductVersion)" />
</RegistryKey>
<!--In case of x64 installer these env vars are already set above-->
<?if $(var.Platform) = x86?>
<Environment Id="E_PATH" Name="PATH" Value="[DOTNETHOME]bin" Permanent="no" Part="last" Action="set" System="yes" />
<Environment Id="E_DOTNET_HOME" Name="DOTNET_HOME" Value="[DOTNETHOME]" Permanent="no" Part="all" Action="set" System="yes" />
<?endif?>
</Component> </Component>
</ComponentGroup> </ComponentGroup>
</Fragment> </Fragment>