Skip to content

Commit 1cb7505

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/6.0' changes
2 parents 4fa64a1 + 2eb4efb commit 1cb7505

File tree

16 files changed

+247
-137
lines changed

16 files changed

+247
-137
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12-
<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" />
12+
<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" />
1313
<!-- End: Package sources from dotnet-emsdk -->
1414
<!-- Begin: Package sources from dotnet-wcf -->
1515
<!-- End: Package sources from dotnet-wcf -->

‎eng/Version.Details.xml‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -10,93 +10,93 @@
1010
</Dependency>
1111
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.4">
1212
<Uri>https://github.com/dotnet/emsdk</Uri>
13-
<Sha>572aeedcfa16bdb619fafcecf5924e5c6b65b07b</Sha>
13+
<Sha>52e9452f82e26f9fcae791e84c082ae22f1ef66f</Sha>
1414
</Dependency>
1515
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.200" Version="6.0.4">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>572aeedcfa16bdb619fafcecf5924e5c6b65b07b</Sha>
17+
<Sha>52e9452f82e26f9fcae791e84c082ae22f1ef66f</Sha>
1818
</Dependency>
1919
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.4">
2020
<Uri>https://github.com/dotnet/emsdk</Uri>
21-
<Sha>572aeedcfa16bdb619fafcecf5924e5c6b65b07b</Sha>
21+
<Sha>52e9452f82e26f9fcae791e84c082ae22f1ef66f</Sha>
2222
</Dependency>
2323
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
2424
<Uri>https://github.com/dotnet/wcf</Uri>
2525
<Sha>04c3656e0325277aefa18378f24238d39b259222</Sha>
2626
</Dependency>
2727
</ProductDependencies>
2828
<ToolsetDependencies>
29-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22107.2">
29+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22161.1">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
31+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22107.2">
33+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22161.1">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
35+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22107.2">
37+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22161.1">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
39+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22107.2">
41+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22161.1">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
43+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22107.2">
45+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22161.1">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
47+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22107.2">
49+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22161.1">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
51+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22107.2">
53+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22161.1">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
55+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22107.2">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22161.1">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
59+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22107.2">
61+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22161.1">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
63+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22122.4">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22161.1">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>853684cf39fdc68035736a4ff0f81303bf4b4361</Sha>
67+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22107.2">
69+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22161.1">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
71+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22107.2">
73+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22161.1">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
75+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22107.2">
77+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22161.1">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
79+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22107.2">
81+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22161.1">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
83+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22107.2">
85+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22161.1">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
87+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22107.2">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22161.1">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
91+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22107.2">
93+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22161.1">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
95+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22107.2">
97+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22161.1">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
99+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
100100
</Dependency>
101101
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
102102
<Uri>https://github.com/microsoft/vstest</Uri>
@@ -218,9 +218,9 @@
218218
<Uri>https://github.com/dotnet/xharness</Uri>
219219
<Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
220220
</Dependency>
221-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22107.2">
221+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22161.1">
222222
<Uri>https://github.com/dotnet/arcade</Uri>
223-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
223+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
224224
</Dependency>
225225
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
226226
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,21 @@
4141
<!-- SDK dependencies -->
4242
<MicrosoftDotNetCompatibilityVersion>1.0.0-rc.2.21511.46</MicrosoftDotNetCompatibilityVersion>
4343
<!-- Arcade dependencies -->
44-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.22107.2</MicrosoftDotNetApiCompatVersion>
45-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksFeedVersion>
46-
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22107.2</MicrosoftDotNetCodeAnalysisVersion>
47-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.22107.2</MicrosoftDotNetGenAPIVersion>
48-
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22107.2</MicrosoftDotNetGenFacadesVersion>
49-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22107.2</MicrosoftDotNetXUnitExtensionsVersion>
50-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22107.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
51-
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksArchivesVersion>
52-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22122.4</MicrosoftDotNetBuildTasksInstallersVersion>
53-
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksPackagingVersion>
54-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksTemplatingVersion>
55-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
56-
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22107.2</MicrosoftDotNetRemoteExecutorVersion>
57-
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22107.2</MicrosoftDotNetVersionToolsTasksVersion>
58-
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22107.2</MicrosoftDotNetPackageTestingVersion>
44+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.22161.1</MicrosoftDotNetApiCompatVersion>
45+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksFeedVersion>
46+
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22161.1</MicrosoftDotNetCodeAnalysisVersion>
47+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.22161.1</MicrosoftDotNetGenAPIVersion>
48+
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22161.1</MicrosoftDotNetGenFacadesVersion>
49+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22161.1</MicrosoftDotNetXUnitExtensionsVersion>
50+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22161.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
51+
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksArchivesVersion>
52+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksInstallersVersion>
53+
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksPackagingVersion>
54+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksTemplatingVersion>
55+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
56+
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22161.1</MicrosoftDotNetRemoteExecutorVersion>
57+
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22161.1</MicrosoftDotNetVersionToolsTasksVersion>
58+
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22161.1</MicrosoftDotNetPackageTestingVersion>
5959
<!-- NuGet dependencies -->
6060
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
6161
<!-- Installer dependencies -->

‎eng/common/generate-sbom-prep.ps1‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Param(
2+
[Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed
3+
)
4+
5+
Write-Host "Creating dir $ManifestDirPath"
6+
# create directory for sbom manifest to be placed
7+
if (!(Test-Path -path $ManifestDirPath))
8+
{
9+
New-Item -ItemType Directory -path $ManifestDirPath
10+
Write-Host "Successfully created directory $ManifestDirPath"
11+
}
12+
else{
13+
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
14+
}
15+
16+
Write-Host "Updating artifact name"
17+
$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
18+
Write-Host "Artifact name $artifact_name"
19+
Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"

‎eng/common/generate-sbom-prep.sh‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/usr/bin/env bash
2+
3+
source="${BASH_SOURCE[0]}"
4+
5+
manifest_dir=$1
6+
7+
if [ ! -d "$manifest_dir" ] ; then
8+
mkdir -p "$manifest_dir"
9+
echo "Sbom directory created." $manifest_dir
10+
else
11+
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
12+
fi
13+
14+
artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
15+
echo "Artifact name before : "$artifact_name
16+
# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
17+
safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
18+
echo "Artifact name after : "$safe_artifact_name
19+
export ARTIFACT_NAME=$safe_artifact_name
20+
echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"
21+
22+
exit 0

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

Lines changed: 9 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,9 @@ jobs:
4343
value: ${{ parameters.AzDOPipelineId }}
4444
- name: AzDOBuildId
4545
value: ${{ parameters.AzDOBuildId }}
46-
# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
47-
# sync with the packages.config file.
48-
- name: DefaultGuardianVersion
49-
value: 0.110.1
46+
- template: /eng/common/templates/variables/sdl-variables.yml
5047
- name: GuardianVersion
5148
value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
52-
- name: GuardianPackagesConfigFile
53-
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
5449
pool:
5550
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
5651
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
@@ -126,57 +121,11 @@ jobs:
126121
displayName: Extract Archive Artifacts
127122
continueOnError: ${{ parameters.sdlContinueOnError }}
128123

129-
- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
130-
- powershell: |
131-
$content = Get-Content $(GuardianPackagesConfigFile)
132-
133-
Write-Host "packages.config content was:`n$content"
134-
135-
$content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)')
136-
$content | Set-Content $(GuardianPackagesConfigFile)
137-
138-
Write-Host "packages.config content updated to:`n$content"
139-
displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }}
140-
141-
- task: NuGetToolInstaller@1
142-
displayName: 'Install NuGet.exe'
143-
- task: NuGetCommand@2
144-
displayName: 'Install Guardian'
145-
inputs:
146-
restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
147-
feedsToUse: config
148-
nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
149-
externalFeedCredentials: GuardianConnect
150-
restoreDirectory: $(Build.SourcesDirectory)\.packages
151-
152-
- ${{ if ne(parameters.overrideParameters, '') }}:
153-
- powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
154-
displayName: Execute SDL
155-
continueOnError: ${{ parameters.sdlContinueOnError }}
156-
- ${{ if eq(parameters.overrideParameters, '') }}:
157-
- powershell: ${{ parameters.executeAllSdlToolsScript }}
158-
-GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
159-
-NugetPackageDirectory $(Build.SourcesDirectory)\.packages
160-
-AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
161-
${{ parameters.additionalParameters }}
162-
displayName: Execute SDL
163-
continueOnError: ${{ parameters.sdlContinueOnError }}
164-
165-
- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}:
166-
# We want to publish the Guardian results and configuration for easy diagnosis. However, the
167-
# '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default
168-
# tooling files. Some of these files are large and aren't useful during an investigation, so
169-
# exclude them by simply deleting them before publishing. (As of writing, there is no documented
170-
# way to selectively exclude a dir from the pipeline artifact publish task.)
171-
- task: DeleteFiles@1
172-
displayName: Delete Guardian dependencies to avoid uploading
173-
inputs:
174-
SourceFolder: $(Agent.BuildDirectory)/.gdn
175-
Contents: |
176-
c
177-
i
178-
condition: succeededOrFailed()
179-
- publish: $(Agent.BuildDirectory)/.gdn
180-
artifact: GuardianConfiguration
181-
displayName: Publish GuardianConfiguration
182-
condition: succeededOrFailed()
124+
- template: /eng/common/templates/steps/execute-sdl.yml
125+
parameters:
126+
overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }}
127+
executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }}
128+
overrideParameters: ${{ parameters.overrideParameters }}
129+
additionalParameters: ${{ parameters.additionalParameters }}
130+
publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }}
131+
sdlContinueOnError: ${{ parameters.sdlContinueOnError }}

‎eng/common/templates/job/job.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ parameters:
3131
name: ''
3232
preSteps: []
3333
runAsPublic: false
34+
# Sbom related params
35+
enableSbom: true
36+
PackageVersion: 6.0.0
37+
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
3438

3539
jobs:
3640
- job: ${{ parameters.name }}
@@ -247,3 +251,9 @@ jobs:
247251
ArtifactName: AssetManifests
248252
continueOnError: ${{ parameters.continueOnError }}
249253
condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
254+
255+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
256+
- template: /eng/common/templates/steps/generate-sbom.yml
257+
parameters:
258+
PackageVersion: ${{ parameters.packageVersion}}
259+
BuildDropPath: ${{ parameters.buildDropPath }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
2222
# sync with the packages.config file.
2323
- name: DefaultGuardianVersion
24-
value: 0.109.0
24+
value: 0.110.1
2525
- name: GuardianPackagesConfigFile
2626
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
2727
- name: GuardianVersion

‎eng/common/templates/jobs/jobs.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ parameters:
88
# Optional: Enable publishing using release pipelines
99
enablePublishUsingPipelines: false
1010

11-
# Optional: Disable component governance detection. In general, component governance
12-
# should be on for all jobs. Use only in the event of issues.
13-
disableComponentGovernance: false
14-
1511
# Optional: Enable running the source-build jobs to build repo from source
1612
enableSourceBuild: false
1713

0 commit comments

Comments
 (0)