Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/native/native-build-ios/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ runs:

sed -i "" -e "s/||MANAGED_VERSION||/${VERSION_MANAGED}/g" -e "s/||NATIVE_VERSION||/${VERSION_NATIVE}/g" ./Native.cs

dotnet build -p:DefineConstants=IOS -p:Version="$VERSION_MANAGED" --configuration Release --output ../ios/bin
dotnet build --framework netstandard2.0 -p:DefineConstants=IOS -p:Version="$VERSION_MANAGED" --configuration Release --output ../ios/bin

- name: Fix dir structure
shell: bash
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/native/native-build-windows/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,14 @@ runs:

sed -i -e "s/||MANAGED_VERSION||/${VERSION_MANAGED}/g" -e "s/||NATIVE_VERSION||/${VERSION_NATIVE}/g" ./src/Native.cs

dotnet build ./src/devolutions-crypto.csproj -p:Version="$VERSION_MANAGED" --configuration Release --output ./dotnet-core/bin
dotnet build ./src/devolutions-crypto.csproj --framework netstandard2.0 -p:Version="$VERSION_MANAGED" --configuration Release --output ./dotnet-core/bin
dotnet build ./src/devolutions-crypto.csproj --framework net48 -p:Version="$VERSION_MANAGED" --configuration Release --output ./dotnet-framework/bin

- uses: actions/upload-artifact@v4.3.6
with:
name: native-windows
path: |
wrappers/csharp/windows/**
wrappers/csharp/dotnet-core/**
wrappers/csharp/dotnet-framework/**

1 change: 0 additions & 1 deletion .github/workflows/tests/csharp/ios/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ runs:
shell: bash
run: xcrun simctl list devices


- name: Extract UDID
shell: bash
run: |
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/tests/csharp/linux/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,6 @@ description: This tests the macOS nugets package.
runs:
using: composite
steps:
- name: Download Config
uses: actions/download-artifact@v4
with:
name: config.txt
path: ./wrappers/csharp

- uses: actions/setup-python@v5
with:
python-version: "3.7"

- name: Download Native Libs
uses: actions/download-artifact@v4
with:
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/tests/csharp/macos/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@ description: This tests the macOS nugets package.
runs:
using: composite
steps:
- name: Download Config
uses: actions/download-artifact@v4
with:
name: config.txt
path: ./wrappers/csharp

- name: Download Nugets Libs
uses: actions/download-artifact@v4
with:
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/tests/csharp/windows/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,6 @@ description: This tests the windows nuget package.
runs:
using: composite
steps:
- name: Download Config
uses: actions/download-artifact@v4
with:
name: config.txt
path: ./wrappers/csharp

- uses: actions/setup-python@v5
with:
python-version: "3.7"

- name: Download Nugets
uses: actions/download-artifact@v4
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
<file src="../../dotnet-core/bin/Devolutions.Crypto.dll" target="lib/netstandard2.0/Devolutions.Crypto.dll" />
<file src="../../dotnet-core/bin/Devolutions.Crypto.pdb" target="lib/netstandard2.0/Devolutions.Crypto.pdb" />

<!-- .Net Framework Library-->
<file src="../../dotnet-framework/bin/Devolutions.Crypto.dll" target="lib/net48/Devolutions.Crypto.dll" />
<file src="../../dotnet-framework/bin/Devolutions.Crypto.pdb" target="lib/net48/Devolutions.Crypto.pdb" />

<!-- iOS Specific Managed Library -->
<file src="../../ios/bin/Devolutions.Crypto.dll" target="runtimes/ios/lib/netstandard2.0/Devolutions.Crypto.dll" />
<file src="../../ios/bin/Devolutions.Crypto.pdb" target="runtimes/ios/lib/netstandard2.0/Devolutions.Crypto.pdb" />
Expand Down Expand Up @@ -49,9 +53,9 @@
<file src="../../android/x86_64/libDevolutionsCrypto.so" target="runtimes/android-x64/native/libDevolutionsCrypto.so"/>

<!-- Required for iOS and Android -->
<file src="Devolutions.Crypto.Core.props" target="build/Devolutions.Crypto.Core.props"/>
<file src="Devolutions.Crypto.Core.props" target="build/netstandard2.0/Devolutions.Crypto.Core.props"/>

<!-- Required for Windows (.Net Framework) -->
<file src="Devolutions.Crypto.Core.targets" target="build/Devolutions.Crypto.Core.targets"/>
<file src="Devolutions.Crypto.Core.targets" target="build/net48/Devolutions.Crypto.Core.targets"/>
</files>
</package>
10 changes: 5 additions & 5 deletions wrappers/csharp/nuget/dotnet-core/Devolutions.Crypto.Core.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,32 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- iOS-->
<ItemGroup Condition="(('$(Platform)' == 'iPhone')) or (('$(Platform)' == 'iPhoneSimulator'))">
<NativeReference Include="$(MSBuildThisFileDirectory)..\runtimes\ios\native\libDevolutionsCrypto.xcframework">
<NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\ios\native\libDevolutionsCrypto.xcframework">
<Kind>Framework</Kind>
</NativeReference>
</ItemGroup>

<!-- Android -->
<ItemGroup Condition="$(AndroidSupportedAbis.Contains('armeabi-v7a')) or $(RuntimeIdentifiers.Contains('android-arm'))">
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\runtimes\android-arm\native\libDevolutionsCrypto.so">
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-arm\native\libDevolutionsCrypto.so">
<Link>libDevolutionsCrypto.so</Link>
<Abi>armeabi-v7a</Abi>
</AndroidNativeLibrary>
</ItemGroup>
<ItemGroup Condition="$(AndroidSupportedAbis.Contains('arm64-v8a')) or $(RuntimeIdentifiers.Contains('android-arm64'))">
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\runtimes\android-arm64\native\libDevolutionsCrypto.so">
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-arm64\native\libDevolutionsCrypto.so">
<Link>libDevolutionsCrypto.so</Link>
<Abi>arm64-v8a</Abi>
</AndroidNativeLibrary>
</ItemGroup>
<ItemGroup Condition="$(AndroidSupportedAbis.Contains('x86')) or $(RuntimeIdentifiers.Contains('android-x86'))">
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\runtimes\android-x86\native\libDevolutionsCrypto.so">
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86\native\libDevolutionsCrypto.so">
<Link>libDevolutionsCrypto.so</Link>
<Abi>x86</Abi>
</AndroidNativeLibrary>
</ItemGroup>
<ItemGroup Condition="$(AndroidSupportedAbis.Contains('x86_64')) or $(RuntimeIdentifiers.Contains('android-x64'))">
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\runtimes\android-x64\native\libDevolutionsCrypto.so">
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x64\native\libDevolutionsCrypto.so">
<Link>libDevolutionsCrypto.so</Link>
<Abi>x86_64</Abi>
</AndroidNativeLibrary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Content Condition="$([MSBuild]::IsOSPlatform('Windows')) AND '$(TargetFramework.TrimEnd(`0123456789`))' == 'net'" Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\DevolutionsCrypto.dll">
<Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\DevolutionsCrypto.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>runtimes\win-x86\native\DevolutionsCrypto.dll</Link>
</Content>
<Content Condition="$([MSBuild]::IsOSPlatform('Windows')) AND '$(TargetFramework.TrimEnd(`0123456789`))' == 'net'" Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\DevolutionsCrypto.dll">
<Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\DevolutionsCrypto.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>runtimes\win-x64\native\DevolutionsCrypto.dll</Link>
</Content>
<Content Condition="$([MSBuild]::IsOSPlatform('Windows')) AND '$(TargetFramework.TrimEnd(`0123456789`))' == 'net'" Include="$(MSBuildThisFileDirectory)..\runtimes\win-arm64\native\DevolutionsCrypto.dll">
<Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64\native\DevolutionsCrypto.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>runtimes\win-arm64\native\DevolutionsCrypto.dll</Link>
</Content>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/csharp/src/Native.Core.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Xamarin and .NET Core bindings

#if ANDROID || IOS || MACOS || NETCOREAPP || NETSTANDARD
#if ANDROID || IOS || MACOS || NETCOREAPP || NETSTANDARD || NETFRAMEWORK
namespace Devolutions.Cryptography
{
using System;
Expand Down
Loading
Loading