diff --git a/PassXYZLib.nuspec b/PassXYZLib.nuspec index e59318f..f0ae414 100644 --- a/PassXYZLib.nuspec +++ b/PassXYZLib.nuspec @@ -1,70 +1,69 @@  - PassXYZLib - 2.2.1 - Roger Ye - Roger Ye - false - LGPL-3.0-or-later - https://passxyz.github.io/KPCLib/ - This is an extension of KPCLib. - - - Updated PassXYZ to version 3.2.0 - - Roger Ye + PassXYZLib + 3.0.1 + Roger Ye + Roger Ye + false + LGPL-3.0-or-later + https://passxyz.github.io/KPCLib/ + This is an extension of KPCLib. + © Roger Ye 2024 + docs\README.md - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + PassXYZLib added additional features for .NET MAUI. - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/PassXYZLib/PassXYZLib.csproj b/PassXYZLib/PassXYZLib.csproj index 1c29ec6..872b77a 100644 --- a/PassXYZLib/PassXYZLib.csproj +++ b/PassXYZLib/PassXYZLib.csproj @@ -15,61 +15,19 @@ True - 2.2.2 + 3.0.1 en-US true True - - $(DefineConstants);PASSXYZ_CLOUD_SERVICE - 1701;1702;1591 - - - - $(DefineConstants);PASSXYZ_CLOUD_SERVICE - 1701;1702;1591 - - - - 1701;1702;1591 - - - - 1701;1702;1591 - - - - 1701;1702;1591 - - - - 1701;1702;1591 - - - - 1701;1702;1591 - - - - 1701;1702;1591 - - - - 1701;1702;1591 - - - - 1701;1702;1591 - - - + diff --git a/PassXYZLib/PxDatabase.cs b/PassXYZLib/PxDatabase.cs index a27bd79..546553f 100644 --- a/PassXYZLib/PxDatabase.cs +++ b/PassXYZLib/PxDatabase.cs @@ -242,7 +242,9 @@ public static string DefaultFolder { m_DefaultFolder = value; PassXYZ.Utils.Settings.DefaultFolder = m_DefaultFolder; - } + PxDataFile.DataFilePath = m_DefaultFolder; + + } } /// @@ -469,7 +471,7 @@ public void New(PassXYZLib.User user, PxKeyProvider kp = null) /// a key provider instance. If it is null, the key file is created from the /// current system. /// true - created key file, false - failed to create key file. - private bool CreateKeyFile(PassXYZLib.User user, PxKeyProvider kp = null) + private bool CreateKeyFile(PassXYZLib.User user, PxKeyProvider kp = null, bool isNewId = false) { PassXYZ.Utils.Settings.DefaultFolder = PxDataFile.KeyFilePath; PassXYZ.Utils.Settings.User.Username = user.Username; @@ -477,8 +479,10 @@ private bool CreateKeyFile(PassXYZLib.User user, PxKeyProvider kp = null) if (kp == null) { pxKeyProvider = new PxKeyProvider(); - } - return pxKeyProvider.CreateKeyFile(user.Username, PxDataFile.KeyFilePath); + isNewId = true; + + } + return pxKeyProvider.CreateKeyFile(user.Username, PxDataFile.KeyFilePath, isNewId); } /// diff --git a/PureOtp/PureOtp/PureOtp.csproj b/PureOtp/PureOtp/PureOtp.csproj index 1206580..2be320e 100644 --- a/PureOtp/PureOtp/PureOtp.csproj +++ b/PureOtp/PureOtp/PureOtp.csproj @@ -1,7 +1,7 @@ - + - netstandard2.0 + net8.0 true Roger Ye, ByronP Copyright 2018 Coinigy Inc. @@ -22,7 +22,7 @@ - + diff --git a/README.md b/README.md index 0b791a9..da70b1e 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ - **PassXYZLib** - This is the enhancement built on top of KeePassLib, such as localization, OTP etc. Version 1.x.x is built for Xamarin.Forms and 2.0.0 or above is built for .NET MAUI. ### Setup -* Available on NuGet: [![NuGet](https://img.shields.io/nuget/v/Xam.Plugin.Media.svg?label=NuGet)](https://www.nuget.org/packages/KPCLib) -* Build status: [![Build status](https://ci.appveyor.com/api/projects/status/4py18evnh0xxxvi1?svg=true)](https://ci.appveyor.com/project/shugaoye/kpclib-bccwi) -* [Branch strategy](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) -* Version `1.x.x` is built using Visual Studio 2019 and version `2.0.0` or above is built using Visual Studio 2022. +* Available on NuGet: [![NuGet](https://img.shields.io/nuget/v/Xam.Plugin.Media.svg?label=NuGet)](https://www.nuget.org/packages/passxyzlib) +* Version `1.x.x` is built using Visual Studio 2019. +* Version `2.x.x` or above is built using Visual Studio 2022 and .NET 7. +* Version `3.x.x` or above is built using Visual Studio 2022 and .NET 8. [1]: https://github.com/passxyz/KPCLibPy