From b8eeea8af67f6acb1d46ec29e89ce19318d75625 Mon Sep 17 00:00:00 2001
From: AlseinX <xyh951115@live.com>
Date: Tue, 18 Dec 2018 11:18:44 +1100
Subject: [PATCH] native packaging update

---
 build/NativeLibraryPackage.props |  2 ++
 build/OutputNativePackage.props  | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/build/NativeLibraryPackage.props b/build/NativeLibraryPackage.props
index 2034a8a..a58cfa5 100644
--- 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
index cb7d789..a54f9b0 100644
--- 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>
\ No newline at end of file