From 4c6223046d69499c9f01aaf3a0d24c9e039b2f34 Mon Sep 17 00:00:00 2001
From: SpoinkyNL <spoinky.nl@gmail.com>
Date: Thu, 18 Apr 2019 19:44:20 +0200
Subject: [PATCH] Fix SQLite

---
 .../Repositories/ProfileRepository.cs         |   1 +
 .../Repositories/SettingRepository.cs         |   1 +
 src/Artemis.Storage/Storage.db                | Bin 94208 -> 0 bytes
 src/Artemis.Storage/StorageContext.cs         |  14 ++++++++++--
 src/Artemis.UI/Artemis.UI.csproj              |  21 ++++++++++++++++++
 src/Artemis.UI/packages.config                |   8 +++++++
 6 files changed, 43 insertions(+), 2 deletions(-)
 delete mode 100644 src/Artemis.Storage/Storage.db

diff --git a/src/Artemis.Storage/Repositories/ProfileRepository.cs b/src/Artemis.Storage/Repositories/ProfileRepository.cs
index 77bc4efd8..cb1c826a9 100644
--- a/src/Artemis.Storage/Repositories/ProfileRepository.cs
+++ b/src/Artemis.Storage/Repositories/ProfileRepository.cs
@@ -14,6 +14,7 @@ namespace Artemis.Storage.Repositories
         public ProfileRepository()
         {
             _dbContext = new StorageContext();
+            _dbContext.Database.EnsureCreated();
         }
 
         public IQueryable<ProfileEntity> GetAll()
diff --git a/src/Artemis.Storage/Repositories/SettingRepository.cs b/src/Artemis.Storage/Repositories/SettingRepository.cs
index 0b52aaee4..8564edbf8 100644
--- a/src/Artemis.Storage/Repositories/SettingRepository.cs
+++ b/src/Artemis.Storage/Repositories/SettingRepository.cs
@@ -14,6 +14,7 @@ namespace Artemis.Storage.Repositories
         internal SettingRepository()
         {
             _dbContext = new StorageContext();
+            _dbContext.Database.EnsureCreated();
         }
 
         public IQueryable<SettingEntity> GetAll()
diff --git a/src/Artemis.Storage/Storage.db b/src/Artemis.Storage/Storage.db
deleted file mode 100644
index b0641d32bdae5f4f688302933baf0ce1f17e3dcf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94208
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

diff --git a/src/Artemis.Storage/StorageContext.cs b/src/Artemis.Storage/StorageContext.cs
index 9b5f7ca84..275494767 100644
--- a/src/Artemis.Storage/StorageContext.cs
+++ b/src/Artemis.Storage/StorageContext.cs
@@ -1,4 +1,7 @@
-using Artemis.Storage.Entities;
+using System;
+using System.IO;
+using System.Reflection;
+using Artemis.Storage.Entities;
 using Microsoft.EntityFrameworkCore;
 
 namespace Artemis.Storage
@@ -10,7 +13,14 @@ namespace Artemis.Storage
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
-            optionsBuilder.UseSqlite("Data Source=Storage.db");
+#if DEBUG
+            var dbLocation = Path.GetFullPath(Path.Combine(Assembly.GetEntryAssembly().Location, @"..\..\..\..\Artemis.Storage\Storage.db"));
+#else
+            var dbLocation = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) + "\\Artemis\\Storage.db";
+#endif
+            optionsBuilder.UseSqlite("Data Source=" + dbLocation);
+
+            // Requires Microsoft.Data.Sqlite in the startup project
             SQLitePCL.Batteries.Init();
         }
 
diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj
index 1bd215c1e..41026e886 100644
--- a/src/Artemis.UI/Artemis.UI.csproj
+++ b/src/Artemis.UI/Artemis.UI.csproj
@@ -80,6 +80,9 @@
     <Reference Include="MaterialDesignThemes.Wpf, Version=2.5.1.1345, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MaterialDesignThemes.2.5.1\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Data.Sqlite, Version=2.2.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.Sqlite.Core.2.2.4\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
+    </Reference>
     <Reference Include="Ninject, Version=3.3.4.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
       <HintPath>..\packages\Ninject.3.3.4\lib\net45\Ninject.dll</HintPath>
     </Reference>
@@ -107,6 +110,18 @@
     <Reference Include="RGB.NET.Groups, Version=0.1.22.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\RGB.NET.Groups.0.1.22\lib\net45\RGB.NET.Groups.dll</HintPath>
     </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_green, Version=1.1.12.351, Culture=neutral, PublicKeyToken=a84b7dcfb1391f7f, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_green.1.1.12\lib\net45\SQLitePCLRaw.batteries_green.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_v2, Version=1.1.12.351, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.bundle_green.1.1.12\lib\net45\SQLitePCLRaw.batteries_v2.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.core, Version=1.1.12.351, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.core.1.1.12\lib\net45\SQLitePCLRaw.core.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.provider.e_sqlite3, Version=1.1.12.351, Culture=neutral, PublicKeyToken=9c301db686d0bd12, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCLRaw.provider.e_sqlite3.net45.1.1.12\lib\net45\SQLitePCLRaw.provider.e_sqlite3.dll</HintPath>
+    </Reference>
     <Reference Include="Stylet, Version=1.1.22.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Stylet.1.1.22\lib\net45\Stylet.dll</HintPath>
     </Reference>
@@ -244,6 +259,12 @@
     <Error Condition="!Exists('..\packages\Fody.4.2.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.4.2.1\build\Fody.targets'))" />
     <Error Condition="!Exists('..\packages\RGB.NET.Resources.Corsair.0.3.0.234\build\RGB.NET.Resources.Corsair.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\RGB.NET.Resources.Corsair.0.3.0.234\build\RGB.NET.Resources.Corsair.targets'))" />
     <Error Condition="!Exists('..\packages\PropertyChanged.Fody.2.6.1\build\PropertyChanged.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PropertyChanged.Fody.2.6.1\build\PropertyChanged.Fody.props'))" />
+    <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets'))" />
+    <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets'))" />
+    <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets'))" />
   </Target>
   <Import Project="..\packages\RGB.NET.Resources.Corsair.0.3.0.234\build\RGB.NET.Resources.Corsair.targets" Condition="Exists('..\packages\RGB.NET.Resources.Corsair.0.3.0.234\build\RGB.NET.Resources.Corsair.targets')" />
+  <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" />
+  <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" />
+  <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/Artemis.UI/packages.config b/src/Artemis.UI/packages.config
index a1b5eaaae..67a7db653 100644
--- a/src/Artemis.UI/packages.config
+++ b/src/Artemis.UI/packages.config
@@ -8,6 +8,8 @@
   <package id="MaterialDesignColors" version="1.1.3" targetFramework="net461" />
   <package id="MaterialDesignThemes" version="2.5.1" targetFramework="net461" />
   <package id="MaterialDesignThemes.MahApps" version="0.0.12" targetFramework="net461" />
+  <package id="Microsoft.Data.Sqlite" version="2.2.4" targetFramework="net472" />
+  <package id="Microsoft.Data.Sqlite.Core" version="2.2.4" targetFramework="net472" />
   <package id="Ninject" version="3.3.4" targetFramework="net461" />
   <package id="Ninject.Extensions.Conventions" version="3.3.0" targetFramework="net461" />
   <package id="Ninject.Extensions.Factory" version="3.3.2" targetFramework="net461" />
@@ -18,6 +20,12 @@
   <package id="RGB.NET.Devices.Corsair" version="0.1.22" targetFramework="net461" />
   <package id="RGB.NET.Groups" version="0.1.22" targetFramework="net461" />
   <package id="RGB.NET.Resources.Corsair" version="0.3.0.234" targetFramework="net461" />
+  <package id="SQLitePCLRaw.bundle_green" version="1.1.12" targetFramework="net472" />
+  <package id="SQLitePCLRaw.core" version="1.1.12" targetFramework="net472" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3.linux" version="1.1.12" targetFramework="net472" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3.osx" version="1.1.12" targetFramework="net472" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3.v110_xp" version="1.1.12" targetFramework="net472" />
+  <package id="SQLitePCLRaw.provider.e_sqlite3.net45" version="1.1.12" targetFramework="net472" />
   <package id="Stylet" version="1.1.22" targetFramework="net461" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
 </packages>
\ No newline at end of file