From 5dec5802e5e66f4410458a970baeeea3fbb8263c Mon Sep 17 00:00:00 2001
From: Brice Lambson <brice@bricelam.net>
Date: Fri, 30 Jun 2023 09:54:33 -0700
Subject: [PATCH 1/2] Add Wasm assets for .NET 8

Depends on ericsink/cb#16
Resolves dotnet/efcore#29000
---
 gen_lib_nuspecs/Program.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gen_lib_nuspecs/Program.cs b/gen_lib_nuspecs/Program.cs
index 8e9b41a4..2602984f 100644
--- a/gen_lib_nuspecs/Program.cs
+++ b/gen_lib_nuspecs/Program.cs
@@ -28,6 +28,7 @@ public enum TFM
     NET461,
     NET60,
     NET70,
+    NET80,
     MACCATALYST,
     XAMARINMAC20,
 }
@@ -46,6 +47,7 @@ public static string AsString(this TFM e)
             case TFM.NET461: return "net461";
             case TFM.NET60: return "net6.0";
             case TFM.NET70: return "net7.0";
+            case TFM.NET80: return "net8.0";
             case TFM.MACCATALYST: return "net6.0-maccatalyst15.2";
             case TFM.XAMARINMAC20: return "xamarin.mac20";
             default:
@@ -416,6 +418,7 @@ XmlWriter f
 
         write_nuspec_file_entry_native_wasm(lib, TFM.NET60, f);
         write_nuspec_file_entry_native_wasm(lib, TFM.NET70, f);
+        write_nuspec_file_entry_native_wasm(lib, TFM.NET80, f);
     }
 
     static void write_nuspec_wasm_targets_file_entry(
@@ -523,6 +526,7 @@ private static void gen_nuspec_lib_e_sqlite3(string dir_src)
 
             write_nuspec_wasm_targets_file_entry(dir_src, id, WhichLib.E_SQLITE3, TFM.NET60, f);
             write_nuspec_wasm_targets_file_entry(dir_src, id, WhichLib.E_SQLITE3, TFM.NET70, f);
+            write_nuspec_wasm_targets_file_entry(dir_src, id, WhichLib.E_SQLITE3, TFM.NET80, f);
 
             // TODO need a comment here to explain these
             common.write_empty(f, TFM.NET461);
@@ -582,6 +586,7 @@ private static void gen_nuspec_lib_e_sqlcipher(string dir_src)
 
             write_nuspec_wasm_targets_file_entry(dir_src, id, WhichLib.E_SQLCIPHER, TFM.NET60, f);
             write_nuspec_wasm_targets_file_entry(dir_src, id, WhichLib.E_SQLCIPHER, TFM.NET70, f);
+            write_nuspec_wasm_targets_file_entry(dir_src, id, WhichLib.E_SQLCIPHER, TFM.NET80, f);
 
             // TODO need a comment here to explain these
             common.write_empty(f, TFM.NET461);

From 9b31e68705a926bd4c8a9103a15a19983c7110af Mon Sep 17 00:00:00 2001
From: Brice Lambson <brice@bricelam.net>
Date: Fri, 30 Jun 2023 11:26:29 -0700
Subject: [PATCH 2/2] fixup! Add Wasm assets for .NET 8

Add/update generated files
---
 .../SQLitePCLRaw.lib.e_sqlcipher.nuspec                    | 2 ++
 .../net8.0/SQLitePCLRaw.lib.e_sqlcipher.targets            | 7 +++++++
 .../SQLitePCLRaw.lib.e_sqlite3.nuspec                      | 2 ++
 .../net8.0/SQLitePCLRaw.lib.e_sqlite3.targets              | 7 +++++++
 4 files changed, 18 insertions(+)
 create mode 100644 src/SQLitePCLRaw.lib.e_sqlcipher/net8.0/SQLitePCLRaw.lib.e_sqlcipher.targets
 create mode 100644 src/SQLitePCLRaw.lib.e_sqlite3/net8.0/SQLitePCLRaw.lib.e_sqlite3.targets

diff --git a/src/SQLitePCLRaw.lib.e_sqlcipher/SQLitePCLRaw.lib.e_sqlcipher.nuspec b/src/SQLitePCLRaw.lib.e_sqlcipher/SQLitePCLRaw.lib.e_sqlcipher.nuspec
index 14a8365c..14735d98 100644
--- a/src/SQLitePCLRaw.lib.e_sqlcipher/SQLitePCLRaw.lib.e_sqlcipher.nuspec
+++ b/src/SQLitePCLRaw.lib.e_sqlcipher/SQLitePCLRaw.lib.e_sqlcipher.nuspec
@@ -43,9 +43,11 @@
     <file src="$cb_bin_path$\e_sqlcipher\linux\ppc64le\libe_sqlcipher.so" target="runtimes\linux-ppc64le\native\libe_sqlcipher.so" />
     <file src="$cb_bin_path$\e_sqlcipher\wasm\net6.0\e_sqlcipher.a" target="runtimes\browser-wasm\nativeassets\net6.0\e_sqlcipher.a" />
     <file src="$cb_bin_path$\e_sqlcipher\wasm\net7.0\e_sqlcipher.a" target="runtimes\browser-wasm\nativeassets\net7.0\e_sqlcipher.a" />
+    <file src="$cb_bin_path$\e_sqlcipher\wasm\net8.0\e_sqlcipher.a" target="runtimes\browser-wasm\nativeassets\net8.0\e_sqlcipher.a" />
     <file src=".\net461\SQLitePCLRaw.lib.e_sqlcipher.targets" target="buildTransitive\net461" />
     <file src=".\net6.0\SQLitePCLRaw.lib.e_sqlcipher.targets" target="buildTransitive\net6.0" />
     <file src=".\net7.0\SQLitePCLRaw.lib.e_sqlcipher.targets" target="buildTransitive\net7.0" />
+    <file src=".\net8.0\SQLitePCLRaw.lib.e_sqlcipher.targets" target="buildTransitive\net8.0" />
     <!--empty directory in lib to avoid nuget adding a reference-->
     <file src="_._" target="lib/net461/_._" />
     <!--empty directory in lib to avoid nuget adding a reference-->
diff --git a/src/SQLitePCLRaw.lib.e_sqlcipher/net8.0/SQLitePCLRaw.lib.e_sqlcipher.targets b/src/SQLitePCLRaw.lib.e_sqlcipher/net8.0/SQLitePCLRaw.lib.e_sqlcipher.targets
new file mode 100644
index 00000000..efcc349e
--- /dev/null
+++ b/src/SQLitePCLRaw.lib.e_sqlcipher/net8.0/SQLitePCLRaw.lib.e_sqlcipher.targets
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Automatically generated-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Condition=" '$(RuntimeIdentifier)' == 'browser-wasm' ">
+    <NativeFileReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\browser-wasm\nativeassets\net8.0\e_sqlcipher.a" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/SQLitePCLRaw.lib.e_sqlite3/SQLitePCLRaw.lib.e_sqlite3.nuspec b/src/SQLitePCLRaw.lib.e_sqlite3/SQLitePCLRaw.lib.e_sqlite3.nuspec
index fdd80080..6fc2729b 100644
--- a/src/SQLitePCLRaw.lib.e_sqlite3/SQLitePCLRaw.lib.e_sqlite3.nuspec
+++ b/src/SQLitePCLRaw.lib.e_sqlite3/SQLitePCLRaw.lib.e_sqlite3.nuspec
@@ -43,9 +43,11 @@
     <file src="$cb_bin_path$\e_sqlite3\linux\ppc64le\libe_sqlite3.so" target="runtimes\linux-ppc64le\native\libe_sqlite3.so" />
     <file src="$cb_bin_path$\e_sqlite3\wasm\net6.0\e_sqlite3.a" target="runtimes\browser-wasm\nativeassets\net6.0\e_sqlite3.a" />
     <file src="$cb_bin_path$\e_sqlite3\wasm\net7.0\e_sqlite3.a" target="runtimes\browser-wasm\nativeassets\net7.0\e_sqlite3.a" />
+    <file src="$cb_bin_path$\e_sqlite3\wasm\net8.0\e_sqlite3.a" target="runtimes\browser-wasm\nativeassets\net8.0\e_sqlite3.a" />
     <file src=".\net461\SQLitePCLRaw.lib.e_sqlite3.targets" target="buildTransitive\net461" />
     <file src=".\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets" target="buildTransitive\net6.0" />
     <file src=".\net7.0\SQLitePCLRaw.lib.e_sqlite3.targets" target="buildTransitive\net7.0" />
+    <file src=".\net8.0\SQLitePCLRaw.lib.e_sqlite3.targets" target="buildTransitive\net8.0" />
     <!--empty directory in lib to avoid nuget adding a reference-->
     <file src="_._" target="lib/net461/_._" />
     <!--empty directory in lib to avoid nuget adding a reference-->
diff --git a/src/SQLitePCLRaw.lib.e_sqlite3/net8.0/SQLitePCLRaw.lib.e_sqlite3.targets b/src/SQLitePCLRaw.lib.e_sqlite3/net8.0/SQLitePCLRaw.lib.e_sqlite3.targets
new file mode 100644
index 00000000..5b7c884f
--- /dev/null
+++ b/src/SQLitePCLRaw.lib.e_sqlite3/net8.0/SQLitePCLRaw.lib.e_sqlite3.targets
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Automatically generated-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Condition=" '$(RuntimeIdentifier)' == 'browser-wasm' ">
+    <NativeFileReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\browser-wasm\nativeassets\net8.0\e_sqlite3.a" />
+  </ItemGroup>
+</Project>
\ No newline at end of file