Merge branch 'cipher-common-src' into cipher-ext-master

Author: Christopher J. Brody

CHANGES.md

@@ -2,6 +2,9 @@
 
 ## 0.1.x-xx
 
+- SQLCipher 3.4.0 with FTS5 and JSON1
+- Support Windows 8.1/Windows Phone 8.1 along with Windows 10 (WAL/MMAP disabled for Windows Phone 8.1)
+
 ### cordova-sqlite-storage 1.2.1
 
 - Close Android SQLiteStatement after INSERT/UPDATE/DELETE
@@ -10,7 +13,6 @@
 
 ### x.x.x-common-dev
 
-- TODO (disabled): Support Windows 8.1/Windows Phone 8.1 along with Windows 10
 - Fix PCH issue with Debug Win32 UWP (Windows 10) build
 
 ### cordova-sqlite-storage 1.2.0

README.md

@@ -1,6 +1,6 @@
 # Cordova/PhoneGap SQLCipher adapter plugin
 
-Native interface to sqlcipher in a Cordova/PhoneGap plugin for Android, iOS, and Windows ~~Universal (8.1)~~ _10 (UWP)_, with API similar to HTML5/[Web SQL API](http://www.w3.org/TR/webdatabase/).
+Native interface to sqlcipher in a Cordova/PhoneGap plugin for Android, iOS, and Windows, with API similar to HTML5/[Web SQL API](http://www.w3.org/TR/webdatabase/).
 
 License for Android and Windows versions: MIT or Apache 2.0
 
@@ -65,10 +65,10 @@ Some other projects by [@brodybits](https://github.com/brodybits):
   - for future consideration: embed OpenSSL libcrypto for all target platforms
 - A recent version of Cordova (such as `6.1.1`) is recommended. Cordova versions older than `6.0.0` are not supported by this project.
 - Windows version is in an alpha state (using the performant [doo / SQLite3-WinRT](https://github.com/doo/SQLite3-WinRT) component):
-  - Windows 8.1/Windows Phone 8.1 build currently not tested or supported
   - Issue with UNICODE `\u0000` character (same as `\0`)
   - No background processing (for future consideration)
-  - Uses libTomCrypt for encryption which *may* be inferior to OpenSSL for encryption
+  - Uses libTomCrypt for encryption which *may* be inferior to OpenSSL for encryption _and seems to run much more slowly_
+  - WAL/MMAP *disabled* for Windows Phone 8.1
 - Android version:
   - ARM (v5/v6/v7/v7a) and x86 CPUs
   - Minimum SDK 10 (a.k.a. Gingerbread, Android 2.3.3); support for older versions is available upon request.
@@ -85,7 +85,7 @@ Some other projects by [@brodybits](https://github.com/brodybits):
 ## Announcements
 
 - SQLCipher version `3.4.0` for Android/iOS/Windows
-- Windows 10 UWP is now supported by this version ~~- along with Windows 8.1 and Windows Phone 8.1~~
+- Windows 10 UWP is now supported by this version - along with Windows 8.1 and Windows Phone 8.1
 - More explicit `openDatabase` and `deleteDatabase` `iosDatabaseLocation` option
 - Added simple sql batch query function
 - Added echo test function to verify installation of this plugin

plugin.xml

@@ -64,7 +64,8 @@
 
         <!-- SQLCipher source distribution and Security.framework dependency for iOS: -->
         <header-file src="src/common/sqlite3.h" />
-        <source-file src="src/common/sqlite3.c" compiler-flags="-DSQLITE_HAS_CODEC -DSQLITE_THREADSAFE=2 -DSQLITE_TEMP_STORE=3 -DSQLCIPHER_CRYPTO_CC -DSQLITE_LOCKING_STYLE=1 -DSQLITE_OMIT_BUILTIN_TEST=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_RTREE=1 -DNDEBUG" />
+        <source-file src="src/common/sqlite3.c"
+                     compiler-flags="-DSQLITE_HAS_CODEC -DSQLITE_THREADSAFE=2 -DSQLITE_TEMP_STORE=3 -DSQLCIPHER_CRYPTO_CC -DSQLITE_LOCKING_STYLE=1 -DSQLITE_OMIT_BUILTIN_TEST=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_RTREE=1 -DNDEBUG -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_JSON1" />
         <framework src="Security.framework" />
 
     </platform>
@@ -82,10 +83,8 @@
 
         <!-- Thanks to AllJoyn-Cordova / cordova-plugin-alljoyn: -->
         <framework src="src/windows/SQLite3-Win-RT/SQLite3/SQLite3.UWP/SQLite3.UWP.vcxproj" custom="true" type="projectReference" versions="10.*" />
-        <!-- XXX TBD currently not tested/supported:
         <framework src="src/windows/SQLite3-Win-RT/SQLite3/SQLite3.Windows/SQLite3.Windows.vcxproj" custom="true" type="projectReference" target="windows" versions="8.1" />
         <framework src="src/windows/SQLite3-Win-RT/SQLite3/SQLite3.WindowsPhone/SQLite3.WindowsPhone.vcxproj" custom="true" type="projectReference" target="phone" versions="8.1" />
-         -->
 
     </platform>
 

src/windows/SQLite3-Win-RT/SQLite3/SQLite3.Shared.vcxitems

@@ -10,8 +10,8 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\..\libTomCrypt</AdditionalIncludeDirectories>
-      <AdditionalOptions>/DSQLITE_HAS_CODEC /DSQLITE_THREADSAFE=2 /DSQLITE_TEMP_STORE=3 /DSQLITE_ENABLE_FTS3=1 /DSQLITE_ENABLE_FTS3_PARENTHESIS=1 /DSQLITE_ENABLE_FTS4=1 /DSQLITE_ENABLE_RTREE=1 /DSQLCIPHER_CRYPTO_LIBTOMCRYPT /DSQLITE_OS_WINRT %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\..\..\common;$(MSBuildThisFileDirectory)..\..\libTomCrypt</AdditionalIncludeDirectories>
+      <AdditionalOptions>/DSQLITE_HAS_CODEC /DSQLITE_THREADSAFE=2 /DSQLITE_TEMP_STORE=3 /DSQLITE_ENABLE_FTS3=1 /DSQLITE_ENABLE_FTS3_PARENTHESIS=1 /DSQLITE_ENABLE_FTS4=1 /DSQLITE_ENABLE_RTREE=1 /DSQLCIPHER_CRYPTO_LIBTOMCRYPT /DSQLITE_OS_WINRT /DNDEBUG /DSQLITE_ENABLE_FTS5 /DSQLITE_ENABLE_JSON1 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -27,85 +27,85 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)Constants.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Database.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Statement.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\common\sqlite3.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\common\sqlite3.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\cbc_encrypt.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\cbc_encrypt.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\cbc_decrypt.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\cbc_decrypt.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\cbc_start.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\cbc_start.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\cbc_done.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\cbc_done.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\crypt_find_cipher.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\crypt_find_cipher.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\crypt_find_hash.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\crypt_find_hash.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\crypt_register_hash.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\crypt_register_hash.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\crypt_register_cipher.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\crypt_register_cipher.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\crypt_register_prng.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\crypt_register_prng.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\crypt_argchk.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\crypt_argchk.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\crypt_cipher_is_valid.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\crypt_cipher_is_valid.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\crypt_cipher_descriptor.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\crypt_cipher_descriptor.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\crypt_prng_descriptor.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\crypt_prng_descriptor.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\crypt_hash_is_valid.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\crypt_hash_is_valid.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\crypt_hash_descriptor.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\crypt_hash_descriptor.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\hash_memory.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\hash_memory.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\zeromem.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\zeromem.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\pkcs_5_2.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\pkcs_5_2.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\aes.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\aes.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\sha1.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\sha1.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\hmac_init.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\hmac_init.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\hmac_memory.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\hmac_memory.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\hmac_process.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\hmac_process.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\hmac_done.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\hmac_done.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\fortuna.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\fortuna.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libTomCrypt\sha256.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\external\libTomCrypt\sha256.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)pch.cpp">

src/windows/SQLite3-Win-RT/SQLite3/SQLite3.UWP/SQLite3.UWP.vcxproj

@@ -126,7 +126,7 @@
       <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\..\..\..\common;$(MSBuildThisFileDirectory)..\..\..\..\external</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -142,7 +142,7 @@
       <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\..\..\..\common;$(MSBuildThisFileDirectory)..\..\..\..\external</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -159,7 +159,7 @@
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>28204</DisableSpecificWarnings>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\..\..\..\common;$(MSBuildThisFileDirectory)..\..\..\..\external</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -176,7 +176,7 @@
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>28204</DisableSpecificWarnings>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\..\..\..\common;$(MSBuildThisFileDirectory)..\..\..\..\external</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -192,7 +192,7 @@
       <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\..\..\..\common;$(MSBuildThisFileDirectory)..\..\..\..\external</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -208,7 +208,7 @@
       <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\..\..\..\common;$(MSBuildThisFileDirectory)..\..\..\..\external</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

src/windows/SQLite3-Win-RT/SQLite3/SQLite3.Windows/SQLite3.Windows.vcxproj

@@ -139,7 +139,7 @@
 			<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
 			<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
 			<DisableSpecificWarnings>28204</DisableSpecificWarnings>
-			<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\..\..\..\common;$(MSBuildThisFileDirectory)..\..\..\..\external</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ClCompile>
 		<Link>
 			<SubSystem>Console</SubSystem>
@@ -157,7 +157,7 @@
 			<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
 			<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
 			<DisableSpecificWarnings>28204</DisableSpecificWarnings>
-			<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\..\..\..\common;$(MSBuildThisFileDirectory)..\..\..\..\external</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ClCompile>
 		<Link>
 			<SubSystem>Console</SubSystem>
@@ -175,7 +175,7 @@
 			<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
 			<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
 			<DisableSpecificWarnings>28204</DisableSpecificWarnings>
-			<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\..\..\..\common;$(MSBuildThisFileDirectory)..\..\..\..\external</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<FunctionLevelLinking>true</FunctionLevelLinking>
 		</ClCompile>
 		<Link>
@@ -194,7 +194,7 @@
 			<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
 			<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
 			<DisableSpecificWarnings>28204</DisableSpecificWarnings>
-			<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\..\..\..\common;$(MSBuildThisFileDirectory)..\..\..\..\external</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<FunctionLevelLinking>true</FunctionLevelLinking>
 		</ClCompile>
 		<Link>
@@ -213,7 +213,7 @@
 			<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
 			<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
 			<DisableSpecificWarnings>28204</DisableSpecificWarnings>
-			<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\..\..\..\common;$(MSBuildThisFileDirectory)..\..\..\..\external</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ClCompile>
 		<Link>
 			<SubSystem>Console</SubSystem>
@@ -231,7 +231,7 @@
 			<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
 			<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
 			<DisableSpecificWarnings>28204</DisableSpecificWarnings>
-			<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\..\..\..\common;$(MSBuildThisFileDirectory)..\..\..\..\external</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ClCompile>
 		<Link>
 			<SubSystem>Console</SubSystem>