Add support for iOS, tvOS, and MacCatalyst

ektrah · May 4, 2024 · 4a3bc4b · 4a3bc4b
1 parent fc777a5
commit 4a3bc4b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,6 +5,7 @@ on: [push, pull_request]
 jobs:
 
   test-win:
+    needs: test-linux-musl
     runs-on: windows-latest
     env:
       DOTNET_CLI_TELEMETRY_OPTOUT: 1
@@ -15,6 +16,8 @@ jobs:
       with:
         dotnet-version: |
           8.0.x
+    - name: Install workloads
+      run: dotnet workload install ios tvos maccatalyst
     - run: dotnet --info
     - uses: actions/checkout@v4
     - name: Test (.NET 8.0/Debug)
@@ -29,7 +32,7 @@ jobs:
         path: '**/*.nupkg'
 
   test-macos:
-    needs: [test-win, test-linux-musl]
+    needs: test-win
     strategy:
       fail-fast: false
       matrix:
@@ -55,7 +58,7 @@ jobs:
       run: dotnet test tests -f net8.0 -c Release
 
   test-linux:
-    needs: [test-win, test-linux-musl]
+    needs: test-macos
     strategy:
       fail-fast: false
       matrix:

diff --git a/src/Cryptography/NSec.Cryptography.csproj b/src/Cryptography/NSec.Cryptography.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(RUNNER_OS)'=='Windows'">net8.0;net8.0-ios;net8.0-tvos;net8.0-maccatalyst</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/Experimental/NSec.Experimental.csproj b/src/Experimental/NSec.Experimental.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(RUNNER_OS)'=='Windows'">net8.0;net8.0-ios;net8.0-tvos;net8.0-maccatalyst</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/Interop/Interop.Libraries.cs b/src/Interop/Interop.Libraries.cs
@@ -2,6 +2,10 @@ internal static partial class Interop
 {
     private static class Libraries
     {
+#if IOS || TVOS || MACCATALYST
+        internal const string Libsodium = "__Internal";
+#else
         internal const string Libsodium = "libsodium";
+#endif
     }
 }