Clean up our runtime-deps packages and enable ARM64 Debs

eng/Signing.props

@@ -27,17 +27,26 @@
 
     <FileExtensionSignInfo Include=".msi" CertificateName="MicrosoftDotNet500" />
 
-    <!-- 
+    <!--
       Removal is temporarily needed as we integrate support for these extensions into SignTool.
       Should be cleaned up after https://github.com/dotnet/arcade/issues/14432,
-      https://github.com/dotnet/arcade/issues/14433, and 
+      https://github.com/dotnet/arcade/issues/14433, and
       https://github.com/dotnet/arcade/issues/14435 are completed.
      -->
     <FileExtensionSignInfo Remove=".deb;.rpm;.pkg" />
     <FileExtensionSignInfo Include=".pkg" CertificateName="8003" />
     <FileExtensionSignInfo Include=".deb;.rpm" CertificateName="LinuxSign" />
   </ItemGroup>
 
+  <!--
+    Ensure that we sign the AZL3 RPM with the LinuxSignMariner key.
+    This package name has the version in it, so we need to use a wildcard to discover the right name.
+  -->
+  <ItemGroup>
+    <AzureLinuxPrereqsRPM Include="$(ArtifactsPackagesDir)**/dotnet-runtime-deps-*-azl.3-*.rpm" />
+    <FileSignInfo Include="@(AzureLinuxPrereqsRPM->'%(Filename)%(Extension)')" CertificateName="LinuxSignMariner" />
+  </ItemGroup>
+
   <!-- Update existing defaults from arcade that were using Microsoft400 to use the .NET-specific cert -->
   <ItemGroup>
     <FileExtensionSignInfo Update="@(FileExtensionSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="MicrosoftDotNet500" />
@@ -71,4 +80,4 @@
               SkipPublish="true" />
   </ItemGroup>
 
-</Project>
+</Project>

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

@@ -14,7 +14,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(BuildOnlyPgoInstrumentedAssets)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'">
     <GenerateInstallers>true</GenerateInstallers>
-    <BuildDebPackage Condition="'$(TargetsLinuxGlibc)' == 'true' and '$(TargetArchitecture)' == 'x64'">true</BuildDebPackage>
+    <BuildDebPackage Condition="'$(TargetsLinuxGlibc)' == 'true' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</BuildDebPackage>
     <BuildRpmPackage Condition="'$(TargetsLinuxGlibc)' == 'true' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</BuildRpmPackage>
     <GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
   </PropertyGroup>

src/installer/pkg/sfx/installers.proj

@@ -10,15 +10,8 @@
   <ItemGroup Condition="'$(TargetsLinuxGlibc)' == 'true'">
     <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj" />
     <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-azl.3.proj" />
-    <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.9.proj" />
-    <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-cm.1.proj" />
-    <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-cm.2.proj" />
-    <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj" />
-    <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.34.proj" />
-    <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj" />
-    <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.8.proj" />
-    <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.8.proj" />
-    <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj" />
+    <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.15.proj" />
+    <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.15.proj" />
   </ItemGroup>
 
   <Target Name="BuildInstallerProjects" BeforeTargets="Build">

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

@@ -1,15 +1,13 @@
 <Project Sdk="Microsoft.Build.NoTargets">
   <PropertyGroup>
-    <BuildDebPackage Condition="'$(TargetArchitecture)' == 'x64'">true</BuildDebPackage>
+    <BuildDebPackage>true</BuildDebPackage>
     <BuildRpmPackage>false</BuildRpmPackage>
   </PropertyGroup>
 
   <ItemGroup>
-    <LinuxPackageDependency Include="libc6;libgcc1;libgssapi-krb5-2;libstdc++6;zlib1g"/>
-    <LinuxPackageDependency Include="libssl1.0.0 | libssl1.0.2 | libssl1.1 | libssl3" />
-    <KnownLibIcuVersion Include="74;72;71;70;69;68;67;66;65;63;60;57;55;52" />
-    <LibIcuPackageDependency Include="libicu" Dependencies="libicu | @(KnownLibIcuVersion -> 'libicu%(Identity)', ' | ')" />
-    <LinuxPackageDependency
-      Include="@(LibIcuPackageDependency->Metadata('Dependencies'))" />
+    <LinuxPackageDependency Include="libc6;libgcc1;libgssapi-krb5-2;libstdc++6"/>
+    <LinuxPackageDependency Include="libssl3" />
+    <KnownLibIcuVersion Include="72" />
+    <LinuxPackageDependency Include="@(KnownLibIcuVersion -> 'libicu%(Identity)', ' | ')" />
  </ItemGroup>
 </Project>

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

@@ -2,10 +2,10 @@
   <PropertyGroup>
     <BuildDebPackage>false</BuildDebPackage>
     <BuildRpmPackage>true</BuildRpmPackage>
-    <PackageTargetOS>fedora.34</PackageTargetOS>
+    <PackageTargetOS>opensuse.15</PackageTargetOS>
   </PropertyGroup>
 
   <ItemGroup>
-    <LinuxPackageDependency Include="libicu;krb5-libs" />
+    <LinuxPackageDependency Include="libopenssl3;libicu;krb5" />
   </ItemGroup>
 </Project>

src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-cm.1.proj → src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.15.proj

@@ -2,10 +2,10 @@
   <PropertyGroup>
     <BuildDebPackage>false</BuildDebPackage>
     <BuildRpmPackage>true</BuildRpmPackage>
-    <PackageTargetOS>cm.1</PackageTargetOS>
+    <PackageTargetOS>sles.15</PackageTargetOS>
   </PropertyGroup>
 
   <ItemGroup>
-    <LinuxPackageDependency Include="openssl-libs;icu;krb5" />
+    <LinuxPackageDependency Include="libopenssl3;libicu;krb5" />
   </ItemGroup>
 </Project>