Use the new RPM tooling and build debs/rpms in the regular build step (instead of as separate steps)

Author: jkoritzinsky

.azure/pipelines/ci-public.yml

@@ -79,14 +79,6 @@ variables:
   value: true
 - template: /eng/common/templates/variables/pool-providers.yml
 
-resources:
-  containers:
-  - container: 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
-
 stages:
 - stage: build
   displayName: Build
@@ -313,43 +305,13 @@ stages:
             --ci
             --arch x64
             --pack
+            --build-installers
             --all
             --no-build-java
             -p:OnlyPackPlatformSpecificPackages=true
             $(_BuildArgs)
             $(_InternalRuntimeDownloadArgs)
         displayName: Run build.sh
-      - script: ./eng/build.sh
-            --ci
-            --nobl
-            --arch x64
-            --build-installers
-            --no-build-deps
-            --no-build-nodejs
-            -p:OnlyPackPlatformSpecificPackages=true
-            -p:BuildRuntimeArchive=false
-            -p:LinuxInstallerType=deb
-            $(_BuildArgs)
-            $(_InternalRuntimeDownloadArgs)
-        displayName: Build Debian installers
-        target: debpkg
-      - script: ./eng/build.sh
-            --ci
-            --nobl
-            --arch x64
-            --build-installers
-            --no-build-deps
-            --no-build-nodejs
-            --publish
-            -p:OnlyPackPlatformSpecificPackages=true
-            -p:BuildRuntimeArchive=false
-            -p:LinuxInstallerType=rpm
-            -p:AssetManifestFileName=aspnetcore-Linux_x64.xml
-            $(_BuildArgs)
-            $(_PublishArgs)
-            $(_InternalRuntimeDownloadArgs)
-        displayName: Build RPM installers
-        target: rpmpkg
       artifacts:
       - name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/

.azure/pipelines/ci.yml

@@ -121,12 +121,6 @@ variables:
 - template: /eng/common/templates-official/variables/pool-providers.yml@self
 
 resources:
-  containers:
-  - container: 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
   repositories:
   # Repo: 1ESPipelineTemplates/1ESPipelineTemplates
   - repository: 1esPipelines
@@ -383,42 +377,12 @@ extends:
                 --arch x64
                 --pack
                 --all
+                --build-installers
                 --no-build-java
                 -p:OnlyPackPlatformSpecificPackages=true
                 $(_BuildArgs)
                 $(_InternalRuntimeDownloadArgs)
             displayName: Run build.sh
-          - script: ./eng/build.sh
-                --ci
-                --nobl
-                --arch x64
-                --build-installers
-                --no-build-deps
-                --no-build-nodejs
-                -p:OnlyPackPlatformSpecificPackages=true
-                -p:BuildRuntimeArchive=false
-                -p:LinuxInstallerType=deb
-                $(_BuildArgs)
-                $(_InternalRuntimeDownloadArgs)
-            displayName: Build Debian installers
-            target: debpkg
-          - script: ./eng/build.sh
-                --ci
-                --nobl
-                --arch x64
-                --build-installers
-                --no-build-deps
-                --no-build-nodejs
-                --publish
-                -p:OnlyPackPlatformSpecificPackages=true
-                -p:BuildRuntimeArchive=false
-                -p:LinuxInstallerType=rpm
-                -p:AssetManifestFileName=aspnetcore-Linux_x64.xml
-                $(_BuildArgs)
-                $(_PublishArgs)
-                $(_InternalRuntimeDownloadArgs)
-            displayName: Build RPM installers
-            target: rpmpkg
           artifacts:
           - name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/

src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj

@@ -30,8 +30,9 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(BuildInstallers)' == 'true'">
-    <BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' and '$(LinuxInstallerType)' == 'deb'">true</BuildDebPackage>
-    <BuildRpmPackage Condition="('$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64') and '$(LinuxInstallerType)' == 'rpm'">true</BuildRpmPackage>
+    <BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64'">true</BuildDebPackage>
+    <BuildRpmPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildRpmPackage>
+    <UseArcadeRpmTooling>true</UseArcadeRpmTooling>
   </PropertyGroup>
 
   <ItemGroup>
@@ -171,4 +172,15 @@
              Targets="PublishToDisk"
              Properties="OutputPath=$(TargetingPackLayoutRoot)" />
   </Target>
+
+  <Target Name="AddLinuxPackageInformation" BeforeTargets="GetDebInstallerJsonProperties;GetRpmInstallerJsonProperties">
+    <ItemGroup>
+      <RpmOwnedDirectory Include="$(LinuxInstallRoot)/packs/Microsoft.AspNetCore.App.Ref" />
+      <RpmOwnedDirectory Include="$(LinuxInstallRoot)/packs/Microsoft.AspNetCore.App.Ref/$(Version)" />
+      <RpmOwnedDirectory Include="$(LinuxInstallRoot)/packs/Microsoft.AspNetCore.App.Ref/$(Version)/data" />
+      <RpmOwnedDirectory Include="$(LinuxInstallRoot)/packs/Microsoft.AspNetCore.App.Ref/$(Version)/analyzers" />
+      <RpmOwnedDirectory Include="$(LinuxInstallRoot)/packs/Microsoft.AspNetCore.App.Ref/$(Version)/ref" />
+      <RpmOwnedDirectory Include="$(LinuxInstallRoot)/packs/Microsoft.AspNetCore.App.Ref/$(Version)/ref/$(TargetFramework)" />
+    </ItemGroup>
+  </Target>
 </Project>

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj

@@ -42,8 +42,8 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(BuildInstallers)' == 'true'">
-    <BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' and '$(LinuxInstallerType)' == 'deb'">true</BuildDebPackage>
-    <BuildRpmPackage Condition="('$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64') and '$(LinuxInstallerType)' == 'rpm'">true</BuildRpmPackage>
+    <BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64'">true</BuildDebPackage>
+    <BuildRpmPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildRpmPackage>
   </PropertyGroup>
 
   <ItemGroup>
@@ -96,4 +96,10 @@
   </Target>
 
   <Target Name="ReturnProductVersion" Returns="$(Version)" />
+
+  <Target Name="AddLinuxPackageInformation" BeforeTargets="GetDebInstallerJsonProperties;GetRpmInstallerJsonProperties">
+    <ItemGroup>
+      <RpmOwnedDirectory Include="$(LinuxInstallRoot)/shared/Microsoft.AspNetCore.App;$(LinuxInstallRoot)/shared/Microsoft.AspNetCore.App/$(Version)" />
+    </ItemGroup>
+  </Target>
 </Project>