@@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=git+https://github.com/dotnet/dotnet
88TERMUX_PKG_GIT_BRANCH=" v${_DOTNET_SDK_VERSION} "
99TERMUX_PKG_BUILD_DEPENDS=" krb5, libicu, openssl, zlib"
1010TERMUX_PKG_SUGGESTS=" dotnet-sdk-10.0"
11- TERMUX_PKG_CONFLICTS=" dotnet9.0"
11+ TERMUX_PKG_CONFLICTS=" dotnet8.0, dotnet9.0"
1212TERMUX_PKG_BUILD_IN_SRC=true
1313TERMUX_PKG_NO_STATICSPLIT=true
1414TERMUX_PKG_AUTO_UPDATE=true
@@ -194,6 +194,7 @@ termux_step_make() {
194194 termux_error_exit
195195 fi
196196 " ${TERMUX_PKG_BUILDDIR} /.dotnet/dotnet" build-server shutdown
197+ termux_dotnet_kill
197198}
198199
199200termux_step_make_install () {
@@ -349,16 +350,16 @@ termux_step_make_install() {
349350 \( -type f -o -type l \) | sort \
350351 > " ${TERMUX_PKG_TMPDIR} " /dotnet-templates.txt
351352
352- if [ ! -d lib/dotnet/packs/NETStandard.Library.Ref ]; then
353+ if [[ ! -d lib/dotnet/packs/NETStandard.Library.Ref ] ]; then
353354 echo " WARNING: NETStandard.Library.Ref not found in SDK tarball, extracting from nupkg"
354355 local _nupkg
355- _nupkg=$( find " ${TERMUX_PKG_BUILDDIR} /prereqs/packages/reference" \
356- -iname ' netstandard.library.ref.2.1.0.nupkg' -print -quit 2> /dev/null)
357- if [ -z " ${_nupkg} " ]; then
358- _nupkg=$( find " ${TERMUX_PKG_BUILDDIR} " -maxdepth 5 \
359- -iname ' netstandard.library.ref.2.1.0.nupkg' -print -quit 2> /dev/null)
356+ _nupkg=" $( find " ${TERMUX_PKG_BUILDDIR} /prereqs/packages/reference" \
357+ -iname ' netstandard.library.ref.2.1.0.nupkg' -print -quit 2> /dev/null) "
358+ if [[ -z " ${_nupkg} " ] ]; then
359+ _nupkg=" $( find " ${TERMUX_PKG_BUILDDIR} " -maxdepth 5 \
360+ -iname ' netstandard.library.ref.2.1.0.nupkg' -print -quit 2> /dev/null) "
360361 fi
361- if [ -n " ${_nupkg} " ]; then
362+ if [[ -n " ${_nupkg} " ] ]; then
362363 mkdir -p lib/dotnet/packs/NETStandard.Library.Ref/2.1.0
363364 unzip -qo " ${_nupkg} " -d lib/dotnet/packs/NETStandard.Library.Ref/2.1.0
364365 rm -rf lib/dotnet/packs/NETStandard.Library.Ref/2.1.0/{_rels,package,' [Content_Types].xml' } \
0 commit comments