[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' (#20511)

Author: SimonZhao888

.vsts-ci.yml

@@ -122,12 +122,13 @@ extends:
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
-            jobName: Build_CentOS_8_Stream_Debug_x64
-            container: centosStream8
+            jobName: Build_CentOS_Stream_9_Debug_x64
+            container: centosStream9
             buildConfiguration: Debug
             buildArchitecture: x64
             linuxPortable: false
             runTests: true
+            additionalBuildParameters: '/p:OSName=centos.8'
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux

.vsts-pr.yml

@@ -89,8 +89,8 @@ stages:
     - template: eng/build-pr.yml
       parameters:
         agentOs: Linux
-        jobName: Build_CentOS_8_Stream_Debug_x64
-        container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
+        jobName: Build_CentOS_Stream_9_Debug_x64
+        container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
         buildConfiguration: Debug
         buildArchitecture: x64
         linuxPortable: false

src/SourceBuild/content/README.md

@@ -123,11 +123,11 @@ You can also build the repository using a Docker image which has the required pr
 The example below creates a Docker volume named `vmr` and clones and builds the VMR there.
 
 ```sh
-docker run --rm -it -v vmr:/vmr -w /vmr mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
+docker run --rm -it -v vmr:/vmr -w /vmr mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
 git clone https://github.com/dotnet/dotnet .
 ./prep.sh && ./build.sh --online
 mkdir -p $HOME/.dotnet
-tar -zxf artifacts/x64/Release/dotnet-sdk-8.0.100-centos.8-x64.tar.gz -C $HOME/.dotnet
+tar -zxf artifacts/x64/Release/dotnet-sdk-8.0.100-centos.9-x64.tar.gz -C $HOME/.dotnet
 ln -s $HOME/.dotnet/dotnet /usr/bin/dotnet
 ```
 

src/redist/targets/GenerateLayout.targets

@@ -50,7 +50,9 @@
       <SharedFrameworkInstallerFileRid Condition=" '$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true' ">$(InstallerTargetArchitecture)</SharedFrameworkInstallerFileRid>
 
       <!-- Use the "x64" Rid when downloading Linux runtime dependencies Debian package. -->
+      <!-- Use centos 8 rid as runtime doesn't float based on the version -->
       <RuntimeDepsInstallerFileRid>$(CoreSetupRid)</RuntimeDepsInstallerFileRid>
+      <RuntimeDepsInstallerFileRid Condition=" '$(CoreSetupRid)' == 'centos.9-x64' ">centos.8-x64</RuntimeDepsInstallerFileRid>
       <RuntimeDepsInstallerFileRid Condition=" '$(IsDebianBaseDistro)' == 'true' ">$(Architecture)</RuntimeDepsInstallerFileRid>
       <RuntimeDepsInstallerFileRid Condition=" '$(IsRPMBasedDistro)' == 'true' And '$(UsePortableLinuxSharedFramework)' != 'true' ">$(OSName)-$(InstallerTargetArchitecture)</RuntimeDepsInstallerFileRid>
       <RuntimeDepsInstallerFileRid Condition=" '$(CoreSetupRid)' == 'rhel.7-x64' And '$(Architecture)' == 'Arm64' And '$(UsePortableLinuxSharedFramework)' == 'true' ">rhel.7-aarch64</RuntimeDepsInstallerFileRid>