From 5922880e1b6ac1ffb4cb4fd418747ee7a5739670 Mon Sep 17 00:00:00 2001 From: Tian Liao Date: Fri, 27 Oct 2023 13:45:51 +0800 Subject: [PATCH] resolve comments --- build/pipelines/azure-pipelines.ci.yaml | 4 ---- build/pipelines/templates/build-single-architecture.yaml | 5 +++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build/pipelines/azure-pipelines.ci.yaml b/build/pipelines/azure-pipelines.ci.yaml index eaa9f054..df87562c 100644 --- a/build/pipelines/azure-pipelines.ci.yaml +++ b/build/pipelines/azure-pipelines.ci.yaml @@ -49,13 +49,11 @@ extends: - template: /build/pipelines/templates/build-single-architecture.yaml@self parameters: platform: ARM - isOSSBuild: true condition: not(eq(variables['Build.Reason'], 'PullRequest')) - template: /build/pipelines/templates/build-single-architecture.yaml@self parameters: platform: ARM64 - isOSSBuild: true condition: not(eq(variables['Build.Reason'], 'PullRequest')) - template: /build/pipelines/templates/run-ui-tests.yaml@self @@ -73,5 +71,3 @@ extends: platform: x86 - template: /build/pipelines/templates/package-msixbundle.yaml@self - parameters: - isOSSBuild: true diff --git a/build/pipelines/templates/build-single-architecture.yaml b/build/pipelines/templates/build-single-architecture.yaml index aad365ad..0528610e 100644 --- a/build/pipelines/templates/build-single-architecture.yaml +++ b/build/pipelines/templates/build-single-architecture.yaml @@ -30,7 +30,7 @@ jobs: templateContext: sdl: binskim: - analyzeTargetGlob: +:f|$(Agent.BuildDirectory)\binskim\**\*.dll;+:f|$(Agent.BuildDirectory)\binskim\**\*.exe + analyzeTargetGlob: +:f|$(Agent.BuildDirectory)\binskim\**\* outputs: - output: pipelineArtifact @@ -91,7 +91,8 @@ jobs: # - WebView2Loader.dll # - Microsoft.Web.WebView2.Core.dll Contents: | - **\* + **\*.dll + **\*.exe !**\clrcompression.dll !**\WebView2Loader.dll !**\Microsoft.Web.WebView2.Core.dll