Skip to content

Clean up our runtime-deps packages and enable ARM64 Debs #112671

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
merged 9 commits into from
Feb 20, 2025
Merged

Clean up our runtime-deps packages and enable ARM64 Debs #112671

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
726e276
Update our signing logic to sign the azl.3 prereqs package with the c…
jkoritzinsky Feb 18, 2025
a1157b8
Delete the CBL-Mariner prereqs packages now that we aren't publishing…
jkoritzinsky Feb 18, 2025
5c4842f
Remove runtime-deps packages for distros Microsoft doesn't publish pa…
jkoritzinsky Feb 18, 2025
fcc91c0
Remove unused zlib1g dependency from the deb/ubuntu package
jkoritzinsky Feb 18, 2025
ac4f916
Remove old Debian support (pre-Bookworm) and all Ubuntu support from …
jkoritzinsky Feb 19, 2025
1b50f62
Update our opensuse/sles packages for Leap 15.6
jkoritzinsky Feb 19, 2025
ad8fe6b
Build Deb packages for ARM64
jkoritzinsky Feb 19, 2025
80064a9
Update installers.proj
jkoritzinsky Feb 19, 2025
bee5840
Restore logic for supporting multiple libicu versions, but only inclu…
jkoritzinsky Feb 19, 2025
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
15 changes: 12 additions & 3 deletions eng/Signing.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -71,4 +80,4 @@
SkipPublish="true" />
</ItemGroup>

</Project>
</Project>
2 changes: 1 addition & 1 deletion src/installer/pkg/sfx/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
11 changes: 0 additions & 11 deletions src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.9.proj
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-cm.2.proj
View file
Open in desktop

This file was deleted.

11 changes: 4 additions & 7 deletions src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
<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" />
<LinuxPackageDependency Include="libicu72" />
</ItemGroup>
</Project>
11 changes: 0 additions & 11 deletions src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...e-deps/dotnet-runtime-deps-fedora.34.proj → ...deps/dotnet-runtime-deps-opensuse.15.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
11 changes: 0 additions & 11 deletions src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.8.proj
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.8.proj
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...untime-deps/dotnet-runtime-deps-cm.1.proj → ...ime-deps/dotnet-runtime-deps-sles.15.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Loading