Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
d464e4f
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jul 30, 2026
eb2459c
Re-generate global.json for PR #26356: [net11.0] Update dependencies …
Jul 30, 2026
ea655f3
[tests] Update expected app size files
github-actions[bot] Jul 30, 2026
3337cdd
[tests] Update expected sizes.
rolfbjarne Jul 30, 2026
7cf94ca
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jul 31, 2026
c5bd781
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Aug 1, 2026
4b6ddc8
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Aug 2, 2026
9d530bc
Merge remote-tracking branch 'origin/net11.0' into darc-net11.0-44762…
rolfbjarne Aug 3, 2026
0af07c3
Update global.json.
rolfbjarne Aug 3, 2026
8a41961
[tests] Update expected sizes.
rolfbjarne Aug 3, 2026
7d787db
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Aug 4, 2026
e6d86de
Re-generate global.json for PR #26356: [net11.0] Update dependencies …
Aug 4, 2026
d700b3d
[tests] Update expected app size files
github-actions[bot] Aug 4, 2026
225c477
Merge remote-tracking branch 'origin/net11.0' into darc-net11.0-44762…
rolfbjarne Aug 4, 2026
76a8707
[tests] Update expected sizes.
rolfbjarne Aug 4, 2026
85b062a
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Aug 5, 2026
ba69bb1
Re-generate global.json for PR #26356: [net11.0] Update dependencies …
Aug 5, 2026
aac469d
Merge remote-tracking branch 'origin/net11.0' into darc-net11.0-44762…
rolfbjarne Aug 5, 2026
8468304
unupdate
rolfbjarne Aug 5, 2026
0e2d146
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Aug 6, 2026
57896c9
Re-generate global.json for PR #26356: [net11.0] Update dependencies …
Aug 6, 2026
eae1462
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Aug 7, 2026
1dd2ac6
Re-generate global.json for PR #26356: [net11.0] Update dependencies …
Aug 7, 2026
41e73f7
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Aug 8, 2026
ccace78
Re-generate global.json for PR #26356: [net11.0] Update dependencies …
Aug 8, 2026
b998ab8
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Aug 9, 2026
94c1d52
Re-generate global.json for PR #26356: [net11.0] Update dependencies …
Aug 9, 2026
ab3dce0
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Aug 10, 2026
8f058ff
Re-generate global.json for PR #26356: [net11.0] Update dependencies …
Aug 10, 2026
ad07ce9
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Aug 11, 2026
d060ab6
Re-generate global.json for PR #26356: [net11.0] Update dependencies …
Aug 11, 2026
8d725e9
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Aug 12, 2026
4e68746
Re-generate global.json for PR #26356: [net11.0] Update dependencies …
Aug 12, 2026
05f98a5
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Aug 13, 2026
3333103
Re-generate global.json for PR #26356: [net11.0] Update dependencies …
Aug 13, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-dfdd32e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-dfdd32e8/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-macios -->
<add key="darc-pub-dotnet-macios-af61ca0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-af61ca08/nuget/v3/index.json" />
Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26365.101</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26365.101</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26365.101</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26365.101</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.7.26365.101</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-preview.7.26365.101</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-preview.7.26365.101</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.7.26365.101</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.7.26365.101</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.7.26365.101</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26379.102</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26379.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26379.102</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26379.102</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-rc.1.26379.102</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-rc.1.26379.102</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-rc.1.26379.102</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-rc.1.26379.102</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-rc.1.26379.102</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-rc.1.26379.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet-macios dependencies -->
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
<MicrosoftiOSSdknet100_265PackageVersion>26.5.10311</MicrosoftiOSSdknet100_265PackageVersion>
Expand Down
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.7.26365.101">
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-rc.1.26379.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
<Sha>813f634ceb016018f5acc9bd3c2b16e17dff4686</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.7.26365.101">
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-rc.1.26379.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
<Sha>813f634ceb016018f5acc9bd3c2b16e17dff4686</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-preview.7.26365.101">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-rc.1.26379.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
<Sha>813f634ceb016018f5acc9bd3c2b16e17dff4686</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-preview.7.26365.101">
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-rc.1.26379.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
<Sha>813f634ceb016018f5acc9bd3c2b16e17dff4686</Sha>
</Dependency>
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if changing the version outside of dependency flow -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.7.26365.101">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-rc.1.26379.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
<Sha>813f634ceb016018f5acc9bd3c2b16e17dff4686</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26365.101">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26379.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
<Sha>813f634ceb016018f5acc9bd3c2b16e17dff4686</Sha>
</Dependency>
<!-- This is a subscription of the .NET 10/Xcode 26.0 versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.11017">
Expand Down Expand Up @@ -78,25 +78,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26365.101">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26379.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
<Sha>813f634ceb016018f5acc9bd3c2b16e17dff4686</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26365.101">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26379.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
<Sha>813f634ceb016018f5acc9bd3c2b16e17dff4686</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.7.26365.101">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-rc.1.26379.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
<Sha>813f634ceb016018f5acc9bd3c2b16e17dff4686</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="11.0.0-prerelease.26217.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>866707736d49c2323628744716cda2475b3af9ee</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26365.101">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26379.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
<Sha>813f634ceb016018f5acc9bd3c2b16e17dff4686</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
2 changes: 2 additions & 0 deletions eng/common/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Param(
[switch] $clean,
[switch][Alias('pb')]$productBuild,
[switch]$fromVMR,
[switch]$disablePipelineSetResult,
[switch][Alias('bl')]$binaryLog,
[string][Alias('bln')]$binaryLogName = '',
[switch][Alias('nobl')]$excludeCIBinarylog,
Expand Down Expand Up @@ -80,6 +81,7 @@ function Print-Usage() {
Write-Host " -nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
Write-Host " -buildCheck Sets /check msbuild parameter"
Write-Host " -fromVMR Set when building from within the VMR"
Write-Host " -disablePipelineSetResult Set to disable masking the actual exit code in the pipeline when the build fails"
Write-Host ""

Write-Host "Command line arguments not listed above are passed thru to msbuild."
Expand Down
11 changes: 11 additions & 0 deletions eng/common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,14 @@ usage()
echo " --projects <value> Project or solution file(s) to build"
echo " --ci Set when running on CI server"
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
echo " --pipelinesLog Promote msbuild errors/warnings to Azure Pipelines timeline issues; defaults to on in CI (short: -pl)"
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
echo " --warnNotAsError <value> Sets a semi-colon delimited list of warning codes that should not be treated as errors"
echo " --buildCheck <value> Sets /check msbuild parameter"
echo " --fromVMR Set when building from within the VMR"
echo " --disablePipelineSetResult Set to disable masking the actual exit code in the pipeline when the build fails"
echo ""
echo "Command line arguments not listed above are passed thru to msbuild."
echo "Arguments can also be passed in with a single hyphen."
Expand All @@ -68,6 +70,7 @@ build=false
source_build=false
product_build=false
from_vmr=false
disable_pipeline_set_result=false
rebuild=false
test=false
integration_test=false
Expand All @@ -86,6 +89,7 @@ build_check=false
binary_log=false
binary_log_name=''
exclude_ci_binary_log=false
pipelines_log=false

projects=''
configuration=''
Expand Down Expand Up @@ -124,6 +128,9 @@ while [[ $# -gt 0 ]]; do
-excludecibinarylog|-nobl)
exclude_ci_binary_log=true
;;
-pipelineslog|-pl)
pipelines_log=true
;;
-restore|-r)
restore=true
;;
Expand Down Expand Up @@ -152,6 +159,9 @@ while [[ $# -gt 0 ]]; do
-fromvmr|-from-vmr)
from_vmr=true
;;
-disablepipelinesetresult|-disable-pipeline-set-result)
disable_pipeline_set_result=true
;;
-test|-t)
test=true
;;
Expand Down Expand Up @@ -213,6 +223,7 @@ if [[ -z "$configuration" ]]; then
fi

if [[ "$ci" == true ]]; then
pipelines_log=true
# Disable node reuse on CI unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
# Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
if [[ "${MSBUILD_NODEREUSE_ENABLED:-}" != "1" ]]; then
Expand Down
20 changes: 15 additions & 5 deletions eng/common/core-templates/job/helix-job-monitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,14 @@ parameters:
type: boolean
default: true

# When true, test results are reported to Azure DevOps using the fully qualified test name
# (Namespace.Type.Method) as the stable automatedTestName and the visible title is qualified as
# well (--use-fully-qualified-test-name). Opt-in because it changes AzDO test identity and display;
# primarily useful for frameworks like MSTest whose display name is only the method name.
- name: useFullyQualifiedTestName
type: boolean
default: false

# Advanced: optional pipeline artifact (produced earlier in this run) that contains the tool
# nupkg. When set, the artifact is downloaded and the tool is installed from the nupkg into
# a local tool-path; this bypasses the repo's .config/dotnet-tools.json manifest and is
Expand Down Expand Up @@ -176,11 +184,13 @@ jobs:
set -euo pipefail

toolArgs=(
--helix-base-uri '${{ parameters.helixBaseUri }}'
--polling-interval-seconds '${{ parameters.pollingIntervalSeconds }}'
--fail-on-failed-tests '${{ parameters.failWorkItemsWithFailedTests }}'
--max-wait-minutes "$((${{ parameters.timeoutInMinutes }} - 5))" # Set the tool's timeout slightly lower than the Azure DevOps job timeout to allow it to exit gracefully.
--stage-name '$(System.StageName)'
--helix-base-uri '${{ parameters.helixBaseUri }}'
--polling-interval-seconds '${{ parameters.pollingIntervalSeconds }}'
--fail-on-failed-tests '${{ parameters.failWorkItemsWithFailedTests }}'
--use-fully-qualified-test-name '${{ parameters.useFullyQualifiedTestName }}'
--max-wait-minutes "$((${{ parameters.timeoutInMinutes }} - 5))" # Set the tool's timeout slightly lower than the Azure DevOps job timeout to allow it to exit gracefully.
--stage-name '$(System.StageName)'
--stage-attempt '$(System.StageAttempt)'
)

organization='${{ parameters.organization }}'
Expand Down
1 change: 0 additions & 1 deletion eng/common/core-templates/steps/publish-logs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ steps:
-runtimeSourceFeed https://ci.dot.net/internal
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
'$(publishing-dnceng-devdiv-code-r-build-re)'
'$(dn-bot-all-orgs-artifact-feeds-rw)'
'$(akams-client-id)'
'$(System.AccessToken)'
${{parameters.CustomSensitiveDataList}}
Expand Down
43 changes: 28 additions & 15 deletions eng/common/cross/build-rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ usage()
echo "BuildArch can be: arm(default), arm64, loongarch64, ppc64le, riscv64, s390x, x64, x86"
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine"
echo " for alpine can be specified with version: alpineX.YY or alpineedge"
echo " for FreeBSD can be: freebsd13, freebsd14"
echo " for OpenBSD can be: openbsd"
echo " for FreeBSD can be: freebsd14, freebsd15"
echo " for OpenBSD can be: openbsd7.8, openbsd7.9"
echo " for illumos can be: illumos"
echo " for Haiku can be: haiku."
echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
Expand Down Expand Up @@ -78,9 +78,9 @@ __AlpinePackages+=" krb5-dev"
__AlpinePackages+=" openssl-dev"
__AlpinePackages+=" zlib-dev"

__FreeBSDBase="13.5-RELEASE"
__FreeBSDPkg="2.7.5"
__FreeBSDABI="13"
__FreeBSDBase="14.4-RELEASE"
__FreeBSDPkg="2.8.0"
__FreeBSDABI="14"
__FreeBSDPackages="libunwind"
__FreeBSDPackages+=" icu"
__FreeBSDPackages+=" libinotify"
Expand Down Expand Up @@ -187,17 +187,14 @@ while :; do
__AlpineArch=loongarch64
__QEMUArch=loongarch64
__UbuntuArch=loong64
__UbuntuSuites=unreleased
__LLDB_Package="liblldb-19-dev"
;;
riscv64)
__BuildArch=riscv64
__AlpineArch=riscv64
__AlpinePackages="${__AlpinePackages// lldb-dev/}"
__QEMUArch=riscv64
__UbuntuArch=riscv64
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
unset __LLDB_Package
__LLDB_Package="liblldb-19-dev"
;;
ppc64le)
__BuildArch=ppc64le
Expand Down Expand Up @@ -291,6 +288,10 @@ while :; do
__CodeName=noble
__LLDB_Package="liblldb-19-dev"
;;
resolute) # Ubuntu 26.04
__CodeName=resolute
__LLDB_Package="liblldb-21-dev"
;;
stretch) # Debian 9
__CodeName=stretch
__LLDB_Package="liblldb-6.0-dev"
Expand Down Expand Up @@ -331,7 +332,7 @@ while :; do

# Debian-Ports architectures need different values
case "$__UbuntuArch" in
amd64|arm64|armhf|i386|mips64el|ppc64el|riscv64|s390x)
amd64|arm64|armhf|i386|mips64el|ppc64el|riscv64|loong64|s390x)
__KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"

if [[ -z "$__UbuntuRepo" ]]; then
Expand Down Expand Up @@ -365,20 +366,29 @@ while :; do
__AlpineVersion="$__AlpineMajorVersion.$__AlpineMinorVersion"
fi
;;
freebsd13)
freebsd14)
__CodeName=freebsd
__SkipUnmount=1
;;
freebsd14)
freebsd15)
__CodeName=freebsd
__FreeBSDBase="14.3-RELEASE"
__FreeBSDABI="14"
__FreeBSDBase="15.1-RELEASE"
__FreeBSDABI="15"
__SkipUnmount=1
;;
openbsd)
__CodeName=openbsd
__SkipUnmount=1
;;
openbsd7.8)
__CodeName=openbsd
__SkipUnmount=1
;;
openbsd7.9)
__CodeName=openbsd
__OpenBSDVersion="7.9"
__SkipUnmount=1
;;
illumos)
__CodeName=illumos
__SkipUnmount=1
Expand Down Expand Up @@ -453,9 +463,12 @@ case "$__AlpineVersion" in
elif [[ "$__AlpineArch" == "x86" ]]; then
__AlpineVersion=3.17 # minimum version that supports lldb-dev
__AlpinePackages+=" llvm15-libs"
elif [[ "$__AlpineArch" == "riscv64" || "$__AlpineArch" == "loongarch64" ]]; then
elif [[ "$__AlpineArch" == "loongarch64" ]]; then
__AlpineVersion=3.21 # minimum version that supports lldb-dev
__AlpinePackages+=" llvm19-libs"
elif [[ "$__AlpineArch" == "riscv64" ]]; then
__AlpineVersion=3.22 # lldb-dev requires 3.21+, but 3.22+ provides the newer linux-headers needed for RISC-V extension probes
__AlpinePackages+=" llvm20-libs"
elif [[ -n "$__AlpineMajorVersion" ]]; then
# use whichever alpine version is provided and select the latest toolchain libs
__AlpineLlvmLibsLookup=1
Expand Down
2 changes: 2 additions & 0 deletions eng/common/cross/toolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ elseif(TARGET_ARCH_NAME STREQUAL "ppc64le")
set(CMAKE_SYSTEM_PROCESSOR ppc64le)
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/powerpc64le-alpine-linux-musl)
set(TOOLCHAIN "powerpc64le-alpine-linux-musl")
elseif(FREEBSD)
set(TOOLCHAIN "powerpc64le-unknown-freebsd14")
else()
set(TOOLCHAIN "powerpc64le-linux-gnu")
endif()
Expand Down
6 changes: 5 additions & 1 deletion eng/common/native/init-os-and-arch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ if [ "$os" = "sunos" ]; then
os="solaris"
fi
CPUName=$(isainfo -n)
elif [ "$os" = "freebsd" ]; then
# FreeBSD's `uname -m` is the machine class ("powerpc" for every PowerPC
# variant); `uname -p` gives the specific processor (e.g. powerpc64le).
CPUName=$(uname -p)
else
# For the rest of the operating systems, use uname(1) to determine what the CPU is.
CPUName=$(uname -m)
Expand Down Expand Up @@ -75,7 +79,7 @@ case "$CPUName" in
arch=s390x
;;

ppc64le)
ppc64le|powerpc64le)
arch=ppc64le
;;
*)
Expand Down
Loading
Loading