Move all drops to a subfolder

This saves on scanning the final output folder unnecessarily.

Author: rainersigwald

azure-pipelines/.vsts-dotnet-build-jobs.yml

@@ -23,46 +23,46 @@ jobs:
   timeoutInMinutes: 180
 
   templateContext:
-    outputParentDirectory: '$(Build.SourcesDirectory)\artifacts'
+    outputParentDirectory: '$(Build.SourcesDirectory)\artifacts\official'
     outputs:
     # Publish OptProf configuration files
     - output: artifactsDrop
-      sourcePath: '$(Build.SourcesDirectory)\artifacts\OptProf\$(BuildConfiguration)\Data'
+      sourcePath: '$(Build.SourcesDirectory)\artifacts\official\OptProf\$(BuildConfiguration)\Data'
       dropServiceURI: 'https://devdiv.artifacts.visualstudio.com'
       dropMetadataContainerName: 'ProfilingInputs/DevDiv/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)'
 
     # Publish bootstrapper info for OptProf data collection run to consume
     - output: buildArtifacts
-      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\MicroBuild\Output'
+      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\official\MicroBuild\Output'
       ArtifactName: MicroBuildOutputs
 
     # RAINES TODO: switch to pipeline?
     # RAINES TODO: how to get always()?
     - output: buildArtifacts
-      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\log\$(BuildConfiguration)'
+      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\official\log\$(BuildConfiguration)'
       ArtifactName: logs
 
     # Publish test configuration for OptProf data collection
     - output: buildArtifacts
-      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(BuildConfiguration)'
+      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\official\VSSetup\$(BuildConfiguration)'
       ArtifactName: VSSetup
 
     # Archive NuGet packages to DevOps.
     # Publish our NuPkgs as an artifact. The name of this artifact must be PackageArtifacts as the
     # arcade templates depend on the name.
     - output: buildArtifacts
-      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\packages\$(BuildConfiguration)'
+      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\official\packages\$(BuildConfiguration)'
       ArtifactName: PackageArtifacts
 
     # Publish "IntelliSense" XSD files to their own artifact
     # so it can be consumed by the insertion-to-VS job
     - output: pipelineArtifact
-      targetPath: '$(Build.SourcesDirectory)\artifacts\xsd'
+      targetPath: '$(Build.SourcesDirectory)\artifacts\official\xsd'
       artifactName: xsd
 
     # Publish Asset Manifests for Build Asset Registry job
     - output: buildArtifacts
-      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\log\$(BuildConfiguration)\AssetManifest'
+      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\official\log\$(BuildConfiguration)\AssetManifest'
       ArtifactName: AssetManifests
 
   variables:
@@ -185,6 +185,51 @@ jobs:
       vsDropServiceUri: 'https://vsdrop.corp.microsoft.com/file/v1'
     condition: succeeded()
 
+  - pwsh: |
+      $ErrorActionPreference = 'Stop'
+
+      $sourceRoot = Join-Path '$(Build.SourcesDirectory)' 'artifacts'
+      $targetRoot = Join-Path $sourceRoot 'official'
+
+      if (-not (Test-Path $targetRoot)) {
+        New-Item -Path $targetRoot -ItemType Directory | Out-Null
+      }
+
+      $paths = @(
+        "OptProf/$(BuildConfiguration)/Data",
+        '$(Build.StagingDirectory)/MicroBuild/Output',
+        "log/$(BuildConfiguration)",
+        "VSSetup/$(BuildConfiguration)",
+        "packages/$(BuildConfiguration)",
+        'xsd'
+      )
+
+      foreach ($relativePath in $paths) {
+        $from = Join-Path $sourceRoot $relativePath
+        if (-not (Test-Path $from)) {
+          continue
+        }
+
+        $to = Join-Path $targetRoot $relativePath
+        $parent = Split-Path $to -Parent
+        if (-not (Test-Path $parent)) {
+          New-Item -Path $parent -ItemType Directory -Force | Out-Null
+        }
+
+        $robocopyResult = & robocopy $from $to /E /MOVE /NFL /NDL /NJH /NJS /NP
+        $exitCode = $LASTEXITCODE
+        if ($exitCode -ge 8) {
+          $robocopyResult | Out-String | Write-Host
+          throw "Robocopy failed with exit code $exitCode while moving '$relativePath'."
+        }
+
+        if (Test-Path $from) {
+          Remove-Item $from -Recurse -Force
+        }
+      }
+
+      $global:LASTEXITCODE = 0
+    displayName: 'Move build artifacts into official folder'
 
   # Tag the build at the very end when we know it's been successful.
   - task: colinsalmcorner.colinsalmcorner-buildtasks.tag-build-task.tagBuildOrRelease@0