Merged from dev and build release 3.0.1

passxyz · Sep 7, 2024 · 620b440 · 620b440
2 parents 42d8d74 + e8614c2
commit 620b440
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 94 deletions.
diff --git a/PassXYZLib.nuspec b/PassXYZLib.nuspec
@@ -1,70 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
     <metadata>
-        <id>PassXYZLib</id>
-        <version>2.2.1</version>
-        <authors>Roger Ye</authors>
-		<owners>Roger Ye</owners>
-		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<license type="expression">LGPL-3.0-or-later</license>
-		<projectUrl>https://passxyz.github.io/KPCLib/</projectUrl>
-		<description>This is an extension of KPCLib.</description>
-      <releaseNotes>
-      - Updated PassXYZ to version 3.2.0
-    </releaseNotes>
-		<copyright>Roger Ye</copyright>
+      <id>PassXYZLib</id>
+      <version>3.0.1</version>
+      <authors>Roger Ye</authors>
+		  <owners>Roger Ye</owners>
+		  <requireLicenseAcceptance>false</requireLicenseAcceptance>
+		  <license type="expression">LGPL-3.0-or-later</license>
+		  <projectUrl>https://passxyz.github.io/KPCLib/</projectUrl>
+		  <description>This is an extension of KPCLib.</description>
+		  <copyright>© Roger Ye 2024</copyright>
+      <readme>docs\README.md</readme>
 		<repository url="https://github.com/passxyz/Lib" />
 		<dependencies>
-      <group targetFramework="net7.0">
+      <group targetFramework="net8.0">
         <dependency id="HtmlAgilityPack" version="1.11.57" exclude="Build,Analyzers" />
         <dependency id="Markdig" version="0.23.0" exclude="Build,Analyzers" />
         <dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
-        <dependency id="PassXYZ" version="3.2.0" exclude="Build,Analyzers" />
-        <dependency id="SSH.NET" Version="2023.0.0" exclude="Build,Analyzers" />
+        <dependency id="PassXYZ" version="3.4.0" exclude="Build,Analyzers" />
+        <dependency id="SSH.NET" version="2023.0.0" exclude="Build,Analyzers" />
       </group>
-      <group targetFramework="net7.0-android33.0">
+      <group targetFramework="net8.0-android34.0">
         <dependency id="HtmlAgilityPack" version="1.11.57" exclude="Build,Analyzers" />
         <dependency id="Markdig" version="0.23.0" exclude="Build,Analyzers" />
         <dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
-        <dependency id="PassXYZ" version="3.2.0" exclude="Build,Analyzers" />
-        <dependency id="SSH.NET" Version="2023.0.0" exclude="Build,Analyzers" />
+        <dependency id="PassXYZ" version="3.4.0" exclude="Build,Analyzers" />
+        <dependency id="SSH.NET" version="2023.0.0" exclude="Build,Analyzers" />
       </group>
-      <group targetFramework="net7.0-ios16.1">
+      <group targetFramework="net8.0-ios17.2">
         <dependency id="HtmlAgilityPack" version="1.11.57" exclude="Build,Analyzers" />
         <dependency id="Markdig" version="0.23.0" exclude="Build,Analyzers" />
         <dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
-        <dependency id="PassXYZ" version="3.2.0" exclude="Build,Analyzers" />
-        <dependency id="SSH.NET" Version="2023.0.0" exclude="Build,Analyzers" />
+        <dependency id="PassXYZ" version="3.4.0" exclude="Build,Analyzers" />
+        <dependency id="SSH.NET" version="2023.0.0" exclude="Build,Analyzers" />
       </group>
-      <group targetFramework="net7.0-maccatalyst16.1">
+      <group targetFramework="net8.0-maccatalyst17.2">
         <dependency id="HtmlAgilityPack" version="1.11.57" exclude="Build,Analyzers" />
         <dependency id="Markdig" version="0.23.0" exclude="Build,Analyzers" />
         <dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
-        <dependency id="PassXYZ" version="3.2.0" exclude="Build,Analyzers" />
-        <dependency id="SSH.NET" Version="2023.0.0" exclude="Build,Analyzers" />
+        <dependency id="PassXYZ" version="3.4.0" exclude="Build,Analyzers" />
+        <dependency id="SSH.NET" version="2023.0.0" exclude="Build,Analyzers" />
       </group>
-      <group targetFramework="net7.0-windows10.0.19041">
+      <group targetFramework="net8.0-windows10.0.19041">
         <dependency id="HtmlAgilityPack" version="1.11.57" exclude="Build,Analyzers" />
         <dependency id="Markdig" version="0.23.0" exclude="Build,Analyzers" />
         <dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
-        <dependency id="PassXYZ" version="3.2.0" exclude="Build,Analyzers" />
-        <dependency id="SSH.NET" Version="2023.0.0" exclude="Build,Analyzers" />
+        <dependency id="PassXYZ" version="3.4.0" exclude="Build,Analyzers" />
+        <dependency id="SSH.NET" version="2023.0.0" exclude="Build,Analyzers" />
       </group>
     </dependencies>
         <summary>PassXYZLib added additional features for .NET MAUI.</summary>
     </metadata>
   <files>
-    <file src="PassXYZLib/bin/Release/net7.0/PassXYZLib.dll" target="lib/net7.0/PassXYZLib.dll" />
-    <file src="PassXYZLib/bin/Release/net7.0/PureOtp.dll" target="lib/net7.0/PureOtp.dll" />
-    <file src="PassXYZLib/bin/Release/net7.0-android/PassXYZLib.dll" target="lib/net7.0-android33.0/PassXYZLib.dll" />
-    <file src="PassXYZLib/bin/Release/net7.0-android/PassXYZLib.aar" target="lib/net7.0-android33.0/PassXYZLib.aar" />
-    <file src="PassXYZLib/bin/Release/net7.0-android/PassXYZLib.xml" target="lib/net7.0-android33.0/PassXYZLib.xml" />
-    <file src="PassXYZLib/bin/Release/net7.0-android/PureOtp.dll" target="lib/net7.0-android33.0/PureOtp.dll" />
-    <file src="PassXYZLib/bin/Release/net7.0-ios/PassXYZLib.dll" target="lib/net7.0-ios16.1/PassXYZLib.dll" />
-    <file src="PassXYZLib/bin/Release/net7.0-ios/PureOtp.dll" target="lib/net7.0-ios16.1/PureOtp.dll" />
-    <file src="PassXYZLib/bin/Release/net7.0-maccatalyst/PassXYZLib.dll" target="lib/net7.0-maccatalyst16.1/PassXYZLib.dll" />
-    <file src="PassXYZLib/bin/Release/net7.0-maccatalyst/PureOtp.dll" target="lib/net7.0-maccatalyst16.1/PureOtp.dll" />
-    <file src="PassXYZLib/bin/Release/net7.0-windows10.0.19041.0/PassXYZLib.dll" target="lib/net7.0-windows10.0.19041/PassXYZLib.dll" />
-    <file src="PassXYZLib/bin/Release/net7.0-windows10.0.19041.0/PureOtp.dll" target="lib/net7.0-windows10.0.19041/PureOtp.dll" />
+    <file src="README.md" target="docs\" />
+    <file src="PassXYZLib/bin/Release/net8.0/PassXYZLib.dll" target="lib/net8.0/PassXYZLib.dll" />
+    <file src="PassXYZLib/bin/Release/net8.0/PureOtp.dll" target="lib/net8.0/PureOtp.dll" />
+    <file src="PassXYZLib/bin/Release/net8.0-android/PassXYZLib.dll" target="lib/net8.0-android34.0/PassXYZLib.dll" />
+    <file src="PassXYZLib/bin/Release/net8.0-android/PassXYZLib.xml" target="lib/net8.0-android34.0/PassXYZLib.xml" />
+    <file src="PassXYZLib/bin/Release/net8.0-android/PureOtp.dll" target="lib/net8.0-android34.0/PureOtp.dll" />
+    <file src="PassXYZLib/bin/Release/net8.0-ios/PassXYZLib.dll" target="lib/net8.0-ios17.2/PassXYZLib.dll" />
+    <file src="PassXYZLib/bin/Release/net8.0-ios/PureOtp.dll" target="lib/net8.0-ios17.2/PureOtp.dll" />
+    <file src="PassXYZLib/bin/Release/net8.0-ios/PassXYZLib.xml" target="lib/net8.0-ios17.2/PassXYZLib.xml" />
+    <file src="PassXYZLib/bin/Release/net8.0-maccatalyst/PassXYZLib.dll" target="lib/net8.0-maccatalyst17.2/PassXYZLib.dll" />
+    <file src="PassXYZLib/bin/Release/net8.0-maccatalyst/PureOtp.dll" target="lib/net8.0-maccatalyst17.2/PureOtp.dll" />
+    <file src="PassXYZLib/bin/Release/net8.0-windows10.0.19041.0/PassXYZLib.dll" target="lib/net8.0-windows10.0.19041/PassXYZLib.dll" />
+    <file src="PassXYZLib/bin/Release/net8.0-windows10.0.19041.0/PureOtp.dll" target="lib/net8.0-windows10.0.19041/PureOtp.dll" />
   </files>
 </package>
diff --git a/PassXYZLib/PassXYZLib.csproj b/PassXYZLib/PassXYZLib.csproj
@@ -15,61 +15,19 @@
 
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
-    <Version>2.2.2</Version>
+    <Version>3.0.1</Version>
     <NeutralLanguage>en-US</NeutralLanguage>
     <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">
-    <DefineConstants>$(DefineConstants);PASSXYZ_CLOUD_SERVICE</DefineConstants>
-    <NoWarn>1701;1702;1591</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|AnyCPU'">
-    <DefineConstants>$(DefineConstants);PASSXYZ_CLOUD_SERVICE</DefineConstants>
-    <NoWarn>1701;1702;1591</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-android|AnyCPU'">
-    <NoWarn>1701;1702;1591</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-ios|AnyCPU'">
-    <NoWarn>1701;1702;1591</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-maccatalyst|AnyCPU'">
-    <NoWarn>1701;1702;1591</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-windows10.0.19041.0|AnyCPU'">
-    <NoWarn>1701;1702;1591</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-android|AnyCPU'">
-    <NoWarn>1701;1702;1591</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-ios|AnyCPU'">
-    <NoWarn>1701;1702;1591</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-maccatalyst|AnyCPU'">
-    <NoWarn>1701;1702;1591</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-windows10.0.19041.0|AnyCPU'">
-    <NoWarn>1701;1702;1591</NoWarn>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
     <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.57" />
     <PackageReference Include="Markdig" Version="0.23.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="PassXYZ" Version="3.3.0" />
+    <PackageReference Include="PassXYZ" Version="3.4.0" />
     <PackageReference Include="SSH.NET" Version="2023.0.0" />
   </ItemGroup>
 

diff --git 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;
+
+            }
 		}
 
 		/// <summary>
@@ -469,16 +471,18 @@ public void New(PassXYZLib.User user, PxKeyProvider kp = null)
         /// <param name="kp">a key provider instance. If it is null, the key file is created from the 
         /// current system.</param>
         /// <returns>true - created key file, false - failed to create key file.</returns>
-        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;
 			PxKeyProvider pxKeyProvider = kp;
 			if (kp == null)
 			{
 				pxKeyProvider = new PxKeyProvider();
-			}
-            return pxKeyProvider.CreateKeyFile(user.Username, PxDataFile.KeyFilePath);
+				isNewId = true;
+
+            }
+            return pxKeyProvider.CreateKeyFile(user.Username, PxDataFile.KeyFilePath, isNewId);
         }
 
         /// <summary>

diff --git a/PureOtp/PureOtp/PureOtp.csproj b/PureOtp/PureOtp/PureOtp.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Roger Ye, ByronP</Authors>
     <Copyright>Copyright 2018 Coinigy Inc.</Copyright>
@@ -22,7 +22,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.8" />
     <PackageReference Include="Wiry.Base32" Version="1.1.1" />
   </ItemGroup>
 

diff --git 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