diff --git a/CakeScripts/Settings.cs b/CakeScripts/Settings.cs
index 335de16fe..7ee123bc1 100755
--- a/CakeScripts/Settings.cs
+++ b/CakeScripts/Settings.cs
@@ -13,43 +13,43 @@ class Settings
             new GAssembly("GLibSharp")
             {
                 NativeDeps = new[] {
-                    "libglib-2.0.so.0", "libglib-2.0-0",
-                    "libgobject-2.0.so.0", "libgobject-2.0-0",
-                    "libgthread-2.0.so.0", "libgthread-2.0-0"
+                    "libglib-2.0.so.0", "libglib-2.0-0.dll",
+                    "libgobject-2.0.so.0", "libgobject-2.0-0.dll",
+                    "libgthread-2.0.so.0", "libgthread-2.0-0.dll"
                 }
             },
             new GAssembly("GioSharp")
             {
                 Deps = new[] { "GLibSharp" },
-                NativeDeps = new[] { "libgio-2.0.so.0", "libgio-2.0-0" }
+                NativeDeps = new[] { "libgio-2.0.so.0", "libgio-2.0-0.dll" }
             },
             new GAssembly("AtkSharp")
             {
                 Deps = new[] { "GLibSharp" },
-                NativeDeps = new[] { "libatk-1.0.so.0", "libatk-1.0-0" },
+                NativeDeps = new[] { "libatk-1.0.so.0", "libatk-1.0-0.dll" },
                 ExtraArgs = "--abi-cs-usings=Atk,GLib"
             },
             new GAssembly("CairoSharp")
             {
-                NativeDeps = new[] { "libcairo.so.2", "libcairo-2" }
+                NativeDeps = new[] { "libcairo.so.2", "libcairo-2.dll" }
             },
             new GAssembly("PangoSharp")
             {
                 Deps = new[] { "GLibSharp", "CairoSharp" },
-                NativeDeps = new[] { "libpango-1.0.so.0", "libpango-1.0-0" }
+                NativeDeps = new[] { "libpango-1.0.so.0", "libpango-1.0-0.dll" }
             },
             new GAssembly("GdkSharp")
             {
                 Deps = new[] { "GLibSharp", "GioSharp", "CairoSharp", "PangoSharp" },
                 NativeDeps = new[] {
-                    "libgdk-3.so.0", "libgdk-3-0",
-                    "libgdk_pixbuf-2.0.so.0", "libgdk_pixbuf-2.0-0"
+                    "libgdk-3.so.0", "libgdk-3-0.dll",
+                    "libgdk_pixbuf-2.0.so.0", "libgdk_pixbuf-2.0-0.dll"
                 }
             },
             new GAssembly("GtkSharp")
             {
                 Deps = new[] { "GLibSharp", "GioSharp", "AtkSharp", "CairoSharp", "PangoSharp", "GdkSharp" },
-                NativeDeps = new[] { "libgtk-3.so.0", "libgtk-3-0" },
+                NativeDeps = new[] { "libgtk-3.so.0", "libgtk-3-0.dll" },
                 ExtraArgs = "--abi-cs-usings=Gtk,GLib"
             }
         };
diff --git a/Source/Libs/AtkSharp/AtkSharp-api.raw b/Source/Libs/AtkSharp/AtkSharp-api.raw
index 78ab45951..4be018fc8 100755
--- a/Source/Libs/AtkSharp/AtkSharp-api.raw
+++ b/Source/Libs/AtkSharp/AtkSharp-api.raw
@@ -6,7 +6,7 @@
         Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
 
 -->
-  <namespace name="Atk" library="libatk-1.0-0">
+  <namespace name="Atk" library="libatk-1.0-0.dll">
     <enum name="CoordType" cname="AtkCoordType" gtype="atk_coord_type_get_type" type="enum">
       <member cname="ATK_XY_SCREEN" name="Screen" />
       <member cname="ATK_XY_WINDOW" name="Window" />
diff --git a/Source/Libs/AtkSharp/AtkSharp.csproj b/Source/Libs/AtkSharp/AtkSharp.csproj
index a50e27e97..825b043fb 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.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x64\libatk-1.0-0.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-arm\libatk-1.0-0.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
+    <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" />
   </ItemGroup>
 </Project>
diff --git a/Source/Libs/AtkSharp/Global.cs b/Source/Libs/AtkSharp/Global.cs
index 0ea42072a..0424c87d7 100755
--- a/Source/Libs/AtkSharp/Global.cs
+++ b/Source/Libs/AtkSharp/Global.cs
@@ -28,7 +28,7 @@ namespace Atk {
 
 	public partial class Global {
 
-		[DllImport ("libatk-1.0-0", CallingConvention = CallingConvention.Cdecl)]
+		[DllImport ("libatk-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern uint atk_add_global_event_listener (GLib.Signal.EmissionHookNative hook, IntPtr event_type);
 		
 		public static uint AddGlobalEventListener (GLib.Signal.EmissionHook hook, string event_type)
diff --git a/Source/Libs/AtkSharp/linux-arm/libatk-1.0-0.so b/Source/Libs/AtkSharp/linux-arm/libatk-1.0-0.dll.so
similarity index 100%
rename from Source/Libs/AtkSharp/linux-arm/libatk-1.0-0.so
rename to Source/Libs/AtkSharp/linux-arm/libatk-1.0-0.dll.so
diff --git a/Source/Libs/AtkSharp/linux-x64/libatk-1.0-0.so b/Source/Libs/AtkSharp/linux-x64/libatk-1.0-0.dll.so
similarity index 100%
rename from Source/Libs/AtkSharp/linux-x64/libatk-1.0-0.so
rename to Source/Libs/AtkSharp/linux-x64/libatk-1.0-0.dll.so
diff --git a/Source/Libs/AtkSharp/linux-x86/libatk-1.0-0.so b/Source/Libs/AtkSharp/linux-x86/libatk-1.0-0.dll.so
similarity index 100%
rename from Source/Libs/AtkSharp/linux-x86/libatk-1.0-0.so
rename to Source/Libs/AtkSharp/linux-x86/libatk-1.0-0.dll.so
diff --git a/Source/Libs/CairoSharp/CairoSharp.csproj b/Source/Libs/CairoSharp/CairoSharp.csproj
index 0ebb10c44..afb180d94 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.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x64\libcairo-2.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-arm\libcairo-2.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
+    <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" />
   </ItemGroup>
 </Project>
diff --git a/Source/Libs/CairoSharp/NativeMethods.cs b/Source/Libs/CairoSharp/NativeMethods.cs
index 1037ac589..20fa29998 100755
--- a/Source/Libs/CairoSharp/NativeMethods.cs
+++ b/Source/Libs/CairoSharp/NativeMethods.cs
@@ -41,7 +41,7 @@ namespace Cairo
 
 	internal static class NativeMethods
 	{
-		const string cairo = "libcairo-2";
+		const string cairo = "libcairo-2.dll";
 		
 		[DllImport (cairo, CallingConvention=CallingConvention.Cdecl)]
 		internal static extern void cairo_append_path (IntPtr cr, IntPtr path);
diff --git a/Source/Libs/CairoSharp/linux-arm/libcairo-2.so b/Source/Libs/CairoSharp/linux-arm/libcairo-2.dll.so
similarity index 100%
rename from Source/Libs/CairoSharp/linux-arm/libcairo-2.so
rename to Source/Libs/CairoSharp/linux-arm/libcairo-2.dll.so
diff --git a/Source/Libs/CairoSharp/linux-x64/libcairo-2.so b/Source/Libs/CairoSharp/linux-x64/libcairo-2.dll.so
similarity index 100%
rename from Source/Libs/CairoSharp/linux-x64/libcairo-2.so
rename to Source/Libs/CairoSharp/linux-x64/libcairo-2.dll.so
diff --git a/Source/Libs/CairoSharp/linux-x86/libcairo-2.so b/Source/Libs/CairoSharp/linux-x86/libcairo-2.dll.so
similarity index 100%
rename from Source/Libs/CairoSharp/linux-x86/libcairo-2.so
rename to Source/Libs/CairoSharp/linux-x86/libcairo-2.dll.so
diff --git a/Source/Libs/GLibSharp/GLibSharp-api.xml b/Source/Libs/GLibSharp/GLibSharp-api.xml
index 225788eb3..4aa4bfda8 100755
--- a/Source/Libs/GLibSharp/GLibSharp-api.xml
+++ b/Source/Libs/GLibSharp/GLibSharp-api.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <api>
-  <namespace name="GLib" library="libglib-2.0-0">
+  <namespace name="GLib" library="libglib-2.0-0.dll">
     <enum name="ConnectFlags" cname="GConnectFlags" type="flags" />
     <enum name="IOCondition" cname="GIOCondition" type="enum" />
     <enum name="SeekType" cname="GSeekType" type="enum" />
diff --git a/Source/Libs/GLibSharp/GLibSharp.csproj b/Source/Libs/GLibSharp/GLibSharp.csproj
index 40d3375d1..ee3904c60 100755
--- a/Source/Libs/GLibSharp/GLibSharp.csproj
+++ b/Source/Libs/GLibSharp/GLibSharp.csproj
@@ -15,14 +15,14 @@
     <OutputPath>..\..\..\BuildOutput\Release</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Content Include="linux-x86\libglib-2.0-0.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x86\libgobject-2.0-0.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x86\libgthread-2.0-0.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x64\libglib-2.0-0.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-x64\libgobject-2.0-0.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-x64\libgthread-2.0-0.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-arm\libglib-2.0-0.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
-    <Content Include="linux-arm\libgobject-2.0-0.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
-    <Content Include="linux-arm\libgthread-2.0-0.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
+    <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" />
   </ItemGroup>
 </Project>
diff --git a/Source/Libs/GLibSharp/Global.cs b/Source/Libs/GLibSharp/Global.cs
index 0e35d776b..46ebeac6e 100755
--- a/Source/Libs/GLibSharp/Global.cs
+++ b/Source/Libs/GLibSharp/Global.cs
@@ -31,8 +31,8 @@ namespace GLib {
 		//this is a static class
 		private Global () {}
 
-		internal const string GLibNativeDll = "libglib-2.0-0";
-		internal const string GObjectNativeDll = "libgobject-2.0-0";
+		internal const string GLibNativeDll = "libglib-2.0-0.dll";
+		internal const string GObjectNativeDll = "libgobject-2.0-0.dll";
 
 		internal static bool IsWindowsPlatform {
 			get {
diff --git a/Source/Libs/GLibSharp/linux-arm/libglib-2.0-0.so b/Source/Libs/GLibSharp/linux-arm/libglib-2.0-0.dll.so
similarity index 100%
rename from Source/Libs/GLibSharp/linux-arm/libglib-2.0-0.so
rename to Source/Libs/GLibSharp/linux-arm/libglib-2.0-0.dll.so
diff --git a/Source/Libs/GLibSharp/linux-arm/libgobject-2.0-0.so b/Source/Libs/GLibSharp/linux-arm/libgobject-2.0-0.dll.so
similarity index 100%
rename from Source/Libs/GLibSharp/linux-arm/libgobject-2.0-0.so
rename to Source/Libs/GLibSharp/linux-arm/libgobject-2.0-0.dll.so
diff --git a/Source/Libs/GLibSharp/linux-arm/libgthread-2.0-0.so b/Source/Libs/GLibSharp/linux-arm/libgthread-2.0-0.dll.so
similarity index 100%
rename from Source/Libs/GLibSharp/linux-arm/libgthread-2.0-0.so
rename to Source/Libs/GLibSharp/linux-arm/libgthread-2.0-0.dll.so
diff --git a/Source/Libs/GLibSharp/linux-x64/libglib-2.0-0.so b/Source/Libs/GLibSharp/linux-x64/libglib-2.0-0.dll.so
similarity index 100%
rename from Source/Libs/GLibSharp/linux-x64/libglib-2.0-0.so
rename to Source/Libs/GLibSharp/linux-x64/libglib-2.0-0.dll.so
diff --git a/Source/Libs/GLibSharp/linux-x64/libgobject-2.0-0.so b/Source/Libs/GLibSharp/linux-x64/libgobject-2.0-0.dll.so
similarity index 100%
rename from Source/Libs/GLibSharp/linux-x64/libgobject-2.0-0.so
rename to Source/Libs/GLibSharp/linux-x64/libgobject-2.0-0.dll.so
diff --git a/Source/Libs/GLibSharp/linux-x64/libgthread-2.0-0.so b/Source/Libs/GLibSharp/linux-x64/libgthread-2.0-0.dll.so
similarity index 100%
rename from Source/Libs/GLibSharp/linux-x64/libgthread-2.0-0.so
rename to Source/Libs/GLibSharp/linux-x64/libgthread-2.0-0.dll.so
diff --git a/Source/Libs/GLibSharp/linux-x86/libglib-2.0-0.so b/Source/Libs/GLibSharp/linux-x86/libglib-2.0-0.dll.so
similarity index 100%
rename from Source/Libs/GLibSharp/linux-x86/libglib-2.0-0.so
rename to Source/Libs/GLibSharp/linux-x86/libglib-2.0-0.dll.so
diff --git a/Source/Libs/GLibSharp/linux-x86/libgobject-2.0-0.so b/Source/Libs/GLibSharp/linux-x86/libgobject-2.0-0.dll.so
similarity index 100%
rename from Source/Libs/GLibSharp/linux-x86/libgobject-2.0-0.so
rename to Source/Libs/GLibSharp/linux-x86/libgobject-2.0-0.dll.so
diff --git a/Source/Libs/GLibSharp/linux-x86/libgthread-2.0-0.so b/Source/Libs/GLibSharp/linux-x86/libgthread-2.0-0.dll.so
similarity index 100%
rename from Source/Libs/GLibSharp/linux-x86/libgthread-2.0-0.so
rename to Source/Libs/GLibSharp/linux-x86/libgthread-2.0-0.dll.so
diff --git a/Source/Libs/GdkSharp/GdkSharp-api.raw b/Source/Libs/GdkSharp/GdkSharp-api.raw
index c26e90ab7..4ba1a40d5 100755
--- a/Source/Libs/GdkSharp/GdkSharp-api.raw
+++ b/Source/Libs/GdkSharp/GdkSharp-api.raw
@@ -6,7 +6,7 @@
         Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
 
 -->
-  <namespace name="Gdk" library="libgdk-3-0">
+  <namespace name="Gdk" library="libgdk-3-0.dll">
     <enum name="AnchorHints" cname="GdkAnchorHints" gtype="gdk_anchor_hints_get_type" type="flags">
       <member cname="GDK_ANCHOR_FLIP_X" name="FlipX" value="1 &lt;&lt; 0" />
       <member cname="GDK_ANCHOR_FLIP_Y" name="FlipY" value="1 &lt;&lt; 1" />
@@ -5301,7 +5301,7 @@
       </method>
     </class>
   </namespace>
-  <namespace name="Gdk" library="libgdk_pixbuf-2.0-0">
+  <namespace name="Gdk" library="libgdk_pixbuf-2.0-0.dll">
     <enum name="Colorspace" cname="GdkColorspace" gtype="gdk_colorspace_get_type" type="enum">
       <member cname="GDK_COLORSPACE_RGB" name="Rgb" />
     </enum>
diff --git a/Source/Libs/GdkSharp/GdkSharp.csproj b/Source/Libs/GdkSharp/GdkSharp.csproj
index fc1464cc5..9cdc888c6 100755
--- a/Source/Libs/GdkSharp/GdkSharp.csproj
+++ b/Source/Libs/GdkSharp/GdkSharp.csproj
@@ -29,11 +29,11 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="linux-x86\libgdk_pixbuf-2.0-0.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x86\libgdk-3-0.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x64\libgdk_pixbuf-2.0-0.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-x64\libgdk-3-0.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-arm\libgdk_pixbuf-2.0-0.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
-    <Content Include="linux-arm\libgdk-3-0.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
+    <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" />
   </ItemGroup>
 </Project>
diff --git a/Source/Libs/GdkSharp/Global.cs b/Source/Libs/GdkSharp/Global.cs
index f25b8b822..357c799c3 100755
--- a/Source/Libs/GdkSharp/Global.cs
+++ b/Source/Libs/GdkSharp/Global.cs
@@ -26,7 +26,7 @@ namespace Gdk {
 
 	public partial class Global {
 
-		internal const string GdkNativeDll = "libgdk-3-0";
+		internal const string GdkNativeDll = "libgdk-3-0.dll";
 
 		[DllImport (Global.GdkNativeDll, CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gdk_list_visuals ();
diff --git a/Source/Libs/GdkSharp/linux-arm/libgdk-3-0.so b/Source/Libs/GdkSharp/linux-arm/libgdk-3-0.dll.so
similarity index 100%
rename from Source/Libs/GdkSharp/linux-arm/libgdk-3-0.so
rename to Source/Libs/GdkSharp/linux-arm/libgdk-3-0.dll.so
diff --git a/Source/Libs/GdkSharp/linux-arm/libgdk_pixbuf-2.0-0.so b/Source/Libs/GdkSharp/linux-arm/libgdk_pixbuf-2.0-0.dll.so
similarity index 100%
rename from Source/Libs/GdkSharp/linux-arm/libgdk_pixbuf-2.0-0.so
rename to Source/Libs/GdkSharp/linux-arm/libgdk_pixbuf-2.0-0.dll.so
diff --git a/Source/Libs/GdkSharp/linux-x64/libgdk-3-0.so b/Source/Libs/GdkSharp/linux-x64/libgdk-3-0.dll.so
similarity index 100%
rename from Source/Libs/GdkSharp/linux-x64/libgdk-3-0.so
rename to Source/Libs/GdkSharp/linux-x64/libgdk-3-0.dll.so
diff --git a/Source/Libs/GdkSharp/linux-x64/libgdk_pixbuf-2.0-0.so b/Source/Libs/GdkSharp/linux-x64/libgdk_pixbuf-2.0-0.dll.so
similarity index 100%
rename from Source/Libs/GdkSharp/linux-x64/libgdk_pixbuf-2.0-0.so
rename to Source/Libs/GdkSharp/linux-x64/libgdk_pixbuf-2.0-0.dll.so
diff --git a/Source/Libs/GdkSharp/linux-x86/libgdk-3-0.so b/Source/Libs/GdkSharp/linux-x86/libgdk-3-0.dll.so
similarity index 100%
rename from Source/Libs/GdkSharp/linux-x86/libgdk-3-0.so
rename to Source/Libs/GdkSharp/linux-x86/libgdk-3-0.dll.so
diff --git a/Source/Libs/GdkSharp/linux-x86/libgdk_pixbuf-2.0-0.so b/Source/Libs/GdkSharp/linux-x86/libgdk_pixbuf-2.0-0.dll.so
similarity index 100%
rename from Source/Libs/GdkSharp/linux-x86/libgdk_pixbuf-2.0-0.so
rename to Source/Libs/GdkSharp/linux-x86/libgdk_pixbuf-2.0-0.dll.so
diff --git a/Source/Libs/GioSharp/GioGlobal.cs b/Source/Libs/GioSharp/GioGlobal.cs
index 059f60564..c01489ce0 100755
--- a/Source/Libs/GioSharp/GioGlobal.cs
+++ b/Source/Libs/GioSharp/GioGlobal.cs
@@ -24,6 +24,6 @@ namespace GLib
 {
 	public partial class GioGlobal
 	{
-		internal const string GioNativeDll = "libgio-2.0-0";
+		internal const string GioNativeDll = "libgio-2.0-0.dll";
 	}
 }
diff --git a/Source/Libs/GioSharp/GioSharp-api.raw b/Source/Libs/GioSharp/GioSharp-api.raw
index 3520fab97..27891c837 100755
--- a/Source/Libs/GioSharp/GioSharp-api.raw
+++ b/Source/Libs/GioSharp/GioSharp-api.raw
@@ -6,7 +6,7 @@
         Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
 
 -->
-  <namespace name="G" library="libgio-2.0-0">
+  <namespace name="G" library="libgio-2.0-0.dll">
     <enum name="AppInfoCreateFlags" cname="GAppInfoCreateFlags" gtype="g_app_info_create_flags_get_type" type="flags">
       <member cname="G_APP_INFO_CREATE_NONE" name="None" />
       <member cname="G_APP_INFO_CREATE_NEEDS_TERMINAL" name="NeedsTerminal" value="1 &lt;&lt; 0" />
diff --git a/Source/Libs/GioSharp/GioSharp.csproj b/Source/Libs/GioSharp/GioSharp.csproj
index fa3177fd0..ca1b39a0f 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.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x64\libgio-2.0-0.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-arm\libgio-2.0-0.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
+    <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" />
   </ItemGroup>
 </Project>
diff --git a/Source/Libs/GioSharp/linux-arm/libgio-2.0-0.so b/Source/Libs/GioSharp/linux-arm/libgio-2.0-0.dll.so
similarity index 100%
rename from Source/Libs/GioSharp/linux-arm/libgio-2.0-0.so
rename to Source/Libs/GioSharp/linux-arm/libgio-2.0-0.dll.so
diff --git a/Source/Libs/GioSharp/linux-x64/libgio-2.0-0.so b/Source/Libs/GioSharp/linux-x64/libgio-2.0-0.dll.so
similarity index 100%
rename from Source/Libs/GioSharp/linux-x64/libgio-2.0-0.so
rename to Source/Libs/GioSharp/linux-x64/libgio-2.0-0.dll.so
diff --git a/Source/Libs/GioSharp/linux-x86/libgio-2.0-0.so b/Source/Libs/GioSharp/linux-x86/libgio-2.0-0.dll.so
similarity index 100%
rename from Source/Libs/GioSharp/linux-x86/libgio-2.0-0.so
rename to Source/Libs/GioSharp/linux-x86/libgio-2.0-0.dll.so
diff --git a/Source/Libs/GtkSharp/Global.cs b/Source/Libs/GtkSharp/Global.cs
index 9cd528f89..b5ae6c364 100755
--- a/Source/Libs/GtkSharp/Global.cs
+++ b/Source/Libs/GtkSharp/Global.cs
@@ -20,7 +20,7 @@ namespace Gtk {
 
 	public partial class Global {
 
-		internal const string GtkNativeDll = "libgtk-3-0";
+		internal const string GtkNativeDll = "libgtk-3-0.dll";
 
 		public static bool ShowUri (string uri)
 		{
diff --git a/Source/Libs/GtkSharp/GtkSharp-api.raw b/Source/Libs/GtkSharp/GtkSharp-api.raw
index e47061d17..56ae9d1a5 100755
--- a/Source/Libs/GtkSharp/GtkSharp-api.raw
+++ b/Source/Libs/GtkSharp/GtkSharp-api.raw
@@ -6,7 +6,7 @@
         Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
 
 -->
-  <namespace name="Gtk" library="libgtk-3-0">
+  <namespace name="Gtk" library="libgtk-3-0.dll">
     <enum name="AccelFlags" cname="GtkAccelFlags" gtype="gtk_accel_flags_get_type" type="flags">
       <member cname="GTK_ACCEL_VISIBLE" name="Visible" value="1 &lt;&lt; 0" />
       <member cname="GTK_ACCEL_LOCKED" name="Locked" value="1 &lt;&lt; 1" />
diff --git a/Source/Libs/GtkSharp/GtkSharp.csproj b/Source/Libs/GtkSharp/GtkSharp.csproj
index a1ba77390..2d2d751a5 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.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x64\libgtk-3-0.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-arm\libgtk-3-0.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
+    <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" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Libs/GtkSharp/linux-arm/libgtk-3-0.so b/Source/Libs/GtkSharp/linux-arm/libgtk-3-0.dll.so
similarity index 100%
rename from Source/Libs/GtkSharp/linux-arm/libgtk-3-0.so
rename to Source/Libs/GtkSharp/linux-arm/libgtk-3-0.dll.so
diff --git a/Source/Libs/GtkSharp/linux-x64/libgtk-3-0.so b/Source/Libs/GtkSharp/linux-x64/libgtk-3-0.dll.so
similarity index 100%
rename from Source/Libs/GtkSharp/linux-x64/libgtk-3-0.so
rename to Source/Libs/GtkSharp/linux-x64/libgtk-3-0.dll.so
diff --git a/Source/Libs/GtkSharp/linux-x86/libgtk-3-0.so b/Source/Libs/GtkSharp/linux-x86/libgtk-3-0.dll.so
similarity index 100%
rename from Source/Libs/GtkSharp/linux-x86/libgtk-3-0.so
rename to Source/Libs/GtkSharp/linux-x86/libgtk-3-0.dll.so
diff --git a/Source/Libs/PangoSharp/Global.cs b/Source/Libs/PangoSharp/Global.cs
index 271b12cb6..c51d84722 100755
--- a/Source/Libs/PangoSharp/Global.cs
+++ b/Source/Libs/PangoSharp/Global.cs
@@ -25,7 +25,7 @@ namespace Pango {
 
 	public partial class Global {
 
-		internal const string PangoNativeDll = "libpango-1.0-0";
+		internal const string PangoNativeDll = "libpango-1.0-0.dll";
 
 		[DllImport (PangoNativeDll, CallingConvention = CallingConvention.Cdecl)]
 		static extern bool pango_scan_int(IntPtr pos, out int out_param);
diff --git a/Source/Libs/PangoSharp/PangoSharp-api.raw b/Source/Libs/PangoSharp/PangoSharp-api.raw
index c7cca1b38..872ad00ee 100755
--- a/Source/Libs/PangoSharp/PangoSharp-api.raw
+++ b/Source/Libs/PangoSharp/PangoSharp-api.raw
@@ -6,7 +6,7 @@
         Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
 
 -->
-  <namespace name="Pango" library="libpango-1.0-0">
+  <namespace name="Pango" library="libpango-1.0-0.dll">
     <enum name="Alignment" cname="PangoAlignment" gtype="pango_alignment_get_type" type="enum">
       <member cname="PANGO_ALIGN_LEFT" name="Left" />
       <member cname="PANGO_ALIGN_CENTER" name="Center" />
diff --git a/Source/Libs/PangoSharp/PangoSharp.csproj b/Source/Libs/PangoSharp/PangoSharp.csproj
index c88c74159..f9a41758a 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.so" PackagePath="runtimes\linux-x86\native" Visible="false" />
-    <Content Include="linux-x64\libpango-1.0-0.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
-    <Content Include="linux-arm\libpango-1.0-0.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
+    <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" />
   </ItemGroup>
 </Project>
diff --git a/Source/Libs/PangoSharp/linux-arm/libpango-1.0-0.so b/Source/Libs/PangoSharp/linux-arm/libpango-1.0-0.dll.so
similarity index 100%
rename from Source/Libs/PangoSharp/linux-arm/libpango-1.0-0.so
rename to Source/Libs/PangoSharp/linux-arm/libpango-1.0-0.dll.so
diff --git a/Source/Libs/PangoSharp/linux-x64/libpango-1.0-0.so b/Source/Libs/PangoSharp/linux-x64/libpango-1.0-0.dll.so
similarity index 100%
rename from Source/Libs/PangoSharp/linux-x64/libpango-1.0-0.so
rename to Source/Libs/PangoSharp/linux-x64/libpango-1.0-0.dll.so
diff --git a/Source/Libs/PangoSharp/linux-x86/libpango-1.0-0.so b/Source/Libs/PangoSharp/linux-x86/libpango-1.0-0.dll.so
similarity index 100%
rename from Source/Libs/PangoSharp/linux-x86/libpango-1.0-0.so
rename to Source/Libs/PangoSharp/linux-x86/libpango-1.0-0.dll.so
diff --git a/build.cake b/build.cake
index 5d3668046..dc657a944 100755
--- a/build.cake
+++ b/build.cake
@@ -18,7 +18,7 @@ Task("Init")
     .Does(() =>
 {
     // Assign some common properties
-    msbuildsettings = msbuildsettings.WithProperty("Version", "3.22.24.7");
+    msbuildsettings = msbuildsettings.WithProperty("Version", "3.22.24.9");
     msbuildsettings = msbuildsettings.WithProperty("Authors", "'GtkSharp Contributors'");
     msbuildsettings = msbuildsettings.WithProperty("PackageLicenseUrl", "'https://github.com/cra0zy/GtkSharp/blob/cakecore/LICENSE'");