From e21f8b33a2d27cb07a293f060a54d87b5a9b4bcb Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sat, 15 Oct 2022 05:07:00 +0000
Subject: [PATCH 1/4] dotnet-runtime: Drop ASP.NET Runtimes 3.1 and 5.0 and
 addon (125)

---
 packages/addons/tools/dotnet-runtime/changelog.txt |  9 +++++++++
 packages/addons/tools/dotnet-runtime/package.mk    | 12 +++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/addons/tools/dotnet-runtime/changelog.txt b/packages/addons/tools/dotnet-runtime/changelog.txt
index 1dd626f144..41ead6fb48 100644
--- a/packages/addons/tools/dotnet-runtime/changelog.txt
+++ b/packages/addons/tools/dotnet-runtime/changelog.txt
@@ -1,3 +1,12 @@
+125
+- Drop ASP.NET Core Runtime 3.1
+- Drop .NET Runtime 5.0
+- Drop ASP.NET Core Runtime 5.0
+  .NET Core 3.1 is End of Support - 2022-12-13
+  .NET 5.0 is End of Support - 2022-05-10
+  Current addons using .NET (Emby4, Jellyfin, NextPVR)
+    are now all using .NET 6.0
+
 124
 - Update ASP.NET Core Runtime 6.0.12
 
diff --git a/packages/addons/tools/dotnet-runtime/package.mk b/packages/addons/tools/dotnet-runtime/package.mk
index 5c0751861c..5fd3944960 100644
--- a/packages/addons/tools/dotnet-runtime/package.mk
+++ b/packages/addons/tools/dotnet-runtime/package.mk
@@ -2,14 +2,14 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="dotnet-runtime"
-PKG_REV="124"
+PKG_REV="125"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://dotnet.microsoft.com/"
-PKG_DEPENDS_TARGET="toolchain icu aspnet5-runtime aspnet6-runtime dotnet3-runtime dotnet5-runtime"
+PKG_DEPENDS_TARGET="toolchain icu aspnet6-runtime"
 PKG_SECTION="tools"
 PKG_SHORTDESC="ASP.NET Core Runtime"
-PKG_LONGDESC="ASP.NET Core Runtimes ($(get_pkg_version dotnet3-runtime)), ($(get_pkg_version dotnet5-runtime)) and ($(get_pkg_version aspnet6-runtime)) enables you to run existing console/web/server applications."
+PKG_LONGDESC="ASP.NET Core Runtimes ($(get_pkg_version aspnet6-runtime)) enables you to run existing console/web/server applications."
 PKG_TOOLCHAIN="manual"
 
 PKG_IS_ADDON="yes"
@@ -20,12 +20,6 @@ PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 addon() {
   mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
-    cp -r $(get_build_dir dotnet3-runtime)/* \
-          ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
-    cp -r $(get_build_dir dotnet5-runtime)/* \
-          ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
-    cp -r $(get_build_dir aspnet5-runtime)/* \
-          ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
     cp -r $(get_build_dir aspnet6-runtime)/* \
           ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 

From 3c4d0a11e830ee54cf6040e350d78cf06cb88ab4 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sat, 15 Oct 2022 05:09:05 +0000
Subject: [PATCH 2/4] dotnet3-runtime: Drop ASP.NET Core Runtime 3.1

---
 .../dotnet3-runtime/package.mk                | 26 -------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 packages/addons/addon-depends/dotnet-runtime-depends/dotnet3-runtime/package.mk

diff --git a/packages/addons/addon-depends/dotnet-runtime-depends/dotnet3-runtime/package.mk b/packages/addons/addon-depends/dotnet-runtime-depends/dotnet3-runtime/package.mk
deleted file mode 100644
index dca1421513..0000000000
--- a/packages/addons/addon-depends/dotnet-runtime-depends/dotnet3-runtime/package.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="dotnet3-runtime"
-PKG_VERSION="3.1.16"
-PKG_LICENSE="MIT"
-PKG_SITE="https://dotnet.microsoft.com/"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="ASP.NET Core Runtime runs applications built with .NET Core, a cross-platform .NET implementation."
-PKG_TOOLCHAIN="manual"
-
-case "${ARCH}" in
-  "aarch64")
-    PKG_SHA256="b76c049484efd86466d2e1cd88994521633c399d090adb1c6804128603816abe"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/64353333-3080-45f7-a3d5-33e391e4596c/e9d5d53cb318628485e8d1fbd26ec30d/aspnetcore-runtime-3.1.16-linux-arm64.tar.gz"
-    ;;
-  "arm")
-    PKG_SHA256="a0163cd5c5ceae228bfffb40053f3509e155a110c23e81c38705757a870e24cc"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/bd734390-3b5f-402a-826f-e0eae538b8ba/5914dd937ede96cb9297e6e7a80f46f3/aspnetcore-runtime-3.1.16-linux-arm.tar.gz"
-    ;;
-  "x86_64")
-    PKG_SHA256="b1a2f61d8a49e2a3ca5eb9daa103b83eb49ea1bcf14914560e601222e94a3022"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/c20a5ac5-5174-46b8-a875-b916a416050d/b2ddd212a183260569178d880899bd94/aspnetcore-runtime-3.1.16-linux-x64.tar.gz"
-    ;;
-esac
-PKG_SOURCE_NAME="aspnetcore3-runtime_${PKG_VERSION}_${ARCH}.tar.gz"

From 08a58ad58c62bbd4dffb4535120ac8d789f323af Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sat, 15 Oct 2022 05:38:45 +0000
Subject: [PATCH 3/4] aspnet5-runtime: Drop ASP.NET Runtime 5.0

---
 .../aspnet5-runtime/package.mk                | 26 -------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 packages/addons/addon-depends/dotnet-runtime-depends/aspnet5-runtime/package.mk

diff --git a/packages/addons/addon-depends/dotnet-runtime-depends/aspnet5-runtime/package.mk b/packages/addons/addon-depends/dotnet-runtime-depends/aspnet5-runtime/package.mk
deleted file mode 100644
index 991cec7ff9..0000000000
--- a/packages/addons/addon-depends/dotnet-runtime-depends/aspnet5-runtime/package.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="aspnet5-runtime"
-PKG_VERSION="5.0.7"
-PKG_LICENSE="MIT"
-PKG_SITE="https://dotnet.microsoft.com/"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="ASP.NET Core Runtime enables you to run existing web/server applications."
-PKG_TOOLCHAIN="manual"
-
-case "${ARCH}" in
-  "aarch64")
-    PKG_SHA256="219f233d4e23e2381d93dc99a7cbdbe55c55e45da2e025b5d139d1338d11d62a"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/d0a22fa3-b916-49ce-8284-97131b424cb3/cb884163ad34b83f1ae1dbd33e09d77a/aspnetcore-runtime-5.0.7-linux-arm64.tar.gz"
-    ;;
-  "arm")
-    PKG_SHA256="c14e64527f2bf7356d1de154132a07b86de4a30c62129e138f3ca95a43c2dd54"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/2f690848-1342-4768-a7d7-45fa476a4a22/50dd1c50ed7864140b04fec057bb8bd6/aspnetcore-runtime-5.0.7-linux-arm.tar.gz"
-    ;;
-  "x86_64")
-    PKG_SHA256="22f9f93b4d6a00e76980918b721f7f62654421d7582d486e830ec478c365707c"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/d6be94b3-458f-43c4-8bb5-9ba261de8c9c/bbe13b54208d088b5fdf428759b5bc0a/aspnetcore-runtime-5.0.7-linux-x64.tar.gz"
-    ;;
-esac
-PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz"

From f9e5646d8efca54c8e57d3498b84b346d0263cbd Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sat, 15 Oct 2022 05:39:12 +0000
Subject: [PATCH 4/4] dotnet5-runtime: Drop .NET Runtime 5.0

---
 .../dotnet5-runtime/package.mk                | 26 -------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 packages/addons/addon-depends/dotnet-runtime-depends/dotnet5-runtime/package.mk

diff --git a/packages/addons/addon-depends/dotnet-runtime-depends/dotnet5-runtime/package.mk b/packages/addons/addon-depends/dotnet-runtime-depends/dotnet5-runtime/package.mk
deleted file mode 100644
index 18cc0d0416..0000000000
--- a/packages/addons/addon-depends/dotnet-runtime-depends/dotnet5-runtime/package.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="dotnet5-runtime"
-PKG_VERSION="5.0.7"
-PKG_LICENSE="MIT"
-PKG_SITE="https://dotnet.microsoft.com/"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC=".NET Runtime runs applications built with .NET Core, a cross-platform .NET implementation."
-PKG_TOOLCHAIN="manual"
-
-case "${ARCH}" in
-  "aarch64")
-    PKG_SHA256="375956c3d326f5030a1eff2cafdba8b994ed0e1b87db2dd812ce17e0bca5fb27"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/a9a37d9f-6158-43a4-a610-f0f9e8c2cb73/c69c6d22c668cb09b2d00bea8209335b/dotnet-runtime-5.0.7-linux-arm64.tar.gz"
-    ;;
-  "arm")
-    PKG_SHA256="fcc811f37cb6914bf3aa1c96040b1a46fad42939e6b1e1e7e0f513a9be1de680"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/09a24e9f-0096-454a-b761-70cdf9504775/eafe9578bbedd15c9319b7580d5a20d9/dotnet-runtime-5.0.7-linux-arm.tar.gz"
-    ;;
-  "x86_64")
-    PKG_SHA256="ed864299f0e736f9d284b655e62d8a29aee97c14741ef8baf13d5ff493f83a47"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/f229fc63-747e-46c8-89ac-88563c2e0b7d/8e59115deda958a26e1546f603cbad9a/dotnet-runtime-5.0.7-linux-x64.tar.gz"
-    ;;
-esac
-PKG_SOURCE_NAME="dotnet-runtime_${PKG_VERSION}_${ARCH}.tar.gz"