native packaging update

AlseinX · Dec 18, 2018 · b8eeea8 · b8eeea8
1 parent 50dba66
commit b8eeea8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/build/NativeLibraryPackage.props b/build/NativeLibraryPackage.props
@@ -2,6 +2,8 @@
 
   <ItemGroup>
     <NativeLibs Include="$(MSBuildProjectDirectory)\lib\**\*.dll" />
+    <NativeLibs Include="$(MSBuildProjectDirectory)\lib\**\*.so" />
+    <NativeLibs Include="$(MSBuildProjectDirectory)\lib\**\*.so.*" />
     <Content Include="@(NativeLibs)" PackagePath="runtimes\%(RecursiveDir)native\%(FileName)%(Extension)">
     </Content>
     <Content Include="$(MSBuildThisFileDirectory)OutputNativePackage.props" PackagePath="build/$(MSBuildProjectName).props" />

diff --git a/build/OutputNativePackage.props b/build/OutputNativePackage.props
@@ -9,11 +9,15 @@
   <ItemGroup Condition=" '$(RuntimeIdentifier)' != '' ">
 
     <NativeLibs Include="$(MSBuildThisFileDirectory)../runtimes/$(RuntimeIdentifier)/native/*.dll" />
+    <NativeLibs Include="$(MSBuildThisFileDirectory)../runtimes/$(RuntimeIdentifier)/native/*.so" />
+    <NativeLibs Include="$(MSBuildThisFileDirectory)../runtimes/$(RuntimeIdentifier)/native/*.so.*" />
     <None Include="@(NativeLibs)">
-      <Link>%(FileName)%(Extension)</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>Native Libraries\%(FileName)%(Extension)</Link>
     </None>
-
+    <ContentWithTargetPath Include="@(NativeLibs)">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>%(FileName)%(Extension)</TargetPath>
+    </ContentWithTargetPath>
   </ItemGroup>
 
 </Project>