Skip to content

Commit 0ee08b6

Browse files
committed
Adjust build order so correct native obj files are packaged inside nupkg
1 parent 6ecb03b commit 0ee08b6

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.gitlab-ci.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@ docker-build:
88
- mkdir build
99
- cd build
1010
- cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../toolchain/Linux-mingw64.cmake ..
11-
- cmake --build .
12-
- cmake --install .
11+
- cmake --build --target bofs_x64 .
12+
- cmake --build --target bofs_x86 .
13+
- cd bofs
14+
- make install
15+
- cd ..
16+
- cmake --build --target bofnet_managed
17+
- cmake --install .
1318
artifacts:
1419
paths:
1520
- build/dist

managed/BOFNET/BOFNET.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</ItemGroup>
6565

6666
<ItemGroup>
67-
<Content Include="../../build/dist/net20/*.cna">
67+
<Content Include="../../*.cna">
6868
<PackagePath>lib/$(TargetFramework)</PackagePath>
6969
<IncludeInPackage>true</IncludeInPackage>
7070
<CopyToOutput>true</CopyToOutput>

0 commit comments

Comments
 (0)