Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,14 @@ jobs:
- template: /eng/pipelines/onebranch/steps/esrp-code-signing-step.yml@self
parameters:
artifactType: dll
sourceRoot: $(BUILD_OUTPUT)
dllPattern: 'Microsoft.Data.SqlClient.dll'

- template: /eng/pipelines/onebranch/steps/esrp-code-signing-step.yml@self
parameters:
artifactType: dll
sourceRoot: $(BUILD_OUTPUT)
dllPattern: 'Microsoft.Data.SqlClient.resources.dll'

- template: /eng/pipelines/common/templates/steps/generate-nuget-package-step.yml@self
parameters:
Expand All @@ -106,7 +114,7 @@ jobs:
displayName: Copy DLLs for APIScan
inputs:
SourceFolder: $(BUILD_OUTPUT)/Package/bin
Contents: '**/Microsoft.Data.SqlClient*.dll'
Contents: '**/Microsoft.Data.SqlClient.dll'
TargetFolder: $(ob_sdl_apiscan_softwareFolder)
# We must preserve the folder structure since our C# projects may produce multiple
# identically named DLLs for different target frameworks (e.g. netstandard2.0, net5.0,
Expand All @@ -117,7 +125,7 @@ jobs:
displayName: Copy PDBs for APIScan
inputs:
SourceFolder: $(BUILD_OUTPUT)/Package/bin
Contents: '**/Microsoft.Data.SqlClient*.pdb'
Contents: '**/Microsoft.Data.SqlClient.pdb'
TargetFolder: $(ob_sdl_apiscan_symbolsFolder)
flattenFolders: false

Expand Down
8 changes: 6 additions & 2 deletions eng/pipelines/onebranch/steps/esrp-code-signing-step.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ parameters:
type: string
default: $(REPO_ROOT)

- name: dllPattern
type: string
default: 'Microsoft.Data.SqlClient*.dll'

- name: artifactDirectory
type: string
default: $(PACK_OUTPUT)
Expand Down Expand Up @@ -53,7 +57,7 @@ steps:
EsrpClientId: '${{parameters.EsrpClientId }}'
UseMSIAuthentication: true
FolderPath: '${{parameters.sourceRoot }}'
Pattern: 'Microsoft.Data.SqlClient*.dll'
Pattern: '${{ parameters.dllPattern }}'
CleanupTempStorage: 1
VerboseLogin: 1

Expand All @@ -69,7 +73,7 @@ steps:
AuthAKVName: '${{parameters.AuthAKVName }}'
AuthSignCertName: '${{parameters.AuthSignCertName }}'
FolderPath: '${{parameters.sourceRoot }}'
Pattern: 'Microsoft.Data.SqlClient*.dll'
Pattern: '${{ parameters.dllPattern }}'
signConfigType: inlineSignParams
inlineOperation: |
[
Expand Down
Loading