Skip to content

Commit 81d1cfa

Browse files
passxyzpassxyz
authored
Merge pull request #5 from shugaoye/main
Release 3.0.1
2 parents cb3cd3e + 620b440 commit 81d1cfa

File tree

95 files changed

+11799
-826
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+11799
-826
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
path = PureOtp
33
url = https://github.com/shugaoye/PureOtp.git
44
branch = passxyz
5+
[submodule "Documentation"]
6+
path = Documentation
7+
url = https://github.com/shugaoye/PassXYZLibDoc.git

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
## Change log
22

3+
### 2.2.2Alpha
4+
- Updated to .NET 8
5+
- Added `PxEnvironment` and test project `UITest`
6+
7+
### 2.2.1
8+
- Updated PassXYZ to 3.2.0
9+
10+
### 2.2.0
11+
- Enabled PASSXYZ_CLOUD_SERVICE
12+
313
### 2.0.2
414
- Built for .NET MAUI GA release
515

‎Documentation‎

Submodule Documentation added at 24e8cb5

‎PassXYZLib.nuspec‎

Lines changed: 43 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,69 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
4-
<id>PassXYZLib</id>
5-
<version>2.1.1</version>
6-
<authors>Roger Ye</authors>
7-
<owners>Roger Ye</owners>
8-
<requireLicenseAcceptance>false</requireLicenseAcceptance>
9-
<license type="expression">LGPL-3.0-or-later</license>
10-
<projectUrl>https://passxyz.github.io/KPCLib/</projectUrl>
11-
<description>This is an extension of KPCLib.</description>
12-
<releaseNotes>
13-
- Updated to version 2.1.1
14-
</releaseNotes>
15-
<copyright>Roger Ye</copyright>
4+
<id>PassXYZLib</id>
5+
<version>3.0.1</version>
6+
<authors>Roger Ye</authors>
7+
<owners>Roger Ye</owners>
8+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
9+
<license type="expression">LGPL-3.0-or-later</license>
10+
<projectUrl>https://passxyz.github.io/KPCLib/</projectUrl>
11+
<description>This is an extension of KPCLib.</description>
12+
<copyright>© Roger Ye 2024</copyright>
13+
<readme>docs\README.md</readme>
1614
<repository url="https://github.com/passxyz/Lib" />
1715
<dependencies>
18-
<group targetFramework="net7.0">
19-
<dependency id="HtmlAgilityPack" version="1.11.46" exclude="Build,Analyzers" />
16+
<group targetFramework="net8.0">
17+
<dependency id="HtmlAgilityPack" version="1.11.57" exclude="Build,Analyzers" />
2018
<dependency id="Markdig" version="0.23.0" exclude="Build,Analyzers" />
2119
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
22-
<dependency id="PassXYZ" version="3.1.0" exclude="Build,Analyzers" />
20+
<dependency id="PassXYZ" version="3.4.0" exclude="Build,Analyzers" />
21+
<dependency id="SSH.NET" version="2023.0.0" exclude="Build,Analyzers" />
2322
</group>
24-
<group targetFramework="net7.0-android33.0">
25-
<dependency id="HtmlAgilityPack" version="1.11.46" exclude="Build,Analyzers" />
23+
<group targetFramework="net8.0-android34.0">
24+
<dependency id="HtmlAgilityPack" version="1.11.57" exclude="Build,Analyzers" />
2625
<dependency id="Markdig" version="0.23.0" exclude="Build,Analyzers" />
2726
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
28-
<dependency id="PassXYZ" version="3.1.0" exclude="Build,Analyzers" />
27+
<dependency id="PassXYZ" version="3.4.0" exclude="Build,Analyzers" />
28+
<dependency id="SSH.NET" version="2023.0.0" exclude="Build,Analyzers" />
2929
</group>
30-
<group targetFramework="net7.0-ios16.1">
31-
<dependency id="HtmlAgilityPack" version="1.11.46" exclude="Build,Analyzers" />
30+
<group targetFramework="net8.0-ios17.2">
31+
<dependency id="HtmlAgilityPack" version="1.11.57" exclude="Build,Analyzers" />
3232
<dependency id="Markdig" version="0.23.0" exclude="Build,Analyzers" />
3333
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
34-
<dependency id="PassXYZ" version="3.1.0" exclude="Build,Analyzers" />
34+
<dependency id="PassXYZ" version="3.4.0" exclude="Build,Analyzers" />
35+
<dependency id="SSH.NET" version="2023.0.0" exclude="Build,Analyzers" />
3536
</group>
36-
<group targetFramework="net7.0-maccatalyst16.1">
37-
<dependency id="HtmlAgilityPack" version="1.11.46" exclude="Build,Analyzers" />
37+
<group targetFramework="net8.0-maccatalyst17.2">
38+
<dependency id="HtmlAgilityPack" version="1.11.57" exclude="Build,Analyzers" />
3839
<dependency id="Markdig" version="0.23.0" exclude="Build,Analyzers" />
3940
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
40-
<dependency id="PassXYZ" version="3.1.0" exclude="Build,Analyzers" />
41+
<dependency id="PassXYZ" version="3.4.0" exclude="Build,Analyzers" />
42+
<dependency id="SSH.NET" version="2023.0.0" exclude="Build,Analyzers" />
4143
</group>
42-
<group targetFramework="net7.0-windows10.0.19041">
43-
<dependency id="HtmlAgilityPack" version="1.11.46" exclude="Build,Analyzers" />
44+
<group targetFramework="net8.0-windows10.0.19041">
45+
<dependency id="HtmlAgilityPack" version="1.11.57" exclude="Build,Analyzers" />
4446
<dependency id="Markdig" version="0.23.0" exclude="Build,Analyzers" />
4547
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
46-
<dependency id="PassXYZ" version="3.1.0" exclude="Build,Analyzers" />
48+
<dependency id="PassXYZ" version="3.4.0" exclude="Build,Analyzers" />
49+
<dependency id="SSH.NET" version="2023.0.0" exclude="Build,Analyzers" />
4750
</group>
4851
</dependencies>
4952
<summary>PassXYZLib added additional features for .NET MAUI.</summary>
5053
</metadata>
5154
<files>
52-
<file src="PassXYZLib/bin/Release/net7.0/PassXYZLib.dll" target="lib/net7.0/PassXYZLib.dll" />
53-
<file src="PassXYZLib/bin/Release/net7.0/PureOtp.dll" target="lib/net7.0/PureOtp.dll" />
54-
<file src="PassXYZLib/bin/Release/net7.0-android/PassXYZLib.dll" target="lib/net7.0-android33.0/PassXYZLib.dll" />
55-
<file src="PassXYZLib/bin/Release/net7.0-android/PassXYZLib.aar" target="lib/net7.0-android33.0/PassXYZLib.aar" />
56-
<file src="PassXYZLib/bin/Release/net7.0-android/PassXYZLib.xml" target="lib/net7.0-android33.0/PassXYZLib.xml" />
57-
<file src="PassXYZLib/bin/Release/net7.0-android/PureOtp.dll" target="lib/net7.0-android33.0/PureOtp.dll" />
58-
<file src="PassXYZLib/bin/Release/net7.0-ios/PassXYZLib.dll" target="lib/net7.0-ios16.1/PassXYZLib.dll" />
59-
<file src="PassXYZLib/bin/Release/net7.0-ios/PureOtp.dll" target="lib/net7.0-ios16.1/PureOtp.dll" />
60-
<file src="PassXYZLib/bin/Release/net7.0-maccatalyst/PassXYZLib.dll" target="lib/net7.0-maccatalyst16.1/PassXYZLib.dll" />
61-
<file src="PassXYZLib/bin/Release/net7.0-maccatalyst/PureOtp.dll" target="lib/net7.0-maccatalyst16.1/PureOtp.dll" />
62-
<file src="PassXYZLib/bin/Release/net7.0-windows10.0.19041.0/PassXYZLib.dll" target="lib/net7.0-windows10.0.19041/PassXYZLib.dll" />
63-
<file src="PassXYZLib/bin/Release/net7.0-windows10.0.19041.0/PureOtp.dll" target="lib/net7.0-windows10.0.19041/PureOtp.dll" />
55+
<file src="README.md" target="docs\" />
56+
<file src="PassXYZLib/bin/Release/net8.0/PassXYZLib.dll" target="lib/net8.0/PassXYZLib.dll" />
57+
<file src="PassXYZLib/bin/Release/net8.0/PureOtp.dll" target="lib/net8.0/PureOtp.dll" />
58+
<file src="PassXYZLib/bin/Release/net8.0-android/PassXYZLib.dll" target="lib/net8.0-android34.0/PassXYZLib.dll" />
59+
<file src="PassXYZLib/bin/Release/net8.0-android/PassXYZLib.xml" target="lib/net8.0-android34.0/PassXYZLib.xml" />
60+
<file src="PassXYZLib/bin/Release/net8.0-android/PureOtp.dll" target="lib/net8.0-android34.0/PureOtp.dll" />
61+
<file src="PassXYZLib/bin/Release/net8.0-ios/PassXYZLib.dll" target="lib/net8.0-ios17.2/PassXYZLib.dll" />
62+
<file src="PassXYZLib/bin/Release/net8.0-ios/PureOtp.dll" target="lib/net8.0-ios17.2/PureOtp.dll" />
63+
<file src="PassXYZLib/bin/Release/net8.0-ios/PassXYZLib.xml" target="lib/net8.0-ios17.2/PassXYZLib.xml" />
64+
<file src="PassXYZLib/bin/Release/net8.0-maccatalyst/PassXYZLib.dll" target="lib/net8.0-maccatalyst17.2/PassXYZLib.dll" />
65+
<file src="PassXYZLib/bin/Release/net8.0-maccatalyst/PureOtp.dll" target="lib/net8.0-maccatalyst17.2/PureOtp.dll" />
66+
<file src="PassXYZLib/bin/Release/net8.0-windows10.0.19041.0/PassXYZLib.dll" target="lib/net8.0-windows10.0.19041/PassXYZLib.dll" />
67+
<file src="PassXYZLib/bin/Release/net8.0-windows10.0.19041.0/PureOtp.dll" target="lib/net8.0-windows10.0.19041/PureOtp.dll" />
6468
</files>
6569
</package>

‎PassXYZLib.sln‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PureOtp", "PureOtp\PureOtp\
1717
EndProject
1818
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PassXYZLib.xunit", "PassXYZLib.xunit\PassXYZLib.xunit.csproj", "{9FE01E8A-B87F-4B86-806A-C79C05B2CF18}"
1919
EndProject
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITest", "UITest\UITest.csproj", "{6E85E69B-8565-4715-817F-F488B5DE3B35}"
21+
EndProject
2022
Global
2123
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2224
Debug|Any CPU = Debug|Any CPU
@@ -77,6 +79,30 @@ Global
7779
{9FE01E8A-B87F-4B86-806A-C79C05B2CF18}.Release|x64.Build.0 = Release|Any CPU
7880
{9FE01E8A-B87F-4B86-806A-C79C05B2CF18}.Release|x86.ActiveCfg = Release|Any CPU
7981
{9FE01E8A-B87F-4B86-806A-C79C05B2CF18}.Release|x86.Build.0 = Release|Any CPU
82+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
83+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Debug|Any CPU.Build.0 = Debug|Any CPU
84+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
85+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Debug|ARM.ActiveCfg = Debug|Any CPU
86+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Debug|ARM.Build.0 = Debug|Any CPU
87+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Debug|ARM.Deploy.0 = Debug|Any CPU
88+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Debug|x64.ActiveCfg = Debug|Any CPU
89+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Debug|x64.Build.0 = Debug|Any CPU
90+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Debug|x64.Deploy.0 = Debug|Any CPU
91+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Debug|x86.ActiveCfg = Debug|Any CPU
92+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Debug|x86.Build.0 = Debug|Any CPU
93+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Debug|x86.Deploy.0 = Debug|Any CPU
94+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Release|Any CPU.ActiveCfg = Release|Any CPU
95+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Release|Any CPU.Build.0 = Release|Any CPU
96+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Release|Any CPU.Deploy.0 = Release|Any CPU
97+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Release|ARM.ActiveCfg = Release|Any CPU
98+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Release|ARM.Build.0 = Release|Any CPU
99+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Release|ARM.Deploy.0 = Release|Any CPU
100+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Release|x64.ActiveCfg = Release|Any CPU
101+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Release|x64.Build.0 = Release|Any CPU
102+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Release|x64.Deploy.0 = Release|Any CPU
103+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Release|x86.ActiveCfg = Release|Any CPU
104+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Release|x86.Build.0 = Release|Any CPU
105+
{6E85E69B-8565-4715-817F-F488B5DE3B35}.Release|x86.Deploy.0 = Release|Any CPU
80106
EndGlobalSection
81107
GlobalSection(SolutionProperties) = preSolution
82108
HideSolutionNode = FALSE

‎PassXYZLib.xunit/PassXYZ/DeviceLockTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace xunit.PassXYZ
1616
{
1717
public class DeviceLockFixture : IDisposable
1818
{
19-
const string TEST_DB = "pass_e_JyHzpRxcopt.xyz";
19+
const string TEST_DB = "pass_e_2TjEf1Dy9V2jiEgbS.xyz";
2020
const string TEST_DB_KEY = "123123";
2121

2222
public DeviceLockFixture()
@@ -58,7 +58,7 @@ public DeviceLockTests(DeviceLockFixture deviceLockFixture)
5858
this.passxyz = deviceLockFixture;
5959
}
6060

61-
[Fact]
61+
[Fact (Skip = "This test can only work in .NET 7 or below")]
6262
public void GetKeyDataTest()
6363
{
6464
var data = PxKeyData.FromBase64String(TEST_DB_KEY_DATA);
@@ -88,8 +88,8 @@ public void CurrentPathTests()
8888
Assert.NotNull(currentPath);
8989
}
9090

91-
[Theory]
92-
[InlineData("/kpclibpy/Database/Oracle")]
91+
[Theory(Skip = "Need to fix this test case")]
92+
[InlineData("/MixedKeyData/Database/TestDataWithPIN")]
9393
/// <summary>
9494
/// Change a protect field
9595
/// </summary>

‎PassXYZLib.xunit/PassXYZ/MockDeviceInfo.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ public class MockDeviceInfo : IDeviceInfo
1212
public string Model => "Lib";
1313
public string Manufacturer => "PassXYZ";
1414
public string Name => "PassXYZLib";
15-
public Version Version => new(1, 0, 0, 0);
15+
public Version Version => new(1, 0, 1, 0);
1616
public string VersionString => Version.ToString();
17-
public DevicePlatform Platform => new();
18-
public DeviceIdiom Idiom => new();
19-
public DeviceType DeviceType => new();
17+
public DevicePlatform Platform => DevicePlatform.WinUI;
18+
public DeviceIdiom Idiom => DeviceIdiom.Desktop;
19+
public DeviceType DeviceType => DeviceType.Physical;
2020
}
2121
}

‎PassXYZLib.xunit/PassXYZ/NewDatabaseTests.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using PassXYZ.Utils;
33
using System.Diagnostics;
44
using PassXYZ.Services;
5+
using PassXYZLib;
56

67
namespace PassXYZLib.xunit.PassXYZ
78
{
@@ -58,6 +59,14 @@ public void IsOpenDbTest()
5859
Assert.True((_db.IsOpen));
5960
}
6061

62+
[Fact]
63+
public void GetDeviceLockDataTest()
64+
{
65+
Connect();
66+
var msg = PxDatabase.GetDeviceLockData(_testUser);
67+
Debug.WriteLine(msg);
68+
}
69+
6170
[Fact]
6271
public void DeleteUserTest()
6372
{

‎PassXYZLib.xunit/PassXYZ/OldDatabaseTests.cs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,22 @@ void Connect()
5656
}
5757
}
5858

59-
[Fact]
59+
[Fact(Skip = "This test can only work in .NET 7 or below")]
6060
public void IsOpenDbTest()
6161
{
6262
Connect();
6363
Debug.WriteLine($"Username is {_testUser.Username}.");
6464
Assert.True((_db.IsOpen));
6565
}
6666

67+
[Fact(Skip = "This test can only work in .NET 7 or below")]
68+
public void GetDeviceLockDataTest()
69+
{
70+
Connect();
71+
var msg = PxDatabase.GetDeviceLockData(_testUser);
72+
Debug.WriteLine(msg);
73+
}
74+
6775
[Fact]
6876
public void DeleteUserTest()
6977
{

‎PassXYZLib.xunit/PassXYZLib.xunit.csproj‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,35 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<Version>2.0.0</Version>
77

88
<IsPackable>false</IsPackable>
99
<UseMaui>true</UseMaui>
10+
<MauiVersion>8.0.80</MauiVersion>
1011

1112
<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</SupportedOSPlatformVersion>
1213
<TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</TargetPlatformMinVersion>
1314

1415
</PropertyGroup>
1516

17+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
18+
<DefineConstants>$(DefineConstants);PASSXYZ_CLOUD_SERVICE</DefineConstants>
19+
</PropertyGroup>
20+
21+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
22+
<DefineConstants>$(DefineConstants);PASSXYZ_CLOUD_SERVICE</DefineConstants>
23+
</PropertyGroup>
24+
1625
<ItemGroup>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
18-
<PackageReference Include="xunit" Version="2.4.1" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
26+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
27+
<PackageReference Include="xunit" Version="2.6.4" />
28+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
2029
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2130
<PrivateAssets>all</PrivateAssets>
2231
</PackageReference>
23-
<PackageReference Include="coverlet.collector" Version="3.1.0">
32+
<PackageReference Include="coverlet.collector" Version="6.0.0">
2433
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2534
<PrivateAssets>all</PrivateAssets>
2635
</PackageReference>
@@ -36,6 +45,8 @@
3645
<DataFiles Include="$(ProjectDir)\pass_d_E8f4pEk.xyz" />
3746
<DataFiles Include="$(ProjectDir)\pass_e_JyHzpRxcopt.xyz" />
3847
<DataFiles Include="$(ProjectDir)\pass_k_JyHzpRxcopt.k4xyz" />
48+
<DataFiles Include="$(ProjectDir)\pass_e_2TjEf1Dy9V2jiEgbS.xyz" />
49+
<DataFiles Include="$(ProjectDir)\pass_k_2TjEf1Dy9V2jiEgbS.k4xyz" />
3950
<DataFiles Include="$(ProjectDir)\pass_e_EFZGmRz.xyz" />
4051
<DataFiles Include="$(ProjectDir)\pass_k_EFZGmRz.k4xyz" />
4152
</ItemGroup>

0 commit comments

Comments
 (0)