Skip to content

Commit 16e7f30

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/9.0] Update dependencies from dotnet/arcade (#4971)
[release/9.0] Update dependencies from dotnet/arcade
1 parent c1ff0f9 commit 16e7f30

File tree

8 files changed

+52
-30
lines changed

8 files changed

+52
-30
lines changed

‎NuGet.config‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-runtime -->
1212
<add key="darc-int-dotnet-runtime-831d23e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5/nuget/v3/index.json" />
13+
<add key="darc-int-dotnet-runtime-831d23e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5-2/nuget/v3/index.json" />
14+
<add key="darc-int-dotnet-runtime-831d23e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5-1/nuget/v3/index.json" />
1315
<!-- End: Package sources from dotnet-runtime -->
1416
<!-- Begin: Package sources from dotnet-winforms -->
1517
<add key="darc-int-dotnet-winforms-5bf1bff" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5bf1bff0/nuget/v3/index.json" />
18+
<add key="darc-int-dotnet-winforms-5bf1bff-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5bf1bff0-2/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-winforms-5bf1bff-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5bf1bff0-1/nuget/v3/index.json" />
1620
<!-- End: Package sources from dotnet-winforms -->
1721
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1822
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -27,9 +31,13 @@
2731
<clear />
2832
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2933
<!-- Begin: Package sources from dotnet-runtime -->
34+
<add key="darc-int-dotnet-runtime-831d23e-1" value="true" />
35+
<add key="darc-int-dotnet-runtime-831d23e-2" value="true" />
3036
<add key="darc-int-dotnet-runtime-831d23e" value="true" />
3137
<!-- End: Package sources from dotnet-runtime -->
3238
<!-- Begin: Package sources from dotnet-winforms -->
39+
<add key="darc-int-dotnet-winforms-5bf1bff-1" value="true" />
40+
<add key="darc-int-dotnet-winforms-5bf1bff-2" value="true" />
3341
<add key="darc-int-dotnet-winforms-5bf1bff" value="true" />
3442
<!-- End: Package sources from dotnet-winforms -->
3543
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎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="9.0.0-beta.25111.5">
155+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25161.4">
156156
<Uri>https://github.com/dotnet/arcade</Uri>
157-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
157+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
158158
</Dependency>
159-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25111.5">
159+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25161.4">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
161+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25111.5">
163+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25161.4">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
165+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25111.5">
167+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25161.4">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
169+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
170170
</Dependency>
171-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25111.5">
171+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25161.4">
172172
<Uri>https://github.com/dotnet/arcade</Uri>
173-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
173+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
174174
</Dependency>
175-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.25111.5">
175+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.25161.4">
176176
<Uri>https://github.com/dotnet/arcade</Uri>
177-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
177+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
178178
</Dependency>
179179
</ToolsetDependencies>
180180
</Dependencies>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
</PropertyGroup>
1313
<PropertyGroup>
1414
<!-- arcade -->
15-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksArchivesVersion>
16-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksInstallersVersion>
15+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksArchivesVersion>
16+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksInstallersVersion>
1717
<!-- corefx -->
1818
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
1919
<SystemDataSqlClientVersion>4.8.6</SystemDataSqlClientVersion>

‎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
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.103"
3+
"dotnet": "9.0.104"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25111.5",
7-
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25111.5",
6+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25161.4",
7+
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25161.4",
88
"Microsoft.Build.NoTargets": "3.7.0",
99
"Microsoft.Build.Traversal": "3.4.0"
1010
}

0 commit comments

Comments
 (0)