From ceb1e2ce2d799662292974e64d70c38890466ee1 Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Sun, 2 Jan 2022 03:47:52 +0000
Subject: [PATCH 1/5] dotnet5-runtime: drop package

---
 .../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"

From 8eac90fb39af2d58610a37895f1a875fcfef17d9 Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Sun, 2 Jan 2022 03:46:47 +0000
Subject: [PATCH 2/5] aspnet5-runtime: drop package

---
 .../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 f490c1da8d2a8d67c85b04393499492ba05970a3 Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Sun, 2 Jan 2022 02:42:58 +0000
Subject: [PATCH 3/5] dotnet6-runtime: initial addon

---
 .../dotnet6-runtime/package.mk                | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 packages/addons/addon-depends/dotnet-runtime-depends/dotnet6-runtime/package.mk

diff --git a/packages/addons/addon-depends/dotnet-runtime-depends/dotnet6-runtime/package.mk b/packages/addons/addon-depends/dotnet-runtime-depends/dotnet6-runtime/package.mk
new file mode 100644
index 0000000000..3155e830fc
--- /dev/null
+++ b/packages/addons/addon-depends/dotnet-runtime-depends/dotnet6-runtime/package.mk
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="dotnet6-runtime"
+PKG_VERSION="6.0.1"
+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="193df0b397d3b154ced255098fdabd017ea8faac00f77485cc1a9fdab7407e4a"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/002742a9-8107-4434-a208-863f07e09397/75884224d828a34b7c5f070df5213553/dotnet-runtime-6.0.1-linux-arm64.tar.gz"
+    ;;
+  "arm")
+    PKG_SHA256="3aa29dc8f9ada9f61a2b2d77fe385b8ef15e15b8f83d4696ed711f66b02e8df7"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/bdea32df-7ab8-47f5-8f8c-3de28d5771d0/c839293beeace695b6698debaedd345e/dotnet-runtime-6.0.1-linux-arm.tar.gz"
+    ;;
+  "x86_64")
+    PKG_SHA256="f77369477ee8c98402793a2b6ce1f46d663fd0373a93a4cef50eb22d8607773c"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/be8a513c-f3bb-4fbd-b382-6596cf0d67b5/968e205c44eabd205b8ea98be250b880/dotnet-runtime-6.0.1-linux-x64.tar.gz"
+    ;;
+esac
+PKG_SOURCE_NAME="dotnet-runtime_${PKG_VERSION}_${ARCH}.tar.gz"

From 95e1b5e4353df6bf759ac7a1d3fa7a4ceb2ea172 Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Sun, 2 Jan 2022 02:40:56 +0000
Subject: [PATCH 4/5] dotnet-runtime: Drop ASP.NET 5.x and Add ASP.NET 6.x and
 addon (115)

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

diff --git a/packages/addons/tools/dotnet-runtime/changelog.txt b/packages/addons/tools/dotnet-runtime/changelog.txt
index 4bed217e70..4c58441811 100644
--- a/packages/addons/tools/dotnet-runtime/changelog.txt
+++ b/packages/addons/tools/dotnet-runtime/changelog.txt
@@ -1,3 +1,9 @@
+115
+- Add .NET Runtime 6.0.1
+- Add ASP.NET Core Runtime 6.0.1
+- Drop .NET Runtime 5.0.7
+- Drop ASP.NET Core Runtime 5.0.7
+
 114
 - Add .NET Runtime 5.0.7
 - Add ASP.NET Core Runtime 5.0.7
diff --git a/packages/addons/tools/dotnet-runtime/package.mk b/packages/addons/tools/dotnet-runtime/package.mk
index 6521c9098c..f12d1a1f57 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="114"
+PKG_REV="115"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://dotnet.microsoft.com/"
-PKG_DEPENDS_TARGET="toolchain icu aspnet5-runtime dotnet3-runtime dotnet5-runtime icu"
+PKG_DEPENDS_TARGET="toolchain icu aspnet6-runtime dotnet3-runtime dotnet6-runtime icu"
 PKG_SECTION="tools"
 PKG_SHORTDESC="ASP.NET Core Runtime"
-PKG_LONGDESC="ASP.NET Core Runtimes ($(get_pkg_version dotnet3-runtime)) and ($(get_pkg_version dotnet5-runtime)) enables you to run existing console/web/server applications."
+PKG_LONGDESC="ASP.NET Core Runtimes ($(get_pkg_version dotnet3-runtime)) and ($(get_pkg_version dotnet6-runtime)) enables you to run existing console/web/server applications."
 PKG_TOOLCHAIN="manual"
 
 PKG_IS_ADDON="yes"
@@ -22,9 +22,9 @@ 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)/* \
+    cp -r $(get_build_dir dotnet6-runtime)/* \
           ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
-    cp -r $(get_build_dir aspnet5-runtime)/* \
+    cp -r $(get_build_dir aspnet6-runtime)/* \
           ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
   mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib

From 2f2a407c1e079e3708e64bbe180496356f7dd083 Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Sun, 2 Jan 2022 02:43:59 +0000
Subject: [PATCH 5/5] aspnet6-runtime: initial addon

---
 .../aspnet6-runtime/package.mk                | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk

diff --git a/packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk b/packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk
new file mode 100644
index 0000000000..5978aa6373
--- /dev/null
+++ b/packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="aspnet6-runtime"
+PKG_VERSION="6.0.1"
+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="0806f4be544c67b12fe236c7b7bc99e49194a172caa1b340619114fab80e633f"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/01f8a4af-9d6c-40ff-b834-a1d73105a9d5/aba0525a8b8cb745ac70ecd671acf0e0/aspnetcore-runtime-6.0.1-linux-arm64.tar.gz"
+    ;;
+  "arm")
+    PKG_SHA256="eef8e3c5a65c67d17d2d7da7382044b8f0a48c05d61e8d9e1d7bc4f77e0c7a9f"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/ff3b2714-0dee-4cf9-94ee-cb9f5ded285f/d6bfe8668428f9eb28acdf6b6f5a81bc/aspnetcore-runtime-6.0.1-linux-arm.tar.gz"
+    ;;
+  "x86_64")
+    PKG_SHA256="ae7dce00eec4bc5431faacc574193b1a920d8a7e92abc4bec6288c20a8a507f6"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/32230fb9-df1e-4b86-b009-12d889cbfa8a/f57a5d92327bb2936caac94bcf602c22/aspnetcore-runtime-6.0.1-linux-x64.tar.gz"
+    ;;
+esac
+PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz"