Skip to content

Commit ec1fbc2

Browse files
carlos-zamoracarlos-zamora
committed
Merge branch 'main' into dev/cazamor/cmdNotFound
2 parents 8c0d7c6 + 01e4df1 commit ec1fbc2

File tree

188 files changed

+4601
-3135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+4601
-3135
lines changed

‎.github/actions/spelling/allow/allow.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ mnt
8080
mru
8181
nje
8282
noreply
83+
notwrapped
8384
ogonek
8485
ok'd
8586
overlined

‎.github/actions/spelling/allow/microsoft.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
ACLs
22
ADMINS
33
advapi
4+
akv
5+
AKV
46
altform
57
altforms
68
appendwttlogging

‎.github/actions/spelling/expect/expect.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ CONKBD
245245
conlibk
246246
conmsgl
247247
CONNECTINFO
248+
connyection
248249
CONOUT
249250
conprops
250251
conpropsp
@@ -405,6 +406,7 @@ DECNKM
405406
DECNRCM
406407
DECOM
407408
decommit
409+
DECPCCM
408410
DECPCTERM
409411
DECPS
410412
DECRARA
@@ -413,6 +415,7 @@ DECREQTPARM
413415
DECRLM
414416
DECRPM
415417
DECRQCRA
418+
DECRQDE
416419
DECRQM
417420
DECRQPSR
418421
DECRQSS
@@ -606,6 +609,7 @@ FILTERONPASTE
606609
FINDCASE
607610
FINDDLG
608611
FINDDOWN
612+
FINDREGEX
609613
FINDSTRINGEXACT
610614
FINDUP
611615
FIter
@@ -1420,6 +1424,8 @@ PUCHAR
14201424
pvar
14211425
pwch
14221426
PWDDMCONSOLECONTEXT
1427+
Pwease
1428+
pweview
14231429
pws
14241430
pwstr
14251431
pwsz
@@ -1898,6 +1904,7 @@ UVWXY
18981904
UVWXYZ
18991905
uwa
19001906
uwp
1907+
uwu
19011908
uxtheme
19021909
Vanara
19031910
vararg
@@ -1971,6 +1978,7 @@ wdm
19711978
webpage
19721979
websites
19731980
wekyb
1981+
wewoad
19741982
wex
19751983
wextest
19761984
wextestclass
@@ -2118,6 +2126,7 @@ XIn
21182126
XManifest
21192127
XMath
21202128
xorg
2129+
XPan
21212130
XResource
21222131
xsi
21232132
xstyler
@@ -2137,6 +2146,7 @@ YCast
21372146
YCENTER
21382147
YCount
21392148
YLimit
2149+
YPan
21402150
YSubstantial
21412151
YVIRTUALSCREEN
21422152
YWalk

‎.github/workflows/similarIssues.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
issueTitle: ${{ github.event.issue.title }}
1717
issueBody: ${{ github.event.issue.body }}
1818
repo: ${{ github.repository }}
19-
similaritytolerance: "0.75"
19+
similaritytolerance: "0.8"
2020
add-comment:
2121
needs: getSimilarIssues
2222
runs-on: ubuntu-latest

‎build/pipelines/daily-loc-submission.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ steps:
5151
git config --local core.autocrlf true
5252
displayName: Prepare git submission environment
5353

54-
- task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@1
54+
- task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@3
5555
displayName: 'Touchdown Build - 7105, PRODEXT'
5656
inputs:
5757
teamId: 7105
58-
authId: '$(TouchdownApplicationID)'
59-
authKey: '$(TouchdownApplicationKey)'
58+
TDBuildServiceConnection: $(TouchdownServiceConnection)
59+
authType: SubjectNameIssuer
6060
resourceFilePath: |
6161
**\en-US\*.resw
6262
Terminal.Internal\PDPs\Stable\PDPs\en-us\PDP.xml

‎build/pipelines/ob-nightly.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ extends:
3030
buildTerminal: true
3131
pgoBuildMode: Optimize
3232
codeSign: true
33+
signingIdentity:
34+
serviceName: $(SigningServiceName)
35+
appId: $(SigningAppId)
36+
tenantId: $(SigningTenantId)
37+
akvName: $(SigningAKVName)
38+
authCertName: $(SigningAuthCertName)
39+
signCertName: $(SigningSignCertName)
3340
publishSymbolsToPublic: true
3441
publishVpackToWindows: false
3542
symbolExpiryTime: 15

‎build/pipelines/ob-release.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,13 @@ extends:
7878
buildConfigurations: ${{ parameters.buildConfigurations }}
7979
buildPlatforms: ${{ parameters.buildPlatforms }}
8080
codeSign: true
81+
signingIdentity:
82+
serviceName: $(SigningServiceName)
83+
appId: $(SigningAppId)
84+
tenantId: $(SigningTenantId)
85+
akvName: $(SigningAKVName)
86+
authCertName: $(SigningAuthCertName)
87+
signCertName: $(SigningSignCertName)
8188
terminalInternalPackageVersion: ${{ parameters.terminalInternalPackageVersion }}
8289
publishSymbolsToPublic: ${{ parameters.publishSymbolsToPublic }}
8390
publishVpackToWindows: ${{ parameters.publishVpackToWindows }}

‎build/pipelines/templates-v2/job-build-package-wpf.yml

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ parameters:
2727
- name: publishArtifacts
2828
type: boolean
2929
default: true
30+
- name: signingIdentity
31+
type: object
32+
default: {}
3033

3134
jobs:
3235
- job: ${{ parameters.jobName }}
@@ -97,31 +100,32 @@ jobs:
97100
flattenFolders: true
98101

99102
- ${{ if eq(parameters.codeSign, true) }}:
100-
- task: EsrpCodeSigning@3
101-
displayName: Submit *.nupkg to ESRP for code signing
102-
inputs:
103-
ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
104-
FolderPath: $(Build.ArtifactStagingDirectory)/nupkg
105-
Pattern: '*.nupkg'
106-
UseMinimatch: true
107-
signConfigType: inlineSignParams
108-
inlineOperation: >-
109-
[
110-
{
111-
"KeyCode": "CP-401405",
112-
"OperationCode": "NuGetSign",
113-
"Parameters": {},
114-
"ToolName": "sign",
115-
"ToolVersion": "1.0"
116-
},
117-
{
118-
"KeyCode": "CP-401405",
119-
"OperationCode": "NuGetVerify",
120-
"Parameters": {},
121-
"ToolName": "sign",
122-
"ToolVersion": "1.0"
123-
}
124-
]
103+
- template: steps-esrp-signing.yml
104+
parameters:
105+
displayName: Submit *.nupkg to ESRP for code signing
106+
signingIdentity: ${{ parameters.signingIdentity }}
107+
inputs:
108+
FolderPath: $(Build.ArtifactStagingDirectory)/nupkg
109+
Pattern: '*.nupkg'
110+
UseMinimatch: true
111+
signConfigType: inlineSignParams
112+
inlineOperation: >-
113+
[
114+
{
115+
"KeyCode": "CP-401405",
116+
"OperationCode": "NuGetSign",
117+
"Parameters": {},
118+
"ToolName": "sign",
119+
"ToolVersion": "1.0"
120+
},
121+
{
122+
"KeyCode": "CP-401405",
123+
"OperationCode": "NuGetVerify",
124+
"Parameters": {},
125+
"ToolName": "sign",
126+
"ToolVersion": "1.0"
127+
}
128+
]
125129
126130
- ${{ if eq(parameters.generateSbom, true) }}:
127131
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0

‎build/pipelines/templates-v2/job-build-project.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ parameters:
6565
- name: removeAllNonSignedFiles
6666
type: boolean
6767
default: false
68+
- name: signingIdentity
69+
type: object
70+
default: {}
6871

6972
jobs:
7073
- job: ${{ parameters.jobName }}
@@ -142,6 +145,10 @@ jobs:
142145
143146
- template: .\steps-restore-nuget.yml
144147

148+
- pwsh: |-
149+
.\build\scripts\Set-LatestVCToolsVersion.ps1
150+
displayName: Work around DD-1541167 (VCToolsVersion)
151+
145152
- ${{ parameters.beforeBuildSteps }}
146153

147154
- task: VSBuild@1
@@ -235,13 +242,14 @@ jobs:
235242

236243
# Code-sign everything we just put together.
237244
# We run the signing in Terminal.BinDir, because all of the signing batches are relative to the final architecture/configuration output folder.
238-
- task: EsrpCodeSigning@3
239-
displayName: Submit Signing Request
240-
inputs:
241-
ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
242-
FolderPath: '$(Terminal.BinDir)'
243-
signType: batchSigning
244-
batchSignPolicyFile: '$(Build.SourcesDirectory)/ESRPSigningConfig.json'
245+
- template: steps-esrp-signing.yml
246+
parameters:
247+
displayName: Submit Signing Request
248+
signingIdentity: ${{ parameters.signingIdentity }}
249+
inputs:
250+
FolderPath: '$(Terminal.BinDir)'
251+
signType: batchSigning
252+
batchSignPolicyFile: '$(Build.SourcesDirectory)/ESRPSigningConfig.json'
245253

246254
# We only need to re-pack the MSIX if we actually signed, so this can stay in the codeSign conditional
247255
- ${{ if or(parameters.buildTerminal, parameters.buildEverything) }}:

‎build/pipelines/templates-v2/job-merge-msix-into-bundle.yml

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ parameters:
3232
- name: afterBuildSteps
3333
type: stepList
3434
default: []
35+
- name: signingIdentity
36+
type: object
37+
default: {}
3538

3639
jobs:
3740
- job: ${{ parameters.jobName }}
@@ -94,40 +97,41 @@ jobs:
9497
displayName: Create msixbundle
9598
9699
- ${{ if eq(parameters.codeSign, true) }}:
97-
- task: EsrpCodeSigning@3
98-
displayName: Submit *.msixbundle to ESRP for code signing
99-
inputs:
100-
ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
101-
FolderPath: $(System.ArtifactsDirectory)\bundle
102-
Pattern: $(BundleStemName)*.msixbundle
103-
UseMinimatch: true
104-
signConfigType: inlineSignParams
105-
inlineOperation: >-
106-
[
107-
{
108-
"KeyCode": "Dynamic",
109-
"CertTemplateName": "WINMSAPP1ST",
110-
"CertSubjectName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
111-
"OperationCode": "SigntoolSign",
112-
"Parameters": {
113-
"OpusName": "Microsoft",
114-
"OpusInfo": "http://www.microsoft.com",
115-
"FileDigest": "/fd \"SHA256\"",
116-
"TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
117-
},
118-
"ToolName": "sign",
119-
"ToolVersion": "1.0"
120-
},
121-
{
122-
"KeyCode": "Dynamic",
123-
"CertTemplateName": "WINMSAPP1ST",
124-
"CertSubjectName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
125-
"OperationCode": "SigntoolVerify",
126-
"Parameters": {},
127-
"ToolName": "sign",
128-
"ToolVersion": "1.0"
129-
}
130-
]
100+
- template: steps-esrp-signing.yml
101+
parameters:
102+
displayName: Submit *.msixbundle to ESRP for code signing
103+
signingIdentity: ${{ parameters.signingIdentity }}
104+
inputs:
105+
FolderPath: $(System.ArtifactsDirectory)\bundle
106+
Pattern: $(BundleStemName)*.msixbundle
107+
UseMinimatch: true
108+
signConfigType: inlineSignParams
109+
inlineOperation: >-
110+
[
111+
{
112+
"KeyCode": "Dynamic",
113+
"CertTemplateName": "WINMSAPP1ST",
114+
"CertSubjectName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
115+
"OperationCode": "SigntoolSign",
116+
"Parameters": {
117+
"OpusName": "Microsoft",
118+
"OpusInfo": "http://www.microsoft.com",
119+
"FileDigest": "/fd \"SHA256\"",
120+
"TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
121+
},
122+
"ToolName": "sign",
123+
"ToolVersion": "1.0"
124+
},
125+
{
126+
"KeyCode": "Dynamic",
127+
"CertTemplateName": "WINMSAPP1ST",
128+
"CertSubjectName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
129+
"OperationCode": "SigntoolVerify",
130+
"Parameters": {},
131+
"ToolName": "sign",
132+
"ToolVersion": "1.0"
133+
}
134+
]
131135
132136
- ${{ if eq(parameters.generateSbom, true) }}:
133137
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0

0 commit comments

Comments
 (0)