Skip to content

Commit 3577444

Browse files
shugaoyeshugaoye
authored
Merge pull request #22 from shugaoye/master
Build 2.0.4
2 parents dbbd523 + 132f73c commit 3577444

File tree

145 files changed

+703
-4100
lines changed

Some content is hidden

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

145 files changed

+703
-4100
lines changed

‎.gitmodules‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎KPCLib.nuspec‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>KPCLib</id>
5-
<version>1.3.8.0</version>
5+
<version>2.0.4</version>
66
<authors>Roger Ye</authors>
77
<owners>Roger Ye</owners>
88
<requireLicenseAcceptance>false</requireLicenseAcceptance>
99
<license type="expression">LGPL-3.0-or-later</license>
10-
<projectUrl>https://github.com/passxyz/KPCLib</projectUrl>
11-
<description>This is the build of KeePassLib in Xamarin Portable Class Library. Three platforms, UWP, Android and iOS, are supported and tested.</description>
10+
<projectUrl>https://passxyz.github.io</projectUrl>
11+
<description>This is a .NET standard 2.0 build of KeePassLib.</description>
1212
<releaseNotes>
13-
- Added Exists() in ProtectedBinaryDictionary
14-
</releaseNotes>
15-
<copyright>Dominik Reichl is the author of the original KeePassLib on Windows platform. Roger Ye updated and enhanced this library for .NET Standard.</copyright>
13+
- Refactored the project structure, build using .NET 8.0
14+
</releaseNotes>
15+
<copyright>Dominik Reichl is the author of KeePassLib on Windows platform. Roger Ye updated and enhanced this library for .NET Standard.</copyright>
1616
<repository url="https://github.com/passxyz/KPCLib" />
1717
<dependencies>
1818
<group targetFramework=".NETStandard2.0">
19-
<dependency id="SkiaSharp" version="2.80.2" exclude="Build,Analyzers" />
20-
<dependency id="Svg.Skia" version="0.5.3" exclude="Build,Analyzers" />
19+
<dependency id="SkiaSharp" version="2.88.6" exclude="Build,Analyzers" />
20+
<dependency id="Svg.Skia" version="1.0.0.9" exclude="Build,Analyzers" />
2121
</group>
2222
</dependencies>
2323
<summary>KeePassLib built as .NET Standard Library</summary>
2424
</metadata>
2525
<files>
2626
<file src="KPCLib/bin/Release/netstandard2.0/KPCLib.dll" target="lib/netstandard2.0/KPCLib.dll" />
27-
<file src="KPCLib/bin/Release/netstandard2.0/PureOtp.dll" target="lib/netstandard2.0/PureOtp.dll" />
27+
<file src="KeePassLib/bin/Release/netstandard2.0/KeePassLib.dll" target="lib/netstandard2.0/KeePassLib.dll" />
2828
</files>
2929
</package>

‎KPCLib.sln‎

Lines changed: 20 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.31025.194
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.1.32113.165
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KPCLib", "KPCLib\KPCLib.csproj", "{3F08B816-6E5F-4DB5-9BF5-4EDF9E662855}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KeePassLib", "KeePassLib\KeePassLib.csproj", "{3F08B816-6E5F-4DB5-9BF5-4EDF9E662855}"
77
EndProject
88
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KPCLib.xunit", "KPCLib.xunit\KPCLib.xunit.csproj", "{4764BB09-267A-4760-AE2D-6979BDA5FB88}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PassXYZLib", "PassXYZLib\PassXYZLib.csproj", "{E6F6B65A-6474-4978-9F9C-F22194688240}"
11-
EndProject
1210
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B5CFEC4A-7D25-4D24-B4F7-A568E1DF4750}"
1311
ProjectSection(SolutionItems) = preProject
1412
appveyor.yml = appveyor.yml
1513
CHANGELOG.md = CHANGELOG.md
1614
KPCLib.nuspec = KPCLib.nuspec
17-
PassXYZLib.nuspec = PassXYZLib.nuspec
1815
README.md = README.md
1916
EndProjectSection
2017
EndProject
21-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PureOtp", "PureOtp\PureOtp\PureOtp.csproj", "{6361E2B1-FAC9-4D2E-9876-90A37E516598}"
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KPCLib", "KPCLib\KPCLib.csproj", "{B072D007-02BD-4A84-9255-8492A3E16667}"
2219
EndProject
2320
Global
2421
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -64,38 +61,22 @@ Global
6461
{4764BB09-267A-4760-AE2D-6979BDA5FB88}.Release|x64.Build.0 = Release|Any CPU
6562
{4764BB09-267A-4760-AE2D-6979BDA5FB88}.Release|x86.ActiveCfg = Release|Any CPU
6663
{4764BB09-267A-4760-AE2D-6979BDA5FB88}.Release|x86.Build.0 = Release|Any CPU
67-
{E6F6B65A-6474-4978-9F9C-F22194688240}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68-
{E6F6B65A-6474-4978-9F9C-F22194688240}.Debug|Any CPU.Build.0 = Debug|Any CPU
69-
{E6F6B65A-6474-4978-9F9C-F22194688240}.Debug|ARM.ActiveCfg = Debug|Any CPU
70-
{E6F6B65A-6474-4978-9F9C-F22194688240}.Debug|ARM.Build.0 = Debug|Any CPU
71-
{E6F6B65A-6474-4978-9F9C-F22194688240}.Debug|x64.ActiveCfg = Debug|Any CPU
72-
{E6F6B65A-6474-4978-9F9C-F22194688240}.Debug|x64.Build.0 = Debug|Any CPU
73-
{E6F6B65A-6474-4978-9F9C-F22194688240}.Debug|x86.ActiveCfg = Debug|Any CPU
74-
{E6F6B65A-6474-4978-9F9C-F22194688240}.Debug|x86.Build.0 = Debug|Any CPU
75-
{E6F6B65A-6474-4978-9F9C-F22194688240}.Release|Any CPU.ActiveCfg = Release|Any CPU
76-
{E6F6B65A-6474-4978-9F9C-F22194688240}.Release|Any CPU.Build.0 = Release|Any CPU
77-
{E6F6B65A-6474-4978-9F9C-F22194688240}.Release|ARM.ActiveCfg = Release|Any CPU
78-
{E6F6B65A-6474-4978-9F9C-F22194688240}.Release|ARM.Build.0 = Release|Any CPU
79-
{E6F6B65A-6474-4978-9F9C-F22194688240}.Release|x64.ActiveCfg = Release|Any CPU
80-
{E6F6B65A-6474-4978-9F9C-F22194688240}.Release|x64.Build.0 = Release|Any CPU
81-
{E6F6B65A-6474-4978-9F9C-F22194688240}.Release|x86.ActiveCfg = Release|Any CPU
82-
{E6F6B65A-6474-4978-9F9C-F22194688240}.Release|x86.Build.0 = Release|Any CPU
83-
{6361E2B1-FAC9-4D2E-9876-90A37E516598}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
84-
{6361E2B1-FAC9-4D2E-9876-90A37E516598}.Debug|Any CPU.Build.0 = Debug|Any CPU
85-
{6361E2B1-FAC9-4D2E-9876-90A37E516598}.Debug|ARM.ActiveCfg = Debug|Any CPU
86-
{6361E2B1-FAC9-4D2E-9876-90A37E516598}.Debug|ARM.Build.0 = Debug|Any CPU
87-
{6361E2B1-FAC9-4D2E-9876-90A37E516598}.Debug|x64.ActiveCfg = Debug|Any CPU
88-
{6361E2B1-FAC9-4D2E-9876-90A37E516598}.Debug|x64.Build.0 = Debug|Any CPU
89-
{6361E2B1-FAC9-4D2E-9876-90A37E516598}.Debug|x86.ActiveCfg = Debug|Any CPU
90-
{6361E2B1-FAC9-4D2E-9876-90A37E516598}.Debug|x86.Build.0 = Debug|Any CPU
91-
{6361E2B1-FAC9-4D2E-9876-90A37E516598}.Release|Any CPU.ActiveCfg = Release|Any CPU
92-
{6361E2B1-FAC9-4D2E-9876-90A37E516598}.Release|Any CPU.Build.0 = Release|Any CPU
93-
{6361E2B1-FAC9-4D2E-9876-90A37E516598}.Release|ARM.ActiveCfg = Release|Any CPU
94-
{6361E2B1-FAC9-4D2E-9876-90A37E516598}.Release|ARM.Build.0 = Release|Any CPU
95-
{6361E2B1-FAC9-4D2E-9876-90A37E516598}.Release|x64.ActiveCfg = Release|Any CPU
96-
{6361E2B1-FAC9-4D2E-9876-90A37E516598}.Release|x64.Build.0 = Release|Any CPU
97-
{6361E2B1-FAC9-4D2E-9876-90A37E516598}.Release|x86.ActiveCfg = Release|Any CPU
98-
{6361E2B1-FAC9-4D2E-9876-90A37E516598}.Release|x86.Build.0 = Release|Any CPU
64+
{B072D007-02BD-4A84-9255-8492A3E16667}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
65+
{B072D007-02BD-4A84-9255-8492A3E16667}.Debug|Any CPU.Build.0 = Debug|Any CPU
66+
{B072D007-02BD-4A84-9255-8492A3E16667}.Debug|ARM.ActiveCfg = Debug|Any CPU
67+
{B072D007-02BD-4A84-9255-8492A3E16667}.Debug|ARM.Build.0 = Debug|Any CPU
68+
{B072D007-02BD-4A84-9255-8492A3E16667}.Debug|x64.ActiveCfg = Debug|Any CPU
69+
{B072D007-02BD-4A84-9255-8492A3E16667}.Debug|x64.Build.0 = Debug|Any CPU
70+
{B072D007-02BD-4A84-9255-8492A3E16667}.Debug|x86.ActiveCfg = Debug|Any CPU
71+
{B072D007-02BD-4A84-9255-8492A3E16667}.Debug|x86.Build.0 = Debug|Any CPU
72+
{B072D007-02BD-4A84-9255-8492A3E16667}.Release|Any CPU.ActiveCfg = Release|Any CPU
73+
{B072D007-02BD-4A84-9255-8492A3E16667}.Release|Any CPU.Build.0 = Release|Any CPU
74+
{B072D007-02BD-4A84-9255-8492A3E16667}.Release|ARM.ActiveCfg = Release|Any CPU
75+
{B072D007-02BD-4A84-9255-8492A3E16667}.Release|ARM.Build.0 = Release|Any CPU
76+
{B072D007-02BD-4A84-9255-8492A3E16667}.Release|x64.ActiveCfg = Release|Any CPU
77+
{B072D007-02BD-4A84-9255-8492A3E16667}.Release|x64.Build.0 = Release|Any CPU
78+
{B072D007-02BD-4A84-9255-8492A3E16667}.Release|x86.ActiveCfg = Release|Any CPU
79+
{B072D007-02BD-4A84-9255-8492A3E16667}.Release|x86.Build.0 = Release|Any CPU
9980
EndGlobalSection
10081
GlobalSection(SolutionProperties) = preSolution
10182
HideSolutionNode = FALSE

‎KPCLib.xunit/DeviceLockTests.cs‎

Lines changed: 0 additions & 112 deletions
This file was deleted.

‎KPCLib.xunit/DisplayNameOrderer.cs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,21 @@
33

44
using Xunit;
55
using Xunit.Abstractions;
6+
using Xunit.Sdk;
67

7-
namespace KPCLib.xunit.Orderers
8+
namespace xunit.Orderers
89
{
9-
class DisplayNameOrderer : ITestCollectionOrderer
10+
public class DisplayNameOrderer : ITestCollectionOrderer
1011
{
1112
public IEnumerable<ITestCollection> OrderTestCollections(
1213
IEnumerable<ITestCollection> testCollections) =>
1314
testCollections.OrderBy(collection => collection.DisplayName);
1415
}
16+
17+
public class AlphabeticalOrderer : ITestCaseOrderer
18+
{
19+
public IEnumerable<TTestCase> OrderTestCases<TTestCase>(
20+
IEnumerable<TTestCase> testCases) where TTestCase : ITestCase =>
21+
testCases.OrderBy(testCase => testCase.TestMethod.Method.Name);
22+
}
1523
}

‎KPCLib.xunit/KPCLib.xunit.csproj‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,33 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFrameworks>net6.0</TargetFrameworks>
5+
<Nullable>enable</Nullable>
56

67
<IsPackable>false</IsPackable>
78

8-
<Version>1.3.2</Version>
9+
<Version>2.0.4</Version>
10+
911
</PropertyGroup>
1012

1113
<ItemGroup>
12-
<PackageReference Include="HtmlAgilityPack" Version="1.11.34" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
14-
<PackageReference Include="PassXYZ" Version="2.1.4.11" />
15-
<PackageReference Include="SkiaSharp" Version="2.80.2" />
16-
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.80.2" />
17-
<PackageReference Include="Svg.Skia" Version="0.5.3" />
18-
<PackageReference Include="xunit" Version="2.4.1" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
14+
<PackageReference Include="HtmlAgilityPack" Version="1.11.57" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
16+
<PackageReference Include="SkiaSharp" Version="2.88.6" />
17+
<PackageReference Include="Svg.Skia" Version="1.0.0.9" />
18+
<PackageReference Include="xunit" Version="2.6.4" />
19+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
2020
<PrivateAssets>all</PrivateAssets>
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
</PackageReference>
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<ProjectReference Include="..\KPCLib\KPCLib.csproj" />
27-
<ProjectReference Include="..\PassXYZLib\PassXYZLib.csproj" />
26+
<ProjectReference Include="..\KeePassLib\KeePassLib.csproj" />
27+
</ItemGroup>
28+
29+
<ItemGroup>
30+
<Folder Include="PassXYZ\" />
2831
</ItemGroup>
2932

3033
<Target Name="CopyDataFiles" AfterTargets="Build">

‎KPCLib.xunit/KPCLib/ItemTest.cs‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Diagnostics;
4+
using System.Linq;
5+
using System.Text;
6+
using System.Threading.Tasks;
7+
8+
using Xunit;
9+
using KPCLib;
10+
using KeePassLib;
11+
12+
namespace xunit.KPCLib
13+
{
14+
public class ItemTest
15+
{
16+
[Fact]
17+
public void PwEntryTest()
18+
{
19+
Item item = new PwEntry(true, true);
20+
Debug.WriteLine($"Id={item.Id}, Name={item.Name}, Desc={item.Description}, Time={item.LastModificationTime}");
21+
Assert.NotNull(item.Id);
22+
Assert.True(!item.IsGroup);
23+
}
24+
25+
[Fact]
26+
public void PwGroupTest()
27+
{
28+
Item item = new PwGroup(true, true);
29+
Debug.WriteLine($"Id={item.Id}, Name={item.Name}, Desc={item.Description}, Time={item.LastModificationTime}");
30+
Assert.NotNull(item.Id);
31+
Assert.True(item.IsGroup);
32+
}
33+
}
34+
}

KPCLib.xunit/GfxUtilTests.cs renamed to KPCLib.xunit/KeePassLib/GfxUtilTests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@
99
using Svg.Skia;
1010

1111
using Xunit;
12-
using PassXYZLib;
1312
using KeePassLib.Utility;
1413

1514
// Need to turn off test parallelization so we can validate the run order
1615
[assembly: CollectionBehavior(DisableTestParallelization = true)]
17-
[assembly: TestCollectionOrderer("KPCLib.xunit.Orderers.DisplayNameOrderer", "KPCLib.xunit")]
16+
[assembly: TestCollectionOrderer("KPCLib.xunit.Orderers.DisplayNameOrderer", "xunit.KeePassLib")]
1817

19-
namespace KPCLib.xunit
18+
namespace xunit.KeePassLib
2019
{
2120
[Collection("Z. GfxUtil Collection")]
2221
public class GfxUtilTests

0 commit comments

Comments
 (0)