Skip to content

Commit 4a36192

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/6.0] Update dependencies from dotnet/arcade (#40522)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 3c4a02c commit 4a36192

File tree

9 files changed

+107
-20
lines changed

9 files changed

+107
-20
lines changed

‎NuGet.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-839cdfb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-839cdfb0/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-runtime -->
98
<!-- Begin: Package sources from dotnet-efcore -->
10-
<add key="darc-int-dotnet-efcore-d93f389" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d93f3895/nuget/v3/index.json" />
119
<!-- End: Package sources from dotnet-efcore -->
1210
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1311
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -27,10 +25,8 @@
2725
<clear />
2826
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2927
<!-- Begin: Package sources from dotnet-efcore -->
30-
<add key="darc-int-dotnet-efcore-d93f389" value="true" />
3128
<!-- End: Package sources from dotnet-efcore -->
3229
<!-- Begin: Package sources from dotnet-runtime -->
33-
<add key="darc-int-dotnet-runtime-839cdfb" value="true" />
3430
<!-- End: Package sources from dotnet-runtime -->
3531
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3632
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,22 +280,22 @@
280280
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
281281
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22107.2">
283+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22122.7">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
285+
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
286286
<SourceBuild RepoName="arcade" ManagedOnly="true" />
287287
</Dependency>
288-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22107.2">
288+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22122.7">
289289
<Uri>https://github.com/dotnet/arcade</Uri>
290-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
290+
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22107.2">
292+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22122.7">
293293
<Uri>https://github.com/dotnet/arcade</Uri>
294-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
294+
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22107.2">
296+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22122.7">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
298+
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
299299
</Dependency>
300300
</ToolsetDependencies>
301301
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
<MicrosoftEntityFrameworkCoreVersion>6.0.2</MicrosoftEntityFrameworkCoreVersion>
132132
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.2</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksInstallersVersion>
135-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksTemplatingVersion>
134+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22122.7</MicrosoftDotNetBuildTasksInstallersVersion>
135+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22122.7</MicrosoftDotNetBuildTasksTemplatingVersion>
136136
</PropertyGroup>
137137
<!--
138138

‎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/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/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

‎eng/common/templates/steps/generate-sbom.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated.
2+
# PackageName - The name of the package this SBOM represents.
3+
# PackageVersion - The version of the package this SBOM represents.
4+
# ManifestDirPath - The path of the directory where the generated manifest files will be placed
5+
6+
parameters:
7+
PackageVersion: 6.0.0
8+
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
9+
PackageName: '.NET'
10+
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
11+
sbomContinueOnError: true
12+
13+
steps:
14+
- task: PowerShell@2
15+
displayName: Prep for SBOM generation in (Non-linux)
16+
condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin'))
17+
inputs:
18+
filePath: ./eng/common/generate-sbom-prep.ps1
19+
arguments: ${{parameters.manifestDirPath}}
20+
21+
# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461
22+
- script: |
23+
chmod +x ./eng/common/generate-sbom-prep.sh
24+
./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}}
25+
displayName: Prep for SBOM generation in (Linux)
26+
condition: eq(variables['Agent.Os'], 'Linux')
27+
continueOnError: ${{ parameters.sbomContinueOnError }}
28+
29+
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
30+
displayName: 'Generate SBOM manifest'
31+
continueOnError: ${{ parameters.sbomContinueOnError }}
32+
inputs:
33+
PackageName: ${{ parameters.packageName }}
34+
BuildDropPath: ${{ parameters.buildDropPath }}
35+
PackageVersion: ${{ parameters.packageVersion }}
36+
ManifestDirPath: ${{ parameters.manifestDirPath }}
37+
38+
- task: PublishPipelineArtifact@1
39+
displayName: Publish SBOM manifest
40+
continueOnError: ${{parameters.sbomContinueOnError}}
41+
inputs:
42+
targetPath: '${{parameters.manifestDirPath}}'
43+
artifactName: $(ARTIFACT_NAME)
44+

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"msbuild-sdks": {
3131
"Yarn.MSBuild": "1.22.10",
32-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22107.2",
33-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22107.2"
32+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22122.7",
33+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22122.7"
3434
}
3535
}

0 commit comments

Comments
 (0)