From 7d2eec3603b79c81f34a6b086ab677889fe13f98 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sun, 28 Apr 2024 13:31:04 +0200
Subject: [PATCH] .NET: add ios/tvos/catalyst

---
 .github/workflows/dotnet-core.yml       | 66 ++++++++++++++-----------
 packaging/dotnet-core/libsodium.pkgproj |  6 ++-
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index dee44f42..b8004772 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -111,45 +111,36 @@ jobs:
           name: build-linux-musl-arm64
           path: zig-out/lib/libsodium.a
 
-  build-macos-x64:
+  build-apple:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
       - name: configure
-        run: env CFLAGS="-Ofast -arch x86_64 -mmacosx-version-min=10.15" LDFLAGS="-arch x86_64 -mmacosx-version-min=10.15" ./configure --host=arm-apple-darwin20 --prefix=$PWD/.libsodium-build
-      - name: make
-        run: make
-      - name: make check
-        run: make check
-      - name: make install
-        run: make install
+        run: ./configure
+      - name: build-xcframework
+        run: env LIBSODIUM_FULL_BUILD=1 LIBSODIUM_SKIP_SIMULATORS=1 dist-build/apple-xcframework.sh
       - uses: actions/upload-artifact@v3
         with:
-          name: build-osx-x64
-          path: .libsodium-build/lib/libsodium.dylib
-
-  build-macos-arm64:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: configure
-        run: env CFLAGS="-Ofast -arch arm64 -mmacosx-version-min=10.15" LDFLAGS="-arch arm64 -mmacosx-version-min=10.15" ./configure --host=arm-apple-darwin20 --prefix=$PWD/.libsodium-build
-      - name: make
-        run: make
-      - name: make install
-        run: make install
+          name: build-macos
+          path: libsodium-apple/macos/lib/libsodium.dylib
       - uses: actions/upload-artifact@v3
         with:
-          name: build-osx-arm64
-          path: .libsodium-build/lib/libsodium.dylib
-
+          name: build-ios
+          path: libsodium-apple/ios/lib/libsodium.a
+      - uses: actions/upload-artifact@v3
+        with:
+          name: build-tvos
+          path: libsodium-apple/tvos/lib/libsodium.a
+      - uses: actions/upload-artifact@v3
+        with:
+          name: build-maccatalyst
+          path: libsodium-apple/catalyst/lib/libsodium.a
   pack:
     runs-on: ubuntu-latest
     needs:
       - build-windows-msvc
+      - build-apple
       - build-others
-      - build-macos-x64
-      - build-macos-arm64
     container:
       image: mcr.microsoft.com/dotnet/sdk:6.0
     env:
@@ -170,6 +161,7 @@ jobs:
         with:
           name: build-win-arm64
           path: .libsodium-pack/runtimes/win-arm64/native/
+
       - uses: actions/download-artifact@v3
         with:
           name: build-linux-x64
@@ -194,14 +186,32 @@ jobs:
         with:
           name: build-linux-musl-arm64
           path: .libsodium-pack/runtimes/linux-musl-arm64/native/
+
       - uses: actions/download-artifact@v3
         with:
-          name: build-osx-x64
+          name: build-macos
           path: .libsodium-pack/runtimes/osx-x64/native/
       - uses: actions/download-artifact@v3
         with:
-          name: build-osx-arm64
+          name: build-macos
           path: .libsodium-pack/runtimes/osx-arm64/native/
+      - uses: actions/download-artifact@v3
+        with:
+          name: build-ios
+          path: .libsodium-pack/runtimes/ios-arm64/native/
+      - uses: actions/download-artifact@v3
+        with:
+          name: build-tvos
+          path: .libsodium-pack/runtimes/tvos-arm64/native/
+      - uses: actions/download-artifact@v3
+        with:
+          name: build-maccatalyst
+          path: .libsodium-pack/runtimes/maccatalyst-x64/native/
+      - uses: actions/download-artifact@v3
+        with:
+          name: build-maccatalyst
+          path: .libsodium-pack/runtimes/maccatalyst-arm64/native/
+
       - name: Copy files
         run: cp AUTHORS ChangeLog LICENSE packaging/dotnet-core/libsodium.pkgproj .libsodium-pack/
       - name: Create NuGet package
diff --git a/packaging/dotnet-core/libsodium.pkgproj b/packaging/dotnet-core/libsodium.pkgproj
index d11238b8..1b168d11 100644
--- a/packaging/dotnet-core/libsodium.pkgproj
+++ b/packaging/dotnet-core/libsodium.pkgproj
@@ -35,7 +35,11 @@
     <Content Include="runtimes/linux-musl-arm/native/libsodium.a" PackagePath="runtimes/linux-musl-arm/native/" />
     <Content Include="runtimes/linux-musl-arm64/native/libsodium.a" PackagePath="runtimes/linux-musl-arm64/native/" />
     <Content Include="runtimes/osx-x64/native/libsodium.dylib" PackagePath="runtimes/osx-x64/native/" />
-    <Content Include="runtimes/osx-arm64/native/libsodium.dylib" PackagePath="runtimes/osx-arm64/native/" />    
+    <Content Include="runtimes/osx-arm64/native/libsodium.dylib" PackagePath="runtimes/osx-arm64/native/" />
+    <Content Include="runtimes/ios-arm64/native/libsodium.a" PackagePath="runtimes/ios-arm64/native/" />
+    <Content Include="runtimes/tvos-arm64/native/libsodium.a" PackagePath="runtimes/tvos-arm64/native/" />
+    <Content Include="runtimes/maccatalyst-x64/native/libsodium.a" PackagePath="runtimes/maccatalyst-x64/native/" />
+    <Content Include="runtimes/maccatalyst-arm64/native/libsodium.a" PackagePath="runtimes/maccatalyst-arm64/native/" />
   </ItemGroup>
 
 </Project>