Skip to content

Commit

Permalink
Fix release pipeline with vs2019 image machine (dotnet#7405)
Browse files Browse the repository at this point in the history
* 1ES VS2019 test

* fix bower error, fix esrp

* install dotnet 2.1 sdk

* copy from docs.build

* latest dotnet for build

Co-authored-by: Shichao Zhang <Shichao.Zhang@microsoft.com>
  • Loading branch information
superyyrrzz and AngryBerryMS authored Jun 7, 2021
1 parent 0bd7c8e commit 7265a7a
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 1 deletion.
1 change: 0 additions & 1 deletion UpdateTemplate.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ $GulpCommand="${DefaultTemplate}node_modules/gulp/bin/gulp"

Set-Location "$DefaultTemplate"
npm install $logLevelParam
node ./node_modules/bower/bin/bower install $logLevelParam
node "$GulpCommand"

Set-Location "$TemplateHome"
Expand Down
19 changes: 19 additions & 0 deletions azure-pipelines-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,22 @@ variables:

pool:
name: 1ES-Pool
demands: ImageOverride -equals Win2019VS2019

steps:

- task: UseDotNet@2
displayName: 'Install .NET Core sdk required for ESRPCodeSigning'
inputs:
packageType: sdk
version: '2.1.811'

- task: UseDotNet@2
displayName: 'Install .NET Core sdk required for docfx'
inputs:
packageType: sdk
version: '5.0.100'

- task: NodeTool@0
displayName: 'Use Node 8.x'
inputs:
Expand Down Expand Up @@ -41,6 +54,12 @@ steps:
env:
TOKEN: $(ServiceAccountGithubToken)

- task: UseDotNet@2
displayName: 'Install .NET Core sdk required for ESRPCodeSigning'
inputs:
packageType: sdk
version: '2.1.811'

- task: EsrpCodeSigning@1
displayName: Sign docfx executables and dlls
inputs:
Expand Down
19 changes: 19 additions & 0 deletions azure-pipelines-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

pool:
name: 1ES-Pool
demands: ImageOverride -equals Win2019VS2019

variables:
- group: docfx-v2-pipeline-kv
Expand All @@ -10,6 +11,18 @@ variables:

steps:

- task: UseDotNet@2
displayName: 'Install .NET Core SDK required for ESRPCodeSigning'
inputs:
packageType: sdk
version: '2.1.811'

- task: UseDotNet@2
displayName: 'Install .NET Core SDK required for docfx'
inputs:
packageType: sdk
version: '5.0.100'

- task: NodeTool@0
displayName: 'Use Node 8.x'
inputs:
Expand Down Expand Up @@ -39,6 +52,12 @@ steps:
arguments: '.\node_modules\gulp\bin\gulp.js dev:build'
workingFolder: tools/Deployment

- task: UseDotNet@2
displayName: 'Install .NET Core sdk required for ESRPCodeSigning'
inputs:
packageType: sdk
version: '2.1.811'

- task: EsrpCodeSigning@1
displayName: Sign docfx executables and dlls
inputs:
Expand Down

0 comments on commit 7265a7a

Please sign in to comment.