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

Commit 11fb693

Browse files
EricJohnson327EricJohnson327
authored
Merge pull request #408 from microsoft/staging
Release - 6/18/24
2 parents 28650f7 + deadfcd commit 11fb693

File tree

10 files changed

+200
-107
lines changed

10 files changed

+200
-107
lines changed

‎build/TriggerReleaseBuild.yml

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,38 @@
11
trigger:
22
- release
33

4-
steps:
5-
- script: echo Triggering ADO Build
6-
displayName: 'Triggering ADO Build'
4+
resources:
5+
repositories:
6+
- repository: templates_onebranch
7+
type: git
8+
name: OneBranch.Pipelines/GovernedTemplates
9+
ref: refs/heads/main
10+
- repository: m365Pipelines
11+
type: git
12+
name: 1ESPipelineTemplates/M365GPT
13+
ref: refs/tags/release
14+
15+
extends:
16+
template: v1/M365.Official.PipelineTemplate.yml@m365Pipelines
17+
parameters:
18+
sdl:
19+
roslyn:
20+
enabled: true
21+
arrow:
22+
serviceConnection: DevHome Build VM Generation
23+
baseline:
24+
baselineFile: $(Build.SourcesDirectory)\guardian\SDL\.gdnbaselines
25+
pool:
26+
name: Azure-Pipelines-1ESPT-ExDShared
27+
image: windows-2022
28+
os: windows
29+
customBuildTags:
30+
- ES365AIMigrationTooling
31+
stages:
32+
- stage: Trigger_Build
33+
dependsOn: []
34+
jobs:
35+
- job: Trigger_Build
36+
steps:
37+
- script: echo Triggering ADO Build
38+
displayName: 'Triggering ADO Build'

‎build/TriggerStagingBuild.yml

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,38 @@
11
trigger:
22
- staging
33

4-
steps:
5-
- script: echo Triggering ADO Build
6-
displayName: 'Triggering ADO Build'
4+
resources:
5+
repositories:
6+
- repository: templates_onebranch
7+
type: git
8+
name: OneBranch.Pipelines/GovernedTemplates
9+
ref: refs/heads/main
10+
- repository: m365Pipelines
11+
type: git
12+
name: 1ESPipelineTemplates/M365GPT
13+
ref: refs/tags/release
14+
15+
extends:
16+
template: v1/M365.Official.PipelineTemplate.yml@m365Pipelines
17+
parameters:
18+
sdl:
19+
roslyn:
20+
enabled: true
21+
arrow:
22+
serviceConnection: DevHome Build VM Generation
23+
baseline:
24+
baselineFile: $(Build.SourcesDirectory)\guardian\SDL\.gdnbaselines
25+
pool:
26+
name: Azure-Pipelines-1ESPT-ExDShared
27+
image: windows-2022
28+
os: windows
29+
customBuildTags:
30+
- ES365AIMigrationTooling
31+
stages:
32+
- stage: Trigger_Build
33+
dependsOn: []
34+
jobs:
35+
- job: Trigger_Build
36+
steps:
37+
- script: echo Triggering ADO Build
38+
displayName: 'Triggering ADO Build'

‎build/azure-pipelines.yml

Lines changed: 90 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ parameters:
2020
- release
2121

2222
variables:
23-
MSIXVersion: '0.1400'
23+
MSIXVersion: '0.1500'
2424
solution: '**/GitHubExtension.sln'
2525
appxPackageDir: 'AppxPackages'
2626
testOutputArtifactDir: 'TestResults'
@@ -59,8 +59,6 @@ extends:
5959
- task: NuGetToolInstaller@1
6060

6161
- task: NuGetAuthenticate@1
62-
inputs:
63-
nuGetServiceConnections: 'DevHomeInternal'
6462

6563
- task: PowerShell@2
6664
displayName: Replace Stubbed Files
@@ -81,9 +79,8 @@ extends:
8179
restoreSolution: '$(solution)'
8280
feedsToUse: 'config'
8381
nugetConfigPath: 'nuget.config'
84-
externalFeedCredentials: 'DevHomeInternal'
8582

86-
- task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@3
83+
- task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@4
8784
displayName: Send and Download Localization Files for Artifacts
8885
condition: and(eq(variables['EnableLocalization'], 'true'), eq(variables['UpdateLocalization'], 'true'))
8986
inputs:
@@ -98,7 +95,7 @@ extends:
9895
appendRelativeDir: true
9996
pseudoSetting: Included
10097

101-
- task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@3
98+
- task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@4
10299
displayName: Download and Use Localization Files
103100
condition: eq(variables['EnableLocalization'], 'true')
104101
retryCountOnTaskFailure: 2
@@ -148,46 +145,45 @@ extends:
148145
filePath: 'build/scripts/Build.ps1'
149146
arguments: -Platform "${{ platform }}" -Configuration "${{ configuration }}" -Version $(MSIXVersion) -BuildStep "msix" -AzureBuildingBranch "$(BuildingBranch)" -IsAzurePipelineBuild -ClientId $(GitHubClientId) -ClientSecret $(GitHubClientSecret)
150147

151-
- task: EsrpCodeSigning@2
152-
inputs:
153-
ConnectedServiceName: 'Xlang Code Signing'
154-
FolderPath: '$(appxPackageDir)\${{ configuration }}'
155-
Pattern: '*.msix'
156-
signConfigType: 'inlineSignParams'
157-
inlineOperation: |
158-
[
159-
{
160-
"keycode": "CP-230012",
161-
"operationSetCode": "SigntoolSign",
162-
"parameters": [
163-
{
164-
"parameterName": "OpusName",
165-
"parameterValue": "Microsoft"
166-
},
167-
{
168-
"parameterName": "OpusInfo",
169-
"parameterValue": "http://www.microsoft.com"
170-
},
171-
{
172-
"parameterName": "PageHash",
173-
"parameterValue": "/NPH"
174-
},
175-
{
176-
"parameterName": "FileDigest",
177-
"parameterValue": "/fd sha256"
178-
},
179-
{
180-
"parameterName": "TimeStamp",
181-
"parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
182-
}
183-
],
184-
"toolName": "signtool.exe",
185-
"toolVersion": "6.2.9304.0"
186-
}
187-
]
188-
SessionTimeout: '60'
189-
MaxConcurrency: '50'
190-
MaxRetryAttempts: '5'
148+
- template: ./build/templates/EsrpSigning-Steps.yml@self
149+
parameters:
150+
displayName: Submit *.msix to ESRP for code signing
151+
inputs:
152+
FolderPath: '$(appxPackageDir)\${{ configuration }}'
153+
Pattern: '*.msix'
154+
UseMinimatch: true
155+
signConfigType: inlineSignParams
156+
inlineOperation: |
157+
[
158+
{
159+
"keycode": "CP-230012",
160+
"operationSetCode": "SigntoolSign",
161+
"parameters": [
162+
{
163+
"parameterName": "OpusName",
164+
"parameterValue": "Microsoft"
165+
},
166+
{
167+
"parameterName": "OpusInfo",
168+
"parameterValue": "http://www.microsoft.com"
169+
},
170+
{
171+
"parameterName": "PageHash",
172+
"parameterValue": "/NPH"
173+
},
174+
{
175+
"parameterName": "FileDigest",
176+
"parameterValue": "/fd sha256"
177+
},
178+
{
179+
"parameterName": "TimeStamp",
180+
"parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
181+
}
182+
],
183+
"toolName": "signtool.exe",
184+
"toolVersion": "6.2.9304.0"
185+
}
186+
]
191187
192188
# Commented out until our implementation is fixed
193189
# - task: AzureKeyVault@1
@@ -292,46 +288,45 @@ extends:
292288
filePath: 'build/scripts/Build.ps1'
293289
arguments: -Configuration "${{ configuration }}" -Version $(MSIXVersion) -BuildStep "msixbundle" -IsAzurePipelineBuild
294290

295-
- task: EsrpCodeSigning@2
296-
inputs:
297-
ConnectedServiceName: 'Xlang Code Signing'
298-
FolderPath: 'AppxBundles\${{ configuration }}'
299-
Pattern: '*.msixbundle'
300-
signConfigType: 'inlineSignParams'
301-
inlineOperation: |
302-
[
303-
{
304-
"keycode": "CP-230012",
305-
"operationSetCode": "SigntoolSign",
306-
"parameters": [
307-
{
308-
"parameterName": "OpusName",
309-
"parameterValue": "Microsoft"
310-
},
311-
{
312-
"parameterName": "OpusInfo",
313-
"parameterValue": "http://www.microsoft.com"
314-
},
315-
{
316-
"parameterName": "PageHash",
317-
"parameterValue": "/NPH"
318-
},
319-
{
320-
"parameterName": "FileDigest",
321-
"parameterValue": "/fd sha256"
322-
},
323-
{
324-
"parameterName": "TimeStamp",
325-
"parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
326-
}
327-
],
328-
"toolName": "signtool.exe",
329-
"toolVersion": "6.2.9304.0"
330-
}
331-
]
332-
SessionTimeout: '60'
333-
MaxConcurrency: '50'
334-
MaxRetryAttempts: '5'
291+
- template: ./build/templates/EsrpSigning-Steps.yml@self
292+
parameters:
293+
displayName: Submit *.msixbundle to ESRP for code signing
294+
inputs:
295+
FolderPath: 'AppxBundles\${{ configuration }}'
296+
Pattern: '*.msixbundle'
297+
UseMinimatch: true
298+
signConfigType: inlineSignParams
299+
inlineOperation: |
300+
[
301+
{
302+
"keycode": "CP-230012",
303+
"operationSetCode": "SigntoolSign",
304+
"parameters": [
305+
{
306+
"parameterName": "OpusName",
307+
"parameterValue": "Microsoft"
308+
},
309+
{
310+
"parameterName": "OpusInfo",
311+
"parameterValue": "http://www.microsoft.com"
312+
},
313+
{
314+
"parameterName": "PageHash",
315+
"parameterValue": "/NPH"
316+
},
317+
{
318+
"parameterName": "FileDigest",
319+
"parameterValue": "/fd sha256"
320+
},
321+
{
322+
"parameterName": "TimeStamp",
323+
"parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
324+
}
325+
],
326+
"toolName": "signtool.exe",
327+
"toolVersion": "6.2.9304.0"
328+
}
329+
]
335330
336331
templateContext:
337332
outputs:
@@ -365,7 +360,7 @@ extends:
365360
artifactName: MsixBundle_Release
366361
targetPath: StorePublish
367362

368-
- task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@3
363+
- task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@4
369364
displayName: Download and Use Localization Files
370365
condition: eq(variables['EnableLocalization'], 'true')
371366
retryCountOnTaskFailure: 2
@@ -390,11 +385,11 @@ extends:
390385
$Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore }
391386
pwsh: true
392387

393-
- task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@2
388+
- task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@3
394389
displayName: 'Create Staging StoreBroker Package'
395390
condition: eq(variables['BuildingBranch'], 'staging')
396391
inputs:
397-
serviceEndpoint: 'DevHomeGitHubExtensionCanary StoreBroker'
392+
serviceEndpoint: 'DevHomeGithubExtensionCanary StoreBroker ServiceConnection'
398393
sbConfigPath: '$(System.DefaultWorkingDirectory)\build\store\canary\SBConfig.json'
399394
sourceFolder: 'StorePublish'
400395
contents: '*.msixbundle'
@@ -403,11 +398,11 @@ extends:
403398
outSBName: DevHomeStoreSubmissionPackage
404399
pdpInclude: 'PDP.xml'
405400

406-
- task: MS-RDX-MRO.windows-store-publish-dev.publish-task.store-publish@2
401+
- task: MS-RDX-MRO.windows-store-publish-dev.publish-task.store-publish@3
407402
displayName: 'Publish Staging StoreBroker Package'
408403
condition: eq(variables['BuildingBranch'], 'staging')
409404
inputs:
410-
serviceEndpoint: 'DevHomeGitHubExtensionCanary StoreBroker'
405+
serviceEndpoint: 'DevHomeGithubExtensionCanary StoreBroker ServiceConnection'
411406
appId: 9N806ZKPW85R
412407
inputMethod: JsonAndZip
413408
jsonPath: '$(System.DefaultWorkingDirectory)\SBOutDir\DevHomeStoreSubmissionPackage.json'
@@ -418,11 +413,11 @@ extends:
418413
jsonZipUpdateMetadata: true
419414
updateImages: true
420415

421-
- task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@2
416+
- task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@3
422417
displayName: 'Create Release StoreBroker Package'
423418
condition: eq(variables['BuildingBranch'], 'release')
424419
inputs:
425-
serviceEndpoint: 'DevHomeGitHubExtension StoreBroker'
420+
serviceEndpoint: 'DevHomeGithubExtension StoreBroker ServiceConnection'
426421
sbConfigPath: '$(System.DefaultWorkingDirectory)\build\store\preview\SBConfig.json'
427422
sourceFolder: 'StorePublish'
428423
contents: '*.msixbundle'
@@ -431,11 +426,11 @@ extends:
431426
outSBName: DevHomeStoreSubmissionPackage
432427
pdpInclude: 'PDP.xml'
433428

434-
- task: MS-RDX-MRO.windows-store-publish-dev.publish-task.store-publish@2
429+
- task: MS-RDX-MRO.windows-store-publish-dev.publish-task.store-publish@3
435430
displayName: 'Publish Release StoreBroker Package'
436431
condition: eq(variables['BuildingBranch'], 'release')
437432
inputs:
438-
serviceEndpoint: 'DevHomeGitHubExtension StoreBroker'
433+
serviceEndpoint: 'DevHomeGithubExtension StoreBroker ServiceConnection'
439434
appId: 9NZCC27PR6N6
440435
inputMethod: JsonAndZip
441436
jsonPath: '$(System.DefaultWorkingDirectory)\SBOutDir\DevHomeStoreSubmissionPackage.json'

‎build/scripts/CreateBuildInfo.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Param(
55
)
66

77
$Major = "0"
8-
$Minor = "14"
8+
$Minor = "15"
99
$Patch = "99" # default to 99 for local builds
1010

1111
$versionSplit = $Version.Split(".");

‎build/templates/EsrpSigning-Steps.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
parameters:
2+
- name: displayName
3+
type: string
4+
default: ESRP Code Signing
5+
- name: inputs
6+
type: object
7+
default: {}
8+
9+
steps:
10+
- task: EsrpCodeSigning@5
11+
displayName: ${{ parameters.displayName }}
12+
inputs:
13+
ConnectedServiceName: $(EsrpConnectedServiceName)
14+
AppRegistrationClientId: $(EsrpAppRegistrationClientId)
15+
AppRegistrationTenantId: $(EsrpAppRegistrationTenantId)
16+
AuthAKVName: $(EsrpAuthAKVName)
17+
AuthCertName: $(EsrpAuthCertName)
18+
AuthSignCertName: $(EsrpAuthSignCertName)
19+
SessionTimeout: '60'
20+
MaxConcurrency: '50'
21+
MaxRetryAttempts: '5'
22+
${{ insert }}: ${{ parameters.inputs }}

‎exclusion.dic

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ Stringify
1212
riid
1313
Impl
1414
microsoft
15+
octokit

0 commit comments

Comments
 (0)