Fix artifact publishing.

diff --git a/.vsts-dotnet.yml b/.vsts-dotnet.yml
index 1974e6e276308b55d008305f6c5141f88c6264ee..ef01bcf30bcb11d0a21daa28c3a61d899ba05927 100644 (file)
--- a/.vsts-dotnet.yml
+++ b/.vsts-dotnet.yml
@@ -247,14 +247,14 @@ phases:
   - task: DownloadBuildArtifacts@0
     displayName: Download Windows x64 and Managed Artifacts
     inputs:
-      artifactName: Windows_Build_Release
+      artifactName: Windows_x64_Release
       downloadPath: '$(System.ArtifactsDirectory)'
     condition: succeeded()
 
   - task: CopyFiles@2
     displayName: Copy Windows Artifacts
     inputs:
-      sourceFolder: '$(System.ArtifactsDirectory)/Windows_Build_Release'
+      sourceFolder: '$(System.ArtifactsDirectory)/Windows_x64_Release'
       targetFolder: '$(Build.SourcesDirectory)/artifacts/bin'
     condition: succeeded()
 
@@ -289,14 +289,14 @@ phases:
   - task: DownloadBuildArtifacts@0
     displayName: Download Windows x86 Artifacts
     inputs:
-      artifactName: Windows_Build_Release_x86
+      artifactName: Windows_x86_Release
       downloadPath: '$(System.ArtifactsDirectory)'
     condition: succeeded()
 
   - task: CopyFiles@2
     displayName: Copy Windows x86 Artifacts
     inputs:
-      sourceFolder: '$(System.ArtifactsDirectory)/Windows_Build_Release_x86'
+      sourceFolder: '$(System.ArtifactsDirectory)/Windows_x86_Release'
       contents: 'sos.dll'
       targetFolder: '$(Build.SourcesDirectory)/artifacts/bin/Windows_NT.x86.Release'
     condition: succeeded()
@@ -330,14 +330,14 @@ phases:
   - task: DownloadBuildArtifacts@0
     displayName: Download Linux Artifacts
     inputs:
-      artifactName: CentOS_7_Build_Release
+      artifactName: CentOS_7_x64_Release
       downloadPath: '$(System.ArtifactsDirectory)'
     condition: succeeded()
 
   - task: CopyFiles@2
     displayName: Copy Linux Artifacts
     inputs:
-      sourceFolder: '$(System.ArtifactsDirectory)/CentOS_7_Build_Release'
+      sourceFolder: '$(System.ArtifactsDirectory)/CentOS_7_x64_Release'
       contents: ?(libsos.so|libsosplugin.so|sosdocsunix.txt)
       targetFolder: '$(Build.SourcesDirectory)/artifacts/bin/Linux.x64.Release'
     condition: succeeded()
@@ -365,14 +365,14 @@ phases:
   - task: DownloadBuildArtifacts@0
     displayName: Download MacOS Artifacts
     inputs:
-      artifactName: MacOS_Build_Release
+      artifactName: MacOS_x64_Release
       downloadPath: '$(System.ArtifactsDirectory)'
     condition: succeeded()
 
   - task: CopyFiles@2
     displayName: Copy MacOS Artifacts
     inputs:
-      sourceFolder: '$(System.ArtifactsDirectory)/MacOS_Build_Release'
+      sourceFolder: '$(System.ArtifactsDirectory)/MacOS_x64_Release'
       contents: ?(libsos.dylib|libsosplugin.dylib|sosdocsunix.txt)
       targetFolder: '$(Build.SourcesDirectory)/artifacts/bin/OSX.x64.Release'
     condition: succeeded()

diff --git a/eng/build.yml b/eng/build.yml
index 92b148e3a9039f79b499a1a4b013dd2da4580069..31b2e4aecb283bb9ebd80358abda509158461517 100644 (file)
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -44,7 +44,7 @@ phases:
 
     variables: 
       ${{ insert }}: ${{ parameters.variables }}
-      _PortableLinuxBuild: CentOS_7_$(_BuildConfig)
+      _PortableLinuxBuild: CentOS_7_$(BuildArch)_$(_BuildConfig)
       _DockerImageName: ${{ parameters.dockerImage }}
       _PhaseName : ${{ parameters.name }}
       _HelixType: build/product
@@ -130,7 +130,7 @@ phases:
       displayName: Upload Artifacts
       inputs:
         pathtoPublish: '$(Build.SourcesDirectory)/artifacts/$(_PublishArtifacts)'
-        artifactName: $(_PhaseName)_$(_BuildConfig)
+        artifactName: $(_PhaseName)_$(_BuildArch)_$(_BuildConfig)
       condition: and(succeeded(), ne(variables['_PublishArtifacts'], ''))
 
     - task: CopyFiles@2
@@ -147,6 +147,6 @@ phases:
       inputs:
         PathtoPublish: '$(Build.StagingDirectory)/BuildLogs'
         PublishLocation: Container
-        ArtifactName: Logs_$(_PhaseName)_$(_BuildConfig)
+        ArtifactName: Logs_$(_PhaseName)_$(_BuildArch)_$(_BuildConfig)
       continueOnError: true
       condition: always()