Skip to content

[main] Update dependencies from dotnet/arcade #5630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dotnet-maestro wants to merge 5 commits into
base: main
Choose a base branch
from
+13 −13
Open

[main] Update dependencies from dotnet/arcade #5630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2455579
Update dependencies from https://github.com/dotnet/arcade build 20260…
dotnet-maestro[bot] Jun 10, 2026
150f081
Update dependencies from https://github.com/dotnet/arcade build 20260…
dotnet-maestro[bot] Jun 12, 2026
5ce9ed5
Update dependencies from https://github.com/dotnet/arcade build 20260…
dotnet-maestro[bot] Jun 12, 2026
c9665e3
Update dependencies from https://github.com/dotnet/arcade build 20260…
dotnet-maestro[bot] Jun 13, 2026
c6a4858
Update dependencies from https://github.com/dotnet/arcade build 20260…
dotnet-maestro[bot] Jun 15, 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
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26310.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26315.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0a80b038bcc0d76b2f26c7f22062942de75779e6</Sha>
<Sha>5f63985fe82894604956e653d43c161ebbc1b576</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26310.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26315.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0a80b038bcc0d76b2f26c7f22062942de75779e6</Sha>
<Sha>5f63985fe82894604956e653d43c161ebbc1b576</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25229.4">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand Down
14 changes: 7 additions & 7 deletions eng/common/cross/toolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu")
endif()
elseif(FREEBSD)
set(triple "aarch64-unknown-freebsd12")
set(TOOLCHAIN "aarch64-unknown-freebsd14")
elseif(OPENBSD)
set(triple "aarch64-unknown-openbsd")
set(TOOLCHAIN "aarch64-unknown-openbsd")
endif()
elseif(TARGET_ARCH_NAME STREQUAL "armel")
set(CMAKE_SYSTEM_PROCESSOR armv7l)
Expand Down Expand Up @@ -117,9 +117,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu")
endif()
elseif(FREEBSD)
set(triple "x86_64-unknown-freebsd12")
set(TOOLCHAIN "x86_64-unknown-freebsd14")
elseif(OPENBSD)
set(triple "x86_64-unknown-openbsd")
set(TOOLCHAIN "x86_64-unknown-openbsd")
elseif(ILLUMOS)
set(TOOLCHAIN "x86_64-illumos")
elseif(HAIKU)
Expand Down Expand Up @@ -206,9 +206,9 @@ if(ANDROID)
include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake)
elseif(FREEBSD OR OPENBSD)
# we cross-compile by instructing clang
set(CMAKE_C_COMPILER_TARGET ${triple})
set(CMAKE_CXX_COMPILER_TARGET ${triple})
set(CMAKE_ASM_COMPILER_TARGET ${triple})
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld")
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26310.1",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26310.1"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26315.1",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26315.1"
}
}