From 2b8dcafa8c52a77f2faedab1dd5ec692ee654b15 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 27 Apr 2024 00:50:18 +0200
Subject: [PATCH] Build for win-arm64

---
 .github/workflows/dotnet-core.yml       | 32 ++++++++++++++++++++-----
 packaging/dotnet-core/libsodium.pkgproj |  1 +
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index 913cc0ddd0..ff756a4549 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -24,6 +24,22 @@ jobs:
           name: build-win-x86
           path: bin/Win32/Release/v143/dynamic/libsodium.dll
 
+  build-windows-arm64:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Zig
+        uses: goto-bus-stop/setup-zig@2a9625d550eefc3a9b1a43d342ad655f563f8241
+        with:
+          version: 0.12.0
+      - uses: actions/checkout@v3
+      - name: build
+        run: |
+          zig build -Doptimize=ReleaseFast -Dtarget=aarch64-windows
+      - uses: actions/upload-artifact@v3
+        with:
+          name: build-windows-arm64
+          path: zig-out/lib/libsodium.dll
+
   build-linux-glibc-x64:
     runs-on: ubuntu-latest
     steps:
@@ -34,7 +50,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: build
         run: |
-          zig build -Doptimize=ReleaseFast -Dtarget=x86_64-linux-gnu.2.17 -Dcpu=baseline
+          zig build -Doptimize=ReleaseFast -Dtarget=x86_64-linux-gnu.2.17
       - name: tests
         run: cd zig-out/bin && ./run.sh
       - uses: actions/upload-artifact@v3
@@ -61,7 +77,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: build
         run: |
-          zig build -Doptimize=ReleaseFast -Dtarget=arm-linux-gnueabihf.2.23 -Dcpu=baseline
+          zig build -Doptimize=ReleaseFast -Dtarget=arm-linux-gnueabihf.2.23
       - name: tests
         run: |
           cd zig-out/bin && env LD_LIBRARY_PATH=/usr/arm-linux-gnueabihf/lib ./run.sh
@@ -89,7 +105,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: build
         run: |
-          zig build -Doptimize=ReleaseFast -Dtarget=aarch64-linux-gnu.2.23 -Dcpu=baseline
+          zig build -Doptimize=ReleaseFast -Dtarget=aarch64-linux-gnu.2.23
       - name: tests
         run: |
           cd zig-out/bin && env LD_LIBRARY_PATH=/usr/aarch64-linux-gnu/lib ./run.sh
@@ -114,7 +130,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: build
         run: |
-          zig build -Doptimize=ReleaseFast -Dtarget=x86_64-linux-musl -Dcpu=baseline
+          zig build -Doptimize=ReleaseFast -Dtarget=x86_64-linux-musl
       - name: tests
         run: |
           cd zig-out/bin && ./run.sh
@@ -133,7 +149,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: build
         run: |
-          zig build -Doptimize=ReleaseFast -Dtarget=arm-linux-musleabihf -Dcpu=baseline
+          zig build -Doptimize=ReleaseFast -Dtarget=arm-linux-musleabihf
       - uses: actions/upload-artifact@v3
         with:
           name: build-linux-musl-arm
@@ -149,7 +165,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: build
         run: |
-          zig build -Doptimize=ReleaseFast -Dtarget=aarch64-linux-musl -Dcpu=baseline
+          zig build -Doptimize=ReleaseFast -Dtarget=aarch64-linux-musl
       - uses: actions/upload-artifact@v3
         with:
           name: build-linux-musl-arm64
@@ -215,6 +231,10 @@ jobs:
         with:
           name: build-win-x86
           path: .libsodium-pack/runtimes/win-x86/native/
+      - uses: actions/download-artifact@v3
+        with:
+          name: build-win-arm64
+          path: .libsodium-pack/runtimes/win-arm64/native/
       - uses: actions/download-artifact@v3
         with:
           name: build-linux-x64
diff --git a/packaging/dotnet-core/libsodium.pkgproj b/packaging/dotnet-core/libsodium.pkgproj
index c1a0011a7f..d11238b857 100644
--- a/packaging/dotnet-core/libsodium.pkgproj
+++ b/packaging/dotnet-core/libsodium.pkgproj
@@ -27,6 +27,7 @@
     <Content Include="ChangeLog" PackagePath="" />
     <Content Include="runtimes/win-x64/native/libsodium.dll" PackagePath="runtimes/win-x64/native/" />
     <Content Include="runtimes/win-x86/native/libsodium.dll" PackagePath="runtimes/win-x86/native/" />
+    <Content Include="runtimes/win-arm64/native/libsodium.dll" PackagePath="runtimes/win-arm64/native/" />
     <Content Include="runtimes/linux-x64/native/libsodium.so" PackagePath="runtimes/linux-x64/native/" />
     <Content Include="runtimes/linux-arm/native/libsodium.so" PackagePath="runtimes/linux-arm/native/" />
     <Content Include="runtimes/linux-arm64/native/libsodium.so" PackagePath="runtimes/linux-arm64/native/" />