From f1037b215039f9e0dd5e3d32827ea019fb7ec7d4 Mon Sep 17 00:00:00 2001 From: Sanjam Panda Date: Tue, 14 Jan 2025 20:09:38 +0000 Subject: [PATCH] enable strict checking while copying aspnetcore-runtime.tar.gz The present condition fails while building .NET10 minor versions before the arcade tooling infrastructure was introduced in aspnetcore. Signed-off-by: Sanjam Panda --- dotnet-build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dotnet-build b/dotnet-build index ef73a18..35cc007 100755 --- a/dotnet-build +++ b/dotnet-build @@ -255,13 +255,13 @@ function build_aspnetcore { if [ -e "$spa_templates" ]; then cp "$spa_templates" "$PACKAGESDIR" fi - if [ "$aspnetcore_major_version" -lt 10 ]; then + if ! git merge-base --is-ancestor 7949421 HEAD; then aspnetcore_tgz=artifacts/installers/$aspnetcore_conf/aspnetcore-runtime-internal-$ASPNETCORE_VERSION-linux-$ARCH.tar.gz else aspnetcore_tgz=artifacts/packages/$aspnetcore_conf/Shipping/aspnetcore-runtime-internal-$ASPNETCORE_VERSION-linux-$ARCH.tar.gz fi if [ ! -e "$aspnetcore_tgz" ]; then - if [ "$aspnetcore_major_version" -lt 10 ]; then + if ! git merge-base --is-ancestor 7949421 HEAD; then aspnetcore_tgz=artifacts/installers/$aspnetcore_conf/aspnetcore-runtime-$ASPNETCORE_VERSION-linux-$ARCH.tar.gz else aspnetcore_tgz=artifacts/packages/$aspnetcore_conf/Shipping/aspnetcore-runtime-$ASPNETCORE_VERSION-linux-$ARCH.tar.gz