Skip to content

Commit 2ece46d

Browse files
authored
[1ES] Add windows pool and remove extra sign step (#2513)
1 parent 0889b68 commit 2ece46d

File tree

2 files changed

+9
-38
lines changed

2 files changed

+9
-38
lines changed

eng/ci/public-build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ pr:
4646
- test/TestUtility
4747
- tools/
4848

49-
5049
resources:
5150
repositories:
5251
- repository: 1es

eng/ci/templates/official/jobs/build-artifacts.yml

Lines changed: 9 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ jobs:
1111
path: $(Build.ArtifactStagingDirectory)/NugetPackages
1212
artifact: NugetPackages
1313

14+
pool:
15+
name: 1es-pool-azfunc
16+
image: 1es-windows-2022
17+
os: windows
18+
1419
variables:
1520
${{ if and( not(contains(variables['Build.SourceBranch'], '/release/')), not(startsWith(variables['Build.SourceBranch'], 'refs/tags')) ) }}:
1621
buildNumberTemp: $(Build.BuildNumber)
@@ -32,43 +37,7 @@ jobs:
3237
displayName: Sign SDK assemblies
3338
inputs:
3439
ConnectedServiceName: ESRP Service-internal
35-
FolderPath: sdk/Sdk/bin/Release
36-
Pattern: Microsoft.Azure.Functions.Worker.Sdk*.dll
37-
signConfigType: inlineSignParams
38-
inlineOperation: |
39-
[
40-
{
41-
"KeyCode": "CP-230012",
42-
"OperationCode": "SigntoolSign",
43-
"Parameters": {
44-
"OpusName": "Microsoft",
45-
"OpusInfo": "http://www.microsoft.com",
46-
"FileDigest": "/fd \"SHA256\"",
47-
"PageHash": "/NPH",
48-
"TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
49-
},
50-
"ToolName": "sign",
51-
"ToolVersion": "1.0"
52-
},
53-
{
54-
"KeyCode": "CP-230012",
55-
"OperationCode": "SigntoolVerify",
56-
"Parameters": {},
57-
"ToolName": "sign",
58-
"ToolVersion": "1.0"
59-
}
60-
]
61-
62-
- task: DeleteFiles@1
63-
displayName: Delete CodeSignSummary files
64-
inputs:
65-
contents: '**/CodeSignSummary-*.md'
66-
67-
- task: EsrpCodeSigning@2
68-
displayName: Sign SDK Analyzers assemblies
69-
inputs:
70-
ConnectedServiceName: ESRP Service-internal
71-
FolderPath: sdk/Sdk.Analyzers/bin/Release
40+
FolderPath: sdk
7241
Pattern: Microsoft.Azure.Functions.Worker.Sdk*.dll
7342
signConfigType: inlineSignParams
7443
inlineOperation: |
@@ -98,6 +67,7 @@ jobs:
9867
- task: DeleteFiles@1
9968
displayName: Delete CodeSignSummary files
10069
inputs:
70+
sourceFolder: sdk
10171
contents: '**/CodeSignSummary-*.md'
10272

10373
- task: EsrpCodeSigning@2
@@ -134,6 +104,7 @@ jobs:
134104
- task: DeleteFiles@1
135105
displayName: Delete CodeSignSummary files
136106
inputs:
107+
sourceFolder: src
137108
contents: '**/CodeSignSummary-*.md'
138109

139110
- task: DotNetCoreCLI@2
@@ -182,4 +153,5 @@ jobs:
182153
- task: DeleteFiles@1
183154
displayName: Delete CodeSignSummary files
184155
inputs:
156+
sourceFolder: $(Build.ArtifactStagingDirectory)/NugetPackages
185157
contents: '**/CodeSignSummary-*.md'

0 commit comments

Comments
 (0)