Skip to content

Commit

Permalink
Add support for tvOS and MacCatalyst
Browse files Browse the repository at this point in the history
  • Loading branch information
ektrah committed May 4, 2024
1 parent c7e4226 commit 1da503d
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 58 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions NSec.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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}
Expand All @@ -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
8 changes: 5 additions & 3 deletions src/Cryptography/NSec.Cryptography.csproj
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
3 changes: 1 addition & 2 deletions src/Experimental/NSec.Experimental.csproj
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
35 changes: 0 additions & 35 deletions src/Interop/Interop.projitems

This file was deleted.

11 changes: 0 additions & 11 deletions src/Interop/Interop.shproj

This file was deleted.

0 comments on commit 1da503d

Please sign in to comment.