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

Merge pull request #1063 from robmen/msi-perf

Browse source 
Improve MSI performance
This commit is contained in:
Sridhar Periyasamy 2016-01-29 08:54:35 -08:00
commit cbdd098ef6
4 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packaging/windows/checkbuildtype.wxs
View file

@ -1,11 +1,14 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?include "Variables.wxi" ?> <?include "Variables.wxi" ?>
<Fragment> <Fragment>
<Property Id="INSTALLEDCLIBUILDTYPE"> <Property Id="INSTALLEDCLIBUILDTYPE">
<RegistrySearch Id="DotnetCLI_BuildType" Type="raw" <RegistrySearch Id="DotnetCLI_BuildType" Type="raw"
Root="HKLM" Key="SOFTWARE\dotnet\Setup" Name="BuildType" Win64="$(var.Win64AttributeValue)"/> Root="HKLM" Key="SOFTWARE\dotnet\Setup" Name="BuildType" Win64="$(var.Win64AttributeValue)"/>
</Property> </Property>
<SetProperty Before="LaunchConditions" Id="EXPECTEDCLIBUILDTYPE" Value="$(var.BuildType)" />
<Condition Message="$(var.IncompatibleBuildTypeError)">
Installed OR NOT INSTALLEDCLIBUILDTYPE OR INSTALLEDCLIBUILDTYPE ~= "$(var.BuildType)"
</Condition>
</Fragment> </Fragment>
</Wix> </Wix>

10
packaging/windows/dotnet.wxs
View file

@ -6,7 +6,8 @@
<MajorUpgrade DowngradeErrorMessage="$(var.DowngradeErrorMessage)" Schedule="afterInstallInitialize"/> <MajorUpgrade DowngradeErrorMessage="$(var.DowngradeErrorMessage)" Schedule="afterInstallInitialize"/>
<MediaTemplate CompressionLevel="mszip" EmbedCab="yes"/> <MediaTemplate CompressionLevel="high" EmbedCab="yes"/>
<Feature Id="MainFeature" Title="Main Feature" Level="1"> <Feature Id="MainFeature" Title="Main Feature" Level="1">
<ComponentGroupRef Id="InstallFiles" /> <ComponentGroupRef Id="InstallFiles" />
<ComponentGroupRef Id="AuthoredRegistryKeys"/> <ComponentGroupRef Id="AuthoredRegistryKeys"/>
@ -19,6 +20,8 @@
<Property Id="ProductCPU" Value="$(var.Platform)" /> <Property Id="ProductCPU" Value="$(var.Platform)" />
<Property Id="RTM_ProductVersion" Value="$(var.Dotnet_ProductVersion)" /> <Property Id="RTM_ProductVersion" Value="$(var.Dotnet_ProductVersion)" />
<Property Id="MSIFASTINSTALL" Value="7" />
<WixVariable Id="WixUILicenseRtf" Value="$(var.MicrosoftEula)" /> <WixVariable Id="WixUILicenseRtf" Value="$(var.MicrosoftEula)" />
<Property Id="WIXUI_INSTALLDIR" Value="DOTNETHOME"/> <Property Id="WIXUI_INSTALLDIR" Value="DOTNETHOME"/>
@ -27,13 +30,10 @@
<CustomActionRef Id="WixBroadcastEnvironmentChange" /> <CustomActionRef Id="WixBroadcastEnvironmentChange" />
<PropertyRef Id="INSTALLEDCLIBUILDTYPE"/> <PropertyRef Id="INSTALLEDCLIBUILDTYPE"/>
<Condition Message="$(var.IncompatibleBuildTypeError)">
<![CDATA[NOT INSTALLEDCLIBUILDTYPE OR INSTALLEDCLIBUILDTYPE ~= EXPECTEDCLIBUILDTYPE]]>
</Condition>
</Product> </Product>
<Fragment> <Fragment>
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="$(var.Program_Files)" Name="$(var.Program_Files)"> <Directory Id="$(var.Program_Files)">
<Directory Id="DOTNETHOME" Name="dotnet"/> <Directory Id="DOTNETHOME" Name="dotnet"/>
</Directory> </Directory>
</Directory> </Directory>

8
packaging/windows/provider.wxs
View file

@ -2,10 +2,8 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension">
<?include "Variables.wxi" ?> <?include "Variables.wxi" ?>
<Fragment> <Fragment>
<DirectoryRef Id="TARGETDIR"> <Component Id="Dotnet_CLI_$(var.Dotnet_DisplayVersion)" Directory="TARGETDIR" Win64="no" Guid="3B7DF8C8-9BB9-3F4C-8CBF-E393E4D7FF43">
<Component Id="Dotnet_CLI_$(var.Dotnet_DisplayVersion)" DiskId="1" Win64="no" Guid="3B7DF8C8-9BB9-3F4C-8CBF-E393E4D7FF43"> <dep:Provides Key="Dotnet.CLI_$(var.Dotnet_DisplayVersion)" />
<dep:Provides Key="Dotnet.CLI_$(var.Dotnet_DisplayVersion)" /> </Component>
</Component>
</DirectoryRef>
</Fragment> </Fragment>
</Wix> </Wix>

6
packaging/windows/variables.wxi
View file

@ -20,10 +20,10 @@
<?define ProductEdition = "001dotnet" ?> <?define ProductEdition = "001dotnet" ?>
<?define LCID = "$(var.ProductLanguage)"?> <?define LCID = "$(var.ProductLanguage)"?>
<?define DowngradeErrorMessage = "A newer version is already installed; please uninstall it and re-run setup."?> <?define DowngradeErrorMessage = "A newer version is already installed; please uninstall it and re-run setup."?>
<?define IncompatibleBuildTypeError = "You have installed '[INSTALLEDCLIBUILDTYPE]' build of Dotnet CLI. It cannot be upgraded to a '[EXPECTEDCLIBUILDTYPE]' build of Dotnet CLI. Please uninstall it and re-run setup."?> <?define IncompatibleBuildTypeError = "You have installed '[INSTALLEDCLIBUILDTYPE]' build of Dotnet CLI. It cannot be upgraded to a '$(var.BuildType)' build of Dotnet CLI. Please uninstall it and re-run setup."?>
<?define Platform = "$(sys.BUILDARCH)" ?> <?define Platform = "$(sys.BUILDARCH)" ?>
<?if $(var.Platform)=x86?> <?if $(var.Platform)=x86?>
<?define Program_Files="ProgramFilesFolder"?> <?define Program_Files="ProgramFilesFolder"?>
<?define Win64AttributeValue=no?> <?define Win64AttributeValue=no?>
<?define UpgradeCode="70A1576F-63B6-4659-9E39-25C7B769DDE5"?> <?define UpgradeCode="70A1576F-63B6-4659-9E39-25C7B769DDE5"?>