Skip to content

Commit f05be20

Browse files
Merged PR 4529: eng | fix a few issues and improvements
- Fixed a typo, publish symbols, and commit number - Updated the cron for daily run in case of any code changes, besides the weekly run - Added parameters instead of pipeline's variables - TSA, SBOM, and CodeQL tools moved out of the `syncSdl` for compatibility with OneBranch's NonOfficial template Related work items: #29920
1 parent 4bce7de commit f05be20

File tree

5 files changed

+69
-21
lines changed

5 files changed

+69
-21
lines changed

eng/pipelines/common/templates/jobs/build-signed-akv-package-job.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
# The .NET Foundation licenses this file to you under the MIT license. #
44
# See the LICENSE file in the project root for more information. #
55
#################################################################################
6+
parameters:
7+
- name: symbolsFolder
8+
type: string
9+
default: symbols
10+
11+
- name: softwareFolder
12+
type: string
13+
default: software
14+
15+
- name: publishSymbols
16+
type: boolean
17+
618
jobs:
719
- job: build_signed_akv_package
820
pool:
@@ -54,6 +66,7 @@ jobs:
5466
referenceType: package
5567
symbolsVersion: ${{variables.AKVNuGetPackageVersion }}
5668
product: AKV
69+
publishSymbols: ${{ parameters['PublishSymbols'] }}
5770

5871
# Publish symbols to public server
5972
- template: ../steps/publish-symbols-step.yml@self
@@ -62,3 +75,4 @@ jobs:
6275
referenceType: package
6376
symbolsVersion: ${{variables.AKVNuGetPackageVersion }}
6477
product: AKV
78+
publishSymbols: ${{ parameters['PublishSymbols'] }}

eng/pipelines/common/templates/jobs/build-signed-package-job.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@ parameters:
77
- name: symbolsFolder
88
type: string
99
default: symbols
10+
1011
- name: softwareFolder
1112
type: string
1213
default: software
1314

15+
- name: publishSymbols
16+
type: boolean
17+
1418
jobs:
1519
- job: build_signed_package
1620
pool:
@@ -49,7 +53,10 @@ jobs:
4953
- template: ../steps/publish-symbols-step.yml@self
5054
parameters:
5155
SymAccount: $(PrivateSymAccount)
56+
publishSymbols: ${{ parameters['PublishSymbols'] }}
57+
5258
# Publish symbols to public server
5359
- template: ../steps/publish-symbols-step.yml@self
5460
parameters:
5561
SymAccount: $(PublicSymAccount)
62+
publishSymbols: ${{ parameters['PublishSymbols'] }}

eng/pipelines/common/templates/steps/generate-nuget-package-step.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
# See the LICENSE file in the project root for more information. #
55
#################################################################################
66
parameters:
7-
- name: CommitHead
8-
type: string
9-
default: '' # the value will grab from the repo's head
10-
117
- name: nuspecPath
128
type: string
139
default: '$(nuspecPath)'
@@ -43,4 +39,4 @@ steps:
4339
displayName: 'NuGet pack with snupkg'
4440
inputs:
4541
command: custom
46-
arguments: 'pack -Symbols -SymbolPackageFormat snupkg ${{parameters.nuspecPath}} -Version ${{parameters.NugetPackageVersion}} -OutputDirectory ${{parameters.OutputDirectory}} -properties "COMMITID=${{parameters.CommitHead}};Configuration=${{parameters.Configuration}};ReferenceType=${{parameters.referenceType}}"'
42+
arguments: 'pack -Symbols -SymbolPackageFormat snupkg ${{parameters.nuspecPath}} -Version ${{parameters.NugetPackageVersion}} -OutputDirectory ${{parameters.OutputDirectory}} -properties "COMMITID=$(CommitHead);Configuration=${{parameters.Configuration}};ReferenceType=${{parameters.referenceType}}"'

eng/pipelines/common/templates/steps/publish-symbols-step.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ parameters:
77
- name: SymAccount
88
type: string
99

10-
- name: PublishSymbols
10+
- name: publishSymbols
1111
type: string
1212
default: '$(PublishSymbols)'
1313

@@ -31,6 +31,7 @@ parameters:
3131
steps:
3232
- powershell: 'Write-Host "##vso[task.setvariable variable=ArtifactServices.Symbol.AccountName;]${{parameters.SymAccount}}"'
3333
displayName: 'Update Symbol.AccountName ${{parameters.SymAccount}}'
34+
condition: and(succeeded(), ${{ eq(parameters.publishSymbols, 'true') }})
3435

3536
- ${{ if eq(parameters.product, 'MDS') }}:
3637
- task: PublishSymbols@2
@@ -45,7 +46,7 @@ steps:
4546
SymbolsMaximumWaitTime: 60
4647
SymbolsProduct: Microsoft.Data.SqlClient
4748
SymbolsVersion: '{{parameters.symbolsVersion }}'
48-
condition: and(succeeded(), eq('${{ parameters.PublishSymbols }}', 'true'))
49+
condition: and(succeeded(), ${{ eq(parameters.publishSymbols, 'true') }})
4950

5051
- ${{ if eq(parameters.product, 'AKV') }}:
5152
- task: PublishSymbols@2
@@ -60,4 +61,4 @@ steps:
6061
SymbolsMaximumWaitTime: 60
6162
SymbolsProduct: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
6263
SymbolsVersion: '{{parameters.symbolsVersion }}'
63-
condition: and(succeeded(), eq('${{ parameters.PublishSymbols }}', 'true'))
64+
condition: and(succeeded(), ${{ eq(parameters.publishSymbols, 'true') }})

eng/pipelines/dotnet-sqlclient-signing-pipeline.yml

Lines changed: 43 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ trigger:
1010
include:
1111
- internal/main
1212
paths:
13-
exclude:
13+
include:
1414
- src
1515
- eng
1616
- tools
@@ -21,8 +21,15 @@ trigger:
2121
- '*.sh'
2222

2323
schedules:
24-
- cron: '30 21 * * 0'
25-
displayName: Weekly Sunday 9:30 pm Build
24+
- cron: '30 4 * * Mon'
25+
displayName: Weekly Sunday 9:30 PM (UTC - 7) Build
26+
branches:
27+
include:
28+
- internal/main
29+
always: true
30+
31+
- cron: '30 3 * * Mon-Fri'
32+
displayName: Mon-Fri 8:30 PM (UTC - 7) Build
2633
branches:
2734
include:
2835
- internal/main
@@ -33,10 +40,31 @@ parameters: # parameters are shown up in ADO UI in a build queue time
3340
type: boolean
3441
default: true
3542

43+
- name: publishSymbols
44+
displayName: 'Publish symbols'
45+
type: boolean
46+
default: false
47+
- name: MDS_PackageRef_Version
48+
displayName: 'MDS package version of AKV Provider (build AKV)'
49+
type: string
50+
default: 5.1.5
51+
- name: CurrentNetFxVersion
52+
displayName: 'Lowest supported .NET Framework version (MDS validation)'
53+
type: string
54+
default: 'net462'
55+
3656
variables:
3757
- template: /eng/pipelines/libraries/variables.yml@self
3858
- name: packageFolderName
3959
value: drop_buildMDS_build_signed_package
60+
- name: PublishSymbols
61+
value: ${{ parameters['publishSymbols'] }}
62+
- name: MDS_PackageRef_Version
63+
value: ${{ parameters['MDS_PackageRef_Version'] }}
64+
- name: CurrentNetFxVersion
65+
value: ${{ parameters['CurrentNetFxVersion'] }}
66+
- name: ProductVersion #MDS product version (MDS validation)
67+
value: $(NUGETPACKAGEVERSION)
4068

4169
resources:
4270
repositories:
@@ -57,10 +85,17 @@ extends:
5785
symbolsFolder: $(symbolsFolder)
5886
softwarename: Microsoft.Data.SqlClient
5987
versionNumber: $(AssemblyFileVersion)
88+
tsa:
89+
enabled: true # onebranch publish all sdl results to TSA. If TSA is disabled all SDL tools will forced into 'break' build mode.
90+
codeql:
91+
compiled:
92+
enabled: true
93+
sbom:
94+
enabled: true
95+
packageName: Microsoft.Data.SqlClient
96+
packageVersion: $(NugetPackageVersion)
6097
asyncSdl:
61-
enabled: false
62-
tsa:
63-
enabled: true # onebranch publish all sdl results to TSA. If TSA is disabled all SDL tools will forced into 'break' build mode.
98+
enabled: false
6499
credscan:
65100
enabled: true
66101
suppressionsFile: $(REPOROOT)/.config/CredScanSuppressions.json
@@ -80,13 +115,6 @@ extends:
80115
break: true
81116
publishLogs:
82117
enabled: true
83-
sbom:
84-
enabled: true
85-
packageName: Microsoft.Data.SqlClient
86-
pacakgeVersion: $(NugetPackageVersion)
87-
codeql:
88-
compiled:
89-
enabled: true
90118
tsaOptionsPath: $(REPOROOT)\.config\tsaoptions.json
91119
disableLegacyManifest: true
92120
stages:
@@ -96,13 +124,15 @@ extends:
96124
parameters:
97125
symbolsFolder: $(symbolsFolder)
98126
softwareFolder: $(softwareFolder)
127+
publishSymbols: ${{ parameters['publishSymbols'] }}
99128

100129
- stage: buildMDS
101130
jobs:
102131
- template: eng/pipelines/common/templates/jobs/build-signed-package-job.yml@self
103132
parameters:
104133
symbolsFolder: $(symbolsFolder)
105134
softwareFolder: $(softwareFolder)
135+
publishSymbols: ${{ parameters['publishSymbols'] }}
106136

107137
- stage: package_validation
108138
dependsOn: buildMDS

0 commit comments

Comments
 (0)