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

dotnet · Aug 7, 2024 · 869197e · 869197e
2 parents 639c033 + 76f0ce8
commit 869197e
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -58,8 +58,8 @@ extends:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
       debian11Amd64:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64
-      fedora39:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
+      fedora40:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-40
       ubuntu2204:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
       mariner20CrossArm:
@@ -116,8 +116,8 @@ extends:
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
-            jobName: Build_Fedora_39_Debug_x64
-            container: fedora39
+            jobName: Build_Fedora_40_Debug_x64
+            container: fedora40
             buildConfiguration: Debug
             buildArchitecture: x64
             linuxPortable: true

diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml
@@ -251,14 +251,21 @@ jobs:
     continueOnError: true
     condition: succeededOrFailed()
 
+  - task: CopyFiles@2
+    inputs:
+      SourceFolder: ${{ variables.sourcesPath }}/artifacts/${{ parameters.architecture }}/Release/
+      TargetFolder: $(Build.ArtifactStagingDirectory)/publishing
+    displayName: Copy artifacts to Artifact Staging Directory
+    condition: succeededOrFailed()
+
   - ${{ if eq(variables['System.TeamProject'], 'public') }}:
     - publish: '$(Build.StagingDirectory)/BuildLogs'
       artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt)
       displayName: Publish BuildLogs
       continueOnError: true
       condition: succeededOrFailed()
 
-    - publish: '${{ variables.sourcesPath }}/artifacts/${{ parameters.architecture }}/Release/'
+    - publish: $(Build.ArtifactStagingDirectory)/publishing
       artifact: $(Agent.JobName)_Artifacts
       displayName: Publish Artifacts
       condition: succeededOrFailed()
@@ -276,7 +283,7 @@ jobs:
       publishRunAttachments: true
       testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName)
 
-  - publish: '${{ variables.sourcesPath }}/artifacts/${{ parameters.architecture }}/Release/'
+  - publish: $(Build.ArtifactStagingDirectory)/publishing
     artifact: $(Agent.JobName)_Artifacts
     displayName: Publish Artifacts
     condition: succeededOrFailed()

diff --git a/eng/pipelines/templates/variables/vmr-build.yml b/eng/pipelines/templates/variables/vmr-build.yml
@@ -1,6 +1,8 @@
 variables:
+- name: almaLinuxContainer
+  value: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build
 - name: alpineContainer
-  value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
+  value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20-withnode
 - name: centOSStreamContainer
   value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
 - name: fedoraContainer
@@ -10,17 +12,21 @@ variables:
 - name: ubuntuArmContainer
   value: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-arm64
 
+- name: almaLinuxName
+  value: AlmaLinux8
 - name: alpineName
-  value: Alpine319
+  value: Alpine320
 - name: centOSStreamName
   value: CentOSStream9
 - name: fedoraName
   value: Fedora40
 - name: ubuntuName
   value: Ubuntu2204
 
+- name: almaLinuxX64Rid
+  value: almalinux.8-x64
 - name: alpineX64Rid
-  value: alpine.3.19-x64
+  value: alpine.3.20-x64
 - name: centOSStreamX64Rid
   value: centos.9-x64
 - name: fedoraX64Rid

diff --git a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml
@@ -45,6 +45,13 @@ jobs:
     dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }}
     publishTestResultsPr: true
 
+- template: templates/jobs/sdk-diff-tests.yml
+  parameters:
+    buildName: ${{ format('{0}_Offline_MsftSdk', variables.almaLinuxName) }}
+    targetRid: ${{ variables.almaLinuxX64Rid }}
+    architecture: x64
+    dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }}
+
 - template: templates/jobs/sdk-diff-tests.yml
   parameters:
     buildName: ${{ format('{0}_Offline_MsftSdk', variables.alpineName) }}