diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e3eb7e9cada..c13ecb07362 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -995,6 +995,12 @@ jobs:
               exit 1
           }
 
+      - name: Smoketest C# AOT build (NativeAOT-LLVM)
+        run: |
+          cd modules/sdk-test-cs
+          EXPERIMENTAL_WASM_AOT=1 dotnet publish -c Release
+          test -f bin/Release/net8.0/wasi-wasm/publish/StdbModule.wasm
+
   internal-tests:
     name: Internal Tests
     needs: [lints]
diff --git a/crates/bindings-csharp/Runtime/build/SpacetimeDB.Runtime.targets b/crates/bindings-csharp/Runtime/build/SpacetimeDB.Runtime.targets
index 780d6f19f43..aa412113b31 100644
--- a/crates/bindings-csharp/Runtime/build/SpacetimeDB.Runtime.targets
+++ b/crates/bindings-csharp/Runtime/build/SpacetimeDB.Runtime.targets
@@ -4,27 +4,46 @@
     <NativeLibrary Include="$(MSBuildThisFileDirectory)..\bindings.c" />
     <UnmanagedEntryPointsAssembly Include="SpacetimeDB.Runtime" />
 
-    <WasmImport Include="$(SpacetimeNamespace)!table_id_from_name" />
-    <WasmImport Include="$(SpacetimeNamespace)!index_id_from_name" />
-    <WasmImport Include="$(SpacetimeNamespace)!datastore_table_row_count" />
-    <WasmImport Include="$(SpacetimeNamespace)!datastore_table_scan_bsatn" />
-    <WasmImport Include="$(SpacetimeNamespace)!datastore_index_scan_range_bsatn" />
-    <WasmImport Include="$(SpacetimeNamespace)!datastore_btree_scan_bsatn" />
-    <WasmImport Include="$(SpacetimeNamespace)!row_iter_bsatn_advance" />
-    <WasmImport Include="$(SpacetimeNamespace)!row_iter_bsatn_close" />
-    <WasmImport Include="$(SpacetimeNamespace)!datastore_insert_bsatn" />
-    <WasmImport Include="$(SpacetimeNamespace)!datastore_delete_by_index_scan_range_bsatn" />
-    <WasmImport Include="$(SpacetimeNamespace)!datastore_delete_by_btree_scan_bsatn" />
-    <WasmImport Include="$(SpacetimeNamespace)!datastore_delete_all_by_eq_bsatn" />
-    <WasmImport Include="$(SpacetimeNamespace)!bytes_source_read" />
-    <WasmImport Include="$(SpacetimeNamespace)!bytes_sink_write" />
-    <WasmImport Include="$(SpacetimeNamespace)!console_log" />
-    <WasmImport Include="$(SpacetimeNamespace)!console_timer_start" />
-    <WasmImport Include="$(SpacetimeNamespace)!console_timer_end" />
-    <WasmImport Include="$(SpacetimeNamespace)!volatile_nonatomic_schedule_immediate" />
+    <!-- spacetime_10.0 imports -->
+    <WasmImport Include="spacetime_10.0!table_id_from_name" />
+    <WasmImport Include="spacetime_10.0!index_id_from_name" />
+    <WasmImport Include="spacetime_10.0!datastore_table_row_count" />
+    <WasmImport Include="spacetime_10.0!datastore_table_scan_bsatn" />
+    <WasmImport Include="spacetime_10.0!datastore_index_scan_range_bsatn" />
+    <WasmImport Include="spacetime_10.0!datastore_btree_scan_bsatn" />
+    <WasmImport Include="spacetime_10.0!row_iter_bsatn_advance" />
+    <WasmImport Include="spacetime_10.0!row_iter_bsatn_close" />
+    <WasmImport Include="spacetime_10.0!datastore_insert_bsatn" />
+    <WasmImport Include="spacetime_10.0!datastore_update_bsatn" />
+    <WasmImport Include="spacetime_10.0!datastore_delete_by_index_scan_range_bsatn" />
+    <WasmImport Include="spacetime_10.0!datastore_delete_by_btree_scan_bsatn" />
+    <WasmImport Include="spacetime_10.0!datastore_delete_all_by_eq_bsatn" />
+    <WasmImport Include="spacetime_10.0!bytes_source_read" />
+    <WasmImport Include="spacetime_10.0!bytes_sink_write" />
+    <WasmImport Include="spacetime_10.0!console_log" />
+    <WasmImport Include="spacetime_10.0!console_timer_start" />
+    <WasmImport Include="spacetime_10.0!console_timer_end" />
+    <WasmImport Include="spacetime_10.0!volatile_nonatomic_schedule_immediate" />
+    <WasmImport Include="spacetime_10.0!identity" />
+
+    <!-- spacetime_10.1 imports -->
+    <WasmImport Include="spacetime_10.1!bytes_source_remaining_length" />
+
+    <!-- spacetime_10.2 imports -->
+    <WasmImport Include="spacetime_10.2!get_jwt" />
+
+    <!-- spacetime_10.3 imports -->
+    <WasmImport Include="spacetime_10.3!procedure_start_mut_tx" />
+    <WasmImport Include="spacetime_10.3!procedure_commit_mut_tx" />
+    <WasmImport Include="spacetime_10.3!procedure_abort_mut_tx" />
+    <WasmImport Include="spacetime_10.3!procedure_http_request" />
+
+    <!-- spacetime_10.4 imports -->
+    <WasmImport Include="spacetime_10.4!datastore_index_scan_point_bsatn" />
+    <WasmImport Include="spacetime_10.4!datastore_delete_by_index_scan_point_bsatn" />
 
     <PackageReference Include="Microsoft.DotNet.ILCompiler.LLVM" Version="8.0.0-*" />
-    <PackageReference Include="runtime.win-x64.Microsoft.DotNet.ILCompiler.LLVM" Version="8.0.0-*" />
+    <PackageReference Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM" Version="8.0.0-*" />
     <PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="8.0.0-*" Condition="'$(ILLinkTargetsPath)' == ''" />
 
     <CustomLinkerArg Include="-DEXPERIMENTAL_WASM_AOT" />