Skip to content

Commit 6aadada

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from devdiv/DevDiv/vs-code-coverage, dotnet/arcade (#7488)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 52f2c8e commit 6aadada

6 files changed

Lines changed: 76 additions & 14 deletions

File tree

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26152.5">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26153.4">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>a27769f306adb2efd8f3089377b384c54414a484</Sha>
6+
<Sha>139fa4e6f6acb2c2714f01f948416429dbf05161</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26152.5">
8+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26153.4">
99
<Uri>https://github.com/dotnet/arcade</Uri>
10-
<Sha>a27769f306adb2efd8f3089377b384c54414a484</Sha>
10+
<Sha>139fa4e6f6acb2c2714f01f948416429dbf05161</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.26152.5">
12+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.26153.4">
1313
<Uri>https://github.com/dotnet/arcade</Uri>
14-
<Sha>a27769f306adb2efd8f3089377b384c54414a484</Sha>
14+
<Sha>139fa4e6f6acb2c2714f01f948416429dbf05161</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="18.6.0-preview.26152.2">
16+
<Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="18.6.0-preview.26153.2">
1717
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
18-
<Sha>6b8d5de4c056a81266b4fe4c787334438d41d07f</Sha>
18+
<Sha>68b69badbaf4767fd7ff70703deaf88975195d70</Sha>
1919
</Dependency>
2020
<Dependency Name="MSTest" Version="4.2.0-preview.26152.5">
2121
<Uri>https://github.com/microsoft/testfx</Uri>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
88
</PropertyGroup>
99
<PropertyGroup Label="MSTest prod dependencies - darc updated">
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26152.5</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftTestingExtensionsCodeCoverageVersion>18.6.0-preview.26152.2</MicrosoftTestingExtensionsCodeCoverageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26153.4</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftTestingExtensionsCodeCoverageVersion>18.6.0-preview.26153.2</MicrosoftTestingExtensionsCodeCoverageVersion>
1212
<!-- empty line to avoid merge conflicts for darc PRs to update CC and MSTest+MTP -->
1313
<MSTestVersion>4.2.0-preview.26152.5</MSTestVersion>
1414
<MicrosoftTestingPlatformVersion>2.2.0-preview.26152.5</MicrosoftTestingPlatformVersion>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ steps:
3131
-runtimeSourceFeed https://ci.dot.net/internal
3232
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
3333
'$(publishing-dnceng-devdiv-code-r-build-re)'
34-
'$(MaestroAccessToken)'
3534
'$(dn-bot-all-orgs-artifact-feeds-rw)'
3635
'$(akams-client-id)'
3736
'$(microsoft-symbol-server-pat)'

‎eng/common/cross/build-rootfs.sh‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ usage()
99
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine"
1010
echo " for alpine can be specified with version: alpineX.YY or alpineedge"
1111
echo " for FreeBSD can be: freebsd13, freebsd14"
12+
echo " for OpenBSD can be: openbsd"
1213
echo " for illumos can be: illumos"
1314
echo " for Haiku can be: haiku."
1415
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
2728
__AlpineArch=armv7
2829
__FreeBSDArch=arm
2930
__FreeBSDMachineArch=armv7
31+
__OpenBSDArch=arm
32+
__OpenBSDMachineArch=armv7
3033
__IllumosArch=arm7
3134
__HaikuArch=arm
3235
__QEMUArch=arm
@@ -82,6 +85,12 @@ __FreeBSDPackages+=" openssl"
8285
__FreeBSDPackages+=" krb5"
8386
__FreeBSDPackages+=" terminfo-db"
8487

88+
__OpenBSDVersion="7.8"
89+
__OpenBSDPackages+=" icu4c"
90+
__OpenBSDPackages+=" inotify-tools"
91+
__OpenBSDPackages+=" openssl"
92+
__OpenBSDPackages+=" heimdal-libs"
93+
8594
__IllumosPackages="icu"
8695
__IllumosPackages+=" mit-krb5"
8796
__IllumosPackages+=" openssl"
@@ -160,6 +169,8 @@ while :; do
160169
__QEMUArch=aarch64
161170
__FreeBSDArch=arm64
162171
__FreeBSDMachineArch=aarch64
172+
__OpenBSDArch=arm64
173+
__OpenBSDMachineArch=aarch64
163174
;;
164175
armel)
165176
__BuildArch=armel
@@ -235,6 +246,8 @@ while :; do
235246
__UbuntuArch=amd64
236247
__FreeBSDArch=amd64
237248
__FreeBSDMachineArch=amd64
249+
__OpenBSDArch=amd64
250+
__OpenBSDMachineArch=amd64
238251
__illumosArch=x86_64
239252
__HaikuArch=x86_64
240253
__UbuntuRepo="http://archive.ubuntu.com/ubuntu/"
@@ -385,6 +398,10 @@ while :; do
385398
__FreeBSDABI="14"
386399
__SkipUnmount=1
387400
;;
401+
openbsd)
402+
__CodeName=openbsd
403+
__SkipUnmount=1
404+
;;
388405
illumos)
389406
__CodeName=illumos
390407
__SkipUnmount=1
@@ -593,6 +610,41 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
593610
INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf update
594611
# shellcheck disable=SC2086
595612
INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages
613+
elif [[ "$__CodeName" == "openbsd" ]]; then
614+
# determine mirrors
615+
OPENBSD_MIRROR="https://cdn.openbsd.org/pub/OpenBSD/$__OpenBSDVersion/$__OpenBSDMachineArch"
616+
617+
# download base system sets
618+
ensureDownloadTool
619+
620+
BASE_SETS=(base comp)
621+
for set in "${BASE_SETS[@]}"; do
622+
FILE="${set}${__OpenBSDVersion//./}.tgz"
623+
echo "Downloading $FILE..."
624+
if [[ "$__hasWget" == 1 ]]; then
625+
wget -O- "$OPENBSD_MIRROR/$FILE" | tar -C "$ROOTFS" -xzpf -
626+
else
627+
curl -SL "$OPENBSD_MIRROR/$FILE" | tar -C "$ROOTFS" -xzpf -
628+
fi
629+
done
630+
631+
PKG_MIRROR="https://cdn.openbsd.org/pub/OpenBSD/${__OpenBSDVersion}/packages/${__OpenBSDMachineArch}"
632+
633+
echo "Installing packages into sysroot..."
634+
635+
for pkg in $__OpenBSDPackages; do
636+
echo "Resolving package filename for $pkg..."
637+
638+
if [[ "$__hasWget" == 1 ]]; then
639+
PKG_FILE=$(wget -qO- "$PKG_MIRROR/" | grep -Eo "${pkg}-[0-9][^\" ]*\.tgz" | head -n1)
640+
[[ -z "$PKG_FILE" ]] && { echo "ERROR: Package $pkg not found"; exit 1; }
641+
wget -O- "$PKG_MIRROR/$PKG_FILE" | tar -C "$ROOTFS" -xzpf -
642+
else
643+
PKG_FILE=$(curl -s "$PKG_MIRROR/" | grep -Eo "${pkg}-[0-9][^\" ]*\.tgz" | head -n1)
644+
[[ -z "$PKG_FILE" ]] && { echo "ERROR: Package $pkg not found"; exit 1; }
645+
curl -SL "$PKG_MIRROR/$PKG_FILE" | tar -C "$ROOTFS" -xzpf -
646+
fi
647+
done
596648
elif [[ "$__CodeName" == "illumos" ]]; then
597649
mkdir "$__RootfsDir/tmp"
598650
pushd "$__RootfsDir/tmp"

‎eng/common/cross/toolchain.cmake‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,22 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
33
# reset platform variables (e.g. cmake 3.25 sets LINUX=1)
44
unset(LINUX)
55
unset(FREEBSD)
6+
unset(OPENBSD)
67
unset(ILLUMOS)
78
unset(ANDROID)
89
unset(TIZEN)
910
unset(HAIKU)
1011

1112
set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})
13+
14+
file(GLOB OPENBSD_PROBE "${CROSS_ROOTFS}/etc/signify/openbsd-*.pub")
15+
1216
if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
1317
set(CMAKE_SYSTEM_NAME FreeBSD)
1418
set(FREEBSD 1)
19+
elseif(OPENBSD_PROBE)
20+
set(CMAKE_SYSTEM_NAME OpenBSD)
21+
set(OPENBSD 1)
1522
elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc)
1623
set(CMAKE_SYSTEM_NAME SunOS)
1724
set(ILLUMOS 1)
@@ -53,6 +60,8 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
5360
endif()
5461
elseif(FREEBSD)
5562
set(triple "aarch64-unknown-freebsd12")
63+
elseif(OPENBSD)
64+
set(triple "aarch64-unknown-openbsd")
5665
endif()
5766
elseif(TARGET_ARCH_NAME STREQUAL "armel")
5867
set(CMAKE_SYSTEM_PROCESSOR armv7l)
@@ -109,6 +118,8 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
109118
endif()
110119
elseif(FREEBSD)
111120
set(triple "x86_64-unknown-freebsd12")
121+
elseif(OPENBSD)
122+
set(triple "x86_64-unknown-openbsd")
112123
elseif(ILLUMOS)
113124
set(TOOLCHAIN "x86_64-illumos")
114125
elseif(HAIKU)
@@ -193,7 +204,7 @@ if(ANDROID)
193204

194205
# include official NDK toolchain script
195206
include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake)
196-
elseif(FREEBSD)
207+
elseif(FREEBSD OR OPENBSD)
197208
# we cross-compile by instructing clang
198209
set(CMAKE_C_COMPILER_TARGET ${triple})
199210
set(CMAKE_CXX_COMPILER_TARGET ${triple})
@@ -291,7 +302,7 @@ endif()
291302

292303
# Specify compile options
293304

294-
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)
305+
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)
295306
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
296307
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
297308
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"runner": "Microsoft.Testing.Platform"
3838
},
3939
"msbuild-sdks": {
40-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26152.5",
40+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26153.4",
4141
"MSBuild.Sdk.Extras": "3.0.44"
4242
}
4343
}

0 commit comments

Comments
 (0)