From 4ef40ca3adb9fa0cbb514791c863b719a5630e75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Jan 2024 13:20:48 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20240118.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.24068.1 -> To Version 9.0.0-beta.24068.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- eng/common/cross/build-rootfs.sh | 16 ++++++++-------- global.json | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79600337bd3d..58d79619895a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,18 +206,18 @@ - + https://github.com/dotnet/arcade - c246c9d7bfb98646ec52a18471d075219b26dccc + 3ce3eaf210b1f815e5f90b33865d8cc5e9ed9849 - + https://github.com/dotnet/arcade - c246c9d7bfb98646ec52a18471d075219b26dccc + 3ce3eaf210b1f815e5f90b33865d8cc5e9ed9849 - + https://github.com/dotnet/arcade - c246c9d7bfb98646ec52a18471d075219b26dccc + 3ce3eaf210b1f815e5f90b33865d8cc5e9ed9849 https://github.com/dotnet/arcade-services @@ -227,9 +227,9 @@ https://github.com/dotnet/arcade-services 702f946f89ace6197fdca2ac309d32187c4bc1bd - + https://github.com/dotnet/arcade - c246c9d7bfb98646ec52a18471d075219b26dccc + 3ce3eaf210b1f815e5f90b33865d8cc5e9ed9849 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 620c83642f88..8d7dc1b31080 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 9.0.0-beta.24068.1 + 9.0.0-beta.24068.4 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 9b2791cf568a..9fa764e78b04 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -8,7 +8,7 @@ usage() echo "BuildArch can be: arm(default), arm64, armel, armv6, 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: freebsd12, freebsd13" + echo " for FreeBSD can be: freebsd13, freebsd14" 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" @@ -71,9 +71,9 @@ __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" -__FreeBSDBase="12.4-RELEASE" -__FreeBSDPkg="1.17.0" -__FreeBSDABI="12" +__FreeBSDBase="13.2-RELEASE" +__FreeBSDPkg="1.20.0" +__FreeBSDABI="13" __FreeBSDPackages="libunwind" __FreeBSDPackages+=" icu" __FreeBSDPackages+=" libinotify" @@ -334,14 +334,14 @@ while :; do __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion" fi ;; - freebsd12) + freebsd13) __CodeName=freebsd __SkipUnmount=1 ;; - freebsd13) + freebsd14) __CodeName=freebsd - __FreeBSDBase="13.2-RELEASE" - __FreeBSDABI="13" + __FreeBSDBase="14.0-RELEASE" + __FreeBSDABI="14" __SkipUnmount=1 ;; illumos) diff --git a/global.json b/global.json index 1e1e15117010..922b16776cf1 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24068.1", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24068.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24068.4", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24068.4" } } From dc1177ffc28b56feaec694e75f93cc39845d65ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 20 Jan 2024 13:18:25 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20240119.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.24068.1 -> To Version 9.0.0-beta.24069.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2310b158f25c..85c2f7786c8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,18 +206,18 @@ - + https://github.com/dotnet/arcade - 3ce3eaf210b1f815e5f90b33865d8cc5e9ed9849 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3ce3eaf210b1f815e5f90b33865d8cc5e9ed9849 + abddd0bd5145578246dcadda264c7557f2a935a9 - + https://github.com/dotnet/arcade - 3ce3eaf210b1f815e5f90b33865d8cc5e9ed9849 + abddd0bd5145578246dcadda264c7557f2a935a9 https://github.com/dotnet/arcade-services @@ -227,9 +227,9 @@ https://github.com/dotnet/arcade-services 702f946f89ace6197fdca2ac309d32187c4bc1bd - + https://github.com/dotnet/arcade - 3ce3eaf210b1f815e5f90b33865d8cc5e9ed9849 + abddd0bd5145578246dcadda264c7557f2a935a9 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f07f48634b3a..35632c8f5efa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 9.0.0-beta.24068.4 + 9.0.0-beta.24069.2 diff --git a/global.json b/global.json index 922b16776cf1..530d84e9d9a5 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24068.4", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24068.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24069.2", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24069.2" } }