From f6497d0797dd37c841a3dcbe24e3ecb80618611e Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sun, 19 Nov 2023 07:01:28 +0000
Subject: [PATCH] dotnet-runtime: system-tools: relocate required icu shared
 files into private dotnet directory

---
 packages/addons/tools/dotnet-runtime/package.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/addons/tools/dotnet-runtime/package.mk b/packages/addons/tools/dotnet-runtime/package.mk
index 7af96313dc..9fc4856120 100644
--- a/packages/addons/tools/dotnet-runtime/package.mk
+++ b/packages/addons/tools/dotnet-runtime/package.mk
@@ -23,7 +23,9 @@ addon() {
     cp -r $(get_build_dir aspnet6-runtime)/* \
           ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
-  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
     cp -L $(get_install_dir icu)/usr/lib/lib*.so.?? \
-          ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
+          ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/shared/Microsoft.NETCore.App/$(get_pkg_version aspnet6-runtime)
+
+    sed -e "s/\"System.Reflection.Metadata.MetadataUpdater.IsSupported\": false/&,\n      \"System.Globalization.AppLocalIcu\": \"$(get_pkg_version icu | cut -f 1 -d -)\"/" \
+      -i ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/shared/Microsoft.NETCore.App/$(get_pkg_version aspnet6-runtime)/Microsoft.NETCore.App.runtimeconfig.json
 }