Skip to content

Commit e6fa0ae

Browse files
authored
Merge pull request #5 from shugaoye/master
Updated documents
2 parents 5630cca + f6c2b63 commit e6fa0ae

File tree

8 files changed

+29
-16
lines changed

8 files changed

+29
-16
lines changed

CHANGELOG.md

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

3+
### Release 1.2.2
4+
- Bug fixes
5+
36
### Release 1.2.1
47
- Support Markdown in Notes field
58
- Support PassXYZ data format

KPCLib.xunit/DeviceLockTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void CurrentPathTests()
8181
}
8282

8383
[Theory]
84-
[InlineData("/test1/WebDAV")]
84+
[InlineData("/kpclibpy/Database/Oracle")]
8585
/// <summary>
8686
/// Change a protect field
8787
/// </summary>

KPCLib.xunit/KPCLib.xunit.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
11+
<PackageReference Include="PassXYZ" Version="2.1.4.4" />
12+
<PackageReference Include="SkiaSharp" Version="2.80.2" />
1113
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.80.2" />
1214
<PackageReference Include="xunit" Version="2.4.1" />
1315
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

KPCLib.xunit/PxDatabaseTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void DeleteEmptyEntryTest()
9999

100100
[Theory]
101101
[InlineData(true)]
102-
[InlineData(false)]
102+
//[InlineData(false)]
103103
/// <summary>
104104
/// Delete the first entry in the list.
105105
/// </summary>
@@ -378,7 +378,7 @@ public class PxLibInfoTests
378378
public void PxLibVersion()
379379
{
380380
Debug.WriteLine($"{PxLibInfo.Version}");
381-
Assert.Equal(PxLibInfo.Version, new System.Version("1.2.1.0"));
381+
Assert.Equal(PxLibInfo.Version, new System.Version("1.2.2.3"));
382382
}
383383

384384
[Fact]

KPCLib/KPCLib.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323

2424
1.1.6 - KPCLib has been tested on all three platforms (Android, iOS and UWP).</PackageReleaseNotes>
2525
<NeutralLanguage>en-US</NeutralLanguage>
26-
<AssemblyVersion>1.2.2.2</AssemblyVersion>
27-
<FileVersion>1.2.2.2</FileVersion>
26+
<AssemblyVersion>1.2.2.3</AssemblyVersion>
27+
<FileVersion>1.2.2.3</FileVersion>
2828
</PropertyGroup>
2929

3030
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

PassXYZLib/PassXYZLib.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<Version>1.2.2</Version>
6-
<AssemblyVersion>1.2.2.2</AssemblyVersion>
7-
<FileVersion>1.2.2.2</FileVersion>
6+
<AssemblyVersion>1.2.2.3</AssemblyVersion>
7+
<FileVersion>1.2.2.3</FileVersion>
88
<Company>PassXYZ Inc.</Company>
99
<Authors>Roger Ye</Authors>
1010
<Copyright>Roger Ye</Copyright>

README.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
# KPCLib - KeePass Portable Class Library
22

3-
This is a port of KeePassLib to PCL and .netstandard so that it can be used to build with Xamarin.Forms. With KPCLib and Xamarin.Forms, we can build KeePass based applications on all major platforms.
3+
This is a port of KeePassLib to PCL and .netstandard. With **KPCLib** and Xamarin.Forms, we can build KeePass based applications on all major platforms. A command line application [KPCLibPy][1] is built using **KPCLib** and [Python.NET][2].
44

5+
**KPCLib** included two components:
6+
- **KeePassLib** - This is the port of the original KeePassLib under project `KPCLib`.
7+
- **PassXYZLib** - This is the enhancement built on top of KeePassLib, such as localization, OTP etc.
8+
9+
To be compatiable with Xamarin.Forms, the current build is an .Net Standard 2.0 library. It can also be used for .NET 5 or .NET 6 applications.
510

611
### Setup
712
* Available on NuGet: [![NuGet](https://img.shields.io/nuget/v/Xam.Plugin.Media.svg?label=NuGet)](https://www.nuget.org/packages/KPCLib)
8-
* Build status: [![Build status](https://ci.appveyor.com/api/projects/status/ugxm1im7nsl634uy/branch/develop?svg=true)](https://ci.appveyor.com/project/shugaoye/kpclib/branch/develop)
13+
* Build status: [![Build status](https://ci.appveyor.com/api/projects/status/4py18evnh0xxxvi1?svg=true)](https://ci.appveyor.com/project/shugaoye/kpclib-bccwi)
914
* [Branch strategy](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)
1015
* Install into your PCL/.NET Standard project and Client projects.
1116

17+
18+
[1]: https://github.com/passxyz/KPCLibPy
19+
[2]: https://github.com/pythonnet/pythonnet

appveyor.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
version: '1.0.{build}'
2-
image: Visual Studio 2017
1+
version: '1.2.2.{build}'
2+
image: Visual Studio 2019
33
branches:
44
only:
5-
- develop
5+
- master
66
init:
77
# Good practise, because Windows line endings are different from Unix/Linux ones
88
- cmd: git config --global core.autocrlf true
@@ -12,13 +12,13 @@ before_build:
1212
# Display .NET Core version
1313
- cmd: dotnet --version
1414
# Display minimal restore text
15-
- cmd: dotnet restore ./KPCLib/KPCLib.csproj --verbosity m
15+
- cmd: dotnet restore ./PassXYZLib/PassXYZLib.csproj --verbosity m
1616
build_script:
1717
# output will be in ./src/bin/debug/netcoreapp2.0/publish
18-
- cmd: dotnet build ./KPCLib/KPCLib.csproj
18+
- cmd: dotnet build ./PassXYZLib/PassXYZLib.csproj
1919
after_build:
2020
# For once the build has completed
21-
- cmd: dotnet pack ./KPCLib/KPCLib.csproj
21+
- cmd: dotnet pack ./PassXYZLib/PassXYZLib.csproj
2222
artifacts:
2323
- path: 'KPCLib\bin\Debug\KPCLib.*.nupkg'
2424
name: KPCLib

0 commit comments

Comments
 (0)