Skip to content

Commit 111a218

Browse files
authored
Merge pull request #546 from bricelam/wasm8
Add Wasm assets for .NET 8
2 parents 293701c + 9b31e68 commit 111a218

File tree

5 files changed

+23
-0
lines changed

5 files changed

+23
-0
lines changed

gen_lib_nuspecs/Program.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public enum TFM
2828
NET461,
2929
NET60,
3030
NET70,
31+
NET80,
3132
MACCATALYST,
3233
XAMARINMAC20,
3334
}
@@ -46,6 +47,7 @@ public static string AsString(this TFM e)
4647
case TFM.NET461: return "net461";
4748
case TFM.NET60: return "net6.0";
4849
case TFM.NET70: return "net7.0";
50+
case TFM.NET80: return "net8.0";
4951
case TFM.MACCATALYST: return "net6.0-maccatalyst15.2";
5052
case TFM.XAMARINMAC20: return "xamarin.mac20";
5153
default:
@@ -416,6 +418,7 @@ XmlWriter f
416418

417419
write_nuspec_file_entry_native_wasm(lib, TFM.NET60, f);
418420
write_nuspec_file_entry_native_wasm(lib, TFM.NET70, f);
421+
write_nuspec_file_entry_native_wasm(lib, TFM.NET80, f);
419422
}
420423

421424
static void write_nuspec_wasm_targets_file_entry(
@@ -523,6 +526,7 @@ private static void gen_nuspec_lib_e_sqlite3(string dir_src)
523526

524527
write_nuspec_wasm_targets_file_entry(dir_src, id, WhichLib.E_SQLITE3, TFM.NET60, f);
525528
write_nuspec_wasm_targets_file_entry(dir_src, id, WhichLib.E_SQLITE3, TFM.NET70, f);
529+
write_nuspec_wasm_targets_file_entry(dir_src, id, WhichLib.E_SQLITE3, TFM.NET80, f);
526530

527531
// TODO need a comment here to explain these
528532
common.write_empty(f, TFM.NET461);
@@ -582,6 +586,7 @@ private static void gen_nuspec_lib_e_sqlcipher(string dir_src)
582586

583587
write_nuspec_wasm_targets_file_entry(dir_src, id, WhichLib.E_SQLCIPHER, TFM.NET60, f);
584588
write_nuspec_wasm_targets_file_entry(dir_src, id, WhichLib.E_SQLCIPHER, TFM.NET70, f);
589+
write_nuspec_wasm_targets_file_entry(dir_src, id, WhichLib.E_SQLCIPHER, TFM.NET80, f);
585590

586591
// TODO need a comment here to explain these
587592
common.write_empty(f, TFM.NET461);

src/SQLitePCLRaw.lib.e_sqlcipher/SQLitePCLRaw.lib.e_sqlcipher.nuspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@
4343
<file src="$cb_bin_path$\e_sqlcipher\linux\ppc64le\libe_sqlcipher.so" target="runtimes\linux-ppc64le\native\libe_sqlcipher.so" />
4444
<file src="$cb_bin_path$\e_sqlcipher\wasm\net6.0\e_sqlcipher.a" target="runtimes\browser-wasm\nativeassets\net6.0\e_sqlcipher.a" />
4545
<file src="$cb_bin_path$\e_sqlcipher\wasm\net7.0\e_sqlcipher.a" target="runtimes\browser-wasm\nativeassets\net7.0\e_sqlcipher.a" />
46+
<file src="$cb_bin_path$\e_sqlcipher\wasm\net8.0\e_sqlcipher.a" target="runtimes\browser-wasm\nativeassets\net8.0\e_sqlcipher.a" />
4647
<file src=".\net461\SQLitePCLRaw.lib.e_sqlcipher.targets" target="buildTransitive\net461" />
4748
<file src=".\net6.0\SQLitePCLRaw.lib.e_sqlcipher.targets" target="buildTransitive\net6.0" />
4849
<file src=".\net7.0\SQLitePCLRaw.lib.e_sqlcipher.targets" target="buildTransitive\net7.0" />
50+
<file src=".\net8.0\SQLitePCLRaw.lib.e_sqlcipher.targets" target="buildTransitive\net8.0" />
4951
<!--empty directory in lib to avoid nuget adding a reference-->
5052
<file src="_._" target="lib/net461/_._" />
5153
<!--empty directory in lib to avoid nuget adding a reference-->
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--Automatically generated-->
3+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4+
<ItemGroup Condition=" '$(RuntimeIdentifier)' == 'browser-wasm' ">
5+
<NativeFileReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\browser-wasm\nativeassets\net8.0\e_sqlcipher.a" />
6+
</ItemGroup>
7+
</Project>

src/SQLitePCLRaw.lib.e_sqlite3/SQLitePCLRaw.lib.e_sqlite3.nuspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@
4343
<file src="$cb_bin_path$\e_sqlite3\linux\ppc64le\libe_sqlite3.so" target="runtimes\linux-ppc64le\native\libe_sqlite3.so" />
4444
<file src="$cb_bin_path$\e_sqlite3\wasm\net6.0\e_sqlite3.a" target="runtimes\browser-wasm\nativeassets\net6.0\e_sqlite3.a" />
4545
<file src="$cb_bin_path$\e_sqlite3\wasm\net7.0\e_sqlite3.a" target="runtimes\browser-wasm\nativeassets\net7.0\e_sqlite3.a" />
46+
<file src="$cb_bin_path$\e_sqlite3\wasm\net8.0\e_sqlite3.a" target="runtimes\browser-wasm\nativeassets\net8.0\e_sqlite3.a" />
4647
<file src=".\net461\SQLitePCLRaw.lib.e_sqlite3.targets" target="buildTransitive\net461" />
4748
<file src=".\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets" target="buildTransitive\net6.0" />
4849
<file src=".\net7.0\SQLitePCLRaw.lib.e_sqlite3.targets" target="buildTransitive\net7.0" />
50+
<file src=".\net8.0\SQLitePCLRaw.lib.e_sqlite3.targets" target="buildTransitive\net8.0" />
4951
<!--empty directory in lib to avoid nuget adding a reference-->
5052
<file src="_._" target="lib/net461/_._" />
5153
<!--empty directory in lib to avoid nuget adding a reference-->
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--Automatically generated-->
3+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4+
<ItemGroup Condition=" '$(RuntimeIdentifier)' == 'browser-wasm' ">
5+
<NativeFileReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\browser-wasm\nativeassets\net8.0\e_sqlite3.a" />
6+
</ItemGroup>
7+
</Project>

0 commit comments

Comments
 (0)