Skip to content

Commit 913ff28

Browse files
Update dependencies from https://github.com/dotnet/dotnet build 291548 (#64452)
[main] Source code updates from dotnet/dotnet
1 parent 260ad54 commit 913ff28

16 files changed

+313
-478
lines changed

eng/Version.Details.props

Lines changed: 92 additions & 92 deletions
Large diffs are not rendered by default.

eng/Version.Details.xml

Lines changed: 185 additions & 185 deletions
Large diffs are not rendered by default.

eng/common/core-templates/job/job.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ parameters:
3131
testRunTitle: ''
3232
testResultsFormat: ''
3333
name: ''
34-
componentGovernanceSteps: []
3534
preSteps: []
3635
artifactPublishSteps: []
3736
runAsPublic: false
@@ -150,9 +149,6 @@ jobs:
150149
- ${{ each step in parameters.steps }}:
151150
- ${{ step }}
152151

153-
- ${{ each step in parameters.componentGovernanceSteps }}:
154-
- ${{ step }}
155-
156152
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
157153
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
158154
parameters:

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ jobs:
172172
artifactName: AssetManifests
173173
displayName: 'Publish Merged Manifest'
174174
retryCountOnTaskFailure: 10 # for any logs being locked
175-
sbomEnabled: false # we don't need SBOM for logs
175+
isProduction: false
176176

177177
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
178178
parameters:

eng/common/core-templates/steps/component-governance.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 10 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,14 @@
1-
# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated.
2-
# PackageName - The name of the package this SBOM represents.
3-
# PackageVersion - The version of the package this SBOM represents.
4-
# ManifestDirPath - The path of the directory where the generated manifest files will be placed
5-
# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.
6-
71
parameters:
8-
PackageVersion: 11.0.0
9-
BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts'
10-
PackageName: '.NET'
11-
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
12-
IgnoreDirectories: ''
13-
sbomContinueOnError: true
14-
is1ESPipeline: false
15-
# disable publishArtifacts if some other step is publishing the artifacts (like job.yml).
16-
publishArtifacts: true
2+
PackageVersion: unused
3+
BuildDropPath: unused
4+
PackageName: unused
5+
ManifestDirPath: unused
6+
IgnoreDirectories: unused
7+
sbomContinueOnError: unused
8+
is1ESPipeline: unused
9+
publishArtifacts: unused
1710

1811
steps:
19-
- task: PowerShell@2
20-
displayName: Prep for SBOM generation in (Non-linux)
21-
condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin'))
22-
inputs:
23-
filePath: ./eng/common/generate-sbom-prep.ps1
24-
arguments: ${{parameters.manifestDirPath}}
25-
26-
# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461
2712
- script: |
28-
chmod +x ./eng/common/generate-sbom-prep.sh
29-
./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}}
30-
displayName: Prep for SBOM generation in (Linux)
31-
condition: eq(variables['Agent.Os'], 'Linux')
32-
continueOnError: ${{ parameters.sbomContinueOnError }}
33-
34-
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
35-
displayName: 'Generate SBOM manifest'
36-
continueOnError: ${{ parameters.sbomContinueOnError }}
37-
inputs:
38-
PackageName: ${{ parameters.packageName }}
39-
BuildDropPath: ${{ parameters.buildDropPath }}
40-
PackageVersion: ${{ parameters.packageVersion }}
41-
ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME)
42-
${{ if ne(parameters.IgnoreDirectories, '') }}:
43-
AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}'
44-
45-
- ${{ if eq(parameters.publishArtifacts, 'true')}}:
46-
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
47-
parameters:
48-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
49-
args:
50-
displayName: Publish SBOM manifest
51-
continueOnError: ${{parameters.sbomContinueOnError}}
52-
targetPath: '${{ parameters.manifestDirPath }}'
53-
artifactName: $(ARTIFACT_NAME)
54-
13+
echo "##vso[task.logissue type=warning]Including generate-sbom.yml is deprecated, SBOM generation is handled 1ES PT now. Remove this include."
14+
displayName: Issue generate-sbom.yml deprecation warning

eng/common/core-templates/steps/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ steps:
6262
artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
6363
continueOnError: true
6464
condition: succeededOrFailed()
65-
sbomEnabled: false # we don't need SBOM for logs
65+
isProduction: false

eng/common/generate-sbom-prep.ps1

Lines changed: 0 additions & 29 deletions
This file was deleted.

eng/common/generate-sbom-prep.sh

Lines changed: 0 additions & 39 deletions
This file was deleted.

eng/common/template-guidance.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ eng\common\
8282
publish-build-artifacts.yml (logic)
8383
publish-pipeline-artifacts.yml (logic)
8484
component-governance.yml (shim)
85-
generate-sbom.yml (shim)
8685
publish-logs.yml (shim)
8786
retain-build.yml (shim)
8887
send-to-helix.yml (shim)
@@ -107,7 +106,6 @@ eng\common\
107106
setup-maestro-vars.yml (logic)
108107
steps\
109108
component-governance.yml (logic)
110-
generate-sbom.yml (logic)
111109
publish-build-artifacts.yml (redirect)
112110
publish-logs.yml (logic)
113111
publish-pipeline-artifacts.yml (redirect)

0 commit comments

Comments
 (0)