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

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

@ -30,7 +30,7 @@
<Fragment> <Fragment>
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="$(var.PFilesFolder)"> <Directory Id="$(var.PFilesFolder)">
<Directory Id="DotNetFolder" Name="dotnet"> <Directory Id="DOTNETHOME" Name="dotnet">
<Directory Id="SharedFolder" Name="shared" /> <Directory Id="SharedFolder" Name="shared" />
</Directory> </Directory>
</Directory> </Directory>
@ -73,7 +73,7 @@
<Component Id="C_ProductInstallDir"> <Component Id="C_ProductInstallDir">
<RegistryKey Key="SOFTWARE\Microsoft\ASP.NET Core\Shared Framework" Root="HKLM"> <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> </RegistryKey>
</Component> </Component>
</DirectoryRef> </DirectoryRef>

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

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

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

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