Don't include the RuntimeIdentifier in the package name, if it is not set

This commit is contained in:
Frederik Carlier
2019-11-22 13:38:20 +01:00
parent 0816fac08e
commit 23626970ef

View File

@@ -12,7 +12,8 @@
<PackageVersion Condition="'$(PackageVersion)' == '' AND '$(Version)' == ''">1.0.0</PackageVersion>
<PackagePrefix Condition="'$(PackagePrefix)' == ''">$(TargetName)</PackagePrefix>
<PackageName Condition="'$(PackageName)' == ''">$(PackagePrefix).$(PackageVersion).$(RuntimeIdentifier)</PackageName>
<PackageName Condition="'$(PackageName)' == '' AND '$(RuntimeIdentifier)' != ''">$(PackagePrefix).$(PackageVersion).$(RuntimeIdentifier)</PackageName>
<PackageName Condition="'$(PackageName)' == ''">$(PackagePrefix).$(PackageVersion)</PackageName>
<IntermediatePackagePath>$(IntermediateOutputPath)$(PackageName)</IntermediatePackagePath>
<PackageDir Condition="'$(PackageDir)' == ''">(TargetDir)</PackageDir>
<PackagePath Condition="'$(PackagePath)' == ''">$([MSBuild]::EnsureTrailingSlash($(PackageDir)))$(PackageName)</PackagePath>