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

Resolve named CAB collision and drop the CABs (#1976)

Browse source 
* Resolve named CAB collision; drop the CABs.

* Resolving naming convention warning: 8 chars plus {0} are allowed.

* Update src/redist/targets/packaging/windows/clisdk/dotnet.wxs

Co-Authored-By: Peter Huene <pehuene@microsoft.com>
This commit is contained in:
John Beisner 2019-05-16 16:33:29 -07:00 • committed by GitHub
parent 8ae3afa572
commit d987a525c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
eng/Publishing.props
View file

@ -45,6 +45,7 @@
<SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.rpm" />
<SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.msi" />
<SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.nupkg" />
<SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.cab" />
<SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.svg" Condition=" '$(PublishBinariesAndBadge)' == 'true' ">
<ExcludeFromManifest>true</ExcludeFromManifest>
</SdkAssetsToPublish>

2
src/redist/targets/packaging/windows/clisdk/bundle.wxs
View file

@ -147,7 +147,7 @@
<MsiProperty Name="DOTNETHOME_X86" Value="[DOTNETHOME_X86]" />
<MsiProperty Name="DOTNETHOME_X64" Value="[DOTNETHOME_X64]" />
<MsiProperty Name="EXEFULLPATH" Value="[WixBundleOriginalSource]" />
<MsiProperty Name="ALLOWCLISDKMSIINSTALL" Value="True" />
<MsiProperty Name="ALLOWMSIINSTALL" Value="True" />
</MsiPackage>
<?if $(var.Platform)=x86?>
<PackageGroupRef Id="PG_AspNetCoreSharedFramework_x86"/>

12
src/redist/targets/packaging/windows/clisdk/dotnet.wxs
View file

@ -4,14 +4,18 @@
<Product Id="*" Name="$(var.ProductName)" Language="$(var.ProductLanguage)" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
<Package Compressed="yes" InstallScope="perMachine" InstallerVersion="200" />
<Condition Message="$(var.ProductName) must be installed as part of an SDK bundle installation.">
Installed OR ALLOWCLISDKMSIINSTALL
<Condition Message="$(var.ProductName) must be installed as part of a coordinated SDK installation.">
Installed OR ALLOWMSIINSTALL
</Condition>
<MajorUpgrade DowngradeErrorMessage="$(var.DowngradeErrorMessage)" Schedule="afterInstallInitialize"/>
<MediaTemplate CabinetTemplate="dnet-{0}.cab" CompressionLevel="high" />
<?if $(var.Platform)=x86?>
<MediaTemplate CabinetTemplate="dnetx86-{0}.cab" CompressionLevel="high" />
<?elseif $(var.Platform)=x64?>
<MediaTemplate CabinetTemplate="dnetx64-{0}.cab" CompressionLevel="high" />
<?endif?>
<Feature Id="MainFeature" Title="Main Feature" Level="1">
<ComponentGroupRef Id="InstallFiles" />
<ComponentGroupRef Id="AuthoredRegistryKeys_x86node"/>