Adjust build order so correct native obj files are packaged inside nupkg

CCob · Sep 1, 2021 · 0ee08b6 · 0ee08b6
1 parent 6ecb03b
commit 0ee08b6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -8,8 +8,13 @@ docker-build:
         - mkdir build
         - cd build
         - cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../toolchain/Linux-mingw64.cmake ..
-        - cmake --build .
-        - cmake --install .  
+        - cmake --build --target bofs_x64 .
+        - cmake --build --target bofs_x86 .
+        - cd bofs
+        - make install
+        - cd ..
+        - cmake --build --target bofnet_managed
+        - cmake --install .
     artifacts:
         paths:
             - build/dist    

diff --git a/managed/BOFNET/BOFNET.csproj b/managed/BOFNET/BOFNET.csproj
@@ -64,7 +64,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="../../build/dist/net20/*.cna">
+    <Content Include="../../*.cna">
       <PackagePath>lib/$(TargetFramework)</PackagePath>
       <IncludeInPackage>true</IncludeInPackage>
       <CopyToOutput>true</CopyToOutput>