From ee57c26d770ef35c9ff260f5ecaacf76180dc6d5 Mon Sep 17 00:00:00 2001
From: cra0zy <cra0zy@gmail.com>
Date: Thu, 9 Nov 2017 22:22:51 +0100
Subject: [PATCH] Improve native lib referencing

---
 CakeScripts/GAssembly.cs                 | 14 +++++++++++---
 Source/Libs/AtkSharp/AtkSharp.csproj     |  6 +++---
 Source/Libs/CairoSharp/CairoSharp.csproj |  6 +++---
 Source/Libs/GLibSharp/GLibSharp.csproj   | 12 +++---------
 Source/Libs/GdkSharp/GdkSharp.csproj     |  9 +++------
 Source/Libs/GioSharp/GioSharp.csproj     |  6 +++---
 Source/Libs/GtkSharp/GtkSharp.csproj     |  6 +++---
 Source/Libs/PangoSharp/PangoSharp.csproj |  6 +++---
 8 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/CakeScripts/GAssembly.cs b/CakeScripts/GAssembly.cs
index 15bdd58b9..edb009e68 100755
--- a/CakeScripts/GAssembly.cs
+++ b/CakeScripts/GAssembly.cs
@@ -85,10 +85,18 @@ public class GAssembly
     {
         var basedir = P.Combine("..", "..", Dir);
 
-        Cake.DeleteDirectory(P.Combine(basedir, "linux-x86"), new DeleteDirectorySettings { Recursive = true, Force = true });
-        Cake.DeleteDirectory(P.Combine(basedir, "linux-x64"), new DeleteDirectorySettings { Recursive = true, Force = true });
-        Cake.DeleteDirectory(P.Combine(basedir, "linux-arm"), new DeleteDirectorySettings { Recursive = true, Force = true });
+        if (Cake.DirectoryExists(P.Combine(basedir, "linux-x86")))
+            Cake.DeleteDirectory(P.Combine(basedir, "linux-x86"), new DeleteDirectorySettings { Recursive = true, Force = true });
+        Cake.CreateDirectory(P.Combine(basedir, "linux-x86"));
 
+        if (Cake.DirectoryExists(P.Combine(basedir, "linux-x64")))
+            Cake.DeleteDirectory(P.Combine(basedir, "linux-x64"), new DeleteDirectorySettings { Recursive = true, Force = true });
+        Cake.CreateDirectory(P.Combine(basedir, "linux-x64"));
+
+        if (Cake.DirectoryExists(P.Combine(basedir, "linux-arm")))
+            Cake.DeleteDirectory(P.Combine(basedir, "linux-arm"), new DeleteDirectorySettings { Recursive = true, Force = true });
+        Cake.CreateDirectory(P.Combine(basedir, "linux-arm"));
+        
         for (int i = 0; i < NativeDeps.Length; i += 2)
         {
             // Generate x86 stubs
diff --git a/Source/Libs/AtkSharp/AtkSharp.csproj b/Source/Libs/AtkSharp/AtkSharp.csproj
index e4f24eab3..5ef2dfa81 100755
--- a/Source/Libs/AtkSharp/AtkSharp.csproj
+++ b/Source/Libs/AtkSharp/AtkSharp.csproj
@@ -20,8 +20,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="linux-x86\libatk-1.0-0.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x64\libatk-1.0-0.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-arm\libatk-1.0-0.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
+    <Content Include="linux-x86\*" PackagePath="runtimes\linux-x86\native" Visible="false" />
+    <Content Include="linux-x64\*" PackagePath="runtimes\linux-x64\native" Visible="false" />
+    <Content Include="linux-arm\*" PackagePath="runtimes\linux-arm\native" Visible="false" />
   </ItemGroup>
 </Project>
diff --git a/Source/Libs/CairoSharp/CairoSharp.csproj b/Source/Libs/CairoSharp/CairoSharp.csproj
index c77367612..5164687d5 100755
--- a/Source/Libs/CairoSharp/CairoSharp.csproj
+++ b/Source/Libs/CairoSharp/CairoSharp.csproj
@@ -15,8 +15,8 @@
     <OutputPath>..\..\..\BuildOutput\Release</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Content Include="linux-x86\libcairo-2.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x64\libcairo-2.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-arm\libcairo-2.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
+    <Content Include="linux-x86\*" PackagePath="runtimes\linux-x86\native" Visible="false" />
+    <Content Include="linux-x64\*" PackagePath="runtimes\linux-x64\native" Visible="false" />
+    <Content Include="linux-arm\*" PackagePath="runtimes\linux-arm\native" Visible="false" />
   </ItemGroup>
 </Project>
diff --git a/Source/Libs/GLibSharp/GLibSharp.csproj b/Source/Libs/GLibSharp/GLibSharp.csproj
index e2767e053..1e24b3ce5 100755
--- a/Source/Libs/GLibSharp/GLibSharp.csproj
+++ b/Source/Libs/GLibSharp/GLibSharp.csproj
@@ -15,14 +15,8 @@
     <OutputPath>..\..\..\BuildOutput\Release</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Content Include="linux-x86\libglib-2.0-0.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x86\libgobject-2.0-0.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x86\libgthread-2.0-0.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x64\libglib-2.0-0.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-x64\libgobject-2.0-0.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-x64\libgthread-2.0-0.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-arm\libglib-2.0-0.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
-    <Content Include="linux-arm\libgobject-2.0-0.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
-    <Content Include="linux-arm\libgthread-2.0-0.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
+    <Content Include="linux-x86\*" PackagePath="runtimes\linux-x86\native" Visible="false" />
+    <Content Include="linux-x64\*" PackagePath="runtimes\linux-x64\native" Visible="false" />
+    <Content Include="linux-arm\*" PackagePath="runtimes\linux-arm\native" Visible="false" />
   </ItemGroup>
 </Project>
diff --git a/Source/Libs/GdkSharp/GdkSharp.csproj b/Source/Libs/GdkSharp/GdkSharp.csproj
index 7c916a8c5..2574dda3e 100755
--- a/Source/Libs/GdkSharp/GdkSharp.csproj
+++ b/Source/Libs/GdkSharp/GdkSharp.csproj
@@ -29,11 +29,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="linux-x86\libgdk_pixbuf-2.0-0.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x86\libgdk-3-0.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x64\libgdk_pixbuf-2.0-0.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-x64\libgdk-3-0.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-arm\libgdk_pixbuf-2.0-0.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
-    <Content Include="linux-arm\libgdk-3-0.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
+    <Content Include="linux-x86\*" PackagePath="runtimes\linux-x86\native" Visible="false" />
+    <Content Include="linux-x64\*" PackagePath="runtimes\linux-x64\native" Visible="false" />
+    <Content Include="linux-arm\*" PackagePath="runtimes\linux-arm\native" Visible="false" />
   </ItemGroup>
 </Project>
diff --git a/Source/Libs/GioSharp/GioSharp.csproj b/Source/Libs/GioSharp/GioSharp.csproj
index 1757be2d3..3871215f6 100755
--- a/Source/Libs/GioSharp/GioSharp.csproj
+++ b/Source/Libs/GioSharp/GioSharp.csproj
@@ -20,8 +20,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="linux-x86\libgio-2.0-0.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x64\libgio-2.0-0.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-arm\libgio-2.0-0.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
+    <Content Include="linux-x86\*" PackagePath="runtimes\linux-x86\native" Visible="false" />
+    <Content Include="linux-x64\*" PackagePath="runtimes\linux-x64\native" Visible="false" />
+    <Content Include="linux-arm\*" PackagePath="runtimes\linux-arm\native" Visible="false" />
   </ItemGroup>
 </Project>
diff --git a/Source/Libs/GtkSharp/GtkSharp.csproj b/Source/Libs/GtkSharp/GtkSharp.csproj
index 90a0f9e3e..1ee2f333c 100755
--- a/Source/Libs/GtkSharp/GtkSharp.csproj
+++ b/Source/Libs/GtkSharp/GtkSharp.csproj
@@ -37,8 +37,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="linux-x86\libgtk-3-0.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x64\libgtk-3-0.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-arm\libgtk-3-0.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
+    <Content Include="linux-x86\*" PackagePath="runtimes\linux-x86\native" Visible="false" />
+    <Content Include="linux-x64\*" PackagePath="runtimes\linux-x64\native" Visible="false" />
+    <Content Include="linux-arm\*" PackagePath="runtimes\linux-arm\native" Visible="false" />
   </ItemGroup>
 </Project>
diff --git a/Source/Libs/PangoSharp/PangoSharp.csproj b/Source/Libs/PangoSharp/PangoSharp.csproj
index f158bf172..22f610a62 100755
--- a/Source/Libs/PangoSharp/PangoSharp.csproj
+++ b/Source/Libs/PangoSharp/PangoSharp.csproj
@@ -23,8 +23,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="linux-x86\libpango-1.0-0.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x64\libpango-1.0-0.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-arm\libpango-1.0-0.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
+    <Content Include="linux-x86\*" PackagePath="runtimes\linux-x86\native" Visible="false" />
+    <Content Include="linux-x64\*" PackagePath="runtimes\linux-x64\native" Visible="false" />
+    <Content Include="linux-arm\*" PackagePath="runtimes\linux-arm\native" Visible="false" />
   </ItemGroup>
 </Project>