Commitea77ace

authored

[release/8.0] Fix target arch suffix for rpm/deb names in newkey packages (#16160)

1 parent583effe commitea77aceCopy full SHA for ea77ace

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,8 @@`
`194`	`194`	`<!-- Packages to be signed with the new key-->`
`195`	`195`	`<PropertyGroup>`
`196`	`196`	`<_NewKeyVersionSuffix>newkey</_NewKeyVersionSuffix>`
`197`		`- <_InstallerBuildPartNewKey>$(Version)-$(_NewKeyVersionSuffix)-$(_InstallerArchSuffix)</_InstallerBuildPartNewKey>`
`198`		`- <_InstallerBuildPartNewKeyCondition="'$(PackageTargetOS)' != ''">$(Version)-$(PackageTargetOS)-$(_NewKeyVersionSuffix)-$(_InstallerArchSuffix)</_InstallerBuildPartNewKey>`
	`197`	`+ <_InstallerBuildPartNewKey>$(Version)-$(_NewKeyVersionSuffix)-$(InstallerTargetArchitecture)</_InstallerBuildPartNewKey>`
	`198`	`+ <_InstallerBuildPartNewKeyCondition="'$(PackageTargetOS)' != ''">$(Version)-$(PackageTargetOS)-$(_NewKeyVersionSuffix)-$(InstallerTargetArchitecture)</_InstallerBuildPartNewKey>`
`199`	`199`	`<_InstallerFileNameWithoutExtensionNewKey>$(InstallerName)-$(_InstallerBuildPartNewKey)$(CrossArchContentsBuildPart)</_InstallerFileNameWithoutExtensionNewKey>`
`200`	`200`	`<_InstallerFileNewKey>$(PackageOutputPath)$(_InstallerFileNameWithoutExtensionNewKey)$(InstallerExtension)</_InstallerFileNewKey>`
`201`	`201`	`</PropertyGroup>`

Comments

(0)