Merge pull request #62449 from dotnet/merges/release/dev17.0-vs-deps-…

…to-release/dev17.2 Merge release/dev17.0-vs-deps to release/dev17.2
dotnet · Jul 7, 2022 · 91f2c11 · 91f2c11
2 parents 49074bb + c99255e
commit 91f2c11
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
@@ -190,6 +190,7 @@ stages:
                    /p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
                    /p:DotnetPublishUsingPipelines=true
                    /p:IgnoreIbcMergeErrors=true
+                   /p:GenerateSbom=true
       condition: succeeded()
 
     - template: eng\common\templates\steps\generate-sbom.yml

diff --git a/global.json b/global.json
@@ -6,6 +6,11 @@
   },
   "tools": {
     "dotnet": "7.0.100-preview.4.22252.9",
+    "runtimes": {
+      "dotnet": [
+       "3.1.0"
+      ]
+    },
     "vs": {
       "version": "17.0"
     },