huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4165 from aspnet/joeloff/SharedInstall 

#3697 - override default install location
This commit is contained in:
Jacques Eloff 2018-11-20 13:41:08 -08:00 committed by GitHub
parent 1d9b77e255 07c3931758
commit 5a446ecc53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Installers/Windows/SharedFramework/Product.wxs
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="$(var.ProductCode)" Name="$(var.ProductName)" Language="1033" Version="$(var.Version)"
<Product Id="$(var.ProductCode)" Name="$(var.ProductName)" Language="1033" Version="$(var.Version)"
Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." Schedule="afterInstallFinalize" />
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." Schedule="afterInstallFinalize" />
<Media Id="1" Cabinet="$(var.Cabinet)" CompressionLevel="high" EmbedCab="$(var.EmbedCab)" />
<WixVariable Id="WixUILicenseRtf" Value="$(var.files)\eula.rtf" />
@ -13,7 +13,7 @@
<FeatureRef Id="FT_DepProvider" />
<FeatureRef Id="FT_AspNetCoreSharedFramework" />
<FeatureRef Id="FT_ProductInfo" />
</Product>
</Product>
<?ifdef PFilesFolder?>
<?undef PFilesFolder?>
@ -27,15 +27,15 @@
<?error Invalid Platform ($(var.Platform))?>
<?endif?>
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="$(var.PFilesFolder)">
<Directory Id="DotNetFolder" Name="dotnet">
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="$(var.PFilesFolder)">
<Directory Id="DOTNETHOME" Name="dotnet">
<Directory Id="SharedFolder" Name="shared" />
</Directory>
</Directory>
</Directory>
</Fragment>
</Directory>
</Directory>
</Fragment>
<Fragment>
<Feature Id="FT_AspNetCoreSharedFramework" Absent="allow" Description="!(loc.FT_AspNetCoreSharedFrameworkDescription)" Display="2" Level="1" Title="!(loc.FT_AspNetCoreSharedFrameworkTitle)">
@ -73,7 +73,7 @@
<Component Id="C_ProductInstallDir">
<RegistryKey Key="SOFTWARE\Microsoft\ASP.NET Core\Shared Framework" Root="HKLM">
<RegistryValue Name="InstallDir" Type="string" Value="[DotNetFolder]" />
<RegistryValue Name="InstallDir" Type="string" Value="[DOTNETHOME]" />
</RegistryKey>
</Component>
</DirectoryRef>

2
src/Installers/Windows/SharedFramework/SharedFramework.wixproj
View File

@ -42,7 +42,7 @@
<HarvestDirectory Include="$(HarvestSource)">
<SuppressRootDirectory>true</SuppressRootDirectory>
<ComponentGroupName>CG_AspNetCoreSharedFramework</ComponentGroupName>
<DirectoryRefId>DotNetFolder</DirectoryRefId>
<DirectoryRefId>DOTNETHOME</DirectoryRefId>
<PreprocessorVariable>var.AspNetCoreSharedFrameworkSource</PreprocessorVariable>
</HarvestDirectory>
</ItemGroup>

6
src/Installers/Windows/SharedFrameworkLib/Library.wxs
View File

@ -7,10 +7,15 @@
<?ifdef SharedFrameworkInstallCondition?>
<?undef SharedFrameworkInstallCondition?>
<?endif?>
<?ifdef DotNetHome?>
<?undef DotNetHome?>
<?endif?>
<?if $(var.Platform)=x86?>
<?define SharedFrameworkInstallCondition=(NOT OPT_NO_SHAREDFX) AND (NOT OPT_NO_X86)?>
<?define DotNetHome=DOTNETHOME_X86?>
<?elseif $(var.Platform)=x64?>
<?define SharedFrameworkInstallCondition=VersionNT64 AND (NOT OPT_NO_SHAREDFX)?>
<?define DotNetHome=DOTNETHOME_X64?>
<?endif?>
<?define SourceFile=$(var.BinPath)\aspnetcore-runtime-$(var.PackageVersion)-win-$(var.Platform).msi?>
@ -21,6 +26,7 @@
Visible="no"
Vital="yes"
InstallCondition="$(var.SharedFrameworkInstallCondition)">
<MsiProperty Name="DOTNETHOME" Value="[$(var.DotNetHome)]" />
<Payload Name="sfx_$(var.Platform).cab" SourceFile="$(var.BinPath)\sfx_$(var.Platform).cab"/>
</MsiPackage>
</PackageGroup>