diff --git a/System.Data.SQLite.Benchmark/System.Data.SQLite.Benchmark.csproj b/System.Data.SQLite.Benchmark/System.Data.SQLite.Benchmark.csproj
index 14cdb5f..4ea7482 100644
--- a/System.Data.SQLite.Benchmark/System.Data.SQLite.Benchmark.csproj
+++ b/System.Data.SQLite.Benchmark/System.Data.SQLite.Benchmark.csproj
@@ -1,5 +1,5 @@
-
+
Debug
AnyCPU
@@ -12,6 +12,8 @@
Benchmark
Benchmark
C#-SQLite.ico
+ v4.7
+
true
@@ -23,6 +25,7 @@
4
0168;0414;0219
AllRules.ruleset
+ false
none
@@ -33,6 +36,7 @@
4
0168;0414;0219
AllRules.ruleset
+ false
@@ -61,4 +65,7 @@
System.Data.SQLite
-
+
+
+
+
\ No newline at end of file
diff --git a/System.Data.SQLite/Client/SQLiteConnection.cs b/System.Data.SQLite/Client/SQLiteConnection.cs
index 4d1f9d7..82ac356 100755
--- a/System.Data.SQLite/Client/SQLiteConnection.cs
+++ b/System.Data.SQLite/Client/SQLiteConnection.cs
@@ -35,6 +35,7 @@
using System.Data.Common;
using System.Text;
using System.Collections.Generic;
+using System.Reflection;
namespace System.Data.SQLite
{
@@ -227,10 +228,10 @@ private void SetConnectionString(string connstring)
#if !(SQLITE_SILVERLIGHT || WINDOWS_MOBILE)
}
else if(tvalue_lc.StartsWith("|DataDirectory|", StringComparison.InvariantCultureIgnoreCase))
- {
- AppDomainSetup ads = AppDomain.CurrentDomain.SetupInformation;
- string filePath = String.Format("App_Data{0}{1}", Path.DirectorySeparatorChar, tvalue_lc.Substring(15));
- db_file = Path.Combine(ads.ApplicationBase, filePath);
+ {
+ var applicationPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location) ?? "";
+ string filePath = String.Format("App_Data{0}{1}", Path.DirectorySeparatorChar, tvalue_lc.Substring(15));
+ db_file = Path.Combine(applicationPath, filePath);
#endif
}
else
diff --git a/System.Data.SQLite/Properties/AssemblyInfo.cs b/System.Data.SQLite/Properties/AssemblyInfo.cs
deleted file mode 100755
index db0aa02..0000000
--- a/System.Data.SQLite/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("System.Data.Sqlite")]
-[assembly: AssemblyDescription("C#-SQLite is an independent reimplementation of the SQLite software library")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Pioneer Software Consulting")]
-[assembly: AssemblyProduct("C#-SQLite3 shell")]
-[assembly: AssemblyCopyright("Copyright © 2009-2013")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("2133c634-4139-466e-8983-9a23ec99e01b")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-[assembly: AssemblyVersion("3.7.7.1")]
-[assembly: AssemblyFileVersion("3.7.7.1")]
\ No newline at end of file
diff --git a/System.Data.SQLite/System.Data.SQLite.csproj b/System.Data.SQLite/System.Data.SQLite.csproj
index 7ffbffc..5678107 100755
--- a/System.Data.SQLite/System.Data.SQLite.csproj
+++ b/System.Data.SQLite/System.Data.SQLite.csproj
@@ -1,146 +1,32 @@
-
-
+
+
- Debug
- AnyCPU
- 9.0.30729
- 2.0
- {F1653F20-D47D-4F29-8C55-3C835542AF5F}
- Library
- System.Data.SQLite
- System.Data.SQLite
+ netstandard2.0
+ C#-SQLite is an independent reimplementation of the SQLite software library
+ Pioneer Software Consulting
+ Pioneer Software Consulting
+ C#-SQLite3 shell
+ Copyright © 2009-2013
+ 3.7.7.1
+ https://github.com/CsharpDatabase/CsharpSQLite
+ git
+ https://github.com/CsharpDatabase/CsharpSQLite
+ true
-
- True
- full
- False
+
+
..\Run\Debug
- DEBUG;TRUE;NDEBUG;SQLITE_ASCII;SQLITE_DISABLE_LFS;SQLITE_ENABLE_OVERSIZE_CELL_CHECK;SQLITE_MUTEX_OMIT;SQLITE_OMIT_AUTHORIZATION;SQLITE_OMIT_DEPRECATED;SQLITE_OMIT_GET_TABLE;SQLITE_OMIT_INCRBLOB;SQLITE_OMIT_LOOKASIDE;SQLITE_OMIT_SHARED_CACHE;SQLITE_OMIT_UTF16;SQLITE_OMIT_WAL;SQLITE_OS_WIN;SQLITE_SYSTEM_MALLOC;VDBE_PROFILE_OFF;SQLITE_DEFAULT_FOREIGN_KEYS
- prompt
- 4
- AllRules.ruleset
+ TRACE;DEBUG;TRUE;NDEBUG;SQLITE_ASCII;SQLITE_DISABLE_LFS;SQLITE_ENABLE_OVERSIZE_CELL_CHECK;SQLITE_MUTEX_OMIT;SQLITE_OMIT_AUTHORIZATION;SQLITE_OMIT_DEPRECATED;SQLITE_OMIT_GET_TABLE;SQLITE_OMIT_INCRBLOB;SQLITE_OMIT_LOOKASIDE;SQLITE_OMIT_SHARED_CACHE;SQLITE_OMIT_UTF16;SQLITE_OMIT_WAL;SQLITE_OS_WIN;SQLITE_SYSTEM_MALLOC;VDBE_PROFILE_OFF;SQLITE_DEFAULT_FOREIGN_KEYS
0168;0169;0414;0618;0649;0219;0162;0429
-
- True
+
+
..\Run\Release
- TRUE;NDEBUG;SQLITE_ASCII;SQLITE_DISABLE_LFS;SQLITE_ENABLE_OVERSIZE_CELL_CHECK;SQLITE_MUTEX_OMIT;SQLITE_OMIT_AUTHORIZATION;SQLITE_OMIT_DEPRECATED;SQLITE_OMIT_GET_TABLE;SQLITE_OMIT_INCRBLOB;SQLITE_OMIT_LOOKASIDE;SQLITE_OMIT_SHARED_CACHE;SQLITE_OMIT_UTF16;SQLITE_OMIT_WAL;SQLITE_OS_WIN;SQLITE_SYSTEM_MALLOC;VDBE_PROFILE_OFF;SQLITE_DEFAULT_FOREIGN_KEYS
- prompt
- 4
- AllRules.ruleset
+ TRACE;TRUE;NDEBUG;SQLITE_ASCII;SQLITE_DISABLE_LFS;SQLITE_ENABLE_OVERSIZE_CELL_CHECK;SQLITE_MUTEX_OMIT;SQLITE_OMIT_AUTHORIZATION;SQLITE_OMIT_DEPRECATED;SQLITE_OMIT_GET_TABLE;SQLITE_OMIT_INCRBLOB;SQLITE_OMIT_LOOKASIDE;SQLITE_OMIT_SHARED_CACHE;SQLITE_OMIT_UTF16;SQLITE_OMIT_WAL;SQLITE_OS_WIN;SQLITE_SYSTEM_MALLOC;VDBE_PROFILE_OFF;SQLITE_DEFAULT_FOREIGN_KEYS
0168;0169;0414;0618;0649;0219;0162;0429
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/Tests/SQLiteClientTests/SQLiteClientTests.csproj b/Tests/SQLiteClientTests/SQLiteClientTests.csproj
index 02bd499..465b418 100644
--- a/Tests/SQLiteClientTests/SQLiteClientTests.csproj
+++ b/Tests/SQLiteClientTests/SQLiteClientTests.csproj
@@ -1,5 +1,5 @@
-
+
Debug
AnyCPU
@@ -11,6 +11,8 @@
SQLiteClientTests
SQLiteClientTests
SQLiteClientTests.SQLiteClientTestDriver
+ v4.7
+
true
@@ -22,6 +24,7 @@
4
0168;0169;0414;0618;0649
true
+ false
true
@@ -31,6 +34,7 @@
4
0168;0169;0414;0618;0649
true
+ false
@@ -79,4 +83,7 @@
System.Data.SQLite
-
+
+
+
+
\ No newline at end of file
diff --git a/Tests/System.Data.SQLite.Tests/App.config b/Tests/System.Data.SQLite.Tests/App.config
index 1fa7831..cf1cde0 100755
--- a/Tests/System.Data.SQLite.Tests/App.config
+++ b/Tests/System.Data.SQLite.Tests/App.config
@@ -1,25 +1,20 @@
-
+
-
+
-
+
-
+
-
+
-
\ No newline at end of file
+
diff --git a/Tests/System.Data.SQLite.Tests/System.Data.SQLite.Tests.csproj b/Tests/System.Data.SQLite.Tests/System.Data.SQLite.Tests.csproj
index c9d3758..448b187 100644
--- a/Tests/System.Data.SQLite.Tests/System.Data.SQLite.Tests.csproj
+++ b/Tests/System.Data.SQLite.Tests/System.Data.SQLite.Tests.csproj
@@ -1,5 +1,5 @@
-
+
Debug
AnyCPU
@@ -9,6 +9,8 @@
Library
System.Data.SQLite.Tests
System.Data.SQLite.Tests
+ v4.7
+
True
@@ -19,6 +21,7 @@
prompt
4
False
+ false
none
@@ -28,6 +31,7 @@
prompt
4
False
+ false
@@ -77,4 +81,4 @@
System.Data.SQLite
-
+
\ No newline at end of file
diff --git a/Tests/System.Data.SQLite.UnitTests/System.Data.SQLite.UnitTests.csproj b/Tests/System.Data.SQLite.UnitTests/System.Data.SQLite.UnitTests.csproj
index 438c8cb..9a40a2d 100644
--- a/Tests/System.Data.SQLite.UnitTests/System.Data.SQLite.UnitTests.csproj
+++ b/Tests/System.Data.SQLite.UnitTests/System.Data.SQLite.UnitTests.csproj
@@ -1,5 +1,5 @@
-
+
Debug
AnyCPU
@@ -10,6 +10,8 @@
Properties
System.Data.SQLite.UnitTests
System.Data.SQLite.UnitTests
+ v4.7
+
true
@@ -20,6 +22,7 @@
prompt
4
0219
+ false
none
@@ -29,6 +32,7 @@
prompt
4
0219
+ false
@@ -64,7 +68,5 @@
System.Data.SQLite
-
-
-
-
+
+
\ No newline at end of file