[main] Update dependencies from devdiv/DevDiv/vs-code-coverage, dotnet/arcade

eng/Version.Details.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26152.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26153.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a27769f306adb2efd8f3089377b384c54414a484</Sha>
+      <Sha>139fa4e6f6acb2c2714f01f948416429dbf05161</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26152.5">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26153.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a27769f306adb2efd8f3089377b384c54414a484</Sha>
+      <Sha>139fa4e6f6acb2c2714f01f948416429dbf05161</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.26152.5">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.26153.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a27769f306adb2efd8f3089377b384c54414a484</Sha>
+      <Sha>139fa4e6f6acb2c2714f01f948416429dbf05161</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="18.6.0-preview.26152.2">
+    <Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="18.6.0-preview.26153.2">
       <Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
-      <Sha>6b8d5de4c056a81266b4fe4c787334438d41d07f</Sha>
+      <Sha>68b69badbaf4767fd7ff70703deaf88975195d70</Sha>
     </Dependency>
     <Dependency Name="MSTest" Version="4.2.0-preview.26152.5">
       <Uri>https://github.com/microsoft/testfx</Uri>

eng/Versions.props

@@ -7,8 +7,8 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup Label="MSTest prod dependencies - darc updated">
-    <MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26152.5</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
-    <MicrosoftTestingExtensionsCodeCoverageVersion>18.6.0-preview.26152.2</MicrosoftTestingExtensionsCodeCoverageVersion>
+    <MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26153.4</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
+    <MicrosoftTestingExtensionsCodeCoverageVersion>18.6.0-preview.26153.2</MicrosoftTestingExtensionsCodeCoverageVersion>
     <!-- empty line to avoid merge conflicts for darc PRs to update CC and MSTest+MTP -->
     <MSTestVersion>4.2.0-preview.26152.5</MSTestVersion>
     <MicrosoftTestingPlatformVersion>2.2.0-preview.26152.5</MicrosoftTestingPlatformVersion>

eng/common/core-templates/steps/publish-logs.yml

@@ -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)'
-      '$(MaestroAccessToken)'
       '$(dn-bot-all-orgs-artifact-feeds-rw)'
       '$(akams-client-id)'
       '$(microsoft-symbol-server-pat)'

eng/common/cross/build-rootfs.sh

@@ -9,6 +9,7 @@ usage()
     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 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"
@@ -27,6 +28,8 @@ __BuildArch=arm
 __AlpineArch=armv7
 __FreeBSDArch=arm
 __FreeBSDMachineArch=armv7
+__OpenBSDArch=arm
+__OpenBSDMachineArch=armv7
 __IllumosArch=arm7
 __HaikuArch=arm
 __QEMUArch=arm
@@ -82,6 +85,12 @@ __FreeBSDPackages+=" openssl"
 __FreeBSDPackages+=" krb5"
 __FreeBSDPackages+=" terminfo-db"
 
+__OpenBSDVersion="7.8"
+__OpenBSDPackages+=" icu4c"
+__OpenBSDPackages+=" inotify-tools"
+__OpenBSDPackages+=" openssl"
+__OpenBSDPackages+=" heimdal-libs"
+
 __IllumosPackages="icu"
 __IllumosPackages+=" mit-krb5"
 __IllumosPackages+=" openssl"
@@ -160,6 +169,8 @@ while :; do
             __QEMUArch=aarch64
             __FreeBSDArch=arm64
             __FreeBSDMachineArch=aarch64
+            __OpenBSDArch=arm64
+            __OpenBSDMachineArch=aarch64
             ;;
         armel)
             __BuildArch=armel
@@ -235,6 +246,8 @@ while :; do
             __UbuntuArch=amd64
             __FreeBSDArch=amd64
             __FreeBSDMachineArch=amd64
+            __OpenBSDArch=amd64
+            __OpenBSDMachineArch=amd64
             __illumosArch=x86_64
             __HaikuArch=x86_64
             __UbuntuRepo="http://archive.ubuntu.com/ubuntu/"
@@ -385,6 +398,10 @@ while :; do
             __FreeBSDABI="14"
             __SkipUnmount=1
             ;;
+        openbsd)
+            __CodeName=openbsd
+            __SkipUnmount=1
+            ;;
         illumos)
             __CodeName=illumos
             __SkipUnmount=1
@@ -593,6 +610,41 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
     INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf update
     # shellcheck disable=SC2086
     INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages
+elif [[ "$__CodeName" == "openbsd" ]]; then
+    # determine mirrors
+    OPENBSD_MIRROR="https://cdn.openbsd.org/pub/OpenBSD/$__OpenBSDVersion/$__OpenBSDMachineArch"
+
+    # download base system sets
+    ensureDownloadTool
+
+    BASE_SETS=(base comp)
+    for set in "${BASE_SETS[@]}"; do
+        FILE="${set}${__OpenBSDVersion//./}.tgz"
+        echo "Downloading $FILE..."
+        if [[ "$__hasWget" == 1 ]]; then
+            wget -O- "$OPENBSD_MIRROR/$FILE" | tar -C "$ROOTFS" -xzpf -
+        else
+            curl -SL "$OPENBSD_MIRROR/$FILE" | tar -C "$ROOTFS" -xzpf -
+        fi
+    done
+
+    PKG_MIRROR="https://cdn.openbsd.org/pub/OpenBSD/${__OpenBSDVersion}/packages/${__OpenBSDMachineArch}"
+
+    echo "Installing packages into sysroot..."
+
+    for pkg in $__OpenBSDPackages; do
+        echo "Resolving package filename for $pkg..."
+
+        if [[ "$__hasWget" == 1 ]]; then
+            PKG_FILE=$(wget -qO- "$PKG_MIRROR/" | grep -Eo "${pkg}-[0-9][^\" ]*\.tgz" | head -n1)
+            [[ -z "$PKG_FILE" ]] && { echo "ERROR: Package $pkg not found"; exit 1; }
+            wget -O- "$PKG_MIRROR/$PKG_FILE" | tar -C "$ROOTFS" -xzpf -
+        else
+            PKG_FILE=$(curl -s "$PKG_MIRROR/" | grep -Eo "${pkg}-[0-9][^\" ]*\.tgz" | head -n1)
+            [[ -z "$PKG_FILE" ]] && { echo "ERROR: Package $pkg not found"; exit 1; }
+            curl -SL "$PKG_MIRROR/$PKG_FILE" | tar -C "$ROOTFS" -xzpf -
+        fi
+    done
 elif [[ "$__CodeName" == "illumos" ]]; then
     mkdir "$__RootfsDir/tmp"
     pushd "$__RootfsDir/tmp"

eng/common/cross/toolchain.cmake

@@ -3,15 +3,22 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
 # reset platform variables (e.g. cmake 3.25 sets LINUX=1)
 unset(LINUX)
 unset(FREEBSD)
+unset(OPENBSD)
 unset(ILLUMOS)
 unset(ANDROID)
 unset(TIZEN)
 unset(HAIKU)
 
 set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})
+
+file(GLOB OPENBSD_PROBE "${CROSS_ROOTFS}/etc/signify/openbsd-*.pub")
+
 if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
   set(CMAKE_SYSTEM_NAME FreeBSD)
   set(FREEBSD 1)
+elseif(OPENBSD_PROBE)
+  set(CMAKE_SYSTEM_NAME OpenBSD)
+  set(OPENBSD 1)
 elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc)
   set(CMAKE_SYSTEM_NAME SunOS)
   set(ILLUMOS 1)
@@ -53,6 +60,8 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
     endif()
   elseif(FREEBSD)
     set(triple "aarch64-unknown-freebsd12")
+  elseif(OPENBSD)
+    set(triple "aarch64-unknown-openbsd")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "armel")
   set(CMAKE_SYSTEM_PROCESSOR armv7l)
@@ -109,6 +118,8 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
     endif()
   elseif(FREEBSD)
     set(triple "x86_64-unknown-freebsd12")
+  elseif(OPENBSD)
+    set(triple "x86_64-unknown-openbsd")
   elseif(ILLUMOS)
     set(TOOLCHAIN "x86_64-illumos")
   elseif(HAIKU)
@@ -193,7 +204,7 @@ if(ANDROID)
 
     # include official NDK toolchain script
     include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake)
-elseif(FREEBSD)
+elseif(FREEBSD OR OPENBSD)
     # we cross-compile by instructing clang
     set(CMAKE_C_COMPILER_TARGET ${triple})
     set(CMAKE_CXX_COMPILER_TARGET ${triple})
@@ -291,7 +302,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) OR ILLUMOS OR HAIKU)
+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)
   set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
   set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
   set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})

global.json

@@ -37,7 +37,7 @@
     "runner": "Microsoft.Testing.Platform"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26152.5",
+    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26153.4",
     "MSBuild.Sdk.Extras": "3.0.44"
   }
 }