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

Merge pull request #13878 from aspnet/joeloff/EmbedCabs 

Embed CAB files
This commit is contained in:
Jacques Eloff 2019-09-10 23:49:07 -07:00 committed by GitHub
parent 6594d8bb7c 262f29b0ec
commit 82a41f0dac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
<Name>AspNetCoreSharedFramework</Name> <Name>AspNetCoreSharedFramework</Name>
<OutputName>$(Name)-$(Platform)</OutputName> <OutputName>$(Name)-$(Platform)</OutputName>
<OutputType>Package</OutputType> <OutputType>Package</OutputType>
<EmbedCab>no</EmbedCab> <EmbedCab>yes</EmbedCab>
<Cabinet>sfx_$(Platform).cab</Cabinet> <Cabinet>sfx_$(Platform).cab</Cabinet>
<ProjectGuid>C681D730-4505-42C6-9E6C-87F757C4FB32</ProjectGuid> <ProjectGuid>C681D730-4505-42C6-9E6C-87F757C4FB32</ProjectGuid>
<HarvestDirectoryAutoGenerateGuids>true</HarvestDirectoryAutoGenerateGuids> <HarvestDirectoryAutoGenerateGuids>true</HarvestDirectoryAutoGenerateGuids>
@ -84,7 +84,6 @@
<Target Name="CreateSharedFrameworkNugetPackage" AfterTargets="CopyToArtifactsDirectory;Build"> <Target Name="CreateSharedFrameworkNugetPackage" AfterTargets="CopyToArtifactsDirectory;Build">
<PropertyGroup> <PropertyGroup>
<MsiFullPath>$(InstallersOutputPath)$(PackageFileName)</MsiFullPath> <MsiFullPath>$(InstallersOutputPath)$(PackageFileName)</MsiFullPath>
<CabFullPath>$(InstallersOutputPath)$(Cabinet)</CabFullPath>
</PropertyGroup> </PropertyGroup>
<Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^ <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
'$(ProductNameShort)' ^ '$(ProductNameShort)' ^

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

@ -25,7 +25,6 @@
Vital="yes" Vital="yes"
InstallCondition="$(var.SharedFrameworkInstallCondition)"> InstallCondition="$(var.SharedFrameworkInstallCondition)">
<MsiProperty Name="DOTNETHOME" Value="[$(var.DotNetHome)]" /> <MsiProperty Name="DOTNETHOME" Value="[$(var.DotNetHome)]" />
<Payload Name="sfx_$(var.Platform).cab" SourceFile="$(var.SharedFramework.TargetDir)sfx_$(var.Platform).cab"/>
</MsiPackage> </MsiPackage>
</PackageGroup> </PackageGroup>
</Fragment> </Fragment>