Skip to content

Commit 78437ad

Browse files
dibarbetdibarbet
authored
[release/dev17.10] Update dependencies from dotnet/arcade (#11936)
This pull request updates the following dependencies [marker]: <> (Begin:0022737c-8efd-4919-ecf2-08dc3decc073) ## From https://github.com/dotnet/arcade - **Subscription**: [0022737c-8efd-4919-ecf2-08dc3decc073](https://maestro.dot.net/subscriptions?search=0022737c-8efd-4919-ecf2-08dc3decc073) - **Build**: [20250925.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=2801844) ([284706](https://maestro.dot.net/channel/3885/github:dotnet:arcade/build/284706)) - **Date Produced**: September 25, 2025 6:24:48 PM UTC - **Commit**: [b56341eb86a370acc94711f2571c3b3aff215c4b](dotnet/arcade@b56341e) - **Branch**: [release/8.0](https://github.com/dotnet/arcade/tree/release/8.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [8.0.0-beta.24570.5 to 8.0.0-beta.25475.2][16] - Microsoft.SourceBuild.Intermediate.arcade - Microsoft.DotNet.Arcade.Sdk [16]: dotnet/arcade@3c7e11b...b56341e [DependencyUpdate]: <> (End) - **Updates to .NET SDKs in root:** - Updates sdk.version to 8.0.120 - Updates tools.dotnet to 8.0.120 [marker]: <> (End:0022737c-8efd-4919-ecf2-08dc3decc073)
2 parents 09ca881 + 719d3ba commit 78437ad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+255
-164
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<EmbedUntrackedSources>true</EmbedUntrackedSources>
3333

3434
<!-- Working around https://github.com/dotnet/sdk/issues/24747 -->
35-
<NoWarn>$(NoWarn);NU1505</NoWarn>
35+
<NoWarn>$(NoWarn);NU1505;NETSDK1138</NoWarn>
3636

3737
<!-- Working around https://github.com/microsoft/msbuild/pull/4764 -->
3838
<EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,14 @@
9696
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
9797
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24570.5">
99+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25475.2">
100100
<Uri>https://github.com/dotnet/arcade</Uri>
101-
<Sha>3c7e11bf80279cde53a6251c4d0fa10e613fc739</Sha>
101+
<Sha>b56341eb86a370acc94711f2571c3b3aff215c4b</Sha>
102102
</Dependency>
103103
<!-- Intermediate is necessary for source build. -->
104-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24570.5">
104+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.25475.2">
105105
<Uri>https://github.com/dotnet/arcade</Uri>
106-
<Sha>3c7e11bf80279cde53a6251c4d0fa10e613fc739</Sha>
106+
<Sha>b56341eb86a370acc94711f2571c3b3aff215c4b</Sha>
107107
<SourceBuild RepoName="arcade" ManagedOnly="true" />
108108
</Dependency>
109109
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>6.0.2-servicing.22064.6</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
5151
<MicrosoftNETCorePlatformsPackageVersion>6.0.1</MicrosoftNETCorePlatformsPackageVersion>
5252
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>9.0.0-alpha.1.24113.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
53-
<MicrosoftSourceBuildIntermediatearcadePackageVersion>8.0.0-beta.24570.5</MicrosoftSourceBuildIntermediatearcadePackageVersion>
53+
<MicrosoftSourceBuildIntermediatearcadePackageVersion>8.0.0-beta.25475.2</MicrosoftSourceBuildIntermediatearcadePackageVersion>
5454
<MicrosoftDotNetXliffTasksPackageVersion>1.0.0-beta.23475.1</MicrosoftDotNetXliffTasksPackageVersion>
5555
<MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>1.0.0-beta.23475.1</MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>
5656
<MicrosoftNetCompilersToolsetPackageVersion>4.10.0-3.24169.7</MicrosoftNetCompilersToolsetPackageVersion>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
# displayName: Setup Private Feeds Credentials
1818
# condition: eq(variables['Agent.OS'], 'Windows_NT')
1919
# inputs:
20-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
21-
# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
20+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
21+
# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token
2222
# env:
2323
# Token: $(dn-bot-dnceng-artifact-feeds-rw)
2424

‎eng/common/SetupNugetSources.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
# - task: Bash@3
1919
# displayName: Setup Private Feeds Credentials
2020
# inputs:
21-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
22-
# arguments: $(Build.SourcesDirectory)/NuGet.config $Token
21+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh
22+
# arguments: $(System.DefaultWorkingDirectory)/NuGet.config $Token
2323
# condition: ne(variables['Agent.OS'], 'Windows_NT')
2424
# env:
2525
# Token: $(dn-bot-dnceng-artifact-feeds-rw)

‎eng/common/cross/toolchain.cmake‎

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm")
4040
set(TOOLCHAIN "arm-linux-gnueabihf")
4141
endif()
4242
if(TIZEN)
43-
set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")
43+
set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf")
4444
endif()
4545
elseif(TARGET_ARCH_NAME STREQUAL "arm64")
4646
set(CMAKE_SYSTEM_PROCESSOR aarch64)
@@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
4949
elseif(LINUX)
5050
set(TOOLCHAIN "aarch64-linux-gnu")
5151
if(TIZEN)
52-
set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
52+
set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu")
5353
endif()
5454
elseif(FREEBSD)
5555
set(triple "aarch64-unknown-freebsd12")
@@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel")
5858
set(CMAKE_SYSTEM_PROCESSOR armv7l)
5959
set(TOOLCHAIN "arm-linux-gnueabi")
6060
if(TIZEN)
61-
set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")
61+
set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi")
6262
endif()
6363
elseif(TARGET_ARCH_NAME STREQUAL "armv6")
6464
set(CMAKE_SYSTEM_PROCESSOR armv6l)
@@ -95,7 +95,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
9595
elseif(LINUX)
9696
set(TOOLCHAIN "x86_64-linux-gnu")
9797
if(TIZEN)
98-
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")
98+
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu")
9999
endif()
100100
elseif(FREEBSD)
101101
set(triple "x86_64-unknown-freebsd12")
@@ -112,7 +112,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
112112
set(TOOLCHAIN "i686-linux-gnu")
113113
endif()
114114
if(TIZEN)
115-
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
115+
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu")
116116
endif()
117117
else()
118118
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!")
@@ -124,26 +124,25 @@ endif()
124124

125125
# Specify include paths
126126
if(TIZEN)
127-
if(TARGET_ARCH_NAME STREQUAL "arm")
128-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
129-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf)
130-
endif()
131-
if(TARGET_ARCH_NAME STREQUAL "armel")
132-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
133-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi)
134-
endif()
135-
if(TARGET_ARCH_NAME STREQUAL "arm64")
136-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
137-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu)
138-
endif()
139-
if(TARGET_ARCH_NAME STREQUAL "x86")
140-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
141-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/i586-tizen-linux-gnu)
142-
endif()
143-
if(TARGET_ARCH_NAME STREQUAL "x64")
144-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
145-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu)
127+
function(find_toolchain_dir prefix)
128+
# Dynamically find the version subdirectory
129+
file(GLOB DIRECTORIES "${prefix}/*")
130+
list(GET DIRECTORIES 0 FIRST_MATCH)
131+
get_filename_component(TOOLCHAIN_VERSION ${FIRST_MATCH} NAME)
132+
133+
set(TIZEN_TOOLCHAIN_PATH "${prefix}/${TOOLCHAIN_VERSION}" PARENT_SCOPE)
134+
endfunction()
135+
136+
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
137+
find_toolchain_dir("${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
138+
else()
139+
find_toolchain_dir("${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
146140
endif()
141+
142+
message(STATUS "TIZEN_TOOLCHAIN_PATH set to: ${TIZEN_TOOLCHAIN_PATH}")
143+
144+
include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++)
145+
include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++/${TIZEN_TOOLCHAIN})
147146
endif()
148147

149148
if(ANDROID)
@@ -265,33 +264,35 @@ endif()
265264

266265
if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
267266
if(TIZEN)
268-
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
267+
add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
269268
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
270269
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
271-
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
270+
add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
272271
endif()
273272
elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
274273
if(TIZEN)
275-
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
274+
add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
276275
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
277276
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64")
278-
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
277+
add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
279278

280279
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64")
281280
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
282-
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
281+
add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}")
283282
endif()
283+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
284+
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
284285
elseif(TARGET_ARCH_NAME STREQUAL "x86")
285286
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
286287
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
287288
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}")
288289
endif()
289290
add_toolchain_linker_flag(-m32)
290291
if(TIZEN)
291-
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
292+
add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
292293
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
293294
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
294-
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
295+
add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
295296
endif()
296297
elseif(ILLUMOS)
297298
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64")
@@ -328,6 +329,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
328329
if(TARGET_ARCH_NAME STREQUAL "armel")
329330
add_compile_options(-mfloat-abi=softfp)
330331
endif()
332+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
333+
add_compile_options("--target=${TOOLCHAIN}")
331334
elseif(TARGET_ARCH_NAME STREQUAL "x86")
332335
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
333336
add_compile_options(--target=${TOOLCHAIN})

‎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+
# 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/sdk-task.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

‎eng/common/sdl/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Guardian.Cli" version="0.109.0"/>
3+
<package id="Microsoft.Guardian.Cli" version="0.199.0"/>
44
</packages>

0 commit comments

Comments
 (0)