Skip to content

Enable correct Linux package architecture #8462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NikolaMilosavljevic merged 1 commit into from
Feb 14, 2022
Merged

Enable correct Linux package architecture #8462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Microsoft.DotNet.Build.Tasks.Installers/build/installer.singlerid.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,9 @@
<PropertyGroup>
<FullLicenseText>$([System.IO.File]::ReadAllText('$(LicenseFile)').Replace('%0A', '\n').Replace('"', '\"'))</FullLicenseText>
<LinuxInstallRoot Condition="'$(LinuxInstallRoot)' == ''">/usr/share/dotnet</LinuxInstallRoot>
<LinuxPackageArchitecture>$(InstallerTargetArchitecture)</LinuxPackageArchitecture>
<!-- Linux packaging requires 'amd64' for x64 packages -->
<LinuxPackageArchitecture Condition="'$(LinuxPackageArchitecture)' == 'x64'">amd64</LinuxPackageArchitecture>
</PropertyGroup>

<ItemGroup>
Expand All @@ -469,7 +472,7 @@

<_LinuxPackageControlProperty Include="priority" String="standard" />
<_LinuxPackageControlProperty Include="section" String="libs" />
<_LinuxPackageControlProperty Include="architecture" String="amd64" />
<_LinuxPackageControlProperty Include="architecture" String="$(LinuxPackageArchitecture)" />

<_LinuxPackageLicenseProperty Include="type" String="MIT and ASL 2.0 and BSD" />
<_LinuxPackageLicenseProperty Include="full_text" String="$(FullLicenseText)" />
Expand Down
4 changes: 3 additions & 1 deletion src/Microsoft.DotNet.Build.Tasks.Installers/build/installer.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@
<PropertyGroup>
<TargetRuntimeOS>$(InstallerRuntimeIdentifier.Substring(0, $(InstallerRuntimeIdentifier.LastIndexOf('-'))))</TargetRuntimeOS>
<TargetArchitecture Condition="'$(TargetArchitecture)' == ''">$(InstallerRuntimeIdentifier.Substring($(InstallerRuntimeIdentifier.LastIndexOf('-'))).TrimStart('-'))</TargetArchitecture>
<InstallerTargetArchitecture Condition="'$(InstallerTargetArchitecture)' == ''">$(TargetArchitecture)</InstallerTargetArchitecture>
<_TargetArch>$(TargetArchitecture)</_TargetArch>
<_TargetArch Condition="'$(BuildRpmPackage)' == 'true' and '$(TargetArchitecture)' == 'arm64'">aarch64</_TargetArch>
<InstallerTargetArchitecture Condition="'$(InstallerTargetArchitecture)' == ''">$(_TargetArch)</InstallerTargetArchitecture>
</PropertyGroup>
<ItemGroup>
<CrossArchMsiToBuild Include="@(CrossArchSdkMsiInstallerArch)" Exclude="$(TargetArchitecture)" />
Expand Down