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

Make sure SharedFx & TargetingPack msi names match (#28298) 

* Make sure SharedFx & TargetingPack msi names match

* Insert packageVersion into OutputName when available

* Move props around again
This commit is contained in:
William Godbe 2020-12-08 14:14:21 -08:00 committed by GitHub
parent f17c23bf98
commit a4f30aeec3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eng/targets/Wix.Common.targets
View File

@ -25,6 +25,14 @@
<DefineConstants Condition="'$(Configuration)' == 'Debug'">$(DefineConstants);Debug</DefineConstants>
<DefineConstants>$(DefineConstants);EmbedCab=$(EmbedCab)</DefineConstants>
<DefineConstants>$(DefineConstants);Cabinet=$(Cabinet)</DefineConstants>
<!-- Set package version for SharedFx & TargetingPack wixproj's -->
<!-- Everything built in those projects _except_ the final package & MSI are shipping assets. -->
<_GeneratedPackageVersion>$(PackageVersion)</_GeneratedPackageVersion>
<_GeneratedPackageVersion
Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels)</_GeneratedPackageVersion>
<!-- Insert PackageVersion into OutputName for SharedFx & TargetingPack -->
<OutputName Condition="'$(OutputNamePrefix)' != '' AND '$(OutputNameSuffix)' != ''">$(OutputNamePrefix)$(_GeneratedPackageVersion)$(OutputNameSuffix)$(TargetExt)</OutputName>
</PropertyGroup>
<PropertyGroup>

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

@ -3,10 +3,10 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
<OutputNamePrefix>$(RuntimeInstallerBaseName)-</OutputNamePrefix>
<OutputNameSuffix>-win-$(Platform)</OutputNameSuffix>
<ProductNameFolder>Microsoft ASP.NET Core Shared Framework</ProductNameFolder>
<ProductNameShort>AspNetCore.SharedFramework</ProductNameShort>
<Name>AspNetCoreSharedFramework</Name>
<OutputName>$(Name)-$(Platform)</OutputName>
<OutputType>Package</OutputType>
<EmbedCab>yes</EmbedCab>
<Cabinet>sfx_$(Platform).cab</Cabinet>
@ -80,11 +80,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
<PropertyGroup>
<!-- Everything built in this project _except_ the final package & MSI are shipping assets. -->
<_GeneratedPackageVersion>$(PackageVersion)</_GeneratedPackageVersion>
<_GeneratedPackageVersion
Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels)</_GeneratedPackageVersion>
<PackageFileName>$(RuntimeInstallerBaseName)-$(_GeneratedPackageVersion)-win-$(Platform)$(TargetExt)</PackageFileName>
<PackageFileName>$(OutputName)</PackageFileName>
<ProductName>Microsoft ASP.NET Core $(PackageBrandingVersion) Shared Framework ($(Platform))</ProductName>
<DefineConstants>$(DefineConstants);ProductName=$(ProductName)</DefineConstants>
</PropertyGroup>

12
src/Installers/Windows/TargetingPack/TargetingPack.wixproj
View File

@ -3,10 +3,11 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
<OutputNamePrefix>$(TargetingPackInstallerBaseName)-</OutputNamePrefix>
<OutputNameSuffix>-win-$(Platform)</OutputNameSuffix>
<ProductName>Microsoft ASP.NET Core $(PackageBrandingVersion) Targeting Pack ($(Platform))</ProductName>
<ProductNameFolder>Microsoft ASP.NET Core Targeting Pack</ProductNameFolder>
<ProductNameShort>AspNetCore.TargetingPack</ProductNameShort>
<Name>AspNetCoreTargetingPack</Name>
<OutputName>$(Name)-$(Platform)</OutputName>
<OutputType>Package</OutputType>
<IsShipping>true</IsShipping>
<SkipCopyToArtifactsDirectory Condition="'$(IsTargetingPackBuilding)' == 'false'">true</SkipCopyToArtifactsDirectory>
@ -70,12 +71,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
<PropertyGroup>
<!-- Everything built in this project _except_ the final package are shipping assets. -->
<_GeneratedPackageVersion>$(PackageVersion)</_GeneratedPackageVersion>
<_GeneratedPackageVersion
Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels)</_GeneratedPackageVersion>
<ProductName>Microsoft ASP.NET Core $(PackageBrandingVersion) Targeting Pack ($(Platform))</ProductName>
<PackageFileName>$(TargetingPackInstallerBaseName)-$(_GeneratedPackageVersion)-win-$(Platform)$(TargetExt)</PackageFileName>
<PackageFileName>$(OutputName)</PackageFileName>
<DefineConstants>$(DefineConstants);ProductName=$(ProductName)</DefineConstants>
<!-- Suppresses building this project completely during servicing builds. -->