Skip to content

Commit 91f2c11

Browse files
authored
Merge pull request dotnet#62449 from dotnet/merges/release/dev17.0-vs-deps-to-release/dev17.2
Merge release/dev17.0-vs-deps to release/dev17.2
2 parents 49074bb + c99255e commit 91f2c11

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

azure-pipelines-official.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ stages:
190190
/p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
191191
/p:DotnetPublishUsingPipelines=true
192192
/p:IgnoreIbcMergeErrors=true
193+
/p:GenerateSbom=true
193194
condition: succeeded()
194195

195196
- template: eng\common\templates\steps\generate-sbom.yml

global.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
},
77
"tools": {
88
"dotnet": "7.0.100-preview.4.22252.9",
9+
"runtimes": {
10+
"dotnet": [
11+
"3.1.0"
12+
]
13+
},
914
"vs": {
1015
"version": "17.0"
1116
},

0 commit comments

Comments
 (0)