Fix broken dependency on specific version of KeePass

Changelog.md

@@ -1,5 +1,8 @@
 # keepass2-haveibeenpwned Changelog
 
+### v1.2.2 - 2017-10-21
+* Alter the way developer extensions are referenced to prevent dependency on a specific version of KeePass
+
 ### v1.2.1 - 2017-09-23
 * Disable the check entries not changed option when checking for breach passwords as this is not relevant for that breach type
 

HaveIBeenPwned.sln

@@ -5,8 +5,6 @@ VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HaveIBeenPwned", "HaveIBeenPwned\HaveIBeenPwned.csproj", "{185AC93C-BF8E-4D41-B6ED-C66839A3512D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "keepass2-developerextensions", "keepass2-developerextensions\keepass2-developerextensions\keepass2-developerextensions.csproj", "{5F46D79A-C383-41F0-9C77-49381D4EB002}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -20,12 +18,6 @@ Global
 		{185AC93C-BF8E-4D41-B6ED-C66839A3512D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{185AC93C-BF8E-4D41-B6ED-C66839A3512D}.ReleasePlgx|Any CPU.ActiveCfg = ReleasePlgx|Any CPU
 		{185AC93C-BF8E-4D41-B6ED-C66839A3512D}.ReleasePlgx|Any CPU.Build.0 = ReleasePlgx|Any CPU
-		{5F46D79A-C383-41F0-9C77-49381D4EB002}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5F46D79A-C383-41F0-9C77-49381D4EB002}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5F46D79A-C383-41F0-9C77-49381D4EB002}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5F46D79A-C383-41F0-9C77-49381D4EB002}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5F46D79A-C383-41F0-9C77-49381D4EB002}.ReleasePlgx|Any CPU.ActiveCfg = ReleasePlgx|Any CPU
-		{5F46D79A-C383-41F0-9C77-49381D4EB002}.ReleasePlgx|Any CPU.Build.0 = ReleasePlgx|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

HaveIBeenPwned/HaveIBeenPwned.csproj

@@ -54,9 +54,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="KeePass, Version=2.35.0.36675, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="KeePass, Version=2.34.0.15991, Culture=neutral, PublicKeyToken=fed2ed7716aecf5c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Desktop\KeePass 2.34\KeePass.exe</HintPath>
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\Program Files (x86)\KeePass Password Safe 2\KeePass.exe</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -75,6 +75,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\keepass2-developerextensions\keepass2-developerextensions\EnumExtensions.cs" />
+    <Compile Include="..\keepass2-developerextensions\keepass2-developerextensions\ProtectedStringExtensions.cs" />
+    <Compile Include="..\keepass2-developerextensions\keepass2-developerextensions\PwEntryExtensions.cs" />
     <Compile Include="BreachCheckers\BaseChecker.cs" />
     <Compile Include="BreachCheckers\HaveIBeenPwnedPassword\HaveIBeenPwnedPasswordChecker.cs" />
     <Compile Include="BreachCheckers\HaveIBeenPwnedPassword\HaveIBeenPwnedPasswordEntry.cs" />
@@ -125,13 +128,6 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\keepass2-developerextensions\keepass2-developerextensions\keepass2-developerextensions.csproj">
-      <Project>{5f46d79a-c383-41f0-9c77-49381d4eb002}</Project>
-      <Name>keepass2-developerextensions</Name>
-      <PlgxReference>..\keepass2-developerextensions\keepass2-developerextensions\bin\ReleasePlgx\keepass2-developerextensions.dll</PlgxReference>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>

HaveIBeenPwned/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.1.0")]
-[assembly: AssemblyFileVersion("1.2.1.0")]
+[assembly: AssemblyVersion("1.2.2.0")]
+[assembly: AssemblyFileVersion("1.2.2.0")]

HaveIBeenPwned/UI/BreachedEntriesDialog.cs

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

VERSION

@@ -1,3 +1,3 @@
 :
-HaveIBeenPwned checker:1.2.1
+HaveIBeenPwned checker:1.2.2
 :

build.bat

@@ -11,7 +11,8 @@ cd /d ""%base%
 del HaveIBeenPwned.plgx
 %netframework%MSBuild.exe /target:clean HaveIBeenPwned.sln
 %netframework%MSBuild.exe /p:Configuration=ReleasePlgx /m HaveIBeenPwned.sln
-copy /y HaveIBeenPwned\bin\Release\HaveIBeenPwned.dll mono
-copy /y HaveIBeenPwned\bin\ReleasePlgx\keepass2-developerextensions.dll mono
+copy /y HaveIBeenPwned\bin\ReleasePlgx\HaveIBeenPwned.dll mono
 copy /y HaveIBeenPwned\bin\ReleasePlgx\HaveIBeenPwned.plgx .
-popd
+popd
+
+pause