more tweaks for #539 moving the code a bit closer to #541 -- remove t…

…he embedded_init stuff for e_sqlite3 and e_sqlcipher
ericsink · May 16, 2023 · 33ce98e · 33ce98e
1 parent fa61659
commit 33ce98e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 32 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
@@ -7,24 +7,11 @@
         <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 Condition="'$(TargetFramework)' == '$(tfm_classic_ios)'">
-    <Compile Include="imp_ios_internal.cs" />
-</ItemGroup>
-
-<ItemGroup>
-    <Compile Include="..\..\src\common\embedded_init.cs" />
-</ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == '$(tfm_classic_ios)'">
-    <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\$(tfm_net6_ios)" />
+      <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_sqlite3.ios/SQLitePCLRaw.lib.e_sqlite3.ios.csproj b/src/SQLitePCLRaw.lib.e_sqlite3.ios/SQLitePCLRaw.lib.e_sqlite3.ios.csproj
@@ -7,24 +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 Condition="'$(TargetFramework)' == '$(tfm_classic_ios)'">
-    <Compile Include="imp_ios_internal.cs" />
-</ItemGroup>
-
-<ItemGroup>
-    <Compile Include="..\..\src\common\embedded_init.cs" />
-</ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == '$(tfm_classic_ios)'">
-    <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)" />
+      <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/msbuild_bundle_fragments/e_sqlcipher_ios.xml b/src/msbuild_bundle_fragments/e_sqlcipher_ios.xml
@@ -2,7 +2,7 @@
 <Project>
 
   <PropertyGroup>
-	<DefineConstants>$(DefineConstants);PROVIDER_internal;EMBEDDED_INIT</DefineConstants>
+	<DefineConstants>$(DefineConstants);PROVIDER_internal</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/msbuild_bundle_fragments/e_sqlite3_ios.xml b/src/msbuild_bundle_fragments/e_sqlite3_ios.xml
@@ -2,7 +2,7 @@
 <Project>
 
   <PropertyGroup>
-	<DefineConstants>$(DefineConstants);PROVIDER_internal;EMBEDDED_INIT</DefineConstants>
+	<DefineConstants>$(DefineConstants);PROVIDER_internal</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>