[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' (#20642)

Author: SimonZhao888

.vsts-ci.yml

@@ -281,7 +281,7 @@ extends:
             buildArchitecture: x64
             # Do not publish zips and tarballs. The linux-x64 binaries are
             # already published by Build_LinuxPortable_Release_x64
-            additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true'
+            additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkRpm=true'
             linuxPortable: true
             runTests: false
         - template: eng/build.yml@self
@@ -294,7 +294,7 @@ extends:
             runtimeIdentifier: 'linux-arm64'
             # Do not publish zips and tarballs. The linux-x64 binaries are
             # already published by Build_LinuxPortable_Release_x64
-            additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true  /p:IsRPMBasedDistro=true'
+            additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true  /p:BuildSdkRpm=true'
             linuxPortable: true
             runTests: false
         - template: eng/build.yml@self

.vsts-pr.yml

@@ -249,7 +249,7 @@ stages:
         buildArchitecture: x64
         # Do not publish zips and tarballs. The linux-x64 binaries are
         # already published by Build_LinuxPortable_Release_x64
-        additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true'
+        additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkRpm=true'
         linuxPortable: true
         runTests: false
     - template: eng/build-pr.yml
@@ -262,7 +262,7 @@ stages:
         runtimeIdentifier: 'linux-arm64'
         # Do not publish zips and tarballs. The linux-x64 binaries are
         # already published by Build_LinuxPortable_Release_x64
-        additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true  /p:IsRPMBasedDistro=true'
+        additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true  /p:BuildSdkRpm=true'
         linuxPortable: true
         runTests: false
     - template: eng/build-pr.yml

eng/build.yml

@@ -93,7 +93,7 @@ jobs:
       pool:
         ${{ if eq(variables['System.TeamProject'], 'public') }}:
           name: $(DncEngPublicBuildPool)
-          image: 1es-ubuntu-2004-open
+          image: 1es-ubuntu-2204-open
           os: linux
         ${{ if eq(variables['System.TeamProject'], 'internal') }}:
           name: $(DncEngInternalBuildPool)

src/redist/targets/GenerateRPMs.targets

@@ -16,12 +16,12 @@
        build environment. https://github.com/dotnet/sdk/issues/41910 -->
   <Target Name="GenerateRpmsInner"
           DependsOnTargets="TestFPMTool;BuildRpms"
-          Condition=" '$(IsRPMBasedDistro)' == 'True' "
+          Condition=" '$(BuildSdkRpm)' == 'True' "
           Outputs="@(GeneratedInstallers)"/>
 
   <Target Name="BuildRpms"
           DependsOnTargets="GenerateSdkRpm"
-          Condition=" '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' "/>
+          Condition=" '$(BuildSdkRpm)' == 'True' and '$(FPMPresent)' == 'True' "/>
 
   <Target Name="GenerateSdkRpm"
           DependsOnTargets="SetupRpmProps">
@@ -317,14 +317,12 @@
       <FPMPresent Condition=" '$(FPMExitCode)' == '0' ">True</FPMPresent>
     </PropertyGroup>
 
-    <!-- Workaround for Jenkins machines that don't have the necessary packages https://github.com/dotnet/core-setup/issues/2260 -->
-    <Message Condition=" '$(FPMPresent)' != 'True' "
-             Text="FPM tool Not found, RPM packages will not be built."
-             Importance="High"/>
+    <Error Condition=" '$(FPMPresent)' != 'True' "
+           Text="FPM tool Not found, RPM packages will not be built." />
   </Target>
 
   <Target Name="TestSdkRpm"
-          Condition="  '$(CLIBUILD_SKIP_TESTS)' != 'true' and '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' "
+          Condition="  '$(CLIBUILD_SKIP_TESTS)' != 'true' and '$(BuildSdkRpm)' == 'True' and '$(FPMPresent)' == 'True' "
           Inputs="$(DownloadedNetCoreAppTargetingPackInstallerFile);
                   $(DownloadedNetStandardTargetingPackInstallerFile);
                   $(DownloadedNetCoreAppHostPackInstallerFile);