Added IncludeNativeLibrariesForSelfExtract to include sqlite. Will ha…

…ve separate windows, linux, macos builds at some stage
bn-l · Mar 25, 2023 · b900e4a · b900e4a
1 parent 743fd66
commit b900e4a
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 20 deletions.
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -5,6 +5,7 @@
 		<Nullable>enable</Nullable>
 		<IsPackable>false</IsPackable>
 		<PlatformTarget>x64</PlatformTarget>
+		<Platforms>AnyCPU;x64</Platforms>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/thsearch.sln b/thsearch.sln
@@ -10,17 +10,27 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{6B348EA6-7F88-4FD6-B5C3-477B6139B547}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6B348EA6-7F88-4FD6-B5C3-477B6139B547}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B348EA6-7F88-4FD6-B5C3-477B6139B547}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6B348EA6-7F88-4FD6-B5C3-477B6139B547}.Debug|x64.Build.0 = Debug|Any CPU
 		{6B348EA6-7F88-4FD6-B5C3-477B6139B547}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6B348EA6-7F88-4FD6-B5C3-477B6139B547}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B348EA6-7F88-4FD6-B5C3-477B6139B547}.Release|x64.ActiveCfg = Release|x64
+		{6B348EA6-7F88-4FD6-B5C3-477B6139B547}.Release|x64.Build.0 = Release|x64
 		{B1921D82-4401-46B8-A979-0F3EEE213CEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B1921D82-4401-46B8-A979-0F3EEE213CEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1921D82-4401-46B8-A979-0F3EEE213CEB}.Debug|x64.ActiveCfg = Debug|x64
+		{B1921D82-4401-46B8-A979-0F3EEE213CEB}.Debug|x64.Build.0 = Debug|x64
 		{B1921D82-4401-46B8-A979-0F3EEE213CEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B1921D82-4401-46B8-A979-0F3EEE213CEB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1921D82-4401-46B8-A979-0F3EEE213CEB}.Release|x64.ActiveCfg = Release|x64
+		{B1921D82-4401-46B8-A979-0F3EEE213CEB}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/thsearch/Program.cs b/thsearch/Program.cs
@@ -19,7 +19,7 @@ internal static void Main(string[] args)
         int numberOfResults = 10;
 
         // TODO: Tests
-        // TODO: File access issues
+        // TODO: Add support for: csv, docx, xlsx, pptx
 
         switch (args.Length)
         {
@@ -56,7 +56,6 @@ internal static void Main(string[] args)
                 return;                
         }
 
-
         configPath = Path.Combine(currentDirectory, configName + ".txt");
 
         ConfigFileParser config = new ConfigFileParser(configPath);
@@ -67,7 +66,6 @@ internal static void Main(string[] args)
 
         IIndex index = new IndexSqlite(dbLocation);
 
-
         TxtExtractor txtExtractor = new TxtExtractor();
         PdfExtractor pdfExtractor = new PdfExtractor();
         HtmlExtractor htmlExtractor = new HtmlExtractor();
@@ -77,7 +75,6 @@ internal static void Main(string[] args)
         ITokenizer tokenizer = new TokenizerSpans();
 
         FileProducer fileProducer = new FileProducer (config.IncludedDirectories, config.ExcludedDirectories, config.FileExtensions, config.ExcludedWords);
-
 
         FileConsumer fileConsumer = new FileConsumer(index, stringExtractor, tokenizer);
 
@@ -86,7 +83,6 @@ internal static void Main(string[] args)
         // used for pruning later
         List<string> foundFiles = new List<string>();
 
-
         var producerTask = Task.Run(() =>
         {
             foreach (FileModel file in fileProducer)

diff --git a/thsearch/Properties/PublishProfiles/FolderProfile.pubxml b/thsearch/Properties/PublishProfiles/FolderProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <Configuration>Release</Configuration>
-    <Platform>Any CPU</Platform>
+    <Platform>x64</Platform>
     <PublishDir>bin\Release\net6.0\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <_TargetId>Folder</_TargetId>

diff --git a/thsearch/thsearch.csproj b/thsearch/thsearch.csproj
@@ -1,22 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
-	<PublishSingleFile>true</PublishSingleFile>
-	<SelfContained>true</SelfContained>
-	<RuntimeIdentifier>win-x64</RuntimeIdentifier>
-	<PublishTrimmed>true</PublishTrimmed>
-	<PublishReadyToRun>true</PublishReadyToRun>
+    <PublishSingleFile>true</PublishSingleFile>
+    <SelfContained>true</SelfContained>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <PublishTrimmed>true</PublishTrimmed>
+    <PublishReadyToRun>true</PublishReadyToRun>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+    <Nullable>disable</Nullable>
     <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
-    <Title>thsearch - The multithread searcher</Title>
-    <Version>1.0.2.0</Version>
-    <Description>A multithread, fixed location, text content searcher. Specify the paths you want to search, and the file extensions, and then call it 
-as follows: thsearch.exe searchterm. </Description>
+    <Title>thsearch</Title>
+    <Version>2.0.0.0</Version>
+    <Description>Fast ranked content searching of documents </Description>
     <PlatformTarget>x64</PlatformTarget>
+    <Platforms>AnyCPU;x64</Platforms>
     <ErrorReport>none</ErrorReport>
+    <!-- Includes sqlite library. See: https://stackoverflow.com/questions/74661400/eliminate-e-sqlite3-dll-during-single-file-compilation -->
+    <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
   </PropertyGroup>
 
   <ItemGroup>
@@ -30,9 +32,10 @@ as follows: thsearch.exe searchterm. </Description>
     <PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.4" />
     <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
     <PackageReference Include="PdfPig" Version="0.1.7" />
-    <PackageReference Include="ShellProgressBar" Version="5.2.0" />
-    <PackageReference Include="System.Data.SQLite" Version="1.0.117" />
-    <PackageReference Include="Terminal.Gui" Version="1.10.0" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.4" />
+    <PackageReference Include="SQLitePCLRaw.core" Version="2.1.4" />
+    <PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" Version="2.1.4" />
+    <PackageReference Include="SQLitePCLRaw.provider.e_sqlite3" Version="2.1.4" />
   </ItemGroup>
 
 	<ItemGroup>