RID-specific lib...

dotnet · Feb 16, 2017 · 96062c9 · 96062c9
1 parent d90ebb6
commit 96062c9
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithRid/NativeCode.cs b/TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithRid/NativeCode.cs
@@ -8,7 +8,17 @@ public class NativeCode
     {
         public static string InvokeNativeCodeAndReturnAString()
         {
-            return Marshal.PtrToStringAnsi(NativeMethod.sqlite3_libversion());
+            switch(GetRidStoredInAssemblyDescriptionAttribute())
+            {
+                case "ubuntu.14.04-x64":
+                    return Marshal.PtrToStringAnsi(NativeMethod.sqlite3_libversion());
+                case "osx.10.11-x64": 
+                    return Marshal.PtrToStringAnsi(NativeMethod.sqlite3_dylibversion());
+                case "win10-x64":
+                    return Marshal.PtrToStringAnsi(NativeMethod.sqlite3_dllversion());
+                default:
+                    return "Unexpected RID. Cannot find sqlite3.";
+            }            
         }
 
         public static string GetRidStoredInAssemblyDescriptionAttribute()

diff --git a/TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithRid/NativeMethods.cs b/TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithRid/NativeMethods.cs
@@ -7,5 +7,11 @@ public static class NativeMethod
     {
         [DllImport("libsqlite3", CallingConvention = CallingConvention.Cdecl)]
         public static extern IntPtr sqlite3_libversion();
+
+        [DllImport("libsqlite3", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr sqlite3_dylibversion();
+
+        [DllImport("sqlite3", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr sqlite3_dllversion();
     }
 }
diff --git a/TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/NativeCode.cs b/TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/NativeCode.cs
@@ -8,7 +8,17 @@ public class NativeCode
     {
         public static string InvokeNativeCodeAndReturnAString()
         {
-            return Marshal.PtrToStringAnsi(NativeMethod.sqlite3_libversion());
+            switch(GetRidStoredInAssemblyDescriptionAttribute())
+            {
+                case "ubuntu.14.04-x64":
+                    return Marshal.PtrToStringAnsi(NativeMethod.sqlite3_libversion());
+                case "osx.10.11-x64": 
+                    return Marshal.PtrToStringAnsi(NativeMethod.sqlite3_dylibversion());
+                case "win10-x64":
+                    return Marshal.PtrToStringAnsi(NativeMethod.sqlite3_dllversion());
+                default:
+                    return "Unexpected RID. Cannot find sqlite3.";
+            }            
         }
 
         public static string GetRidStoredInAssemblyDescriptionAttribute()

diff --git a/TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/NativeMethods.cs b/TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/NativeMethods.cs
@@ -7,5 +7,11 @@ public static class NativeMethod
     {
         [DllImport("libsqlite3", CallingConvention = CallingConvention.Cdecl)]
         public static extern IntPtr sqlite3_libversion();
+
+        [DllImport("libsqlite3", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr sqlite3_dylibversion();
+
+        [DllImport("sqlite3", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr sqlite3_dllversion();
     }
 }