Skip to content

Commit 1aa7440

Browse files
committed
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. see more dotnet/aspnetcore#58612 Signed-off-by: Sanjam Panda <[email protected]>
1 parent 80088f4 commit 1aa7440

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

dotnet-build

+2-2
Original file line numberDiff line numberDiff line change
@@ -255,13 +255,13 @@ function build_aspnetcore {
255255
if [ -e "$spa_templates" ]; then
256256
cp "$spa_templates" "$PACKAGESDIR"
257257
fi
258-
if [ "$aspnetcore_major_version" -lt 10 ]; then
258+
if ! git merge-base --is-ancestor 7949421 HEAD; then
259259
aspnetcore_tgz=artifacts/installers/$aspnetcore_conf/aspnetcore-runtime-internal-$ASPNETCORE_VERSION-linux-$ARCH.tar.gz
260260
else
261261
aspnetcore_tgz=artifacts/packages/$aspnetcore_conf/Shipping/aspnetcore-runtime-internal-$ASPNETCORE_VERSION-linux-$ARCH.tar.gz
262262
fi
263263
if [ ! -e "$aspnetcore_tgz" ]; then
264-
if [ "$aspnetcore_major_version" -lt 10 ]; then
264+
if ! git merge-base --is-ancestor 7949421 HEAD; then
265265
aspnetcore_tgz=artifacts/installers/$aspnetcore_conf/aspnetcore-runtime-$ASPNETCORE_VERSION-linux-$ARCH.tar.gz
266266
else
267267
aspnetcore_tgz=artifacts/packages/$aspnetcore_conf/Shipping/aspnetcore-runtime-$ASPNETCORE_VERSION-linux-$ARCH.tar.gz

0 commit comments

Comments
 (0)