From 9a1d18d45a2e44d22bbf60c4eb1b6534cdd76d26 Mon Sep 17 00:00:00 2001
From: Antoine Martin <dev@ayakael.net>
Date: Sat, 9 Sep 2023 11:59:23 -0400
Subject: [PATCH] community/dotnet6-build: test aspnetcore fix

---
 community/dotnet6-build/APKBUILD              | 12 +-----
 .../dotnet6-build/build_fix-aspnetcore.patch  | 37 +++++++++++++++++++
 2 files changed, 39 insertions(+), 10 deletions(-)
 create mode 100644 community/dotnet6-build/build_fix-aspnetcore.patch

diff --git a/community/dotnet6-build/APKBUILD b/community/dotnet6-build/APKBUILD
index ed35884..9b2a75b 100644
--- a/community/dotnet6-build/APKBUILD
+++ b/community/dotnet6-build/APKBUILD
@@ -44,12 +44,8 @@ _giturl="https://github.com/dotnet/installer"
 _testtag=e1cc0f181ffd4d755756d30d985513897d592ba4
 _bunnytag=71880bd94711519f7b786248a88a827a401207a2
 _patches="
-	build_14816-non-portable-build.patch
-	build_14816-stop-overriding-aspnetcore-version.patch
-	build_14816-update-portable-rid-logic.patch
 	build_disable-apphost.diff
-	installer_14816-crossgen2-rid.patch
-	installer_14816-update-portable-rid-logic.patch
+	build_fix-aspnetcore.patch
 	msbuild_optional-systemconfiguration.patch
 	msbuild_optional-systemsecurity.patch
 	roslyn_57003-mono-namedmutex.patch
@@ -553,12 +549,8 @@ sha512sums="
 f038ff9707a102cc07032a32547dd4b0bae9bbe357cfafd769030ad625fbcd86bb9396db543309e625bad2af1f0e183f0288d6bd3ef47f803d203a11e03524e2  dotnet-v6.0.121-source-build.tar.xz
 e9f3df13d093fac214778c1137857e065f58d4e0d2a48d540d8ed7bb41e2fd73b2b3f62a0aa5b0e80fa80a5b58ba77ff19b9d10a492802f8539e3a6ed79d299d  dotnet-testsuite-e1cc0f181ffd4d755756d30d985513897d592ba4.tar.gz
 fc281df5fcf0d31dc9ff7f5b0e870960cfbe3c4fa0f6a6bb50b22c4ee18d2c608c827205bc79bd7f686d77ac917582fc26f68432cdd86c4a33b910c0c7416d09  dotnet-bunny-71880bd94711519f7b786248a88a827a401207a2.tar.gz
-bdbe798add3ded0c2cf361c9f5aa18fb3540e348e68a5695cbdb797be917f06d1bda69855cae2f36950e9506119e81165927787e13b80a17a1b647ef2c221916  build_14816-non-portable-build.patch
-3e04fff2d9d9b39ac4dce0b80f4b566fff8819313a5bf1df791e8f1a63a26ef882bd8aa1524344f63fbb4a3728077179b7f1d7ebefc003c236d39a48beaa0073  build_14816-stop-overriding-aspnetcore-version.patch
-70d402d0bcaa98c8b09652365404238b67ed26eb9c3d510c7d6309fb61937d98c9144f1096e521c11b00e946d29585a9d474498ccc5223de32bd6471ab5a431f  build_14816-update-portable-rid-logic.patch
 a5a359af816595fbf19482e5dccf874c78d2fc4b59f38223118aac603b33e00c9fed22580eee3112519477205c2c8ed16177d100f09f45275e3da3c20b0ed7f7  build_disable-apphost.diff
-7ffda90d766217e7c3756ebd423b557218c24f5337668b319421514945d3f961d82037c997b7254de088b1853102d7de15e0d824cf2cc02a6c455efc2b0107a2  installer_14816-crossgen2-rid.patch
-e71f91d14873755bc2f227807d909e5260bd1f166a262eda0bf05d4a3975a7bce7fde457c1eba476a83b317aebdaaba25f1893d3385182428c08bba6243f21c8  installer_14816-update-portable-rid-logic.patch
+2d0f6f9c276b8f353436b5cb9c7a2c0e602c084b6cb4d1415507c3c0ad60de062514157de91879e7611d5c6d83222790881c714e2032ade48c5ec5734658ff20  build_fix-aspnetcore.patch
 86e14ecc0269c8b2c2a2a679790de4fa4e15ac06b2a831e1129c4a7de1499d60583fcdc79b3705652c3c4ced73afac2e0ee3edce2cfa3b00fddf94180fb26e10  msbuild_optional-systemconfiguration.patch
 f4d27624f735ce77e0030fa791594fc12fb325a3ce8620791a7856bd5c0067a042df2196ec97ed4d0309db64bd51e6a48cafaad316d9ea45e34134214a7f3ca4  msbuild_optional-systemsecurity.patch
 42779a7bf1004fe0f7054cfa4f09f49d7f2a57c0543ec994ffbd54fb349abb508295476098ed35d60e9676be8bcc15aa8a9ec5c814cd1e058357530b5cdfb2b6  roslyn_57003-mono-namedmutex.patch
diff --git a/community/dotnet6-build/build_fix-aspnetcore.patch b/community/dotnet6-build/build_fix-aspnetcore.patch
new file mode 100644
index 0000000..3240fdd
--- /dev/null
+++ b/community/dotnet6-build/build_fix-aspnetcore.patch
@@ -0,0 +1,37 @@
+diff --git a/repos/aspnetcore.proj.orig b/repos/aspnetcore.proj
+index 480f3c7..9b25187 100644
+--- a/repos/aspnetcore.proj.orig
++++ b/repos/aspnetcore.proj
+@@ -7,6 +7,7 @@
+     <!-- The arch flag (defaults to x64) overrides any value of TargetArchitecture that we might set -->
+     <BuildCommandArgs>$(BuildCommandArgs) --arch $(Platform)</BuildCommandArgs>
+     <BuildCommandArgs>$(BuildCommandArgs) --no-build-repo-tasks</BuildCommandArgs>
++    <BuildCommandArgs Condition="$(PortableRid.StartsWith('linux-musl')>$(BuildCommandArgs) --os-name linux-musi</BuildCommandArgs>
+     <BuildCommandArgs>$(BuildCommandArgs) /p:BuildNodeJs=false</BuildCommandArgs>
+     <BuildCommandArgs>$(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime)</BuildCommandArgs>
+     <!-- Update to 1.0.0 version of reference assemblies which are built in SBRP instead of the preview.2 version
+diff --git a/repos/installer.proj.orig b/repos/installer.proj
+index e34337b..9b42de3 100644
+--- a/repos/installer.proj.orig
++++ b/repos/installer.proj
+@@ -25,7 +25,7 @@
+     <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:Rid=$(TargetRid)</BuildCommandArgs>
+     <BuildCommandArgs>$(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir)</BuildCommandArgs>
+ 
+-    <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreInstallerRid=linux-$(Platform)</BuildCommandArgs>
++    <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreInstallerRid=$(PortableRid)</BuildCommandArgs>
+     <!-- core-sdk always wants to build portable on OSX and FreeBSD -->
+     <BuildCommandArgs Condition="'$(TargetOS)' == 'FreeBSD'">$(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true</BuildCommandArgs>
+     <BuildCommandArgs Condition="'$(TargetOS)' == 'OSX'">$(BuildCommandArgs) /p:CoreSetupRid=osx-x64</BuildCommandArgs>
+diff --git a/Directory.Build.props.orig b/Directory.Build.props
+index 797e54f..8be93da 100644
+--- a/Directory.Build.props.orig
++++ b/Directory.Build.props
+@@ -181,6 +181,7 @@
+     <PortableRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-$(Platform)</PortableRid>
+     <PortableRid Condition="'$(TargetOS)' == 'OSX'">osx-$(Platform)</PortableRid>
+     <PortableRid Condition="'$(TargetOS)' == 'Linux'">linux-$(Platform)</PortableRid>
++    <PortableRid Condition="$(TargetRid.StartsWith('linux-musl')) or $(TargetRid.StartsWith('alpine'))">linux-musl-$(Platform)</PortableRid>
+     <PortableRid Condition="'$(TargetOS)' == 'Windows_NT'">win-$(Platform)</PortableRid>
+     <TargetRid Condition="'$(PortableBuild)' == 'true' AND '$(PortableRid)' != ''">$(PortableRid)</TargetRid>
+   </PropertyGroup>
-- 
2.45.2