From f32334f2f6044aa1bb61cc4fa4fc2788db96774f Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sat, 15 Oct 2022 05:09:05 +0000
Subject: [PATCH 1/2] 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 adf5b903544a6ebeeb2ed9665cdd28d4da8d0a1d Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sat, 15 Oct 2022 05:07:00 +0000
Subject: [PATCH 2/2] dotnet-runtime: Drop ASP.NET Core Runtime 3.1 and addon
 (124)

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

diff --git a/packages/addons/tools/dotnet-runtime/changelog.txt b/packages/addons/tools/dotnet-runtime/changelog.txt
index 6979cbe8d1..c800d71299 100644
--- a/packages/addons/tools/dotnet-runtime/changelog.txt
+++ b/packages/addons/tools/dotnet-runtime/changelog.txt
@@ -1,3 +1,9 @@
+124
+- Drop ASP.NET Core Runtime 3.1
+  .NET Core 3.1 is End of Support - 2022-12-13
+  Current addons using .NET (Emby4, Jellyfin, NextPVR)
+    are now all using .NET 6.0
+
 123
 - Update ASP.NET Core Runtime 6.0.10
 
diff --git a/packages/addons/tools/dotnet-runtime/package.mk b/packages/addons/tools/dotnet-runtime/package.mk
index 988545e8c2..4cbe4166c3 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="123"
+PKG_REV="124"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://dotnet.microsoft.com/"
-PKG_DEPENDS_TARGET="toolchain icu aspnet6-runtime dotnet3-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)) and ($(get_pkg_version aspnet6-runtime)) enables you to run existing console/web/server applications."
+PKG_LONGDESC="ASP.NET Core Runtime ($(get_pkg_version aspnet6-runtime)) enables you to run existing console/web/server applications."
 PKG_TOOLCHAIN="manual"
 
 PKG_IS_ADDON="yes"
@@ -20,8 +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 aspnet6-runtime)/* \
           ${ADDON_BUILD}/${PKG_ADDON_ID}/bin