From 04f291e8605f750621f3805f171ed568e69d9809 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Sun, 14 Sep 2025 21:13:13 -0600 Subject: [PATCH 1/8] bump to latest versions --- Directory.Build.props | 15 ++++++++++----- ...lliance.Componentize.DotNet.WitBindgen.targets | 2 +- .../generated/wit/MySimple.cs | 13 ++++++------- ...MySimpleWorld_wasm_import_linkage_attribute.cs | 4 ++-- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 08ca89b..f7386ff 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -9,13 +9,18 @@ $(NoWarn);NU1507 - 1.227.1 - v0.6.1 - 0.41.0 - 0.10.0 + + 1.239.0 + + v0.8.0 + + 0.46.0 + + 0.11.0 - 30.0.2 + + 36.0.2 diff --git a/src/WitBindgen/build/BytecodeAlliance.Componentize.DotNet.WitBindgen.targets b/src/WitBindgen/build/BytecodeAlliance.Componentize.DotNet.WitBindgen.targets index 844cad2..19950d8 100644 --- a/src/WitBindgen/build/BytecodeAlliance.Componentize.DotNet.WitBindgen.targets +++ b/src/WitBindgen/build/BytecodeAlliance.Componentize.DotNet.WitBindgen.targets @@ -3,7 +3,7 @@ native-aot - 24.0 + 27.0 https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$(WasiSdkVersion.Split(".")[0])/wasi-sdk-$(WasiSdkVersion)-x86_64-windows.tar.gz https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$(WasiSdkVersion.Split(".")[0])/wasi-sdk-$(WasiSdkVersion)-x86_64-linux.tar.gz https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$(WasiSdkVersion.Split(".")[0])/wasi-sdk-$(WasiSdkVersion)-x86_64-macos.tar.gz diff --git a/test/WitBindgenTest/testapps/LibraryWithCustomGeneratedFilesLocation/generated/wit/MySimple.cs b/test/WitBindgenTest/testapps/LibraryWithCustomGeneratedFilesLocation/generated/wit/MySimple.cs index 23adb25..173295f 100644 --- a/test/WitBindgenTest/testapps/LibraryWithCustomGeneratedFilesLocation/generated/wit/MySimple.cs +++ b/test/WitBindgenTest/testapps/LibraryWithCustomGeneratedFilesLocation/generated/wit/MySimple.cs @@ -1,7 +1,7 @@ -// Generated by `wit-bindgen` 0.40.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.46.0. DO NOT EDIT! // #nullable enable -using System.Runtime.InteropServices; + namespace MySimpleWorld { public interface IMySimpleWorld { @@ -11,7 +11,7 @@ public interface IMySimpleWorld { public readonly struct None {} - [StructLayout(LayoutKind.Sequential)] + [global::System.Runtime.InteropServices.StructLayoutAttribute(global::System.Runtime.InteropServices.LayoutKind.Sequential)] public readonly struct Result { public readonly byte Tag; @@ -45,7 +45,7 @@ public TOk AsOk return (TOk)value; } - throw new ArgumentException("expected k, got " + Tag); + throw new global::System.ArgumentException("expected k, got " + Tag); } } @@ -58,7 +58,7 @@ public TErr AsErr return (TErr)value; } - throw new ArgumentException("expected Err, got " + Tag); + throw new global::System.ArgumentException("expected Err, got " + Tag); } } @@ -70,11 +70,10 @@ public class Tags } namespace exports { - using System.Runtime.InteropServices; public static class MySimpleWorld { - [UnmanagedCallersOnly(EntryPoint = "get-number")] + [global::System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute(EntryPoint = "get-number")] public static unsafe int wasmExportGetNumber() { int ret; diff --git a/test/WitBindgenTest/testapps/LibraryWithCustomGeneratedFilesLocation/generated/wit/MySimpleWorld_wasm_import_linkage_attribute.cs b/test/WitBindgenTest/testapps/LibraryWithCustomGeneratedFilesLocation/generated/wit/MySimpleWorld_wasm_import_linkage_attribute.cs index a376f1c..8feb0d9 100644 --- a/test/WitBindgenTest/testapps/LibraryWithCustomGeneratedFilesLocation/generated/wit/MySimpleWorld_wasm_import_linkage_attribute.cs +++ b/test/WitBindgenTest/testapps/LibraryWithCustomGeneratedFilesLocation/generated/wit/MySimpleWorld_wasm_import_linkage_attribute.cs @@ -1,4 +1,4 @@ -// Generated by `wit-bindgen` 0.40.0. DO NOT EDIT! +// Generated by `wit-bindgen` 0.46.0. DO NOT EDIT! // #nullable enable @@ -6,6 +6,6 @@ // temporarily add this attribute until it is available in dotnet 9 namespace System.Runtime.InteropServices { - internal partial class WasmImportLinkageAttribute : Attribute {} + internal partial class WasmImportLinkageAttribute : global::System.Attribute {} } #endif From 74734a8b1bb4eb08e9823909e20c27d13ea24ceb Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Sun, 14 Sep 2025 21:17:03 -0600 Subject: [PATCH 2/8] add url for wasi-sdk --- .../BytecodeAlliance.Componentize.DotNet.WitBindgen.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/src/WitBindgen/build/BytecodeAlliance.Componentize.DotNet.WitBindgen.targets b/src/WitBindgen/build/BytecodeAlliance.Componentize.DotNet.WitBindgen.targets index 19950d8..e17f309 100644 --- a/src/WitBindgen/build/BytecodeAlliance.Componentize.DotNet.WitBindgen.targets +++ b/src/WitBindgen/build/BytecodeAlliance.Componentize.DotNet.WitBindgen.targets @@ -3,6 +3,7 @@ native-aot + 27.0 https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$(WasiSdkVersion.Split(".")[0])/wasi-sdk-$(WasiSdkVersion)-x86_64-windows.tar.gz https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$(WasiSdkVersion.Split(".")[0])/wasi-sdk-$(WasiSdkVersion)-x86_64-linux.tar.gz From 3d72a2b0f0fb6bd80e56d17317cfab78ec3a8677 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Mon, 15 Sep 2025 15:38:32 -0600 Subject: [PATCH 3/8] bump Microsoft.DotNet.ILCompiler.LLVM --- Directory.Packages.props | 4 ++-- templates/content/wasi-cli/wasi-cli.csproj | 4 ++-- test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj | 2 +- test/E2ETest/testapps/E2EProducer/E2EProducer.csproj | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 8e653e8..22ae074 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,8 +4,8 @@ - - + + diff --git a/templates/content/wasi-cli/wasi-cli.csproj b/templates/content/wasi-cli/wasi-cli.csproj index 0e706fc..c105d5c 100644 --- a/templates/content/wasi-cli/wasi-cli.csproj +++ b/templates/content/wasi-cli/wasi-cli.csproj @@ -15,7 +15,7 @@ - - + + diff --git a/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj b/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj index aca4445..67aa749 100644 --- a/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj +++ b/test/E2ETest/testapps/E2EConsumer/E2EConsumer.csproj @@ -19,7 +19,7 @@ - + diff --git a/test/E2ETest/testapps/E2EProducer/E2EProducer.csproj b/test/E2ETest/testapps/E2EProducer/E2EProducer.csproj index 425b924..520acc4 100644 --- a/test/E2ETest/testapps/E2EProducer/E2EProducer.csproj +++ b/test/E2ETest/testapps/E2EProducer/E2EProducer.csproj @@ -17,7 +17,7 @@ - + From 3406ed547bcbb8dce5afbc46f7ebf099849941b5 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Mon, 15 Sep 2025 16:16:29 -0600 Subject: [PATCH 4/8] BeforeTargets="IlcCompile" --- .../BytecodeAlliance.Componentize.DotNet.WitBindgen.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WitBindgen/build/BytecodeAlliance.Componentize.DotNet.WitBindgen.targets b/src/WitBindgen/build/BytecodeAlliance.Componentize.DotNet.WitBindgen.targets index 38b6052..41d0796 100644 --- a/src/WitBindgen/build/BytecodeAlliance.Componentize.DotNet.WitBindgen.targets +++ b/src/WitBindgen/build/BytecodeAlliance.Componentize.DotNet.WitBindgen.targets @@ -21,7 +21,7 @@ MSBuild stuff to acquire the necessary SDKs (WASI SDK) automatically. It will take a few mins on the first build on a given machine, but after that should no-op. --> - + $(WasiSdkRoot) From e9e7cc5cd4aba5eaaec790851a857756c95c829c Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Mon, 15 Sep 2025 16:39:07 -0600 Subject: [PATCH 5/8] Fixes SDK template version extraction Narrows version parsing to the intended SDK dependency to avoid grabbing unrelated Version attributes and causing false mismatch failures in the CI version check. Improves reliability of the template/package version comparison. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6e235f6..4e9628e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: run: | ls ./artifacts/*.nupkg version=$(unzip -p ./artifacts/*SDK*.nupkg '*.nuspec' | grep -oE "[^<]+" | sed 's///' | grep -oE "^[0-9]+\.[0-9]+\.[0-9]+-preview") - template_version=$(grep -oE "Version=\"[^\"]+" ./templates/content/wasi-cli/wasi-cli.csproj | sed 's/Version="//' | grep -oE "^[0-9]+\.[0-9]+\.[0-9]+-preview") + template_version=$(grep 'Componentize.DotNet.Wasm.SDK' ./templates/content/wasi-cli/wasi-cli.csproj | grep -oE 'Version="[0-9]+\.[0-9]+\.[0-9]+-preview' | sed 's/Version="//') echo "Package Version: $version | Template version: $template_version" if [ "$version" != "$template_version" ]; then echo "Version mismatch: Package version ($version) does not match template version ($template_version)"; From fcfd425450cbbeb3bd5f334ded74848c23d76a6f Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 16 Sep 2025 10:49:33 -0600 Subject: [PATCH 6/8] add direct links --- Directory.Packages.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Directory.Packages.props b/Directory.Packages.props index 22ae074..2d1b110 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,7 +4,9 @@ + + From 6d339d09f4a68130f9d03f7eda8276e804402a34 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Wed, 17 Sep 2025 19:58:35 -0600 Subject: [PATCH 7/8] wkg 0.12 now has binaries --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index f7386ff..aedfd39 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -16,7 +16,7 @@ 0.46.0 - 0.11.0 + 0.12.0 From a7896fcacdec86784b45f287b12b4ecf4f4ceefa Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Wed, 17 Sep 2025 20:03:47 -0600 Subject: [PATCH 8/8] try ci fix --- .../testapps/SimpleConsumer/SimpleConsumer.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj b/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj index de0792a..056a884 100644 --- a/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj +++ b/test/WasmComponentSdkTest/testapps/SimpleConsumer/SimpleConsumer.csproj @@ -29,7 +29,7 @@ - ../SimpleProducer/bin/$(Configuration)/$(TargetFramework)/wasi-wasm/native/simpleproducer.wasm + ../SimpleProducer/bin/$(Configuration)/$(TargetFramework)/wasi-wasm/publish/simpleproducer.wasm