Moved GetUsersList() to Class User

Author: shugaoye

KPCLib.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>KPCLib</id>
-        <version>1.3.0.0</version>
+        <version>1.3.1.0</version>
         <authors>Roger Ye</authors>
 		<owners>Roger Ye</owners>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>

KPCLib.xunit/PxDatabaseTests.cs

@@ -392,7 +392,7 @@ public class PxLibInfoTests
         public void PxLibVersion() 
         {
             Debug.WriteLine($"{PxLibInfo.Version}");
-            Assert.Equal(PxLibInfo.Version, new System.Version("1.3.0.0"));
+            Assert.Equal(PxLibInfo.Version, new System.Version("1.3.1.0"));
         }
 
         [Fact]

KPCLib.xunit/UserTests.cs

@@ -63,7 +63,7 @@ public void KeyPathTest()
         [Fact]
         public void GetUserNameTest()
         {
-            PxDataFile.GetUsersList();
+            User.GetUsersList();
         }
 
         [Fact]

KPCLib.xunit/pass_d_E8f4pEk.xyz

@@ -6,7 +6,7 @@
     <OutputType>Library</OutputType>
     <StartupObject />
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.3.0.0</Version>
+    <Version>1.3.1.0</Version>
     <PackageProjectUrl>https://github.com/passxyz/KPCLib</PackageProjectUrl>
     <RepositoryUrl>https://github.com/passxyz/KPCLib</RepositoryUrl>
     <Description>This is the build of KeePassLib in Xamarin Portable Class Library. Three platforms, UWP, Android and iOS, are supported and tested.</Description>
@@ -17,8 +17,8 @@
 - Updated to KeePass 2.48.1
 - Fixed an issue in CryptoRandom.cs</PackageReleaseNotes>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <AssemblyVersion>1.3.0.0</AssemblyVersion>
-    <FileVersion>1.3.0.0</FileVersion>
+    <AssemblyVersion>1.3.1.0</AssemblyVersion>
+    <FileVersion>1.3.1.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

KPCLib/KPCLib.csproj

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>PassXYZLib</id>
-        <version>1.3.0.0</version>
+        <version>1.3.1.0</version>
         <authors>Roger Ye</authors>
 		<owners>Roger Ye</owners>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -24,7 +24,7 @@
 			<dependency id="Xamarin.Forms.FontAwesome.Brand" version="1.0.0" exclude="Build,Analyzers" />
 			<dependency id="Xamarin.Forms.FontAwesome.Regular" version="1.0.0" exclude="Build,Analyzers" />
 			<dependency id="Xamarin.Forms.FontAwesome.Solid" version="1.0.0" exclude="Build,Analyzers" />
-			<dependency id="KPCLib" version="1.3.0.0" exclude="Build,Analyzers" />
+			<dependency id="KPCLib" version="1.3.1.0" exclude="Build,Analyzers" />
 		  </group>
 		</dependencies>
         <summary>PassXYZLib added additional features for Xamarin Forms.</summary>

PassXYZLib.nuspec

@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.3.0.0</Version>
-    <AssemblyVersion>1.3.0.0</AssemblyVersion>
-    <FileVersion>1.3.0.0</FileVersion>
+    <Version>1.3.1.0</Version>
+    <AssemblyVersion>1.3.1.0</AssemblyVersion>
+    <FileVersion>1.3.1.0</FileVersion>
     <Company>PassXYZ Inc.</Company>
     <Authors>Roger Ye</Authors>
     <Copyright>Roger Ye</Copyright>

PassXYZLib/PassXYZLib.csproj

@@ -70,26 +70,6 @@ public static string GetUserName(string fileName)
             return trimedName;
         }
 
-        /// <summary>
-        /// Get a list of existing users from the encoded data files
-        /// </summary>
-        /// <returns>user list</returns>
-        public static List<string> GetUsersList()
-        {
-            List<string> userList = new List<string>();
-
-            var dataFiles = Directory.EnumerateFiles(DataFilePath, PxDefs.all_xyz);
-            foreach (string currentFile in dataFiles)
-            {
-                string fileName = currentFile.Substring(DataFilePath.Length + 1);
-                string userName = GetUserName(fileName);
-                if (userName != string.Empty && !string.IsNullOrWhiteSpace(userName))
-                {
-                    userList.Add(userName);
-                }
-            }
-            return userList;
-        }
     }
 
     public class User
@@ -202,6 +182,27 @@ private string GetFileName(bool isDeviceLockEnabled = false)
             }
         }
 
+        /// <summary>
+        /// Get a list of existing users from the encoded data files
+        /// </summary>
+        /// <returns>user list</returns>
+        public static List<string> GetUsersList()
+        {
+            List<string> userList = new List<string>();
+
+            var dataFiles = Directory.EnumerateFiles(PxDataFile.DataFilePath, PxDefs.all_xyz);
+            foreach (string currentFile in dataFiles)
+            {
+                string fileName = currentFile.Substring(PxDataFile.DataFilePath.Length + 1);
+                string userName = PxDataFile.GetUserName(fileName);
+                if (userName != string.Empty && !string.IsNullOrWhiteSpace(userName))
+                {
+                    userList.Add(userName);
+                }
+            }
+            return userList;
+        }
+
         public User()
         {
             IsDeviceLockEnabled = false;