From bdc479a485bcada789274fad7f022a59ac4e86fe Mon Sep 17 00:00:00 2001
From: David Lechner <david@lechnology.com>
Date: Sun, 24 Dec 2023 13:54:56 -0600
Subject: [PATCH] Use official KeePass for ReleaseDll

The .dll build with ReleaseDll will fail to load in KeePass because the
NuGet KeePass is an unofficial debug build and is not strongly versioned
(lacks public key token). So we have to build against the official
signed KeePass version.
---
 .github/workflows/build.yml |  5 ++++-
 KeeAgent/KeeAgent.csproj    | 24 ++++++++++++++++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9e42c33..3f7d9f3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,10 @@ jobs:
       with:
         submodules: true
 
-    - run: nuget restore
+    - name: Install prerequisites
+      run: |
+        choco install keepass
+        nuget restore
 
     - name: Setup MSBuild.exe
       uses: microsoft/setup-msbuild@v1.1
diff --git a/KeeAgent/KeeAgent.csproj b/KeeAgent/KeeAgent.csproj
index 1d08652..8d89c3a 100644
--- a/KeeAgent/KeeAgent.csproj
+++ b/KeeAgent/KeeAgent.csproj
@@ -253,11 +253,27 @@
   <ItemGroup>
     <None Include="Resources\help-3.png" />
   </ItemGroup>
+  <Choose>
+    <When Condition="'$(Configuration)' == 'ReleaseDll'">
+      <ItemGroup Condition=" '$(OS)' != 'Unix' ">
+        <Reference Include="KeePass">
+          <HintPath>$(ProgramFiles)\KeePass Password Safe 2\KeePass.exe</HintPath>
+          <ExcludeFromPlgx />
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
+  <Choose>
+    <When Condition="'$(Configuration)' != 'ReleaseDll'">
+      <ItemGroup Condition=" '$(OS)' != 'Unix' ">
+        <PackageReference Include="KeePass">
+          <Version>2.53.0.21099</Version>
+          <ExcludeFromPlgx />
+        </PackageReference>
+      </ItemGroup>
+    </When>
+  </Choose>
   <ItemGroup Condition=" '$(OS)' != 'Unix' ">
-    <PackageReference Include="KeePass">
-      <Version>2.53.0.21099</Version>
-      <ExcludeFromPlgx />
-    </PackageReference>
     <PackageReference Include="ILRepack">
       <Version>2.0.20</Version>
       <PrivateAssets>all</PrivateAssets>