From 5e720dd196441dafd48cd3cbb776306f8523a58f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 20:06:03 +0200 Subject: [PATCH] [main] Update dependencies from dotnet/arcade (#105469) * Update dependencies from https://github.com/dotnet/arcade build 20240724.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24372.7 -> To Version 9.0.0-beta.24374.3 * Update dependencies from https://github.com/dotnet/arcade build 20240725.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24372.7 -> To Version 9.0.0-beta.24375.3 * Update dependencies from https://github.com/dotnet/arcade build 20240725.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24372.7 -> To Version 9.0.0-beta.24375.3 * Update dependencies from https://github.com/dotnet/arcade build 20240725.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24372.7 -> To Version 9.0.0-beta.24375.3 * Update dependencies from https://github.com/dotnet/arcade build 20240725.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24372.7 -> To Version 9.0.0-beta.24375.3 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 84 ++++++++++++++++---------------- eng/Versions.props | 32 ++++++------ eng/common/cross/build-rootfs.sh | 14 +++--- global.json | 6 +-- 4 files changed, 68 insertions(+), 68 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92add19ae35cc..f89d8302d83bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -88,87 +88,87 @@ - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f https://github.com/dotnet/runtime-assets @@ -328,9 +328,9 @@ https://github.com/dotnet/xharness 65d0584b517952962b7a79195b5d7606b52fcbfe - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index c5cb711ed7d3e..835e68028dfa5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,22 +83,22 @@ 9.0.100-preview.7.24371.4 - 9.0.0-beta.24372.7 - 9.0.0-beta.24372.7 - 9.0.0-beta.24372.7 - 9.0.0-beta.24372.7 - 2.9.0-beta.24372.7 - 9.0.0-beta.24372.7 - 2.9.0-beta.24372.7 - 9.0.0-beta.24372.7 - 9.0.0-beta.24372.7 - 9.0.0-beta.24372.7 - 9.0.0-beta.24372.7 - 9.0.0-beta.24372.7 - 9.0.0-beta.24372.7 - 9.0.0-beta.24372.7 - 9.0.0-beta.24372.7 - 9.0.0-beta.24372.7 + 9.0.0-beta.24375.3 + 9.0.0-beta.24375.3 + 9.0.0-beta.24375.3 + 9.0.0-beta.24375.3 + 2.9.0-beta.24375.3 + 9.0.0-beta.24375.3 + 2.9.0-beta.24375.3 + 9.0.0-beta.24375.3 + 9.0.0-beta.24375.3 + 9.0.0-beta.24375.3 + 9.0.0-beta.24375.3 + 9.0.0-beta.24375.3 + 9.0.0-beta.24375.3 + 9.0.0-beta.24375.3 + 9.0.0-beta.24375.3 + 9.0.0-beta.24375.3 1.4.0 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 6d99d1263c0be..4b5e8d7166bd9 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -605,18 +605,18 @@ elif [[ "$__CodeName" == "illumos" ]]; then fi echo "Building binutils. Please wait.." if [[ "$__hasWget" == 1 ]]; then - wget -O- https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf - + wget -O- https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz | tar -xJf - else - curl -SL https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf - + curl -SL https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz | tar -xJf - fi mkdir build-binutils && cd build-binutils - ../binutils-2.33.1/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" + ../binutils-2.42/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.11" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" make -j "$JOBS" && make install && cd .. echo "Building gcc. Please wait.." if [[ "$__hasWget" == 1 ]]; then - wget -O- https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf - + wget -O- https://ftp.gnu.org/gnu/gcc/gcc-13.3.0/gcc-13.3.0.tar.xz | tar -xJf - else - curl -SL https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf - + curl -SL https://ftp.gnu.org/gnu/gcc/gcc-13.3.0/gcc-13.3.0.tar.xz | tar -xJf - fi CFLAGS="-fPIC" CXXFLAGS="-fPIC" @@ -624,7 +624,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then CFLAGS_FOR_TARGET="-fPIC" export CFLAGS CXXFLAGS CXXFLAGS_FOR_TARGET CFLAGS_FOR_TARGET mkdir build-gcc && cd build-gcc - ../gcc-8.4.0/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \ + ../gcc-13.3.0/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.11" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \ --with-gnu-ld --disable-nls --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv --disable-libcilkrts --disable-libada --disable-libsanitizer \ --disable-libquadmath-support --disable-shared --enable-tls make -j "$JOBS" && make install && cd .. @@ -632,7 +632,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then if [[ "$__UseMirror" == 1 ]]; then BaseUrl=https://pkgsrc.smartos.skylime.net fi - BaseUrl="$BaseUrl/packages/SmartOS/trunk/${__illumosArch}/All" + BaseUrl="$BaseUrl/packages/SmartOS/2019Q4/${__illumosArch}/All" echo "Downloading manifest" if [[ "$__hasWget" == 1 ]]; then wget "$BaseUrl" diff --git a/global.json b/global.json index 510f47b5aed98..138de31b038fa 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-preview.6.24328.19" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24372.7", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24372.7", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24372.7", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24375.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24375.3", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24375.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.7.24371.6"