diff --git a/eng/targets/Wix.Common.targets b/eng/targets/Wix.Common.targets index 2bb40dc6b0a8..5206b96c0876 100644 --- a/eng/targets/Wix.Common.targets +++ b/eng/targets/Wix.Common.targets @@ -18,6 +18,14 @@ + + + <_GeneratedPackageVersion>$(PackageVersion) + <_GeneratedPackageVersion + Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels) + + $(OutputNamePrefix)$(_GeneratedPackageVersion)$(OutputNameSuffix) + yes $(OutputName.Replace('-', '_')).cab $(ProductName) @@ -25,14 +33,6 @@ $(DefineConstants);Debug $(DefineConstants);EmbedCab=$(EmbedCab) $(DefineConstants);Cabinet=$(Cabinet) - - - - <_GeneratedPackageVersion>$(PackageVersion) - <_GeneratedPackageVersion - Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels) - - $(OutputNamePrefix)$(_GeneratedPackageVersion)$(OutputNameSuffix)$(TargetExt) diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj index 5c691c87b85f..9b9e4c6f0a7e 100644 --- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj +++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj @@ -80,7 +80,7 @@ - $(OutputName) + $(OutputName)$(TargetExt) Microsoft ASP.NET Core $(PackageBrandingVersion) Shared Framework ($(Platform)) $(DefineConstants);ProductName=$(ProductName) diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj index 7706d6e19cab..4725496d0e13 100644 --- a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj +++ b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj @@ -5,7 +5,6 @@ $(TargetingPackInstallerBaseName)- -win-$(Platform) - Microsoft ASP.NET Core $(PackageBrandingVersion) Targeting Pack ($(Platform)) Microsoft ASP.NET Core Targeting Pack AspNetCore.TargetingPack Package @@ -71,7 +70,8 @@ - $(OutputName) + Microsoft ASP.NET Core $(PackageBrandingVersion) Targeting Pack ($(Platform)) + $(OutputName)$(TargetExt) $(DefineConstants);ProductName=$(ProductName)