Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/aspnetcore.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/Installers/Windows/SharedFramework/SharedFramework.wixproj')
-rw-r--r--src/Installers/Windows/SharedFramework/SharedFramework.wixproj10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
index ed2fa9e235..4752953ec2 100644
--- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
+++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
@@ -85,15 +85,21 @@
<PropertyGroup>
<MsiFullPath>$(InstallersOutputPath)$(PackageFileName)</MsiFullPath>
<CabFullPath>$(InstallersOutputPath)$(Cabinet)</CabFullPath>
+
+ <!-- Everything built in this project _except_ the final package are shipping assets. -->
+ <_GeneratedPackageVersion>$(PackageVersion)</_GeneratedPackageVersion>
+ <_GeneratedPackageVersion
+ Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels)</_GeneratedPackageVersion>
</PropertyGroup>
- <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
+
+ <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
'$(ProductNameShort)' ^
'$(MsiFullPath)' ^
'$(CabFullPath)' ^
'$(ToolsetInstallerNuspecFile)' ^
'$(ArtifactsNonShippingPackagesDir)' ^
'$(Platform)' ^
- '$(PackageVersion)' ^
+ '$(_GeneratedPackageVersion)' ^
'$(RepoRoot)' ^
'$(AspNetCoreMajorVersion)' ^
'$(AspNetCoreMinorVersion)'" />