Skip to content

Commit 53fed4b

Browse files
andrew-schofieldandrew-schofield
committed
Fix broken dependency on specific version of KeePass
1 parent 2310058 commit 53fed4b

10 files changed

+16
-24
lines changed

‎Changelog.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# keepass2-haveibeenpwned Changelog
22

3+
### v1.2.2 - 2017-10-21
4+
* Alter the way developer extensions are referenced to prevent dependency on a specific version of KeePass
5+
36
### v1.2.1 - 2017-09-23
47
* Disable the check entries not changed option when checking for breach passwords as this is not relevant for that breach type
58

‎HaveIBeenPwned.plgx

-1.43 KB
Binary file not shown.

‎HaveIBeenPwned.sln

-8
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HaveIBeenPwned", "HaveIBeenPwned\HaveIBeenPwned.csproj", "{185AC93C-BF8E-4D41-B6ED-C66839A3512D}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "keepass2-developerextensions", "keepass2-developerextensions\keepass2-developerextensions\keepass2-developerextensions.csproj", "{5F46D79A-C383-41F0-9C77-49381D4EB002}"
9-
EndProject
108
Global
119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1210
Debug|Any CPU = Debug|Any CPU
@@ -20,12 +18,6 @@ Global
2018
{185AC93C-BF8E-4D41-B6ED-C66839A3512D}.Release|Any CPU.Build.0 = Release|Any CPU
2119
{185AC93C-BF8E-4D41-B6ED-C66839A3512D}.ReleasePlgx|Any CPU.ActiveCfg = ReleasePlgx|Any CPU
2220
{185AC93C-BF8E-4D41-B6ED-C66839A3512D}.ReleasePlgx|Any CPU.Build.0 = ReleasePlgx|Any CPU
23-
{5F46D79A-C383-41F0-9C77-49381D4EB002}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24-
{5F46D79A-C383-41F0-9C77-49381D4EB002}.Debug|Any CPU.Build.0 = Debug|Any CPU
25-
{5F46D79A-C383-41F0-9C77-49381D4EB002}.Release|Any CPU.ActiveCfg = Release|Any CPU
26-
{5F46D79A-C383-41F0-9C77-49381D4EB002}.Release|Any CPU.Build.0 = Release|Any CPU
27-
{5F46D79A-C383-41F0-9C77-49381D4EB002}.ReleasePlgx|Any CPU.ActiveCfg = ReleasePlgx|Any CPU
28-
{5F46D79A-C383-41F0-9C77-49381D4EB002}.ReleasePlgx|Any CPU.Build.0 = ReleasePlgx|Any CPU
2921
EndGlobalSection
3022
GlobalSection(SolutionProperties) = preSolution
3123
HideSolutionNode = FALSE

‎HaveIBeenPwned/HaveIBeenPwned.csproj

+5-9
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5555
</PropertyGroup>
5656
<ItemGroup>
57-
<Reference Include="KeePass, Version=2.35.0.36675, Culture=neutral, processorArchitecture=MSIL">
57+
<Reference Include="KeePass, Version=2.34.0.15991, Culture=neutral, PublicKeyToken=fed2ed7716aecf5c, processorArchitecture=MSIL">
58+
<HintPath>..\..\..\Desktop\KeePass 2.34\KeePass.exe</HintPath>
5859
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>..\..\..\..\..\Program Files (x86)\KeePass Password Safe 2\KeePass.exe</HintPath>
6060
<Private>False</Private>
6161
</Reference>
6262
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -75,6 +75,9 @@
7575
<Reference Include="System.Xml" />
7676
</ItemGroup>
7777
<ItemGroup>
78+
<Compile Include="..\keepass2-developerextensions\keepass2-developerextensions\EnumExtensions.cs" />
79+
<Compile Include="..\keepass2-developerextensions\keepass2-developerextensions\ProtectedStringExtensions.cs" />
80+
<Compile Include="..\keepass2-developerextensions\keepass2-developerextensions\PwEntryExtensions.cs" />
7881
<Compile Include="BreachCheckers\BaseChecker.cs" />
7982
<Compile Include="BreachCheckers\HaveIBeenPwnedPassword\HaveIBeenPwnedPasswordChecker.cs" />
8083
<Compile Include="BreachCheckers\HaveIBeenPwnedPassword\HaveIBeenPwnedPasswordEntry.cs" />
@@ -125,13 +128,6 @@
125128
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
126129
</EmbeddedResource>
127130
</ItemGroup>
128-
<ItemGroup>
129-
<ProjectReference Include="..\keepass2-developerextensions\keepass2-developerextensions\keepass2-developerextensions.csproj">
130-
<Project>{5f46d79a-c383-41f0-9c77-49381d4eb002}</Project>
131-
<Name>keepass2-developerextensions</Name>
132-
<PlgxReference>..\keepass2-developerextensions\keepass2-developerextensions\bin\ReleasePlgx\keepass2-developerextensions.dll</PlgxReference>
133-
</ProjectReference>
134-
</ItemGroup>
135131
<ItemGroup>
136132
<None Include="packages.config" />
137133
</ItemGroup>

‎HaveIBeenPwned/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.2.1.0")]
36-
[assembly: AssemblyFileVersion("1.2.1.0")]
35+
[assembly: AssemblyVersion("1.2.2.0")]
36+
[assembly: AssemblyFileVersion("1.2.2.0")]

‎HaveIBeenPwned/UI/BreachedEntriesDialog.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private void breachedEntryList_MouseDoubleClick(object sender, MouseEventArgs e)
8888
{
8989
bool bUpdImg = pluginHost.Database.UINeedsIconUpdate;
9090
pluginHost.MainWindow.RefreshEntriesList(); // Update entry
91-
pluginHost.MainWindow.UpdateUI(false, null, bUpdImg, null, false, null, pwForm.HasModifiedEntry);
91+
pluginHost.MainWindow.UpdateUI(false, null, bUpdImg, null, false, null, pwForm.HasModifiedEntry);
9292
breachedEntryList.SelectedItems[0].SubItems[0] = new ListViewItem.ListViewSubItem(breachedEntryList.SelectedItems[0], entry.Strings.ReadSafe(PwDefs.TitleField));
9393
breachedEntryList.SelectedItems[0].SubItems[1] = new ListViewItem.ListViewSubItem(breachedEntryList.SelectedItems[0], entry.Strings.ReadSafe(PwDefs.UserNameField));
9494
breachedEntryList.SelectedItems[0].SubItems[2] = new ListViewItem.ListViewSubItem(breachedEntryList.SelectedItems[0], entry.Strings.ReadSafe(PwDefs.UrlField));

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
:
2-
HaveIBeenPwned checker:1.2.1
2+
HaveIBeenPwned checker:1.2.2
33
:

‎build.bat

+4-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ cd /d ""%base%
1111
del HaveIBeenPwned.plgx
1212
%netframework%MSBuild.exe /target:clean HaveIBeenPwned.sln
1313
%netframework%MSBuild.exe /p:Configuration=ReleasePlgx /m HaveIBeenPwned.sln
14-
copy /y HaveIBeenPwned\bin\Release\HaveIBeenPwned.dll mono
15-
copy /y HaveIBeenPwned\bin\ReleasePlgx\keepass2-developerextensions.dll mono
14+
copy /y HaveIBeenPwned\bin\ReleasePlgx\HaveIBeenPwned.dll mono
1615
copy /y HaveIBeenPwned\bin\ReleasePlgx\HaveIBeenPwned.plgx .
17-
popd
16+
popd
17+
18+
pause

‎mono/HaveIBeenPwned.dll

13.5 KB
Binary file not shown.

‎mono/keepass2-developerextensions.dll

-8 KB
Binary file not shown.

0 commit comments

Comments
 (0)