From 17e787f4c20745e7d1932f19adcf2fb041a5a881 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Dec 2024 13:36:57 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/source-build-externals build 20241216.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 10.0.560902 -> To Version 10.0.561601 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2b31ba46..dc4483652 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -30,9 +30,9 @@ - + https://github.com/dotnet/source-build-externals - 8b6c934b975aed0bd3cdc863ad6a86b19c51c52c + 2aa5deaca3313a9908da198c08bf2cab11107684 From 2268f4442b0f4a6048c747e09ff5cb317029dfac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Dec 2024 13:53:13 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/arcade build 20241216.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24613.2 -> To Version 10.0.0-beta.24616.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dc4483652..6ac2b7555 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,14 +13,14 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/arcade - 255d5e0c89958af276883a988108c2d616438805 + e0abaf3431b0fe3c9f9902aa42f6008b1250e75e - + https://github.com/dotnet/arcade - 255d5e0c89958af276883a988108c2d616438805 + e0abaf3431b0fe3c9f9902aa42f6008b1250e75e diff --git a/global.json b/global.json index 98f799089..8dc33bf96 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24613.2" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24616.1" } } From 9e747a4a87742a95d383d03d5ae0e8dd807b5945 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Dec 2024 13:53:23 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20241216.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 10.0.561001 -> To Version 10.0.561602 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ac2b7555..c13be9b91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -24,9 +24,9 @@ - + https://github.com/dotnet/source-build-reference-packages - 94798e07efab2663f2d1a71862780bc365d2e3ab + b24c3aa9f120f83befa255d5d5f465b961f387fb From bb63b3f10b9cecba8bf3524333a32f0b78066b5f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Dec 2024 13:32:43 +0000 Subject: [PATCH 4/4] Update dependencies from https://github.com/dotnet/arcade build 20241217.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24613.2 -> To Version 10.0.0-beta.24617.2 --- eng/Version.Details.xml | 8 ++++---- eng/common/cross/build-rootfs.sh | 2 +- global.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c13be9b91..59138643a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,14 +13,14 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/arcade - e0abaf3431b0fe3c9f9902aa42f6008b1250e75e + 4f2968fce08735a7e22fca6bd4c99d003221d716 - + https://github.com/dotnet/arcade - e0abaf3431b0fe3c9f9902aa42f6008b1250e75e + 4f2968fce08735a7e22fca6bd4c99d003221d716 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index de9807297..464040aaa 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -422,7 +422,7 @@ case "$__AlpineVersion" in elif [[ "$__AlpineArch" == "riscv64" ]]; then __AlpineLlvmLibsLookup=1 __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) - elif [[ -n "$__AlpineVersion" ]]; then + elif [[ -n "$__AlpineMajorVersion" ]]; then # use whichever alpine version is provided and select the latest toolchain libs __AlpineLlvmLibsLookup=1 else diff --git a/global.json b/global.json index 8dc33bf96..1b0d49658 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24616.1" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24617.2" } }