Update to the 22.04 debpkg image so we're on a newer ubuntu version. (#…

…86803)
dotnet · Jun 22, 2023 · bae3da7 · bae3da7
1 parent 2a09527
commit bae3da7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/eng/pipelines/common/templates/pipeline-with-resources.yml b/eng/pipelines/common/templates/pipeline-with-resources.yml
@@ -105,7 +105,7 @@ resources:
         ROOTFS_DIR: /crossrootfs/armel
 
     - container: debpkg
-      image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-debpkg
+      image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
 
     - container: rpmpkg
       image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm

diff --git a/eng/pipelines/runtimelab.yml b/eng/pipelines/runtimelab.yml
@@ -37,14 +37,6 @@ pr:
     - PATENTS.TXT
     - THIRD-PARTY-NOTICES.TXT
 
-resources:
-  containers:
-  # Define auxilary containers used by the installer jobs
-  - container: debpkg
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-debpkg
-  - container: rpmpkg
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg
-
 variables:
   - template: /eng/pipelines/common/variables.yml
   - ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:

diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
@@ -59,6 +59,8 @@
   <Target Name="AddLinuxPackageInformation" BeforeTargets="GetDebInstallerJsonProperties;GetRpmInstallerJsonProperties">
     <ItemGroup>
       <LinuxPackageDependency Include="dotnet-hostfxr-$(MajorVersion).$(MinorVersion);dotnet-runtime-deps-$(MajorVersion).$(MinorVersion)" Version="$(InstallerPackageVersion)" />
+      <!-- We build on an image with LTTNGv0, but we package on distros that have v1. Ignore inspecting dependencies on our LLTNG provider to ensure we can package. -->
+      <DebJsonProperty Include="debian_ignored_libraries" Object="[&quot;libcoreclrtraceptprovider.so&quot;]" />
     </ItemGroup>
   </Target>