Skip to content

Commit 2f2b213

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20250314.5 (#1135)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.25120.1 -> To Version 8.0.0-beta.25164.5 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent d004f53 commit 2f2b213

9 files changed

+51
-37
lines changed

‎eng/Version.Details.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -215,30 +215,30 @@
215215
<Uri>https://github.com/dotnet/llvm-project</Uri>
216216
<Sha>0eac01ff3c4a8d1dbe6452dd2d8b75395bbf2b3d</Sha>
217217
</Dependency>
218-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25120.1">
218+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25164.5">
219219
<Uri>https://github.com/dotnet/arcade</Uri>
220-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
220+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
221221
<SourceBuild RepoName="arcade" ManagedOnly="true" />
222222
</Dependency>
223-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25120.1">
223+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25164.5">
224224
<Uri>https://github.com/dotnet/arcade</Uri>
225-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
225+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
226226
</Dependency>
227-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25120.1">
227+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25164.5">
228228
<Uri>https://github.com/dotnet/arcade</Uri>
229-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
229+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
230230
</Dependency>
231-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25120.1">
231+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25164.5">
232232
<Uri>https://github.com/dotnet/arcade</Uri>
233-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
233+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
234234
</Dependency>
235-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25120.1">
235+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25164.5">
236236
<Uri>https://github.com/dotnet/arcade</Uri>
237-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
237+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
238238
</Dependency>
239-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.25120.1">
239+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.25164.5">
240240
<Uri>https://github.com/dotnet/arcade</Uri>
241-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
241+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
242242
</Dependency>
243243
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
244244
<Uri>https://github.com/dotnet/xliff-tasks</Uri>

‎eng/Versions.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
4444
</PropertyGroup>
4545
<PropertyGroup>
46-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksPackagingVersion>
47-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksTemplatingVersion>
48-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
49-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
46+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksPackagingVersion>
47+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksTemplatingVersion>
48+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
49+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
5050
</PropertyGroup>
5151
<PropertyGroup>
5252
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

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

+14-6
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

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ parameters:
3838
enableSbom: true
3939
PackageVersion: 7.0.0
4040
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
41+
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
4142

4243
jobs:
4344
- job: ${{ parameters.name }}
@@ -261,4 +262,4 @@ jobs:
261262
targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration'
262263
artifactName: 'BuildConfiguration'
263264
displayName: 'Publish build retry configuration'
264-
continueOnError: true
265+
continueOnError: true

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ steps:
3535
PackageName: ${{ parameters.packageName }}
3636
BuildDropPath: ${{ parameters.buildDropPath }}
3737
PackageVersion: ${{ parameters.packageVersion }}
38-
ManifestDirPath: ${{ parameters.manifestDirPath }}
38+
ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME)
3939
${{ if ne(parameters.IgnoreDirectories, '') }}:
4040
AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}'
4141

‎eng/common/tools.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
[bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }
4343

4444
# Enable repos to use a particular version of the on-line dotnet-install scripts.
45-
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
45+
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1
4646
[string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }
4747

4848
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -263,7 +263,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
263263
if (!(Test-Path $installScript)) {
264264
Create-Directory $dotnetRoot
265265
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
266-
$uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
266+
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
267267

268268
Retry({
269269
Write-Host "GET $uri"

‎eng/common/tools.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
5454
use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
5555

5656
# Enable repos to use a particular version of the on-line dotnet-install scripts.
57-
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
57+
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
5858
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
5959

6060
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -297,7 +297,7 @@ function with_retries {
297297
function GetDotNetInstallScript {
298298
local root=$1
299299
local install_script="$root/dotnet-install.sh"
300-
local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
300+
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
301301

302302
if [[ ! -a "$install_script" ]]; then
303303
mkdir -p "$root"

‎global.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.113"
3+
"dotnet": "8.0.114"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25120.1",
7-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25120.1",
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25164.5",
7+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25164.5",
88
"Microsoft.Build.Traversal": "2.0.34"
99
}
1010
}

0 commit comments

Comments
 (0)