Skip to content

Commit 6777906

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Update dependencies from https://github.com/dotnet/arcade build 20250226.4
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk From Version 10.0.0-beta.25106.4 -> To Version 10.0.0-beta.25126.4
1 parent 80dc344 commit 6777906

File tree

7 files changed

+51
-37
lines changed

7 files changed

+51
-37
lines changed

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -388,39 +388,39 @@
388388
<Uri>https://github.com/dotnet/runtime</Uri>
389389
<Sha>42423ef91c9f23381d99dee708fa55336318debc</Sha>
390390
</Dependency>
391-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25125.2">
391+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25126.4">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
393+
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
394394
</Dependency>
395395
<!-- Intermediate is necessary for source build. -->
396-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25125.2">
396+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25126.4">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
398+
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
399399
<SourceBuild RepoName="arcade" ManagedOnly="true" />
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25125.2">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25126.4">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
403+
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25125.2">
405+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25126.4">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
407+
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25125.2">
409+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25126.4">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
411+
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25125.2">
413+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25126.4">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
415+
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
416416
</Dependency>
417-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25125.2">
417+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25126.4">
418418
<Uri>https://github.com/dotnet/arcade</Uri>
419-
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
419+
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25125.2">
421+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25126.4">
422422
<Uri>https://github.com/dotnet/arcade</Uri>
423-
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
423+
<Sha>6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d</Sha>
424424
</Dependency>
425425
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.3.0-preview.1.25107.9">
426426
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@
166166
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
167167
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
168168
<!-- Packages from dotnet/arcade -->
169-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25125.2</MicrosoftDotNetBuildTasksArchivesVersion>
170-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25125.2</MicrosoftDotNetBuildTasksInstallersVersion>
171-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25125.2</MicrosoftDotNetBuildTasksTemplatingVersion>
172-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25125.2</MicrosoftDotNetRemoteExecutorVersion>
173-
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.25125.2</MicrosoftSourceBuildIntermediatearcadeVersion>
169+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25126.4</MicrosoftDotNetBuildTasksArchivesVersion>
170+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25126.4</MicrosoftDotNetBuildTasksInstallersVersion>
171+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25126.4</MicrosoftDotNetBuildTasksTemplatingVersion>
172+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25126.4</MicrosoftDotNetRemoteExecutorVersion>
173+
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.25126.4</MicrosoftSourceBuildIntermediatearcadeVersion>
174174
<!-- Packages from dotnet/source-build-externals -->
175175
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>10.0.610402</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
176176
<!-- Packages from dotnet/source-build-reference-packages -->

‎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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25125.2",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25125.2",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25125.2",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25126.4",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25126.4",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25126.4",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

0 commit comments

Comments
 (0)