Replace Step_CopyExtraResultFilesForCI with a YAML template

build-tools/automation/yaml-templates/copy-extra-result-files.yaml

@@ -0,0 +1,113 @@
+parameters:
+ xaSourcePath: $(System.DefaultWorkingDirectory)
+ configuration: $(XA.Build.Configuration)
+ condition: or(ne(variables['Agent.JobStatus'], 'Succeeded'), eq(variables['XA.PublishAllLogs'], 'true'))
+
+# Copies extra build and test result files into $(Build.StagingDirectory) so
+# they can be uploaded as pipeline artifacts. This template replaces the old
+# `Step_CopyExtraResultFilesForCI` xaprepare step.
+steps:
+# Build-side files: configuration files scattered across the source tree.
+# Preserve the relative paths so e.g. external/.../config.log lands at
+# Build$(Configuration)/external/.../config.log.
+- task: CopyFiles@2
+ displayName: Copy extra build result files (preserve paths)
+ condition: ${{ parameters.condition }}
+ continueOnError: true
+ inputs:
+ sourceFolder: ${{ parameters.xaSourcePath }}
+ contents: |
+ **/Configuration.OperatingSystem.props
+ **/Configuration.Override.props
+ **/config.log
+ **/config.status
+ **/config.h
+ **/android-*.config.cache
+ CMakeFiles/*.log
+ external/Java.Interop/bin/Build${{ parameters.configuration }}/*.props
+ targetFolder: $(Build.StagingDirectory)/Build${{ parameters.configuration }}
+ flattenFolders: false
+
+# Build-side files from bin/Build$(Configuration); flat at the destination
+# root. Use the repo root as sourceFolder so a missing
+# bin/Build$(Configuration) is just 0 matches rather than a hard error
+# (matches the old C# Directory.Exists guard).
+- task: CopyFiles@2
+ displayName: Copy bin/Build$(Configuration) result files
+ condition: ${{ parameters.condition }}
+ continueOnError: true
+ inputs:
+ sourceFolder: ${{ parameters.xaSourcePath }}
+ contents: |
+ bin/Build${{ parameters.configuration }}/XABuildConfig.cs
+ bin/Build${{ parameters.configuration }}/*.binlog
+ bin/Build${{ parameters.configuration }}/prepare*log
+ bin/Build${{ parameters.configuration }}/*.json
+ bin/Build${{ parameters.configuration }}/*.mk
+ bin/Build${{ parameters.configuration }}/*.projitems
+ bin/Build${{ parameters.configuration }}/*.cmake
+ bin/Build${{ parameters.configuration }}/*.targets
+ bin/Build${{ parameters.configuration }}/CMakeCache.txt
+ bin/Build${{ parameters.configuration }}/.ninja_log
+ bin/Build${{ parameters.configuration }}/clang-tidy*.log
+ targetFolder: $(Build.StagingDirectory)/Build${{ parameters.configuration }}
+ flattenFolders: true
+
+# Test-side files from bin/Test$(Configuration); top-level only, flat.
+# Same pattern: sourceFolder is the repo root so missing folders don't error.
+- task: CopyFiles@2
+ displayName: Copy bin/Test$(Configuration) result files
+ condition: ${{ parameters.condition }}
+ continueOnError: true
+ inputs:
+ sourceFolder: ${{ parameters.xaSourcePath }}
+ contents: |
+ bin/Test${{ parameters.configuration }}/*.apkdesc
+ bin/Test${{ parameters.configuration }}/*.aabdesc
+ bin/Test${{ parameters.configuration }}/logcat-*.txt
+ bin/Test${{ parameters.configuration }}/*log
+ bin/Test${{ parameters.configuration }}/TestOutput-*.txt
+ bin/Test${{ parameters.configuration }}/Timing_*
+ bin/Test${{ parameters.configuration }}/*.runsettings
+ targetFolder: $(Build.StagingDirectory)/Test${{ parameters.configuration }}
+ flattenFolders: true
+
+# Test-side compatibility subfolder. sourceFolder at the repo root so a
+# missing compatibility/ doesn't error.
+- task: CopyFiles@2
+ displayName: Copy bin/Test$(Configuration)/compatibility files
+ condition: ${{ parameters.condition }}
+ continueOnError: true
+ inputs:
+ sourceFolder: ${{ parameters.xaSourcePath }}
+ contents: bin/Test${{ parameters.configuration }}/compatibility/*
+ targetFolder: $(Build.StagingDirectory)/Test${{ parameters.configuration }}/compatibility
+ flattenFolders: true
+
+# Repo-root TestResult*.xml and *.csv files into test-extras (top-level only).
+- task: CopyFiles@2
+ displayName: Copy TestResult*.xml and *.csv to test-extras
+ condition: ${{ parameters.condition }}
+ continueOnError: true
+ inputs:
+ sourceFolder: ${{ parameters.xaSourcePath }}
+ contents: |
+ TestResult*.xml
+ *.csv
+ targetFolder: $(Build.StagingDirectory)/Test${{ parameters.configuration }}/test-extras
+ flattenFolders: true
+
+# Stray llc.exe-* files from the system temp directory (matches Path.GetTempPath()).
+- pwsh: |
+ $tempDir = [System.IO.Path]::GetTempPath()
+ $destDir = "$(Build.StagingDirectory)/Test${{ parameters.configuration }}/test-extras"
+ if (Test-Path $tempDir) {
+ $llcFiles = Get-ChildItem -Path $tempDir -Filter 'llc.exe-*' -File -ErrorAction SilentlyContinue
+ if ($llcFiles) {
+ New-Item -ItemType Directory -Force -Path $destDir | Out-Null
+ $llcFiles | ForEach-Object { Copy-Item -LiteralPath $_.FullName -Destination $destDir -Force -ErrorAction SilentlyContinue }
+ }
+ }
+ displayName: Copy llc.exe-* temp files to test-extras
+ condition: ${{ parameters.condition }}
+ continueOnError: true

build-tools/automation/yaml-templates/upload-results.yaml

@@ -7,12 +7,10 @@ parameters:
  use1ESTemplate: true
 
 steps:
-- template: /build-tools/automation/yaml-templates/run-xaprepare.yaml
+- template: /build-tools/automation/yaml-templates/copy-extra-result-files.yaml
  parameters:
  configuration: ${{ parameters.configuration }}
- arguments: --s=CopyExtraResultFilesForCI --verbosity v
  xaSourcePath: ${{ parameters.xaSourcePath }}
- displayName: Copy extra result files
  condition: ${{ parameters.condition }}
 
 - ${{ if eq(parameters.includeBuildResults, false) }}:

build-tools/xaprepare/xaprepare/Application/Utilities.cs

@@ -290,19 +290,6 @@ public static void CreateDirectory (string? directoryPath)
  Directory.CreateDirectory (directoryPath);
  }
 
- public static void CopyFilesSimple (IEnumerable<string> sourceFiles, string destinationDirectory, bool overwriteDestinationFile = true)
- {
- if (sourceFiles == null)
- throw new ArgumentNullException (nameof (sourceFiles));
- if (String.IsNullOrEmpty (destinationDirectory))
- throw new ArgumentException ("must not be null or empty", nameof (destinationDirectory));
-
- CreateDirectory (destinationDirectory);
- foreach (string src in sourceFiles) {
- CopyFileInternal (src, destinationDirectory, destinationFileName: String.Empty, overwriteDestinationFile: overwriteDestinationFile);
- }
- }
-
  public static void CopyFile (string sourceFilePath, string destinationFilePath, bool overwriteDestinationFile = true)
  {
  if (String.IsNullOrEmpty (sourceFilePath))