Skip to content

Commit f668c69

Browse files
migrate pipeline to MicroBuild (#1419)
* migrate pipeline to MicroBuild * fix mb configs
1 parent 19e4e5a commit f668c69

File tree

2 files changed

+30
-82
lines changed

2 files changed

+30
-82
lines changed

.azure-pipelines/nightly.yml

Lines changed: 16 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,27 @@ resources:
1212
- repository: self
1313
type: git
1414
ref: refs/heads/main
15-
- repository: 1esPipelines
15+
- repository: MicroBuildTemplate
1616
type: git
17-
name: 1ESPipelineTemplates/1ESPipelineTemplates
18-
ref: refs/tags/release
17+
name: 1ESPipelineTemplates/MicroBuildTemplate
1918
trigger: none
2019
extends:
21-
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
20+
template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
2221
parameters:
2322
pool:
24-
name: 1ES_JavaTooling_Pool
25-
image: 1ES_JavaTooling_Windows_2022
26-
os: windows
27-
sdl:
28-
sourceAnalysisPool:
29-
name: 1ES_JavaTooling_Pool
30-
image: 1ES_JavaTooling_Windows_2022
31-
os: windows
32-
customBuildTags:
33-
- MigrationTooling-mseng-VSJava-13437-Tool
23+
name: MSEngSS-MicroBuild2022-1ES
3424
stages:
3525
- stage: Build
3626
jobs:
3727
- job: Job_1
3828
displayName: Agent job 1
3929
templateContext:
30+
mb:
31+
signing:
32+
enabled: true
33+
signType: real
34+
zipSources: false
35+
feedSource: 'https://mseng.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json'
4036
outputs:
4137
- output: pipelineArtifact
4238
artifactName: vsix
@@ -58,13 +54,13 @@ extends:
5854
displayName: Replace AI Key
5955
inputs:
6056
script: npx [email protected] -I -f package.json -e "this.aiKey=\"%AI_KEY%\""
61-
- task: Bash@3
57+
- task: PowerShell@2
6258
displayName: update version in package json
6359
inputs:
6460
targetType: inline
6561
script: |-
6662
node ./scripts/prepare-nightly-build.js
67-
mv ./package.insiders.json ./package.json
63+
Move-Item -Path "./package.insiders.json" -Destination "./package.json" -Force
6864
- task: CmdLine@2
6965
displayName: VSCE package --pre-release
7066
inputs:
@@ -90,34 +86,12 @@ extends:
9086
AzureServicesAuthConnectionString: runAs=App;AppId=$(ApiScanClientId);TenantId=$(ApiScanTenant);AppKey=$(ApiScanSecret)
9187
- script: npx @vscode/vsce@latest generate-manifest -i extension.vsix -o extension.manifest
9288
displayName: 'Generate extension manifest'
93-
- script: cp extension.manifest extension.signature.p7s
89+
- script: copy extension.manifest extension.signature.p7s
9490
displayName: 'Prepare manifest for signing'
95-
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
91+
- task: CmdLine@2
92+
displayName: Sign extension
9693
inputs:
97-
ConnectedServiceName: $(ConnectedServiceName)
98-
AppRegistrationClientId: $(AppRegistrationClientId)
99-
AppRegistrationTenantId: $(AppRegistrationTenantId)
100-
AuthAKVName: $(AuthAKVName)
101-
AuthCertName: $(AuthCertName)
102-
AuthSignCertName: $(AuthSignCertName)
103-
FolderPath: '.'
104-
Pattern: 'extension.signature.p7s'
105-
signConfigType: inlineSignParams
106-
inlineOperation: |
107-
[
108-
{
109-
"keyCode": "CP-401405",
110-
"operationSetCode": "VSCodePublisherSign",
111-
"parameters" : [],
112-
"toolName": "sign",
113-
"toolVersion": "1.0"
114-
}
115-
]
116-
SessionTimeout: 90
117-
MaxConcurrency: 25
118-
MaxRetryAttempts: 5
119-
PendingAnalysisWaitTimeoutMinutes: 5
120-
displayName: 'Sign extension'
94+
script: dotnet %MBSIGN_APPFOLDER%/ddsignfiles.dll /file:extension.signature.p7s /certs:4014052
12195
- task: CopyFiles@2
12296
displayName: "Copy Files to: $(Build.ArtifactStagingDirectory)"
12397
inputs:

.azure-pipelines/rc.yml

Lines changed: 14 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,27 @@ resources:
77
- repository: self
88
type: git
99
ref: refs/heads/main
10-
- repository: 1esPipelines
10+
- repository: MicroBuildTemplate
1111
type: git
12-
name: 1ESPipelineTemplates/1ESPipelineTemplates
13-
ref: refs/tags/release
12+
name: 1ESPipelineTemplates/MicroBuildTemplate
1413
trigger: none
1514
extends:
16-
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
15+
template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
1716
parameters:
1817
pool:
19-
name: 1ES_JavaTooling_Pool
20-
image: 1ES_JavaTooling_Windows_2022
21-
os: windows
22-
sdl:
23-
sourceAnalysisPool:
24-
name: 1ES_JavaTooling_Pool
25-
image: 1ES_JavaTooling_Windows_2022
26-
os: windows
27-
customBuildTags:
28-
- MigrationTooling-mseng-VSJava-9248-Tool
18+
name: MSEngSS-MicroBuild2022-1ES
2919
stages:
3020
- stage: Build
3121
jobs:
3222
- job: Job_1
3323
displayName: Agent job 1
3424
templateContext:
25+
mb:
26+
signing:
27+
enabled: true
28+
signType: real
29+
zipSources: false
30+
feedSource: 'https://mseng.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json'
3531
outputs:
3632
- output: pipelineArtifact
3733
artifactName: vsix
@@ -78,34 +74,12 @@ extends:
7874
AzureServicesAuthConnectionString: runAs=App;AppId=$(ApiScanClientId);TenantId=$(ApiScanTenant);AppKey=$(ApiScanSecret)
7975
- script: npx @vscode/vsce@latest generate-manifest -i extension.vsix -o extension.manifest
8076
displayName: 'Generate extension manifest'
81-
- script: cp extension.manifest extension.signature.p7s
77+
- script: copy extension.manifest extension.signature.p7s
8278
displayName: 'Prepare manifest for signing'
83-
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
79+
- task: CmdLine@2
80+
displayName: Sign extension
8481
inputs:
85-
ConnectedServiceName: $(ConnectedServiceName)
86-
AppRegistrationClientId: $(AppRegistrationClientId)
87-
AppRegistrationTenantId: $(AppRegistrationTenantId)
88-
AuthAKVName: $(AuthAKVName)
89-
AuthCertName: $(AuthCertName)
90-
AuthSignCertName: $(AuthSignCertName)
91-
FolderPath: '.'
92-
Pattern: 'extension.signature.p7s'
93-
signConfigType: inlineSignParams
94-
inlineOperation: |
95-
[
96-
{
97-
"keyCode": "CP-401405",
98-
"operationSetCode": "VSCodePublisherSign",
99-
"parameters" : [],
100-
"toolName": "sign",
101-
"toolVersion": "1.0"
102-
}
103-
]
104-
SessionTimeout: 90
105-
MaxConcurrency: 25
106-
MaxRetryAttempts: 5
107-
PendingAnalysisWaitTimeoutMinutes: 5
108-
displayName: 'Sign extension'
82+
script: dotnet %MBSIGN_APPFOLDER%/ddsignfiles.dll /file:extension.signature.p7s /certs:4014052
10983
- task: CopyFiles@2
11084
displayName: "Copy Files to: $(Build.ArtifactStagingDirectory)"
11185
inputs:

0 commit comments

Comments
 (0)