From 80724464cb34d33fb4725346c85d7eeec282f6c0 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Wed, 12 Jul 2023 18:19:41 +0200 Subject: [PATCH 1/3] add artifacts pattern to arguments --- eng/common/templates/job/execute-sdl.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 7aabaa18017..44d9e08d208 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -129,6 +129,7 @@ jobs: overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }} executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }} overrideParameters: ${{ parameters.overrideParameters }} - additionalParameters: ${{ parameters.additionalParameters }} + additionalParameters: -ArtifactsDirectory '$(Build.ArtifactStagingDirectory)\artifacts\**' + ${{ parameters.additionalParameters }} publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }} sdlContinueOnError: ${{ parameters.sdlContinueOnError }} From 890824659f4fe69080f61f37a9e819fffe570e56 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Thu, 13 Jul 2023 11:14:44 +0200 Subject: [PATCH 2/3] set target with binskim params --- eng/common/sdl/configure-sdl-tool.ps1 | 3 --- eng/common/templates/job/execute-sdl.yml | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1 index ee9eb893321..1ebad67aa43 100644 --- a/eng/common/sdl/configure-sdl-tool.ps1 +++ b/eng/common/sdl/configure-sdl-tool.ps1 @@ -92,9 +92,6 @@ try { $tool.Args += $CodeQLAdditionalRunConfigParams } 'binskim' { - if ($targetDirectory) { - $tool.Args += "`"Target < $TargetDirectory`"" - } $tool.Args += $BinskimAdditionalRunConfigParams } } diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 44d9e08d208..7aabaa18017 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -129,7 +129,6 @@ jobs: overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }} executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }} overrideParameters: ${{ parameters.overrideParameters }} - additionalParameters: -ArtifactsDirectory '$(Build.ArtifactStagingDirectory)\artifacts\**' - ${{ parameters.additionalParameters }} + additionalParameters: ${{ parameters.additionalParameters }} publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }} sdlContinueOnError: ${{ parameters.sdlContinueOnError }} From 2d5849ca01cabf9bc0372553854d3cadabccb60f Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Fri, 14 Jul 2023 10:25:04 +0200 Subject: [PATCH 3/3] set binskim pattern --- eng/common/sdl/configure-sdl-tool.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1 index 1ebad67aa43..e4108e39d9a 100644 --- a/eng/common/sdl/configure-sdl-tool.ps1 +++ b/eng/common/sdl/configure-sdl-tool.ps1 @@ -92,6 +92,9 @@ try { $tool.Args += $CodeQLAdditionalRunConfigParams } 'binskim' { + if ($targetDirectory) { + $tool.Args += "`"Target < $TargetDirectory\**`"" + } $tool.Args += $BinskimAdditionalRunConfigParams } }