From 91eebd021004f83c333e03c7c7dc591393db15a3 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Mon, 3 Dec 2018 17:25:32 +0000
Subject: [PATCH 1/3] Ensure e_sqlite.dll is included in .vsix

Ensure e_sqlite.dll is included in .vsix when built using Visual
Studio. This file was only being included in the .vsix when built using
MSBuild from the command line.
---
 src/GitHub.VisualStudio/GitHub.VisualStudio.csproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
index 460532ddf3..6dc3e2f427 100644
--- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
+++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
@@ -425,6 +425,10 @@
     <PackageReference Include="Microsoft.VSSDK.VsixSignTool">
       <Version>14.1.24720</Version>
     </PackageReference>
+    <!-- Ensure e_sqlite.dll is included in .vsix when built using Visual Studio -->
+    <PackageReference Include="SQLitePCL.raw_basic">
+      <Version>0.7.3-vs2012</Version>
+    </PackageReference>
   </ItemGroup>
   <PropertyGroup>
     <UseCodebase>true</UseCodebase>

From 7a68b08bf1415cd42fd7ca7929b19bcd2c5e2457 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Tue, 4 Dec 2018 13:26:59 +0000
Subject: [PATCH 2/3] Include (x86|x64)\e_sqlite3.dll in VSIX

Explicitly include x86\e_sqlite3.dll and x64\e_sqlite3.dll from content
files in VSIX.
---
 src/GitHub.VisualStudio/GitHub.VisualStudio.csproj | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
index 6dc3e2f427..20cc32de7c 100644
--- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
+++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
@@ -425,10 +425,6 @@
     <PackageReference Include="Microsoft.VSSDK.VsixSignTool">
       <Version>14.1.24720</Version>
     </PackageReference>
-    <!-- Ensure e_sqlite.dll is included in .vsix when built using Visual Studio -->
-    <PackageReference Include="SQLitePCL.raw_basic">
-      <Version>0.7.3-vs2012</Version>
-    </PackageReference>
   </ItemGroup>
   <PropertyGroup>
     <UseCodebase>true</UseCodebase>
@@ -438,6 +434,8 @@
     <ItemGroup>
       <VSIXSourceItem Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' == 'System.ValueTuple'" />
       <VSIXSourceItem Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' == 'Newtonsoft.Json'" />
+      <VSIXSourceItem VSIXSubPath="x86" Include="@(Content)" Condition="'%(Content.Link)' == 'x86\e_sqlite3.dll'" />
+      <VSIXSourceItem VSIXSubPath="x64" Include="@(Content)" Condition="'%(Content.Link)' == 'x64\e_sqlite3.dll'" />
     </ItemGroup>
   </Target>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

From 7868846248577a8e9275cc2ee6016dbd24a53f9f Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Tue, 4 Dec 2018 15:22:18 +0000
Subject: [PATCH 3/3] Include reference to SQLitePCLRaw.bundle_e_sqlite3

A direct reference to this package causes x86\e_sqlite3.dll and
x64\e_sqlite3.dll be copied to the output directory so they can be
picked by the VSIXSourceItem filter.
---
 src/GitHub.VisualStudio/GitHub.VisualStudio.csproj | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
index 20cc32de7c..32371f48cd 100644
--- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
+++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
@@ -429,6 +429,12 @@
   <PropertyGroup>
     <UseCodebase>true</UseCodebase>
   </PropertyGroup>
+  <ItemGroup>
+    <!-- Include a reference to this package so that x86|x64\e_sqlite3.dll are copied to the output directory -->
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3">
+      <Version>1.1.11</Version>
+    </PackageReference>
+  </ItemGroup>
   <!-- Include required NuGet dependencies-->
   <Target Name="IncludeNuGetPackageReferences" AfterTargets="GetVsixSourceItems">
     <ItemGroup>