Skip to content

Commit 240d607

Browse files
committed
fix(main/dotnet{8.0,9.0,10.0}): add bidirectional subpackage conflicts
1 parent f47906c commit 240d607

9 files changed

Lines changed: 15 additions & 11 deletions

packages/dotnet10.0/build.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -349,16 +349,16 @@ termux_step_make_install() {
349349
\( -type f -o -type l \) | sort \
350350
> "${TERMUX_PKG_TMPDIR}"/dotnet-templates.txt
351351

352-
if [ ! -d lib/dotnet/packs/NETStandard.Library.Ref ]; then
352+
if [[ ! -d lib/dotnet/packs/NETStandard.Library.Ref ]]; then
353353
echo "WARNING: NETStandard.Library.Ref not found in SDK tarball, extracting from nupkg"
354354
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)
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)"
360360
fi
361-
if [ -n "${_nupkg}" ]; then
361+
if [[ -n "${_nupkg}" ]]; then
362362
mkdir -p lib/dotnet/packs/NETStandard.Library.Ref/2.1.0
363363
unzip -qo "${_nupkg}" -d lib/dotnet/packs/NETStandard.Library.Ref/2.1.0
364364
rm -rf lib/dotnet/packs/NETStandard.Library.Ref/2.1.0/{_rels,package,'[Content_Types].xml'} \
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
TERMUX_SUBPKG_DESCRIPTION=".NET 10.0 Host"
22
TERMUX_SUBPKG_DEPEND_ON_PARENT=false
3-
TERMUX_SUBPKG_CONFLICTS="dotnet-host-9.0"
3+
TERMUX_SUBPKG_CONFLICTS="dotnet-host-8.0, dotnet-host-9.0"
44
TERMUX_SUBPKG_INCLUDE=$(cat "${TERMUX_PKG_TMPDIR}"/dotnet-host.txt)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
TERMUX_SUBPKG_DESCRIPTION="NETStandard.Library 2.1 Targeting Pack (.NET 10.0)"
22
TERMUX_SUBPKG_DEPEND_ON_PARENT=false
33
TERMUX_SUBPKG_DEPENDS="dotnet-host"
4-
TERMUX_SUBPKG_CONFLICTS="netstandard-targeting-pack-2.1-9.0"
4+
TERMUX_SUBPKG_CONFLICTS="netstandard-targeting-pack-2.1-8.0, netstandard-targeting-pack-2.1-9.0"
55
TERMUX_SUBPKG_INCLUDE=$(cat "${TERMUX_PKG_TMPDIR}"/netstandard-targeting-pack-2.1.txt)

packages/dotnet8.0/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION=".NET 8.0"
33
TERMUX_PKG_LICENSE="MIT"
44
TERMUX_PKG_MAINTAINER="@truboxl"
55
TERMUX_PKG_VERSION="8.0.24"
6+
TERMUX_PKG_REVISION=1
67
_DOTNET_SDK_VERSION="8.0.124"
78
TERMUX_PKG_SRCURL=git+https://github.com/dotnet/dotnet
89
TERMUX_PKG_GIT_BRANCH="v${_DOTNET_SDK_VERSION}"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
TERMUX_SUBPKG_DESCRIPTION=".NET 8.0 Host"
22
TERMUX_SUBPKG_DEPEND_ON_PARENT=false
3+
TERMUX_SUBPKG_CONFLICTS="dotnet-host-9.0, dotnet-host-10.0"
34
TERMUX_SUBPKG_INCLUDE=$(cat "${TERMUX_PKG_TMPDIR}"/dotnet-host.txt)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
TERMUX_SUBPKG_DESCRIPTION="NETStandard.Library 2.1 Targeting Pack (.NET 8.0)"
22
TERMUX_SUBPKG_DEPEND_ON_PARENT=false
33
TERMUX_SUBPKG_DEPENDS="dotnet-host"
4+
TERMUX_SUBPKG_CONFLICTS="netstandard-targeting-pack-2.1-9.0, netstandard-targeting-pack-2.1-10.0"
45
TERMUX_SUBPKG_INCLUDE=$(cat "${TERMUX_PKG_TMPDIR}"/netstandard-targeting-pack-2.1.txt)

packages/dotnet9.0/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION=".NET 9.0"
33
TERMUX_PKG_LICENSE="MIT"
44
TERMUX_PKG_MAINTAINER="@truboxl"
55
TERMUX_PKG_VERSION="9.0.12"
6+
TERMUX_PKG_REVISION=1
67
_DOTNET_SDK_VERSION="9.0.113"
78
TERMUX_PKG_SRCURL=git+https://github.com/dotnet/dotnet
89
TERMUX_PKG_GIT_BRANCH="v${_DOTNET_SDK_VERSION}"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
TERMUX_SUBPKG_DESCRIPTION=".NET 9.0 Host"
22
TERMUX_SUBPKG_DEPEND_ON_PARENT=false
3-
TERMUX_SUBPKG_CONFLICTS="dotnet-host-8.0"
3+
TERMUX_SUBPKG_CONFLICTS="dotnet-host-8.0, dotnet-host-10.0"
44
TERMUX_SUBPKG_INCLUDE=$(cat "${TERMUX_PKG_TMPDIR}"/dotnet-host.txt)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
TERMUX_SUBPKG_DESCRIPTION="NETStandard.Library 2.1 Targeting Pack (.NET 9.0)"
22
TERMUX_SUBPKG_DEPEND_ON_PARENT=false
33
TERMUX_SUBPKG_DEPENDS="dotnet-host"
4-
TERMUX_SUBPKG_CONFLICTS="netstandard-targeting-pack-2.1-8.0"
4+
TERMUX_SUBPKG_CONFLICTS="netstandard-targeting-pack-2.1-8.0, netstandard-targeting-pack-2.1-10.0"
55
TERMUX_SUBPKG_INCLUDE=$(cat "${TERMUX_PKG_TMPDIR}"/netstandard-targeting-pack-2.1.txt)

0 commit comments

Comments
 (0)