Skip to content

Commit 1fc2716

Browse files
committed
Update native lib paths to runtimes/ and clean up CI copy step
Refactor native library references in Hexa.NET.Utilities.csproj to use the standard runtimes/ directory structure for better .NET compatibility. Remove redundant manual copy step from tests.yml as native assets are now copied automatically during build.
1 parent 68f753b commit 1fc2716

2 files changed

Lines changed: 10 additions & 16 deletions

File tree

.github/workflows/tests.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ jobs:
2929

3030
- name: Build
3131
run: dotnet build
32-
33-
- name: Copy Dlls
34-
shell: bash
35-
run: |
36-
mkdir -p Hexa.NET.Utilities.Tests/bin/Debug/net8.0
37-
cp -r Hexa.NET.Utilities/runtimes Hexa.NET.Utilities.Tests/bin/Debug/net8.0/
38-
32+
3933
- name: Run tests
4034
run: dotnet test

Hexa.NET.Utilities/Hexa.NET.Utilities.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,55 +45,55 @@
4545
</ItemGroup>
4646

4747
<ItemGroup>
48-
<None Include="native\android-arm64\*.so">
48+
<None Include="runtimes\android-arm64\*.so">
4949
<Link>runtimes\android-arm64\native\%(RecursiveDir)%(Filename)%(Extension)</Link>
5050
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
5151
<PackagePath>runtimes/android-arm64/native</PackagePath>
5252
<Pack>true</Pack>
5353
</None>
54-
<None Include="native\android-x64\*.so">
54+
<None Include="runtimes\android-x64\*.so">
5555
<Link>runtimes\android-x64\native\%(RecursiveDir)%(Filename)%(Extension)</Link>
5656
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
5757
<PackagePath>runtimes/android-x64/native</PackagePath>
5858
<Pack>true</Pack>
5959
</None>
60-
<None Include="native\osx-arm64\*.dylib">
60+
<None Include="runtimes\osx-arm64\*.dylib">
6161
<Link>runtimes\osx-arm64\native\%(RecursiveDir)%(Filename)%(Extension)</Link>
6262
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6363
<PackagePath>runtimes/osx-arm64/native</PackagePath>
6464
<Pack>true</Pack>
6565
</None>
66-
<None Include="native\osx-x64\*.dylib">
66+
<None Include="runtimes\osx-x64\*.dylib">
6767
<Link>runtimes\osx-x64\native\%(RecursiveDir)%(Filename)%(Extension)</Link>
6868
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6969
<PackagePath>runtimes/osx-x64/native</PackagePath>
7070
<Pack>true</Pack>
7171
</None>
72-
<None Include="native\linux-arm64\*.so">
72+
<None Include="runtimes\linux-arm64\*.so">
7373
<Link>runtimes\linux-arm64\native\%(RecursiveDir)%(Filename)%(Extension)</Link>
7474
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
7575
<PackagePath>runtimes/linux-arm64/native</PackagePath>
7676
<Pack>true</Pack>
7777
</None>
78-
<None Include="native\linux-x64\*.so">
78+
<None Include="runtimes\linux-x64\*.so">
7979
<Link>runtimes\linux-x64\native\%(RecursiveDir)%(Filename)%(Extension)</Link>
8080
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
8181
<PackagePath>runtimes/linux-x64/native</PackagePath>
8282
<Pack>true</Pack>
8383
</None>
84-
<None Include="native\win-arm64\*.dll">
84+
<None Include="runtimes\win-arm64\*.dll">
8585
<Link>runtimes\win-arm64\native\%(RecursiveDir)%(Filename)%(Extension)</Link>
8686
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
8787
<PackagePath>runtimes/win-arm64/native</PackagePath>
8888
<Pack>true</Pack>
8989
</None>
90-
<None Include="native\win-x64\*.dll">
90+
<None Include="runtimes\win-x64\*.dll">
9191
<Link>runtimes\win-x64\native\%(RecursiveDir)%(Filename)%(Extension)</Link>
9292
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
9393
<PackagePath>runtimes/win-x64/native</PackagePath>
9494
<Pack>true</Pack>
9595
</None>
96-
<None Include="native\win-x86\*.dll">
96+
<None Include="runtimes\win-x86\*.dll">
9797
<Link>runtimes\win-x86\native\%(RecursiveDir)%(Filename)%(Extension)</Link>
9898
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
9999
<PackagePath>runtimes/win-x86/native</PackagePath>

0 commit comments

Comments
 (0)