From a09f751b103aac0a3bbdba75940e8ba475b36c1c Mon Sep 17 00:00:00 2001
From: cra0zy <cra0zy@gmail.com>
Date: Sat, 11 Nov 2017 19:11:44 +0100
Subject: [PATCH] Generate .dll.config files for standard .NET projects

---
 CakeScripts/GAssembly.cs                     | 8 ++++++++
 Source/Libs/AtkSharp/AtkSharp.csproj         | 3 +++
 Source/Libs/AtkSharp/AtkSharp.dll.config     | 3 +++
 Source/Libs/CairoSharp/CairoSharp.csproj     | 3 +++
 Source/Libs/CairoSharp/CairoSharp.dll.config | 3 +++
 Source/Libs/GLibSharp/GLibSharp.csproj       | 3 +++
 Source/Libs/GLibSharp/GLibSharp.dll.config   | 5 +++++
 Source/Libs/GdkSharp/GdkSharp.csproj         | 3 +++
 Source/Libs/GdkSharp/GdkSharp.dll.config     | 4 ++++
 Source/Libs/GioSharp/GioSharp.csproj         | 3 +++
 Source/Libs/GioSharp/GioSharp.dll.config     | 3 +++
 Source/Libs/GtkSharp/GtkSharp.csproj         | 3 +++
 Source/Libs/GtkSharp/GtkSharp.dll.config     | 3 +++
 Source/Libs/PangoSharp/PangoSharp.csproj     | 3 +++
 Source/Libs/PangoSharp/PangoSharp.dll.config | 3 +++
 build.cake                                   | 2 +-
 16 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 Source/Libs/AtkSharp/AtkSharp.dll.config
 create mode 100644 Source/Libs/CairoSharp/CairoSharp.dll.config
 create mode 100644 Source/Libs/GLibSharp/GLibSharp.dll.config
 create mode 100644 Source/Libs/GdkSharp/GdkSharp.dll.config
 create mode 100644 Source/Libs/GioSharp/GioSharp.dll.config
 create mode 100644 Source/Libs/GtkSharp/GtkSharp.dll.config
 create mode 100644 Source/Libs/PangoSharp/PangoSharp.dll.config

diff --git a/CakeScripts/GAssembly.cs b/CakeScripts/GAssembly.cs
index edb009e68..eb31dd349 100755
--- a/CakeScripts/GAssembly.cs
+++ b/CakeScripts/GAssembly.cs
@@ -1,5 +1,6 @@
 using System;
 using P = System.IO.Path;
+using F = System.IO.File;
 
 public class GAssembly
 {
@@ -84,6 +85,7 @@ public class GAssembly
     public void GenerateLinuxStubs()
     {
         var basedir = P.Combine("..", "..", Dir);
+        var lines = new List<string>();
 
         if (Cake.DirectoryExists(P.Combine(basedir, "linux-x86")))
             Cake.DeleteDirectory(P.Combine(basedir, "linux-x86"), new DeleteDirectorySettings { Recursive = true, Force = true });
@@ -97,8 +99,11 @@ public class GAssembly
             Cake.DeleteDirectory(P.Combine(basedir, "linux-arm"), new DeleteDirectorySettings { Recursive = true, Force = true });
         Cake.CreateDirectory(P.Combine(basedir, "linux-arm"));
         
+        lines.Add("<configuration>");
         for (int i = 0; i < NativeDeps.Length; i += 2)
         {
+            lines.Add("  <dllmap dll=\"" + NativeDeps[i + 1] +"\" target=\"" + NativeDeps[i] + "\"/>");
+
             // Generate x86 stubs
             Cake.CreateDirectory(P.Combine(basedir, "linux-x86"));
             Cake.StartProcess("gcc", "-m32 -shared -o " + NativeDeps[i] + " empty.c");
@@ -114,5 +119,8 @@ public class GAssembly
             Cake.StartProcess("arm-none-eabi-gcc", "-shared -o " + NativeDeps[i] + " empty.c");
             Cake.StartProcess("arm-none-eabi-gcc", "-Wl,--no-as-needed -shared -o " + P.Combine(basedir, "linux-arm", NativeDeps[i + 1] + ".so") + " -fPIC -L. -l:" + NativeDeps[i] + "");
         }
+        lines.Add("</configuration>");
+
+        F.WriteAllLines(P.Combine(basedir, Name + ".dll.config"), lines.ToArray());
     }
 }
diff --git a/Source/Libs/AtkSharp/AtkSharp.csproj b/Source/Libs/AtkSharp/AtkSharp.csproj
index 5ef2dfa81..dd84e0cfc 100755
--- a/Source/Libs/AtkSharp/AtkSharp.csproj
+++ b/Source/Libs/AtkSharp/AtkSharp.csproj
@@ -23,5 +23,8 @@
     <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" />
+    <Content Include="*.dll.config" PackagePath="lib\netstandard2.0">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 </Project>
diff --git a/Source/Libs/AtkSharp/AtkSharp.dll.config b/Source/Libs/AtkSharp/AtkSharp.dll.config
new file mode 100644
index 000000000..7378241a8
--- /dev/null
+++ b/Source/Libs/AtkSharp/AtkSharp.dll.config
@@ -0,0 +1,3 @@
+<configuration>
+  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0.so.0"/>
+</configuration>
diff --git a/Source/Libs/CairoSharp/CairoSharp.csproj b/Source/Libs/CairoSharp/CairoSharp.csproj
index 5164687d5..fc11b8f09 100755
--- a/Source/Libs/CairoSharp/CairoSharp.csproj
+++ b/Source/Libs/CairoSharp/CairoSharp.csproj
@@ -18,5 +18,8 @@
     <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" />
+    <Content Include="*.dll.config" PackagePath="lib\netstandard2.0">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 </Project>
diff --git a/Source/Libs/CairoSharp/CairoSharp.dll.config b/Source/Libs/CairoSharp/CairoSharp.dll.config
new file mode 100644
index 000000000..225389168
--- /dev/null
+++ b/Source/Libs/CairoSharp/CairoSharp.dll.config
@@ -0,0 +1,3 @@
+<configuration>
+  <dllmap dll="libcairo-2.dll" target="libcairo.so.2"/>
+</configuration>
diff --git a/Source/Libs/GLibSharp/GLibSharp.csproj b/Source/Libs/GLibSharp/GLibSharp.csproj
index 1e24b3ce5..443c0b524 100755
--- a/Source/Libs/GLibSharp/GLibSharp.csproj
+++ b/Source/Libs/GLibSharp/GLibSharp.csproj
@@ -18,5 +18,8 @@
     <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" />
+    <Content Include="*.dll.config" PackagePath="lib\netstandard2.0">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 </Project>
diff --git a/Source/Libs/GLibSharp/GLibSharp.dll.config b/Source/Libs/GLibSharp/GLibSharp.dll.config
new file mode 100644
index 000000000..03cb09f20
--- /dev/null
+++ b/Source/Libs/GLibSharp/GLibSharp.dll.config
@@ -0,0 +1,5 @@
+<configuration>
+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
+  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0.so.0"/>
+</configuration>
diff --git a/Source/Libs/GdkSharp/GdkSharp.csproj b/Source/Libs/GdkSharp/GdkSharp.csproj
index 2574dda3e..ca0947e3e 100755
--- a/Source/Libs/GdkSharp/GdkSharp.csproj
+++ b/Source/Libs/GdkSharp/GdkSharp.csproj
@@ -32,5 +32,8 @@
     <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" />
+    <Content Include="*.dll.config" PackagePath="lib\netstandard2.0">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 </Project>
diff --git a/Source/Libs/GdkSharp/GdkSharp.dll.config b/Source/Libs/GdkSharp/GdkSharp.dll.config
new file mode 100644
index 000000000..bdb1c4c87
--- /dev/null
+++ b/Source/Libs/GdkSharp/GdkSharp.dll.config
@@ -0,0 +1,4 @@
+<configuration>
+  <dllmap dll="libgdk-3-0.dll" target="libgdk-3.so.0"/>
+  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0.so.0"/>
+</configuration>
diff --git a/Source/Libs/GioSharp/GioSharp.csproj b/Source/Libs/GioSharp/GioSharp.csproj
index 3871215f6..6d026a3bc 100755
--- a/Source/Libs/GioSharp/GioSharp.csproj
+++ b/Source/Libs/GioSharp/GioSharp.csproj
@@ -23,5 +23,8 @@
     <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" />
+    <Content Include="*.dll.config" PackagePath="lib\netstandard2.0">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 </Project>
diff --git a/Source/Libs/GioSharp/GioSharp.dll.config b/Source/Libs/GioSharp/GioSharp.dll.config
new file mode 100644
index 000000000..fa7f933f5
--- /dev/null
+++ b/Source/Libs/GioSharp/GioSharp.dll.config
@@ -0,0 +1,3 @@
+<configuration>
+  <dllmap dll="libgio-2.0-0.dll" target="libgio-2.0.so.0"/>
+</configuration>
diff --git a/Source/Libs/GtkSharp/GtkSharp.csproj b/Source/Libs/GtkSharp/GtkSharp.csproj
index 1ee2f333c..ca081a287 100755
--- a/Source/Libs/GtkSharp/GtkSharp.csproj
+++ b/Source/Libs/GtkSharp/GtkSharp.csproj
@@ -40,5 +40,8 @@
     <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" />
+    <Content Include="*.dll.config" PackagePath="lib\netstandard2.0">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 </Project>
diff --git a/Source/Libs/GtkSharp/GtkSharp.dll.config b/Source/Libs/GtkSharp/GtkSharp.dll.config
new file mode 100644
index 000000000..920d579b4
--- /dev/null
+++ b/Source/Libs/GtkSharp/GtkSharp.dll.config
@@ -0,0 +1,3 @@
+<configuration>
+  <dllmap dll="libgtk-3-0.dll" target="libgtk-3.so.0"/>
+</configuration>
diff --git a/Source/Libs/PangoSharp/PangoSharp.csproj b/Source/Libs/PangoSharp/PangoSharp.csproj
index 22f610a62..26eba73c8 100755
--- a/Source/Libs/PangoSharp/PangoSharp.csproj
+++ b/Source/Libs/PangoSharp/PangoSharp.csproj
@@ -26,5 +26,8 @@
     <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" />
+    <Content Include="*.dll.config" PackagePath="lib\netstandard2.0">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 </Project>
diff --git a/Source/Libs/PangoSharp/PangoSharp.dll.config b/Source/Libs/PangoSharp/PangoSharp.dll.config
new file mode 100644
index 000000000..83d72fd80
--- /dev/null
+++ b/Source/Libs/PangoSharp/PangoSharp.dll.config
@@ -0,0 +1,3 @@
+<configuration>
+  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0.so.0"/>
+</configuration>
diff --git a/build.cake b/build.cake
index 7ca59cdb1..2afcf07bc 100755
--- a/build.cake
+++ b/build.cake
@@ -6,7 +6,7 @@
 // VARS
 
 Settings.Cake = Context;
-Settings.Version = "3.22.24.12";
+Settings.Version = "3.22.24.13";
 Settings.BuildTarget = Argument("BuildTarget", "Default");
 Settings.Assembly = Argument("Assembly", "");