From 737709d1f5d8fa57d2f94c926af611330e3d045d Mon Sep 17 00:00:00 2001
From: Antoine Martin <dev@ayakael.net>
Date: Mon, 27 Nov 2023 10:40:44 -0500
Subject: [PATCH] user/dotnet8-sdk: upgrade to 8.0.100

---
 user/dotnet8-sdk/APKBUILD  | 12 ++++++------
 user/dotnet8-sdk/README.md | 23 +++++++++++++----------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/user/dotnet8-sdk/APKBUILD b/user/dotnet8-sdk/APKBUILD
index 13d6e0e..c832da8 100644
--- a/user/dotnet8-sdk/APKBUILD
+++ b/user/dotnet8-sdk/APKBUILD
@@ -2,9 +2,9 @@
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 
 pkgname=dotnet8-sdk
-pkgver=8.0.100_pre7
-_bldver=8.0.0_pre7-r2
-pkgrel=2
+pkgver=8.0.100
+_bldver=8.0.0-r0
+pkgrel=0
 
 # Following for dotnet build version 6.0 and up
 _pkgver_macro=${pkgver%.*}
@@ -14,8 +14,9 @@ _bldver_ver=${_bldver_ver/0./0.10}
 pkgdesc="The .NET $_pkgver_macro SDK"
 # x86: blocked by https://github.com/dotnet/runtime/issues/77667
 # armhf: blocked by https://github.com/dotnet/runtime/issues/77663
-# upgrade needed
-#arch="all !x86 !armhf"
+# riscv64: blocked by https://github.com/dotnet/runtime/issues/84834
+# s390x | ppc64le: mono-based runtime still has issues on musl
+arch="all !x86 !armhf !riscv64 !s390x !ppc64le"
 url=https://dotnet.microsoft.com
 license="MIT"
 makedepends="dotnet$_pkgver_name-runtime-bootstrap=$_bldver"
@@ -119,7 +120,6 @@ doc() {
 	default_doc
 	pkgdesc="Docs for .NET"
 
-
 	# licenses
 	install -dm 755 "$subpkgdir"/usr/share/licenses/dotnet
 	cp -r $_libdir/dotnet/bootstrap/$_bldver_ver/LICENSE.txt "$subpkgdir"/usr/share/licenses/dotnet/.
diff --git a/user/dotnet8-sdk/README.md b/user/dotnet8-sdk/README.md
index 1a55eda..26d3107 100644
--- a/user/dotnet8-sdk/README.md
+++ b/user/dotnet8-sdk/README.md
@@ -7,8 +7,6 @@ Please report any issues [using Gitlab](https://gitlab.alpinelinux.org/alpine/ap
 # Building info
 
 ## Generated packages
-* `dotnet8-build` (aimed for internal use as bootstrap)
-* `dotnet8-build-artifacts` (aimed for internal use as bootstrap)
 * `dotnet8-sdk`
 * `dotnet8-templates` (required by sdk)
 * `dotnet-zsh-completion`
@@ -31,13 +29,18 @@ In summary, dotnet8 is built using three different aports.
 
 * `community/dotnet8-stage0`
 Builds minimum components for full build of dotnet8, and packages these in an initial 
-`dotnet8-stage0-bootstrap` package that `dotnet8-build` pulls.
-* `community/dotnet8-build`
+`dotnet8-stage0-bootstrap` package that `dotnet8-runtime` pulls.
+* `community/dotnet8-runtime
 Builds full and packages dotnet8 fully using either stage0 or previoulsy built
 dotnet8 build.
-* `community/dotnet8-runtime`
+* `community/dotnet8-sdk`
 As abuild does not allow different versions for subpackages, a different aport
-is required to package runtime bits from dotnet8-build.
+is required to package runtime bits from dotnet8-runtime. dotnet8-runtime only
+builds 8.0.1xx feature branch of SDK. Thus, when a new feature branch of sdk is
+released, the updated components are to be built on dotnet8-sdk rather than
+simply repackaging dotnet8-runtime artifacts.
+
+
 
 ## Crossbuilding with `stage0`
 Crossbuilding `stage0` is a three step process:
@@ -74,7 +77,7 @@ follow.
 2. Checkout the forked repository.
 
     - `git clone ssh://git@gitlab.alpinelinux.org/$USER/aports`
-    - `cd community/dotnet8-build`
+    - `cd community/dotnet8-sdk`
 
 3. Make your changes. Don't forget to add a changelog.
 
@@ -89,7 +92,7 @@ follow.
     - `git checkout -b dotnet8/<name>`
     - `git add` any new patches
     - `git remove` any now-unnecessary patches
-    - `git commit -m 'community/dotnet8-build: descriptive description'`
+    - `git commit -m 'community/dotnet8-sdk: descriptive description'`
     - `git push`
 
 7. Create a merge request with your changes, tagging @ayakael for review.
@@ -104,7 +107,7 @@ follow.
 2. Checkout the forked repository.
 
     - `git clone ssh://git@gitlab.alpinelinux.org/$USER/aports`
-    - `cd community/dotnet8-build`
+    - `cd community/dotnet8-sdk`
 
 
 3. Build the new upstream source tarball. Update the versions in the
@@ -128,7 +131,7 @@ follow.
     - `git checkout -b dotnet8/<name>`	
     - `git add` any new patches
     - `git remove` any now-unnecessary patches
-    - `git commit -m 'community/dotnet8-build: upgrade to <new-version>`
+    - `git commit -m 'community/dotnet8-sdk: upgrade to <new-version>`
     - `git push`
 
 8. Create a merge request with your changes, tagging @ayakael for review.