diff --git a/eng/Version.Details.props b/eng/Version.Details.props index eddf807d1..f616abee1 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,48 +6,48 @@ This file should be imported by eng/Versions.props - 12.0.0-beta.26473.114 - 12.0.0-beta.26473.114 - 12.0.0-beta.26473.114 - 12.0.0-beta.26473.114 - 12.0.0-beta.26473.114 - 12.0.0-beta.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 - 12.0.0-alpha.1.26473.114 + 12.0.0-beta.26477.101 + 12.0.0-beta.26477.101 + 12.0.0-beta.26477.101 + 12.0.0-beta.26477.101 + 12.0.0-beta.26477.101 + 12.0.0-beta.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 + 12.0.0-alpha.1.26477.101 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d6c4db96..a5ea9e7cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,176 +1,176 @@ - + - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e - + https://github.com/dotnet/dotnet - c567e8ff13b8ada7c5285c60bc2ac1111ae602e7 + c38d0900682e8ee67cf6eb5dcff6b35de9019c7e diff --git a/eng/common/core-templates/job/helix-job-monitor.yml b/eng/common/core-templates/job/helix-job-monitor.yml index 7417afdf3..b1ad5d68a 100644 --- a/eng/common/core-templates/job/helix-job-monitor.yml +++ b/eng/common/core-templates/job/helix-job-monitor.yml @@ -94,13 +94,12 @@ parameters: type: boolean default: false -# 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. +# When true (the default), 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). Set to false to preserve framework-provided display names. - name: useFullyQualifiedTestName type: boolean - default: false + default: true # Controls per-test output attachments. Defaults to Failed. - name: testResultAttachmentMode diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 70b71395e..ba7707109 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -6,6 +6,7 @@ unset(FREEBSD) unset(OPENBSD) unset(ILLUMOS) unset(ANDROID) +unset(OPENHARMONY) unset(TIZEN) unset(HAIKU) @@ -35,6 +36,8 @@ if(EXISTS ${CROSS_ROOTFS}/etc/tizen-release) set(TIZEN 1) elseif(EXISTS ${CROSS_ROOTFS}/android_platform) set(ANDROID 1) +elseif(EXISTS ${CROSS_ROOTFS}/../build/cmake/ohos.toolchain.cmake) + set(OPENHARMONY 1) endif() if(TARGET_ARCH_NAME STREQUAL "arm") @@ -204,6 +207,17 @@ if(ANDROID) # include official NDK toolchain script include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake) +elseif(OPENHARMONY) + if(TARGET_ARCH_NAME STREQUAL "arm") + set(OHOS_ARCH armeabi-v7a) + elseif(TARGET_ARCH_NAME STREQUAL "arm64") + set(OHOS_ARCH arm64-v8a) + elseif(TARGET_ARCH_NAME STREQUAL "x64") + set(OHOS_ARCH x86_64) + endif() + + # include official OHOS NDK toolchain script + include(${CROSS_ROOTFS}/../build/cmake/ohos.toolchain.cmake) elseif(FREEBSD OR OPENBSD) # we cross-compile by instructing clang set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) @@ -308,7 +322,7 @@ endif() # Specify compile options -if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD AND NOT OPENBSD) OR ILLUMOS OR HAIKU) +if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT OPENHARMONY AND NOT FREEBSD AND NOT OPENBSD) OR ILLUMOS OR HAIKU) set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN}) diff --git a/eng/common/native/init-distro-rid.sh b/eng/common/native/init-distro-rid.sh index 8fc6d2fec..abb3e2311 100644 --- a/eng/common/native/init-distro-rid.sh +++ b/eng/common/native/init-distro-rid.sh @@ -41,6 +41,9 @@ getNonPortableDistroRid() nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}" elif [ "$targetOs" = "openbsd" ]; then nonPortableRid="openbsd.$(uname -r)-${targetArch}" + elif [ "$targetOs" = "openharmony" ] && command -v param >/dev/null && param get const.ohos.fullname 2>/dev/null | grep -qi '^openharmony'; then + __openharmony_api_version=$(param get const.ohos.apiversion | tr -d '[:space:]') + nonPortableRid="openharmony.$__openharmony_api_version-${targetArch}" elif command -v getprop >/dev/null && getprop ro.product.system.model | grep -qi android; then __android_sdk_version=$(getprop ro.build.version.sdk) nonPortableRid="android.$__android_sdk_version-${targetArch}" @@ -101,10 +104,14 @@ initDistroRidGlobal() STRINGS="$(command -v llvm-strings || true)" fi - # Check for musl-based distros (e.g. Alpine Linux, Void Linux). - if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl || - ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then - __PortableTargetOS="linux-musl" + # Check for musl-based distros (e.g. Alpine Linux, Void Linux). Only linux targets + # have a musl/glibc portable flavor; skip the check for other targets so that a + # musl-based build host does not clobber their portable OS (e.g. openharmony). + if [ "$targetOs" = "linux" ]; then + if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl || + ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then + __PortableTargetOS="linux-musl" + fi fi fi diff --git a/eng/common/native/init-os-and-arch.sh b/eng/common/native/init-os-and-arch.sh index 62d62fed5..c3e212284 100644 --- a/eng/common/native/init-os-and-arch.sh +++ b/eng/common/native/init-os-and-arch.sh @@ -7,9 +7,17 @@ if command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android OSName="android" fi +# OpenHarmony/HarmonyOS hosts report `HarmonyOS` (or `Linux` on some devices) +# from uname, so query the OHOS parameter service as well. +if command -v param >/dev/null 2>&1 && param get const.ohos.fullname 2>/dev/null | grep -qi '^openharmony'; then + OSName="openharmony" +fi + case "$OSName" in freebsd|linux|netbsd|openbsd|sunos|android|haiku) os="$OSName" ;; +harmonyos|openharmony) + os=openharmony ;; darwin) os=osx ;; *) diff --git a/global.json b/global.json index 553aef5a4..85a244320 100644 --- a/global.json +++ b/global.json @@ -18,8 +18,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26473.114", - "Microsoft.DotNet.SharedFramework.Sdk": "12.0.0-beta.26473.114", + "Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26477.101", + "Microsoft.DotNet.SharedFramework.Sdk": "12.0.0-beta.26477.101", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "6.0.3-dotnet.6"