Skip to content
This repository was archived by the owner on Jun 5, 2025. It is now read-only.

Staging - 6/4/24 #395

Merged
EricJohnson327 merged 2 commits into from
Jun 5, 2024
Merged

Staging - 6/4/24 #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67cc48b
Update ESRP yaml task (#394)
EricJohnson327 Jun 5, 2024
c972896
Update version to 0.15
EricJohnson327 Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 79 additions & 81 deletions build/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ parameters:
- release

variables:
MSIXVersion: '0.1400'
MSIXVersion: '0.1500'
solution: '**/GitHubExtension.sln'
appxPackageDir: 'AppxPackages'
testOutputArtifactDir: 'TestResults'
Expand Down Expand Up @@ -148,46 +148,45 @@ extends:
filePath: 'build/scripts/Build.ps1'
arguments: -Platform "${{ platform }}" -Configuration "${{ configuration }}" -Version $(MSIXVersion) -BuildStep "msix" -AzureBuildingBranch "$(BuildingBranch)" -IsAzurePipelineBuild -ClientId $(GitHubClientId) -ClientSecret $(GitHubClientSecret)

- task: EsrpCodeSigning@2
inputs:
ConnectedServiceName: 'Xlang Code Signing'
FolderPath: '$(appxPackageDir)\${{ configuration }}'
Pattern: '*.msix'
signConfigType: 'inlineSignParams'
inlineOperation: |
[
{
"keycode": "CP-230012",
"operationSetCode": "SigntoolSign",
"parameters": [
{
"parameterName": "OpusName",
"parameterValue": "Microsoft"
},
{
"parameterName": "OpusInfo",
"parameterValue": "http://www.microsoft.com"
},
{
"parameterName": "PageHash",
"parameterValue": "/NPH"
},
{
"parameterName": "FileDigest",
"parameterValue": "/fd sha256"
},
{
"parameterName": "TimeStamp",
"parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
}
],
"toolName": "signtool.exe",
"toolVersion": "6.2.9304.0"
}
]
SessionTimeout: '60'
MaxConcurrency: '50'
MaxRetryAttempts: '5'
- template: ./build/templates/EsrpSigning-Steps.yml@self
parameters:
displayName: Submit *.msix to ESRP for code signing
inputs:
FolderPath: '$(appxPackageDir)\${{ configuration }}'
Pattern: '*.msix'
UseMinimatch: true
signConfigType: inlineSignParams
inlineOperation: |
[
{
"keycode": "CP-230012",
"operationSetCode": "SigntoolSign",
"parameters": [
{
"parameterName": "OpusName",
"parameterValue": "Microsoft"
},
{
"parameterName": "OpusInfo",
"parameterValue": "http://www.microsoft.com"
},
{
"parameterName": "PageHash",
"parameterValue": "/NPH"
},
{
"parameterName": "FileDigest",
"parameterValue": "/fd sha256"
},
{
"parameterName": "TimeStamp",
"parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
}
],
"toolName": "signtool.exe",
"toolVersion": "6.2.9304.0"
}
]

# Commented out until our implementation is fixed
# - task: AzureKeyVault@1
Expand Down Expand Up @@ -292,46 +291,45 @@ extends:
filePath: 'build/scripts/Build.ps1'
arguments: -Configuration "${{ configuration }}" -Version $(MSIXVersion) -BuildStep "msixbundle" -IsAzurePipelineBuild

- task: EsrpCodeSigning@2
inputs:
ConnectedServiceName: 'Xlang Code Signing'
FolderPath: 'AppxBundles\${{ configuration }}'
Pattern: '*.msixbundle'
signConfigType: 'inlineSignParams'
inlineOperation: |
[
{
"keycode": "CP-230012",
"operationSetCode": "SigntoolSign",
"parameters": [
{
"parameterName": "OpusName",
"parameterValue": "Microsoft"
},
{
"parameterName": "OpusInfo",
"parameterValue": "http://www.microsoft.com"
},
{
"parameterName": "PageHash",
"parameterValue": "/NPH"
},
{
"parameterName": "FileDigest",
"parameterValue": "/fd sha256"
},
{
"parameterName": "TimeStamp",
"parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
}
],
"toolName": "signtool.exe",
"toolVersion": "6.2.9304.0"
}
]
SessionTimeout: '60'
MaxConcurrency: '50'
MaxRetryAttempts: '5'
- template: ./build/templates/EsrpSigning-Steps.yml@self
parameters:
displayName: Submit *.msixbundle to ESRP for code signing
inputs:
FolderPath: 'AppxBundles\${{ configuration }}'
Pattern: '*.msixbundle'
UseMinimatch: true
signConfigType: inlineSignParams
inlineOperation: |
[
{
"keycode": "CP-230012",
"operationSetCode": "SigntoolSign",
"parameters": [
{
"parameterName": "OpusName",
"parameterValue": "Microsoft"
},
{
"parameterName": "OpusInfo",
"parameterValue": "http://www.microsoft.com"
},
{
"parameterName": "PageHash",
"parameterValue": "/NPH"
},
{
"parameterName": "FileDigest",
"parameterValue": "/fd sha256"
},
{
"parameterName": "TimeStamp",
"parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
}
],
"toolName": "signtool.exe",
"toolVersion": "6.2.9304.0"
}
]

templateContext:
outputs:
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/CreateBuildInfo.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Param(
)

$Major = "0"
$Minor = "14"
$Minor = "15"
$Patch = "99" # default to 99 for local builds

$versionSplit = $Version.Split(".");
Expand Down
22 changes: 22 additions & 0 deletions build/templates/EsrpSigning-Steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
parameters:
- name: displayName
type: string
default: ESRP Code Signing
- name: inputs
type: object
default: {}

steps:
- task: EsrpCodeSigning@5
displayName: ${{ parameters.displayName }}
inputs:
ConnectedServiceName: $(EsrpConnectedServiceName)
AppRegistrationClientId: $(EsrpAppRegistrationClientId)
AppRegistrationTenantId: $(EsrpAppRegistrationTenantId)
AuthAKVName: $(EsrpAuthAKVName)
AuthCertName: $(EsrpAuthCertName)
AuthSignCertName: $(EsrpAuthSignCertName)
SessionTimeout: '60'
MaxConcurrency: '50'
MaxRetryAttempts: '5'
${{ insert }}: ${{ parameters.inputs }}