[release/6.0] Update dependencies from dotnet/emsdk dotnet/arcade

NuGet.config

@@ -9,7 +9,7 @@
  <clear />
  <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
  <!-- Begin: Package sources from dotnet-emsdk -->
- <add key="darc-pub-dotnet-emsdk-572aeed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-572aeedc/nuget/v3/index.json" />
+ <add key="darc-pub-dotnet-emsdk-52e9452" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-52e9452f/nuget/v3/index.json" />
  <!-- End: Package sources from dotnet-emsdk -->
  <!-- Begin: Package sources from dotnet-wcf -->
  <!-- End: Package sources from dotnet-wcf -->

eng/Version.Details.xml

@@ -10,93 +10,93 @@
  </Dependency>
  <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.4">
  <Uri>https://github.com/dotnet/emsdk</Uri>
- <Sha>572aeedcfa16bdb619fafcecf5924e5c6b65b07b</Sha>
+ <Sha>52e9452f82e26f9fcae791e84c082ae22f1ef66f</Sha>
  </Dependency>
  <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.200" Version="6.0.4">
  <Uri>https://github.com/dotnet/emsdk</Uri>
- <Sha>572aeedcfa16bdb619fafcecf5924e5c6b65b07b</Sha>
+ <Sha>52e9452f82e26f9fcae791e84c082ae22f1ef66f</Sha>
  </Dependency>
  <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.4">
  <Uri>https://github.com/dotnet/emsdk</Uri>
- <Sha>572aeedcfa16bdb619fafcecf5924e5c6b65b07b</Sha>
+ <Sha>52e9452f82e26f9fcae791e84c082ae22f1ef66f</Sha>
  </Dependency>
  <Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
  <Uri>https://github.com/dotnet/wcf</Uri>
  <Sha>04c3656e0325277aefa18378f24238d39b259222</Sha>
  </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22107.2">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22161.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+ <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22107.2">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22161.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+ <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22107.2">
+ <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22161.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+ <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22107.2">
+ <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22161.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+ <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22107.2">
+ <Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22161.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+ <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22107.2">
+ <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22161.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+ <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22107.2">
+ <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22161.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+ <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22107.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22161.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+ <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22107.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22161.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+ <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22122.4">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22161.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>853684cf39fdc68035736a4ff0f81303bf4b4361</Sha>
+ <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22107.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22161.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+ <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22107.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22161.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+ <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22107.2">
+ <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22161.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+ <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22107.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22161.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+ <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22107.2">
+ <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22161.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+ <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22107.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22161.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+ <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22107.2">
+ <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22161.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+ <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22107.2">
+ <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22161.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+ <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
  </Dependency>
  <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
  <Uri>https://github.com/microsoft/vstest</Uri>
@@ -218,9 +218,9 @@
  <Uri>https://github.com/dotnet/xharness</Uri>
  <Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22107.2">
+ <Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22161.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+ <Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
  </Dependency>
  <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
  <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

eng/Versions.props

@@ -41,21 +41,21 @@
  <!-- SDK dependencies -->
  <MicrosoftDotNetCompatibilityVersion>1.0.0-rc.2.21511.46</MicrosoftDotNetCompatibilityVersion>
  <!-- Arcade dependencies -->
- <MicrosoftDotNetApiCompatVersion>6.0.0-beta.22107.2</MicrosoftDotNetApiCompatVersion>
- <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksFeedVersion>
- <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22107.2</MicrosoftDotNetCodeAnalysisVersion>
- <MicrosoftDotNetGenAPIVersion>6.0.0-beta.22107.2</MicrosoftDotNetGenAPIVersion>
- <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22107.2</MicrosoftDotNetGenFacadesVersion>
- <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22107.2</MicrosoftDotNetXUnitExtensionsVersion>
- <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22107.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
- <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksArchivesVersion>
- <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22122.4</MicrosoftDotNetBuildTasksInstallersVersion>
- <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksPackagingVersion>
- <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksTemplatingVersion>
- <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
- <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22107.2</MicrosoftDotNetRemoteExecutorVersion>
- <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22107.2</MicrosoftDotNetVersionToolsTasksVersion>
- <MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22107.2</MicrosoftDotNetPackageTestingVersion>
+ <MicrosoftDotNetApiCompatVersion>6.0.0-beta.22161.1</MicrosoftDotNetApiCompatVersion>
+ <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksFeedVersion>
+ <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22161.1</MicrosoftDotNetCodeAnalysisVersion>
+ <MicrosoftDotNetGenAPIVersion>6.0.0-beta.22161.1</MicrosoftDotNetGenAPIVersion>
+ <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22161.1</MicrosoftDotNetGenFacadesVersion>
+ <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22161.1</MicrosoftDotNetXUnitExtensionsVersion>
+ <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22161.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
+ <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksArchivesVersion>
+ <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksInstallersVersion>
+ <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksPackagingVersion>
+ <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksTemplatingVersion>
+ <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
+ <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22161.1</MicrosoftDotNetRemoteExecutorVersion>
+ <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22161.1</MicrosoftDotNetVersionToolsTasksVersion>
+ <MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22161.1</MicrosoftDotNetPackageTestingVersion>
  <!-- NuGet dependencies -->
  <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
  <!-- Installer dependencies -->

eng/common/generate-sbom-prep.ps1

@@ -0,0 +1,19 @@
+Param(
+ [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed
+)
+
+Write-Host "Creating dir $ManifestDirPath"
+# create directory for sbom manifest to be placed
+if (!(Test-Path -path $ManifestDirPath))
+{
+ New-Item -ItemType Directory -path $ManifestDirPath
+ Write-Host "Successfully created directory $ManifestDirPath"
+}
+else{
+ Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
+}
+
+Write-Host "Updating artifact name"
+$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
+Write-Host "Artifact name $artifact_name"
+Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"

eng/common/generate-sbom-prep.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+source="${BASH_SOURCE[0]}"
+
+manifest_dir=$1
+
+if [ ! -d "$manifest_dir" ] ; then
+ mkdir -p "$manifest_dir"
+ echo "Sbom directory created." $manifest_dir
+else
+ Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
+fi
+
+artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
+echo "Artifact name before : "$artifact_name
+# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
+safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
+echo "Artifact name after : "$safe_artifact_name
+export ARTIFACT_NAME=$safe_artifact_name
+echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"
+
+exit 0

eng/common/templates/job/execute-sdl.yml

@@ -43,14 +43,9 @@ jobs:
  value: ${{ parameters.AzDOPipelineId }}
  - name: AzDOBuildId
  value: ${{ parameters.AzDOBuildId }}
- # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
- # sync with the packages.config file.
- - name: DefaultGuardianVersion
- value: 0.110.1
+ - template: /eng/common/templates/variables/sdl-variables.yml
  - name: GuardianVersion
  value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
- - name: GuardianPackagesConfigFile
- value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
  pool:
  # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
  ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
@@ -126,57 +121,11 @@ jobs:
  displayName: Extract Archive Artifacts
  continueOnError: ${{ parameters.sdlContinueOnError }}
 
- - ${{ if ne(parameters.overrideGuardianVersion, '') }}:
- - powershell: |
- $content = Get-Content $(GuardianPackagesConfigFile)
-
- Write-Host "packages.config content was:`n$content"
-
- $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)')
- $content | Set-Content $(GuardianPackagesConfigFile)
-
- Write-Host "packages.config content updated to:`n$content"
- displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }}
-
- - task: NuGetToolInstaller@1
- displayName: 'Install NuGet.exe'
- - task: NuGetCommand@2
- displayName: 'Install Guardian'
- inputs:
- restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
- feedsToUse: config
- nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
- externalFeedCredentials: GuardianConnect
- restoreDirectory: $(Build.SourcesDirectory)\.packages
-
- - ${{ if ne(parameters.overrideParameters, '') }}:
- - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
- displayName: Execute SDL
- continueOnError: ${{ parameters.sdlContinueOnError }}
- - ${{ if eq(parameters.overrideParameters, '') }}:
- - powershell: ${{ parameters.executeAllSdlToolsScript }}
- -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
- -NugetPackageDirectory $(Build.SourcesDirectory)\.packages
- -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
- ${{ parameters.additionalParameters }}
- displayName: Execute SDL
- continueOnError: ${{ parameters.sdlContinueOnError }}
-
- - ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}:
- # We want to publish the Guardian results and configuration for easy diagnosis. However, the
- # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default
- # tooling files. Some of these files are large and aren't useful during an investigation, so
- # exclude them by simply deleting them before publishing. (As of writing, there is no documented
- # way to selectively exclude a dir from the pipeline artifact publish task.)
- - task: DeleteFiles@1
- displayName: Delete Guardian dependencies to avoid uploading
- inputs:
- SourceFolder: $(Agent.BuildDirectory)/.gdn
- Contents: |
- c
- i
- condition: succeededOrFailed()
- - publish: $(Agent.BuildDirectory)/.gdn
- artifact: GuardianConfiguration
- displayName: Publish GuardianConfiguration
- condition: succeededOrFailed()
+ - template: /eng/common/templates/steps/execute-sdl.yml
+ parameters:
+ overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }}
+ executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }}
+ overrideParameters: ${{ parameters.overrideParameters }}
+ additionalParameters: ${{ parameters.additionalParameters }}
+ publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }}
+ sdlContinueOnError: ${{ parameters.sdlContinueOnError }}

eng/common/templates/job/job.yml

@@ -31,6 +31,10 @@ parameters:
  name: ''
  preSteps: []
  runAsPublic: false
+# Sbom related params
+ enableSbom: true
+ PackageVersion: 6.0.0
+ BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
 
 jobs:
 - job: ${{ parameters.name }}
@@ -247,3 +251,9 @@ jobs:
  ArtifactName: AssetManifests
  continueOnError: ${{ parameters.continueOnError }}
  condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
+
+ - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
+ - template: /eng/common/templates/steps/generate-sbom.yml
+ parameters:
+ PackageVersion: ${{ parameters.packageVersion}}
+ BuildDropPath: ${{ parameters.buildDropPath }}

eng/common/templates/jobs/codeql-build.yml

@@ -21,7 +21,7 @@ jobs:
  # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
  # sync with the packages.config file.
  - name: DefaultGuardianVersion
- value: 0.109.0
+ value: 0.110.1
  - name: GuardianPackagesConfigFile
  value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
  - name: GuardianVersion

eng/common/templates/jobs/jobs.yml

@@ -8,10 +8,6 @@ parameters:
  # Optional: Enable publishing using release pipelines
  enablePublishUsingPipelines: false
 
- # Optional: Disable component governance detection. In general, component governance
- # should be on for all jobs. Use only in the event of issues.
- disableComponentGovernance: false
-
  # Optional: Enable running the source-build jobs to build repo from source
  enableSourceBuild: false