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)"; diff --git a/Directory.Build.props b/Directory.Build.props index 08ca89b..aedfd39 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.12.0 - 30.0.2 + + 36.0.2 diff --git a/Directory.Packages.props b/Directory.Packages.props index 8e653e8..2d1b110 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,8 +4,10 @@ - - + + + + diff --git a/src/WitBindgen/build/BytecodeAlliance.Componentize.DotNet.WitBindgen.targets b/src/WitBindgen/build/BytecodeAlliance.Componentize.DotNet.WitBindgen.targets index e6c516e..41d0796 100644 --- a/src/WitBindgen/build/BytecodeAlliance.Componentize.DotNet.WitBindgen.targets +++ b/src/WitBindgen/build/BytecodeAlliance.Componentize.DotNet.WitBindgen.targets @@ -3,7 +3,8 @@ 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 @@ -20,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) 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 @@ - + 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 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