Merge pull request #6 from CamW/rem-lib-file-ext

Remove library file extensions.
CamW · Mar 22, 2021 · 8520225 · 8520225
2 parents ee7a906 + 086f7ef
commit 8520225
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,5 @@
+os: linux
+dist: focal
 language: csharp
 mono: none
 dotnet: 3.1
@@ -13,7 +15,7 @@ after_success:
 before_deploy:
 - dotnet pack -c Release
 deploy:
-  skip_cleanup: true
+  cleanup: false
   provider: script
   script: dotnet nuget push ./src/Npam/bin/Release/Npam.*.nupkg -k $NUGET_API -s https://api.nuget.org/v3/index.json --skip-duplicate
   on:

diff --git a/src/Npam/Interop/Pam.cs b/src/Npam/Interop/Pam.cs
@@ -4,13 +4,13 @@
 namespace Npam.Interop
 {
     public class Pam {
-        [DllImport("libpam.so")]
+        [DllImport("libpam")]
         public static extern PamStatus pam_start([MarshalAs(UnmanagedType.LPStr)] string serviceName, [MarshalAs(UnmanagedType.LPStr)] string user, PamConv conversation, ref IntPtr pamHandle);
-        [DllImport("libpam.so")]
+        [DllImport("libpam")]
         public static extern PamStatus pam_authenticate(IntPtr pamHandle, int flags);
-        [DllImport("libpam.so")]
+        [DllImport("libpam")]
         public static extern PamStatus pam_acct_mgmt(IntPtr pamHandle, int flags);
-        [DllImport("libpam.so")]
+        [DllImport("libpam")]
         public static extern PamStatus pam_end(IntPtr pamHandle, PamStatus pamStatus);
     }
 }
diff --git a/src/Npam/Interop/StdLibC.cs b/src/Npam/Interop/StdLibC.cs
@@ -5,13 +5,13 @@ namespace Npam.Interop
 {
     public class StdLibC {
 
-        [DllImport("libc.so.6")]
+        [DllImport("libc")]
         public static extern IntPtr getgrgid(int groupId);
 
-        [DllImport("libc.so.6")]
+        [DllImport("libc")]
         public static extern IntPtr getpwnam([MarshalAs(UnmanagedType.LPStr)] string user);
 
-        [DllImport("libc.so.6")]
+        [DllImport("libc")]
         public static extern int getgrouplist([MarshalAs(UnmanagedType.LPStr)] string user, int groupId, [Out] int[] groupIdArray, ref int numberOfGroups);
 
         public static AccountInfo GetPwNamAsAccountInfo(string user) {

diff --git a/src/Npam/Npam.csproj b/src/Npam/Npam.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<TargetFramework>netstandard1.2</TargetFramework>
+	<TargetFrameworks>netstandard1.2;netstandard2.0</TargetFrameworks>
 	<PackageId>Npam</PackageId>
-	<Version>1.0.1</Version>
+	<Version>1.0.2</Version>
 	<Authors>Cameron Waldron</Authors>
   </PropertyGroup>