From 200766200d8e7e1832da4135920cb242472db12c Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Tue, 16 May 2023 17:12:40 +0200
Subject: [PATCH] Fix ios packages after device/simulator split

---
 .../SQLitePCLRaw.lib.e_sqlcipher.ios.csproj   | 18 +++++--------
 .../SQLitePCLRaw.lib.e_sqlcipher.ios.targets  | 16 +++++++++++
 .../imp_ios_internal.cs                       | 24 -----------------
 .../SQLitePCLRaw.lib.e_sqlite3.ios.csproj     | 27 ++++++-------------
 .../SQLitePCLRaw.lib.e_sqlite3.ios.targets    | 16 +++++------
 .../imp_ios_internal.cs                       | 24 -----------------
 6 files changed, 37 insertions(+), 88 deletions(-)
 create mode 100644 src/SQLitePCLRaw.lib.e_sqlcipher.ios/SQLitePCLRaw.lib.e_sqlcipher.ios.targets
 delete mode 100644 src/SQLitePCLRaw.lib.e_sqlcipher.ios/imp_ios_internal.cs
 delete mode 100644 src/SQLitePCLRaw.lib.e_sqlite3.ios/imp_ios_internal.cs

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
index 36da57fa..a73c7fb7 100644
--- 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,19 +4,15 @@
 		<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>
-    <Compile Include="..\..\src\common\embedded_init.cs" />
-    <Compile Include="imp_ios_internal.cs" />
-</ItemGroup>
-
-  <ItemGroup>
-    <ManifestResourceWithNoCulture Include="$(cb_bin_path)\e_sqlcipher\ios\device\e_sqlcipher.a">
-      <Link>e_sqlcipher.a</Link>
-    </ManifestResourceWithNoCulture>
-  </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
new file mode 100644
index 00000000..22e127c5
--- /dev/null
+++ b/src/SQLitePCLRaw.lib.e_sqlcipher.ios/SQLitePCLRaw.lib.e_sqlcipher.ios.targets
@@ -0,0 +1,16 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <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-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
deleted file mode 100644
index 2a03764d..00000000
--- a/src/SQLitePCLRaw.lib.e_sqlcipher.ios/imp_ios_internal.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-   Copyright 2014-2019 SourceGear, LLC
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-[assembly: ObjCRuntime.LinkWith(
-        "e_sqlcipher.a",
-        ForceLoad=true,
-        LinkerFlags="",
-        Frameworks=""
-        )
-        ]
-
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
index 7ea365f8..5d10adaf 100644
--- 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
@@ -4,25 +4,14 @@
 		<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.lib.e_sqlite3.snk</AssemblyOriginatorKeyFile>
-        <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>
-    <Compile Include="..\..\src\common\embedded_init.cs" />
-    <Compile Include="imp_ios_internal.cs" />
-</ItemGroup>
-
-  <ItemGroup>
-    <ManifestResourceWithNoCulture Include="$(cb_bin_path)\e_sqlite3\ios\device\e_sqlite3.a">
-      <Link>e_sqlite3.a</Link>
-    </ManifestResourceWithNoCulture>
-  </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\$(tfm_net6_ios)" />
-  </ItemGroup>
+		<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>
 </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
index a853b59a..9b295055 100644
--- 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
deleted file mode 100644
index 2cf7d8e6..00000000
--- a/src/SQLitePCLRaw.lib.e_sqlite3.ios/imp_ios_internal.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-   Copyright 2014-2019 SourceGear, LLC
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-[assembly: ObjCRuntime.LinkWith(
-        "e_sqlite3.a",
-        ForceLoad=true,
-        LinkerFlags="",
-        Frameworks=""
-        )
-        ]
-