Skip to content

Commit c8c2db2

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#4953)
[main] Update dependencies from dotnet/arcade
1 parent b0461f0 commit c8c2db2

File tree

7 files changed

+43
-29
lines changed

7 files changed

+43
-29
lines changed

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -152,29 +152,29 @@
152152
</Dependency>
153153
</ProductDependencies>
154154
<ToolsetDependencies>
155-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25125.5">
155+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25126.4">
156156
<Uri>https://github.com/dotnet/arcade</Uri>
157-
<Sha>55fcfd92d29648cbf024a07ad3517930106fbe09</Sha>
157+
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
158158
</Dependency>
159-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25125.5">
159+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25126.4">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>55fcfd92d29648cbf024a07ad3517930106fbe09</Sha>
161+
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25125.5">
163+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25126.4">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>55fcfd92d29648cbf024a07ad3517930106fbe09</Sha>
165+
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25125.5">
167+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25126.4">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>55fcfd92d29648cbf024a07ad3517930106fbe09</Sha>
169+
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
170170
</Dependency>
171-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25125.5">
171+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25126.4">
172172
<Uri>https://github.com/dotnet/arcade</Uri>
173-
<Sha>55fcfd92d29648cbf024a07ad3517930106fbe09</Sha>
173+
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
174174
</Dependency>
175-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25125.5">
175+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25126.4">
176176
<Uri>https://github.com/dotnet/arcade</Uri>
177-
<Sha>55fcfd92d29648cbf024a07ad3517930106fbe09</Sha>
177+
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
178178
</Dependency>
179179
</ToolsetDependencies>
180180
</Dependencies>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</PropertyGroup>
1212
<PropertyGroup>
1313
<!-- arcade -->
14-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25125.5</MicrosoftDotNetBuildTasksArchivesVersion>
15-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25125.5</MicrosoftDotNetBuildTasksInstallersVersion>
14+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25126.4</MicrosoftDotNetBuildTasksArchivesVersion>
15+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25126.4</MicrosoftDotNetBuildTasksInstallersVersion>
1616
<!-- corefx -->
1717
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
1818
<!-- The SQL team had deprecated System.Data.SqlClient package and replaced it with Microsoft.Data.SqlClient.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ steps:
3838
PackageName: ${{ parameters.packageName }}
3939
BuildDropPath: ${{ parameters.buildDropPath }}
4040
PackageVersion: ${{ parameters.packageVersion }}
41-
ManifestDirPath: ${{ parameters.manifestDirPath }}
41+
ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME)
4242
${{ if ne(parameters.IgnoreDirectories, '') }}:
4343
AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}'
4444

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,26 @@ Param(
44

55
. $PSScriptRoot\pipeline-logging-functions.ps1
66

7+
# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
8+
# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
9+
$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM"
10+
$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_'
11+
$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName
12+
13+
Write-Host "Artifact name before : $ArtifactName"
14+
Write-Host "Artifact name after : $SafeArtifactName"
15+
716
Write-Host "Creating dir $ManifestDirPath"
17+
818
# create directory for sbom manifest to be placed
9-
if (!(Test-Path -path $ManifestDirPath))
19+
if (!(Test-Path -path $SbomGenerationDir))
1020
{
11-
New-Item -ItemType Directory -path $ManifestDirPath
12-
Write-Host "Successfully created directory $ManifestDirPath"
21+
New-Item -ItemType Directory -path $SbomGenerationDir
22+
Write-Host "Successfully created directory $SbomGenerationDir"
1323
}
1424
else{
1525
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
1626
}
1727

1828
Write-Host "Updating artifact name"
19-
$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
20-
Write-Host "Artifact name $artifact_name"
21-
Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"
29+
Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName"

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,24 @@ done
1414
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
1515
. $scriptroot/pipeline-logging-functions.sh
1616

17+
18+
# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
19+
artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
20+
safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
1721
manifest_dir=$1
1822

19-
if [ ! -d "$manifest_dir" ] ; then
20-
mkdir -p "$manifest_dir"
21-
echo "Sbom directory created." $manifest_dir
23+
# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
24+
# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
25+
sbom_generation_dir="$manifest_dir/$safe_artifact_name"
26+
27+
if [ ! -d "$sbom_generation_dir" ] ; then
28+
mkdir -p "$sbom_generation_dir"
29+
echo "Sbom directory created." $sbom_generation_dir
2230
else
2331
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
2432
fi
2533

26-
artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
2734
echo "Artifact name before : "$artifact_name
28-
# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
29-
safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
3035
echo "Artifact name after : "$safe_artifact_name
3136
export ARTIFACT_NAME=$safe_artifact_name
3237
echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
parameters:
1717
PackageVersion: ${{ parameters.packageVersion }}
1818
BuildDropPath: ${{ parameters.buildDropPath }}
19+
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
1920
publishArtifacts: false
2021

2122
# publish artifacts

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
}
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25125.5",
12-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25125.5",
11+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25126.4",
12+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25126.4",
1313
"Microsoft.Build.NoTargets": "3.7.0",
1414
"Microsoft.Build.Traversal": "3.4.0"
1515
}

0 commit comments

Comments
 (0)