Merge pull request #10 from dhil/wasmfx-merge

Merge with upstream

Author: dhil

Cargo.lock

@@ -1040,10 +1040,11 @@ extern void {ns}_{snake}_drop_own({own} handle);
         let import_module = if self.in_import {
             self.wasm_import_module.unwrap().to_string()
         } else {
-            match self.interface {
+            let module = match self.interface {
                 Some((_, key)) => self.resolve.name_world_key(key),
                 None => unimplemented!("resource exports from worlds"),
-            }
+            };
+            format!("[export]{module}")
         };
 
         let drop_fn = format!("__wasm_import_{ns}_{snake}_drop");

crates/c/src/lib.rs

@@ -23,6 +23,7 @@ wasm-metadata = { workspace = true }
 heck = { workspace = true }
 clap = { workspace = true, optional = true }
 anyhow = { workspace = true }
+indexmap = { workspace = true }
 
 [dev-dependencies]
 test-helpers = { path = '../test-helpers' }

crates/csharp/Cargo.toml

@@ -0,0 +1,46 @@
+/**
+ * This class is used to assign a unique integer identifier to instances of
+ * exported resources, which the host will use as its "core representation" per
+ * https://github.com/WebAssembly/component-model/blob/main/design/mvp/Explainer.md#definition-types.
+ * The identifier may be used to retrieve the corresponding instance e.g. when
+ * lifting a handle as part of the canonical ABI implementation.
+ */
+internal class RepTable<T> {
+    private List<object> list = new List<object>();
+    private int? firstVacant = null;
+    
+    private class Vacant {
+        internal int? next;
+
+        internal Vacant(int? next) {
+            this.next = next;
+        }
+    }
+
+    internal int Add(T v) {
+        int rep;
+        if (firstVacant.HasValue) {
+            rep = firstVacant.Value;
+            firstVacant = ((Vacant) list[rep]).next;
+            list[rep] = v;
+        } else {
+            rep = list.Count;
+            list.Add(v);
+        }
+        return rep;
+    }
+
+    internal T Get(nint rep) {
+        if (list[(int)rep] is Vacant) {
+            throw new ArgumentException("invalid rep");
+        }
+        return (T) list[(int)rep];
+    }
+
+    internal T Remove(nint rep) {
+        var val = Get(rep);
+        list[(int)rep] = new Vacant(firstVacant);
+        firstVacant = (int)rep;
+        return (T) val;
+    }
+}

crates/csharp/src/RepTable.cs

@@ -80,7 +80,6 @@ impl CSProjectLLVMBuilder {
         <ItemGroup>
           <NativeLibrary Include=\"{camel}_component_type.o\" />
           <NativeLibrary Include=\"$(MSBuildProjectDirectory)/{camel}_cabi_realloc.o\" />
-   
         </ItemGroup>
 
         <ItemGroup>
@@ -185,18 +184,6 @@ impl CSProjectMonoBuilder {
 
         let aot = self.aot;
 
-        fs::write(
-            self.dir.join("rd.xml"),
-            format!(
-                r#"<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-            <Application>
-                <Assembly Name="{name}">
-                </Assembly>
-            </Application>
-        </Directives>"#
-            ),
-        )?;
-
         let maybe_aot = match aot {
             true => format!("<WasmBuildNative>{aot}</WasmBuildNative>"),
             false => String::new(),
@@ -208,13 +195,11 @@ impl CSProjectMonoBuilder {
         <PropertyGroup>
             <TargetFramework>net9.0</TargetFramework>
             <RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
-
-            <TargetOs>wasi</TargetOs>
+            <OutputType>Library</OutputType>
             {maybe_aot}
+            <RunAOTCompilation>{aot}</RunAOTCompilation>
             <WasmNativeStrip>false</WasmNativeStrip>
-            <IsBrowserWasmProject>false</IsBrowserWasmProject>
             <WasmSingleFileBundle>true</WasmSingleFileBundle>
-
             <RootNamespace>{name}</RootNamespace>
             <ImplicitUsings>enable</ImplicitUsings>
             <Nullable>enable</Nullable>
@@ -227,32 +212,27 @@ impl CSProjectMonoBuilder {
         </PropertyGroup>
 
         <ItemGroup>
-          <NativeLibrary Include=\"{camel}_component_type.o\" />
+          <NativeFileReference Include=\"{camel}_component_type.o\" Condition=\"Exists('{camel}_component_type.o')\"/>
         </ItemGroup>
 
-        <ItemGroup>
-            <RdXmlFile Include=\"rd.xml\" />
-        </ItemGroup>
         "
         );
 
-        if self.aot {
-            fs::write(
-                self.dir.join("nuget.config"),
-                r#"<?xml version="1.0" encoding="utf-8"?>
-            <configuration>
-                <config>
-                    <add key="globalPackagesFolder" value=".packages" />
-                </config>
-                <packageSources>
-                    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
-                    <clear />
-                    <add key="nuget" value="https://api.nuget.org/v3/index.json" />
-                    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
-                </packageSources>
-            </configuration>"#,
-            )?;
-        }
+        fs::write(
+            self.dir.join("nuget.config"),
+            r#"<?xml version="1.0" encoding="utf-8"?>
+        <configuration>
+            <config>
+                <add key="globalPackagesFolder" value=".packages" />
+            </config>
+            <packageSources>
+                <!--To inherit the global NuGet package sources remove the <clear/> line below -->
+                <clear />
+                <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+                <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
+            </packageSources>
+        </configuration>"#,
+        )?;
 
         if self.clean_targets {
             let mut wasm_filename = self.dir.join(name);