Skip to content

Commit 4cfa977

Browse files
authored
Adds SBOM Task and 1ES Hosted Pool Configuration for v3.x (#8018)
* adds sbom and 1ES Hosted Pool * updating langversion to latest * testing with MMS2022TLS * rolling back to 2019
1 parent 22fa432 commit 4cfa977

File tree

2 files changed

+47
-6
lines changed

2 files changed

+47
-6
lines changed

azure-pipelines.yml

Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ trigger:
1919
jobs:
2020
- job: InitializePipeline
2121
pool:
22-
vmImage: 'windows-2019'
22+
name: '1ES-Hosted-AzFunc'
23+
demands:
24+
- ImageOverride -equals MMS2019TLS
2325
steps:
2426
- task: AzureKeyVault@1
2527
inputs:
@@ -51,7 +53,9 @@ jobs:
5153
minorVersion: $[dependencies.InitializePipeline.outputs['Initialize.MinorVersion']]
5254
patchVersion: $[dependencies.InitializePipeline.outputs['Initialize.PatchVersion']]
5355
pool:
54-
vmImage: 'windows-2019'
56+
name: '1ES-Hosted-AzFunc'
57+
demands:
58+
- ImageOverride -equals MMS2019TLS
5559
steps:
5660
- task: UseDotNet@2
5761
inputs:
@@ -275,6 +279,11 @@ jobs:
275279
displayName: 'Delete CodeSignSummary files'
276280
inputs:
277281
contents: '**\CodeSignSummary-*.md'
282+
- task: ManifestGeneratorTask@0
283+
displayName: 'SBOM Generation Task - SiteExtension'
284+
inputs:
285+
BuildDropPath: '$(Build.ArtifactStagingDirectory)\SiteExtension'
286+
Verbosity: 'Information'
278287
- publish: $(Build.ArtifactStagingDirectory)\SiteExtension
279288
artifact: SiteExtension
280289
- pwsh: |
@@ -284,21 +293,49 @@ jobs:
284293
Write-Host "##vso[task.setvariable variable=isPatchVersion]true"
285294
}
286295
displayName: 'Set isPatchVersion'
296+
- task: ManifestGeneratorTask@0
297+
displayName: 'SBOM Generation Task - ZippedPatchSiteExtension'
298+
inputs:
299+
BuildDropPath: '$(Build.ArtifactStagingDirectory)\ZippedPatchSiteExtension'
300+
Verbosity: 'Information'
301+
condition: and(succeeded(), eq(variables['isPatchVersion'], 'true'))
287302
- publish: $(Build.ArtifactStagingDirectory)\ZippedPatchSiteExtension
288303
artifact: PatchedSiteExtension
289304
condition: and(succeeded(), eq(variables['isPatchVersion'], 'true'))
305+
- task: ManifestGeneratorTask@0
306+
displayName: 'SBOM Generation Task - PrivateSiteExtension'
307+
inputs:
308+
BuildDropPath: '$(Build.ArtifactStagingDirectory)\PrivateSiteExtension'
309+
Verbosity: 'Information'
290310
- publish: $(Build.ArtifactStagingDirectory)\PrivateSiteExtension
291311
artifact: PrivateSiteExtension
312+
- task: ManifestGeneratorTask@0
313+
displayName: 'SBOM Generation Task - Symbols'
314+
inputs:
315+
BuildDropPath: '$(Build.ArtifactStagingDirectory)\Symbols'
316+
Verbosity: 'Information'
292317
- publish: $(Build.ArtifactStagingDirectory)\Symbols
293318
artifact: Symbols
319+
- task: ManifestGeneratorTask@0
320+
displayName: 'SBOM Generation Task - NugetPackages'
321+
inputs:
322+
BuildDropPath: '$(Build.Repository.LocalPath)\packages'
323+
Verbosity: 'Information'
294324
- publish: $(Build.Repository.LocalPath)\packages
295325
artifact: NugetPackages
326+
- task: ManifestGeneratorTask@0
327+
displayName: 'SBOM Generation Task - Performance'
328+
inputs:
329+
BuildDropPath: '$(Build.Repository.LocalPath)\WebJobs.Script.Performance.App'
330+
Verbosity: 'Information'
296331
- publish: $(Build.Repository.LocalPath)\WebJobs.Script.Performance.App
297332
artifact: Performance
298333

299334
- job: RunUnitTests
300335
pool:
301-
vmImage: 'windows-2019'
336+
name: '1ES-Hosted-AzFunc'
337+
demands:
338+
- ImageOverride -equals MMS2019TLS
302339
steps:
303340
- task: UseDotNet@2
304341
inputs:
@@ -318,7 +355,9 @@ jobs:
318355
319356
- job: RunNonE2EIntegrationTests
320357
pool:
321-
vmImage: 'windows-2019'
358+
name: '1ES-Hosted-AzFunc'
359+
demands:
360+
- ImageOverride -equals MMS2019TLS
322361
steps:
323362
- task: UseDotNet@2
324363
inputs:
@@ -375,7 +414,9 @@ jobs:
375414

376415
- job: RunIntegrationTests
377416
pool:
378-
vmImage: 'windows-2019'
417+
name: '1ES-Hosted-AzFunc'
418+
demands:
419+
- ImageOverride -equals MMS2019TLS
379420
steps:
380421
- task: UseDotNet@2
381422
inputs:

build/common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project=".\package.props" />
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<LangVersion>8.0</LangVersion>
5+
<LangVersion>latest</LangVersion>
66
<MajorVersion>3</MajorVersion>
77
<MinorVersion>5</MinorVersion>
88
<PatchVersion>0</PatchVersion>

0 commit comments

Comments
 (0)