Generate Sbom for VS insertion (#6545)

azure-pipelines.yml

@@ -153,6 +153,7 @@ stages:
               /p:ManifestBuildBranch=$(Build.SourceBranchName)
               /p:ManifestBuildNumber=$(Build.BuildNumber)
               /p:VisualStudioDropName=Products/dotnet/razor-tooling/$(Build.SourceBranchName)/$(Build.BuildNumber)
+              /p:GenerateSbom=true
 
         - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
           - group: DotNet-Blob-Feed
@@ -171,6 +172,8 @@ stages:
           inputs:
             command: custom
             arguments: 'locals all -clear'
+        - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+          - template: /eng/common/restore-internal-tools.yml
 
         - powershell: ./eng/scripts/InstallProcDump.ps1
           displayName: Install ProcDump

build.cmd

@@ -1,3 +1,8 @@
 @echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build -pack %*"
-exit /b %ErrorLevel%
+setlocal
+
+set _args=%*
+if "%~1"=="-?" set _args=-help
+
+powershell -ExecutionPolicy ByPass -NoProfile -Command "& '%~dp0eng\common\build.ps1'" %_args%
+exit /b %ERRORLEVEL%

eng/common/restore-internal-tools.yml

@@ -0,0 +1,15 @@
+steps:
+  - task: NuGetAuthenticate@0
+    inputs:
+      nuGetServiceConnections: 'devdiv/dotnet-core-internal-tooling'
+      forceReinstallCredentialProvider: true
+
+  - script: $(Build.SourcesDirectory)\build.cmd
+            -ci
+            -restore
+            -projects $(Build.SourcesDirectory)/eng/common/internal/Tools.csproj
+            /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/RestoreInternal.binlog
+            /v:normal
+    displayName: Restore internal tools
+    condition: and(succeeded(), ne(variables['_skipRestoreInternalTools'], 'true'))
+

global.json

@@ -4,7 +4,8 @@
     "runtimes": {
       "dotnet": [
         "2.1.11",
-        "$(MicrosoftNETCoreBrowserDebugHostTransportPackageVersion)"
+        "$(MicrosoftNETCoreBrowserDebugHostTransportPackageVersion)",
+        "3.1.0"
       ]
     },
     "vs": {