Merge branch 'bytecodealliance:main' into main

wasmfx · Nov 28, 2024 · 680f786 · 680f786
2 parents 525d273 + d1387cc
commit 680f786
Show file tree

Hide file tree

Showing 18 changed files with 418 additions and 159 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,7 +18,7 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "0.35.0"
+version = "0.36.0"
 license = "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT"
 repository = "https://github.com/bytecodealliance/wasi-rs"
 
@@ -30,23 +30,23 @@ pulldown-cmark = { version = "0.9", default-features = false }
 clap = { version = "4.3.19", features = ["derive"] }
 indexmap = "2.0.0"
 prettyplease = "0.2.20"
-syn = { version = "2.0", features = ["printing"] }
+syn = { version = "2.0.89", features = ["printing"] }
 
 wasmparser    = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.220.0" }
 wasm-metadata = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.220.0" }
 wasm-encoder  = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.220.0" }
 wit-parser    = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.220.0" }
 wit-component = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.220.0" }
 
-wit-bindgen-core = { path = 'crates/core', version = '0.35.0' }
-wit-bindgen-c = { path = 'crates/c', version = '0.35.0' }
-wit-bindgen-rust = { path = "crates/rust", version = "0.35.0" }
-wit-bindgen-teavm-java = { path = 'crates/teavm-java', version = '0.35.0' }
-wit-bindgen-go = { path = 'crates/go', version = '0.35.0' }
-wit-bindgen-csharp = { path = 'crates/csharp', version = '0.35.0' }
-wit-bindgen-markdown = { path = 'crates/markdown', version = '0.35.0' }
-wit-bindgen-moonbit = { path = 'crates/moonbit', version = '0.35.0' }
-wit-bindgen = { path = 'crates/guest-rust', version = '0.35.0', default-features = false }
+wit-bindgen-core = { path = 'crates/core', version = '0.36.0' }
+wit-bindgen-c = { path = 'crates/c', version = '0.36.0' }
+wit-bindgen-rust = { path = "crates/rust", version = "0.36.0" }
+wit-bindgen-teavm-java = { path = 'crates/teavm-java', version = '0.36.0' }
+wit-bindgen-go = { path = 'crates/go', version = '0.36.0' }
+wit-bindgen-csharp = { path = 'crates/csharp', version = '0.36.0' }
+wit-bindgen-markdown = { path = 'crates/markdown', version = '0.36.0' }
+wit-bindgen-moonbit = { path = 'crates/moonbit', version = '0.36.0' }
+wit-bindgen = { path = 'crates/guest-rust', version = '0.36.0', default-features = false }
 
 [[bin]]
 name = "wit-bindgen"

diff --git a/crates/csharp/Cargo.toml b/crates/csharp/Cargo.toml
@@ -16,7 +16,6 @@ doctest = false
 test = false
 
 [dependencies]
-wasm-encoder = { workspace = true }
 wit-bindgen-core = { workspace = true }
 wit-component = { workspace = true }
 wit-parser = { workspace = true }

diff --git a/crates/csharp/src/csproj.rs b/crates/csharp/src/csproj.rs
@@ -92,8 +92,8 @@ impl CSProjectLLVMBuilder {
             csproj.push_str(
                 r#"
                 <ItemGroup>
-                    <PackageReference Include="Microsoft.DotNet.ILCompiler.LLVM" Version="9.0.0-rc.1.24412.1" />
-                    <PackageReference Include="runtime.win-x64.Microsoft.DotNet.ILCompiler.LLVM" Version="9.0.0-rc.1.24412.1" />
+                    <PackageReference Include="Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-*" />
+                    <PackageReference Include="runtime.win-x64.Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-*" />
                 </ItemGroup>
                 "#,
             );