Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Wasm assets for .NET 8 #546

Merged
merged 2 commits into from
Aug 9, 2023
Merged

Add Wasm assets for .NET 8 #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dec580
Add Wasm assets for .NET 8
bricelam Jun 30, 2023
9b31e68
fixup! Add Wasm assets for .NET 8
bricelam Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions gen_lib_nuspecs/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public enum TFM
NET461,
NET60,
NET70,
NET80,
MACCATALYST,
XAMARINMAC20,
}
Expand All @@ -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:
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions src/SQLitePCLRaw.lib.e_sqlcipher/SQLitePCLRaw.lib.e_sqlcipher.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-->
Expand Down
7 changes: 7 additions & 0 deletions src/SQLitePCLRaw.lib.e_sqlcipher/net8.0/SQLitePCLRaw.lib.e_sqlcipher.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 2 additions & 0 deletions src/SQLitePCLRaw.lib.e_sqlite3/SQLitePCLRaw.lib.e_sqlite3.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-->
Expand Down
7 changes: 7 additions & 0 deletions src/SQLitePCLRaw.lib.e_sqlite3/net8.0/SQLitePCLRaw.lib.e_sqlite3.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Loading