Skip to content

Commit 92fc0c2

Browse files
committed
fix(main/dotnet10.0): remove netstandard-targeting-pack-2.1-10.0
1 parent fea736f commit 92fc0c2

4 files changed

Lines changed: 8 additions & 31 deletions

File tree

packages/dotnet10.0/build.sh

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,10 @@ termux_step_make_install() {
270270
fi
271271

272272
pushd "${TERMUX_PREFIX}"
273+
# https://github.com/dotnet/sdk/pull/50354
274+
# NETStandard.Library.Ref is no longer shipped in .NET 10 SDK
275+
rm -fr lib/dotnet/packs/NETStandard.Library.Ref
276+
273277
# remove unused targeting packs pdb files
274278
find \
275279
lib/dotnet/packs/Microsoft.AspNetCore.App.Ref \
@@ -350,28 +354,6 @@ termux_step_make_install() {
350354
\( -type f -o -type l \) | sort \
351355
> "${TERMUX_PKG_TMPDIR}"/dotnet-templates.txt
352356

353-
if [[ ! -d lib/dotnet/packs/NETStandard.Library.Ref ]]; then
354-
echo "WARNING: NETStandard.Library.Ref not found in SDK tarball, extracting from nupkg"
355-
local _nupkg
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)"
361-
fi
362-
if [[ -n "${_nupkg}" ]]; then
363-
mkdir -p lib/dotnet/packs/NETStandard.Library.Ref/2.1.0
364-
unzip -qo "${_nupkg}" -d lib/dotnet/packs/NETStandard.Library.Ref/2.1.0
365-
rm -rf lib/dotnet/packs/NETStandard.Library.Ref/2.1.0/{_rels,package,'[Content_Types].xml'} \
366-
lib/dotnet/packs/NETStandard.Library.Ref/2.1.0/*.nuspec
367-
else
368-
termux_error_exit "NETStandard.Library.Ref.2.1.0.nupkg not found"
369-
fi
370-
fi
371-
find \
372-
lib/dotnet/packs/NETStandard.Library.Ref \
373-
\( -type f -o -type l \) | sort \
374-
> "${TERMUX_PKG_TMPDIR}"/netstandard-targeting-pack-2.1.txt
375357
popd
376358

377359
local txt

packages/dotnet10.0/dotnet-sdk-10.0.subpackage.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
TERMUX_SUBPKG_DESCRIPTION=".NET 10.0 SDK"
22
TERMUX_SUBPKG_DEPEND_ON_PARENT=false
3-
TERMUX_SUBPKG_DEPENDS="aspnetcore-runtime-10.0, aspnetcore-targeting-pack-10.0, dotnet-apphost-pack-10.0, dotnet-runtime-10.0, dotnet-targeting-pack-10.0, dotnet-templates-10.0, netstandard-targeting-pack-2.1"
3+
TERMUX_SUBPKG_DEPENDS="aspnetcore-runtime-10.0, aspnetcore-targeting-pack-10.0, dotnet-apphost-pack-10.0, dotnet-runtime-10.0, dotnet-targeting-pack-10.0, dotnet-templates-10.0"
44
TERMUX_SUBPKG_INCLUDE=$(cat "${TERMUX_PKG_TMPDIR}"/dotnet-sdk.txt)
55

66
termux_step_create_subpkg_debscripts() {

packages/dotnet10.0/netstandard-targeting-pack-2.1-10.0.subpackage.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

packages/netstandard-targeting-pack-2.1/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://dotnet.microsoft.com/en-us/
22
TERMUX_PKG_DESCRIPTION="A metapackage for NETStandard.Library 2.1 Targeting Pack"
33
TERMUX_PKG_LICENSE="Public Domain"
44
TERMUX_PKG_MAINTAINER="@truboxl"
5-
TERMUX_PKG_VERSION="10.0"
6-
TERMUX_PKG_DEPENDS="netstandard-targeting-pack-2.1-10.0 | netstandard-targeting-pack-2.1-9.0 | netstandard-targeting-pack-2.1-8.0"
7-
TERMUX_PKG_ANTI_BUILD_DEPENDS="netstandard-targeting-pack-2.1-10.0, netstandard-targeting-pack-2.1-9.0, netstandard-targeting-pack-2.1-8.0"
5+
TERMUX_PKG_VERSION="9.0"
6+
TERMUX_PKG_DEPENDS="netstandard-targeting-pack-2.1-9.0 | netstandard-targeting-pack-2.1-8.0"
7+
TERMUX_PKG_ANTI_BUILD_DEPENDS="netstandard-targeting-pack-2.1-9.0, netstandard-targeting-pack-2.1-8.0"
88
TERMUX_PKG_AUTO_UPDATE=false
99
TERMUX_PKG_METAPACKAGE=true
1010
TERMUX_PKG_SKIP_SRC_EXTRACT=true

0 commit comments

Comments
 (0)