Skip to content

Commit 1f20828

Browse files
committed
Replace PackageES with ESRP template
This isn't done, but I need to start a pipeline run to see where it's at.
1 parent 2936b4b commit 1f20828

File tree

2 files changed

+32
-16
lines changed

2 files changed

+32
-16
lines changed

.vsts-ci/azure-pipelines-release.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ trigger:
3232
- /LICENSE
3333
- /CODE_OF_CONDUCT.md
3434

35+
resources:
36+
repositories:
37+
- repository: ComplianceRepo
38+
type: github
39+
endpoint: ComplianceGHRepo
40+
name: PowerShell/compliance
41+
3542
jobs:
3643

3744
- job: 'ReleaseBuild'
@@ -45,7 +52,9 @@ jobs:
4552
displayName: Signing Build
4653
dependsOn: 'ReleaseBuild'
4754
pool:
48-
name: 'Package ES CodeHub Lab E'
55+
name: 'Package ES Standard Build'
4956
demands: DotNetFramework
57+
variables:
58+
- group: ESRP
5059
steps:
5160
- template: templates/release-general.yml

.vsts-ci/templates/release-general.yml

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
steps:
2+
- checkout: self
3+
24
- powershell: |
35
Write-Host "Installing pwsh..."
46
if (Get-Command pwsh -ErrorAction Ignore)
@@ -19,12 +21,6 @@ steps:
1921
displayName: Capture environment
2022
condition: succeededOrFailed()
2123

22-
- task: PkgESSetupBuild@10
23-
displayName: 'Package ES - Setup Build'
24-
inputs:
25-
productName: PowerShellEditorServices
26-
useDfs: false
27-
2824
- task: DownloadBuildArtifacts@0
2925
displayName: 'Download Build Artifacts'
3026
inputs:
@@ -40,14 +36,25 @@ steps:
4036
$psesZip | Expand-Archive -DestinationPath $dest -Force -Verbose
4137
$psesZip | Remove-Item -Recurse -Force
4238
43-
- task: PkgESCodeSign@10
44-
displayName: 'CodeSign tools/releaseBuild/signing.xml'
45-
env:
46-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
47-
inputs:
48-
signConfigXml: tools/releaseBuild/signing.xml
49-
inPathRoot: '$(Build.ArtifactStagingDirectory)'
50-
outPathRoot: '$(Build.ArtifactStagingDirectory)\Signed'
39+
- checkout: ComplianceRepo
40+
41+
- template: EsrpSign.yml@ComplianceRepo
42+
displayName: 'Sign the scripts and libraries'
43+
parameters:
44+
buildOutputPath: '$(Build.ArtifactStagingDirectory)'
45+
signOutputPath: '$(Build.ArtifactStagingDirectory)/Signed'
46+
certificateId: 'CP-230012' # Authenticode certificate.
47+
useMinimatch: true
48+
pattern: |
49+
# PowerShellEditorServices Script
50+
release/out/PowerShellEditorServices/PowerShellEditorServices/*.{psd1,psm1,ps1xml}
51+
release/out/PowerShellEditorServices/PowerShellEditorServices/Commands/**/*.{psd1,psm1,ps1xml}
52+
# PowerShellEditorServices Binaries
53+
release/out/**/Microsoft.PowerShell.EditorServices*.dll
54+
# PowerShellEditorServices.VSCode Script
55+
release/out/**/PowerShellEditorServices.VSCode.psd1
56+
# PowerShellEditorServices.VSCode Binary
57+
release/out/**/Microsoft.PowerShell.EditorServices.VSCode.dll
5158
5259
- task: PowerShell@1
5360
displayName: 'Copy signed items into output'
@@ -100,7 +107,7 @@ steps:
100107
optionsXS: 0
101108
optionsPE: '1|2|3|4'
102109
optionsHMENABLE: 0
103-
optionsFTPATH: '$(Build.SourcesDirectory)\tools\terms\FileTypeSet.xml'
110+
optionsFTPATH: '$(Build.SourcesDirectory)/PowerShellEditorServices/tools/terms/FileTypeSet.xml'
104111
# toolVersion: 5.8.2.1
105112

106113
- task: CredScan@2

0 commit comments

Comments
 (0)