Skip to content

Commit 9e2afd1

Browse files
authored
Clean up our runtime-deps packages and enable ARM64 Debs (#112671)
* Update our signing logic to sign the azl.3 prereqs package with the correct cert * Delete the CBL-Mariner prereqs packages now that we aren't publishing the special Mariner package copies * Remove runtime-deps packages for distros Microsoft doesn't publish packages for any more. These distros publish .NET RPMs themselves. * Remove unused zlib1g dependency from the deb/ubuntu package * Remove old Debian support (pre-Bookworm) and all Ubuntu support from the deb package. We don't publish packages for Ubuntu any more * Update our opensuse/sles packages for Leap 15.6 * Build Deb packages for ARM64 * Update installers.proj * Restore logic for supporting multiple libicu versions, but only include the version that we know any debian distro has.
1 parent fb6b045 commit 9e2afd1

13 files changed

+24
-101
lines changed

eng/Signing.props

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,26 @@
2727

2828
<FileExtensionSignInfo Include=".msi" CertificateName="MicrosoftDotNet500" />
2929

30-
<!--
30+
<!--
3131
Removal is temporarily needed as we integrate support for these extensions into SignTool.
3232
Should be cleaned up after https://github.com/dotnet/arcade/issues/14432,
33-
https://github.com/dotnet/arcade/issues/14433, and
33+
https://github.com/dotnet/arcade/issues/14433, and
3434
https://github.com/dotnet/arcade/issues/14435 are completed.
3535
-->
3636
<FileExtensionSignInfo Remove=".deb;.rpm;.pkg" />
3737
<FileExtensionSignInfo Include=".pkg" CertificateName="8003" />
3838
<FileExtensionSignInfo Include=".deb;.rpm" CertificateName="LinuxSign" />
3939
</ItemGroup>
4040

41+
<!--
42+
Ensure that we sign the AZL3 RPM with the LinuxSignMariner key.
43+
This package name has the version in it, so we need to use a wildcard to discover the right name.
44+
-->
45+
<ItemGroup>
46+
<AzureLinuxPrereqsRPM Include="$(ArtifactsPackagesDir)**/dotnet-runtime-deps-*-azl.3-*.rpm" />
47+
<FileSignInfo Include="@(AzureLinuxPrereqsRPM->'%(Filename)%(Extension)')" CertificateName="LinuxSignMariner" />
48+
</ItemGroup>
49+
4150
<!-- Update existing defaults from arcade that were using Microsoft400 to use the .NET-specific cert -->
4251
<ItemGroup>
4352
<FileExtensionSignInfo Update="@(FileExtensionSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="MicrosoftDotNet500" />
@@ -71,4 +80,4 @@
7180
SkipPublish="true" />
7281
</ItemGroup>
7382

74-
</Project>
83+
</Project>

src/installer/pkg/sfx/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515
<PropertyGroup Condition="'$(BuildOnlyPgoInstrumentedAssets)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'">
1616
<GenerateInstallers>true</GenerateInstallers>
17-
<BuildDebPackage Condition="'$(TargetsLinuxGlibc)' == 'true' and '$(TargetArchitecture)' == 'x64'">true</BuildDebPackage>
17+
<BuildDebPackage Condition="'$(TargetsLinuxGlibc)' == 'true' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</BuildDebPackage>
1818
<BuildRpmPackage Condition="'$(TargetsLinuxGlibc)' == 'true' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</BuildRpmPackage>
1919
<GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
2020
</PropertyGroup>

src/installer/pkg/sfx/installers.proj

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,8 @@
1010
<ItemGroup Condition="'$(TargetsLinuxGlibc)' == 'true'">
1111
<InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj" />
1212
<InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-azl.3.proj" />
13-
<InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.9.proj" />
14-
<InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-cm.1.proj" />
15-
<InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-cm.2.proj" />
16-
<InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj" />
17-
<InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.34.proj" />
18-
<InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj" />
19-
<InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.8.proj" />
20-
<InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.8.proj" />
21-
<InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj" />
13+
<InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.15.proj" />
14+
<InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.15.proj" />
2215
</ItemGroup>
2316

2417
<Target Name="BuildInstallerProjects" BeforeTargets="Build">

src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.9.proj

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-cm.2.proj

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<Project Sdk="Microsoft.Build.NoTargets">
22
<PropertyGroup>
3-
<BuildDebPackage Condition="'$(TargetArchitecture)' == 'x64'">true</BuildDebPackage>
3+
<BuildDebPackage>true</BuildDebPackage>
44
<BuildRpmPackage>false</BuildRpmPackage>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<LinuxPackageDependency Include="libc6;libgcc1;libgssapi-krb5-2;libstdc++6;zlib1g"/>
9-
<LinuxPackageDependency Include="libssl1.0.0 | libssl1.0.2 | libssl1.1 | libssl3" />
10-
<KnownLibIcuVersion Include="74;72;71;70;69;68;67;66;65;63;60;57;55;52" />
11-
<LibIcuPackageDependency Include="libicu" Dependencies="libicu | @(KnownLibIcuVersion -> 'libicu%(Identity)', ' | ')" />
12-
<LinuxPackageDependency
13-
Include="@(LibIcuPackageDependency->Metadata('Dependencies'))" />
8+
<LinuxPackageDependency Include="libc6;libgcc1;libgssapi-krb5-2;libstdc++6"/>
9+
<LinuxPackageDependency Include="libssl3" />
10+
<KnownLibIcuVersion Include="72" />
11+
<LinuxPackageDependency Include="@(KnownLibIcuVersion -> 'libicu%(Identity)', ' | ')" />
1412
</ItemGroup>
1513
</Project>

src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.34.proj renamed to src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.15.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<PropertyGroup>
33
<BuildDebPackage>false</BuildDebPackage>
44
<BuildRpmPackage>true</BuildRpmPackage>
5-
<PackageTargetOS>fedora.34</PackageTargetOS>
5+
<PackageTargetOS>opensuse.15</PackageTargetOS>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<LinuxPackageDependency Include="libicu;krb5-libs" />
9+
<LinuxPackageDependency Include="libopenssl3;libicu;krb5" />
1010
</ItemGroup>
1111
</Project>

src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.8.proj

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)