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

Merge pull request #285 from Sridhar-MS/msi-fixes

Browse source 
Change the install path, registry key path and environment component.
This commit is contained in:
Sridhar Periyasamy 2015-11-24 15:25:59 -08:00
commit 513e9f58ed
4 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packaging/windows/dotnet.wxs
View file

@ -13,7 +13,6 @@
<MediaTemplate CompressionLevel="mszip" EmbedCab="yes"/>
<Feature Id="MainFeature" Title="Main Feature" Level="1">
<ComponentGroupRef Id="InstallFiles" />
<ComponentRef Id="SetEnvVars" />
<ComponentGroupRef Id="AuthoredRegistryKeys"/>
</Feature>
<Feature Id="Provider" Absent="disallow" AllowAdvertise="no" Description="Used for Ref Counting" Display="hidden" Level="1" InstallDefault="local" Title="RefCounting" TypicalDefault="install">
@ -25,18 +24,17 @@
<Property Id="RTM_ProductVersion" Value="$(var.Dotnet_ProductVersion)" />
<!--Property Id="ARPNOMODIFY" Value="1" /-->
<WixVariable Id="WixUILicenseRtf" Value="$(var.MicrosoftEula)" />
<Property Id="WIXUI_INSTALLDIR" Value="DOTNETHOME"/>
<UIRef Id="WixUI_InstallDir" />
<CustomActionRef Id="WixBroadcastEnvironmentChange" />
</Product>
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="$(var.Program_Files)" Name="$(var.Program_Files)">
<Directory Id="ProgramFilesFolder.Microsoft" Name="Microsoft">
<Directory Id="DOTNETHOME" Name="dotnet"/>
</Directory>
<Directory Id="DOTNETHOME" Name="dotnet"/>
</Directory>
</Directory>
</Fragment>

13
packaging/windows/envvars.wxs
View file

@ -1,13 +0,0 @@
<?xml version="1.0"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension">
<?include "Variables.wxi" ?>
<Fragment>
<DirectoryRef Id="TARGETDIR">
<Component Id="SetEnvVars" Guid="{E503A496-DE1B-4646-81D4-47213B4CCFAF}">
<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" />
</Component>
</DirectoryRef>
<CustomActionRef Id="WixBroadcastEnvironmentChange" />
</Fragment>
</Wix>

8
packaging/windows/generatemsi.ps1
View file

@ -43,7 +43,7 @@ function RunHeat
Write-Host Running heat..
.\heat.exe dir `"$inputDir`" -template fragment -sreg -gg -var var.DotnetSrc -cg InstallFiles -srd -dr DOTNETHOME -out $InstallFileswsx | Out-Null
.\heat.exe dir `"$inputDir`" -template fragment -sreg -gg -var var.DotnetSrc -cg InstallFiles -srd -dr DOTNETHOME -out $InstallFileswsx | Out-Host
if($LastExitCode -ne 0)
{
@ -66,10 +66,9 @@ function RunCandle
.\candle.exe -dDotnetSrc="$inputDir" -dMicrosoftEula="$RepoRoot\packaging\osx\resources\en.lproj\eula.rtf" -dBuildVersion="$env:DOTNET_BUILD_VERSION" -arch x64 `
-ext WixDependencyExtension.dll `
"$AuthWsxRoot\dotnet.wxs" `
"$AuthWsxRoot\envvars.wxs" `
"$AuthWsxRoot\provider.wxs" `
"$AuthWsxRoot\registrykeys.wxs" `
$InstallFileswsx | Out-Null
$InstallFileswsx | Out-Host
if($LastExitCode -ne 0)
{
@ -91,11 +90,10 @@ function RunLight
.\light -ext WixUIExtension -ext WixDependencyExtension -ext WixUtilExtension `
-cultures:en-us `
dotnet.wixobj `
envvars.wixobj `
provider.wixobj `
registrykeys.wixobj `
$InstallFilesWixobj `
-out $DotnetMSIOutput | Out-Null
-out $DotnetMSIOutput | Out-Host
if($LastExitCode -ne 0)
{

29
packaging/windows/registrykeys.wxs
View file

@ -3,13 +3,30 @@
<?include "Variables.wxi" ?>
<Fragment>
<ComponentGroup Id="AuthoredRegistryKeys">
<Component Directory="TARGETDIR" Guid="*" Win64="$(var.Win64AttributeValue)">
<RegistryKey Root="HKLM" Key="SOFTWARE\Microsoft\Dotnet CLI\Setup">
<RegistryValue Action="write" Name="Install" Type="integer" Value="1" />
<RegistryValue Action="write" Name="InstallDir" Type="string" Value="[DOTNETHOME]" />
<RegistryValue Action="write" Name="Version" Type="string" Value="$(var.Dotnet_ProductVersion)" />
<!--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">
<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>
</Component>
<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" />
</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>
</ComponentGroup>
</Fragment>
</Wix>