Skip to content

Commit b60aa54

Browse files
[Release/6.0] Backport of Mariner 2.0 and Linux Arm64 packaging work (dotnet#65979)
* Backport - enable Mariner 2.0 and arm64 RPM packages * Adding Mariner 2.0 deps project
1 parent 13a0b28 commit b60aa54

5 files changed

Lines changed: 24 additions & 11 deletions

File tree

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
<Uri>https://github.com/dotnet/arcade</Uri>
5555
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22107.2">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22122.4">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
59+
<Sha>853684cf39fdc68035736a4ff0f81303bf4b4361</Sha>
6060
</Dependency>
6161
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22107.2">
6262
<Uri>https://github.com/dotnet/arcade</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22107.2</MicrosoftDotNetXUnitExtensionsVersion>
5050
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22107.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
5151
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksArchivesVersion>
52-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksInstallersVersion>
52+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22122.4</MicrosoftDotNetBuildTasksInstallersVersion>
5353
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksPackagingVersion>
5454
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksTemplatingVersion>
5555
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>

eng/pipelines/installer/jobs/base-job.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -422,18 +422,20 @@ jobs:
422422
displayName: Disk Usage after Build
423423
424424
# Only in glibc leg, we produce RPMs and Debs
425-
- ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.platform, 'Linux_x64'), eq(parameters.osSubgroup, ''), eq(parameters.pgoType, ''))}}:
425+
- ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), or(eq(parameters.platform, 'Linux_x64'), eq(parameters.platform, 'Linux_arm64')), eq(parameters.osSubgroup, ''), eq(parameters.pgoType, ''))}}:
426426
- ${{ each packageBuild in parameters.packageDistroList }}:
427427
# This leg's RID matches the build image. Build its distro-dependent packages, as well as
428428
# the distro-independent installers. (There's no particular reason to build the distro-
429429
# independent installers on this leg, but we need to do it somewhere.)
430-
- template: steps/build-linux-package.yml
431-
parameters:
432-
packageType: ${{ packageBuild.packageType }}
433-
image: ${{ packageBuild.image }}
434-
packageStepDescription: Runtime Deps, Runtime, Framework Packs installers
435-
subsetArg: $(installersSubsetArg)
436-
packagingArgs: ${{ packageBuild.packagingArgs }}
430+
# Currently, Linux_arm64 supports 'rpm' type only.
431+
- ${{ if or(not(eq(parameters.platform, 'Linux_arm64')), eq(packageBuild.packageType, 'rpm')) }}:
432+
- template: steps/build-linux-package.yml
433+
parameters:
434+
packageType: ${{ packageBuild.packageType }}
435+
image: ${{ packageBuild.image }}
436+
packageStepDescription: Runtime Deps, Runtime, Framework Packs installers
437+
subsetArg: $(installersSubsetArg)
438+
packagingArgs: ${{ packageBuild.packagingArgs }}
437439

438440
- ${{ if ne(parameters.container, '') }}:
439441
# Files may be owned by root because builds don't set user ID. Later build steps run 'find' in

src/installer/pkg/sfx/installers.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<ItemGroup Condition="'$(BuildRpmPackage)' == 'true'">
1313
<InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj" />
1414
<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" />
1516
<InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj" />
1617
<InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.34.proj" />
1718
<InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj" />
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Project Sdk="Microsoft.Build.NoTargets">
2+
<PropertyGroup>
3+
<GenerateInstallers Condition="'$(BuildRpmPackage)' != 'true'">false</GenerateInstallers>
4+
<PackageTargetOS>cm.2</PackageTargetOS>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<LinuxPackageDependency Include="openssl-libs;icu;krb5" />
9+
</ItemGroup>
10+
</Project>

0 commit comments

Comments
 (0)