Skip to content

Commit 8037c1f

Browse files
authored
[APIScan] Scan extra symbols and update parameters (#8812)
Updates the task parameters for API Scan to better match those used for VS scanning, which should allow us to only have to maintain one SEL. Additional symbols files from the latest binutils package are also now included.
1 parent 6d2a4bb commit 8037c1f

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

build-tools/automation/azure-pipelines-nightly.yaml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,11 @@ stages:
294294
timeoutInMinutes: 480
295295
workspace:
296296
clean: all
297+
variables:
298+
- name: ApiScanSoftwareName
299+
value: VS
300+
- name: ApiScanSoftwareVersion
301+
value: 17.10
297302
steps:
298303
- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
299304
parameters:
@@ -317,21 +322,21 @@ stages:
317322
Contents: |
318323
$(System.DefaultWorkingDirectory)\bin\$(XA.Build.Configuration)\dotnet\packs\Microsoft.Android*\**\?(*.dll|*.exe|*.pdb)
319324
$(System.DefaultWorkingDirectory)\binutils-pdb\*.pdb
320-
TargetFolder: $(Build.StagingDirectory)\apiscan
325+
TargetFolder: $(Agent.TempDirectory)\T
321326
OverWrite: true
322327
flattenFolders: true
323328

324-
- pwsh: Get-ChildItem -Path "$(Build.StagingDirectory)\apiscan" -Recurse
329+
- pwsh: Get-ChildItem -Path "$(Agent.TempDirectory)\T" -Recurse
325330
displayName: List Files for APIScan
326331

327332
### Run latest version of APIScan listed at https://www.1eswiki.com/wiki/APIScan_Build_Task
328333
- task: APIScan@2
329334
displayName: Run APIScan
330335
inputs:
331-
softwareFolder: $(Build.StagingDirectory)\apiscan
332-
symbolsFolder: 'SRV*http://symweb;$(Build.StagingDirectory)\apiscan'
333-
softwareName: $(ApiScanName)
334-
softwareVersionNum: $(Build.SourceBranchName)-$(Build.SourceVersion)$(System.JobAttempt)
336+
softwareFolder: $(Agent.TempDirectory)\T
337+
symbolsFolder: 'SRV*http://symweb;$(Agent.TempDirectory)\T'
338+
softwareName: $(ApiScanSoftwareName)
339+
softwareVersionNum: $(ApiScanSoftwareVersion)
335340
isLargeApp: true
336341
toolVersion: Latest
337342
env:

build-tools/xaprepare/xaprepare/Steps/Step_InstallGNUBinutils.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,11 @@ void CopyTools (string prefix)
122122
Utilities.CopyFile (toolSourcePath, toolDestinationPath);
123123
Utilities.CopyFile (toolSourcePdbPath, toolDestinationPdbPath);
124124
}
125+
// Copy PDB files for tools that have been renamed
126+
if (isWindows) {
127+
Utilities.CopyFile (Path.Combine (sourcePath, "lld.pdb"), Path.Combine (symbolArchiveDir, "lld.pdb"));
128+
Utilities.CopyFile (Path.Combine (sourcePath, "llvm-objcopy.pdb"), Path.Combine (symbolArchiveDir, "llvm-objcopy.pdb"));
129+
}
125130
}
126131
}
127132

0 commit comments

Comments
 (0)