Skip to content

Commit 96cf707

Browse files
committed
Index sources and move to ESRP signing 2.* to try and resolve .NET version problems
1 parent e88c8cc commit 96cf707

File tree

1 file changed

+5
-17
lines changed

1 file changed

+5
-17
lines changed

.pipelines/build.yml

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ jobs:
129129
inputs:
130130
SymbolsFolder: $(Build.ArtifactStagingDirectory)
131131
SearchPattern: '**/*.pdb'
132-
IndexSources: false
133132
SymbolServerType: TeamServices
134133
SymbolsProduct: CppWinRT
135134

@@ -153,11 +152,6 @@ jobs:
153152
disableMsbuildVersion: true
154153
disableBuildTools: true
155154

156-
- task: UseDotNet@2
157-
displayName: 'Use .NET Core runtime 2.1.x (required for ESRP signing)'
158-
inputs:
159-
version: 2.1.x
160-
161155
- task: DownloadPipelineArtifact@1
162156
displayName: Download x86 Artifacts
163157
inputs:
@@ -201,7 +195,7 @@ jobs:
201195
dir $(Build.SourcesDirectory)\x86\cppwinrt
202196
xcopy $(Build.SourcesDirectory)\x86\cppwinrt\*.* $(Build.SourcesDirectory)\x86\tempsign /icefzy
203197
204-
- task: EsrpCodeSigning@1
198+
- task: EsrpCodeSigning@2
205199
displayName: Sign Compiler vPack for internal use
206200
inputs:
207201
ConnectedServiceName: bf601a97-455d-4977-b248-07b90c96eed9
@@ -319,11 +313,6 @@ jobs:
319313
clean: true
320314
persistCredentials: True
321315

322-
- task: UseDotNet@2
323-
displayName: 'Use .NET Core runtime 2.1.x (required for ESRP signing)'
324-
inputs:
325-
version: 2.1.x
326-
327316
- task: NuGetToolInstaller@1
328317
displayName: Use NuGet 6.0.2
329318
continueOnError: True
@@ -357,7 +346,7 @@ jobs:
357346
artifactName: $(BuildConfiguration)_arm64
358347
downloadPath: $(Build.SourcesDirectory)\arm64
359348

360-
- task: EsrpCodeSigning@1
349+
- task: EsrpCodeSigning@2
361350
displayName: ESRP CodeSigning NatVis
362351
inputs:
363352
ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
@@ -437,7 +426,7 @@ jobs:
437426
- task: ComponentGovernanceComponentDetection@0
438427
displayName: Component Detection
439428

440-
- task: EsrpCodeSigning@1
429+
- task: EsrpCodeSigning@2
441430
displayName: ESRP CodeSigning Nuget Package
442431
inputs:
443432
ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
@@ -485,7 +474,7 @@ jobs:
485474
destinationFolder: $(Agent.TempDirectory)\Microsoft.Windows.CppWinRT.Dev17.vsix
486475
overwriteExistingFiles: true
487476

488-
- task: EsrpCodeSigning@1
477+
- task: EsrpCodeSigning@2
489478
displayName: ESRP CodeSign VSIX contents
490479
inputs:
491480
ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
@@ -539,7 +528,7 @@ jobs:
539528
platform: x86
540529
configuration: Release
541530

542-
- task: EsrpCodeSigning@1
531+
- task: EsrpCodeSigning@2
543532
displayName: ESRP CodeSigning VSIX
544533
inputs:
545534
ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
@@ -651,7 +640,6 @@ jobs:
651640
inputs:
652641
SymbolsFolder: $(Build.ArtifactStagingDirectory)
653642
SearchPattern: '**/Microsoft.Windows.CppWinRT.Dev17.pdb'
654-
IndexSources: false
655643
SymbolServerType: TeamServices
656644
SymbolsProduct: CppWinRT
657645
...

0 commit comments

Comments
 (0)