From 1da503d9fce7b8479ee4705bbdd92b77f1e5e68c Mon Sep 17 00:00:00 2001
From: ektrah <ektrah@users.noreply.github.com>
Date: Sat, 4 May 2024 15:42:41 +0200
Subject: [PATCH] Add support for tvOS and MacCatalyst

---
 .github/workflows/test.yml                |  2 ++
 NSec.sln                                  |  7 -----
 src/Cryptography/NSec.Cryptography.csproj |  8 ++++--
 src/Experimental/NSec.Experimental.csproj |  3 +-
 src/Interop/Interop.projitems             | 35 -----------------------
 src/Interop/Interop.shproj                | 11 -------
 6 files changed, 8 insertions(+), 58 deletions(-)
 delete mode 100644 src/Interop/Interop.projitems
 delete mode 100644 src/Interop/Interop.shproj

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ce853e2a..4c968a4a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,6 +9,7 @@ jobs:
     env:
       DOTNET_CLI_TELEMETRY_OPTOUT: 1
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
+      AdditionalTargetFrameworks: net8.0-ios;net8.0-tvos;net8.0-maccatalyst
     steps:
     - name: Set up .NET
       uses: actions/setup-dotnet@v4
@@ -41,6 +42,7 @@ jobs:
     env:
       DOTNET_CLI_TELEMETRY_OPTOUT: 1
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
+      AdditionalTargetFrameworks: net8.0-ios;net8.0-tvos;net8.0-maccatalyst
     steps:
     - name: Set up .NET
       uses: actions/setup-dotnet@v4
diff --git a/NSec.sln b/NSec.sln
index 90d2b87c..c0c131dd 100644
--- a/NSec.sln
+++ b/NSec.sln
@@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSec.Cryptography", "src\Cr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSec.Experimental", "src\Experimental\NSec.Experimental.csproj", "{5D5C8827-A74C-4B29-961F-CB8613C33F5C}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Interop", "src\Interop\Interop.shproj", "{F9492D32-4406-41EE-B90E-F9AE33F0F4DC}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "tests\Tests.csproj", "{97BF2648-69D2-4A17-888F-2A13E5C5CB28}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Files", "Files", "{DF40D4F3-D18D-45F3-87DD-2A8378354B57}"
@@ -113,7 +111,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{F9492D32-4406-41EE-B90E-F9AE33F0F4DC} = {D24568A9-54F1-48E0-88FF-2E067F9BDA95}
 		{99A04338-7321-4B8B-AA29-496C18328F90} = {DF40D4F3-D18D-45F3-87DD-2A8378354B57}
 		{F9D92917-A968-4F64-8F28-98B2CADE6417} = {DF40D4F3-D18D-45F3-87DD-2A8378354B57}
 		{D24568A9-54F1-48E0-88FF-2E067F9BDA95} = {DF40D4F3-D18D-45F3-87DD-2A8378354B57}
@@ -124,8 +121,4 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {ED81BE7D-A09F-4466-8138-E0F420A24568}
 	EndGlobalSection
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		src\Interop\Interop.projitems*{839872cc-6af4-456b-a55b-f82ee7b4822e}*SharedItemsImports = 5
-		src\Interop\Interop.projitems*{f9492d32-4406-41ee-b90e-f9ae33f0f4dc}*SharedItemsImports = 13
-	EndGlobalSection
 EndGlobal
diff --git a/src/Cryptography/NSec.Cryptography.csproj b/src/Cryptography/NSec.Cryptography.csproj
index f984ade5..0408b7c2 100644
--- a/src/Cryptography/NSec.Cryptography.csproj
+++ b/src/Cryptography/NSec.Cryptography.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
-    <TargetFrameworks Condition="!$([MSBuild]::IsOSUnixLike())">$(TargetFrameworks);net8.0-ios</TargetFrameworks>
+    <TargetFrameworks>net8.0;$(AdditionalTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -27,6 +26,9 @@ NSec.Cryptography.X25519</Description>
     <InternalsVisibleTo Include="NSec.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010055ed48fe0ca225f55812bdd9f1f90275582737e39480a11e88c81249392524fb11958b71efdf93239e4f9b36719fde247ec1d2f1169c8439df2595b045c08c3e4dc3dee83e11410179108e530e62c1a5c9eb6ab3d508cfa4b91f6f7958790fd0637ca9f7f75191e7d8204e7662f4995ee0caeeda1e01b2c7eab0a4d17bcc48d0" />
   </ItemGroup>
 
-  <Import Project="..\Interop\Interop.projitems" Label="Shared" />
+  <ItemGroup>
+    <Compile Include="..\Interop\*.cs" Link="Interop\%(RecursiveDir)%(Filename)%(Extension)" />
+    <None Include="..\Interop\*.yaml" Link="Interop\%(RecursiveDir)%(Filename)%(Extension)" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/Experimental/NSec.Experimental.csproj b/src/Experimental/NSec.Experimental.csproj
index c28f0d52..1f3c9fe1 100644
--- a/src/Experimental/NSec.Experimental.csproj
+++ b/src/Experimental/NSec.Experimental.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
-    <TargetFrameworks Condition="!$([MSBuild]::IsOSUnixLike())">$(TargetFrameworks);net8.0-ios</TargetFrameworks>
+    <TargetFrameworks>net8.0;$(AdditionalTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Interop/Interop.projitems b/src/Interop/Interop.projitems
deleted file mode 100644
index dad831ee..00000000
--- a/src/Interop/Interop.projitems
+++ /dev/null
@@ -1,35 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <SharedGUID>f9492d32-4406-41ee-b90e-f9ae33f0f4dc</SharedGUID>
-    <HasSharedItems>true</HasSharedItems>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.Aead.Aegis128L.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.Aead.Aegis256.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.Aead.Aes256Gcm.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.Aead.ChaCha20Poly1305.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.Aead.XChaCha20Poly1305.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.Auth.HmacSha256.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.Auth.HmacSha512.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.Core.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.GenericHash.Blake2b.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.Hash.Sha256.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.Hash.Sha512.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.Libraries.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.PublicKeyBytes.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.Pwhash.Argon2i.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.Pwhash.Argon2id.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.Pwhash.Scrypt.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.Scalarmult.X25519.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.SecretBox.XSalsa20Poly1305.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.SecureMemoryHandle.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.Sign.Ed25519.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.Stream.ChaCha20.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.Utils.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop.Version.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)Interop.yaml" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Interop/Interop.shproj b/src/Interop/Interop.shproj
deleted file mode 100644
index d3f5522c..00000000
--- a/src/Interop/Interop.shproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>f9492d32-4406-41ee-b90e-f9ae33f0f4dc</ProjectGuid>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <Import Project="Interop.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>
\ No newline at end of file