Skip to content

Commit 3f7d791

Browse files
simon-jentzschsimon-jentzsch
committed
Merge branch '265-net-ci-integration-and-windows-testing' into 'develop'
Resolve ".net CI integration and windows testing" Closes #265 See merge request in3/c/in3-core!226
2 parents c9b8dda + 738b87f commit 3f7d791

8 files changed

+111
-19
lines changed

‎dotnet/ConsoleTest/ConsoleTest.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@
99
<ProjectReference Include="..\In3\In3.csproj" />
1010
</ItemGroup>
1111

12+
<Import Project="..\In3\In3.targets" />
13+
1214
</Project>

‎dotnet/In3/In3.csproj

+23-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,35 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>netcoreapp3.1</TargetFramework>
4-
<Repository>https://github.com/slockit/in3-c</Repository>
54
<RootNamespace>csharp</RootNamespace>
65
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
6+
<Authors>slock.it</Authors>
7+
<Owners>slock.it</Owners>
8+
<Title>In3</Title>
9+
<Description>Incubed client and provider for web3. Based on in3-c runtime.</Description>
10+
<RuntimeIdentifiers>osx-x64;linux-x64;win-x64;linux-arm64</RuntimeIdentifiers>
11+
<Version Condition="'$(version)' != ''">${version}</Version>
12+
<RepositoryUrl>https://github.com/slockit/in3-c</RepositoryUrl>
13+
<RepositoryType>git</RepositoryType>
14+
<PackageId>Slockit.In3</PackageId>
15+
<PackageLicenseExpression>AGPL-3.0-or-later</PackageLicenseExpression>
16+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
17+
<PackageDocumentation>https://in3.readthedocs.io</PackageDocumentation>
18+
<PackageProjectUrl>https://in3.readthedocs.io</PackageProjectUrl>
19+
<PackageTags>In3;C;Arm;X86;X64;Macos;Windows;Linux;Blockchain;Ethereum;Bitcoin;Ipfs</PackageTags>
720
</PropertyGroup>
821
<ItemGroup>
922
<Reference Include="System.Text.Json, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
1023
<HintPath>..\..\..\..\..\..\..\usr\share\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Text.Json.dll</HintPath>
1124
</Reference>
25+
<!-- Heavily "inspired" by: https://github.com/CoreyKaylor/Lightning.NET/blob/master/src/LightningDB/LightningDB.csproj -->
26+
<None Include="runtimes\**\*.*">
27+
<Pack>true</Pack>
28+
<PackagePath>runtimes</PackagePath>
29+
</None>
30+
<None Include="In3.targets">
31+
<Pack>true</Pack>
32+
<PackagePath>build</PackagePath>
33+
</None>
1234
</ItemGroup>
1335
</Project>

‎dotnet/In3/In3.targets

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<In3TargetRuntimeRelativePath Condition=" '$(In3TargetRuntimeRelativePath)' == '' ">\..\</In3TargetRuntimeRelativePath>
5+
</PropertyGroup>
6+
<ItemGroup Condition="'$([MSBuild]::IsOsPlatform(Windows))' And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='X64'">
7+
<None Include="$(MSBuildThisFileDirectory)\runtimes\win-x64\native\libin3.dll">
8+
<Link>libin3.dll</Link>
9+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
10+
</None>
11+
</ItemGroup>
12+
<ItemGroup Condition="'$([MSBuild]::IsOsPlatform(OSX))' And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='X64'">
13+
<None Include="$(MSBuildThisFileDirectory)\runtimes\osx-x64\native\libin3.dylib">
14+
<Link>libin3.dylib</Link>
15+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
16+
</None>
17+
</ItemGroup>
18+
<ItemGroup Condition="'$([MSBuild]::IsOsPlatform(Linux))' And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='X64'">
19+
<None Include="$(MSBuildThisFileDirectory)\runtimes\linux-x64\native\libin3.so">
20+
<Link>libin3.so</Link>
21+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
22+
</None>
23+
</ItemGroup>
24+
<ItemGroup Condition="'$([MSBuild]::IsOsPlatform(Linux))' And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='Arm'">
25+
<None Include="$(MSBuildThisFileDirectory)\runtimes\linux-arm64\native\libin3.so">
26+
<Link>libin3.so</Link>
27+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
28+
</None>
29+
</ItemGroup>
30+
</Project>

‎dotnet/In3/Native/NativeConfiguration.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public static ClientConfiguration Read(IntPtr client)
1313
{
1414
IntPtr jsonPointer = in3_get_config(client);
1515
string jsonConfig = Marshal.PtrToStringUTF8(jsonPointer);
16-
Marshal.FreeHGlobal(jsonPointer);
17-
16+
NativeUtils._free_(jsonPointer);
17+
1818
ClientConfiguration clientConf = JsonSerializer.Deserialize<ClientConfiguration>(jsonConfig);
1919
clientConf.MarkSynced();
2020
return clientConf;
@@ -26,7 +26,7 @@ internal static string SetConfig(IntPtr client, string val)
2626
if (jsonPointer != IntPtr.Zero)
2727
{
2828
string error = Marshal.PtrToStringUTF8(jsonPointer);
29-
Marshal.FreeHGlobal(jsonPointer);
29+
NativeUtils._free_(jsonPointer);
3030
return error;
3131
}
3232

‎dotnet/In3/Native/NativeTransportHandler.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ enum ErrorCode : int
1717
IN3_ERPC = -11
1818
}
1919

20-
[StructLayout(LayoutKind.Sequential)] private ref struct in3_request_t
20+
[StructLayout(LayoutKind.Sequential)] private struct in3_request_t
2121
{
2222
[MarshalAs(UnmanagedType.LPStr)] public string payload;
2323
// This esoteric thing came from here: https://docs.microsoft.com/en-us/dotnet/framework/interop/default-marshaling-for-arrays
@@ -28,7 +28,7 @@ enum ErrorCode : int
2828
public IntPtr times;
2929
}
3030

31-
[UnmanagedFunctionPointer(CallingConvention.StdCall, CharSet = CharSet.Ansi)] private delegate int TransportHandler(ref in3_request_t ptr1);
31+
[UnmanagedFunctionPointer(CallingConvention.StdCall, CharSet = CharSet.Ansi)] private delegate int TransportHandler(IntPtr ptr1);
3232

3333
public NativeTransportHandler(NativeWrapper wrapper)
3434
{
@@ -58,8 +58,9 @@ public void UnregisterNativeHandler()
5858
TransportGcHandle.Free();
5959
}
6060

61-
private int HandleRequest(ref in3_request_t req)
61+
private int HandleRequest(IntPtr reqPtr)
6262
{
63+
in3_request_t req = Marshal.PtrToStructure<in3_request_t>(reqPtr);
6364
ErrorCode err = ErrorCode.IN3_OK;
6465
string[] urls = NativeUtils.GetAllStrings(req.urls, req.urls_len);
6566
for (int i = 0; i < req.urls_len; i++)

‎dotnet/In3/Native/NativeWrapper.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public NativeWrapper(IN3 in3, Chain chainId)
2525
public string Send(string jsonRpcRequest)
2626
{
2727
IntPtr res = in3_client_exec_req(NativeClientPointer, jsonRpcRequest);
28-
string str = Marshal.PtrToStringAuto(res);
28+
string str = Marshal.PtrToStringAnsi(res);
2929
NativeUtils._free_(res);
3030
return str;
3131
}
@@ -51,7 +51,7 @@ public void Free()
5151
NativeHandlers.Clear();
5252
if (NativeClientPointer != IntPtr.Zero)
5353
{
54-
in3_free(NativeClientPointer);
54+
in3_free(NativeClientPointer);
5555
}
5656
}
5757

‎dotnet/Test/Test.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10+
<PackageReference Include="JUnitTestLogger" Version="1.1.0" />
1011
<PackageReference Include="nunit" Version="3.12.0" />
1112
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
1213
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
1314
</ItemGroup>
1415

16+
<Import Project="..\In3\In3.targets" />
17+
1518
<ItemGroup>
1619
<ProjectReference Include="..\In3\In3.csproj" />
1720
</ItemGroup>

‎dotnet/ci.yml

+44-10
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
dotnet:
1010
image: docker.slock.it/build-images/dotnet-core-sdk:3.1
1111
stage: bindings
12+
extends: .only_dotnet
1213
needs:
1314
- mac_os
1415
- win_jni
@@ -17,18 +18,51 @@ dotnet:
1718
tags:
1819
- short-jobs
1920
script:
20-
- mkdir dotnet/Debug
21-
- cp mac_build/lib/libin3.dylib dotnet/Debug/libin3.x64.dylib
22-
- cp win_jni/lib/libin3.so dotnet/Debug/in3.x64.dll
23-
- cp x64_build/lib/libin3.so dotnet/Debug/libin3.x64.so
24-
- cp arm_jni_build/lib/libin3.so dotnet/Debug/libin3.arm7.so
25-
- cp -r dotnet/Debug dotnet/Release
21+
- mkdir -p dotnet/In3/runtimes/linux-x64/native
22+
- mkdir -p dotnet/In3/runtimes/linux-arm64/native
23+
- mkdir -p dotnet/In3/runtimes/osx-x64/native
24+
- mkdir -p dotnet/In3/runtimes/win-x64/native
25+
- cp mac_build/lib/libin3.dylib dotnet/In3/runtimes/osx-x64/native/libin3.dylib
26+
- cp x64_build/lib/libin3.so dotnet/In3/runtimes/linux-x64/native/libin3.so
27+
- cp win_jni/lib/libin3_jni.so dotnet/In3/runtimes/win-x64/native/libin3.dll
28+
- cp arm_jni_build/lib/libin3.so dotnet/In3/runtimes/linux-arm64/native/libin3.so
2629
- cd dotnet
27-
- dotnet build -c Debug
30+
- mkdir Release
2831
- dotnet build -c Release
29-
- cp In3/bin/Debug/netcoreapp3.1/* Debug/
30-
- cp In3/bin/Release/netcoreapp3.1/* Release/
32+
- cp -r In3/bin/Release/* Release/
3133
artifacts:
3234
paths:
33-
- dotnet/Debug
3435
- dotnet/Release
36+
- dotnet/In3/runtimes/
37+
38+
.dotnet_test:
39+
stage: dotnet
40+
needs:
41+
- dotnet
42+
script:
43+
- dotnet test --logger "junit;LogFilePath=test_results.xml" ./dotnet/
44+
artifacts:
45+
reports:
46+
junit: dotnet/Test/test_results.xml
47+
48+
dotnet_win:
49+
extends: .dotnet_test
50+
tags:
51+
- windows
52+
53+
dotnet_linux:
54+
extends: .dotnet_test
55+
image: docker.slock.it/build-images/dotnet-core-sdk:3.1
56+
tags:
57+
- short-jobs
58+
59+
dotnet_macos:
60+
extends: .dotnet_test
61+
tags:
62+
- mac-mini-runner
63+
64+
dotnet_arm:
65+
extends: .dotnet_test
66+
image: mcr.microsoft.com/dotnet/core/sdk:3.1
67+
tags:
68+
- arm

0 commit comments

Comments
 (0)