diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml index 3971c55884..af8d42c7c0 100644 --- a/tools/releaseBuild/azureDevOps/templates/linux.yml +++ b/tools/releaseBuild/azureDevOps/templates/linux.yml @@ -112,7 +112,7 @@ jobs: - task: AzureFileCopy@4 displayName: 'Upload to Azure - DEB and tar.gz' inputs: - SourcePath: '$(System.ArtifactsDirectory)\finished\release' + SourcePath: '$(System.ArtifactsDirectory)\finished\release\*' azureSubscription: '$(AzureFileCopySubscription)' Destination: AzureBlob storage: '$(StorageAccount)' @@ -125,7 +125,7 @@ jobs: - task: AzureFileCopy@4 displayName: 'Upload to Azure - RPM - Unsigned' inputs: - SourcePath: '$(System.ArtifactsDirectory)\rpm\release' + SourcePath: '$(System.ArtifactsDirectory)\rpm\release\*' azureSubscription: '$(AzureFileCopySubscription)' Destination: AzureBlob storage: '$(StorageAccount)' @@ -135,7 +135,7 @@ jobs: - task: AzureFileCopy@4 displayName: 'Upload to Azure - RPM - Signed' inputs: - SourcePath: '$(Build.StagingDirectory)\signedPackages' + SourcePath: '$(Build.StagingDirectory)\signedPackages\*' azureSubscription: '$(AzureFileCopySubscription)' Destination: AzureBlob storage: '$(StorageAccount)' diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml index 32cafd1642..0a5d30312b 100644 --- a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml +++ b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml @@ -68,8 +68,8 @@ jobs: $destination = "$(System.ArtifactsDirectory)\azureMacOs" New-Item -Path $destination -Type Directory $zipPath = dir "$(Build.StagingDirectory)\signedMacOSPackages\powershell-*.zip" -Recurse | select-object -expandproperty fullname - Expand-Archive -Path $zipPath -DestinationPath $destination - $targzPath = dir "$(System.ArtifactsDirectory)\*.tar.gz" -Recurse | select-object -expandproperty fullname + foreach ($z in $zipPath) { Expand-Archive -Path $z -DestinationPath $destination } + $targzPath = dir "$(System.ArtifactsDirectory)\*osx*.tar.gz" -Recurse | select-object -expandproperty fullname Copy-Item -Path $targzPath -Destination $destination displayName: 'Extract and copy macOS artifacts for upload' condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true')) @@ -90,7 +90,7 @@ jobs: - task: AzureFileCopy@4 displayName: 'AzureBlob File Copy - unsigned' inputs: - SourcePath: '$(Build.StagingDirectory)\macos-unsigned' + SourcePath: '$(Build.StagingDirectory)\macos-unsigned\*' azureSubscription: '$(AzureFileCopySubscription)' Destination: AzureBlob storage: '$(StorageAccount)' @@ -100,7 +100,7 @@ jobs: - task: AzureFileCopy@4 displayName: 'AzureBlob File Copy - signed' inputs: - SourcePath: '$(System.ArtifactsDirectory)\azureMacOs' + SourcePath: '$(System.ArtifactsDirectory)\azureMacOs\*' azureSubscription: '$(AzureFileCopySubscription)' Destination: AzureBlob storage: '$(StorageAccount)' diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml index d7f834d692..83ff3860ec 100644 --- a/tools/releaseBuild/azureDevOps/templates/nuget.yml +++ b/tools/releaseBuild/azureDevOps/templates/nuget.yml @@ -205,7 +205,7 @@ jobs: - task: AzureFileCopy@4 displayName: 'Upload NuGet packages to Azure' inputs: - SourcePath: '$(System.ArtifactsDirectory)\signed\' + SourcePath: '$(System.ArtifactsDirectory)\signed\*' azureSubscription: '$(AzureFileCopySubscription)' Destination: AzureBlob storage: '$(StorageAccount)' @@ -215,7 +215,7 @@ jobs: - task: AzureFileCopy@4 displayName: 'Upload global tool packages to Azure' inputs: - sourcePath: '$(System.ArtifactsDirectory)\signed\globaltool' + sourcePath: '$(System.ArtifactsDirectory)\signed\globaltool\*' azureSubscription: '$(GlobalToolSubscription)' Destination: AzureBlob storage: '$(GlobalToolStorageAccount)'