Update publishing

Author: NikolaMilosavljevic

.vsts-ci.yml

@@ -156,10 +156,16 @@ extends:
                 codesign -dv --verbose=4 artifacts/layout/dotnet-core-uninstall/dotnet-core-uninstall
               name: VerifySignature
               displayName: Verify Signature
+            - task: CopyFiles@2
+              condition: eq(variables['system.pullrequest.isfork'], false)
+              inputs:
+                sourceFolder: 'artifacts/layout/'
+                contents: '*.tar.gz'
+                targetFolder: '$(Build.ArtifactStagingDirectory)/artifacts'
             - task: 1ES.PublishBuildArtifacts@1
               condition: eq(variables['system.pullrequest.isfork'], false)
               inputs:
-                PathtoPublish: 'artifacts/layout/dotnet-core-uninstall-$(_RID).tar.gz'
+                PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
                 ArtifactName: 'drop-$(_RID)'
                 publishLocation: 'Container'
                 parallel: true

.vsts-pr.yml

@@ -135,15 +135,12 @@ stages:
             --prepareMachine
             /p:RID=$(_RID)
           displayName: Build
-        - task: ArchiveFiles@2
+        - task: CopyFiles@2
           condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
           inputs:
-            rootFolderOrFile: 'artifacts/layout/dotnet-core-uninstall/'
-            includeRootFolder: false
-            archiveType: 'tar'
-            tarCompression: 'gz'
-            archiveFile: '$(Build.ArtifactStagingDirectory)/dotnet-core-uninstall.tar.gz'
-            replaceExistingArchive: true
+            sourceFolder: 'artifacts/layout/'
+            contents: '*.tar.gz'
+            targetFolder: '$(Build.ArtifactStagingDirectory)/artifacts'
         - task: PublishBuildArtifacts@1
           condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
           inputs: