Tweak the output path again and attempt to resolve the component linking

bytecodealliance · Aug 30, 2024 · 1b1d549 · 1b1d549
1 parent 43ca36b
commit 1b1d549
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/crates/csharp/src/csproj.rs b/crates/csharp/src/csproj.rs
@@ -186,6 +186,7 @@ impl CSProjectMonoBuilder {
             <Nullable>enable</Nullable>
             <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
             <WasmGenerateAppBundle>true</WasmGenerateAppBundle>
+            <WasmBuildNative>true</WasmBuildNative>
         </PropertyGroup>
         
         <PropertyGroup>
@@ -194,7 +195,10 @@ impl CSProjectMonoBuilder {
         </PropertyGroup>
 
         <ItemGroup>
-          <NativeLibrary Include=\"$(MSBuildProjectDirectory)/{camel}_cabi_realloc.c\" />
+          <_WasiLinkStepArgs Include=\"-Wl,--component-type,{camel}_component_type.wit\" />
+          <!-- both versions of these seem to fail to find the .o
+          <_WasiLinkStepArgs Include=\"-Wl,--component-type,&quot;$([MSBuild]::NormalizePath('$(MSBuildProjectDirectory)', '{camel}_component_type.wit').Replace('\\','/'))&quot;\" />
+          -->
         </ItemGroup>
 
         <Target Name=\"_FixRootAssembly\" AfterTargets=\"PrepareForILLink\">

diff --git a/tests/runtime/main.rs b/tests/runtime/main.rs
@@ -553,6 +553,7 @@ fn tests(name: &str, dir_name: &str) -> Result<Vec<PathBuf>> {
             csproj.generate()?;
 
             let dotnet_root_env = "DOTNET_ROOT";
+            let configuration = "Debug";
             let dotnet_cmd: PathBuf;
             match env::var(dotnet_root_env) {
                 Ok(val) => dotnet_cmd = Path::new(&val).join("dotnet"),
@@ -566,7 +567,7 @@ fn tests(name: &str, dir_name: &str) -> Result<Vec<PathBuf>> {
             cmd.arg("publish")
                 .arg(out_dir.join(format!("{camel}.csproj")))
                 .arg("-c")
-                .arg("Debug")
+                .arg(configuration)
                 .arg("/p:PlatformTarget=AnyCPU")
                 .arg("--self-contained")
                 .arg("-o")
@@ -586,7 +587,7 @@ fn tests(name: &str, dir_name: &str) -> Result<Vec<PathBuf>> {
                 panic!("failed to compile");
             }
 
-            //let out_wasm = out_wasm.join(assembly_name);
+            let out_wasm = out_dir.join("bin").join(configuration).join("net9.0").join("AppBundle").join(assembly_name);
             let mut wasm_filename = out_wasm.clone();
             wasm_filename.set_extension("wasm");