merge #541

ericsink · May 16, 2023 · 8a125bb · 8a125bb
2 parents f775293 + db3b312
commit 8a125bb
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 83 deletions.
diff --git a/src/SQLitePCLRaw.lib.e_sqlcipher.ios/SQLitePCLRaw.lib.e_sqlcipher.ios.csproj b/src/SQLitePCLRaw.lib.e_sqlcipher.ios/SQLitePCLRaw.lib.e_sqlcipher.ios.csproj
@@ -4,15 +4,14 @@
  <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
  <SignAssembly>true</SignAssembly>
  <AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.lib.e_sqlcipher.snk</AssemblyOriginatorKeyFile>
- <PackageDescription>This package contains platform-specific native code builds of SQLCipher (see sqlcipher/sqlcipher on GitHub) for use with SQLitePCLRaw. Note that these sqlcipher builds are unofficial and unsupported. For official sqlcipher builds, contact Zetetic. To use this package, you need SQLitePCLRaw.core as well as one of the SQLitePCLRaw.provider.* packages. Convenience packages are named SQLitePCLRaw.bundle_*.</PackageDescription>
+ <PackageDescription>This package contains platform-specific native code builds of SQLCipher (see sqlcipher/sqlcipher on GitHub) for use with SQLitePCLRaw. Note that these sqlcipher builds are unofficial and unsupported. For official sqlcipher builds, contact Zetetic. To use this package, you need SQLitePCLRaw.core as well as one of the SQLitePCLRaw.provider.* packages. Convenience packages are named SQLitePCLRaw.bundle_*.</PackageDescription>
  </PropertyGroup>
 
- <ItemGroup>
- <None Include="$(cb_bin_path)\e_sqlcipher\ios\device\e_sqlcipher.a" Pack="true" PackagePath="static\device" />
- <None Include="$(cb_bin_path)\e_sqlcipher\ios\simulator\e_sqlcipher.a" Pack="true" PackagePath="static\simulator" />
- <None Include="SQLitePCLRaw.lib.e_sqlcipher.ios.targets" Pack="true" PackagePath="build" />
- <None Include="SQLitePCLRaw.lib.e_sqlcipher.ios.targets" Pack="true" PackagePath="buildTransitive" />
- </ItemGroup>
-
+ <ItemGroup>
+ <None Include="$(cb_bin_path)\e_sqlcipher\ios\device\e_sqlcipher.a" Pack="true" PackagePath="static\device" />
+ <None Include="$(cb_bin_path)\e_sqlcipher\ios\simulator\e_sqlcipher.a" Pack="true" PackagePath="static\simulator" />
+ <None Include="SQLitePCLRaw.lib.e_sqlcipher.ios.targets" Pack="true" PackagePath="build" />
+ <None Include="SQLitePCLRaw.lib.e_sqlcipher.ios.targets" Pack="true" PackagePath="buildTransitive" />
+ </ItemGroup>
 </Project>
 
diff --git a/src/SQLitePCLRaw.lib.e_sqlcipher.ios/SQLitePCLRaw.lib.e_sqlcipher.ios.targets b/src/SQLitePCLRaw.lib.e_sqlcipher.ios/SQLitePCLRaw.lib.e_sqlcipher.ios.targets
@@ -1,20 +1,16 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Condition="'$(RuntimeIdentifier)'=='ios-arm64'">
- <NativeReference Include="$(MSBuildThisFileDirectory)..\..\static\device\e_sqlcipher.a">
+ <ItemGroup Condition="'$(RuntimeIdentifier)'=='ios-arm64' or '$(ComputedPlatform)'=='iPhone'">
+ <NativeReference Include="$(MSBuildThisFileDirectory)..\static\device\e_sqlcipher.a">
  <Kind>Static</Kind>
  <SmartLink>False</SmartLink>
+ <ForceLoad>true</ForceLoad>
  </NativeReference>
  </ItemGroup>
- <ItemGroup Condition="'$(RuntimeIdentifier)'=='iossimulator-x64'">
- <NativeReference Include="$(MSBuildThisFileDirectory)..\..\static\simulator\e_sqlcipher.a">
- <Kind>Static</Kind>
- <SmartLink>False</SmartLink>
- </NativeReference>
- </ItemGroup>
- <ItemGroup Condition="'$(RuntimeIdentifier)'=='iossimulator-arm64'">
- <NativeReference Include="$(MSBuildThisFileDirectory)..\..\static\simulator\e_sqlcipher.a">
+ <ItemGroup Condition="'$(RuntimeIdentifier)'=='iossimulator-arm64' or '$(RuntimeIdentifier)'=='iossimulator-x64' or '$(ComputedPlatform)'=='iPhoneSimulator'">
+ <NativeReference Include="$(MSBuildThisFileDirectory)..\static\simulator\e_sqlcipher.a">
  <Kind>Static</Kind>
  <SmartLink>False</SmartLink>
+ <ForceLoad>true</ForceLoad>
  </NativeReference>
  </ItemGroup>
 </Project>
diff --git a/src/SQLitePCLRaw.lib.e_sqlcipher.ios/imp_ios_internal.cs b/src/SQLitePCLRaw.lib.e_sqlcipher.ios/imp_ios_internal.cs
diff --git a/src/SQLitePCLRaw.lib.e_sqlite3.ios/SQLitePCLRaw.lib.e_sqlite3.ios.csproj b/src/SQLitePCLRaw.lib.e_sqlite3.ios/SQLitePCLRaw.lib.e_sqlite3.ios.csproj
@@ -7,12 +7,11 @@
  <PackageDescription>This package contains platform-specific native code builds of SQLite for use with SQLitePCLRaw. To use this, you need SQLitePCLRaw.core as well as one of the SQLitePCLRaw.provider.* packages. Convenience packages are named SQLitePCLRaw.bundle_*.</PackageDescription>
  </PropertyGroup>
 
- <ItemGroup>
- <None Include="$(cb_bin_path)\e_sqlite3\ios\device\e_sqlite3.a" Pack="true" PackagePath="static\device" />
- <None Include="$(cb_bin_path)\e_sqlite3\ios\simulator\e_sqlite3.a" Pack="true" PackagePath="static\simulator" />
- <None Include="SQLitePCLRaw.lib.e_sqlite3.ios.targets" Pack="true" PackagePath="build" />
- <None Include="SQLitePCLRaw.lib.e_sqlite3.ios.targets" Pack="true" PackagePath="buildTransitive" />
- </ItemGroup>
-
+ <ItemGroup>
+ <None Include="$(cb_bin_path)\e_sqlite3\ios\device\e_sqlite3.a" Pack="true" PackagePath="static\device" />
+ <None Include="$(cb_bin_path)\e_sqlite3\ios\simulator\e_sqlite3.a" Pack="true" PackagePath="static\simulator" />
+ <None Include="SQLitePCLRaw.lib.e_sqlite3.ios.targets" Pack="true" PackagePath="build" />
+ <None Include="SQLitePCLRaw.lib.e_sqlite3.ios.targets" Pack="true" PackagePath="buildTransitive" />
+ </ItemGroup>
 </Project>
 
diff --git a/src/SQLitePCLRaw.lib.e_sqlite3.ios/SQLitePCLRaw.lib.e_sqlite3.ios.targets b/src/SQLitePCLRaw.lib.e_sqlite3.ios/SQLitePCLRaw.lib.e_sqlite3.ios.targets
@@ -1,20 +1,16 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Condition="'$(RuntimeIdentifier)'=='ios-arm64'">
- <NativeReference Include="$(MSBuildThisFileDirectory)..\..\static\device\e_sqlite3.a">
+ <ItemGroup Condition="'$(RuntimeIdentifier)'=='ios-arm64' or '$(ComputedPlatform)'=='iPhone'">
+ <NativeReference Include="$(MSBuildThisFileDirectory)..\static\device\e_sqlite3.a">
  <Kind>Static</Kind>
  <SmartLink>False</SmartLink>
+ <ForceLoad>true</ForceLoad>
  </NativeReference>
  </ItemGroup>
- <ItemGroup Condition="'$(RuntimeIdentifier)'=='iossimulator-x64'">
- <NativeReference Include="$(MSBuildThisFileDirectory)..\..\static\simulator\e_sqlite3.a">
- <Kind>Static</Kind>
- <SmartLink>False</SmartLink>
- </NativeReference>
- </ItemGroup>
- <ItemGroup Condition="'$(RuntimeIdentifier)'=='iossimulator-arm64'">
- <NativeReference Include="$(MSBuildThisFileDirectory)..\..\static\simulator\e_sqlite3.a">
+ <ItemGroup Condition="'$(RuntimeIdentifier)'=='iossimulator-arm64' or '$(RuntimeIdentifier)'=='iossimulator-x64' or '$(ComputedPlatform)'=='iPhoneSimulator'">
+ <NativeReference Include="$(MSBuildThisFileDirectory)..\static\simulator\e_sqlite3.a">
  <Kind>Static</Kind>
  <SmartLink>False</SmartLink>
+ <ForceLoad>true</ForceLoad>
  </NativeReference>
  </ItemGroup>
 </Project>
diff --git a/src/SQLitePCLRaw.lib.e_sqlite3.ios/imp_ios_internal.cs b/src/SQLitePCLRaw.lib.e_sqlite3.ios/imp_ios_internal.cs