diff --git a/wasm/dotnet/build-aot/wwwroot/_framework/System.Collections.Concurrent.wasm b/wasm/dotnet/build-aot/wwwroot/_framework/System.Collections.Concurrent.wasm index c671f0fc..ef7717d4 100644 Binary files a/wasm/dotnet/build-aot/wwwroot/_framework/System.Collections.Concurrent.wasm and b/wasm/dotnet/build-aot/wwwroot/_framework/System.Collections.Concurrent.wasm differ diff --git a/wasm/dotnet/build-aot/wwwroot/_framework/System.Collections.wasm b/wasm/dotnet/build-aot/wwwroot/_framework/System.Collections.wasm index 6118ac89..6b5dc09a 100644 Binary files a/wasm/dotnet/build-aot/wwwroot/_framework/System.Collections.wasm and b/wasm/dotnet/build-aot/wwwroot/_framework/System.Collections.wasm differ diff --git a/wasm/dotnet/build-aot/wwwroot/_framework/System.ComponentModel.Primitives.wasm b/wasm/dotnet/build-aot/wwwroot/_framework/System.ComponentModel.Primitives.wasm index 0adb79cb..c88ec605 100644 Binary files a/wasm/dotnet/build-aot/wwwroot/_framework/System.ComponentModel.Primitives.wasm and b/wasm/dotnet/build-aot/wwwroot/_framework/System.ComponentModel.Primitives.wasm differ diff --git a/wasm/dotnet/build-aot/wwwroot/_framework/System.ComponentModel.TypeConverter.wasm b/wasm/dotnet/build-aot/wwwroot/_framework/System.ComponentModel.TypeConverter.wasm index e7fa1cbb..11f84ade 100644 Binary files a/wasm/dotnet/build-aot/wwwroot/_framework/System.ComponentModel.TypeConverter.wasm and b/wasm/dotnet/build-aot/wwwroot/_framework/System.ComponentModel.TypeConverter.wasm differ diff --git a/wasm/dotnet/build-aot/wwwroot/_framework/System.Drawing.Primitives.wasm b/wasm/dotnet/build-aot/wwwroot/_framework/System.Drawing.Primitives.wasm index 5e6b3256..22da9239 100644 Binary files a/wasm/dotnet/build-aot/wwwroot/_framework/System.Drawing.Primitives.wasm and b/wasm/dotnet/build-aot/wwwroot/_framework/System.Drawing.Primitives.wasm differ diff --git a/wasm/dotnet/build-aot/wwwroot/_framework/System.Drawing.wasm b/wasm/dotnet/build-aot/wwwroot/_framework/System.Drawing.wasm index 79f2c19c..bd56a230 100644 Binary files a/wasm/dotnet/build-aot/wwwroot/_framework/System.Drawing.wasm and b/wasm/dotnet/build-aot/wwwroot/_framework/System.Drawing.wasm differ diff --git a/wasm/dotnet/build-aot/wwwroot/_framework/System.IO.Pipelines.wasm b/wasm/dotnet/build-aot/wwwroot/_framework/System.IO.Pipelines.wasm index c3060915..5f83745c 100644 Binary files a/wasm/dotnet/build-aot/wwwroot/_framework/System.IO.Pipelines.wasm and b/wasm/dotnet/build-aot/wwwroot/_framework/System.IO.Pipelines.wasm differ diff --git a/wasm/dotnet/build-aot/wwwroot/_framework/System.Linq.wasm b/wasm/dotnet/build-aot/wwwroot/_framework/System.Linq.wasm index 57a297a8..4acaa6b7 100644 Binary files a/wasm/dotnet/build-aot/wwwroot/_framework/System.Linq.wasm and b/wasm/dotnet/build-aot/wwwroot/_framework/System.Linq.wasm differ diff --git a/wasm/dotnet/build-aot/wwwroot/_framework/System.Memory.wasm b/wasm/dotnet/build-aot/wwwroot/_framework/System.Memory.wasm index 97d03a8b..7584886d 100644 Binary files a/wasm/dotnet/build-aot/wwwroot/_framework/System.Memory.wasm and b/wasm/dotnet/build-aot/wwwroot/_framework/System.Memory.wasm differ diff --git a/wasm/dotnet/build-aot/wwwroot/_framework/System.ObjectModel.wasm b/wasm/dotnet/build-aot/wwwroot/_framework/System.ObjectModel.wasm index aa5f86d1..485d0cd9 100644 Binary files a/wasm/dotnet/build-aot/wwwroot/_framework/System.ObjectModel.wasm and b/wasm/dotnet/build-aot/wwwroot/_framework/System.ObjectModel.wasm differ diff --git a/wasm/dotnet/build-aot/wwwroot/_framework/System.Private.CoreLib.wasm b/wasm/dotnet/build-aot/wwwroot/_framework/System.Private.CoreLib.wasm index 6fdb5284..2c87a32e 100644 Binary files a/wasm/dotnet/build-aot/wwwroot/_framework/System.Private.CoreLib.wasm and b/wasm/dotnet/build-aot/wwwroot/_framework/System.Private.CoreLib.wasm differ diff --git a/wasm/dotnet/build-aot/wwwroot/_framework/System.Runtime.InteropServices.JavaScript.wasm b/wasm/dotnet/build-aot/wwwroot/_framework/System.Runtime.InteropServices.JavaScript.wasm index 181b4b18..ad623198 100644 Binary files a/wasm/dotnet/build-aot/wwwroot/_framework/System.Runtime.InteropServices.JavaScript.wasm and b/wasm/dotnet/build-aot/wwwroot/_framework/System.Runtime.InteropServices.JavaScript.wasm differ diff --git a/wasm/dotnet/build-aot/wwwroot/_framework/System.Text.Encodings.Web.wasm b/wasm/dotnet/build-aot/wwwroot/_framework/System.Text.Encodings.Web.wasm index f80baa4e..73d05914 100644 Binary files a/wasm/dotnet/build-aot/wwwroot/_framework/System.Text.Encodings.Web.wasm and b/wasm/dotnet/build-aot/wwwroot/_framework/System.Text.Encodings.Web.wasm differ diff --git a/wasm/dotnet/build-aot/wwwroot/_framework/System.Text.Json.wasm b/wasm/dotnet/build-aot/wwwroot/_framework/System.Text.Json.wasm index 6f461d76..e510e949 100644 Binary files a/wasm/dotnet/build-aot/wwwroot/_framework/System.Text.Json.wasm and b/wasm/dotnet/build-aot/wwwroot/_framework/System.Text.Json.wasm differ diff --git a/wasm/dotnet/build-aot/wwwroot/_framework/dotnet.native.wasm b/wasm/dotnet/build-aot/wwwroot/_framework/dotnet.native.wasm index f5b320e4..15f96cc8 100755 Binary files a/wasm/dotnet/build-aot/wwwroot/_framework/dotnet.native.wasm and b/wasm/dotnet/build-aot/wwwroot/_framework/dotnet.native.wasm differ diff --git a/wasm/dotnet/build-aot/wwwroot/_framework/dotnet.wasm b/wasm/dotnet/build-aot/wwwroot/_framework/dotnet.wasm index 32026f92..3452c457 100644 Binary files a/wasm/dotnet/build-aot/wwwroot/_framework/dotnet.wasm and b/wasm/dotnet/build-aot/wwwroot/_framework/dotnet.wasm differ diff --git a/wasm/dotnet/build-interp/wwwroot/_framework/System.Collections.Concurrent.wasm b/wasm/dotnet/build-interp/wwwroot/_framework/System.Collections.Concurrent.wasm index c671f0fc..ef7717d4 100644 Binary files a/wasm/dotnet/build-interp/wwwroot/_framework/System.Collections.Concurrent.wasm and b/wasm/dotnet/build-interp/wwwroot/_framework/System.Collections.Concurrent.wasm differ diff --git a/wasm/dotnet/build-interp/wwwroot/_framework/System.Collections.wasm b/wasm/dotnet/build-interp/wwwroot/_framework/System.Collections.wasm index 6118ac89..6b5dc09a 100644 Binary files a/wasm/dotnet/build-interp/wwwroot/_framework/System.Collections.wasm and b/wasm/dotnet/build-interp/wwwroot/_framework/System.Collections.wasm differ diff --git a/wasm/dotnet/build-interp/wwwroot/_framework/System.ComponentModel.Primitives.wasm b/wasm/dotnet/build-interp/wwwroot/_framework/System.ComponentModel.Primitives.wasm index 0adb79cb..c88ec605 100644 Binary files a/wasm/dotnet/build-interp/wwwroot/_framework/System.ComponentModel.Primitives.wasm and b/wasm/dotnet/build-interp/wwwroot/_framework/System.ComponentModel.Primitives.wasm differ diff --git a/wasm/dotnet/build-interp/wwwroot/_framework/System.ComponentModel.TypeConverter.wasm b/wasm/dotnet/build-interp/wwwroot/_framework/System.ComponentModel.TypeConverter.wasm index e7fa1cbb..11f84ade 100644 Binary files a/wasm/dotnet/build-interp/wwwroot/_framework/System.ComponentModel.TypeConverter.wasm and b/wasm/dotnet/build-interp/wwwroot/_framework/System.ComponentModel.TypeConverter.wasm differ diff --git a/wasm/dotnet/build-interp/wwwroot/_framework/System.Drawing.Primitives.wasm b/wasm/dotnet/build-interp/wwwroot/_framework/System.Drawing.Primitives.wasm index 5e6b3256..22da9239 100644 Binary files a/wasm/dotnet/build-interp/wwwroot/_framework/System.Drawing.Primitives.wasm and b/wasm/dotnet/build-interp/wwwroot/_framework/System.Drawing.Primitives.wasm differ diff --git a/wasm/dotnet/build-interp/wwwroot/_framework/System.Drawing.wasm b/wasm/dotnet/build-interp/wwwroot/_framework/System.Drawing.wasm index 79f2c19c..bd56a230 100644 Binary files a/wasm/dotnet/build-interp/wwwroot/_framework/System.Drawing.wasm and b/wasm/dotnet/build-interp/wwwroot/_framework/System.Drawing.wasm differ diff --git a/wasm/dotnet/build-interp/wwwroot/_framework/System.IO.Pipelines.wasm b/wasm/dotnet/build-interp/wwwroot/_framework/System.IO.Pipelines.wasm index c3060915..5f83745c 100644 Binary files a/wasm/dotnet/build-interp/wwwroot/_framework/System.IO.Pipelines.wasm and b/wasm/dotnet/build-interp/wwwroot/_framework/System.IO.Pipelines.wasm differ diff --git a/wasm/dotnet/build-interp/wwwroot/_framework/System.Linq.wasm b/wasm/dotnet/build-interp/wwwroot/_framework/System.Linq.wasm index 57a297a8..4acaa6b7 100644 Binary files a/wasm/dotnet/build-interp/wwwroot/_framework/System.Linq.wasm and b/wasm/dotnet/build-interp/wwwroot/_framework/System.Linq.wasm differ diff --git a/wasm/dotnet/build-interp/wwwroot/_framework/System.Memory.wasm b/wasm/dotnet/build-interp/wwwroot/_framework/System.Memory.wasm index 97d03a8b..7584886d 100644 Binary files a/wasm/dotnet/build-interp/wwwroot/_framework/System.Memory.wasm and b/wasm/dotnet/build-interp/wwwroot/_framework/System.Memory.wasm differ diff --git a/wasm/dotnet/build-interp/wwwroot/_framework/System.ObjectModel.wasm b/wasm/dotnet/build-interp/wwwroot/_framework/System.ObjectModel.wasm index aa5f86d1..485d0cd9 100644 Binary files a/wasm/dotnet/build-interp/wwwroot/_framework/System.ObjectModel.wasm and b/wasm/dotnet/build-interp/wwwroot/_framework/System.ObjectModel.wasm differ diff --git a/wasm/dotnet/build-interp/wwwroot/_framework/System.Private.CoreLib.wasm b/wasm/dotnet/build-interp/wwwroot/_framework/System.Private.CoreLib.wasm index 6fdb5284..2c87a32e 100644 Binary files a/wasm/dotnet/build-interp/wwwroot/_framework/System.Private.CoreLib.wasm and b/wasm/dotnet/build-interp/wwwroot/_framework/System.Private.CoreLib.wasm differ diff --git a/wasm/dotnet/build-interp/wwwroot/_framework/System.Runtime.InteropServices.JavaScript.wasm b/wasm/dotnet/build-interp/wwwroot/_framework/System.Runtime.InteropServices.JavaScript.wasm index 181b4b18..ad623198 100644 Binary files a/wasm/dotnet/build-interp/wwwroot/_framework/System.Runtime.InteropServices.JavaScript.wasm and b/wasm/dotnet/build-interp/wwwroot/_framework/System.Runtime.InteropServices.JavaScript.wasm differ diff --git a/wasm/dotnet/build-interp/wwwroot/_framework/System.Text.Encodings.Web.wasm b/wasm/dotnet/build-interp/wwwroot/_framework/System.Text.Encodings.Web.wasm index f80baa4e..73d05914 100644 Binary files a/wasm/dotnet/build-interp/wwwroot/_framework/System.Text.Encodings.Web.wasm and b/wasm/dotnet/build-interp/wwwroot/_framework/System.Text.Encodings.Web.wasm differ diff --git a/wasm/dotnet/build-interp/wwwroot/_framework/System.Text.Json.wasm b/wasm/dotnet/build-interp/wwwroot/_framework/System.Text.Json.wasm index 6f461d76..e510e949 100644 Binary files a/wasm/dotnet/build-interp/wwwroot/_framework/System.Text.Json.wasm and b/wasm/dotnet/build-interp/wwwroot/_framework/System.Text.Json.wasm differ diff --git a/wasm/dotnet/build-interp/wwwroot/_framework/dotnet.native.wasm b/wasm/dotnet/build-interp/wwwroot/_framework/dotnet.native.wasm index 86656c66..791b9b13 100755 Binary files a/wasm/dotnet/build-interp/wwwroot/_framework/dotnet.native.wasm and b/wasm/dotnet/build-interp/wwwroot/_framework/dotnet.native.wasm differ diff --git a/wasm/dotnet/build-interp/wwwroot/_framework/dotnet.wasm b/wasm/dotnet/build-interp/wwwroot/_framework/dotnet.wasm index fa9dd49e..199c9a5a 100644 Binary files a/wasm/dotnet/build-interp/wwwroot/_framework/dotnet.wasm and b/wasm/dotnet/build-interp/wwwroot/_framework/dotnet.wasm differ diff --git a/wasm/dotnet/build.sh b/wasm/dotnet/build.sh index 9609c617..d0c700dc 100755 --- a/wasm/dotnet/build.sh +++ b/wasm/dotnet/build.sh @@ -10,7 +10,7 @@ # Finally `sudo dotnet workload install wasm-tools` (without sudo for a user # installation of dotnet, e.g., with option B above). -rm -r ./build-interp ./build-aot build.log +rm -r src/dotnet/bin src/dotnet/obj ./build-interp ./build-aot build.log touch build.log BUILD_LOG="$(realpath build.log)" @@ -27,6 +27,12 @@ printf '%s\n' 'import.meta.url ??= "";' | cat - ./src/dotnet/bin/Release/net9.0/ echo "Copying symbol maps..." | tee -a "$BUILD_LOG" cp ./src/dotnet/obj/Release/net9.0/wasm/for-publish/dotnet.native.js.symbols ./build-interp/wwwroot/_framework/ +for wasmFile in $(find "./build-interp" -type f -name "*.wasm"); +do + wasm-opt "$wasmFile" --translate-to-exnref --enable-bulk-memory --enable-exception-handling --enable-simd --enable-reference-types --enable-multivalue -o "$wasmFile" +done + + echo "Building aot..." | tee -a "$BUILD_LOG" dotnet publish -o ./build-aot ./src/dotnet/dotnet.csproj -p:RunAOTCompilation=true @@ -34,3 +40,8 @@ dotnet publish -o ./build-aot ./src/dotnet/dotnet.csproj -p:RunAOTCompilation=tr printf '%s\n' 'import.meta.url ??= "";' | cat - ./build-aot/wwwroot/_framework/dotnet.js > temp.js && mv temp.js ./build-aot/wwwroot/_framework/dotnet.js echo "Copying symbol maps..." | tee -a "$BUILD_LOG" cp ./src/dotnet/obj/Release/net9.0/wasm/for-publish/dotnet.native.js.symbols ./build-aot/wwwroot/_framework/ + +for wasmFile in $(find "./build-aot" -type f -name "*.wasm"); +do + wasm-opt "$wasmFile" --translate-to-exnref --enable-bulk-memory --enable-exception-handling --enable-simd --enable-reference-types --enable-multivalue -o "$wasmFile" +done