Skip to content

Commit 8a125bb

Browse files
ericsinkericsink
committed
merge #541 
2 parents f775293 + db3b312 commit 8a125bb

File tree

6 files changed

+25
-83
lines changed

6 files changed

+25
-83
lines changed

‎src/SQLitePCLRaw.lib.e_sqlcipher.ios/SQLitePCLRaw.lib.e_sqlcipher.ios.csproj‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.lib.e_sqlcipher.snk</AssemblyOriginatorKeyFile>
7-
<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>
7+
<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>
88
</PropertyGroup>
99

10-
<ItemGroup>
11-
<None Include="$(cb_bin_path)\e_sqlcipher\ios\device\e_sqlcipher.a" Pack="true" PackagePath="static\device" />
12-
<None Include="$(cb_bin_path)\e_sqlcipher\ios\simulator\e_sqlcipher.a" Pack="true" PackagePath="static\simulator" />
13-
<None Include="SQLitePCLRaw.lib.e_sqlcipher.ios.targets" Pack="true" PackagePath="build" />
14-
<None Include="SQLitePCLRaw.lib.e_sqlcipher.ios.targets" Pack="true" PackagePath="buildTransitive" />
15-
</ItemGroup>
16-
10+
<ItemGroup>
11+
<None Include="$(cb_bin_path)\e_sqlcipher\ios\device\e_sqlcipher.a" Pack="true" PackagePath="static\device" />
12+
<None Include="$(cb_bin_path)\e_sqlcipher\ios\simulator\e_sqlcipher.a" Pack="true" PackagePath="static\simulator" />
13+
<None Include="SQLitePCLRaw.lib.e_sqlcipher.ios.targets" Pack="true" PackagePath="build" />
14+
<None Include="SQLitePCLRaw.lib.e_sqlcipher.ios.targets" Pack="true" PackagePath="buildTransitive" />
15+
</ItemGroup>
1716
</Project>
1817

‎src/SQLitePCLRaw.lib.e_sqlcipher.ios/SQLitePCLRaw.lib.e_sqlcipher.ios.targets‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<ItemGroup Condition="'$(RuntimeIdentifier)'=='ios-arm64'">
3-
<NativeReference Include="$(MSBuildThisFileDirectory)..\..\static\device\e_sqlcipher.a">
2+
<ItemGroup Condition="'$(RuntimeIdentifier)'=='ios-arm64' or '$(ComputedPlatform)'=='iPhone'">
3+
<NativeReference Include="$(MSBuildThisFileDirectory)..\static\device\e_sqlcipher.a">
44
<Kind>Static</Kind>
55
<SmartLink>False</SmartLink>
6+
<ForceLoad>true</ForceLoad>
67
</NativeReference>
78
</ItemGroup>
8-
<ItemGroup Condition="'$(RuntimeIdentifier)'=='iossimulator-x64'">
9-
<NativeReference Include="$(MSBuildThisFileDirectory)..\..\static\simulator\e_sqlcipher.a">
10-
<Kind>Static</Kind>
11-
<SmartLink>False</SmartLink>
12-
</NativeReference>
13-
</ItemGroup>
14-
<ItemGroup Condition="'$(RuntimeIdentifier)'=='iossimulator-arm64'">
15-
<NativeReference Include="$(MSBuildThisFileDirectory)..\..\static\simulator\e_sqlcipher.a">
9+
<ItemGroup Condition="'$(RuntimeIdentifier)'=='iossimulator-arm64' or '$(RuntimeIdentifier)'=='iossimulator-x64' or '$(ComputedPlatform)'=='iPhoneSimulator'">
10+
<NativeReference Include="$(MSBuildThisFileDirectory)..\static\simulator\e_sqlcipher.a">
1611
<Kind>Static</Kind>
1712
<SmartLink>False</SmartLink>
13+
<ForceLoad>true</ForceLoad>
1814
</NativeReference>
1915
</ItemGroup>
2016
</Project>

‎src/SQLitePCLRaw.lib.e_sqlcipher.ios/imp_ios_internal.cs‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎src/SQLitePCLRaw.lib.e_sqlite3.ios/SQLitePCLRaw.lib.e_sqlite3.ios.csproj‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
<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>
88
</PropertyGroup>
99

10-
<ItemGroup>
11-
<None Include="$(cb_bin_path)\e_sqlite3\ios\device\e_sqlite3.a" Pack="true" PackagePath="static\device" />
12-
<None Include="$(cb_bin_path)\e_sqlite3\ios\simulator\e_sqlite3.a" Pack="true" PackagePath="static\simulator" />
13-
<None Include="SQLitePCLRaw.lib.e_sqlite3.ios.targets" Pack="true" PackagePath="build" />
14-
<None Include="SQLitePCLRaw.lib.e_sqlite3.ios.targets" Pack="true" PackagePath="buildTransitive" />
15-
</ItemGroup>
16-
10+
<ItemGroup>
11+
<None Include="$(cb_bin_path)\e_sqlite3\ios\device\e_sqlite3.a" Pack="true" PackagePath="static\device" />
12+
<None Include="$(cb_bin_path)\e_sqlite3\ios\simulator\e_sqlite3.a" Pack="true" PackagePath="static\simulator" />
13+
<None Include="SQLitePCLRaw.lib.e_sqlite3.ios.targets" Pack="true" PackagePath="build" />
14+
<None Include="SQLitePCLRaw.lib.e_sqlite3.ios.targets" Pack="true" PackagePath="buildTransitive" />
15+
</ItemGroup>
1716
</Project>
1817

‎src/SQLitePCLRaw.lib.e_sqlite3.ios/SQLitePCLRaw.lib.e_sqlite3.ios.targets‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<ItemGroup Condition="'$(RuntimeIdentifier)'=='ios-arm64'">
3-
<NativeReference Include="$(MSBuildThisFileDirectory)..\..\static\device\e_sqlite3.a">
2+
<ItemGroup Condition="'$(RuntimeIdentifier)'=='ios-arm64' or '$(ComputedPlatform)'=='iPhone'">
3+
<NativeReference Include="$(MSBuildThisFileDirectory)..\static\device\e_sqlite3.a">
44
<Kind>Static</Kind>
55
<SmartLink>False</SmartLink>
6+
<ForceLoad>true</ForceLoad>
67
</NativeReference>
78
</ItemGroup>
8-
<ItemGroup Condition="'$(RuntimeIdentifier)'=='iossimulator-x64'">
9-
<NativeReference Include="$(MSBuildThisFileDirectory)..\..\static\simulator\e_sqlite3.a">
10-
<Kind>Static</Kind>
11-
<SmartLink>False</SmartLink>
12-
</NativeReference>
13-
</ItemGroup>
14-
<ItemGroup Condition="'$(RuntimeIdentifier)'=='iossimulator-arm64'">
15-
<NativeReference Include="$(MSBuildThisFileDirectory)..\..\static\simulator\e_sqlite3.a">
9+
<ItemGroup Condition="'$(RuntimeIdentifier)'=='iossimulator-arm64' or '$(RuntimeIdentifier)'=='iossimulator-x64' or '$(ComputedPlatform)'=='iPhoneSimulator'">
10+
<NativeReference Include="$(MSBuildThisFileDirectory)..\static\simulator\e_sqlite3.a">
1611
<Kind>Static</Kind>
1712
<SmartLink>False</SmartLink>
13+
<ForceLoad>true</ForceLoad>
1814
</NativeReference>
1915
</ItemGroup>
2016
</Project>

‎src/SQLitePCLRaw.lib.e_sqlite3.ios/imp_ios_internal.cs‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)