Skip to content

Commit 9a0d2b7

Browse files
committed
fix aspnetcore build failures
* fix NU1102 by updating the <MicrosoftNETCoreAppRuntimeVersion> to the currently built runtime version of nupkg * change path from where the aspnetcore-runtime-*.tar.gz is copied from * update the build parameters introduced here :- dotnet/aspnetcore#58612 Signed-off-by: Sanjam Panda <[email protected]>
1 parent 5975016 commit 9a0d2b7

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

dotnet-build

+17-2
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,13 @@ function build_aspnetcore {
206206
--pack
207207
"/p:DotNetAssetRootUrl=file://$DOWNLOADDIR/"
208208
)
209+
if [ "$runtime_major_version" -gt 9 ]; then
210+
aspnetcore_build_flags+=(
211+
"/p:PublicBaseURL=file://$DOWNLOADDIR/"
212+
"/p:MicrosoftNETCoreAppRuntimeVersion=$runtime_version"
213+
"/p:DotNetRuntimeDownloadPath=Runtime/$runtime_version/dotnet-runtime-$runtime_version-linux-$ARCH.tar.gz"
214+
)
215+
fi
209216
if [ "$aspnetcore_build_id" != "" ]; then
210217
aspnetcore_build_flags+=(
211218
"/p:ContinuousIntegrationBuild=true"
@@ -248,9 +255,17 @@ function build_aspnetcore {
248255
if [ -e "$spa_templates" ]; then
249256
cp "$spa_templates" "$PACKAGESDIR"
250257
fi
251-
aspnetcore_tgz=artifacts/installers/$aspnetcore_conf/aspnetcore-runtime-internal-$ASPNETCORE_VERSION-linux-$ARCH.tar.gz
258+
if [ "$aspnetcore_major_version" -lt 10 ]; then
259+
aspnetcore_tgz=artifacts/installers/$aspnetcore_conf/aspnetcore-runtime-internal-$ASPNETCORE_VERSION-linux-$ARCH.tar.gz
260+
else
261+
aspnetcore_tgz=artifacts/packages/$aspnetcore_conf/Shipping/aspnetcore-runtime-internal-$ASPNETCORE_VERSION-linux-$ARCH.tar.gz
262+
fi
252263
if [ ! -e "$aspnetcore_tgz" ]; then
253-
aspnetcore_tgz=artifacts/installers/$aspnetcore_conf/aspnetcore-runtime-$ASPNETCORE_VERSION-linux-$ARCH.tar.gz
264+
if [ "$aspnetcore_major_version" -lt 10 ]; then
265+
aspnetcore_tgz=artifacts/installers/$aspnetcore_conf/aspnetcore-runtime-$ASPNETCORE_VERSION-linux-$ARCH.tar.gz
266+
else
267+
aspnetcore_tgz=artifacts/packages/$aspnetcore_conf/Shipping/aspnetcore-runtime-$ASPNETCORE_VERSION-linux-$ARCH.tar.gz
268+
fi
254269
fi
255270
mkdir -p "$DOWNLOADDIR/aspnetcore/Runtime/$aspnetcore_internal_version"
256271
cp "$aspnetcore_tgz" "$DOWNLOADDIR/aspnetcore/Runtime/$aspnetcore_internal_version"

0 commit comments

Comments
 (0)